diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-05-27 17:16:53 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-05-27 17:16:53 +0200 |
| commit | eb4606e64a7d548f5d60a9583baa8104890b2c6e (patch) | |
| tree | 2dc8e587fc79c207dab2fb74830963cc84dcf801 /fs/proc/base.c | |
| parent | 86c72d1ce91d804e4fa8d90b316a89597dd220f1 (diff) | |
| parent | bf65921380cd50b87618df550398e06581f4a361 (diff) | |
| download | linux-next-eb4606e64a7d548f5d60a9583baa8104890b2c6e.tar.gz | |
Merge tag 'asoc-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v4.7 part 2
Really sorry about this late pull request. It looks like at the time I
sent my pull request for v4.7 there was some conflict or other issue
which caused my script to stop merging the ASoC branches at some point
after the HDMI changes.
It's all specific driver updates, including:
- New drivers for MAX98371 and TAS5720.
- SPI support for TLV320AIC32x4.
- TDM support for STI Uniperf IPs.
This code should all have been in -next prior to the merge window apart
from some fixes, it dropped out on the 18th.
Diffstat (limited to 'fs/proc/base.c')
| -rw-r--r-- | fs/proc/base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 92e37e224cd2..0d163a84082d 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -434,7 +434,7 @@ static int proc_pid_wchan(struct seq_file *m, struct pid_namespace *ns, && !lookup_symbol_name(wchan, symname)) seq_printf(m, "%s", symname); else - seq_puts(m, "0\n"); + seq_putc(m, '0'); return 0; } |