Merge 'staging-next' to Linus's tree

This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-omap2/Makefile
Simple merge

diff --cc arch/arm/plat-omap/common.c
index 221a675ebbaedb4b14d08d354103ced49a402e90,57205a49289e2ba6b441be7ca4379ed23b4af749..f04731820301c921f8d65c3d394f570ee543b34a
--- 1/arch/arm/plat-omap/common.c
--- 2/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@@ -16,10 -17,33 +16,11 @@@
  #include <linux/io.h>
  #include <linux/omapfb.h>
  
 -#include <mach/hardware.h>
 -#include <asm/system.h>
 -#include <asm/pgtable.h>
 -#include <asm/mach/map.h>
 -#include <asm/setup.h>
 -
  #include <plat/common.h>
  #include <plat/board.h>
 -#include <plat/control.h>
 -#include <plat/mux.h>
 -#include <plat/fpga.h>
 -#include <plat/serial.h>
  #include <plat/vram.h>
+ #include <plat/dsp.h>
  
 -#include <plat/clock.h>
 -
 -#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
 -# include "../mach-omap2/sdrc.h"
 -#endif
  
  #define NO_LENGTH_CHECK 0xffffffff
  
@@@ -64,4 -88,272 +65,5 @@@ void __init omap_reserve(void
  {
        omapfb_reserve_sdram_memblock();
        omap_vram_reserve_sdram_memblock();
+       omap_dsp_reserve_sdram_memblock();
  }
 -
 -/*
 - * 32KHz clocksource ... always available, on pretty most chips except
 - * OMAP 730 and 1510.  Other timers could be used as clocksources, with
 - * higher resolution in free-running counter modes (e.g. 12 MHz xtal),
 - * but systems won't necessarily want to spend resources that way.
 - */
 -
 -#define OMAP16XX_TIMER_32K_SYNCHRONIZED               0xfffbc410
 -
 -#if !(defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP15XX))
 -
 -#include <linux/clocksource.h>
 -
 -/*
 - * offset_32k holds the init time counter value. It is then subtracted
 - * from every counter read to achieve a counter that counts time from the
 - * kernel boot (needed for sched_clock()).
 - */
 -static u32 offset_32k __read_mostly;
 -
 -#ifdef CONFIG_ARCH_OMAP16XX
 -static cycle_t omap16xx_32k_read(struct clocksource *cs)
 -{
 -      return omap_readl(OMAP16XX_TIMER_32K_SYNCHRONIZED) - offset_32k;
 -}
 -#else
 -#define omap16xx_32k_read     NULL
 -#endif
 -
 -#ifdef CONFIG_ARCH_OMAP2420
 -static cycle_t omap2420_32k_read(struct clocksource *cs)
 -{
 -      return omap_readl(OMAP2420_32KSYNCT_BASE + 0x10) - offset_32k;
 -}
 -#else
 -#define omap2420_32k_read     NULL
 -#endif
 -
 -#ifdef CONFIG_ARCH_OMAP2430
 -static cycle_t omap2430_32k_read(struct clocksource *cs)
 -{
 -      return omap_readl(OMAP2430_32KSYNCT_BASE + 0x10) - offset_32k;
 -}
 -#else
 -#define omap2430_32k_read     NULL
 -#endif
 -
 -#ifdef CONFIG_ARCH_OMAP3
 -static cycle_t omap34xx_32k_read(struct clocksource *cs)
 -{
 -      return omap_readl(OMAP3430_32KSYNCT_BASE + 0x10) - offset_32k;
 -}
 -#else
 -#define omap34xx_32k_read     NULL
 -#endif
 -
 -#ifdef CONFIG_ARCH_OMAP4
 -static cycle_t omap44xx_32k_read(struct clocksource *cs)
 -{
 -      return omap_readl(OMAP4430_32KSYNCT_BASE + 0x10) - offset_32k;
 -}
 -#else
 -#define omap44xx_32k_read     NULL
 -#endif
 -
 -/*
 - * Kernel assumes that sched_clock can be called early but may not have
 - * things ready yet.
 - */
 -static cycle_t omap_32k_read_dummy(struct clocksource *cs)
 -{
 -      return 0;
 -}
 -
 -static struct clocksource clocksource_32k = {
 -      .name           = "32k_counter",
 -      .rating         = 250,
 -      .read           = omap_32k_read_dummy,
 -      .mask           = CLOCKSOURCE_MASK(32),
 -      .shift          = 10,
 -      .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 -};
 -
 -/*
 - * Returns current time from boot in nsecs. It's OK for this to wrap
 - * around for now, as it's just a relative time stamp.
 - */
 -unsigned long long sched_clock(void)
 -{
 -      return clocksource_cyc2ns(clocksource_32k.read(&clocksource_32k),
 -                                clocksource_32k.mult, clocksource_32k.shift);
 -}
 -
 -/**
 - * read_persistent_clock -  Return time from a persistent clock.
 - *
 - * Reads the time from a source which isn't disabled during PM, the
 - * 32k sync timer.  Convert the cycles elapsed since last read into
 - * nsecs and adds to a monotonically increasing timespec.
 - */
 -static struct timespec persistent_ts;
 -static cycles_t cycles, last_cycles;
 -void read_persistent_clock(struct timespec *ts)
 -{
 -      unsigned long long nsecs;
 -      cycles_t delta;
 -      struct timespec *tsp = &persistent_ts;
 -
 -      last_cycles = cycles;
 -      cycles = clocksource_32k.read(&clocksource_32k);
 -      delta = cycles - last_cycles;
 -
 -      nsecs = clocksource_cyc2ns(delta,
 -                                 clocksource_32k.mult, clocksource_32k.shift);
 -
 -      timespec_add_ns(tsp, nsecs);
 -      *ts = *tsp;
 -}
 -
 -static int __init omap_init_clocksource_32k(void)
 -{
 -      static char err[] __initdata = KERN_ERR
 -                      "%s: can't register clocksource!\n";
 -
 -      if (cpu_is_omap16xx() || cpu_class_is_omap2()) {
 -              struct clk *sync_32k_ick;
 -
 -              if (cpu_is_omap16xx())
 -                      clocksource_32k.read = omap16xx_32k_read;
 -              else if (cpu_is_omap2420())
 -                      clocksource_32k.read = omap2420_32k_read;
 -              else if (cpu_is_omap2430())
 -                      clocksource_32k.read = omap2430_32k_read;
 -              else if (cpu_is_omap34xx())
 -                      clocksource_32k.read = omap34xx_32k_read;
 -              else if (cpu_is_omap44xx())
 -                      clocksource_32k.read = omap44xx_32k_read;
 -              else
 -                      return -ENODEV;
 -
 -              sync_32k_ick = clk_get(NULL, "omap_32ksync_ick");
 -              if (sync_32k_ick)
 -                      clk_enable(sync_32k_ick);
 -
 -              clocksource_32k.mult = clocksource_hz2mult(32768,
 -                                          clocksource_32k.shift);
 -
 -              offset_32k = clocksource_32k.read(&clocksource_32k);
 -
 -              if (clocksource_register(&clocksource_32k))
 -                      printk(err, clocksource_32k.name);
 -      }
 -      return 0;
 -}
 -arch_initcall(omap_init_clocksource_32k);
 -
 -#endif        /* !(defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP15XX)) */
 -
 -/* Global address base setup code */
 -
 -#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
 -
 -static void __init __omap2_set_globals(struct omap_globals *omap2_globals)
 -{
 -      omap2_set_globals_tap(omap2_globals);
 -      omap2_set_globals_sdrc(omap2_globals);
 -      omap2_set_globals_control(omap2_globals);
 -      omap2_set_globals_prcm(omap2_globals);
 -      omap2_set_globals_uart(omap2_globals);
 -}
 -
 -#endif
 -
 -#if defined(CONFIG_ARCH_OMAP2420)
 -
 -static struct omap_globals omap242x_globals = {
 -      .class  = OMAP242X_CLASS,
 -      .tap    = OMAP2_L4_IO_ADDRESS(0x48014000),
 -      .sdrc   = OMAP2420_SDRC_BASE,
 -      .sms    = OMAP2420_SMS_BASE,
 -      .ctrl   = OMAP2420_CTRL_BASE,
 -      .prm    = OMAP2420_PRM_BASE,
 -      .cm     = OMAP2420_CM_BASE,
 -      .uart1_phys     = OMAP2_UART1_BASE,
 -      .uart2_phys     = OMAP2_UART2_BASE,
 -      .uart3_phys     = OMAP2_UART3_BASE,
 -};
 -
 -void __init omap2_set_globals_242x(void)
 -{
 -      __omap2_set_globals(&omap242x_globals);
 -}
 -#endif
 -
 -#if defined(CONFIG_ARCH_OMAP2430)
 -
 -static struct omap_globals omap243x_globals = {
 -      .class  = OMAP243X_CLASS,
 -      .tap    = OMAP2_L4_IO_ADDRESS(0x4900a000),
 -      .sdrc   = OMAP243X_SDRC_BASE,
 -      .sms    = OMAP243X_SMS_BASE,
 -      .ctrl   = OMAP243X_CTRL_BASE,
 -      .prm    = OMAP2430_PRM_BASE,
 -      .cm     = OMAP2430_CM_BASE,
 -      .uart1_phys     = OMAP2_UART1_BASE,
 -      .uart2_phys     = OMAP2_UART2_BASE,
 -      .uart3_phys     = OMAP2_UART3_BASE,
 -};
 -
 -void __init omap2_set_globals_243x(void)
 -{
 -      __omap2_set_globals(&omap243x_globals);
 -}
 -#endif
 -
 -#if defined(CONFIG_ARCH_OMAP3)
 -
 -static struct omap_globals omap3_globals = {
 -      .class  = OMAP343X_CLASS,
 -      .tap    = OMAP2_L4_IO_ADDRESS(0x4830A000),
 -      .sdrc   = OMAP343X_SDRC_BASE,
 -      .sms    = OMAP343X_SMS_BASE,
 -      .ctrl   = OMAP343X_CTRL_BASE,
 -      .prm    = OMAP3430_PRM_BASE,
 -      .cm     = OMAP3430_CM_BASE,
 -      .uart1_phys     = OMAP3_UART1_BASE,
 -      .uart2_phys     = OMAP3_UART2_BASE,
 -      .uart3_phys     = OMAP3_UART3_BASE,
 -      .uart4_phys     = OMAP3_UART4_BASE,     /* Only on 3630 */
 -};
 -
 -void __init omap2_set_globals_3xxx(void)
 -{
 -      __omap2_set_globals(&omap3_globals);
 -}
 -
 -void __init omap3_map_io(void)
 -{
 -      omap2_set_globals_3xxx();
 -      omap34xx_map_common_io();
 -}
 -#endif
 -
 -#if defined(CONFIG_ARCH_OMAP4)
 -static struct omap_globals omap4_globals = {
 -      .class  = OMAP443X_CLASS,
 -      .tap    = OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE),
 -      .ctrl   = OMAP443X_CTRL_BASE,
 -      .prm    = OMAP4430_PRM_BASE,
 -      .cm     = OMAP4430_CM_BASE,
 -      .cm2    = OMAP4430_CM2_BASE,
 -      .uart1_phys     = OMAP4_UART1_BASE,
 -      .uart2_phys     = OMAP4_UART2_BASE,
 -      .uart3_phys     = OMAP4_UART3_BASE,
 -      .uart4_phys     = OMAP4_UART4_BASE,
 -};
 -
 -void __init omap2_set_globals_443x(void)
 -{
 -      omap2_set_globals_tap(&omap4_globals);
 -      omap2_set_globals_control(&omap4_globals);
 -      omap2_set_globals_prcm(&omap4_globals);
 -      omap2_set_globals_uart(&omap4_globals);
 -}
 -#endif
 -

