From: David S. Miller <davem@davemloft.net>
Date: Wed, 1 Apr 2015 18:48:50 +0000 (-0400)
Subject: Merge tag 'wireless-drivers-for-davem-2015-04-01' of git://git.kernel.org/pub/scm... 
X-Git-Tag: v4.0-rc7~18^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f5f321c43150cb4db8f342c8479c6fbdbe20b338;p=linux-2.6-block.git

Merge tag 'wireless-drivers-for-davem-2015-04-01' of git://git./linux/kernel/git/kvalo/wireless-drivers

Kalle Valo says:

====================
iwlwifi:

* fix a memory leak, we leaked memory each time the module
  was loaded.
====================

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

f5f321c43150cb4db8f342c8479c6fbdbe20b338