merge ti: https://github.com/RobertCNelson/ti-linux-kernel/compare/f80207e53fe133f89767c9ce0c537e3dea52900d...83b86ca5dacc381b5c21db27aba348f187890632
merge ti: https://github.com/RobertCNelson/ti-linux-kernel/compare/f80207e53fe133f89767c9ce0c537e3dea52900d...83b86ca5dacc381b5c21db27aba348f187890632

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

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