[Pkg-dkms-commits] [dkms] 02/06: Merge tag 'upstream/2.3'

[Aron Xu]

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

aron pushed a commit to branch master
in repository dkms.

commit 616c6cf724d9854400274869bbd2e5188a7a9231
Merge: 781220c be082d5
Author: Aron Xu <aron at debian.org>
Date:   Wed Oct 26 14:14:30 2016 +0800

    Merge tag 'upstream/2.3'
    
    Upstream version 2.3
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/copyright
    	debian/install
    	debian/patches/series
    	debian/scripts/dh_dkms
    	debian/watch
    	dkms.spec

 dkms.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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