]> git.ipfire.org Git - thirdparty/iw.git/commit
Merge branch 'ibss-test'
authorJohannes Berg <johannes@sipsolutions.net>
Mon, 20 Apr 2009 22:36:20 +0000 (00:36 +0200)
committerJohannes Berg <johannes@sipsolutions.net>
Mon, 20 Apr 2009 22:36:20 +0000 (00:36 +0200)
commite5075677859cae658322933aace593a76227d221
treefde39f40e85d79b1c1d4c6713a1264941decad9a
parent80e02110bcdfe033e3ff849796b04bc7d3cdccf0
parent95940df3ac17e46bddfc2467bc17c03f79d7f418
Merge branch 'ibss-test'

Conflicts:
nl80211.h