summaryrefslogtreecommitdiffstats
path: root/net/rxrpc/af_rxrpc.c
diff options
context:
space:
mode:
authorDavid S. Miller2017-06-07 04:20:08 +0200
committerDavid S. Miller2017-06-07 04:20:08 +0200
commit216fe8f021e33c36e3b27c49c9f1951f6b037d7f (patch)
treea43daec41b4d3955e7a4f8d0ed0654a7c80527ec /net/rxrpc/af_rxrpc.c
parentMerge branch 'phylib-support-for-MV88X3310-10G-phy' (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
downloadkernel-qcow2-linux-216fe8f021e33c36e3b27c49c9f1951f6b037d7f.tar.gz
kernel-qcow2-linux-216fe8f021e33c36e3b27c49c9f1951f6b037d7f.tar.xz
kernel-qcow2-linux-216fe8f021e33c36e3b27c49c9f1951f6b037d7f.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Just some simple overlapping changes in marvell PHY driver and the DSA core code. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rxrpc/af_rxrpc.c')
0 files changed, 0 insertions, 0 deletions