Len Brown 95ee46aa86 Merge branch 'linus' into release ... Conflicts: drivers/acpi/debug.c Signed-off-by: Len Brown <len.brown@intel.com>		2010-08-15 01:06:31 -04:00
..
acpi	Merge branch 'linus' into release	2010-08-15 01:06:31 -04:00
asm-generic	dma-mapping: remove dma_is_consistent API	2010-08-11 08:59:21 -07:00
crypto
drm	Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2010-08-12 09:21:39 -07:00
keys
linux	Merge branch 'linus' into release	2010-08-15 01:06:31 -04:00
math-emu
media	V4L/DVB: cx2341x: convert to the control framework	2010-08-08 23:43:05 -03:00
mtd	mtd: Update copyright notices	2010-08-08 20:58:20 +01:00
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2010-08-10 15:59:38 -07:00
pcmcia
rdma
rxrpc
scsi	scsi: use __uX types for headers exported to user space	2010-08-11 08:59:01 -07:00
sound
trace	Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block	2010-08-10 15:22:42 -07:00
video
xen	Merge branch 'stable/xen-swiotlb-0.8.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2010-08-12 09:09:41 -07:00
Kbuild