diff --cc arch/arm/plat-omap/devices.c
Simple merge

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/misc/Makefile
index 4be5c6fc5ef4a47ae8a16c213492beba700321bb,ab3353a597d8165192ed650ab9382c6362601816..47af4cd08f01bd0447555ec4192efe3d2970b771
--- 1/drivers/misc/Makefile
--- 2/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@@ -37,6 -33,6 +37,7 @@@ obj-$(CONFIG_IWMC3200TOP)      += iwmc3
  obj-$(CONFIG_HMC6352)         += hmc6352.o
  obj-y                         += eeprom/
  obj-y                         += cb710/
 -obj-$(CONFIG_VMWARE_BALLOON)  += vmware_balloon.o
 +obj-$(CONFIG_VMWARE_BALLOON)  += vmw_balloon.o
  obj-$(CONFIG_ARM_CHARLCD)     += arm-charlcd.o
 +obj-$(CONFIG_PCH_PHUB)                += pch_phub.o
+ obj-y                         += ti-st/

diff --cc drivers/staging/Kconfig
Simple merge

diff --cc drivers/staging/Makefile
Simple merge

diff --cc drivers/staging/autofs/Kconfig
Simple merge

diff --cc drivers/staging/autofs/root.c
Simple merge

diff --cc drivers/staging/comedi/comedi_fops.c
Simple merge

