Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 6 Jul 2014 08:15:30 +0000 (11:15 +0300)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 6 Jul 2014 08:15:30 +0000 (11:15 +0300)

Trivial merge