Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

4 files changed, 9 insertions, 11 deletions

diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index cae2d16858d..309a0eaddd8 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -674,8 +674,6 @@ static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                 skb->data, skb->len, DMA_TO_DEVICE));
         CBDW_DATLEN(bdp, skb->len);
 
-        dev->trans_start = jiffies;
-
         /*
          * If this was the last BD in the ring, start at the beginning again.
          */
diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c
index 9d4f272137d..5d45084b287 100644
--- a/drivers/net/fs_enet/mac-fcc.c
+++ b/drivers/net/fs_enet/mac-fcc.c
@@ -231,12 +231,12 @@ static void set_multicast_finish(struct net_device *dev)
 
 static void set_multicast_list(struct net_device *dev)
 {
-        struct dev_mc_list *pmc;
+        struct netdev_hw_addr *ha;
 
         if ((dev->flags & IFF_PROMISC) == 0) {
                 set_multicast_start(dev);
-                netdev_for_each_mc_addr(pmc, dev)
-                        set_multicast_one(dev, pmc->dmi_addr);
+                netdev_for_each_mc_addr(ha, dev)
+                        set_multicast_one(dev, ha->addr);
                 set_multicast_finish(dev);
         } else
                 set_promiscuous_mode(dev);
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c
index bd7a6e7064b..7ca1642276d 100644
--- a/drivers/net/fs_enet/mac-fec.c
+++ b/drivers/net/fs_enet/mac-fec.c
@@ -232,12 +232,12 @@ static void set_multicast_finish(struct net_device *dev)
 
 static void set_multicast_list(struct net_device *dev)
 {
-        struct dev_mc_list *pmc;
+        struct netdev_hw_addr *ha;
 
         if ((dev->flags & IFF_PROMISC) == 0) {
                 set_multicast_start(dev);
-                netdev_for_each_mc_addr(pmc, dev)
-                        set_multicast_one(dev, pmc->dmi_addr);
+                netdev_for_each_mc_addr(ha, dev)
+                        set_multicast_one(dev, ha->addr);
                 set_multicast_finish(dev);
         } else
                 set_promiscuous_mode(dev);
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index 49a4d8c6016..a3c44544846 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -223,12 +223,12 @@ static void set_multicast_finish(struct net_device *dev)
 
 static void set_multicast_list(struct net_device *dev)
 {
-        struct dev_mc_list *pmc;
+        struct netdev_hw_addr *ha;
 
         if ((dev->flags & IFF_PROMISC) == 0) {
                 set_multicast_start(dev);
-                netdev_for_each_mc_addr(pmc, dev)
-                        set_multicast_one(dev, pmc->dmi_addr);
+                netdev_for_each_mc_addr(ha, dev)
+                        set_multicast_one(dev, ha->addr);
                 set_multicast_finish(dev);
         } else
                 set_promiscuous_mode(dev);