projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f015941 f7c66dc)
Merge branch 'next/soc' into next/dt
authorOlof Johansson <olof@lixom.net>
Tue, 5 Feb 2013 21:19:03 +0000 (13:19 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 5 Feb 2013 21:19:03 +0000 (13:19 -0800)
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/boot/dts/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/boot/dts/Makefile
Simple merge
John Crispins staging tree