diff --cc drivers/staging/comedi/drivers/cb_pcimdas.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ni_labpc.c
Simple merge

diff --cc drivers/staging/comedi/drivers/rtd520.c
Simple merge

diff --cc drivers/staging/crystalhd/crystalhd_lnx.c
Simple merge

diff --cc drivers/staging/dream/pmem.c
Simple merge

diff --cc drivers/staging/frontier/alphatrack.c
Simple merge

diff --cc drivers/staging/frontier/tranzport.c
Simple merge

diff --cc drivers/staging/hv/blkvsc_drv.c
Simple merge

diff --cc drivers/staging/hv/netvsc_drv.c
Simple merge

diff --cc drivers/staging/hv/storvsc_drv.c
Simple merge

diff --cc drivers/staging/iio/industrialio-core.c
Simple merge

diff --cc drivers/staging/iio/industrialio-ring.c
Simple merge

diff --cc drivers/staging/lirc/lirc_imon.c
Simple merge

diff --cc drivers/staging/lirc/lirc_sasem.c
Simple merge

diff --cc drivers/staging/quickstart/quickstart.c
Simple merge

diff --cc drivers/staging/smbfs/Kconfig
Simple merge

diff --cc drivers/staging/smbfs/dir.c
Simple merge

diff --cc drivers/staging/smbfs/inode.c
Simple merge

