]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf3cd08435fd857a5d30be6dd8736ec0479910484
tree119c5bb9e513c8205efed485c2dc7b8271123326
parentd8386f6c46e199889c4d3ec97039d36edb222097
parent6df45e0a97ea75d59c92a6c615d1fe5d8c144308
Merge branch 'master' of git://git.kernel.org/pub/scm/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