Merge branch 'pm-linux-3.8.y' into ti-linux-3.8.y

Merge branch 'pm-linux-3.8.y' into ti-linux-3.8.y

TI-Feature: power_management
TI-Tree: git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree.git
TI-Branch: pm-linux-3.8.y

* pm-linux-3.8.y: (61 commits)
  ARM: OMAP2+: AM33XX: Hookup AM33XX PM code into OMAP builds
  ARM: OMAP2+: AM33XX: Select Mailbox when PM is enabled
  ARM: OMAP2+: AM33XX: Basic suspend resume support
  ARM: OMAP2+: AM33XX: Add assembly code for PM operations
  ARM: OMAP2+: AM33XX: timer: Interchange clkevt and clksrc timers
  ARM: OMAP2+: timer: Add suspend-resume callbacks for clockevent device
  ARM: OMAP2+: Fix selection of clockevent timer when using device-tree
  ARM: OMAP: DTB: Update IRQ data for WKUP_M3
  ARM: OMAP2+: AM33XX: control: Add some control module registers and APIs
  memory: emif: Move EMIF related header file to include/linux/
  ARM: OMAP2: am33xx-hwmod: Fix "register offset NULL check" bug
  ARM: OMAP2+: AM33xx: hwmod: add missing HWMOD_NO_IDLEST flags
  ARM: OMAP: AM33xx hwmod: Add parent-child relationship for PWM subsystem
  ARM: OMAP: AM33xx hwmod: Corrects PWM subsystem HWMOD entries
  ARM: DTS: AM33XX: Add nodes for OCMC RAM and WKUP-M3
  ARM: OMAP2+: AM33XX: Update the hardreset API
  ARM: OMAP2+: AM33XX: hwmod: Update the WKUP-M3 hwmod with reset status bit
  ARM: OMAP2+: AM33XX: hwmod: Fixup cpgmac0 hwmod entry
  ARM: OMAP2+: AM33XX: hwmod: Update TPTC0 hwmod with the right flags
  ARM: OMAP2+: AM33XX: hwmod: Register OCMC RAM hwmod
  ...

Conflicts:
	arch/arm/boot/dts/am33xx.dtsi
	arch/arm/mach-omap2/omap_hwmod_33xx_data.c

Signed-off-by: Dan Murphy <dmurphy@ti.com>