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>

1 files changed, 5 insertions, 7 deletions

diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 0ab51037bf88..4a34833b85dd 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -1999,7 +1999,7 @@ static void ucc_geth_memclean(struct ucc_geth_private *ugeth)
 static void ucc_geth_set_multi(struct net_device *dev)
 {
         struct ucc_geth_private *ugeth;
-        struct dev_mc_list *dmi;
+        struct netdev_hw_addr *ha;
         struct ucc_fast __iomem *uf_regs;
         struct ucc_geth_82xx_address_filtering_pram __iomem *p_82xx_addr_filt;
 
@@ -2028,16 +2028,16 @@ static void ucc_geth_set_multi(struct net_device *dev)
                         out_be32(&p_82xx_addr_filt->gaddr_h, 0x0);
                         out_be32(&p_82xx_addr_filt->gaddr_l, 0x0);
 
-                        netdev_for_each_mc_addr(dmi, dev) {
+                        netdev_for_each_mc_addr(ha, dev) {
                                 /* Only support group multicast for now.
                                  */
-                                if (!(dmi->dmi_addr[0] & 1))
+                                if (!(ha->addr[0] & 1))
                                         continue;
 
                                 /* Ask CPM to run CRC and set bit in
                                  * filter mask.
                                  */
-                                hw_add_addr_in_hash(ugeth, dmi->dmi_addr);
+                                hw_add_addr_in_hash(ugeth, ha->addr);
                         }
                 }
         }
@@ -3148,8 +3148,6 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)
         /* set bd status and length */
         out_be32((u32 __iomem *)bd, bd_status);
 
-        dev->trans_start = jiffies;
-
         /* Move to next BD in the ring */
         if (!(bd_status & T_W))
                 bd += sizeof(struct qe_bd);
@@ -3883,7 +3881,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
         }
 
         if (netif_msg_probe(&debug))
-                printk(KERN_INFO "ucc_geth: UCC%1d at 0x%8x (irq = %d) \n",
+                printk(KERN_INFO "ucc_geth: UCC%1d at 0x%8x (irq = %d)\n",
                         ug_info->uf_info.ucc_num + 1, ug_info->uf_info.regs,
                         ug_info->uf_info.irq);