Merge branch 'next-queue' into next
authorJames Morris <jmorris@namei.org>
Thu, 9 Feb 2012 06:02:34 +0000 (17:02 +1100)
committerJames Morris <jmorris@namei.org>
Thu, 9 Feb 2012 06:02:34 +0000 (17:02 +1100)
commit9e3ff38647a316e4f92d59b14c8f0eb13b33bb2c
tree2750d9fc94b8fb78d9982ea4a62d586e7f0a7862
parent2eb6038c51034bf7f9335b15ce9238a028fdd2d6
parent4c2c392763a682354fac65b6a569adec4e4b5387
Merge branch 'next-queue' into next
fs/cifs/cifsacl.c
include/linux/key.h
security/integrity/ima/ima_policy.c