tree 7dd8d60ed5f642add44b53f67c5a987b1145a030
parent ef4ead3f29256ed83991cd77b39334aadd25672a
parent 712b24adc105518f7cbbb6f9f353efea48954bb9
author John W. Linville <linville@tuxdriver.com> 1409852756 -0400
committer John W. Linville <linville@tuxdriver.com> 1409852756 -0400

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next