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-10-26 16:52:18 -07:00
2009-11-03 16:06:53 +01:00
2010-07-11 22:16:32 +02:00
2009-01-01 10:12:19 +10:30
2009-06-18 13:04:05 -07:00
2010-05-25 08:07:06 -07:00
2010-04-06 15:52:11 -07:00
2010-08-09 20:45:05 -07:00
2009-12-14 23:55:33 +01:00
2010-05-21 09:37:29 -07:00
2009-10-01 21:17:49 +02:00
2010-10-26 16:52:19 -07:00
2010-11-12 07:55:32 -08:00
2010-06-16 18:08:13 +02:00
2010-01-11 09:34:05 -08:00
2010-03-06 11:26:35 -08:00
2010-05-19 22:40:47 -04:00