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

Conflicts:
	security/smack/smack_lsm.c

Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au>
Ok'd by Casey Schaufler <casey@schaufler-ca.com>

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

2011-01-10 09:46:24 +11:00

..

acpi

…

asm-generic

Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

2011-01-07 17:02:58 -08:00

crypto

…

drm

…

keys

…

linux

Merge branch 'master' into next

2011-01-10 09:46:24 +11:00

math-emu

…

media

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

2011-01-06 18:32:12 -08:00

mtd

…

net

netfilter: fix the race when initializing nf_ct_expect_hash_rnd

2011-01-06 11:22:20 -08:00

pcmcia

…

rdma

…

rxrpc

…

scsi

[SCSI] libiscsi: do not take host lock in queuecommand

2010-12-31 09:52:44 -06:00

sound

…

trace

perf: Clean up power events by introducing new, more generic ones

2011-01-04 08:16:54 +01:00

video

Merge branch 'fbdev/udlfb'

2011-01-06 18:10:09 +09:00

xen

xen: Provide a variant of __RING_SIZE() that is an integer constant expression

2010-12-15 12:34:28 -08:00

Kbuild

…