]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commitdiff
projects / can-eth-gw-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9adaef9 494bfec)
Merge remote-tracking branch 'mturquette/clk-3.7' into mxs/dt-for-3.7-2
authorShawn Guo <shawn.guo@linaro.org>
Mon, 17 Sep 2012 06:26:40 +0000 (14:26 +0800)
committerShawn Guo <shawn.guo@linaro.org>
Mon, 17 Sep 2012 06:26:40 +0000 (14:26 +0800)
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/mach-ux500/Kconfig patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mach-ux500/Kconfig
Simple merge