Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel...
authorDan Murphy <DMurphy@ti.com>
Wed, 24 Sep 2014 14:03:16 +0000 (09:03 -0500)
committerDan Murphy <DMurphy@ti.com>
Wed, 24 Sep 2014 14:03:16 +0000 (09:03 -0500)
commit8eb81df9fc91bee340e3a78c2b976e0e75297d6d
tree878d016224741ca6af5f5118e145c2c3e03ccfa1
parent540dcc399b522ec232172d2133b201066ed5b722
parent29c0274c03b26ea7a6a7b8c19dfb0ceef9ed8278
Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into ti-linux-3.14.y

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

* 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
  dmaengine: omap-dma: Restore the CLINK_CTRL in resume path
  dmaengine: omap-dma: Add memory barrier to dma_resume path
  ARM: OMAP: DRA7xx: Make L4SEC clock domain SWSUP only
  ti_config_fragments/baseport.cfg: Update with options for OpenSSL AF_ALG
  ti_config_fragments/baseport.cfg: Enable CONFIG_PREEMPT_VOLUNTARY

Signed-off-by: Dan Murphy <DMurphy@ti.com>
arch/arm/mach-omap2/clockdomains7xx_data.c