[linux] 06/06: Merge branch 'disable-packages-new' of https://anonscm.debian.org/git/collab-maint/linux-grsec

[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 3e8c6af15ed11801a7c8ce94d9b774b5d307430a
Merge: 37d4f9e 6759b9a
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Nov 13 16:46:28 2015 +0000

    Merge branch 'disable-packages-new' of https://anonscm.debian.org/git/collab-maint/linux-grsec

 debian/bin/gencontrol.py | 25 ++++++++++++++++---------
 debian/rules.real        |  4 +++-
 2 files changed, 19 insertions(+), 10 deletions(-)

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