merge ti: https://github.com/RobertCNelson/ti-linux-kernel/compare/de593e3af980575d848a569e08676332a3977585...4b4eb93a58d79dd593aaa6f6bc2108f5c7d54b5f
merge ti: https://github.com/RobertCNelson/ti-linux-kernel/compare/de593e3af980575d848a569e08676332a3977585...4b4eb93a58d79dd593aaa6f6bc2108f5c7d54b5f

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

RobertCNelson/ti-linux-kernel-dev,robert-budde/ti-linux-kernel-dev