merge ti: https://github.com/RobertCNelson/ti-linux-kernel/compare/7a47bdff8575e7be55e2452b33744e20b25ddd82...ab06be68419e6ca01f608c34a7f7c24b07f8c340
merge ti: https://github.com/RobertCNelson/ti-linux-kernel/compare/7a47bdff8575e7be55e2452b33744e20b25ddd82...ab06be68419e6ca01f608c34a7f7c24b07f8c340

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

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