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

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