tree 0a9bccc45ca1a02597ab35caca8c2fe92889f0b2
parent 3d5c203272b25c4391397247cdb0059a04fccddf
parent 25b9ea5c797b5d78f8ceced9ad9c7a7daf0db19c
author John W. Linville <linville@tuxdriver.com> 1362776027 -0500
committer John W. Linville <linville@tuxdriver.com> 1362776027 -0500

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