Arnd Bergmann 40ba95fdf1 Merge branch 'depends/rmk/restart' into next/cleanup ... Conflicts: arch/arm/mach-at91/at91cap9.c arch/arm/mach-at91/at91sam9260.c arch/arm/mach-at91/at91sam9261.c arch/arm/mach-at91/at91sam9263.c arch/arm/mach-at91/at91sam9g45.c arch/arm/mach-at91/at91sam9rl.c arch/arm/mach-exynos/cpu.c arch/arm/mach-shmobile/board-kota2.c This resolves a bunch of conflicts between the arm-soc tree and changes from the arm tree that have gone upstream. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-07 11:51:28 +00:00
..
accessibility
acpi	pstore: pass allocated memory region back to caller	2011-11-17 12:58:07 -08:00
amba
ata	Merge branch 'depends/rmk/restart' into next/cleanup	2012-01-07 11:51:28 +00:00
atm
auxdisplay
base	PM / Driver core: leave runtime PM enabled during system shutdown	2011-12-07 22:26:56 +01:00
bcma
block	Merge branch 'for-linus' of git://git.kernel.dk/linux-block	2011-12-16 10:05:14 -08:00
bluetooth	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem	2011-12-09 14:07:12 -05:00
cdrom
char	ipmi_watchdog: restore settings when BMC reset	2011-12-20 10:25:04 -08:00
clk
clocksource
connector
cpufreq
cpuidle
crypto	Merge git://github.com/herbertx/crypto	2011-11-25 21:55:07 -08:00
dca
devfreq
dio
dma
edac	drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac	2011-11-24 01:59:38 -06:00
eisa
firewire
firmware	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft	2011-12-15 14:16:47 -08:00
gpio	gpio: Fix DA9052 GPIO build errors.	2011-12-15 11:25:43 -07:00
gpu	vmwgfx: Clip cliprects against screen boundaries in present and dirty	2011-12-19 14:06:05 +00:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2011-12-02 08:25:46 -08:00
hv
hwmon	hwmon: (jz4740) Staticise jz4740_hwmon_driver	2011-12-12 08:31:21 -08:00
hwspinlock
i2c	i2c-eg20t: correct the driver init order of pch_i2c_probe()	2011-12-18 11:46:42 +00:00
ide	ARM: at91/ide: use gpio_is_valid to check the gpio	2011-11-29 15:46:15 +00:00
idle
ieee802154
infiniband	Merge branches 'cma', 'mlx4' and 'qib' into for-next	2011-12-19 09:19:49 -08:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-12-19 15:11:12 -08:00
iommu	Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~keithp/linux	2011-12-16 11:27:56 -08:00
isdn	isdn: avoid copying too long drvid	2011-11-29 18:39:37 -05:00
leds
lguest
macintosh
mca
md	md/bitmap: It is OK to clear bits during recovery.	2011-12-23 09:57:48 +11:00
media	Merge branch 'depends/rmk/restart' into next/cleanup	2012-01-07 11:51:28 +00:00
memstick
message
mfd	mfd: Include linux/io.h to jz4740-adc	2011-12-20 18:53:26 +01:00
misc	Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc	2011-11-21 20:36:05 -08:00
mmc	Merge branch 'depends/rmk/restart' into next/cleanup	2012-01-07 11:51:28 +00:00
mtd	Merge branch 'depends/rmk/restart' into next/cleanup	2012-01-07 11:51:28 +00:00
net	Merge branch 'depends/rmk/restart' into next/cleanup	2012-01-07 11:51:28 +00:00
nfc
nubus
of	of/irq: Get rid of NO_IRQ usage	2011-12-07 09:06:37 -08:00
oprofile	oprofile: Fix uninitialized memory access when writing to writing to oprofilefs	2011-12-19 17:18:43 +01:00
parisc
parport
pci	pci: Fix hotplug of Express Module with pci bridges	2011-12-18 14:10:16 -08:00
pcmcia
pinctrl
platform	toshiba_acpi: Fix machines that don't support HCI_SYSTEM_EVENT	2011-12-05 13:07:28 -05:00
pnp
power	x86/mrst: Battery fixes	2011-12-05 17:06:37 +01:00
pps
ps3
ptp	ptp: Fix clock_getres() implementation	2011-12-06 11:38:32 +01:00
rapidio	rapidio/tsi721: modify PCIe capability settings	2011-12-09 07:50:29 -08:00
regulator	regulator: twl: fix twl4030 support for smps regulators	2011-11-28 18:58:31 +00:00
rtc	Merge branch 'depends/rmk/restart' into next/cleanup	2012-01-07 11:51:28 +00:00
s390	[SCSI] zfcp: return early from slave_destroy if slave_alloc returned early	2011-12-14 15:40:43 +04:00
sbus	sbus: convert drivers/sbus/char/* to use module_platform_driver()	2011-12-04 10:46:58 -08:00
scsi	[SCSI] fcoe: fix fcoe in a DCB environment by adding DCB notifiers to set skb priority	2011-12-15 11:02:07 +04:00
sfi
sh
sn
spi	spi/gpio: fix section mismatch warning	2011-12-07 22:17:39 +01:00
ssb	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem	2011-12-09 14:07:12 -05:00
staging	staging: r8712u: Add new USB ID	2011-12-13 16:13:15 -08:00
target	iscsi-target: Fix hex2bin warn_unused compile message	2011-12-06 06:00:59 +00:00
tc
telephony
thermal
tty	Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty	2011-11-21 20:36:46 -08:00
uio
usb	Merge branch 'depends/rmk/restart' into next/cleanup	2012-01-07 11:51:28 +00:00
uwb
vhost
video	viafb: correct sync polarity for OLPC DCON	2011-11-22 00:56:17 +00:00
virt
virtio	virtio-pci: make reset operation safer	2011-11-24 13:04:48 +10:30
vlynq
w1
watchdog	ARM: at91: make watchdog drivers soc independent	2011-11-28 22:50:39 +08:00
xen	Revert "xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel"	2011-12-19 09:30:35 -05:00
zorro
Kconfig
Makefile