Merge branch 'maint-ti-linux-3.14.y' of...

Merge branch 'maint-ti-linux-3.14.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel-maint into ti-linux-3.14.y

TI-Feature: ti-linux-3.14-maint
TI-Tree: git://git.ti.com/ti-linux-kernel/ti-linux-kernel-maint.git
TI-Branch: maint-ti-linux-3.14.y

* 'maint-ti-linux-3.14.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel-maint

:
  mfd: ti_am335x_tscadc: Fix merge issue

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