diff options
| author | Rafael J. Wysocki <[email protected]> | 2016-07-25 11:46:23 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2016-07-25 11:46:23 +0000 |
| commit | e717a62d3602e41d4b0f9cd2d18e6851d33a2150 (patch) | |
| tree | 4931289b5a4f9ba3c146843dc0b77d4670eec835 /fs/jbd2/commit.c | |
| parent | Merge branch 'pm-cpuidle' (diff) | |
| parent | powercap / RAPL: Add support for Ivy Bridge server (diff) | |
| download | kernel-e717a62d3602e41d4b0f9cd2d18e6851d33a2150.tar.gz kernel-e717a62d3602e41d4b0f9cd2d18e6851d33a2150.zip | |
Merge branch 'powercap'
* powercap:
powercap / RAPL: Add support for Ivy Bridge server
powercap / RAPL: add support for Denverton
powercap / RAPL: handle missing MSRs
powercap / RAPL: reduce message loglevel
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions