summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-11-08Merge remote-tracking branch 'asoc/topic/tegra' into asoc-nextMark Brown6-28/+186
2013-11-08Merge remote-tracking branch 'asoc/topic/tas5086' into asoc-nextMark Brown1-62/+109
2013-11-08Merge remote-tracking branch 'asoc/topic/spear' into asoc-nextMark Brown2-22/+4
2013-11-08Merge remote-tracking branch 'asoc/topic/sn95031' into asoc-nextMark Brown1-15/+20
2013-11-08Merge remote-tracking branch 'asoc/topic/simple' into asoc-nextMark Brown1-0/+5
2013-11-08Merge remote-tracking branch 'asoc/topic/si476x' into asoc-nextMark Brown1-48/+16
2013-11-08Merge remote-tracking branch 'asoc/topic/samsung' into asoc-nextMark Brown3-19/+12
2013-11-08Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-nextMark Brown1-6/+25
2013-11-08Merge remote-tracking branch 'asoc/topic/rcar' into asoc-nextMark Brown11-197/+346
2013-11-08Merge remote-tracking branch 'asoc/topic/pxa' into asoc-nextMark Brown13-48/+46
2013-11-08Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-nextMark Brown1-0/+1
2013-11-08Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-nextMark Brown1-0/+1
2013-11-08Merge remote-tracking branch 'asoc/topic/mxs' into asoc-nextMark Brown4-22/+40
2013-11-08Merge remote-tracking branch 'asoc/topic/ml26124' into asoc-nextMark Brown1-0/+2
2013-11-08Merge remote-tracking branch 'asoc/topic/mc13783' into asoc-nextMark Brown4-61/+91
2013-11-08Merge remote-tracking branch 'asoc/topic/max9850' into asoc-nextMark Brown1-10/+29
2013-11-08Merge remote-tracking branch 'asoc/topic/max98095' into asoc-nextMark Brown1-296/+170
2013-11-08Merge remote-tracking branch 'asoc/topic/max98088' into asoc-nextMark Brown1-351/+273
2013-11-08Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-nextMark Brown5-28/+94
2013-11-08Merge remote-tracking branch 'asoc/topic/fsl' into asoc-nextMark Brown8-36/+28
2013-11-08Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-nextMark Brown1-1/+1
2013-11-08Merge remote-tracking branch 'asoc/topic/doc' into asoc-nextMark Brown5-66/+456
2013-11-08Merge remote-tracking branch 'asoc/topic/devm' into asoc-nextMark Brown12-52/+108
2013-11-08Merge remote-tracking branch 'asoc/topic/davinci' into asoc-nextMark Brown8-91/+382
2013-11-08Merge remote-tracking branch 'asoc/topic/cs42l73' into asoc-nextMark Brown4-90/+173
2013-11-08Merge remote-tracking branch 'asoc/topic/cs42l52' into asoc-nextMark Brown3-40/+57
2013-11-08Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-nextMark Brown1-0/+1
2013-11-08Merge remote-tracking branch 'asoc/topic/cq93vc' into asoc-nextMark Brown1-32/+14
2013-11-08Merge remote-tracking branch 'asoc/topic/core' into asoc-nextMark Brown7-381/+177
2013-11-08Merge remote-tracking branch 'asoc/topic/component' into asoc-nextMark Brown2-104/+174
2013-11-08Merge remote-tracking branch 'asoc/topic/bclk' into asoc-nextMark Brown2-0/+19
2013-11-08Merge remote-tracking branch 'asoc/topic/atmel' into asoc-nextMark Brown3-9/+2
2013-11-08Merge remote-tracking branch 'asoc/topic/arizona' into asoc-nextMark Brown2-9/+26
2013-11-08Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-nextMark Brown1-2/+0
2013-11-08Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-nextMark Brown1-3/+8
2013-11-08Merge remote-tracking branch 'asoc/topic/adsp' into asoc-nextMark Brown1-7/+20
2013-11-08Merge remote-tracking branch 'asoc/topic/adav80x' into asoc-nextMark Brown1-45/+102
2013-11-08Merge remote-tracking branch 'asoc/topic/adau1373' into asoc-nextMark Brown1-61/+237
2013-11-08Merge remote-tracking branch 'asoc/topic/ab8500' into asoc-nextMark Brown1-47/+45
2013-11-08Merge remote-tracking branch 'asoc/topic/88pm860x' into asoc-nextMark Brown2-121/+71
2013-11-08Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linusMark Brown1-20/+2
2013-11-08Merge remote-tracking branch 'asoc/fix/dma' into asoc-linusMark Brown7-29/+118
2013-11-08Merge remote-tracking branch 'asoc/fix/ak4642' into asoc-linusMark Brown1-1/+1
2013-11-08ASoC: fsl: imx-wm8962: remove an unneeded checkDan Carpenter1-2/+1
"data->codec_clk" can't be an ERR_PTR here so I have removed the superflous check. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-11-08ASoC: fsl: imx-pcm-fiq: Remove unused 'runtime' variableFabio Estevam1-1/+0
Commit 68f9672b (ASoC: fsl: imx-pcm-fiq: remove bogus period delta calculation) introduced the following build warning: sound/soc/fsl/imx-pcm-fiq.c:53:26: warning: unused variable 'runtime' [-Wunused-variable] Remove the unused 'runtime' variable. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Oskar Schirmer <oskar@scara.com> Signed-off-by: Mark Brown <broonie@linaro.org>
2013-11-08inet: fix a UFO regressionEric Dumazet1-1/+3
While testing virtio_net and skb_segment() changes, Hannes reported that UFO was sending wrong frames. It appears this was introduced by a recent commit : 8c3a897bfab1 ("inet: restore gso for vxlan") The old condition to perform IP frag was : tunnel = !!skb->encapsulation; ... if (!tunnel && proto == IPPROTO_UDP) { So the new one should be : udpfrag = !skb->encapsulation && proto == IPPROTO_UDP; ... if (udpfrag) { Initialization of udpfrag must be done before call to ops->callbacks.gso_segment(skb, features), as skb_udp_tunnel_segment() clears skb->encapsulation (We want udpfrag to be true for UFO, false for VXLAN) With help from Alexei Starovoitov Reported-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Alexei Starovoitov <ast@plumgrid.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2013-11-08ALSA: hda/realtek - Make fixup regs persist after resumeKailang Yang1-0/+2
Upon suspend / resume, the fixup register settings are lost because sending HDA_FIXUP_ACT_PRE_PROBE is not part of the resume path. Instead, write our registers in response to the HDA_FIXUP_ACT_INIT, which happens after initial probe and upon resume. Signed-off-by: Kailang Yang <kailang@realtek.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-11-08f2fs: fix memory leak after kobject init failed in fill_superChao Yu1-2/+8
If we failed to init&add kobject when fill_super, stats info and proc object of f2fs will not be released. We should free them before we finish fill_super. Signed-off-by: Chao Yu <chao2.yu@samsung.com> Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
2013-11-08f2fs: cleanup waiting routine for writeback pages in cpChangman Lee4-12/+21
use genernal method supported by kernel o changes from v1 If any waiter exists at end io, wake up it. Signed-off-by: Changman Lee <cm224.lee@samsung.com> Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
2013-11-08Merge branch 'pskb_put'David S. Miller5-32/+31
Mathias Krause says: ==================== move pskb_put (was: IPsec improvements) This series moves pskb_put() to the core code, making the code duplication in caif obsolete (patches 1 and 2). Patch 3 fixes a few kernel-doc issues. v2 of this series does no longer contain the skb_cow_data() patch and therefore no performance improvements for IPsec. The change is still under discussion, but otherwise independent from the above changes. Please apply! v2: - kernel-doc fixes for pskb_put, as noticed by Ben - dropped skb_cow_data patch as it's still discussed - added a kernel-doc fixes patch (patch 3) ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
generated by cgit v1.2.3 (git 2.39.0) at 2025-10-02 20:47:35 +0300