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
..
2010-08-09 16:48:42 -04:00
2010-07-14 11:29:46 +02:00
2010-10-30 01:42:19 -04:00
2010-10-30 01:42:19 -04:00
2010-10-30 08:45:43 -04:00
2010-10-29 04:17:06 -04:00
2010-11-10 15:01:34 +01:00
2010-12-16 11:36:43 +01:00
2010-10-01 10:50:58 -07:00
2010-10-18 18:44:26 +02:00
2010-08-11 23:04:20 +09:30
2010-12-16 11:36:43 +01:00
2010-08-19 17:18:02 -07:00
2011-01-10 09:46:24 +11:00
2010-11-18 13:27:46 +01:00
2011-01-07 15:55:10 +01:00
2010-10-27 17:28:36 +01:00
2010-07-27 12:40:54 +02:00
2010-12-29 11:31:38 -08:00