Merge branch 'v3.11-next/driver-pinctrl' into v3.11-next/s3c24xx-driver
authorKukjin Kim <kgene.kim@samsung.com>
Tue, 11 Jun 2013 20:24:16 +0000 (05:24 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Tue, 11 Jun 2013 20:24:16 +0000 (05:24 +0900)
commit0e81a3529e2495c31b717eaba3d2644461cbc5b4
tree05f25d95367bab3635486db8ba3287d754102f1d
parent20e375329473327d385ee54c7d62f74a6784beed
parentaf99a7507469d4fa6dd4d8d633e093b1ff7aff6e
Merge branch 'v3.11-next/driver-pinctrl' into v3.11-next/s3c24xx-driver
drivers/gpio/gpio-samsung.c
drivers/pinctrl/pinctrl-samsung.c
drivers/pinctrl/pinctrl-samsung.h