Merge remote-tracking branch 'iwlwifi-fixes/master' into NEXT
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 14 Sep 2014 09:54:42 +0000 (12:54 +0300)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 14 Sep 2014 09:54:42 +0000 (12:54 +0300)

Trivial merge