]> git.karo-electronics.de Git - linux-beck.git/commit
projects / linux-beck.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0ddd808 a1d53da)
Merge tag 'marvell-xor-board-dt-changes-3.8-v2' of github.com:MISL-EBU-System-SW...
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tue, 20 Nov 2012 22:40:29 +0000 (23:40 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tue, 20 Nov 2012 22:40:29 +0000 (23:40 +0100)
commit895e4e3a7da0fea246e736dd815b4d04851ea387
tree5fd0137d292400d83fed427cf98c1b1d31ef2ffetree | snapshot
parent0ddd80856b7b99cab198a09ed6cc9edb794fdb3ecommit | diff
parenta1d53dab4f5b37c800d7a20c56e84a96180a8ea6commit | diff
Merge tag 'marvell-xor-board-dt-changes-3.8-v2' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge

Marvell XOR driver DT changes for 3.8

Conflicts:
arch/arm/boot/dts/armada-xp.dtsi

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
arch/arm/boot/dts/armada-xp.dtsi diff1 | diff2 | blob | history
Beck SC1x5 Kernel