merge ti: https://github.com/RobertCNelson/ti-linux-kernel/compare/3bbf1ef79051fc13faef5bc69e0ed2c61c18b523...1bc045ab6622f65406e48be7e361846ca091b311
merge ti: https://github.com/RobertCNelson/ti-linux-kernel/compare/3bbf1ef79051fc13faef5bc69e0ed2c61c18b523...1bc045ab6622f65406e48be7e361846ca091b311

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

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