]> git.karo-electronics.de Git - linux-beck.git/commit
Merge branch 'next/pinctrl-exynos' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Fri, 15 Mar 2013 21:51:54 +0000 (22:51 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 15 Mar 2013 21:51:54 +0000 (22:51 +0100)
commitb7442b6c8b081f1a7433ad34697ce6f8e77f4904
tree46537e2b25ef848ba8162e30a9ecc40540229d18
parentcabaf3edf8b464558776c90c0c70252b40197c9d
parent97916777d6904e24b86eac77da58ef7cb09d539d
Merge branch 'next/pinctrl-exynos' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers

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

Here is support pinctrl-exynos5250 and that already got ack from Linus Walleij.

* 'next/pinctrl-exynos' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: skip wakeup interrupt registration for exynos5250 if pinctrl is enabled
  gpio: samsung: skip gpiolib registration if pinctrl support is enabled for exynos5250
  pinctrl: exynos: add exynos5250 SoC specific data

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
drivers/gpio/gpio-samsung.c