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

110 KiB

Raw Blame History

View Raw