Merge 4.6-rc7 into staging-next

This fixes some merge issues with some iio drivers that were found in
linux-next.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2016-05-09 13:20:04 +02:00
commit 4096e645d8
739 changed files with 7650 additions and 4221 deletions