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, 1 insertions, 2 deletions

diff --git a/drivers/net/s6gmac.c b/drivers/net/s6gmac.c
index 45f26344b368..a7ff8ea342b4 100644
--- a/drivers/net/s6gmac.c
+++ b/drivers/net/s6gmac.c
@@ -396,7 +396,6 @@ static void s6gmac_rx_interrupt(struct net_device *dev)
                 } else {
                         skb_put(skb, (pfx >> S6_GMAC_BURST_POSTRD_LEN)
                                 & S6_GMAC_BURST_POSTRD_LEN_MASK);
-                        skb->dev = dev;
                         skb->protocol = eth_type_trans(skb, dev);
                         skb->ip_summed = CHECKSUM_UNNECESSARY;
                         netif_rx(skb);
@@ -853,8 +852,8 @@ static int s6gmac_tx(struct sk_buff *skb, struct net_device *dev)
 {
         struct s6gmac *pd = netdev_priv(dev);
         unsigned long flags;
+
         spin_lock_irqsave(&pd->lock, flags);
-        dev->trans_start = jiffies;
         writel(skb->len << S6_GMAC_BURST_PREWR_LEN |
                 0 << S6_GMAC_BURST_PREWR_CFE |
                 1 << S6_GMAC_BURST_PREWR_PPE |