summaryrefslogtreecommitdiffstats
path: root/net/can
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-03-02 14:39:17 -0800
committerDavid S. Miller <davem@davemloft.net>2017-03-02 14:39:17 -0800
commit35576ee17f7c15a5ec776570088fd2eff1dbdc2d (patch)
treef48759bbfa6184f13a83c19c36c006799432daec /net/can
parent1c296a3ea853ca785351fe4e6f389a967758ac60 (diff)
parenteb1e011a14748a1d9df9a7d7df9a5711721a1bdb (diff)
downloadlinux-35576ee17f7c15a5ec776570088fd2eff1dbdc2d.tar.bz2
Merge tag 'mac80211-for-davem-2017-03-02' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says: ==================== This contains just the average.h change in order to get it into the tree before adding new users through -next trees. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/can')
0 files changed, 0 insertions, 0 deletions