tree 5fd0137d292400d83fed427cf98c1b1d31ef2ffe
parent 0ddd80856b7b99cab198a09ed6cc9edb794fdb3e
parent a1d53dab4f5b37c800d7a20c56e84a96180a8ea6
author Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 1353451229 +0100
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 1353451229 +0100
mergetag object a1d53dab4f5b37c800d7a20c56e84a96180a8ea6
 type commit
 tag marvell-xor-board-dt-changes-3.8-v2
 tagger Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 1353450000 +0100
 
 Marvell XOR driver DT changes for 3.8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iEYEABECAAYFAlCsAhAACgkQ9lPLMJjT96dSzQCgoJwqNxCWQPYFgi1XgxYDYaOM
 A10An1l0h8WMAgy/eDBlyWOjA8FD8Ekx
 =xq4r
 -----END PGP SIGNATURE-----

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>