]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 895e4e3 8dc40c1)
Merge tag 'marvell-net-xor-defconfig-for-3.8' of github.com:MISL-EBU-System-SW/mainli...
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tue, 20 Nov 2012 22:42:09 +0000 (23:42 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tue, 20 Nov 2012 22:42:09 +0000 (23:42 +0100)
commit74f980beaa660614c707675ce6a11e70db3d49b6
tree1850743db35687b9015d775c8fd494e60dee86fctree
parent895e4e3a7da0fea246e736dd815b4d04851ea387commit | diff
parent8dc40c19efad15f5bdb77b8d1ccf902902c00c58commit | diff
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>
arch/arm/configs/mvebu_defconfig diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.