From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 18 Jun 2012 19:13:27 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.5-rc5~17^2~34
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8cfe523a1294da65ef95b6ed7b0f7db5629f8d88;p=linux-2.6-block.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem
---

8cfe523a1294da65ef95b6ed7b0f7db5629f8d88