summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/pinctrl-imx6q.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-25 09:16:12 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-25 09:16:12 -0700
commit889e5528cbe7dff2e91caf48f4bb23c17748b984 (patch)
treeaf66c15b48efb49926c475bbb4f33f48e1a76c40 /drivers/pinctrl/pinctrl-imx6q.c
parentff446f2001cf9b5ed97c6256c4ee3549d3b7abed (diff)
parent6b16351acbd415e66ba16bf7d473ece1574cf0bc (diff)
Merge 3.5-rc4 into usb-next
This is to get the USB fixes that were merged in the 3.5-rc4 tree into usb-next so that everyone can sync up properly. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-imx6q.c')
0 files changed, 0 insertions, 0 deletions