From: David S. Miller <davem@davemloft.net>
Date: Thu, 14 Aug 2014 22:17:37 +0000 (-0700)
Subject: Merge tag 'master-2014-08-14' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a61ebdfdb13a051f707b408d464f63b991aa21e3;p=linux.git

Merge tag 'master-2014-08-14' of git://git./linux/kernel/git/linville/wireless

John W. Linville says:

====================
pull request: wireless 2014-08-14

Please pull this batch of fixes intended for the 3.17 stream...

Arend van Spriel brings two brcmfmac fixes, one which fixes a memory
leak and one which corrects some merge damage.

Emmanuel Grumbach fixes Linus's iwlwifi firmware-related log spam.

Rickard Strandqvist does some proper NULL termination after a call
to strncpy.

Ronald Wahl corrects a carl9170 problem with sending URBs with the
wrong endpoint type (resulting in log spam).
====================

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

a61ebdfdb13a051f707b408d464f63b991aa21e3