commit 16c29dafcc86024048f1dbb8349d31cb22c7c55a
author Linus Torvalds <torvalds@linux-foundation.org> Fri Mar 25 21:07:59 2011 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Mar 25 21:07:59 2011 -0700
tree 100c4fd34903adf02c9b8ae7705a3e1f30c8d712
parent dc50eddb2f3a0dff365f093b2a93fb4ab4dd4389
parent d47d81c0e9abdc3c88653fabff5beae82c949b09

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

* 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  Introduce ARCH_NO_SYSDEV_OPS config option (v2)
  cpufreq: Use syscore_ops for boot CPU suspend/resume (v2)
  KVM: Use syscore_ops instead of sysdev class and sysdev
  PCI / Intel IOMMU: Use syscore_ops instead of sysdev class and sysdev
  timekeeping: Use syscore_ops instead of sysdev class and sysdev
  x86: Use syscore_ops instead of sysdev classes and sysdevs