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 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html