Merge tag 'timer-samsung-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel...

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>