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)
1  2 
drivers/gpio/gpio-samsung.c
drivers/pinctrl/pinctrl-samsung.c
drivers/pinctrl/pinctrl-samsung.h

Simple merge
Simple merge
Simple merge