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
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index e588b2e..0273ad0 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -877,7 +877,7 @@
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();
}