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

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