]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'at91-clocksource-driver2' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Mon, 13 Apr 2015 23:52:47 +0000 (01:52 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 13 Apr 2015 23:52:47 +0000 (01:52 +0200)
Pull "A fix for the ST clocksource driver Kconfig option" from Nicolas Ferre

* tag 'at91-clocksource-driver2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  clocksource: atmel-st: select MFD_SYSCON


Trivial merge