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

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