tree 7b04bc63c08adb384a1fd4eb118f364c56aa4dab
parent 608cfbe4abaf76e9d732efd7ed1cfa3998163d91
parent cf38e4f756d6396657c76f72ef42b6f47c523f97
author John W. Linville <linville@tuxdriver.com> 1389894857 -0500
committer John W. Linville <linville@tuxdriver.com> 1389894857 -0500

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