]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 9 Jun 2007 01:15:49 +0000 (18:15 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 9 Jun 2007 01:15:49 +0000 (18:15 -0700)
commit2ec6f2bf3921fabd41c5df2422910d1089406101
tree3cfe28d60a3e7fdae5c0b4e5a52792f3cc79a4bc
parent7c1352d721ce34ac00f3b0e9ea2e96cedf7d9fef
parenta67e71d34f67063eaf04962d7347e3d7b7d4d6cf
Merge branch 'master' of master.kernel.org:/pub/scm/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