Marvell mvebu defconfig updates for 3.8

Browse source

-----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>

...

This commit is contained in:

Thomas Petazzoni 2012-11-20 23:42:09 +01:00

parent 895e4e3a7d 8dc40c19ef

commit 74f980beaa

1 changed files with 7 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

7

arch/arm/configs/mvebu_defconfig

View file