[linux] 04/05: Merge branch 'split-docs' 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 b11f7640b8810b8bfbee39ec4b1e5429a52a59c0
Merge: 5269f93 8f6b139
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Nov 12 15:05:11 2015 +0000

    Merge branch 'split-docs' of https://anonscm.debian.org/git/collab-maint/linux-grsec

 debian/bin/gencontrol.py                           |  7 ++++
 debian/rules.real                                  | 19 +++++++----
 .../templates/{control.main.in => control.docs.in} | 30 ++----------------
 debian/templates/control.main.in                   | 37 ++--------------------
 4 files changed, 23 insertions(+), 70 deletions(-)

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