From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 1 Feb 2016 20:50:26 +0000 (-0800)
Subject: Merge 4.5-rc2 into staging-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4cff7adbebf4d25f662b13c6582b945d9d549e25;p=linux-beck.git

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>
---

4cff7adbebf4d25f662b13c6582b945d9d549e25
diff --cc drivers/staging/panel/panel.c
index 1219ff7884f8,70b8f4fabfad..4262db0237f9
--- a/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);