| commit | e947382ed38563544d2b5b79f6ea90bdde350e5e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.osdl.org> | Thu Jan 11 18:25:44 2007 -0800 |
| committer | Linus Torvalds <torvalds@woody.osdl.org> | Thu Jan 11 18:25:44 2007 -0800 |
| tree | b09380b54bc2ef3841e6568fbf98fbb8f7706de8 | |
| parent | 5b94d541806da24c8dbbff629486d65ce71dec46 [diff] | |
| parent | d2fadbbbf0e42b842731da71864f222e7f119461 [diff] |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: Revert "ACPI: ibm-acpi: make non-generic bay support optional" ACPI: update MAINTAINERS ACPI: schedule obsolete features for deletion ACPI: delete two spurious ACPI messages ACPI: rename cstate_entry_s to cstate_entry ACPI: ec: enable printk on cmdline use ACPI: Altix: ACPI _PRT support