averello/linux-stable-mirror
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-12-31 22:57:14 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
cefcb602012482003ca2ccc44fcba628d006e4bd
linux-stable-mirror/kernel/capability.c
James Morris 12a5a2621b 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>
2011-05-19 18:51:57 +10:00

11 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink