Merge tag 'mvebu-defconfig-3.15-2' of git://git.infradead.org/linux-mvebu into next...
authorArnd Bergmann <arnd@arndb.de>
Mon, 17 Mar 2014 10:23:35 +0000 (11:23 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 17 Mar 2014 10:23:35 +0000 (11:23 +0100)
commit3a516b6afbf90f4a577f9fea36eaf826b5101cb8
tree43a88debea1e79175498ec11fd2bfbd850b03d2b
parentaf8cdfd332df41669c28f979d16d521a15541bcc
parent7c8f827f57ad1a7f52e1679ded1b99d8a0c881ad
Merge tag 'mvebu-defconfig-3.15-2' of git://git.infradead.org/linux-mvebu into next/boards

Merge "mvebu defconfig changes for v3.15 (incremental pull #2)" from Jason Cooper

 - add multi_v5_defconfig
 - add mvebu_v5_defconfig
 - kirkwood: add HP T5325 devices

* tag 'mvebu-defconfig-3.15-2' of git://git.infradead.org/linux-mvebu:
  ARM: kirkwood: Add HP T5325 devices to {multi|mvebu}_v5_defconfig
  ARM: config: Add mvebu_v5_defconfig
  ARM: config: Add a multi_v5_defconfig

Signed-off-by: Arnd Bergmann <arnd@arndb.de>