| commit | ccc751841567816532874afcaeb449dbf6ca7d3a | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 1 May 2008 03:13:22 +0000 (30 20:13 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 1 May 2008 03:13:22 +0000 (30 20:13 -0700) | ||
| tree | 453605574bda558948616021aca346ce04dd9045 | treesnapshot (tar.gz zip) |
| parent | 214b7049a7929f03bbd2786aaef04b8b79db34e2 | commitdiff |
| parent | 809917903127804c2b2ac76342ab0f29f4b394d3 | commitdiff |
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.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
ipv6: Compilation fix for compat MCAST_MSFILTER sockopts.