Subject: linux-next: manual merge of the mvebu tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 17 Jul 2014 11:44:44 +1000

Hi all,

Today's linux-next merge of the mvebu tree got a conflict in
drivers/cpuidle/cpuidle-armada-370-xp.c between commit dc559aabe2d4
("cpuidle: mvebu: Fix the name of the states") from Linus' tree and
commit 742450174037 ("cpuidle: mvebu: rename the driver from
armada-370-xp to mvebu-v7") from the mvebu tree.

The former patch appears to have been applied to the
renamed file, so there was nothing to do (except remove the git created
version of the old file).

-- 
Cheers,
Stephen Rothwell                    [email-masked]