Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...
authorSimon Horman <horms+renesas@verge.net.au>
Fri, 15 Mar 2013 06:16:28 +0000 (07:16 +0100)
committerSimon Horman <horms+renesas@verge.net.au>
Fri, 15 Mar 2013 06:16:28 +0000 (07:16 +0100)
commit47f4e0c1c87f34bf1fc74b8935a37d229a147946
tree29c7fe96a5dbc8870e75ecbb027e39682a5fcbab
parenta9324f6b8394ef514098ded280e7017b4204fb90
parentbf4d7be57ba9040347065f48a60f895a254f6e28
Merge branch 'fixes' of git://git./linux/kernel/git/linusw/linux-pinctrl into pinmux-base
drivers/gpio/gpiolib-of.c
drivers/pinctrl/pinconf.c
drivers/pinctrl/pinconf.h
drivers/pinctrl/pinctrl-abx500.c