diff options
| author |   David S. Miller <davem@davemloft.net> | 2010-04-14 05:01:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-14 05:01:33 -0700 |
| commit | dad1e54b121d93ed47690d77736af63d3f11d657 (patch) | |
| tree | 36fdd29537e43bbb4f36252e010a591ae6fe20bc /drivers/net/s2io.c | |
| parent | stmmac: updated the drv module version (diff) | |
| parent | tun: orphan an skb on tx (diff) | |
| download | linux-dev-dad1e54b121d93ed47690d77736af63d3f11d657.tar.xz linux-dev-dad1e54b121d93ed47690d77736af63d3f11d657.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/pcmcia/smc91c92_cs.c
drivers/net/virtio_net.c
Diffstat (limited to 'drivers/net/s2io.c')
0 files changed, 0 insertions, 0 deletions