tree ea756d49395ac4a08d6cdff98d74e60384a322a6
parent 3f76a4ea5383ba2f9e76f9625f77ff246907a134
parent 0f33be009b89d2268e94194dc4fd01a7851b6d51
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1411396203 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1411396203 -0700

Merge 3.17-rc6 into staging-next.

We want the fixes in there, and it resolves a merge issue with
drivers/iio/accel/bma180.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>