tree c3b6cf9ac486c5618670449860aad20acada47f9
parent 12307e420864eb99a648dae84dd3888959885d97
parent a42c9fcc4a88cdd246fab3bcf06c4487afee3d88
author John W. Linville <linville@tuxdriver.com> 1403720422 -0400
committer John W. Linville <linville@tuxdriver.com> 1403720422 -0400

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