From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 11 Mar 2017 08:13:28 +0000 (-0800)
Subject: Merge tag 'staging-4.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: Ubuntu-4.11.0-0.5~429
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=85298808617299fe713ed3e03114058883ce3d8a;p=mirror_ubuntu-artful-kernel.git

Merge tag 'staging-4.11-rc2' of git://git.kernel.org/pub/scm/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
---

85298808617299fe713ed3e03114058883ce3d8a