Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 17 Jan 2014 19:43:17 +0000 (14:43 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 17 Jan 2014 19:43:17 +0000 (14:43 -0500)
commit7916a075571f0ccd0830cf3da293188a8b6045e3
tree119c5bb9e513c8205efed485c2dc7b8271123326
parentcf84eb0b09c0f09b4c70a648b9dfeec78be61f07
parente4e19c031901e95dc7d1cf0a2c9c50525d71651f
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem
drivers/net/wireless/adm8211.c
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/ti/wl1251/main.c
include/net/nfc/nci_core.h
net/mac80211/tx.c
net/nfc/core.c
net/wireless/nl80211.c