tree 8a9da43ce605f16b1caff1f22105267913ac1aca
parent dcead42437d79c3a760b56eabf349a71cf3117c0
parent 5658d58545388850c77a070fb3b882ddd958eb88
author Olof Johansson <olof@lixom.net> 1404797388 -0700
committer Olof Johansson <olof@lixom.net> 1404797388 -0700
mergetag object 5658d58545388850c77a070fb3b882ddd958eb88
 type commit
 tag mvebu-defconfig-3.17
 tagger Jason Cooper <jason@lakedaemon.net> 1403873264 +0000
 
 mvebu defconfig changes for v3.17
 
  - mvebu (v5)
     - add LaCie 2Big and 5Big Network v2
 
  - multi (v5)
     - add LaCie 2Big and 5Big Network v2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJTrWhAAAoJEP45WPkGe8ZnJ3IP/316dhwcTy6Viv1Z0NH9dKMu
 RZdlAwHmc1969/Z1n4DerQ6jC30kCQPPfeK/+a9mU4UuBQ7yZ6j1PmadA4AWOQPE
 2j4O7XKjUIepm2wif17mhW/n5XjINetnOrTyUpwNMtQ/UE4CubO+zVyDEn+Oeqzn
 Sdza21S/8/iDxE5h4QakqKORVOCiZIt5+a1MdNifS9bOUQ0RuT0nuJCapYOsiVvB
 W46iRSJhdlLIKbfQfRYgRrZevXuvRpf+9QYLTO0TcyhBkEDNFX9iTjn40wqbvpWm
 21LTw17yfTjYQWxAE2HcdmcSJo6lN7CYWp+YnlTXZr8d8pylk9sSqQO6VK5HCZPh
 sZ+ZEft4lFSCZ4i1yRxv9epUE6JAm1thgPSgi+PuXWoAdcYmta+ASA7JZ+qlCB3F
 cKphd2BpbWLjDXSiJCjiH6J5rlozs+JD7uJSY2uLQ9K50Y1Z0wmXPK8L2PKKEKuN
 JYwT35s8Fc4JLApJuhSP4xMSY1mn7KAHN/uxN5m5fgNifVYxC/wS0Qg9vz0UTDil
 3UHv3Dc3yK6bffBjke/w6DJAgDYbr15mQuB9iuNzLv6ekuWN6izEvacvjwgpiQfl
 0QbRLkzfluaI3YOzEykWK50+PvgLsxsoTil3a9s2QEEJJ1RUwm28lVM1zgk2RZbP
 2wNn9Vu8JXDmNbTCSWRw
 =tnk8
 -----END PGP SIGNATURE-----

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>