merge to: https://github.com/RobertCNelson/linux/commit/534c97b0950b1967bca1c753aeaed32f5db40264

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