From: Johannes Berg <johannes@sipsolutions.net>
Date: Thu, 23 Oct 2008 07:55:43 +0000 (+0200)
Subject: Merge branch 'mesh-params'
X-Git-Tag: v0.9.6~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e90e07f1a591b33abc9da7a2b3b939656ec24f7;p=thirdparty%2Fiw.git

Merge branch 'mesh-params'

Conflicts:

	nl80211.h
---

4e90e07f1a591b33abc9da7a2b3b939656ec24f7