Merge tag 'staging-4.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

Pull staging fixes from Greg KH:
 "Here are some small staging driver fixes for 4.5-rc2.

  One of them predated 4.4-final, but I missed that merge window due to
  the holliday.  The others fix reported issues that have come up
  recently.  The tty change is needed for the speakup driver fix and has
  the ack of the tty driver maintainer as well, i.e.  myself :)

  All have been in linux-next with no reported issues"

* tag 'staging-4.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  Staging: speakup: fix read scrolled-back VT
  Staging: speakup: Fix getting port information
  Revert "Staging: panel: usleep_range is preferred over udelay"
  iio: adis_buffer: Fix out-of-bounds memory access

diff --combined drivers/tty/vt/vt.c
index e7cbc44eef57529a23c479413538f1c2f924b55c,12210dab9ab14e67fc586119ba14cbe0abfbbd45..bd51bdd0a7bf2536617b1a27e3c846105c31a821
--- 1/drivers/tty/vt/vt.c
--- 2/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@@ -634,7 -634,7 +634,7 @@@ static void set_origin(struct vc_data *
        vc->vc_pos = vc->vc_origin + vc->vc_size_row * vc->vc_y + 2 * vc->vc_x;
  }
  
 -static inline void save_screen(struct vc_data *vc)
 +static void save_screen(struct vc_data *vc)
  {
        WARN_CONSOLE_UNLOCKED();
  
@@@ -4250,6 -4250,7 +4250,7 @@@ unsigned short *screen_pos(struct vc_da
  {
        return screenpos(vc, 2 * w_offset, viewed);
  }
+ EXPORT_SYMBOL_GPL(screen_pos);
  
  void getconsxy(struct vc_data *vc, unsigned char *p)
  {