Re: [PATCH] ARM: dts: msm: Fix merge resolution

From: Olof Johansson
Date: Tue Jun 18 2013 - 03:30:00 EST

On Mon, Jun 17, 2013 at 01:39:38PM -0700, David Brown wrote:
> Commit e45600107b (Merge tag 'msm-cleanup-for-3.11' of
> git:// into
> next/cleanup) incorrectly resolved a merge conflict, resulting in a
> node address that doesn't match the register address.
> Fix this node address.

Luckily this is just cosmetic. Applied.

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at