]> git.ipfire.org Git - thirdparty/iw.git/commit - interface.c
Merge branch 'master' into scan-test
authorJohannes Berg <johannes@sipsolutions.net>
Thu, 29 Jan 2009 13:42:58 +0000 (14:42 +0100)
committerJohannes Berg <johannes@sipsolutions.net>
Thu, 29 Jan 2009 13:42:58 +0000 (14:42 +0100)
commitfeedb87a9e7413b3a6116692aad433ad51f30f83
treef7e2b78916bd8002981330abbb9ed0819e80aaef
parent4e6d3cb88a3bfbb3fe5af115cec0fea098aa923d
parent57077d6405ffe61e4959e23ba93f9fa59c761f18
Merge branch 'master' into scan-test

Conflicts:
nl80211.h
Makefile
info.c