diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-21 12:32:26 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-21 12:32:26 +0400 |
| commit | e5e9743bb7429f53c83ad69b432f7b661e74c3f0 (patch) | |
| tree | db3691aef0d46c4aed4a2be6dc8ab7c44c3488cb /net/8021q/vlan_netlink.c | |
| parent | a0f82f64e26929776c58a5c93c2ecb38e3d82815 (diff) | |
| parent | 775d8d931581764a1ec982ebe5a927b12762fb6d (diff) | |
| download | linux-e5e9743bb7429f53c83ad69b432f7b661e74c3f0.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/core/dev.c
Diffstat (limited to 'net/8021q/vlan_netlink.c')
0 files changed, 0 insertions, 0 deletions