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

Olof Johansson olof at lixom.net
Tue Jun 18 03:29:57 EDT 2013


On Mon, Jun 17, 2013 at 01:39:38PM -0700, David Brown wrote:
> Commit e45600107b (Merge tag 'msm-cleanup-for-3.11' of
> git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm 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.


-Olof



More information about the linux-arm-kernel mailing list