tree 2b729d4435b4c6856381d88ea72080a27f8cda72
parent 5ba0eb4ad1d06f3d8f36dae02a0f2bf595d16ee4
parent 2470b36e84a2e680d7a7e3809cbceae5bfae3606
author John W. Linville <linville@tuxdriver.com> 1362425246 -0500
committer John W. Linville <linville@tuxdriver.com> 1362425246 -0500

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