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

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