Theodore Ts'o a107e5a3a4 Merge branch 'next' into upstream-merge ... Conflicts: fs/ext4/inode.c fs/ext4/mballoc.c include/trace/events/ext4.h		2010-10-27 23:44:47 -04: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	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
drm	Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next	2010-10-26 09:23:22 +10:00
keys
linux	Merge branch 'next' into upstream-merge	2010-10-27 23:44:47 -04:00
math-emu
media	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-10-25 07:59:01 -07:00
mtd
net	caif-u5500: Adding shared memory include	2010-10-27 12:29:51 -07:00
pcmcia	pcmcia: IOCARD is also required for using IRQs	2010-10-22 08:46:36 +02:00
rdma	IB/core: Add VLAN support for IBoE	2010-10-25 10:20:39 -07:00
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	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-10-25 08:32:05 -07:00
trace	Merge branch 'next' into upstream-merge	2010-10-27 23:44:47 -04:00
video	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-10-25 08:32:05 -07:00
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