Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Apr 2008 17:10:54 +0000 (10:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Apr 2008 17:10:54 +0000 (10:10 -0700)
commitf222eba0f9d98376d363b51fcc2361fb56929844
tree7b75784eda684b96d4235149acc68b4adbcc50a4
parentcf867ac375cea7c7a834eaddaf373e2662d9e260
parent7f424a8b08c26dc14ac5c17164014539ac9a5c65
Merge branch 'for-linus' of git://git./linux/kernel/git/x86/linux-2.6-idle-fix

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-idle-fix:
  fix idle (arch, acpi and apm) and lockdep