From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 3 Apr 2013 17:50:34 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: Ubuntu-5.0.0-8.9~14007^2~10^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=407ad2b7efebe42f8331fd42c4576ed3a6117e29;p=mirror_ubuntu-disco-kernel.git

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

407ad2b7efebe42f8331fd42c4576ed3a6117e29