• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · f86054c2
    Linus Torvalds authored
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: (23 commits)
      at_hdmac: Rework suspend_late()/resume_early()
      PM: Reset transition_started at dpm_resume_noirq
      PM: Update kerneldoc comments in drivers/base/power/main.c
      PM: Add convenience macro to make switching to dev_pm_ops less error-prone
      hp-wmi: Switch driver to dev_pm_ops
      floppy: Switch driver to dev_pm_ops
      PM: Trivial fixes
      PM / Hibernate / Memory hotplug: Always use for_each_populated_zone()
      PM/Hibernate: Do not try to allocate too much memory too hard (rev. 2)
      PM/Hibernate: Do not release preallocated memory unnecessarily (rev. 2)
      PM/Hibernate: Rework shrinking of memory
      PM: Fix typo in label name s/Platofrm_finish/Platform_finish/
      PM: Run-time PM platform device bus support
      PM: Introduce core framework for run-time PM of I/O devices (rev. 17)
      Driver Core: Make PM operations a const pointer
      PM: Remove platform device suspend_late()/resume_early() V2
      USB: Rework musb suspend()/resume_early()
      I2C: Rework i2c-s3c2410 suspend_late()/resume() V2
      I2C: Rework i2c-pxa suspend_late()/resume_early()
      DMA: Rework txx9dmac suspend_late()/resume_early()
      ...
    
    Fix trivial conflict in drivers/base/platform.c (due to same
    constification patch being merged in both sides, along with some other
    PM work in the PM branch)
    f86054c2
gpio.c 57.5 KB