From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 14 Nov 2012 21:46:40 +0000 (-0800)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=79e979eae0df58831e85281e3285f63663f3cf76;p=linux-edison.git

Merge branch 'release' of git://git./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
---

79e979eae0df58831e85281e3285f63663f3cf76