commit | f70d6318320983a8d2fac28cfe8d22dfd5e52a73 | [log] [tgz] |
---|---|---|
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Aug 10 09:07:25 2015 -0700 |
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Aug 10 09:07:25 2015 -0700 |
tree | e3a427a3abeca491007f036b09be84944657f58e | |
parent | b963e7223cb3278dda35a6550a8df08ff2be2ee5 [diff] | |
parent | f7644cbfcdf03528f0f450f3940c4985b2291f49 [diff] |
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>