Merge tag 'sti-defconfig-for-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Tue, 12 May 2015 14:53:39 +0000 (16:53 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 12 May 2015 14:53:39 +0000 (16:53 +0200)
Merge "STi defconfig for v4.2, round 1" from Maxime Coquelin:

Highlights:
-----------
 - Enable ST's LPC Watchdog driver
 - Enable ST's LPC RTC driver

* tag 'sti-defconfig-for-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti:
  ARM: multi_v7_defconfig: Enable support for ST's LPC RTC
  ARM: multi_v7_defconfig: Enable support for ST's LPC Watchdog

1  2 
arch/arm/configs/multi_v7_defconfig

Simple merge