aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/netdev.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-04-14 06:45:44 -0700
committerDavid S. Miller <davem@davemloft.net>2010-04-14 06:45:44 -0700
commitb4bf665c5761837f693e87ab27870a5868185ccc (patch)
tree5c48b5e305a0ec572fb7d4538ad0bde51171a543 /drivers/net/e1000e/netdev.c
parentMerge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadlinux-dev-b4bf665c5761837f693e87ab27870a5868185ccc.tar.xz
linux-dev-b4bf665c5761837f693e87ab27870a5868185ccc.zip
virtio_net: Fix mis-merge.
Pointed out by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
0 files changed, 0 insertions, 0 deletions