From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 18 Apr 2012 17:37:33 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: Ubuntu-5.2.0-15.16~18207^2~12^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=dbd717e37bf1409fd250d13aef2cab07bcae8c88;p=mirror_ubuntu-eoan-kernel.git

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

dbd717e37bf1409fd250d13aef2cab07bcae8c88