diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-11 00:13:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-11 00:13:28 -0800 |
| commit | 85298808617299fe713ed3e03114058883ce3d8a (patch) | |
| tree | dcfbc74842eb8c0100e0e4444019a4834097041a /init | |
| parent | 46552bf4337b99322c0cc65f6003e59b7f36bf15 (diff) | |
| parent | 69eb1596b4df8ca834ba6f9a3df40f78943f6dca (diff) | |
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
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions