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

From: Stephen Rothwell
Date: Tue Mar 06 2012 - 01:24:51 EST

Next message: Ingo Molnar: "Re: [PATCH] perf report: auto-detect branch stack sampling mode"
Previous message: Santosh Jodh: "RE: [PATCH 0001/001] xen: multi page ring support for block devices"
In reply to: Stephen Rothwell: "linux-next: manual merge of the arm-soc tree with the sound-asoctree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/plat-mxc/audmux-v1.c between commit 2405fc9728a3 ("ARM: imx:
merge audmux-v1 and audmux-v2") from the sound-asoc tree and commit
48d795616c73 ("ARM: plat-mxc: audmux-v1: Remove unneeded ifdef's") from
the arm-soc tree.

The former removed this file, so I did that.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature

Next message: Ingo Molnar: "Re: [PATCH] perf report: auto-detect branch stack sampling mode"
Previous message: Santosh Jodh: "RE: [PATCH 0001/001] xen: multi page ring support for block devices"
In reply to: Stephen Rothwell: "linux-next: manual merge of the arm-soc tree with the sound-asoctree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]