Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

diff --cc drivers/net/wireless/adm8211.c
Simple merge

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

diff --cc drivers/net/wireless/ti/wl1251/main.c
Simple merge

diff --cc include/net/nfc/nci_core.h
Simple merge

diff --cc net/mac80211/tx.c
Simple merge

diff --cc net/nfc/core.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge