ti: merge to: http://git.ti.com/gitweb/?p=ti-linux-kernel/ti-linux-kernel.git;a=commit;h=725e21d2909742287c8017b6d6407c4050dc622e

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>