Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

diff --combined MAINTAINERS
index 80d2b0ab0ce02d3a1bd16f4219e616c6cf693bf3,46fa1797707a1a95743914655b3eaf239f17c34f..a0171fe2b495eb7635c8bf5498d65b82414b6255
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1611,7 -1611,7 +1611,7 @@@ ETHERNET BRIDG
  P:    Stephen Hemminger
  M:    shemminger@linux-foundation.org
  L:    bridge@lists.linux-foundation.org
- W:    http://bridge.sourceforge.net/
+ W:    http://www.linux-foundation.org/en/Net:Bridge
  S:    Maintained
  
  ETHERTEAM 16I DRIVER
@@@ -3959,7 -3959,7 +3959,7 @@@ S:      Maintaine
  
  TI OMAP MMC INTERFACE DRIVER
  P:    Carlos Aguiar, Anderson Briglia and Syed Khasim
 -M:    linux-omap-open-source@linux.omap.com (subscribers only)
 +M:    linux-omap@vger.kernel.org
  W:    http://linux.omap.com
  W:    http://www.muru.com/linux/omap/
  S:    Maintained

diff --combined Makefile
index 6490698f5fd4e5628be8b6a30a79cfcc4e782a8c,2b951205317da8eaadfe2d71aadd260e6230d775..f152ccb7a89248a85e9360c19ce800dc49812b4d
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 26
- EXTRAVERSION = -rc4
+ EXTRAVERSION = -rc5
  NAME = Funky Weasel is Jiggy wit it
  
  # *DOCUMENTATION*
@@@ -16,9 -16,6 +16,9 @@@
  # o  print "Entering directory ...";
  MAKEFLAGS += -rR --no-print-directory
  
 +# Add custom flags here to avoid conflict with updates
 +EXTRAVERSION := $(EXTRAVERSION)-omap1
 +
  # We are using a recursive build, so we need to do a little thinking
  # to get the ordering right.
  #
@@@ -174,8 -171,6 +174,8 @@@ SUBARCH := $(shell uname -m | sed -e s/
                                  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
                                  -e s/sh.*/sh/ )
  
 +SUBARCH := arm
 +
  # Cross compiling and selecting different set of gcc/bin-utils
  # ---------------------------------------------------------------------------
  #
@@@ -196,7 -191,7 +196,7 @@@
  # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
  export KBUILD_BUILDHOST := $(SUBARCH)
  ARCH          ?= $(SUBARCH)
 -CROSS_COMPILE ?=
 +CROSS_COMPILE ?= arm-linux-
  
  # Architecture as present in compile.h
  UTS_MACHINE   := $(ARCH)

diff --combined drivers/serial/8250.c
index 3ddc03694164515fc4986886c92f6b1802d4ac72,1bc00b721e9dac70693f20b85c4f72776f214eb2..a352a17bf7b94712622a8c243b237b4a08d125b9
--- 1/drivers/serial/8250.c
--- 2/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@@ -43,7 -43,6 +43,6 @@@
  
  #include <asm/io.h>
  #include <asm/irq.h>
- #include <asm/serial.h>
  
  #include "8250.h"
  
@@@ -93,6 -92,7 +92,7 @@@ static unsigned int nr_uarts = CONFIG_S
   */
  #define CONFIG_HUB6 1
  
+ #include <asm/serial.h>
  /*
   * SERIAL_PORT_DFNS tells us about built-in ports that have no
   * standard enumeration mechanism.   Platforms that can find all
@@@ -1504,11 -1504,7 +1504,11 @@@ static irqreturn_t serial8250_interrupt
  
        DEBUG_INTR("end.\n");
  
 +#ifdef CONFIG_ARCH_OMAP15XX
 +      return IRQ_HANDLED;     /* FIXME: iir status not ready on 1510 */
 +#else
        return IRQ_RETVAL(handled);
 +#endif
  }
  
  /*
@@@ -1551,8 -1547,6 +1551,6 @@@ static int serial_link_irq_chain(struc
                i->head = &up->list;
                spin_unlock_irq(&i->lock);
  
-               irq_flags |= SERIAL_EXTRA_IRQ_FLAGS;
- 
                ret = request_irq(up->port.irq, serial8250_interrupt,
                                  irq_flags, "serial", i);
                if (ret < 0)
@@@ -2230,19 -2224,6 +2228,19 @@@ serial8250_set_termios(struct uart_por
                        /* emulated UARTs (Lucent Venus 167x) need two steps */
                        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
                }
 +
 +              /* Note that we need to set ECB to access write water mark
 +               * bits. First allow FCR tx fifo write, then set fcr with
 +               * possible TX fifo settings. */
 +              if (uart_config[up->port.type].flags & UART_CAP_EFR) {
 +                      serial_outp(up, UART_LCR, 0xbf);        /* Access EFR */
 +                      serial_outp(up, UART_EFR, UART_EFR_ECB);
 +                      serial_outp(up, UART_LCR, 0x0);         /* Access FCR */
 +                      serial_outp(up, UART_FCR, fcr);
 +                      serial_outp(up, UART_LCR, 0xbf);        /* Access EFR */
 +                      serial_outp(up, UART_EFR, 0);
 +                      serial_outp(up, UART_LCR, cval);        /* Access FCR */
 +        } else
                serial_outp(up, UART_FCR, fcr);         /* set fcr */
        }
        serial8250_set_mctrl(&up->port, up->port.mctrl);
@@@ -2272,11 -2253,6 +2270,11 @@@ static int serial8250_request_std_resou
        unsigned int size = 8 << up->port.regshift;
        int ret = 0;
  
 +#ifdef CONFIG_ARCH_OMAP
 +      if (is_omap_port((unsigned int)up->port.membase))
 +              size = 0x16 << up->port.regshift;
 +#endif
 +
        switch (up->port.iotype) {
        case UPIO_AU:
                size = 0x100000;