Arnd Bergmann 08cab72f91 Merge branch 'dt/gic' into next/dt ... Conflicts: arch/arm/include/asm/localtimer.h arch/arm/mach-msm/board-msm8x60.c arch/arm/mach-omap2/board-generic.c		2011-10-31 14:08:10 +01:00
..
acpi	Merge branch 'apei-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2011-08-03 21:53:27 -10:00
asm-generic	All Arch: remove linkage for sys_nfsservctl system call	2011-08-26 15:09:58 -07:00
crypto
drm	drm: Separate EDID Header Check from EDID Block Check	2011-08-04 14:39:35 +01:00
keys
linux	Merge branch 'dt/gic' into next/dt	2011-10-31 14:08:10 +01:00
math-emu
media	[media] V4L: initial driver for ov5642 CMOS sensor	2011-07-27 17:56:09 -03:00
mtd
net	Merge branch 'nf' of git://1984.lsi.us.es/net	2011-10-17 19:38:03 -04:00
pcmcia	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2011-07-31 06:23:08 -10:00
rdma	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
rxrpc	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
scsi	Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd	2011-08-06 22:56:03 -07:00
sound	ASoC: omap: Update e-mail address of Jarkko Nikula	2011-08-12 11:45:10 +09:00
target	target: Make standard INQUIRY return 'not connected' for tpg_virt_lun0	2011-08-22 19:25:35 +00:00
trace	writeback: show raw dirtied_when in trace writeback_single_inode	2011-08-31 08:48:15 +08:00
video	OMAP: DSS2: Remove unused opt_clock_available	2011-07-25 10:22:05 +03:00
xen	xen/balloon: memory hotplug support for Xen balloon driver	2011-07-25 20:57:08 -07:00
Kbuild