]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'wireless-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 01:52:26 +0000 (12:52 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 01:52:26 +0000 (12:52 +1100)
commit2c6f8bcd28eb32cf2c24cf9be7a0e294968106a7
treeccf1539f3e67b45720dbe91cee924ffbf67d6af6
parent39b12d6cb96b6c6f42b9e1c400bd60ce37ce553f
parent608cfbe4abaf76e9d732efd7ed1cfa3998163d91
Merge remote-tracking branch 'wireless-next/master'
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