Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: (34 commits)
  PM: Introduce generic prepare and complete callbacks for subsystems
  PM: Allow drivers to allocate memory from .prepare() callbacks safely
  PM: Remove CONFIG_PM_VERBOSE
  Revert "PM / Hibernate: Reduce autotuned default image size"
  PM / Hibernate: Add sysfs knob to control size of memory for drivers
  PM / Wakeup: Remove useless synchronize_rcu() call
  kmod: always provide usermodehelper_disable()
  PM / ACPI: Remove acpi_sleep=s4_nonvs
  PM / Wakeup: Fix build warning related to the "wakeup" sysfs file
  PM: Print a warning if firmware is requested when tasks are frozen
  PM / Runtime: Rework runtime PM handling during driver removal
  Freezer: Use SMP barriers
  PM / Suspend: Do not ignore error codes returned by suspend_enter()
  PM: Fix build issue in clock_ops.c for CONFIG_PM_RUNTIME unset
  PM: Revert "driver core: platform_bus: allow runtime override of dev_pm_ops"
  OMAP1 / PM: Use generic clock manipulation routines for runtime PM
  PM: Remove sysdev suspend, resume and shutdown operations
  PM / PowerPC: Use struct syscore_ops instead of sysdevs for PM
  PM / UNICORE32: Use struct syscore_ops instead of sysdevs for PM
  PM / AVR32: Use struct syscore_ops instead of sysdevs for PM
  ...

diff --combined arch/x86/Kconfig
index e7f94a5,140e254..b9ea9a8
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -71,7 -71,6 +71,6 @@@ config X8
        select GENERIC_IRQ_SHOW
        select IRQ_FORCED_THREADING
        select USE_GENERIC_SMP_HELPERS if SMP
-       select ARCH_NO_SYSDEV_OPS
  
  config INSTRUCTION_DECODER
        def_bool (KPROBES || PERF_EVENTS)
@@@ -1848,7 -1847,7 +1847,7 @@@ config APM_ALLOW_INT
  
  endif # APM
  
 -source "arch/x86/kernel/cpu/cpufreq/Kconfig"
 +source "drivers/cpufreq/Kconfig"
  
  source "drivers/cpuidle/Kconfig"
  

diff --combined include/linux/device.h
index d08399d,ea9db9b..0d75350
--- 1/include/linux/device.h
--- 2/include/linux/device.h
+++ b/include/linux/device.h
@@@ -442,6 -442,7 +442,6 @@@ struct device 
        struct dev_archdata     archdata;
  
        struct device_node      *of_node; /* associated device tree node */
 -      const struct of_device_id *of_match; /* matching of_device_id from driver */
  
        dev_t                   devt;   /* dev_t, creates the sysfs "dev" */
  
@@@ -632,13 -633,6 +632,6 @@@ static inline int devtmpfs_mount(const 
  /* drivers/base/power/shutdown.c */
  extern void device_shutdown(void);
  
- #ifndef CONFIG_ARCH_NO_SYSDEV_OPS
- /* drivers/base/sys.c */
- extern void sysdev_shutdown(void);
- #else
- static inline void sysdev_shutdown(void) { }
- #endif
- 
  /* debugging and troubleshooting/diagnostic helpers. */
  extern const char *dev_driver_string(const struct device *dev);