merge to: https://github.com/RobertCNelson/linux/commit/399a946edbbe90bd03aec2e93ce58c9b3f18e70b

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