]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'tools-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Feb 2011 23:19:22 +0000 (15:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Feb 2011 23:19:22 +0000 (15:19 -0800)
commitb9d4ba6b48e9467e2e72bd6fb296b75024466b93
treea07f54e68e0dcca1ee225a616b55ee9bbe337f22
parentb45bbf07722bd9491c35681c6698cab93a778904
parenta829eb4d7e08b316e2d48880ecab3630497f300f
Merge branch 'tools-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6

* 'tools-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
  tools: turbostat: style updates
  tools: turbostat: fix bitwise and operand