Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Thu, 19 May 2011 08:51:57 +0000 (18:51 +1000)
committerJames Morris <jmorris@namei.org>
Thu, 19 May 2011 08:51:57 +0000 (18:51 +1000)
commit12a5a2621b1ee14d32beca35304d7c6076a58815
tree213e13f99de690b3c4a510f504393b63ada626bd
parente77dc3460fa59be5759e9327ad882868eee9d61b
parent61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf
Merge branch 'master' into next

Conflicts:
include/linux/capability.h

Manually resolve merge conflict w/ thanks to Stephen Rothwell.

Signed-off-by: James Morris <jmorris@namei.org>
include/linux/capability.h
kernel/capability.c
kernel/cred.c