diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-22 16:30:03 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-22 16:30:03 +0200 |
| commit | d84a2b0d6fecbb6e29875dd9dc97cdcdaa15744a (patch) | |
| tree | ea756d49395ac4a08d6cdff98d74e60384a322a6 /drivers/cpuidle | |
| parent | Staging: rtl8192e: Fix __constant_htons to htons style warning (diff) | |
| parent | Linux 3.17-rc6 (diff) | |
| download | linux-d84a2b0d6fecbb6e29875dd9dc97cdcdaa15744a.tar.xz linux-d84a2b0d6fecbb6e29875dd9dc97cdcdaa15744a.zip | |
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>
Diffstat (limited to 'drivers/cpuidle')
0 files changed, 0 insertions, 0 deletions