]> git.ipfire.org Git - thirdparty/iw.git/commit
Merge branch 'mesh-params'
authorJohannes Berg <johannes@sipsolutions.net>
Thu, 23 Oct 2008 07:55:43 +0000 (09:55 +0200)
committerJohannes Berg <johannes@sipsolutions.net>
Thu, 23 Oct 2008 07:55:43 +0000 (09:55 +0200)
commit4e90e07f1a591b33abc9da7a2b3b939656ec24f7
tree34485e55adda86a7f66e5c9fe5837fe759098be9
parent58f018c31014553001ad44755a4f4fd3a00d718c
parent46c1ad1fac51356236e746e285995c6629fd8650
Merge branch 'mesh-params'

Conflicts:

nl80211.h
nl80211.h