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

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