Greg Kroah-Hartman e4c5bf8e3d Merge 'staging-next' to Linus's tree ... This merges the staging-next tree to Linus's tree and resolves some conflicts that were present due to changes in other trees that were affected by files here. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2010-10-28 09:44:56 -07:00
..
acpi	Merge branch 'misc' into release	2010-10-26 14:51:00 -04:00
asm-generic	taskstats: use real microsecond granularity for CPU times	2010-10-27 18:03:17 -07:00
crypto
drm
keys
linux	Merge 'staging-next' to Linus's tree	2010-10-28 09:44:56 -07:00
math-emu
media
mtd
net	caif-u5500: Adding shared memory include	2010-10-27 12:29:51 -07:00
pcmcia
rdma
rxrpc
scsi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2010-10-26 17:54:22 -07:00
sound
trace	Merge branch 'next' into upstream-merge	2010-10-27 23:44:47 -04:00
video
xen	Merge branches 'upstream/xenfs' and 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen	2010-10-26 18:20:19 -07:00
Kbuild