[crda] 10/16: Merge tag 'upstream/3.18'

[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 crda.

commit 83fd6ba84216bd31ca18aa1ce8ec523deac841f6
Merge: f08f50f e481c20
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Jan 18 01:03:39 2017 +0000

    Merge tag 'upstream/3.18'
    
    Upstream version 3.18

 CONTRIBUTING                 |  49 ++++
 Makefile                     |  15 +-
 README                       |  16 +-
 crda.8                       |   6 +-
 crda.c                       |   3 +
 nl80211.h                    | 525 ++++++++++++++++++++++++++++++++++++++-----
 pubkeys/sforshee.key.pub.pem |   9 +
 regdb.h                      |   1 +
 reglib.c                     | 368 +++++++-----------------------
 reglib.h                     |   4 +-
 10 files changed, 634 insertions(+), 362 deletions(-)

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