From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 2 Feb 2008 03:29:57 +0000 (+1100)
Subject: Merge branch 'suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux... 
X-Git-Tag: v2.6.25-rc1~1073
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=687fcdf741e4a268c2c7bac8b3734de761bb9719;p=linux-2.6

Merge branch 'suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (38 commits)
  suspend: cleanup reference to swsusp_pg_dir[]
  PM: Remove obsolete /sys/devices/.../power/state docs
  Hibernation: Invoke suspend notifications after console switch
  Suspend: Invoke suspend notifications after console switch
  Suspend: Clean up suspend_64.c
  Suspend: Add config option to disable the freezer if architecture wants that
  ACPI: Print message before calling _PTS
  ACPI hibernation: Call _PTS before suspending devices
  Hibernation: Introduce begin() and end() callbacks
  ACPI suspend: Call _PTS before suspending devices
  ACPI: Separate disabling of GPEs from _PTS
  ACPI: Separate invocations of _GTS and _BFS from _PTS and _WAK
  Suspend: Introduce begin() and end() callbacks
  suspend: fix ia64 allmodconfig build
  ACPI: clear GPE earily in resume to avoid warning
  Suspend: Clean up Kconfig (V2)
  Hibernation: Clean up Kconfig (V2)
  Hibernation: Update messages
  Suspend: Use common prefix in messages
  Hibernation: Remove unnecessary variable declaration
  ...
---

687fcdf741e4a268c2c7bac8b3734de761bb9719