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-04-04 10:11:33 +01:00
2016-05-09 13:20:04 +02:00
2016-03-14 09:46:02 +10:00
2016-05-09 13:20:04 +02:00
2016-03-31 11:24:37 +02:00
2016-04-29 17:03:49 -07:00
2016-03-17 08:09:44 +10:00
2016-04-28 11:07:30 -07:00
2016-03-14 09:46:02 +10:00
2016-01-13 16:43:07 +01:00