git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0c3911 d91bb17)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Nov 2012 21:46:40 +0000 (13:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Nov 2012 21:46:40 +0000 (13:46 -0800)
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


Trivial merge
Pandora Kernel Repository