Merge 4.5-rc2 into staging-next

This fixes a merge issue with the panel driver, and picks up fixes in
iio and other drivers that we want here.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/staging/panel/panel.c
index 1219ff7884f855471849a52f860e58d3c02a5be7,70b8f4fabfad31af474fae8b7943f7a1404cbb8f..4262db0237f90e46b02f08a3f5505f5d18af953f
--- 1/drivers/staging/panel/panel.c
--- 2/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
@@@ -945,8 -943,7 +941,8 @@@ static void lcd_clear_fast_s(void
                lcd_send_serial(0x5F);  /* R/W=W, RS=1 */
                lcd_send_serial(' ' & 0x0F);
                lcd_send_serial((' ' >> 4) & 0x0F);
 -              udelay(40);     /* the shortest data takes at least 40 us */
 +              /* the shortest data takes at least 40 us */
-               usleep_range(40, 100);
++              udelay(40);
        }
        spin_unlock_irq(&pprt_lock);
  

diff --cc drivers/staging/speakup/main.c
Simple merge