John W. Linville c96e96354a Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem ... Conflicts: net/bluetooth/Makefile		2011-01-05 16:06:25 -05:00
..
acpi	ACPI: video: fix build for CONFIG_ACPI=n	2010-12-11 02:01:46 -05:00
asm-generic
crypto
drm	drm/i915: announce to userspace that the bsd ring is coherent	2010-12-05 10:40:39 +00:00
keys
linux	net: typos in comments in include/linux/igmp.h	2011-01-04 11:29:52 -08:00
math-emu
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2010-12-20 10:35:04 -08:00
mtd
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2011-01-05 16:06:25 -05: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
video	fbdev: da8xx: punt duplicated FBIO_WAITFORVSYNC define	2010-11-16 10:14:22 +09:00
xen	xen: Provide a variant of __RING_SIZE() that is an integer constant expression	2010-12-15 12:34:28 -08:00
Kbuild