merge to: https://github.com/RobertCNelson/linux/commit/55529fa5762462beb39f913c5277cb96c7be0858

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