tree 7b75784eda684b96d4235149acc68b4adbcc50a4
parent cf867ac375cea7c7a834eaddaf373e2662d9e260
parent 7f424a8b08c26dc14ac5c17164014539ac9a5c65
author Linus Torvalds <torvalds@linux-foundation.org> 1209316254 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1209316254 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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