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>

3 files changed, 5 insertions, 5 deletions

diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index bb14c3477680..bb738c9f9146 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -955,7 +955,7 @@ out:
  * The main difference with a "standard" connect is that with IrDA we need
  * to resolve the service name into a TSAP selector (in TCP, port number
  * doesn't have to be resolved).
- * Because of this service name resoltion, we can offer "auto-connect",
+ * Because of this service name resolution, we can offer "auto-connect",
  * where we connect to a service without specifying a destination address.
  *
  * Note : by consulting "errno", the user space caller may learn the cause
diff --git a/net/irda/irlan/irlan_provider.c b/net/irda/irlan/irlan_provider.c
index 32dcaac70b0c..4664855222f4 100644
--- a/net/irda/irlan/irlan_provider.c
+++ b/net/irda/irlan/irlan_provider.c
@@ -296,7 +296,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command,
         skb = alloc_skb(IRLAN_MAX_HEADER + IRLAN_CMD_HEADER +
                         /* Bigger param length comes from CMD_GET_MEDIA_CHAR */
                         IRLAN_STRING_PARAMETER_LEN("FILTER_TYPE", "DIRECTED") +
-                        IRLAN_STRING_PARAMETER_LEN("FILTER_TYPE", "BORADCAST") +
+                        IRLAN_STRING_PARAMETER_LEN("FILTER_TYPE", "BROADCAST") +
                         IRLAN_STRING_PARAMETER_LEN("FILTER_TYPE", "MULTICAST") +
                         IRLAN_STRING_PARAMETER_LEN("ACCESS_TYPE", "HOSTED"),
                         GFP_ATOMIC);
diff --git a/net/irda/irqueue.c b/net/irda/irqueue.c
index f06947c4fa82..7152624ed5f1 100644
--- a/net/irda/irqueue.c
+++ b/net/irda/irqueue.c
@@ -523,7 +523,7 @@ void *hashbin_remove_first( hashbin_t *hashbin)
                  * Dequeue the entry...
                  */
                 dequeue_general( (irda_queue_t**) &hashbin->hb_queue[ bin ],
-                                 (irda_queue_t*) entry );
+                                 entry);
                 hashbin->hb_size--;
                 entry->q_next = NULL;
                 entry->q_prev = NULL;
@@ -615,7 +615,7 @@ void* hashbin_remove( hashbin_t* hashbin, long hashv, const char* name)
          */
         if ( found ) {
                 dequeue_general( (irda_queue_t**) &hashbin->hb_queue[ bin ],
-                                 (irda_queue_t*) entry );
+                                 entry);
                 hashbin->hb_size--;
 
                 /*
@@ -685,7 +685,7 @@ void* hashbin_remove_this( hashbin_t* hashbin, irda_queue_t* entry)
          * Dequeue the entry...
          */
         dequeue_general( (irda_queue_t**) &hashbin->hb_queue[ bin ],
-                         (irda_queue_t*) entry );
+                         entry);
         hashbin->hb_size--;
         entry->q_next = NULL;
         entry->q_prev = NULL;