James Morris ece13879e7 Merge branch 'master' into next ...

Conflicts:
	security/Kconfig

Manual fix.

Signed-off-by: James Morris <jmorris@namei.org>

2009-08-20 09:18:42 +10:00

..

acpi

…

asm-generic

…

crypto

…

drm

drm/radeon/kms: implement bo busy check + current domain

2009-08-17 12:28:56 +10:00

keys

…

linux

Merge branch 'master' into next

2009-08-20 09:18:42 +10:00

math-emu

…

media

…

mtd

…

net

net: restore gnet_stats_basic to previous definition

2009-08-17 21:33:49 -07:00

pcmcia

…

rdma

…

rxrpc

…

scsi

…

sound

…

trace

perf_counter: Zero dead bytes from ftrace raw samples size alignment

2009-08-10 16:51:19 +02:00

video

…

xen

…

Kbuild

…