Merge branch 'tools' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Jan 2011 16:39:15 +0000 (08:39 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Jan 2011 16:39:15 +0000 (08:39 -0800)
* 'tools' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
  tools: create power/x86/x86_energy_perf_policy
  tools: create power/x86/turbostat


Trivial merge