Merge tag 'mvebu-defconfig-3.14' of git://git.infradead.org/linux-mvebu into next...
authorOlof Johansson <olof@lixom.net>
Wed, 4 Dec 2013 01:12:56 +0000 (17:12 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 4 Dec 2013 01:12:56 +0000 (17:12 -0800)
commitf07c71aeeedbb1a69ab6e6091af5ba27dc4301cb
treefaf815b8336c839ec41d4933d19f8d4b41527d29
parent38e67641b9f0ec421a51a258d23974a06fb7b884
parent9ec1acb88698d3b5f181fe8621d259c59b392e49
Merge tag 'mvebu-defconfig-3.14' of git://git.infradead.org/linux-mvebu into next/boards

From Jason Cooper:
mvebu defconfig changes for v3.14

 - mvebu: add GPIO LEDs
 - kirkwood: enable HIGHMEM

* tag 'mvebu-defconfig-3.14' of git://git.infradead.org/linux-mvebu:
  ARM: kirkwood: enable HIGHMEM in defconfig
  ARM: mvebu: config: Add GPIO connected LEDs support to defconfig

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