summaryrefslogtreecommitdiffstats
path: root/net/mac80211/ht.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2017-02-01 09:06:26 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2017-02-01 09:06:26 +0100
commit45bf86e7731606a475b7f989486de23b0784bfe7 (patch)
treedac8a776783d6322bedf346060fb6000251c8b40 /net/mac80211/ht.c
parent059c7a5a748d4e7481d8b1b4cf0e182cb81496ad (diff)
parent18566acac18f5784347bc5fe636a26897d1c963b (diff)
downloadtalos-obmc-linux-45bf86e7731606a475b7f989486de23b0784bfe7.tar.gz
talos-obmc-linux-45bf86e7731606a475b7f989486de23b0784bfe7.zip
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next
Backmerge to resync and also so that Ville can apply a cleanup patch from Takashi. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'net/mac80211/ht.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud