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

Conflicts:
	drivers/staging/comedi/drivers/amplc_dio200.c

diff --cc drivers/staging/android/binder.c
Simple merge

diff --cc drivers/staging/comedi/drivers/8255_pci.c
Simple merge

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

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

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

diff --cc drivers/staging/comedi/drivers/ni_labpc.c
index b5a19a0863fbb8ba3e7fe2842f66b0611992b054,40012506334f77a670f1c7360df7f0ef9e92dfd5..ab51c2678b9d425762d182951d6a183ba0cb585f
--- 1/drivers/staging/comedi/drivers/ni_labpc.c
--- 2/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@@ -770,10 -775,9 +775,11 @@@ static int labpc_attach(struct comedi_d
  
  void labpc_common_detach(struct comedi_device *dev)
  {
+       struct labpc_private *devpriv = dev->private;
        struct comedi_subdevice *s;
  
 +      if (!thisboard)
 +              return;
        if (dev->subdevices) {
                s = &dev->subdevices[2];
                subdev_8255_cleanup(dev, s);

diff --cc drivers/staging/dgrp/dgrp_net_ops.c
Simple merge

diff --cc drivers/staging/dgrp/dgrp_sysfs.c
Simple merge

diff --cc drivers/staging/iio/accel/adis16201_core.c
Simple merge

diff --cc drivers/staging/iio/accel/adis16203_core.c
Simple merge

diff --cc drivers/staging/iio/accel/adis16204_core.c
Simple merge

diff --cc drivers/staging/iio/accel/adis16209_core.c
Simple merge

diff --cc drivers/staging/iio/accel/adis16220_core.c
Simple merge

diff --cc drivers/staging/iio/accel/adis16240_core.c
Simple merge

diff --cc drivers/staging/iio/gyro/adis16260_core.c
Simple merge

diff --cc drivers/staging/iio/imu/adis16400_core.c
Simple merge

diff --cc drivers/staging/omapdrm/omap_gem.c
Simple merge