Merge tag 'v3.15-rc6' into sched/core, to pick up the latest fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
index ef3463e0ae19..28b3ee369778 100644
--- a/arch/arm/boot/dts/kirkwood-dreamplug.dts
+++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts
@@ -43,7 +43,7 @@
                         m25p40@0 {
                                 #address-cells = <1>;
                                 #size-cells = <1>;
-                                compatible = "mx25l1606e";
+                                compatible = "mxicy,mx25l1606e";
                                 reg = <0>;
                                 spi-max-frequency = <50000000>;
                                 mode = <0>;