sync with debian 3.12.9

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