rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commit

]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commit

author	Olof Johansson <olof@lixom.net>
	Wed, 21 Nov 2012 06:21:32 +0000 (22:21 -0800)
committer	Olof Johansson <olof@lixom.net>
	Wed, 21 Nov 2012 06:21:32 +0000 (22:21 -0800)
commit	a93d620159524088d9633f60a8f746e3dd2e791e
tree	09da5c10d18adc2b27ee88dcf5673e92d49b4043	tree \| snapshot
parent	2cad6a8a4c31175578943f087e1dbef9f52e6ec3	commit \| diff
parent	2a5528912d15a4db760c5eb7fa3e1efdd5c87371	commit \| diff

Merge branch 'clps711x/soc' into clps711x/soc2

Conflicts:
arch/arm/Kconfig

Signed-off-by: Olof Johansson <olof@lixom.net>