Arnd Bergmann a94c7b0a8f Merge branch 'spear/dt' into next/dt2 ... * spear/dt: ARM: SPEAr600: Add device-tree support to SPEAr600 boards (update to v3.3-rc7) Conflicts: arch/arm/mach-spear6xx/spear6xx.c arch/arm/mach-vexpress/Kconfig The conflicts are between the previous contents of the next/dt2 branch and upstream changes from v3.3-rc7. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-03-16 20:25:17 +00:00
..
firewire	tools/firewire: nosy-dump: increment program version	2010-07-27 11:04:12 +02:00
hv	drivers: hv: kvp: Cleanup the kernel/user protocol	2012-02-09 08:32:44 -08:00
lguest	lguest: move the lguest tool to the tools directory	2012-01-12 15:44:47 +10:30
nfsd	NFSD: Added fault injection script	2011-11-07 21:10:47 -05:00
perf	perf tools: Handle kernels that don't support attr.exclude_{guest,host}	2012-03-03 12:19:56 -03:00
power	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-01-18 15:51:48 -08:00
slub	Merge branches 'slab/next' and 'slub/partial' into slab/for-linus	2011-10-26 18:09:12 +03:00
testing	While demoing ktest at ELC in 2012, it was embarrassing that the	2012-02-27 15:43:05 -08:00
usb	USB: ffs-test: fix header path	2011-02-28 19:27:12 -08:00
virtio	virtio: rename virtqueue_add_buf_gfp to virtqueue_add_buf	2012-01-12 15:44:42 +10:30