From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 6 Dec 2011 15:47:12 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: upstream/snapshot3+hdmi~8450^2~332^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d39aeaf260e7d1ec6a677beed230a0406d0069a6;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

d39aeaf260e7d1ec6a677beed230a0406d0069a6