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

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