projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e259e0 6630125)
Merge branch 'perf/core' into perf/urgent
authorIngo Molnar <mingo@elte.hu>
Thu, 4 Mar 2010 10:47:50 +0000 (11:47 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 4 Mar 2010 10:47:52 +0000 (11:47 +0100)
Merge reason: Switch from pre-merge topical split to the post-merge urgent track

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
arch/x86/kernel/hw_breakpoint.c patch | diff1 | diff2 | blob | history
kernel/hw_breakpoint.c patch | diff1 | diff2 | blob | history

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