[wireless-regdb] 20/24: Merge tag 'master-2015-07-20'

[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 wireless-regdb.

commit 8cca11ff9c049a8119e99383b1751823a1c5e701
Merge: 190adc6 a909f3b
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Aug 30 00:08:16 2015 +0100

    Merge tag 'master-2015-07-20'
    
    Remove upstream regulatory.bin and sha1sum.txt, which we rebuild.

 Makefile               |   3 +-
 db.txt                 | 127 +++++++++++++++++++++++++++++++------------------
 debian-example/control |   2 +-
 linville.key.pub.pem   |   9 ----
 sforshee.key.pub.pem   |   9 ++++
 wireless-regdb.spec    |   2 +-
 6 files changed, 94 insertions(+), 58 deletions(-)

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