Merge tag 'wireless-drivers-for-davem-2015-01-09' of git://git.kernel.org/pub/scm...
authorDavid S. Miller <davem@davemloft.net>
Mon, 12 Jan 2015 05:23:45 +0000 (00:23 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 12 Jan 2015 05:23:45 +0000 (00:23 -0500)
* rtlwifi: fix a regression in large skb allocation failure

iwlwifi:

* fix for 7265D NVM check
* fixes for scan: fix long scanning times and network discovery
* new firmware API for iwlmvm supported devices
* fixes in rate control

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge