Merge branch 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel...
authorTexas Instruments Auto Merger <lcpd_integration@list.ti.com>
Tue, 20 Jan 2015 05:20:14 +0000 (23:20 -0600)
committerTexas Instruments Auto Merger <lcpd_integration@list.ti.com>
Tue, 20 Jan 2015 05:20:14 +0000 (23:20 -0600)
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:
  ti_config_fragments/debug_options.cfg: add commonly useful debug options

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

Trivial merge