From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 8 Aug 2015 01:26:31 +0000 (+0300)
Subject: Merge tag 'staging-4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v4.14-rc1~4924
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9f21a8bdaa0ec47730675ddac962c1415dd1451d;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'staging-4.2-rc6' of git://git./linux/kernel/git/gregkh/staging

Pull staging driver fixes from Greg KH:
 "Here are three bugfixes for some staging driver issues that have been
  reported.  All have been in the linux-next tree for a while"

* tag 'staging-4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: lustre: Include unaligned.h instead of access_ok.h
  staging: vt6655: vnt_bss_info_changed check conf->beacon_rate is not NULL
  staging: comedi: das1800: add missing break in switch
---

9f21a8bdaa0ec47730675ddac962c1415dd1451d