Merge branch 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm...
authorDan Murphy <DMurphy@ti.com>
Thu, 6 Nov 2014 16:33:17 +0000 (10:33 -0600)
committerDan Murphy <DMurphy@ti.com>
Thu, 6 Nov 2014 16:33:17 +0000 (10:33 -0600)
commit828f4fe51fa46e2713d53fe2e6c87c187a261f1a
tree14873c850d2c6cfae690d03914474e20e0712082
parent455098f0ec936d18990016e1ba1e8da63f9f5a39
parent7398ce7eb13023bcc88bfaa96e00861cd7f67115
Merge branch 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree into ti-linux-3.14.y

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

* 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree:
  ARM: OMAP2+: DRA7XX: OPP: Add encoding for "All OPP" configuration

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