[linux] 01/01: Merge remote-tracking branch 'alioth/master'

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 2cb3972dfb4715f59f4239f10880570d4d987d6e
Merge: b93e46d 4d7d15c
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Sep 11 14:58:11 2017 +0100

    Merge remote-tracking branch 'alioth/master'

 debian/config/amd64/config          |  1 -
 debian/config/config                | 19 +++++++++----------
 debian/config/hppa/config           |  3 ++-
 debian/config/kernelarch-x86/config |  5 -----
 debian/config/s390x/config          |  1 -
 5 files changed, 11 insertions(+), 18 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git