projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69e13ad fd04808)
Merge branch 'linus' into x86/signal
authorIngo Molnar <mingo@elte.hu>
Sun, 12 Oct 2008 10:49:27 +0000 (12:49 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 12 Oct 2008 10:49:27 +0000 (12:49 +0200)
Conflicts:
arch/x86/kernel/signal_64.c

1  2 
include/asm-x86/ptrace.h patch | diff1 | diff2 | blob | history

diff --cc include/asm-x86/ptrace.h
Simple merge
John Crispins staging tree