summaryrefslogtreecommitdiffstats
path: root/include/asm-generic/gpio.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-05-09 21:59:24 +0200
committerDavid S. Miller <davem@davemloft.net>2016-05-09 21:59:24 +0200
commite800072c18f0d7b89a80fa46dceb3d080c80e09c (patch)
tree8da6cb7944762a60ec37594720c1ad2757631c2f /include/asm-generic/gpio.h
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next (diff)
parentMerge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert... (diff)
downloadlinux-e800072c18f0d7b89a80fa46dceb3d080c80e09c.tar.xz
linux-e800072c18f0d7b89a80fa46dceb3d080c80e09c.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
In netdevice.h we removed the structure in net-next that is being changes in 'net'. In macsec.c and rtnetlink.c we have overlaps between fixes in 'net' and the u64 attribute changes in 'net-next'. The mlx5 conflicts have to do with vxlan support dependencies. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-generic/gpio.h')
0 files changed, 0 insertions, 0 deletions