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

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