Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 4 Jan 2013 21:06:11 +0000 (16:06 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 4 Jan 2013 21:06:11 +0000 (16:06 -0500)
commita910c9cab60c2407e1eab49bbc154628a114c719
tree5bb91b0a930ad1592beef33db30c744b82e65724
parentd339fc8980955faca38141a4483761241b62e7c4
parentf590dcec944552f9a4a61155810f3abd17d6465d
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-fixes