tree c283fa26cb05404de8ba43b57f573e955568d748
parent 701a9e619347ac06d59481db14bbc4df99763270
parent dc271ee0d04d12d6bfabacbec803289a7072fbd9
author John W. Linville <linville@tuxdriver.com> 1404759597 -0400
committer John W. Linville <linville@tuxdriver.com> 1404759597 -0400

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