Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 12 Jul 2012 19:21:48 +0000 (15:21 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 12 Jul 2012 19:21:48 +0000 (15:21 -0400)
commit8a50ace27134c8ef2b9ca4c47dd91cb733f52a53
treecb43f5d627f53645dc19b3a70ef0d0cf0263a684
parentd07d152892aadd8dc3209ecef6788dfc83475676
parent3ec4588231914344834805a6828551cd5c65afd8
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next