aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/if_ether.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-24 18:20:32 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-24 18:20:32 -0700
commit12145387a042e8aa4439485f8976e6992a529b12 (patch)
treeae161089e3058663510033fa85ed05115ab3b550 /include/linux/if_ether.h
parent[MIPS] Fix oprofile logic to physical counter remapping (diff)
parent[BNX2]: Fix occasional NETDEV WATCHDOG on 5709. (diff)
downloadlinux-dev-12145387a042e8aa4439485f8976e6992a529b12.tar.xz
linux-dev-12145387a042e8aa4439485f8976e6992a529b12.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [BNX2]: Fix occasional NETDEV WATCHDOG on 5709. [IPV6]: Disallow RH0 by default. [XFRM]: beet: fix pseudo header length value [TCP]: Congestion control initialization.
Diffstat (limited to 'include/linux/if_ether.h')
0 files changed, 0 insertions, 0 deletions