Merge branch 'v3.11-next/driver-pinctrl' into v3.11-next/s3c24xx-driver