From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Fri, 12 Jan 2007 02:25:44 +0000 (-0800)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux... 
X-Git-Tag: MMI-PSA29.97-13-9~45534
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e947382ed38563544d2b5b79f6ea90bdde350e5e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'release' of git://git./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
---

e947382ed38563544d2b5b79f6ea90bdde350e5e