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

diff --cc drivers/iio/adc/at91_adc.c
index 3bd5540238a7e6d683fd903cfacc14c8b05b92d5,c1e4690f188d200830d3c4aa22350ba2e9e1885c..ffa7726852bc3f873feddaa10512a0667daad8e1
--- 1/drivers/iio/adc/at91_adc.c
--- 2/drivers/iio/adc/at91_adc.c
+++ b/drivers/iio/adc/at91_adc.c
@@@ -602,22 -589,17 +589,17 @@@ static int __devinit at91_adc_probe(str
                goto error_free_irq;
        }
  
-       ret = clk_prepare(st->clk);
+       ret = clk_prepare_enable(st->clk);
        if (ret) {
-               dev_err(&pdev->dev, "Could not prepare the clock.\n");
-               goto error_free_clk;
-       }
- 
-       ret = clk_enable(st->clk);
-       if (ret) {
-               dev_err(&pdev->dev, "Could not enable the clock.\n");
-               goto error_unprepare_clk;
+               dev_err(&pdev->dev,
+                       "Could not prepare or enable the clock.\n");
+               goto error_free_irq;
        }
  
-       st->adc_clk = clk_get(&pdev->dev, "adc_op_clk");
+       st->adc_clk = devm_clk_get(&pdev->dev, "adc_op_clk");
        if (IS_ERR(st->adc_clk)) {
                dev_err(&pdev->dev, "Failed to get the ADC clock.\n");
 -              ret = PTR_ERR(st->clk);
 +              ret = PTR_ERR(st->adc_clk);
                goto error_disable_clk;
        }
  

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

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

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

diff --cc drivers/staging/iio/adc/ad7192.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/iio/meter/ade7753.c
Simple merge

diff --cc drivers/staging/iio/meter/ade7754.c
Simple merge

diff --cc drivers/staging/iio/meter/ade7759.c
Simple merge

diff --cc drivers/staging/ipack/devices/ipoctal.c
index a68d981c259fe6eb517d85df0667f7d9cad7c96a,c94a9dffd1e5cf2fbcb70a81ff07c4ce43501866..aaf8fce4911ea0a3022bd0add2cbb1256f2ecdea
--- 1/drivers/staging/ipack/devices/ipoctal.c
--- 2/drivers/staging/ipack/devices/ipoctal.c
+++ b/drivers/staging/ipack/devices/ipoctal.c
@@@ -617,18 -599,18 +599,18 @@@ static void ipoctal_set_termios(struct 
        struct ipoctal *ipoctal = tty->driver_data;
        speed_t baud;
  
 -      cflag = tty->termios->c_cflag;
 +      cflag = tty->termios.c_cflag;
  
        /* Disable and reset everything before change the setup */
-       ipoctal_write_io_reg(ipoctal, &ipoctal->chan_regs[channel].u.w.cr,
+       ipoctal_write_io_reg(ipoctal, &ipoctal->chan_regs[channel].w.cr,
                             CR_DISABLE_RX | CR_DISABLE_TX);
-       ipoctal_write_cr_cmd(ipoctal, &ipoctal->chan_regs[channel].u.w.cr,
+       ipoctal_write_cr_cmd(ipoctal, &ipoctal->chan_regs[channel].w.cr,
                             CR_CMD_RESET_RX);
-       ipoctal_write_cr_cmd(ipoctal, &ipoctal->chan_regs[channel].u.w.cr,
+       ipoctal_write_cr_cmd(ipoctal, &ipoctal->chan_regs[channel].w.cr,
                             CR_CMD_RESET_TX);
-       ipoctal_write_cr_cmd(ipoctal, &ipoctal->chan_regs[channel].u.w.cr,
+       ipoctal_write_cr_cmd(ipoctal, &ipoctal->chan_regs[channel].w.cr,
                             CR_CMD_RESET_ERR_STATUS);
-       ipoctal_write_cr_cmd(ipoctal, &ipoctal->chan_regs[channel].u.w.cr,
+       ipoctal_write_cr_cmd(ipoctal, &ipoctal->chan_regs[channel].w.cr,
                             CR_CMD_RESET_MR);
  
        /* Set Bits per chars */

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

diff --cc drivers/staging/vt6656/dpc.c
Simple merge

diff --cc drivers/staging/vt6656/rxtx.c
Simple merge