diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-19 09:21:33 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-19 09:21:33 +0200 |
| commit | e1943424e43974f85b82bb31eaf832823bf49ce7 (patch) | |
| tree | 00a2dda7454ba186c0be4bfb8d08b7f74c3cd98c /drivers/net/xen-netback | |
| parent | net: qlge: convert to hw_features (diff) | |
| parent | ip6_pol_route panic: Do not allow VLAN on loopback (diff) | |
| download | linux-e1943424e43974f85b82bb31eaf832823bf49ce7.tar.xz linux-e1943424e43974f85b82bb31eaf832823bf49ce7.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x_ethtool.c
Diffstat (limited to 'drivers/net/xen-netback')
0 files changed, 0 insertions, 0 deletions