Greg Kroah-Hartman 4096e645d8 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>
2016-05-09 13:20:04 +02:00
..
2016-05-05 08:26:54 -07:00
2016-05-09 13:20:04 +02:00
2016-05-09 13:20:04 +02:00
2016-05-07 08:10:08 -07:00
2016-05-07 08:17:45 -07:00
2016-05-07 10:53:32 -07:00
2016-05-09 13:20:04 +02:00
2016-04-29 17:37:10 -07:00