| commit | 4752e2076f574445cddb146df3d183394131585c | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Tue May 12 16:53:39 2015 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Tue May 12 16:53:39 2015 +0200 |
| tree | db7d402400f963ae04295774b3a24d7ae6a7dd54 | |
| parent | dfee81513cc42d08e40b0532076ce9ced65b82bd [diff] | |
| parent | cb6a7a9e00fda1d51880ac0e93ad54a87034e822 [diff] |
Merge tag 'sti-defconfig-for-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti into next/defconfig 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