tree c91096cfecc226413d4d702f52c71ef6152223df
parent ba23d2068d85f6616ea5f92320c04e87d4b9e141
parent abae2386d55aff1d395cdb665f03684c227a6a69
author John W. Linville <linville@tuxdriver.com> 1357588663 -0500
committer John W. Linville <linville@tuxdriver.com> 1357588663 -0500

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