summaryrefslogtreecommitdiff
path: root/mac80211.c
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2016-10-04 17:41:03 +0200
committerTobias Klauser <tklauser@distanz.ch>2016-10-04 17:41:03 +0200
commit7e7bfc9f66066771804af28ae293dca3d9b7f4bb (patch)
tree61592f6838506935c7f21446df54b46f18dc1114 /mac80211.c
parent2671a349c712ac7d0c0f8cd3f4ede13434859d6d (diff)
AUTHORS: Add Yousong Zhou for his contribution
Add Yousong Zhou for commits 47493936 ("build: configure: fix checking CC containing -i option") and 70079759 ("all: fix build on CentOS 6 by checking presence of several macros"), submitted via #160. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'mac80211.c')
0 files changed, 0 insertions, 0 deletions
bb4076ace670addc55300e3b8c4a02dfc6'>diff)
Merge branch 'nvme-4.10-fixes' of git://git.infradead.org/nvme into for-linus
Pull nvme target fixes from Sagi: Given that its -rc6, I removed anything that is not bug fix. - nvmet-fc discard fix from Christoph - queue disconnect fix from James - nvmet-rdma dma sync fix from Parav - Some more nvmet fixes
Diffstat (limited to 'include/dt-bindings/display/tda998x.h')