James Morris 8fcc995495 Merge branch 'next' into for-linus
Conflicts:
	security/integrity/evm/evm_crypto.c

Resolved upstream fix vs. next conflict manually.

Signed-off-by: James Morris <jmorris@namei.org>
2012-01-09 12:16:48 +11:00
..
2011-12-12 17:21:40 +11:00
2011-10-12 12:15:20 +11:00
2011-07-14 17:50:03 +10:00
2011-09-15 08:14:21 +10:00
2011-07-14 17:50:03 +10:00