tree 1850743db35687b9015d775c8fd494e60dee86fc
parent 895e4e3a7da0fea246e736dd815b4d04851ea387
parent 8dc40c19efad15f5bdb77b8d1ccf902902c00c58
author Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 1353451329 +0100
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 1353451329 +0100
mergetag object 8dc40c19efad15f5bdb77b8d1ccf902902c00c58
 type commit
 tag marvell-net-xor-defconfig-for-3.8
 tagger Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 1353450279 +0100
 
 Marvell mvebu defconfig updates for 3.8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iEYEABECAAYFAlCsAycACgkQ9lPLMJjT96cQGgCgq4xI2ig/aM1TTqanQAnTbggv
 PQwAn3iZzozSCL91KAfsN84spBXk+Zes
 =b4+f
 -----END PGP SIGNATURE-----

Merge tag 'marvell-net-xor-defconfig-for-3.8' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge

Marvell mvebu defconfig updates for 3.8

Conflicts:
	arch/arm/configs/mvebu_defconfig

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>