tree 7deef6efeb4602267671e2b942b6e6174f9481af
parent c699404db182836498bd9d9a36ef044de2cab4fd
parent 905e36ae172c83a30894a3adefab7d4f850fcf54
author Kalle Valo <kvalo@codeaurora.org> 1456483420 +0200
committer Kalle Valo <kvalo@codeaurora.org> 1456483420 +0200
mergetag object 905e36ae172c83a30894a3adefab7d4f850fcf54
 type commit
 tag iwlwifi-for-kalle-2016-02-25
 tagger Emmanuel Grumbach <emmanuel.grumbach@intel.com> 1456433531 +0200
 
 Two fixes for 4.5:
 * We forgot to free the paging memory (Matti)
 * Fix the frames in flight accounting (Liad)
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWz2l7AAoJEC0Llv5uNjIByy4P/3Q/Vtcxnp899HYBt1luugpE
 QE2RtIf72JqvBihMdEgYZPd8e3K9ta1M+jt+3fLhn4gC/vEFydo68t0evoEA1QX8
 d0LFZk9YDCVyHhLfPsnkLMVRwRcmfqALyv/gcEjRS8AYO+ZC7BzI8z25iSn25O4J
 M0EwdL1MWCtVAdglyh6vVlh9k90Fby84MzFa53MvIT4hv+Lc2qQawn/bT8vDFf1A
 /pc0aovgpOoTrQT8Ld00wcROak+6W0ad4c28tke30U/W9MOvk7uJl495rEeA1Kw1
 pMNKOyEifbq6efS/4zZwFI7gIpgTE/fbGeb0onw4RB5SFUbHm+P88dIEzUp8mhD2
 Y0gNPAuY1rPCDwDUX0oWtzLVqunZMxIz5CwPBahuxrXs5RuSKkEcUpuLvZcY9iaD
 GYniIitsubBPjclAUXFJEqbZ0QwS73EQjztnaAv6K8UOcaEHO78erW6P0r10Q15l
 /ZdGcGb0qzpvIgJHSPf/lNAYtSvunzwqp4wktcBpxf/734QJ4xSdN4wFBWsBSrq0
 q5hv6lp/sqM3Ch72xnPcwTZRgMlnVt9aiKLDiJuwrXMO/oog3sfxgkKc2FL4w8n0
 b/R1xzXSqzKDsBHufWpSL6FHlue1yL1gYr2RdcqOuwGHedurPeKWiDVJJ4Rqgkhb
 /uBO1D8JKU1c9M6+fA5R
 =hdNJ
 -----END PGP SIGNATURE-----

Merge tag 'iwlwifi-for-kalle-2016-02-25' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

Two fixes for 4.5:
* We forgot to free the paging memory (Matti)
* Fix the frames in flight accounting (Liad)