projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c56716a bc465aa)
Merge tag 'v4.0-rc5' into x86/asm, to resolve conflicts
authorIngo Molnar <[email protected]>
Mon, 23 Mar 2015 10:13:15 +0000 (11:13 +0100)
committerIngo Molnar <[email protected]>
Mon, 23 Mar 2015 10:13:15 +0000 (11:13 +0100)
Conflicts:
arch/x86/kernel/entry_64.S

Signed-off-by: Ingo Molnar <[email protected]>
1  2 
arch/x86/kernel/traps.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/traps.c
Simple merge
John Crispins staging tree