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

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