scripts: merge with master of stable-kernel

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