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

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