summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/freescale/pinctrl-imx23.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-09-27 01:08:27 +0200
committerDavid S. Miller <davem@davemloft.net>2015-09-27 01:08:27 +0200
commit4963ed48f2c20196d51a447ee87dc2815584fee4 (patch)
treea1902f466dafa00453889a4f1e66b00249ce0529 /drivers/pinctrl/freescale/pinctrl-imx23.c
parentMerge branch 'listener-sock-const' (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
downloadlinux-4963ed48f2c20196d51a447ee87dc2815584fee4.tar.xz
linux-4963ed48f2c20196d51a447ee87dc2815584fee4.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: net/ipv4/arp.c The net/ipv4/arp.c conflict was one commit adding a new local variable while another commit was deleting one. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/pinctrl/freescale/pinctrl-imx23.c')
0 files changed, 0 insertions, 0 deletions