tree 5d5817ab3198661ab8dcb5348b7139ac6e51b794
parent a72e25f78134cc0c1ef2adc99d6c3680ebd80e35
parent 246dd9922e859768aa522daa6c1c601785e57e0c
author John W. Linville <linville@tuxdriver.com> 1382119093 -0400
committer John W. Linville <linville@tuxdriver.com> 1382119093 -0400

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