From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 12 Jul 2012 17:44:50 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.6-rc1~125^2~179^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=38a00840638b4932152bca48098dbfa069d942a2;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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

38a00840638b4932152bca48098dbfa069d942a2