From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 14 Aug 2012 18:42:54 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.6-rc3~10^2~40^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e55217e174f4e6920fd441dcd3aaf8e37645460;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

1e55217e174f4e6920fd441dcd3aaf8e37645460