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

…

asm-generic

taskstats: use real microsecond granularity for CPU times

2010-10-27 18:03:17 -07:00

crypto

…

drm

…

keys

…

linux

Merge branch 'next' into upstream-merge

2010-10-27 23:44:47 -04: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

…