tree 87eba8a229b302f5bffcca5a085f271430330ac1
parent 6bb7aabf73401c9cfca26c71ccae1e3d6e1640d5
parent 622ebe994f6866b8d46ee5d3bcc329ed65d3722d
author John W. Linville <linville@tuxdriver.com> 1371061701 -0400
committer John W. Linville <linville@tuxdriver.com> 1371061701 -0400

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