Merge tag 'defconfig-3.12' of git://git.infradead.org/linux-mvebu into next/boards

From Jason Cooper, mvebu defconfig changes for v3.12:

 - kirkwood: add i2c devices, ext4, r8169
 - mvebu: gpio-keys, input event
 - dove: SI5351, PCI, xHCI

* tag 'defconfig-3.12' of git://git.infradead.org/linux-mvebu:
  ARM: dove: update dove_defconfig with SI5351, PCI, and xHCI
  ARM: mvebu: add gpio-keys and input event support in defconfig
  ARM: Kirkwood: update defconfig for used i2c devices, EXT4 FS, r8169

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

diff --cc arch/arm/configs/kirkwood_defconfig
index e3f667a2e10e119d08ee4387b60fac6efa9dd127,4f2bf736335e2eff279c98e0961d68ceb4c82bb3..0ae0eaebf6b22ea7c71ed5746ee448029346af9f
--- 1/arch/arm/configs/kirkwood_defconfig
--- 2/arch/arm/configs/kirkwood_defconfig
+++ b/arch/arm/configs/kirkwood_defconfig
@@@ -69,8 -101,10 +70,9 @@@ CONFIG_ATA=
  CONFIG_SATA_AHCI=y
  CONFIG_SATA_MV=y
  CONFIG_NETDEVICES=y
 -CONFIG_MII=y
  CONFIG_NET_DSA_MV88E6123_61_65=y
  CONFIG_MV643XX_ETH=y
+ CONFIG_R8169=y
  CONFIG_MARVELL_PHY=y
  CONFIG_LIBERTAS=y
  CONFIG_LIBERTAS_SDIO=y
@@@ -91,8 -125,12 +93,11 @@@ CONFIG_I2C_MV64XXX=
  CONFIG_SPI=y
  CONFIG_SPI_ORION=y
  CONFIG_GPIO_SYSFS=y
- # CONFIG_HWMON is not set
+ CONFIG_SENSORS_ADT7475=y
+ CONFIG_SENSORS_LM63=y
+ CONFIG_SENSORS_LM75=y
+ CONFIG_SENSORS_LM85=y
  CONFIG_THERMAL=y
 -CONFIG_KIRKWOOD_THERMAL=y
  CONFIG_WATCHDOG=y
  CONFIG_ORION_WATCHDOG=y
  CONFIG_HID_DRAGONRISE=y