Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 28 May 2013 17:39:40 +0000 (13:39 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 28 May 2013 17:39:40 +0000 (13:39 -0400)
commit25da0cd4233dbc3dbf8adbd7a357d00a9e796f40
treee054d7f78266eda7ac0a7d0fde36d87ac6bb80b0
parentd61bdbf1235b7a11b29197b538bbee41855eaf38
parenta87783699b23395c46bbeeb5d28f6db24897bf26
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-fixes