aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-21 09:03:14 +09:00
Code Issues Packages Projects Releases Wiki Activity
Files
75df713627f28f88b901b329c8857747545fd4ab
lkl_linux/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