Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 23 Jan 2014 19:00:51 +0000 (14:00 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 23 Jan 2014 19:00:51 +0000 (14:00 -0500)
commitcfa9c3fba738031ae107039ed7da0819f2c02502
treeda94fedf2f79af10150e23c930208b1e66f78df5
parente4e19c031901e95dc7d1cf0a2c9c50525d71651f
parent23e76d1a516eef416fb5c038791e943fc0916b67
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next