Merge branch 'origin' into devel-stable

Conflicts:
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-mx2/devices.h
	sound/soc/pxa/pxa-ssp.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c
index 0c768593aad0..a849f6f23a17 100644
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
@@ -568,7 +568,7 @@ void gelic_net_set_multi(struct net_device *netdev)
                         status);
 
         if ((netdev->flags & IFF_ALLMULTI) ||
-            (netdev->mc_count > GELIC_NET_MC_COUNT_MAX)) {
+            (netdev_mc_count(netdev) > GELIC_NET_MC_COUNT_MAX)) {
                 status = lv1_net_add_multicast_address(bus_id(card),
                                                        dev_id(card),
                                                        0, 1);
@@ -580,7 +580,7 @@ void gelic_net_set_multi(struct net_device *netdev)
         }
 
         /* set multicast addresses */
-        for (mc = netdev->mc_list; mc; mc = mc->next) {
+        netdev_for_each_mc_addr(mc, netdev) {
                 addr = 0;
                 p = mc->dmi_addr;
                 for (i = 0; i < ETH_ALEN; i++) {