| commit | d2e7ad19229f982fc1eb731827d82ceac90abfb3 | |
| author | James Morris <jmorris@namei.org> | |
| Sun, 9 Jan 2011 22:46:24 +0000 (10 09:46 +1100) | ||
| committer | James Morris <jmorris@namei.org> | |
| Sun, 9 Jan 2011 22:46:24 +0000 (10 09:46 +1100) | ||
| tree | 98a3741b4d4b27a48b3c7ea9babe331e539416a8 | treesnapshot (tar.gz zip) |
| parent | d03a5d888fb688c832d470b749acc5ed38e0bc1d | commitdiff |
| parent | 0c21e3aaf6ae85bee804a325aa29c325209180fd | commitdiff |
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>
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>