tree 98a3741b4d4b27a48b3c7ea9babe331e539416a8
parent d03a5d888fb688c832d470b749acc5ed38e0bc1d
parent 0c21e3aaf6ae85bee804a325aa29c325209180fd
author James Morris <jmorris@namei.org> 1294613184 +1100
committer James Morris <jmorris@namei.org> 1294613184 +1100

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>