diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-15 01:46:40 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-15 01:46:40 +0400 |
| commit | 79e979eae0df58831e85281e3285f63663f3cf76 (patch) | |
| tree | 03263ca6cd0709763be0461202a46dd7f73fa3c4 /block | |
| parent | f0c391131a6483004791458f181d2a6f6ffb1c11 (diff) | |
| parent | d91bb17c2a874493603c4d99db305d8caf2d180c (diff) | |
| download | linux-79e979eae0df58831e85281e3285f63663f3cf76.tar.xz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull power tools fixes from Len Brown:
"A pair of power tools patches -- a 3.7 regression fix plus a bug fix."
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
tools/power turbostat: graceful fail on garbage input
tools/power turbostat: Repair Segmentation fault when using -i option
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions