From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 10 Apr 2013 18:10:24 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v3.10-rc1~120^2~43^2^2~97
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d72c728210fa803a21203360c0f40b32972d795a;p=users%2Fhch%2Fblock.git

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
---

d72c728210fa803a21203360c0f40b32972d795a