From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 1 May 2008 03:13:22 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.26-rc1~95
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ccc751841567816532874afcaeb449dbf6ca7d3a;p=linux.git

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.
---

ccc751841567816532874afcaeb449dbf6ca7d3a