Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 4 Sep 2014 17:45:56 +0000 (13:45 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 4 Sep 2014 17:45:56 +0000 (13:45 -0400)
commitd17ec4d55223d9487df195012762da6f85862d4c
tree7dd8d60ed5f642add44b53f67c5a987b1145a030
parentef4ead3f29256ed83991cd77b39334aadd25672a
parent712b24adc105518f7cbbb6f9f353efea48954bb9
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next