diff options
| author | Kevin Hilman <khilman@linaro.org> | 2014-01-15 03:23:00 +0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2014-01-15 03:25:32 +0400 |
| commit | 3e0a79695cf8600322c519b33df76b8bc2f1aaca (patch) | |
| tree | 322c96e36f819368150ccfc154f97f353abf6948 /sound/soc/tegra/tegra_pcm.c | |
| parent | eb90217750136e4712f1d87a33e1951b80a1a365 (diff) | |
| parent | 75cac6abe756fde529a000e725dceed2b908f61a (diff) | |
| download | linux-3e0a79695cf8600322c519b33df76b8bc2f1aaca.tar.xz | |
Merge tag 'sunxi-core-for-3.14-2' of https://github.com/mripard/linux into next/soc
From Maxime Ripard:
Second round of core additions for the Allwinner SoCs
Fixes to select missing configuration options, and update of the maintainer
file.
* tag 'sunxi-core-for-3.14-2' of https://github.com/mripard/linux:
ARM: sunxi: select ARM_PSCI
MAINTAINERS: Update Allwinner sunXi maintainer files
ARM: sunxi: Select RESET_CONTROLLER
ARM: sun6i: Add SMP support for the Allwinner A31
dt-bindings: fix example of allwinner interrupt controller
ARM: sunxi: Register the A31 reset IP in init_time
ARM: sunxi: Select ARCH_HAS_RESET_CONTROLLER
reset: Add Allwinner SoCs Reset Controller Driver
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'sound/soc/tegra/tegra_pcm.c')
0 files changed, 0 insertions, 0 deletions