Merge 4.2-rc6 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 10 Aug 2015 16:07:25 +0000 (09:07 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 10 Aug 2015 16:07:25 +0000 (09:07 -0700)
commitf70d6318320983a8d2fac28cfe8d22dfd5e52a73
treee3a427a3abeca491007f036b09be84944657f58e
parentb963e7223cb3278dda35a6550a8df08ff2be2ee5
parentf7644cbfcdf03528f0f450f3940c4985b2291f49
Merge 4.2-rc6 into staging-next

We want the IIO and staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/staging/vt6655/device_main.c