Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 6 Jan 2014 19:20:07 +0000 (14:20 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 6 Jan 2014 19:20:07 +0000 (14:20 -0500)
commite46316c86ee6a5e8909fa228455f9cf1dbee6957
tree50aab5930d1c9c2f8574be004e7aeac1141db64f
parenta50f9d5ee0f81271be49d64801bee0dfe84c2127
parentefc5520c4224479967b7381775a63fb48283b082
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-fixes