Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Wed, 29 Apr 2015 10:12:18 +0000 (13:12 +0300)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Wed, 29 Apr 2015 10:12:18 +0000 (13:12 +0300)
commitac1c8d5ea14dcf7cbfab97a9221cc80ee850a7b5
tree1b47e714692c56c72907cfd54b7f494e0dfae338
parent6c373ca89399c5a3f7ef210ad8f63dc3437da345
parente7afe89fd67d40a7f5fff8130c5f925d99a94b1f
Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next