tree 04ab3567c3bea31503c4dfa94909f99dc4b3789f
parent f761b6947dde42890beea59b020e1be87491809e
parent 0f6b3f597daab2254614e2773e322e73fb1b6f4b
author John W. Linville <linville@tuxdriver.com> 1340390393 -0400
committer John W. Linville <linville@tuxdriver.com> 1340390393 -0400

Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next