Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwif...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 26 Sep 2014 17:33:58 +0000 (13:33 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 26 Sep 2014 17:33:58 +0000 (13:33 -0400)
commitd3d3e0017fcc2c3c8e5f6a229f4b65f8bcc15bae
tree4f8e9ed6eafd0b784bab4540373a210894bea96d
parent7a0a260a0f6ff0226c33cf28a5cc26711ab0ae5f
parent48849a4150e353656dc5d207f2a56ebd00484ce6
Merge branch 'master' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next