projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b08dc3e 6c30c53)
Merge branch 'master' into next
authorJames Morris <[email protected]>
Wed, 19 Aug 2009 23:18:42 +0000 (09:18 +1000)
committerJames Morris <[email protected]>
Wed, 19 Aug 2009 23:18:42 +0000 (09:18 +1000)
Conflicts:
security/Kconfig

Manual fix.

Signed-off-by: James Morris <[email protected]>
1  2 
include/linux/sched.h patch | diff1 | diff2 | blob | history
security/selinux/hooks.c patch | diff1 | diff2 | blob | history

diff --cc include/linux/sched.h
Simple merge
diff --cc security/selinux/hooks.c
Simple merge
John Crispins staging tree