merge to: https://github.com/RobertCNelson/linux/commit/8d2763770c34e8ed771f0be86760eb4485febc05

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