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

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