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, 0 insertions, 3 deletions

diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 4c38491b8efb..2ccb9f12805b 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -902,7 +902,6 @@ get_dma_channel(struct net_device *dev)
                         return;
                 }
         }
-        return;
 }
 
 static void
@@ -1554,7 +1553,6 @@ static netdev_tx_t net_send_packet(struct sk_buff *skb,struct net_device *dev)
         writewords(dev->base_addr, TX_FRAME_PORT,skb->data,(skb->len+1) >>1);
         spin_unlock_irqrestore(&lp->lock, flags);
         lp->stats.tx_bytes += skb->len;
-        dev->trans_start = jiffies;
         dev_kfree_skb (skb);
 
         /*
@@ -1673,7 +1671,6 @@ count_rx_errors(int status, struct net_local *lp)
                 /* per str 172 */
                 lp->stats.rx_crc_errors++;
         if (status & RX_DRIBBLE) lp->stats.rx_frame_errors++;
-        return;
 }
 
 /* We have a good packet(s), get it/them out of the buffers. */