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

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