Merge branch 'next-queue' into next
James Morris [Thu, 9 Feb 2012 06:02:34 +0000 (17:02 +1100)]
1  2 
fs/cifs/cifsacl.c
include/linux/key.h
security/integrity/ima/ima_policy.c

Simple merge
Simple merge
Simple merge