Russell King 4ec3eb1363 Merge branch 'smp' into misc ... Conflicts: arch/arm/kernel/entry-armv.S arch/arm/mm/ioremap.c		2011-01-06 22:32:03 +00:00
..
acpi	Merge branch 'misc' into release	2010-10-26 14:51:00 -04:00
asm-generic	asm-generic/stat.h: support 64-bit file time_t for stat()	2010-11-01 15:31:29 -04:00
crypto
drm	drm/nouveau: Expose some BO usage flags to userspace.	2010-11-18 14:38:29 +10:00
keys
linux	Merge branch 'smp' into misc	2011-01-06 22:32:03 +00:00
math-emu
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2010-10-28 09:35:11 -07:00
mtd
net	af_unix: limit recursion level	2010-11-29 09:45:15 -08:00
pcmcia
rdma
rxrpc
scsi	SCSI host lock push-down	2010-11-16 13:33:23 -08:00
sound	ARM: mach-shmobile: ap4evb: FSI clock use proper process for HDMI	2010-11-24 15:29:56 +09:00
trace	ext4: Add new ext4 inode tracepoints	2010-11-08 13:51:33 -05:00
video	fbdev: da8xx: punt duplicated FBIO_WAITFORVSYNC define	2010-11-16 10:14:22 +09:00
xen	Merge branches 'upstream/core', 'upstream/xenfs' and 'upstream/evtchn' into upstream/for-linus	2010-11-22 12:22:42 -08:00
Kbuild