tree fde848a374c53ff4352e0f9166b4d4eca0582886
parent f7f84f38cd916552c175f1f3d09cb6e85c1b29fc
parent 0f99fed4606dcbcbe813df831a39fd8f9653ef54
author Linus Torvalds <torvalds@linux-foundation.org> 1235337990 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1235337990 -0800

Merge branch 'core/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  PM: Split up sysdev_[suspend|resume] from device_power_[down|up], fix