James Morris 043b4d40f5 Merge branch 'master' into next ... Conflicts: security/keys/keyring.c Resolved conflict with whitespace fix in find_keyring_by_name() Signed-off-by: James Morris <jmorris@namei.org>		2010-05-06 22:21:04 +10:00
..
acpi
asm-generic
crypto
drm	Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2010-04-19 07:27:06 -07:00
keys
linux	Merge branch 'master' into next	2010-05-06 10:56:07 +10:00
math-emu
media
mtd
net	net: fix compile error due to double return type in SOCK_DEBUG	2010-05-02 13:42:39 -07:00
pcmcia	pcmcia: pcmcia_dev_present bugfix	2010-04-21 08:09:17 +02:00
rdma
rxrpc
scsi	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
sound	Merge branch 'fix/asoc' into for-linus	2010-04-07 09:54:41 +02:00
trace	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	2010-04-09 11:50:29 -07:00
video
xen	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
Kbuild