Merge tag 'staging-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

Pull staging tree patches from Greg Kroah-Hartman:
 "Here's the big staging tree merge for the 3.6-rc1 merge window.

  There are some patches in here outside of drivers/staging/, notibly
  the iio code (which is still stradeling the staging / not staging
  boundry), the pstore code, and the tracing code.  All of these have
  gotten acks from the various subsystem maintainers to be included in
  this tree.  The pstore and tracing patches are related, and are coming
  here as they replace one of the android staging drivers.

  Otherwise, the normal staging mess.  Lots of cleanups and a few new
  drivers (some iio drivers, and the large csr wireless driver
  abomination.)

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
Fixed up trivial conflicts in drivers/staging/comedi/drivers/s626.h and
drivers/staging/gdm72xx/netlink_k.c

* tag 'staging-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1108 commits)
  staging: csr: delete a bunch of unused library functions
  staging: csr: remove csr_utf16.c
  staging: csr: remove csr_pmem.h
  staging: csr: remove CsrPmemAlloc
  staging: csr: remove CsrPmemFree()
  staging: csr: remove CsrMemAllocDma()
  staging: csr: remove CsrMemCalloc()
  staging: csr: remove CsrMemAlloc()
  staging: csr: remove CsrMemFree() and CsrMemFreeDma()
  staging: csr: remove csr_util.h
  staging: csr: remove CsrOffSetOf()
  stating: csr: remove unneeded #includes in csr_util.c
  staging: csr: make CsrUInt16ToHex static
  staging: csr: remove CsrMemCpy()
  staging: csr: remove CsrStrLen()
  staging: csr: remove CsrVsnprintf()
  staging: csr: remove CsrStrDup
  staging: csr: remove CsrStrChr()
  staging: csr: remove CsrStrNCmp
  staging: csr: remove CsrStrCmp
  ...

diff --cc drivers/staging/comedi/drivers/s626.h
index 92d3ea5eb44db00e91be8819e5a05f2ba52f1fbc,179623634732b1bb2b927145385bef6a9c60a1f2..8a8f196cf153c23373848863a1e5813cb0b123f2
--- 1/drivers/staging/comedi/drivers/s626.h
--- 2/drivers/staging/comedi/drivers/s626.h
+++ b/drivers/staging/comedi/drivers/s626.h
@@@ -76,11 -70,7 +70,7 @@@
  #define FALSE   (0)
  #endif
  
- #if !defined(INLINE)
- #define INLINE static __inline
- #endif
- 
 -#include<linux/slab.h>
 +#include <linux/slab.h>
  
  #define S626_SIZE 0x0200
  #define SIZEOF_ADDRESS_SPACE          0x0200

diff --cc drivers/staging/gdm72xx/netlink_k.c
Simple merge

diff --cc drivers/staging/nvec/nvec.c
index 9356886f489bcfd7e3939b4f0c7bf042ed0090d3,0f2b541add186f42003dcdee345789ec4db071c7..695ea35f75b0831cc8e2d28369d9ef124f8c2da9
--- 1/drivers/staging/nvec/nvec.c
--- 2/drivers/staging/nvec/nvec.c
+++ b/drivers/staging/nvec/nvec.c
@@@ -695,15 -697,17 +697,17 @@@ static void tegra_init_i2c_slave(struc
  
        enable_irq(nvec->irq);
  
 -      clk_disable(nvec->i2c_clk);
 +      clk_disable_unprepare(nvec->i2c_clk);
  }
  
+ #ifdef CONFIG_PM_SLEEP
  static void nvec_disable_i2c_slave(struct nvec_chip *nvec)
  {
        disable_irq(nvec->irq);
        writel(I2C_SL_NEWSL | I2C_SL_NACK, nvec->base + I2C_SL_CNFG);
 -      clk_disable(nvec->i2c_clk);
 +      clk_disable_unprepare(nvec->i2c_clk);
  }
+ #endif
  
  static void nvec_power_off(void)
  {

diff --cc include/linux/Kbuild
Simple merge

diff --cc kernel/trace/trace.c
Simple merge