diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-14 13:46:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-14 13:46:40 -0800 |
| commit | 79e979eae0df58831e85281e3285f63663f3cf76 (patch) | |
| tree | 03263ca6cd0709763be0461202a46dd7f73fa3c4 /include/linux/debugobjects.h | |
| parent | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus (diff) | |
| parent | tools/power turbostat: graceful fail on garbage input (diff) | |
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 'include/linux/debugobjects.h')
0 files changed, 0 insertions, 0 deletions