Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 25 Jun 2014 18:20:22 +0000 (14:20 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 25 Jun 2014 18:20:22 +0000 (14:20 -0400)
commitdc70a292dab714f02c3012bddaee83a672df7656
treec3b6cf9ac486c5618670449860aad20acada47f9
parent12307e420864eb99a648dae84dd3888959885d97
parenta42c9fcc4a88cdd246fab3bcf06c4487afee3d88
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-fixes