Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit81d84a94be8085475c3585596e52b06ccbedd922
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 9 Jun 2007 01:15:49 +0000 (8 18:15 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 9 Jun 2007 01:15:49 +0000 (8 18:15 -0700)
tree3cfe28d60a3e7fdae5c0b4e5a52792f3cc79a4bc
parent7ac7834765e1c888ab06f677d906179858627f26
parent50e5d35ce2c4190cead13a091ea1ceab47d29cc2
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [CIPSO]: Fix several unaligned kernel accesses in the CIPSO engine.
  [NetLabel]: consolidate the struct socket/sock handling to just struct sock
  [IPV4]: Do not remove idev when addresses are cleared