merge to: https://github.com/RobertCNelson/linux/commit/41615e811b3031728a003da077005e8dcf9d71cc

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