git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.