projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: be940d6 7638d53)
Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Mon, 13 Jul 2009 14:30:40 +0000 (00:30 +1000)
committerJames Morris <jmorris@namei.org>
Mon, 13 Jul 2009 14:30:40 +0000 (00:30 +1000)
Conflicts:
include/linux/personality.h

Use Linus' version.

Signed-off-by: James Morris <jmorris@namei.org>
1  2 
kernel/ptrace.c patch | diff1 | diff2 | blob | history

diff --cc kernel/ptrace.c
Simple merge
John Crispins staging tree