| commit | 9eed28679282238210ad5e80bb91df30fec6d7db | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Tue Oct 24 22:01:33 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Tue Oct 24 22:01:33 2006 -0700 |
| tree | e94e88cb57861c7820371fc8038f87c3631ee178 | |
| parent | 2099c99e3b24f86b131566aa9854249189ae9ea2 [diff] | |
| parent | 0e64e94e477f8ed04e9295b11a5898d443c28a47 [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