tree a07f54e68e0dcca1ee225a616b55ee9bbe337f22
parent b45bbf07722bd9491c35681c6698cab93a778904
parent a829eb4d7e08b316e2d48880ecab3630497f300f
author Linus Torvalds <torvalds@linux-foundation.org> 1297811962 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1297811962 -0800

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