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

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