]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/misc/sgi-gru/grufile.c
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Oct 2010 00:28:07 +0000 (17:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Oct 2010 00:28:07 +0000 (17:28 -0700)
commit27afe58fe60fbf71a25f1f592472c0e7b72b3502
treed1d7768dbd1bcf01b5eea38c6fb55fe25b16f5cd
parent7eb901e79129d457b72b3876a948a28c34557285
parentc25d29952b2a8c9aaf00e081c9162a0e383030cd
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6

* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
  intel_idle: do not use the LAPIC timer for ATOM C2
  intel_idle: add initial Sandy Bridge support
  acpi_idle: delete bogus data from cpuidle_state.power_usage
  intel_idle: delete bogus data from cpuidle_state.power_usage
  intel_idle: simplify test for leave_mm()
drivers/idle/intel_idle.c