diff options
author | David S. Miller <davem@davemloft.net> | 2011-04-12 00:44:25 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-12 00:44:25 +0400 |
commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /include/net/protocol.h | |
parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
download | linux-1c01a80cfec6f806246f31ff2680cd3639b30e67.tar.xz |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'include/net/protocol.h')
0 files changed, 0 insertions, 0 deletions