diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-14 15:45:44 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-14 15:45:44 +0200 |
| commit | b4bf665c5761837f693e87ab27870a5868185ccc (patch) | |
| tree | 5c48b5e305a0ec572fb7d4538ad0bde51171a543 /drivers/net/ksz884x.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne... (diff) | |
| download | linux-b4bf665c5761837f693e87ab27870a5868185ccc.tar.xz linux-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/ksz884x.c')
0 files changed, 0 insertions, 0 deletions