tree 39c4736047e7f1f6617a4703b3ebf62df1d68d34
parent 76babde121d2ffef04ca692ce64ef9f8a9866086
parent 65b4b4e81a5094d52cbe372b887b1779abe53f9b
author Linus Torvalds <torvalds@g5.osdl.org> 1143660573 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1143660573 -0800

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:
  [NETFILTER]: Rename init functions.
  [TCP]: Fix RFC2465 typo.
  [INET]: Introduce tunnel4/tunnel6
  [NET]: deinline 200+ byte inlines in sock.h
  [ECONET]: Convert away from SOCKOPS_WRAPPED
  [NET]: Fix ipx/econet/appletalk/irda ioctl crashes
  [NET]: Kill Documentation/networking/TODO
  [TG3]: Update version and reldate
  [TG3]: Skip timer code during full lock
  [TG3]: Speed up SRAM access
  [TG3]: Fix PHY loopback on 5700
  [TG3]: Fix bug in 40-bit DMA workaround code
  [TG3]: Fix probe failure due to invalid MAC address