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

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