Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 22 Jun 2012 18:39:53 +0000 (14:39 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 22 Jun 2012 18:39:53 +0000 (14:39 -0400)
commit133189a46c2c522eb4ef26b1ede63dd0a9fdc920
tree04ab3567c3bea31503c4dfa94909f99dc4b3789f
parentf761b6947dde42890beea59b020e1be87491809e
parent0f6b3f597daab2254614e2773e322e73fb1b6f4b
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
net/mac80211/cfg.c
net/mac80211/mlme.c