Merge remote-tracking branch 'staging/staging-next'

Conflicts:
	drivers/staging/comedi/drivers/s626.h
	drivers/staging/gdm72xx/netlink_k.c

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