diff options
author | Olof Johansson <olof@lixom.net> | 2014-07-07 22:29:48 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-07-07 22:29:48 -0700 |
commit | 73290cc9c0c269605227c4f75b2727c325ebc5fd (patch) | |
tree | 8a9da43ce605f16b1caff1f22105267913ac1aca /drivers/tty/serial/sccnxp.c | |
parent | dcead42437d79c3a760b56eabf349a71cf3117c0 (diff) | |
parent | 5658d58545388850c77a070fb3b882ddd958eb88 (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>
Diffstat (limited to 'drivers/tty/serial/sccnxp.c')
0 files changed, 0 insertions, 0 deletions