Merge tag 'mvebu-defconfig-4.1-2' of git://git.infradead.org/linux-mvebu into next...
authorOlof Johansson <olof@lixom.net>
Fri, 3 Apr 2015 17:54:34 +0000 (10:54 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 3 Apr 2015 17:54:34 +0000 (10:54 -0700)
Merge "ARM: mvebu: defconfig changes for v4.1 (round 2)" from Gregory Clement:

mvebu defconfig changes for v4.1 (part #2)

- add perf support in mvebu_v7_defconfig

* tag 'mvebu-defconfig-4.1-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: Enable perf support in mvebu_v7_defconfig

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

Trivial merge