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

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