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)
We want the IIO and staging fixes in here as well.

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

diff --cc MAINTAINERS
Simple merge
Simple merge