projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dcead42 5658d58)
Merge tag 'mvebu-defconfig-3.17' of git://git.infradead.org/linux-mvebu into next...
authorOlof Johansson <olof@lixom.net>
Tue, 8 Jul 2014 05:29:48 +0000 (22:29 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 8 Jul 2014 05:29:48 +0000 (22:29 -0700)
commit73290cc9c0c269605227c4f75b2727c325ebc5fd
tree8a9da43ce605f16b1caff1f22105267913ac1acatree | snapshot (tar.gz zip)
parentdcead42437d79c3a760b56eabf349a71cf3117c0commit | diff
parent5658d58545388850c77a070fb3b882ddd958eb88commit | diff
Merge tag 'mvebu-defconfig-3.17' of git://git.infradead.org/linux-mvebu into next/defconfig

Merge "mvebu defconfig changes for v3.17" from Jason Cooper:

- mvebu (v5)
  * add LaCie 2Big and 5Big Network v2

- multi (v5)
  * add LaCie 2Big and 5Big Network v2

* tag 'mvebu-defconfig-3.17' of git://git.infradead.org/linux-mvebu:
  ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2
  ARM: mvebu: Add LaCie 2Big and 5Big Network v2

Signed-off-by: Olof Johansson <olof@lixom.net>