Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 22 Jul 2014 19:08:29 +0000 (22:08 +0300)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 22 Jul 2014 19:08:29 +0000 (22:08 +0300)

Trivial merge