diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-27 13:10:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-27 13:10:54 -0400 |
| commit | f222eba0f9d98376d363b51fcc2361fb56929844 (patch) | |
| tree | 7b75784eda684b96d4235149acc68b4adbcc50a4 /drivers/ide/ide-cd.c | |
| 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
Diffstat (limited to 'drivers/ide/ide-cd.c')
0 files changed, 0 insertions, 0 deletions