]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 26 Jun 2012 18:27:34 +0000 (14:27 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 26 Jun 2012 18:27:34 +0000 (14:27 -0400)
commit29afa6aeddaf0bc32a6fe87c0d214cd55fd40d19
tree5b73cea04b13c888d94e29000c0a66ed2c23980f
parentd15aa9f26f317a89d97e7d14d6ab936f164b6ed7
parent6a634fda49bafca58a915613d8e6ad175db2d6df
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
drivers/net/wireless/mac80211_hwsim.c
include/net/mac80211.h
net/mac80211/cfg.c
net/mac80211/mlme.c