Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 22 May 2014 17:53:27 +0000 (13:53 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 22 May 2014 17:53:27 +0000 (13:53 -0400)
commit2c316e699fa40f2fc161ebb770b6e2845db4f3b0
tree6dce3aa33e10f92e9df01521daea72367084683e
parent20b4f9c73ff4137d720c4f378e1a780ac6a6c04d
parent7bacc782270ff7db3b9f29fa5d24ad2ee1e8e81d
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-fixes