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)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  ipv6: Compilation fix for compat MCAST_MSFILTER sockopts.


Trivial merge