From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 15 Aug 2012 18:29:37 +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~15175^2~319^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=16698918cdb39ae0d9289741ac2a9ed179f8b8ba;p=mirror_ubuntu-disco-kernel.git

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

16698918cdb39ae0d9289741ac2a9ed179f8b8ba