summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-11-08Merge remote-tracking branch 'asoc/topic/spear' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/sn95031' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/simple' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/si476x' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/samsung' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/rcar' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/pxa' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/mxs' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/ml26124' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/mc13783' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/max9850' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/max98095' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/max98088' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/fsl' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/doc' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/devm' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/davinci' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/cs42l73' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/cs42l52' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/cq93vc' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/core' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/component' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/bclk' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/atmel' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/arizona' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/adsp' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/adav80x' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/adau1373' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/ab8500' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/topic/88pm860x' into asoc-nextMark Brown
2013-11-08Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linusMark Brown
2013-11-08Merge remote-tracking branch 'asoc/fix/dma' into asoc-linusMark Brown
2013-11-08Merge remote-tracking branch 'asoc/fix/ak4642' into asoc-linusMark Brown
2013-11-08ASoC: fsl: imx-wm8962: remove an unneeded checkDan Carpenter
"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 Estevam
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-08scripts/tags.sh: remove obsolete __devinit[const|data]Michael Opdenacker
This removes the use of __devinitconst and __devinitdata in scripts/tags.sh, which were removed in 3.8. Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com> Cc: Michal Marek <mmarek@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Michal Marek <mmarek@suse.cz>
2013-11-08scripts: kallsyms: Use %zu to print 'size_t'Fabio Estevam
Commit f3462aa95 (Kbuild: Handle longer symbols in kallsyms.c) introduced the following warning on ARM: scripts/kallsyms.c:121:4: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'size_t' [-Wformat] Use %zu to print 'size_t'. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
2013-11-08inet: fix a UFO regressionEric Dumazet
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 Yang
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-08Merge tag 'drm-intel-fixes-2013-11-07' of ↵Dave Airlie
git://people.freedesktop.org/~danvet/drm-intel into drm-next Bit a bit -fixes pull request in the merge window than usual dua to two feauture-y things: - Display CRCs are now enabled on all platforms, including the odd DP case on gm45/vlv. Since this is a testing-only feature it should ever hurt, but I figured it'll help with regression-testing -fixes. So I left it in and didn't postpone it to 3.14. - Display power well refactoring from Imre. Would have caused major pain conflict with the bdw stage 1 patches if I'd postpone this to -next. It's only an relatively small interface rework, so shouldn't cause pain. It's also been in my tree since almost 3 weeks already. That accounts for about two thirds of the pull, otherwise just bugfixes: - vlv backlight fix from Jesse/Jani - vlv vblank timestamp fix from Jesse - improved edp detection through vbt from Ville (fixes a vlv issue) - eDP vdd fix from Paulo - fixes for dvo lvds on i830M - a few smaller things all over Note: This contains a backmerge of v3.12. Since the -internal branch always applied on top of -nightly I need that unified base to merge bdw patches. So you'll get a conflict with radeon connector props when pulling this (and nouveau/master will also conflict a bit when Ben doesn't rebase). The backmerge itself only had conflicts in drm/i915. There's also a tiny conflict between Jani's backlight fix and your sysfs lifetime fix in drm-next. * tag 'drm-intel-fixes-2013-11-07' of git://people.freedesktop.org/~danvet/drm-intel: (940 commits) drm/i915/vlv: use per-pipe backlight controls v2 drm/i915: make backlight functions take a connector drm/i915: move opregion asle request handling to a work queue drm/i915/vlv: use PIPE_START_VBLANK interrupts on VLV drm/i915: Make intel_dp_is_edp() less specific drm/i915: Give names to the VBT child device type bits drm/i915/vlv: enable HDA display audio for Valleyview2 drm/i915/dvo: call ->mode_set callback only when the port is running drm/i915: avoid unclaimed registers when capturing the error state drm/i915: Enable DP port CRC for the "auto" source on g4x/vlv drm/i915: scramble reset support for DP port CRC on vlv drm/i915: scramble reset support for DP port CRC on g4x drm/i916: add "auto" pipe CRC source ... Conflicts: MAINTAINERS drivers/gpu/drm/i915/intel_panel.c drivers/gpu/drm/nouveau/core/subdev/mc/base.c drivers/gpu/drm/radeon/atombios_encoders.c drivers/gpu/drm/radeon/radeon_connectors.c
2013-11-08drm/vmwgfx: fix warning if config intel iommu is off.Dave Airlie
Though I'm not really happy with how ugly this code is now. Signed-off-by: Dave Airlie <airlied@redhat.com>
2013-11-08drm/nouveau: consider CLASS_DISPLAY_3D devices while detecting dsm/optimusEmil Velikov
The present code assumes that optimus is present whenever two VGA (PCI_CLASS_DISPLAY_VGA) devices are present. This does not seem to be the case of newer laptops with optimus, in which case the nvidia gpu is a PCI_CLASS_DISPLAY_3D device. Rework the logic so that we count both VGA and 3D devices, when contemplating if optimus is present on the platform. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70208 Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>