Merge branch 'platform-ti-linux-3.12.y' of git://git.ti.com/~rrnayak/ti-linux-ke…

…rnel/platform-linux-feature-tree into ti-linux-3.12.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.12.y

* 'platform-ti-linux-3.12.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
  ARM: config: omap: Change PREEMPTion to voluntary

Conflicts:
	arch/arm/configs/omap2plus_defconfig

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