From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 25 Oct 2006 05:01:33 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v3.12-rc1~32144^2~7^2~75
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9eed28679282238210ad5e80bb91df30fec6d7db;p=kernel%2Fkernel-generic.git

Merge /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
---

9eed28679282238210ad5e80bb91df30fec6d7db