Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 13 May 2014 18:52:34 +0000 (14:52 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 13 May 2014 18:52:34 +0000 (14:52 -0400)
commit209f6c37540a6cc1c74333a7ede0da729488a8cd
treee7c040198825b713b1b5b8d467e06d45d1faf6a1
parent03e5da151b8e390f2e28c4edf8fbbb6ca6d7a7ed
parentb538b8ce76f69f7fa225bc0817bbb361b877ea23
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-fixes