]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2099c99 0e64e94)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 25 Oct 2006 05:01:33 +0000 (22:01 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 25 Oct 2006 05:01:33 +0000 (22:01 -0700)
commit9eed28679282238210ad5e80bb91df30fec6d7db
treee94e88cb57861c7820371fc8038f87c3631ee178tree | snapshot
parent2099c99e3b24f86b131566aa9854249189ae9ea2commit | diff
parent0e64e94e477f8ed04e9295b11a5898d443c28a47commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.