tree 4e175cc207463251e4335fdab7dff9fb056f199d
parent 9ce12eb16ffb143f3a509da86283ddd0b10bcdb3
parent 77b2f2865956b7573f9b040db7a9f808b434acd1
author David S. Miller <davem@davemloft.net> 1408054657 -0700
committer David S. Miller <davem@davemloft.net> 1408054657 -0700

Merge tag 'master-2014-08-14' of git://git.kernel.org/pub/scm/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>