summaryrefslogtreecommitdiffstats
path: root/firmware/e100
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-03-08 18:34:12 +0100
committerDavid S. Miller <davem@davemloft.net>2016-03-08 18:34:12 +0100
commit810813c47a564416f6306ae214e2661366c987a7 (patch)
treef0d1f856d4b0024324f642fe519963248828b83f /firmware/e100
parenthv_netvsc: Move subchannel waiting to rndis_filter_device_remove() (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
downloadlinux-810813c47a564416f6306ae214e2661366c987a7.tar.xz
linux-810813c47a564416f6306ae214e2661366c987a7.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Several cases of overlapping changes, as well as one instance (vxlan) of a bug fix in 'net' overlapping with code movement in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'firmware/e100')
0 files changed, 0 insertions, 0 deletions