]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 May 2008 03:13:22 +0000 (20:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 May 2008 03:13:22 +0000 (20:13 -0700)
commitec5c38aa09ca7b9118b20d447f2237200108d399
tree453605574bda558948616021aca346ce04dd9045
parent92fcad352432983dfd7b41a6ac83bd6417b6fdba
parentf5f4d5561de0a695b0d670aad133d82489b3e545
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  ipv6: Compilation fix for compat MCAST_MSFILTER sockopts.