Merge tty-next into 3.6-rc1

This handles the merge issue in:
	arch/um/drivers/line.c
	arch/um/drivers/line.h
And resolves the duplicate patches that were in both trees do to the
tty-next branch not getting merged into 3.6-rc1.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
index fcb5b0e0f260..3e5519a0acc7 100644
--- a/drivers/net/ethernet/sgi/ioc3-eth.c
+++ b/drivers/net/ethernet/sgi/ioc3-eth.c
@@ -583,7 +583,7 @@ static inline void ioc3_rx(struct net_device *dev)
         unsigned long *rxr;
         u32 w0, err;
 
-        rxr = (unsigned long *) ip->rxr;                /* Ring base */
+        rxr = ip->rxr;          /* Ring base */
         rx_entry = ip->rx_ci;                           /* RX consume index */
         n_entry = ip->rx_pi;
 
@@ -903,7 +903,7 @@ static void ioc3_alloc_rings(struct net_device *dev)
         if (ip->rxr == NULL) {
                 /* Allocate and initialize rx ring.  4kb = 512 entries  */
                 ip->rxr = (unsigned long *) get_zeroed_page(GFP_ATOMIC);
-                rxr = (unsigned long *) ip->rxr;
+                rxr = ip->rxr;
                 if (!rxr)
                         printk("ioc3_alloc_rings(): get_zeroed_page() failed!\n");