Merge branch 'platform-base-3.8.y' into ti-linux-3.8.y
authorDan Murphy <dmurphy@ti.com>
Wed, 13 Mar 2013 14:06:57 +0000 (09:06 -0500)
committerDan Murphy <dmurphy@ti.com>
Wed, 13 Mar 2013 14:06:57 +0000 (09:06 -0500)
commit1b891dcc842b790f2f75197652b98a1d8c5576d4
tree4a2f9147b67ccd8b2e6f1bdb47c4bbc88fc0d83d
parente69f39916783a559c499e264359edea315ef44fd
parentda1de287389ac444b85f4e4752f940f185004dbc
Merge branch 'platform-base-3.8.y' into ti-linux-3.8.y

TI-Feature: platform_base
TI-Tree: http://git.ti.com/git/~rrnayak/ti-linux-kernel/platform-linux-feature-tree
TI-Branch: platform-base-3.8.y

* platform-base-3.8.y: (35 commits)
  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()
  crypto: omap-sham - Add Device Tree Support
  crypto: omap-sham - Remove usage of private DMA API
  crypto: omap-sham - Add code to use dmaengine API
  crypto: omap-sham - Add suspend/resume support
  crypto: omap-sham - Convert to use pm_runtime API
  crypto: omap-sham - Remove unnecessary pr_info noise
  crypto: omap-aes - Add CTR algorithm Support
  crypto: omap-aes - Add OMAP4/AM33XX AES Support
  crypto: omap-aes - Convert to dma_request_slave_channel_compat()
  crypto: omap-aes - Add Device Tree Support
  crypto: omap-aes - Remove usage of private DMA API
  crypto: omap-aes - Add code to use dmaengine API
  crypto: omap-aes - Add suspend/resume support
  crypto: omap-aes - Convert to use pm_runtime API
  crypto: omap-aes - Don't reset controller for every operation
  crypto: omap-aes - Remmove unnecessary pr_info noise
  ARM: dts: Add AES data and documentation for AM33XX
  ...

Conflicts:
arch/arm/boot/dts/am335x-bone.dts
arch/arm/boot/dts/am335x-evm.dts
arch/arm/boot/dts/am335x-evmsk.dts
arch/arm/mach-omap2/devices.c

Signed-off-by: Dan Murphy <dmurphy@ti.com>
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/mach-omap2/devices.c
arch/arm/mach-omap2/omap_hwmod_2420_data.c
arch/arm/mach-omap2/omap_hwmod_2430_data.c
arch/arm/mach-omap2/omap_hwmod_33xx_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c