Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

diff --combined MAINTAINERS
index 23eb517a0e14284314b330463d0d62f31f8d2c09,6d628fb6ee014a3e5491cc92b98cef54c3e67831..0b44e4c5bc0aa2b8f61a436b7f30e4628716b333
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -266,6 -266,15 +266,15 @@@ L:      linux-acpi@vger.kernel.or
  W:      http://www.lesswatts.org/projects/acpi/
  S:      Maintained
  
+ AD1889 ALSA SOUND DRIVER
+ P:     Kyle McMartin
+ M:     kyle@parisc-linux.org
+ P:     Thibaut Varene
+ M:     T-Bone@parisc-linux.org
+ W:     http://wiki.parisc-linux.org/AD1889
+ L:     linux-parisc@vger.kernel.org
+ S:     Maintained
+ 
  ADM1025 HARDWARE MONITOR DRIVER
  P:    Jean Delvare
  M:    khali@linux-fr.org
@@@ -3831,7 -3840,7 +3840,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 c909f6f13add23fb3cf515cc2c441eba73cf3fbf,7a4d34b91e032099d119adae92a0f347dc481901..f94e22a41c3cea3f24e4f3ce1a0c10551d4d33e8
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 25
- EXTRAVERSION = -rc5
+ EXTRAVERSION = -rc6
  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
  
  ARCH          ?= $(SUBARCH)
 -CROSS_COMPILE ?=
 +CROSS_COMPILE ?= arm-linux-
  
  # Architecture as present in compile.h
  UTS_MACHINE   := $(ARCH)

diff --combined drivers/misc/Kconfig
index 84385bcd6b943e4a2a7f60397961abc57f0ac9ad,962817e49fba02e063dc164a3d0971e221eaa3a7..12bbe693dcef022f5a0d12380f7d5c64bf878698
--- 1/drivers/misc/Kconfig
--- 2/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@@ -108,6 -108,7 +108,7 @@@ config ACER_WM
        depends on ACPI
        depends on LEDS_CLASS
        depends on BACKLIGHT_CLASS_DEVICE
+       depends on SERIO_I8042
        select ACPI_WMI
        ---help---
          This is a driver for newer Acer (and Wistron) laptops. It adds
@@@ -317,17 -318,6 +318,17 @@@ config INTEL_MENLO
  
          If unsure, say N.
  
 +config OMAP_STI
 +      bool "STI/XTI support"
 +      depends on ARCH_OMAP16XX || ARCH_OMAP24XX
 +      default n
 +
 +config OMAP_STI_CONSOLE
 +      bool "STI console support"
 +      depends on OMAP_STI
 +      help
 +        This enables a console driver by way of STI/XTI.
 +
  config ENCLOSURE_SERVICES
        tristate "Enclosure Services"
        default n