ti: merge to: http://git.ti.com/gitweb/?p=ti-linux-kernel/ti-linux-kernel.git;a=commit;h=e8a8ec43b840159cd381efde21ff1218b4044b31

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
ti: merge to: http://git.ti.com/gitweb/?p=ti-linux-kernel/ti-linux-kernel.git;a=commit;h=e072dce1b42b6c5688c9f8724c26d918dc097d39

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