projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d79a886 384703b)
Merge commit 'v3.2-rc6' into x86/platform
authorIngo Molnar <[email protected]>
Sun, 18 Dec 2011 09:35:16 +0000 (10:35 +0100)
committerIngo Molnar <[email protected]>
Sun, 18 Dec 2011 09:35:16 +0000 (10:35 +0100)
1  2 
arch/x86/Kconfig patch | diff1 | diff2 | blob | history
arch/x86/platform/mrst/mrst.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/Kconfig
Simple merge
diff --cc arch/x86/platform/mrst/mrst.c
Simple merge
John Crispins staging tree