Merge tag 'staging-4.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Mar 2017 08:13:28 +0000 (00:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Mar 2017 08:13:28 +0000 (00:13 -0800)
commit85298808617299fe713ed3e03114058883ce3d8a
treedcfbc74842eb8c0100e0e4444019a4834097041a
parent46552bf4337b99322c0cc65f6003e59b7f36bf15
parent69eb1596b4df8ca834ba6f9a3df40f78943f6dca
Merge tag 'staging-4.11-rc2' of git://git./linux/kernel/git/gregkh/staging

Pull staging driver fixes from Greg KH:
 "Here are two small build warning fixes for some staging drivers that
  Arnd has found on his valiant quest to get the kernel to build
  properly with no warnings.

  Both of these have been in linux-next this week and resolve the
  reported issues"

* tag 'staging-4.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: octeon: remove unused variable
  staging/vc04_services: add CONFIG_OF dependency