Hey Peter,

Please pull in your for-v3.4 branch this branch:

git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git  stable/for-x86-for-3.4

which has two patches for v3.4. They have been acked by Rafael Wysocki
and Joseph Cihula and posted: https://lkml.org/lkml/2012/3/10/115

The net gain of these patches is to remove the 'tboot' call within the ACPI core
framwork and replace it with an function call where the platform drivers can
register if they choose to. This makes it possible for platforms such as ARM, IA64
to choose whether they want to make a call to something similar to tboot or not.
If nothing is registered the call ends up being a nop.


 arch/x86/kernel/tboot.c       |    9 ++++++---
 drivers/acpi/acpica/hwsleep.c |   10 +++++++---
 drivers/acpi/osl.c            |   24 ++++++++++++++++++++++++
 include/acpi/acexcep.h        |    1 +
 include/linux/acpi.h          |   10 ++++++++++
 include/linux/tboot.h         |    1 -
 6 files changed, 48 insertions(+), 7 deletions(-)

Konrad Rzeszutek Wilk (1):
      tboot: Add return values for tboot_sleep

Tang Liang (1):
      x86, acpi, tboot: Have a ACPI os prepare sleep instead of calling tboot_sleep.