tree 4da554a6d83adbfea3e00e242f97028a69cc0bb7
parent d0746663667f37e7be5646bf68cb452c8375a23d
parent 89716344806bd49d213ad5960661e8c2d38c4982
author John W. Linville <linville@tuxdriver.com> 1376678920 -0400
committer John W. Linville <linville@tuxdriver.com> 1376678920 -0400

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