merge ti: https://github.com/RobertCNelson/ti-linux-kernel/compare/177c70876a40add3c949f75e8cc6620ad98728b3...7860aafb97d975910017d76cda8c9d2c968c7dcf
merge ti: https://github.com/RobertCNelson/ti-linux-kernel/compare/177c70876a40add3c949f75e8cc6620ad98728b3...7860aafb97d975910017d76cda8c9d2c968c7dcf

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

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