]> git.ipfire.org Git - thirdparty/iw.git/commit
Merge branch 'master' into scan-test
authorJohannes Berg <johannes@sipsolutions.net>
Thu, 5 Feb 2009 20:08:54 +0000 (21:08 +0100)
committerJohannes Berg <johannes@sipsolutions.net>
Thu, 5 Feb 2009 20:08:54 +0000 (21:08 +0100)
commit50563c6af47ce7abda6c7b23f57f86114a521662
treed96c9d07aa170ddd4684373c491d67fc12a21dca
parent84bee8120fe389dc4587ef4bcd778c3e62b29cc4
parent7ab6522718c8f70dcc580bd2b380ca4a7c681bda
Merge branch 'master' into scan-test

Conflicts:
nl80211.h
Makefile
info.c
nl80211.h