]> 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: 2cad6a8 2a55289)
Merge branch 'clps711x/soc' into clps711x/soc2
authorOlof Johansson <olof@lixom.net>
Wed, 21 Nov 2012 06:21:32 +0000 (22:21 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 21 Nov 2012 06:21:32 +0000 (22:21 -0800)
Conflicts:
arch/arm/Kconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge