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

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