Merge tag 'mvebu-defconfig-4.5-1' of git://git.infradead.org/linux-mvebu into next...
authorArnd Bergmann <arnd@arndb.de>
Tue, 15 Dec 2015 16:42:32 +0000 (17:42 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 15 Dec 2015 16:42:32 +0000 (17:42 +0100)
commit0ae102c64c3b17370d6660d18d5ec1fee8ffd96c
tree006212e83f03021da59eaf2ab0ba408e6e9252f7
parent5502acf4aa643945c61c2a3937a5aade48479af4
parenta0638365f6850855728a5ef5caf2aeab82a58035
Merge tag 'mvebu-defconfig-4.5-1' of git://git.infradead.org/linux-mvebu into next/defconfig

Merge "mvebu defconfig for 4.5 (part 1)" from Gregory CLEMENT:

update of mvebu_v5 defconfig with the addition of cpuidle

* tag 'mvebu-defconfig-4.5-1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: add Kirkwood cpuidle to defconfig
  ARM: mvebu: update v5 defconfig