]> git.ipfire.org Git - thirdparty/iw.git/commitdiff
projects / thirdparty / iw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80e0211 95940df)
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)
Conflicts:
nl80211.h


Trivial merge
Mirror git://git.kernel.org/pub/scm/linux/kernel/git/jberg/iw.git