Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 Oct 2010 19:05:09 +0000 (12:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 Oct 2010 19:05:09 +0000 (12:05 -0700)
* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
  intel_idle: enable Atom C6


Trivial merge