aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-10-25Merge tag 'fixes-for-linus' of ↵Linus Torvalds2-7/+73
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC fixes from Olof Johansson: "There's really only one bugfix in this branch, which is a fix for timers on the integrator platform. Since Linus Walleij is resurrecting support for the platform it seems valuable to get the fix into 3.12 even though the regression has been around a while. The rest are a handful of maintainers updates. If you prefer to hold those until 3.13 then just merge the first patch on the branch which is the fix" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: MAINTAINERS: Add maintainers entry for Rockchip SoCs MAINTAINERS: Tegra updates, and driver ownership MAINTAINERS: ARM: mvebu: add Sebastian Hesselbarth ARM: integrator: deactivate timer0 on the Integrator/CP
2013-10-25ASoC: kirkwood: Fix compile error due to patch 'add S/PDIF support'Jean-Francois Moine1-1/+1
This patch fixes the compilation error of kirkwood-i2s.c introduced by the commit 75b9b65ee5a80e99e 'ASoC: kirkwood: add S/PDIF support'. Signed-off-by: Jean-Francois Moine <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2013-10-25Merge tag 'ecryptfs-3.12-rc7-fixes' of ↵Linus Torvalds2-2/+3
git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs Pull ecryptfs fixes from Tyler Hicks: "Two important fixes - Fix long standing memory leak in the (rarely used) public key support - Fix large file corruption on 32 bit architectures" * tag 'ecryptfs-3.12-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs: eCryptfs: fix 32 bit corruption issue ecryptfs: Fix memory leakage in keystore.c
2013-10-25PM / hibernate: Move software_resume to late_initcall_syncRuss Dill1-1/+1
software_resume is being called after deferred_probe_initcall in drivers base. If the probing of the device that contains the resume image is deferred, and the system has been instructed to wait for it to show up, this wait will occur in software_resume. This causes a deadlock. Move software_resume into late_initcall_sync so that it happens after all the other late_initcalls. Signed-off-by: Russ Dill <[email protected]> Acked-by: Pavel Machek <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
2013-10-24mtd: nand: pxa3xx: Fix registered MTD nameEzequiel Garcia1-1/+6
In a recent commit: commit f455578dd961087a5cf94730d9f6489bb1d355f0 Author: Ezequiel Garcia <[email protected]> Date: Mon Aug 12 14:14:53 2013 -0300 mtd: nand: pxa3xx: Remove hardcoded mtd name There's no advantage in using a hardcoded name for the mtd device. Instead use the provided by the platform_device. The MTD name was changed to use the one provided by the platform_device. However, this can be problematic as some users want to set partitions using the kernel parameter 'mtdparts', where the name is needed. Therefore, to avoid regressions in users relying in 'mtdparts' we revert the change and use the previous one 'pxa3xx_nand-0'. While at it, let's put a big comment and prevent this change from happening ever again. Signed-off-by: Ezequiel Garcia <[email protected]> Signed-off-by: Brian Norris <[email protected]>
2013-10-24eCryptfs: fix 32 bit corruption issueColin Ian King1-1/+1
Shifting page->index on 32 bit systems was overflowing, causing data corruption of > 4GB files. Fix this by casting it first. https://launchpad.net/bugs/1243636 Signed-off-by: Colin Ian King <[email protected]> Reported-by: Lars Duesing <[email protected]> Cc: [email protected] # v3.11+ Signed-off-by: Tyler Hicks <[email protected]>
2013-10-24dmaengine: edma: fix another memory leakVinod Koul1-0/+1
commit 4b6271a6 fix a menory leak but one more existed in driver so fix that Signed-off-by: Vinod Koul <[email protected]>
2013-10-24dma: edma: Fix memory leakValentin Ilie1-0/+1
When it fails to allocate a slot, edesc should be free'd before return; Signed-off-by: Valentin Ilie <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2013-10-24ASoC: eukrea-tlv320: Use dev_err instead of pr_err.Denis Carikli1-5/+10
It also contains a minor style cleanup. Signed-off-by: Denis Carikli <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2013-10-24Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-nextMark Brown1-110/+108
2013-10-24Merge remote-tracking branch 'asoc/topic/wm8400' into asoc-nextMark Brown1-75/+20
2013-10-24Merge remote-tracking branch 'asoc/topic/twl6040' into asoc-nextMark Brown1-19/+7
2013-10-24Merge remote-tracking branch 'asoc/topic/twl4030' into asoc-nextMark Brown1-44/+36
2013-10-24Merge remote-tracking branch 'asoc/topic/tpa6130a2' into asoc-nextMark Brown2-9/+50
2013-10-24Merge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-nextMark Brown2-121/+139
2013-10-24Merge remote-tracking branch 'asoc/topic/tlv320aic32x4' into asoc-nextMark Brown1-71/+30
2013-10-24Merge remote-tracking branch 'asoc/topic/tlv320aic26' into asoc-nextMark Brown2-116/+28
2013-10-24Merge remote-tracking branch 'asoc/topic/tlv320aic23' into asoc-nextMark Brown1-50/+34
2013-10-24Merge remote-tracking branch 'asoc/topic/tegra' into asoc-nextMark Brown6-28/+186
2013-10-24Merge remote-tracking branch 'asoc/topic/tas5086' into asoc-nextMark Brown1-62/+109
2013-10-24Merge remote-tracking branch 'asoc/topic/spear' into asoc-nextMark Brown2-22/+4
2013-10-24Merge remote-tracking branch 'asoc/topic/sn95031' into asoc-nextMark Brown1-15/+20
2013-10-24Merge remote-tracking branch 'asoc/topic/simple' into asoc-nextMark Brown1-0/+5
2013-10-24Merge remote-tracking branch 'asoc/topic/si476x' into asoc-nextMark Brown1-48/+16
2013-10-24Merge remote-tracking branch 'asoc/topic/samsung' into asoc-nextMark Brown3-18/+11
2013-10-24Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-nextMark Brown1-3/+21
2013-10-24Merge remote-tracking branch 'asoc/topic/rcar' into asoc-nextMark Brown10-185/+326
2013-10-24Merge remote-tracking branch 'asoc/topic/pxa' into asoc-nextMark Brown13-48/+46
2013-10-24Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-nextMark Brown1-0/+1
2013-10-24Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-nextMark Brown1-0/+1
2013-10-24Merge remote-tracking branch 'asoc/topic/mxs' into asoc-nextMark Brown4-22/+40
2013-10-24Merge remote-tracking branch 'asoc/topic/mc13783' into asoc-nextMark Brown4-61/+91
2013-10-24Merge remote-tracking branch 'asoc/topic/max9850' into asoc-nextMark Brown1-10/+29
2013-10-24Merge remote-tracking branch 'asoc/topic/max98095' into asoc-nextMark Brown1-296/+170
2013-10-24Merge remote-tracking branch 'asoc/topic/max98088' into asoc-nextMark Brown1-351/+273
2013-10-24Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-nextMark Brown5-27/+93
2013-10-24Merge remote-tracking branch 'asoc/topic/fsl' into asoc-nextMark Brown7-24/+17
2013-10-24Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-nextMark Brown1-1/+1
2013-10-24Merge remote-tracking branch 'asoc/topic/doc' into asoc-nextMark Brown5-66/+456
2013-10-24Merge remote-tracking branch 'asoc/topic/dma' into asoc-nextMark Brown7-28/+115
2013-10-24Merge remote-tracking branch 'asoc/topic/devm' into asoc-nextMark Brown12-52/+108
2013-10-24Merge remote-tracking branch 'asoc/topic/davinci' into asoc-nextMark Brown8-91/+382
2013-10-24Merge remote-tracking branch 'asoc/topic/dapm' into asoc-nextMark Brown8-85/+279
2013-10-24Merge remote-tracking branch 'asoc/topic/cs42l73' into asoc-nextMark Brown4-90/+173
2013-10-24Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-nextMark Brown1-0/+1
2013-10-24Merge remote-tracking branch 'asoc/topic/cq93vc' into asoc-nextMark Brown1-32/+14
2013-10-24Merge remote-tracking branch 'asoc/topic/core' into asoc-nextMark Brown7-357/+100
2013-10-24Merge remote-tracking branch 'asoc/topic/component' into asoc-nextMark Brown2-104/+174
2013-10-24Merge remote-tracking branch 'asoc/topic/bclk' into asoc-nextMark Brown2-0/+19
2013-10-24Merge remote-tracking branch 'asoc/topic/atmel' into asoc-nextMark Brown3-9/+2
Powered by cgit, Gruvboxed by Blaster4385.