Merge branch 'platform-base-3.8.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platf...
authorFelipe Balbi <balbi@ti.com>
Tue, 26 Mar 2013 11:24:43 +0000 (13:24 +0200)
committerFelipe Balbi <balbi@ti.com>
Tue, 26 Mar 2013 11:24:43 +0000 (13:24 +0200)
commitf5edd7e3ebc1c56a0f07db12f78b84bfd519b570
tree3fab198161afb636b7504a3b7082ed74255b6a41
parentece56bc37b3c83b00e4e96d2aa49bdb0a5249741
parent52871649002ace37e80824d0950d209a2287ad9a
Merge branch 'platform-base-3.8.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into tmp

* 'platform-base-3.8.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree: (58 commits)
  ARM: dts: Fix the model and compatible for uevm and sevm boards
  ARM: OMAP: dpll: enable bypass clock only when attempting dpll bypass
  ARM: OMAP5: clock: Initialize USB DPLL
  ARM: OMAP5: clock: Lock ABE dpll at boot time
  ARM: OMAP5: clock: Add missing OPT clock nodes for SCRM
  ARM: OMAP2+: hwmod: Introduce HWMOD_ACCESS_DISABLED flag.
  OMAP2+: hwmod: Report current state of hwmod on debugfs.
  ARM: OMAP: hwmod: Don't wakeup SW Conrolled clkdm when disabling module
  ARM: OMAP: hwmod: Fix the module disable sequence
  ARM: OMAP: hwmod: check of oh->cldm for get_pwrdm
  ARM/dts: omap5-uevm: Remove lpddr2 device node
  Revert "ARM/dts: omap5-panda: Remove lpddr2 device node"
  ARM: OMAP2+: mux: warn only when signal really not found
  ARM: OMAP2+: mux: warn only when GPIO really not found
  gpio/omap: add support for OMAP5 gpio banks
  ARM/dts: omap5-panda: Remove lpddr2 device node
  ARM: OMAP5: PM: handle device instance for OMAP5 for coldreset
  crypto: omap-sham - Add SHA224 and SHA256 Support
  crypto: omap-sham - Add OMAP4/AM33XX SHAM Support
  crypto: omap-sham - Convert to dma_request_slave_channel_compat()
  ...

Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
arch/arm/boot/dts/am335x-bone.dts
arch/arm/boot/dts/am335x-evm.dts
arch/arm/boot/dts/am335x-evmsk.dts
arch/arm/boot/dts/am335x-bone.dts
arch/arm/boot/dts/am335x-evm.dts
arch/arm/boot/dts/am335x-evmsk.dts
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/omap5-sevm.dts
arch/arm/boot/dts/omap5.dtsi
arch/arm/mach-omap2/cclock54xx_data.c
arch/arm/mach-omap2/devices.c