Merge branch 'platform-ti-linux-4.1.y' of...

Merge branch 'platform-ti-linux-4.1.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree into ti-linux-4.1.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-4.1.y

* 'platform-ti-linux-4.1.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree

:
  ARM: OMAP2+: PM: fix a typo in an attempted build breakage fix

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>