Pull fluff into release branch
Len Brown [Tue, 20 Nov 2007 06:21:47 +0000 (01:21 -0500)]
Conflicts:

drivers/acpi/ec.c

Signed-off-by: Len Brown <len.brown@intel.com>

1  2 
arch/x86/pci/acpi.c
drivers/acpi/ec.c
drivers/acpi/processor_core.c

Simple merge
@@@ -175,17 -170,17 +175,17 @@@ static int acpi_ec_wait(struct acpi_ec 
            likely(!force_poll)) {
                if (wait_event_timeout(ec->wait, acpi_ec_check_status(ec, event),
                                       msecs_to_jiffies(ACPI_EC_DELAY)))
 -                      return 0;
 +                      goto end;
                clear_bit(EC_FLAGS_WAIT_GPE, &ec->flags);
                if (acpi_ec_check_status(ec, event)) {
 -                      if (event == ACPI_EC_EVENT_OBF_1) {
 -                              /* miss OBF = 1 GPE, don't expect it anymore */
 -                              printk(KERN_INFO PREFIX "missing OBF_1 confirmation, "
 -                                      "switching to degraded mode.\n");
 -                              set_bit(EC_FLAGS_ONLY_IBF_GPE, &ec->flags);
 +                      if (test_bit(EC_FLAGS_ADDRESS, &ec->flags)) {
 +                              /* miss address GPE, don't expect it anymore */
-                               printk(KERN_INFO PREFIX "missing address confirmation,"
++                              printk(KERN_INFO PREFIX "missing address confirmation, "
 +                                      "don't expect it any longer.\n");
 +                              set_bit(EC_FLAGS_NO_ADDRESS_GPE, &ec->flags);
                        } else {
                                /* missing GPEs, switch back to poll mode */
-                               printk(KERN_INFO PREFIX "missing confirmations,"
 -                              printk(KERN_INFO PREFIX "missing IBF_1 confirmations, "
++                              printk(KERN_INFO PREFIX "missing confirmations, "
                                        "switch off interrupt mode.\n");
                                clear_bit(EC_FLAGS_GPE_MODE, &ec->flags);
                        }
Simple merge