summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2007-01-12 03:25:44 +0100
committerLinus Torvalds <torvalds@woody.osdl.org>2007-01-12 03:25:44 +0100
commite947382ed38563544d2b5b79f6ea90bdde350e5e (patch)
treeb09380b54bc2ef3841e6568fbf98fbb8f7706de8 /init
parentMerge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/a... (diff)
parentRevert "ACPI: ibm-acpi: make non-generic bay support optional" (diff)
downloadlinux-e947382ed38563544d2b5b79f6ea90bdde350e5e.tar.xz
linux-e947382ed38563544d2b5b79f6ea90bdde350e5e.zip
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
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions