config: rebase on debian 3.16.2-3

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