tree 213e13f99de690b3c4a510f504393b63ada626bd
parent e77dc3460fa59be5759e9327ad882868eee9d61b
parent 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf
author James Morris <jmorris@namei.org> 1305795117 +1000
committer James Morris <jmorris@namei.org> 1305795117 +1000

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>