Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/bonding/bond_main.c
	net/core/net-sysfs.c
	net/ipv6/addrconf.c

drivers/net/bonding/bond_main.c

@@ -877,7 +877,7 @@ static void __bond_resend_igmp_join_requests(struct net_device *dev)
 	rcu_read_lock();
 	in_dev = __in_dev_get_rcu(dev);
 	if (in_dev)
-			ip_mc_rejoin_groups(in_dev);
+		ip_mc_rejoin_groups(in_dev);
 	rcu_read_unlock();
 }