Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'

1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 930427fc0c4b..62ce87d71651 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -105,6 +105,14 @@ static int acpi_pm_enter(suspend_state_t pm_state)
         default:
                 return -EINVAL;
         }
+
+        /* ACPI 3.0 specs (P62) says that it's the responsabilty
+         * of the OSPM to clear the status bit [ implying that the
+         * POWER_BUTTON event should not reach userspace ]
+         */
+        if (ACPI_SUCCESS(status) && (acpi_state == ACPI_STATE_S3))
+                acpi_clear_event(ACPI_EVENT_POWER_BUTTON);
+
         local_irq_restore(flags);
         printk(KERN_DEBUG "Back to C!\n");