From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 11 Nov 2011 16:34:47 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.2-rc3~25^2~36^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=fb14ca438c0a54306419ee648d9d146c5e7be679;p=linux-block.git

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

fb14ca438c0a54306419ee648d9d146c5e7be679