diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-27 05:29:52 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-27 05:29:52 +0200 |
| commit | 25918f9811eae1d657db2bccdfcb077038d9454c (patch) | |
| tree | d492a30c0d889a990fdb85ef38653773a633f321 /sound/pci/emu10k1/emu10k1_synth.c | |
| parent | Merge branch 'for-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/c... (diff) | |
| parent | ARM: mxs: fix compile error caused by prom_update_property change (diff) | |
| download | linux-25918f9811eae1d657db2bccdfcb077038d9454c.tar.xz linux-25918f9811eae1d657db2bccdfcb077038d9454c.zip | |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
"A mixed bag of fixes, some for merge window fallout (tegra, MXS), and
a short series of fixes for marvell platforms that didn't make it in
before 3.5."
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: mxs: fix compile error caused by prom_update_property change
ARM: dt: tegra trimslice: enable USB2 port
ARM: dt: tegra trimslice: add vbus-gpio property
ARM: vt8500: Add maintainer for VT8500 architecture
ARM: Kirkwood: Replace mrvl with marvell
ARM: Orion: fix driver probe error handling with respect to clk
ARM: Dove: Fixup ge00 initialisation
ARM: Kirkwood: Fix PHY disable clk problems
ARM: Kirkwood: Ensure runit clock always ticks.
ARM: versatile: Don't use platform clock for Integrator & VE
ARM: tegra: harmony: add regulator supply name and its input supply
Diffstat (limited to 'sound/pci/emu10k1/emu10k1_synth.c')
0 files changed, 0 insertions, 0 deletions