summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorMark Einon2014-09-30 23:29:46 +0200
committerDavid S. Miller2014-10-03 21:22:19 +0200
commit38df6492eb511d2a6823303cb1a194c4fe423154 (patch)
tree178f95aa9898127f5dc16a9635db59dfe558a5e6 /block
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
downloadkernel-qcow2-linux-38df6492eb511d2a6823303cb1a194c4fe423154.tar.gz
kernel-qcow2-linux-38df6492eb511d2a6823303cb1a194c4fe423154.tar.xz
kernel-qcow2-linux-38df6492eb511d2a6823303cb1a194c4fe423154.zip
et131x: Add PCIe gigabit ethernet driver et131x to drivers/net
This adds the ethernet driver for Agere et131x devices to drivers/net/ethernet. The driver being added has been in the staging tree for some time, and will be removed from there in a seperate patch. This one merely disables the staging version to prevent two instances being built. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions