merge to: https://github.com/RobertCNelson/linux/commit/ec1882a9391c55332ebf3d1654f40b76e4a6c010

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