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)
commitccc751841567816532874afcaeb449dbf6ca7d3a
tree453605574bda558948616021aca346ce04dd9045
parent214b7049a7929f03bbd2786aaef04b8b79db34e2
parent809917903127804c2b2ac76342ab0f29f4b394d3
Merge git://git./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.