merge ti: https://github.com/RobertCNelson/ti-linux-kernel/compare/4404e719e231bd5e2b7fa297c7cf965c100b2f3f...725b7cf9428077b8cce8b4b7d74608b82978dda5
merge ti: https://github.com/RobertCNelson/ti-linux-kernel/compare/4404e719e231bd5e2b7fa297c7cf965c100b2f3f...725b7cf9428077b8cce8b4b7d74608b82978dda5

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

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