Merge branch 'net-next-2.6_20100423a/br/br_multicast_v3' of git://git.linux-ipv6...
David S. Miller [Sat, 24 Apr 2010 06:37:24 +0000 (23:37 -0700)]

Trivial merge