Linus Torvalds 411f5c7a50 Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm ... * 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits) davinci: DM644x EVM: register MUSB device earlier davinci: add spi devices on tnetv107x evm davinci: add ssp config for tnetv107x evm board davinci: add tnetv107x ssp platform device spi: add ti-ssp spi master driver mfd: add driver for sequencer serial port ARM: EXYNOS4: Implement Clock gating for System MMU ARM: EXYNOS4: Enhancement of System MMU driver ARM: EXYNOS4: Add support for gpio interrupts ARM: S5P: Add function to register gpio interrupt bank data ARM: S5P: Cleanup S5P gpio interrupt code ARM: EXYNOS4: Add missing GPYx banks ARM: S3C64XX: Fix section mismatch from cpufreq init ARM: EXYNOS4: Add keypad device to the SMDKV310 ARM: EXYNOS4: Update clocks for keypad ARM: EXYNOS4: Update keypad base address ARM: EXYNOS4: Add keypad device helpers ARM: EXYNOS4: Add support for SATA on ARMLEX4210 plat-nomadik: make GPIO interrupts work with cpuidle ApSleep mach-u300: define a dummy filter function for coh901318 ... Fix up various conflicts in - arch/arm/mach-exynos4/cpufreq.c - arch/arm/mach-mxs/gpio.c - drivers/net/Kconfig - drivers/tty/serial/Kconfig - drivers/tty/serial/Makefile - drivers/usb/gadget/fsl_mxc_udc.c - drivers/video/Kconfig		2011-03-17 19:08:06 -07:00
..
accessibility
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6	2011-03-16 19:01:29 -07:00
amba
ata	Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-16 17:28:10 -07:00
atm
auxdisplay
base	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6	2011-03-16 15:05:40 -07:00
block	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2011-03-16 19:08:03 -07:00
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-03-16 16:29:25 -07:00
cdrom
char	Merge branches 'defcfg', 'drivers' and 'cyberpro-next' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-17 18:48:35 -07:00
clk
clocksource
connector
cpufreq	[CPUFREQ] Remove the pm_message_t argument from driver suspend	2011-03-16 17:54:33 -04:00
cpuidle
crypto	Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-16 17:28:10 -07:00
dca
dio
dma	Merge branches 'defcfg', 'drivers' and 'cyberpro-next' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-17 18:48:35 -07:00
edac	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp	2011-03-17 17:21:32 -07:00
eisa
firewire
firmware	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6	2011-03-16 15:05:40 -07:00
gpio	Merge branches 'defcfg', 'drivers' and 'cyberpro-next' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-17 18:48:35 -07:00
gpu	drm/radeon: fixup refcounts in radeon dumb create ioctl.	2011-03-17 13:58:34 +10:00
hid
hwmon	Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging	2011-03-17 16:59:38 -07:00
i2c	Merge branch 'for-linus/2639/i2c-1' of git://git.fluff.org/bjdooks/linux	2011-03-17 17:10:19 -07:00
ide
idle
ieee802154
infiniband	Merge branch 'kvm-updates/2.6.39' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2011-03-17 18:40:35 -07:00
input	Merge branches 'defcfg', 'drivers' and 'cyberpro-next' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-17 18:48:35 -07:00
isdn	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-03-16 15:11:04 -07:00
leds
lguest
macintosh
mca
md	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-03-17 17:54:40 -07:00
media	Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-16 17:28:10 -07:00
memstick
message	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-03-17 17:54:40 -07:00
mfd	Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-17 19:08:06 -07:00
misc	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-03-16 15:11:04 -07:00
mmc	Merge branches 'defcfg', 'drivers' and 'cyberpro-next' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-17 18:48:35 -07:00
mtd	Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-17 19:08:06 -07:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-03-17 17:54:40 -07:00
nfc
nubus
of	Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-16 17:28:10 -07:00
oprofile
parisc
parport
pci	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32	2011-03-17 10:11:25 -07:00
pcmcia	Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-16 17:28:10 -07:00
platform
pnp
power
pps	pps: make pps_gen_parport depend on BROKEN	2011-03-04 17:53:38 -08:00
ps3
rapidio
regulator
rtc	Merge branches 'defcfg', 'drivers' and 'cyberpro-next' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-17 18:48:35 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-03-17 17:54:40 -07:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-03-17 17:54:40 -07:00
sfi
sh
sn
spi	Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-17 19:08:06 -07:00
ssb
staging	Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	2011-03-16 17:21:00 -07:00
target	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-03-17 17:54:40 -07:00
tc
telephony
thermal	ACPI: Fix build for CONFIG_NET unset	2011-02-28 18:00:31 -08:00
tty	Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-17 19:08:06 -07:00
uio	UIO: add PRUSS UIO driver support	2011-03-07 13:10:27 -08:00
usb	Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-17 19:08:06 -07:00
uwb
vhost
video	Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-17 19:08:06 -07:00
virtio
vlynq
w1
watchdog	Merge branches 'defcfg', 'drivers' and 'cyberpro-next' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-17 18:48:35 -07:00
xen	Merge branch 'stable/xen.pm.bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-03-17 18:37:42 -07:00
zorro
Kconfig
Makefile