merge ti: https://github.com/RobertCNelson/ti-linux-kernel/compare/f93aba31cfc224ed7ea414d1b7ab988808d764ba...0e5217614e9fad739b0e81a72b84dc8a76ef5326

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