diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-08-14 15:17:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-14 15:17:37 -0700 |
| commit | a61ebdfdb13a051f707b408d464f63b991aa21e3 (patch) | |
| tree | 4e175cc207463251e4335fdab7dff9fb056f199d /lib/pm-notifier-error-inject.c | |
| parent | netlink: Annotate RCU locking for seq_file walker (diff) | |
| parent | iwlwifi: mvm: disable scheduled scan to prevent firmware crash (diff) | |
| download | linux-dev-a61ebdfdb13a051f707b408d464f63b991aa21e3.tar.xz linux-dev-a61ebdfdb13a051f707b408d464f63b991aa21e3.zip | |
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>
Diffstat (limited to 'lib/pm-notifier-error-inject.c')
0 files changed, 0 insertions, 0 deletions