commit | 26b2da5ae5041e4a6d11a3d9cb1d1097c447d90d | [log] [tgz] |
---|---|---|
author | Arnd Bergmann <arnd@arndb.de> | Tue Apr 09 22:47:38 2013 +0200 |
committer | Arnd Bergmann <arnd@arndb.de> | Tue Apr 09 22:47:38 2013 +0200 |
tree | c61db4d43d0ecd4866e079cff4fdffe6e9758345 | |
parent | 0b8467ee39721340450482e87471ca4c0d6170f3 [diff] | |
parent | 536504309c3c2da5a755263c7179ffe1b2e5b3dd [diff] |
Merge tag 'timer-samsung-for-v3.10' of git://git.kernel.org/pub/scm/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>