Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel...
authorDan Murphy <DMurphy@ti.com>
Fri, 28 Nov 2014 04:31:48 +0000 (22:31 -0600)
committerDan Murphy <DMurphy@ti.com>
Fri, 28 Nov 2014 04:31:48 +0000 (22:31 -0600)
commit9f9246f7f1beeedf262a2850725d29343e7fd157
tree68bb3d572cc0adbeeb325503da1751bbb4c5c432
parentc574201eb8a98dad6f4ec9950b558f4c00cb82f5
parent2a0eec469e03d99b5377fbda3143cab3596f3905
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:
  ARM: OMAP2+: AM43x: Add ID for ES1.2

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