leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d7fc02c7ba
linux/arch/arm
History
Linus Torvalds d7fc02c7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1815 commits)
  mac80211: fix reorder buffer release
  iwmc3200wifi: Enable wimax core through module parameter
  iwmc3200wifi: Add wifi-wimax coexistence mode as a module parameter
  iwmc3200wifi: Coex table command does not expect a response
  iwmc3200wifi: Update wiwi priority table
  iwlwifi: driver version track kernel version
  iwlwifi: indicate uCode type when fail dump error/event log
  iwl3945: remove duplicated event logging code
  b43: fix two warnings
  ipw2100: fix rebooting hang with driver loaded
  cfg80211: indent regulatory messages with spaces
  iwmc3200wifi: fix NULL pointer dereference in pmkid update
  mac80211: Fix TX status reporting for injected data frames
  ath9k: enable 2GHz band only if the device supports it
  airo: Fix integer overflow warning
  rt2x00: Fix padding bug on L2PAD devices.
  WE: Fix set events not propagated
  b43legacy: avoid PPC fault during resume
  b43: avoid PPC fault during resume
  tcp: fix a timewait refcnt race
  ...

Fix up conflicts due to sysctl cleanups (dead sysctl_check code and
CTL_UNNUMBERED removed) in
	kernel/sysctl_check.c
	net/ipv4/sysctl_net_ipv4.c
	net/ipv6/addrconf.c
	net/sctp/sysctl.c
