From: Johannes Berg <johannes@sipsolutions.net>
Date: Thu, 29 Jan 2009 13:42:58 +0000 (+0100)
Subject: Merge branch 'master' into scan-test
X-Git-Tag: v0.9.10~14
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fiw.git;a=commitdiff_plain;h=feedb87a9e7413b3a6116692aad433ad51f30f83

Merge branch 'master' into scan-test

Conflicts:
	nl80211.h
---

feedb87a9e7413b3a6116692aad433ad51f30f83