| commit | d84a2b0d6fecbb6e29875dd9dc97cdcdaa15744a | |
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| Mon, 22 Sep 2014 14:30:03 +0000 (22 07:30 -0700) | ||
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| Mon, 22 Sep 2014 14:30:03 +0000 (22 07:30 -0700) | ||
| tree | ea756d49395ac4a08d6cdff98d74e60384a322a6 | treesnapshot (tar.gz zip) |
| parent | 3f76a4ea5383ba2f9e76f9625f77ff246907a134 | commitdiff |
| parent | 0f33be009b89d2268e94194dc4fd01a7851b6d51 | commitdiff |
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>
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>