diff --cc drivers/staging/smbfs/proc.c
Simple merge

diff --cc drivers/staging/spectra/Kconfig
Simple merge

diff --cc drivers/staging/tidspbridge/rmgr/drv_interface.c
Simple merge

diff --cc drivers/staging/wlags49_h2/wl_main.c
Simple merge

diff --cc drivers/staging/zram/zram_drv.c
Simple merge

diff --cc fs/Kconfig
Simple merge

diff --cc fs/Makefile
Simple merge

diff --cc fs/compat.c
Simple merge

diff --cc fs/compat_ioctl.c
index d0ad09d57789c2e72b4f6eeda2c09535651bfe8e,34cf03cd791f5a56912935b5cc60c5011266433e..410ed188faa1376b7b0b10ed5bff0c36aa9c8806
--- 1/fs/compat_ioctl.c
--- 2/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@@ -1457,11 -1501,11 +1438,7 @@@ static long do_ioctl_trans(int fd, unsi
        case MTIOCGET32:
        case MTIOCPOS32:
                return mt_ioctl_trans(fd, cmd, argp);
 -      /* Raw devices */
 -      case RAW_SETBIND:
 -      case RAW_GETBIND:
 -              return raw_ioctl(fd, cmd, argp);
  #endif
-       /* One SMB ioctl needs translations. */
- #define SMB_IOC_GETMOUNTUID_32 _IOR('u', 1, compat_uid_t)
-       case SMB_IOC_GETMOUNTUID_32:
-               return do_smb_getmountuid(fd, cmd, argp);
        /* Serial */
        case TIOCGSERIAL:
        case TIOCSSERIAL:

diff --cc include/linux/Kbuild
Simple merge

diff --cc include/linux/tty.h
Simple merge