Arnd Bergmann 66a2886d86 Merge branch 'spear/dt' into spear/clock ... Conflicts: arch/arm/mach-spear3xx/clock.c arch/arm/mach-spear3xx/include/mach/generic.h arch/arm/mach-spear3xx/include/mach/misc_regs.h arch/arm/mach-spear3xx/spear320.c arch/arm/mach-spear6xx/clock.c arch/arm/mach-spear6xx/include/mach/misc_regs.h Resolve even more merge conflicts. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-05-14 17:31:45 +02:00
..
accessibility
acpi	Revert "ACPI: ignore FADT reset-reg-sup flag"	2012-04-20 11:19:35 -07:00
amba
ata
atm
auxdisplay
base
bcma
block	Fixes in various components:	2012-04-20 11:31:00 -07:00
bluetooth
cdrom
char
clk	SPEAr: Switch to common clock framework	2012-05-12 21:44:12 +02:00
clocksource
connector
cpufreq
cpuidle
crypto
dca
devfreq
dio
dma
edac
eisa
firewire
firmware
gpio
gpu	kill mm argument of vm_munmap()	2012-04-21 01:58:20 -04:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2012-04-20 10:39:33 -07:00
hsi
hv
hwmon
hwspinlock
i2c
ide
idle
ieee802154
infiniband
input
iommu
isdn
leds
lguest
macintosh
mca
md
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-04-21 12:43:23 -07:00
memstick
message
mfd
misc
mmc	mmc: core: Do not pre-claim host in suspend	2012-04-20 21:52:13 -04:00
mtd
net
nfc
nubus
of	Merge branch 'spear/dt' into spear/clock	2012-05-14 17:31:45 +02:00
oprofile
parisc
parport
pci
pcmcia
pinctrl	Merge branches 'depends/pinctrl/devel' and 'depends/rmk/clkdev' into spear/pinctrl	2012-05-12 20:38:42 +02:00
platform
pnp
power
pps
ps3
ptp
rapidio
regulator
remoteproc
rpmsg
rtc
s390
sbus
scsi
sfi
sh
sn
spi
ssb
staging
target
tc
thermal
tty	drivers/tty/amiserial.c: add missing tty_unlock	2012-04-19 19:15:35 -07:00
uio
usb	ARM: SoC fixes for 3.4-rc	2012-04-21 12:45:52 -07:00
uwb	uwb: fix error handling	2012-04-18 13:15:51 -07:00
vhost
video
virt
virtio
vlynq
w1
watchdog
xen	xen/resume: Fix compile warnings.	2012-04-19 15:12:49 -04:00
zorro
Kconfig
Makefile