From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 22 Jan 2013 19:22:01 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: upstream/snapshot3+hdmi~5755^2~6^2^2~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cb4ec37d485b05decf4bdcd11724362c7f03606a;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-fixes
---

cb4ec37d485b05decf4bdcd11724362c7f03606a