Merge tag 'timer-samsung-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 20:47:38 +0000 (22:47 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 20:47:38 +0000 (22:47 +0200)
commit26b2da5ae5041e4a6d11a3d9cb1d1097c447d90d
treec61db4d43d0ecd4866e079cff4fdffe6e9758345
parent0b8467ee39721340450482e87471ca4c0d6170f3
parent536504309c3c2da5a755263c7179ffe1b2e5b3dd
Merge tag 'timer-samsung-for-v3.10' of git://git./linux/kernel/git/kgene/linux-samsung into next/drivers

From Kukjin Kim <kgene.kim@samsung.com>:

including fix for GENERIC_GPIO based on previous pull-request for timer-samsung

* tag 'timer-samsung-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: SAMSUNG: change GENERIC_GPIO to ARCH_REQUIRE_GPIOLIB

Signed-off-by: Arnd Bergmann <arnd@anrdb.de>
arch/arm/Kconfig