Merge branch 'cleanup-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...

* 'cleanup-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: PM: share some suspend-related functions across OMAP2, 3, 4
  ARM: OMAP2+: omap_device: call all suspend, resume callbacks when OMAP_DEVICE_NO_IDLE_ON_SUSPEND is set
  ARM: OMAP: omap_device: remove omap_device_parent
  ARM: OMAP2+: PM debug: fix the use of debugfs_create_* API
  ARM: OMAP2+: PM: share clkdms_setup() across OMAP2, 3, 4
  ARM: OMAP2+: PM: clean up omap_set_pwrdm_state()
  ARM: OMAP3: PM: remove superfluous calls to pwrdm_clear_all_prev_pwrst()
  ARM: OMAP: convert omap_device_build() and callers to __init
  ARM: OMAP2+: Mark omap_hsmmc_init and omap_mux related functions as __init
  ARM: OMAP2+: Split omap2_hsmmc_init() to properly support I2C GPIO pins
  ARM: OMAP: omap_device: Expose omap_device_{alloc, delete, register}
  ARM: OMAP: Fix build error when mmc_omap is built as module
  ARM: OMAP: Fix kernel panic with HSMMC when twl4030_gpio is a module

diff --cc arch/arm/mach-omap2/gpio.c
index 1e0b750afcaa27b6b730afca679bcaf82ded2c8e,64c0caed9516d29535fa3d72e7002b67603351ac..2f994e5194e85c932836421f79b90fe7efe0ce4c
--- 1/arch/arm/mach-omap2/gpio.c
--- 2/arch/arm/mach-omap2/gpio.c
+++ b/arch/arm/mach-omap2/gpio.c
@@@ -23,11 -23,8 +23,11 @@@
  
  #include <plat/omap_hwmod.h>
  #include <plat/omap_device.h>
 +#include <plat/omap-pm.h>
 +
 +#include "powerdomain.h"
  
- static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
+ static int __init omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
  {
        struct platform_device *pdev;
        struct omap_gpio_platform_data *pdata;

diff --cc arch/arm/mach-omap2/pm34xx.c
Simple merge