Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 14 Jun 2013 17:18:24 +0000 (13:18 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 14 Jun 2013 17:18:24 +0000 (13:18 -0400)
commit65574866d1f3f6db328923f951218c2995b66c77
treeea37382b1213deacb626a424dca24f40ede618bd
parentb70727e8a61a8e6b4d818519b03fce2937d0ef40
parentadaf69186c24100d34c2fb107dacd33546cad3c5
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next