2009-12-08 07:55:01 -08:00
..
boot kbuild: use INSTALLKERNEL to select customized installkernel script 2009-09-20 12:18:14 +02:00
common ARM: 5735/1: sa1111: CodingStyle cleanups 2009-10-02 22:32:33 +01:00
configs Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2009-11-12 14:57:15 -08:00
include/asm Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-12-01 22:13:38 -08:00
kernel Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2009-12-08 07:55:01 -08:00
lib Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 2009-09-19 13:47:57 +01:00
mach-aaec2000
mach-at91 at91: at91sam9g20ek modify dual slot evaluation kit 2009-11-16 16:57:50 +01:00
mach-bcmring sysctl: Drop & in front of every proc_handler. 2009-11-18 08:37:40 -08:00
mach-clps711x
mach-davinci ASoC: DaVinci: pcm, fix underrun by using sram 2009-11-19 10:48:08 +00:00
mach-ebsa110
mach-ep93xx ARM: 5779/1: ep93xx/micro9.c: fix implicit declaration of function __raw_readl and IOMEM 2009-11-05 20:20:56 +00:00
mach-footbridge
mach-gemini
mach-h720x
mach-integrator ARM: integrator: allow Integrator to be built with highmem 2009-10-25 22:44:30 +00:00
mach-iop13xx Merge branch 'iop-raid6' into async-tx-next 2009-09-08 17:53:57 -07:00
mach-iop32x iop3xx: ATU and PCI memory configuration corrected 2009-08-18 13:48:35 -07:00
mach-iop33x iop3xx: ATU and PCI memory configuration corrected 2009-08-18 13:48:35 -07:00
mach-ixp4xx ixp4xx: arch_idle() documentation fixup 2009-09-21 19:20:03 +02:00
mach-ixp23xx
mach-ixp2000
mach-kirkwood [ARM] Kirkwood: disable propagation of mbus error to the CPU local bus 2009-11-13 12:14:23 -05:00
mach-ks8695 ARM: 5780/1: KS8695: Fix macro definition bug in regs-switch.c 2009-11-05 20:21:25 +00:00
mach-l7200
mach-lh7a40x
mach-loki
mach-mmp [ARM] pxa: fix missing underscores in mfp-pxa910.h 2009-11-13 16:25:47 +08:00
mach-msm
mach-mv78xx0 [ARM] properly report mv78100 stepping A1 2009-11-05 23:03:19 -05:00
mach-mx1 ARM: mxc: Fix i2c_board_info definitions 2009-08-14 12:40:37 +02:00
mach-mx2 MXC: fix reset for mx31, mx35 and mx27 SoCs 2009-10-13 10:24:10 +02:00
mach-mx3 MXC: fix reset for mx31, mx35 and mx27 SoCs 2009-10-13 10:24:10 +02:00
mach-mx25 mx25: Add missing copyright / license header 2009-10-02 09:14:18 +02:00
mach-mxc91231 MXC: add iomux pins configuration support for MXC91231 2009-08-14 12:40:47 +02:00
mach-netx netx: Use get_irqnr_preamble to initialize base register 2009-08-13 20:34:36 +02:00
mach-nomadik mtd: OneNand support for Nomadik 8815 SoC (on NHK8815 board) 2009-09-20 06:00:27 -07:00
mach-ns9xxx const: constify remaining file_operations 2009-10-01 16:11:11 -07:00
mach-omap1 omap1: Fix DSP public peripherals support for ams-delta 2009-10-22 14:47:42 -07:00
mach-omap2 Merge branch 'topic/asoc' into for-linus 2009-12-04 16:22:41 +01:00
mach-orion5x [ARM] orion5x: Add LaCie NAS 2Big Network support 2009-09-08 14:10:35 -04:00
mach-pnx4008
mach-pxa [ARM] pxa/spitz: fix compile regression on spitz 2009-11-22 09:32:43 -06:00
mach-realview RealView: Add sparsemem support for the RealView PBX platform 2009-11-05 10:10:36 +00:00
mach-rpc
mach-s3c24a0/include/mach ARM: S3C: move s3c_device_nand from plat-s3c24xx to plat-s3c 2009-07-31 00:10:24 +01:00
mach-s3c2400
mach-s3c2410 ARM: S3C2410: Fix sparse warnings in arch/arm/mach-s3c2410/gpio.c 2009-10-28 18:34:56 +00:00
mach-s3c2412 ARM: S3C: Add missing selection of S3C_DEV_NAND in machine Kconfigs. 2009-09-17 10:12:28 +01:00
mach-s3c2440 ARM: S3C2440: mini2440: Fix spare warnings 2009-10-28 18:34:51 +00:00
mach-s3c2442 [ARM] GTA02: build fixes (s3c2410_nand_set usage) 2009-06-24 00:10:46 +01:00
mach-s3c2443
mach-s3c6400 Merge branch 'topic/asoc' into for-linus 2009-12-04 16:22:41 +01:00
mach-s3c6410 ARM: SMDK6410: Allocate more GPIO space for WM1190-EV1 2009-11-09 23:40:21 +00:00
mach-s5pc100 ARM: S5PC100: Board and configuration file 2009-08-16 23:40:39 +01:00
mach-sa1100 ARM: 5752/1: SA1100: fix building of h3100 2009-10-07 13:13:01 +01:00
mach-shark
mach-stmp37xx
mach-stmp378x
mach-u300 ARM: 5787/1: U300 COH 901 331 fixes 2009-11-16 16:15:49 +00:00
mach-versatile ARM: 5720/1: Move MMCI header to amba include dir 2009-09-22 20:49:04 +01:00
mach-w90x900 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2009-09-14 17:56:51 -07:00
mm ARMv7: Check whether the SMP/nAMP mode was already enabled 2009-11-04 12:19:22 +00:00
nwfpe
oprofile ARM: 5764/1: bcmring: add oprofile pmu support 2009-10-17 20:10:22 +01:00
plat-iop Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop 2009-10-02 22:31:04 +01:00
plat-mxc spi: add SPI driver for most known i.MX SoCs 2009-09-23 07:39:43 -07:00
plat-omap omap: fix unlikely(x) < y 2009-11-18 10:33:41 -08:00
plat-orion [ARM] Kirkwood: __init requires linux/init.h 2009-08-24 11:55:59 -04:00
plat-pxa [ARM] pxa: ensure mfp is in correct range in mfp_{read,write} 2009-11-17 00:50:10 +08:00
plat-s3c ARM: S3C64XX: Defined PCM controller platform devices 2009-11-18 13:35:05 +00:00
plat-s3c24xx ARM: S3C24XX: Fix warnings in arch/arm/plat-s3c24xx/gpio.c 2009-10-28 18:34:45 +00:00
plat-s3c64xx Merge branch 'topic/asoc' into for-linus 2009-12-04 16:22:41 +01:00
plat-s5pc1xx ARM: S5PC100: Kconfigs and Makefiles 2009-08-16 23:35:19 +01:00
plat-stmp3xxx ARM: STMP3xxx: deallocation with negative index of descriptors[] 2009-09-19 12:14:05 +01:00
tools [ARM] Update mach-types 2009-11-25 22:17:36 +00:00
vfp Thumb-2: Implement the unified VFP support 2009-07-24 12:32:57 +01:00
Kconfig ARM: 5580/2: ARM TCM (Tightly-Coupled Memory) support v3 2009-09-15 22:11:05 +01:00
Kconfig-nommu
Kconfig.debug Thumb-2: Add Thumb-2 support to the build files 2009-07-24 12:33:02 +01:00
Makefile Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next 2009-09-23 15:37:02 -07:00