From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 16 Nov 2012 17:59:13 +0000 (-0500)
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~14852^2^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=26c6e80892d8c160dffaba85889bd4e65b1dacf6;p=mirror_ubuntu-disco-kernel.git

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

26c6e80892d8c160dffaba85889bd4e65b1dacf6