Mark Brown
48ce3ec16a
Merge remote-tracking branch 'asoc/topic/devm' into asoc-next
2013-10-24 11:24:04 +01:00
Mark Brown
cf44fba089
Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next
2013-10-24 11:24:04 +01:00
Mark Brown
0705690110
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
2013-10-24 11:24:03 +01:00
Mark Brown
85eb5dce82
Merge remote-tracking branch 'asoc/topic/cs42l73' into asoc-next
2013-10-24 11:24:03 +01:00
Mark Brown
05be686a40
Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-next
2013-10-24 11:24:02 +01:00
Mark Brown
f8736ad2ee
Merge remote-tracking branch 'asoc/topic/cq93vc' into asoc-next
2013-10-24 11:24:02 +01:00
Mark Brown
d6ee232c7f
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
2013-10-24 11:24:02 +01:00
Mark Brown
6180561670
Merge remote-tracking branch 'asoc/topic/component' into asoc-next
2013-10-24 11:24:01 +01:00
Mark Brown
d1c59c8712
Merge remote-tracking branch 'asoc/topic/bclk' into asoc-next
2013-10-24 11:24:01 +01:00
Mark Brown
80ca31869f
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
2013-10-24 11:24:00 +01:00
Mark Brown
c4c2361aef
Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next
2013-10-24 11:24:00 +01:00
Mark Brown
805c605562
Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-next
2013-10-24 11:23:59 +01:00
Mark Brown
bb80a5d4cd
Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-next
2013-10-24 11:23:59 +01:00
Mark Brown
e447360474
Merge remote-tracking branch 'asoc/topic/adav80x' into asoc-next
2013-10-24 11:23:58 +01:00
Mark Brown
9c5ff908aa
Merge remote-tracking branch 'asoc/topic/adau1373' into asoc-next
2013-10-24 11:23:58 +01:00
Mark Brown
de3bb2ded6
Merge remote-tracking branch 'asoc/topic/ab8500' into asoc-next
2013-10-24 11:23:57 +01:00
Mark Brown
cbf125e211
Merge remote-tracking branch 'asoc/topic/88pm860x' into asoc-next
2013-10-24 11:23:57 +01:00
Mark Brown
b85e95781c
Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus
2013-10-24 11:23:56 +01:00
Mark Brown
ebc0b38625
Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
2013-10-24 11:23:56 +01:00
Mark Brown
3bd36a147f
Merge remote-tracking branch 'asoc/fix/pcm1792a' into asoc-linus
2013-10-24 11:23:55 +01:00
Mark Brown
dfbbe16f14
Merge remote-tracking branch 'asoc/fix/pcm1681' into asoc-linus
2013-10-24 11:23:55 +01:00
Mark Brown
92359d6d65
Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus
2013-10-24 11:23:55 +01:00
Mark Brown
686b377152
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
2013-10-24 11:23:54 +01:00
Nicolin Chen
1abe729f78
ASoC: fsl: Add missing pm to current machine drivers
...
Add missing pm to current machine drivers so that all of them would
correctly do suspend/resume.
Signed-off-by: Nicolin Chen <b42378@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-10-24 11:22:44 +01:00
Russell King
0ea1ec713f
ARM: dma-mapping: don't allow DMA mappings to be marked executable
...
DMA mapping permissions were being derived from pgprot_kernel directly
without using PAGE_KERNEL. This causes them to be marked with executable
permission, which is not what we want. Fix this.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2013-10-24 11:17:27 +01:00
Mark Brown
d4d5cef649
Merge remote-tracking branch 'regulator/topic/tps65910' into regulator-next
2013-10-24 11:11:43 +01:00
Mark Brown
2532a39500
Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next
2013-10-24 11:11:43 +01:00
Mark Brown
e11678e4b4
Merge remote-tracking branch 'regulator/topic/tps65090' into regulator-next
2013-10-24 11:11:42 +01:00
Mark Brown
f5549f5bd8
Merge remote-tracking branch 'regulator/topic/tps65023' into regulator-next
2013-10-24 11:11:42 +01:00
Mark Brown
6c7bdf8e63
Merge remote-tracking branch 'regulator/topic/tps6105x' into regulator-next
2013-10-24 11:11:41 +01:00
Mark Brown
07afa93e31
Merge remote-tracking branch 'regulator/topic/ti-abb' into regulator-next
2013-10-24 11:11:41 +01:00
Mark Brown
aa11a358f8
Merge remote-tracking branch 'regulator/topic/stw481x' into regulator-next
2013-10-24 11:11:40 +01:00
Mark Brown
67471b6a24
Merge remote-tracking branch 'regulator/topic/s5m8767' into regulator-next
2013-10-24 11:11:40 +01:00
Mark Brown
22eb85adaf
Merge remote-tracking branch 'regulator/topic/palmas' into regulator-next
2013-10-24 11:11:39 +01:00
Mark Brown
aef393da75
Merge remote-tracking branch 'regulator/topic/optional' into regulator-next
2013-10-24 11:11:39 +01:00
Mark Brown
88c260a180
Merge remote-tracking branch 'regulator/topic/mc13783' into regulator-next
2013-10-24 11:11:38 +01:00
Mark Brown
08f09c63e1
Merge remote-tracking branch 'regulator/topic/max8997' into regulator-next
2013-10-24 11:11:38 +01:00
Mark Brown
4e31566d9b
Merge remote-tracking branch 'regulator/topic/lp3971' into regulator-next
2013-10-24 11:11:38 +01:00
Mark Brown
4c35c8676f
Merge remote-tracking branch 'regulator/topic/linear' into regulator-next
2013-10-24 11:11:37 +01:00
Mark Brown
a6117615a2
Merge remote-tracking branch 'regulator/topic/gpio' into regulator-next
2013-10-24 11:11:36 +01:00
Mark Brown
706664c290
Merge remote-tracking branch 'regulator/topic/fixed' into regulator-next
2013-10-24 11:11:36 +01:00
Mark Brown
b735e47f6e
Merge remote-tracking branch 'regulator/topic/devm' into regulator-next
2013-10-24 11:11:35 +01:00
Mark Brown
3242a86170
Merge remote-tracking branch 'regulator/topic/da9210' into regulator-next
2013-10-24 11:11:34 +01:00
Mark Brown
513b485a2d
Merge remote-tracking branch 'regulator/topic/da9063' into regulator-next
2013-10-24 11:11:34 +01:00
Mark Brown
2a86e8e753
Merge remote-tracking branch 'regulator/topic/da9052' into regulator-next
2013-10-24 11:11:33 +01:00
Mark Brown
81e439f476
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
2013-10-24 11:11:33 +01:00
Mark Brown
cea64d8c08
Merge remote-tracking branch 'regulator/topic/as3722' into regulator-next
2013-10-24 11:11:33 +01:00
Mark Brown
f2399df731
Merge remote-tracking branch 'regulator/topic/anatop' into regulator-next
2013-10-24 11:11:32 +01:00
Mark Brown
420118d483
Merge remote-tracking branch 'regulator/topic/alias' into regulator-next
2013-10-24 11:11:32 +01:00
Mark Brown
2a2bec6554
Merge remote-tracking branch 'regulator/fix/ti-abb' into regulator-linus
2013-10-24 11:11:31 +01:00
