tree a76ed2231a207a6e3d951acc7fd749bc12173416
parent 3cd17638fdf13d2f7fe76465cf74106e612af5eb
parent 4e760f1ab267edcd6e4b232ff732fc9cdc659ebb
author John W. Linville <linville@tuxdriver.com> 1350676097 -0400
committer John W. Linville <linville@tuxdriver.com> 1350676097 -0400

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