From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 31 Oct 2012 17:10:01 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.12-rc1~2005^2~20^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=06272911485850b4a336122958c50af0f8ea7c13;p=kernel%2Fkernel-generic.git

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

06272911485850b4a336122958c50af0f8ea7c13