tree e825711effd11b63bccadaabb4df6d5be2698de3
parent db18014f65f62879e70be55898be3fd68a3363a8
parent 82b715c211a53e80a1db83b9b71995a05fe32908
author John W. Linville <linville@tuxdriver.com> 1393272342 -0500
committer John W. Linville <linville@tuxdriver.com> 1393272342 -0500

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