Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

diff --combined Makefile
index 634fce8780315c97f3f2909049af3588d5e6ecb7,29abe62ccbad27d9ebb7ac45460cc2ef42e54c5a..e3182541dc954ede9d0a5935a17d6577da4521d9
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 28
- EXTRAVERSION = -rc2
+ EXTRAVERSION = -rc3
  NAME = Killer Bat of Doom
  
  # *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/mfd/Kconfig
index 30793602034dff1a8925755fca416ace0b5c2f5f,257277394f8c5527d164d6273c8f7b25a157544f..2438aabb99e124391180097b99792174e9eb2828
--- 1/drivers/mfd/Kconfig
--- 2/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@@ -75,22 -75,13 +75,22 @@@ config TWL4030_COR
          high speed USB OTG transceiver, an audio codec (on most
          versions) and many other features.
  
 +config TWL4030_POWER
 +      bool "Support power sequencing scripts on TWL4030/TPS659x0"
 +      depends on TWL4030_CORE
 +      help
 +        Say yes here if you want to use the power sequencing scripts on
 +        the TWL4030/TPS659x0. These scripts control which regulators or
 +        oscillators are switched off or on or reset when a sleep, wakeup
 +        or warm reset event occurs.
 +
  config MFD_TMIO
        bool
        default n
  
  config MFD_T7L66XB
        bool "Support Toshiba T7L66XB"
-       depends on ARM
+       depends on ARM && HAVE_CLK
        select MFD_CORE
        select MFD_TMIO
        help
@@@ -98,7 -89,7 +98,7 @@@
  
  config MFD_TC6387XB
        bool "Support Toshiba TC6387XB"
-       depends on ARM
+       depends on ARM && HAVE_CLK
        select MFD_CORE
        select MFD_TMIO
        help

diff --combined drivers/net/smc91x.c
index 01cabebdf1a5b39cd74495ab118ff648cd3d01b4,6f9895d4e5bdf3016b5930d8b6716a81bf714ed7..a97a0753b09135e9c2dd6e764cefdbcd7b6c9bbf
--- 1/drivers/net/smc91x.c
--- 2/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@@ -448,11 -448,6 +448,11 @@@ static inline void  smc_rcv(struct net_
                dev->name, packet_number, status,
                packet_len, packet_len);
  
 +      if (unlikely(packet_len == 0 && !(status & RS_ERRORS))) {
 +              printk(KERN_ERR "%s: bad memory timings: rxlen %u status %x\n",
 +                      dev->name, packet_len, status);
 +              status |= RS_TOOSHORT;
 +      }
        back:
        if (unlikely(packet_len < 6 || status & RS_ERRORS)) {
                if (status & RS_TOOLONG && packet_len <= (1514 + 4 + 6)) {
@@@ -2065,7 -2060,6 +2065,6 @@@ static int smc_request_attrib(struct pl
                              struct net_device *ndev)
  {
        struct resource * res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-attrib");
-       struct smc_local *lp = netdev_priv(ndev);
  
        if (!res)
                return 0;
@@@ -2080,7 -2074,6 +2079,6 @@@ static void smc_release_attrib(struct p
                               struct net_device *ndev)
  {
        struct resource * res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-attrib");
-       struct smc_local *lp = netdev_priv(ndev);
  
        if (res)
                release_mem_region(res->start, ATTRIB_SIZE);