linux-next: manual merge of the arm-soc tree with the sound tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in sound/soc/omap/omap-pcm.c between commit 946cc36ae550 ("ASoC: omap-pcm: Convert to use dmaengine") from the sound tree and commit 7d7e1eba7e92 ("ARM: OMAP2+: Prepare for irqs.h removal") from the arm-soc tree. I fixed it up

linux-next: manual merge of the arm-soc tree with the sound tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in sound/soc/omap/omap-mcbsp.c between commit 04564e325830 ("ASoC: OMAP: mcbsp, mcpdm, dmic: Let omap-pcm to pick the dma_type") from the sound tree and commits 7d7e1eba7e92 ("ARM: OMAP2+: Prepare for irqs.h removal") and

linux-next: manual merge of the arm-soc tree with the sound tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in sound/soc/omap/omap-mcbsp.c between commit 04564e325830 (ASoC: OMAP: mcbsp, mcpdm, dmic: Let omap-pcm to pick the dma_type) from the sound tree and commits 7d7e1eba7e92 (ARM: OMAP2+: Prepare for irqs.h removal) and

linux-next: manual merge of the arm-soc tree with the sound tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in sound/soc/omap/omap-pcm.c between commit 946cc36ae550 (ASoC: omap-pcm: Convert to use dmaengine) from the sound tree and commit 7d7e1eba7e92 (ARM: OMAP2+: Prepare for irqs.h removal) from the arm-soc tree. I fixed it up (see

linux-next: manual merge of the arm-soc tree with the sound tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-davinci/include/mach/da8xx.h between commit 896f66b7de29 (ASoC/ARM: Davinci: McASP: split asp header into platform and audio specific"") from the sound tree and commit ec2a0833e515 ("ARM: davinci: move

linux-next: manual merge of the arm-soc tree with the sound tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-davinci/dm365.c between commit 896f66b7de29 ("ASoC/ARM: Davinci: McASP: split asp header into platform and audio specific") from the tree and commit ec2a0833e515 ("ARM: davinci: move platform_data definitions")

linux-next: manual merge of the arm-soc tree with the sound tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-davinci/dm355.c between commit 896f66b7de29 ("ASoC/ARM: Davinci: McASP: split asp header into platform and audio specific") from the sound tree and commit ec2a0833e515 ("ARM: davinci: move platform_data

linux-next: manual merge of the arm-soc tree with the sound tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-davinci/davinci.h between commit 896f66b7de29 ("ASoC/ARM: Davinci: McASP: split asp header into platform and audio specific") from the sound tree and commit ec2a0833e515 ("ARM: davinci: move platform_data

linux-next: manual merge of the arm-soc tree with the sound tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-davinci/davinci.h between commit 896f66b7de29 (ASoC/ARM: Davinci: McASP: split asp header into platform and audio specific) from the sound tree and commit ec2a0833e515 (ARM: davinci: move platform_data

linux-next: manual merge of the arm-soc tree with the sound tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-davinci/dm355.c between commit 896f66b7de29 (ASoC/ARM: Davinci: McASP: split asp header into platform and audio specific) from the sound tree and commit ec2a0833e515 (ARM: davinci: move platform_data definitions)

linux-next: manual merge of the arm-soc tree with the sound tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-davinci/dm365.c between commit 896f66b7de29 (ASoC/ARM: Davinci: McASP: split asp header into platform and audio specific) from the tree and commit ec2a0833e515 (ARM: davinci: move platform_data definitions) from

linux-next: manual merge of the arm-soc tree with the sound tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-davinci/include/mach/da8xx.h between commit 896f66b7de29 (ASoC/ARM: Davinci: McASP: split asp header into platform and audio specific) from the sound tree and commit ec2a0833e515 (ARM: davinci: move platform_data