tree e94e88cb57861c7820371fc8038f87c3631ee178
parent 2099c99e3b24f86b131566aa9854249189ae9ea2
parent 0e64e94e477f8ed04e9295b11a5898d443c28a47
author Linus Torvalds <torvalds@g5.osdl.org> 1161752493 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1161752493 -0700

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:
  [DCCP]: Update documentation references.
  [ATM] horizon: read_bia() needs to be __devinit
  [NETFILTER]: Fix ip6_tables extension header bypass bug
  [NETFILTER]: Fix ip6_tables protocol bypass bug
  [XFRM]: Fix xfrm_state accounting
  [IPV4] ipconfig: fix RARP ic_servaddr breakage