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

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