| commit | f222eba0f9d98376d363b51fcc2361fb56929844 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Apr 27 10:10:54 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Apr 27 10:10:54 2008 -0700 |
| tree | 7b75784eda684b96d4235149acc68b4adbcc50a4 | |
| parent | cf867ac375cea7c7a834eaddaf373e2662d9e260 [diff] | |
| parent | 7f424a8b08c26dc14ac5c17164014539ac9a5c65 [diff] |
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