[PATCH] ARM: mvebu: fix for mvebu/soc-cpuidle branch

Thomas Petazzoni thomas.petazzoni at free-electrons.com
Mon May 5 07:17:07 PDT 2014

Hello Jason,

In the merge of the Armada 375/38x I/O coherency support and the
Armada XP cpuidle support, there was a conflict in coherency.c which
was resolved correctly.

This commit fixes this invalid merge. It applies on top of your
mvebu/soc-cpuidle branch.



Thomas Petazzoni (1):
  ARM: mvebu: fix mis-merge in coherency.c

 arch/arm/mach-mvebu/coherency.c | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)


More information about the linux-arm-kernel mailing list