From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 11 Oct 2013 07:57:47 +0000 (+0200)
Subject: Merge remote-tracking branch 'wireless-next/master' into HEAD
X-Git-Tag: v3.13-rc1~105^2~55^2^2~52^2~14
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=04a4e1fdd248d7a19d53e6e90f757e99093e3d29;p=~emulex%2Finfiniband.git

Merge remote-tracking branch 'wireless-next/master' into HEAD
---

04a4e1fdd248d7a19d53e6e90f757e99093e3d29