Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/microblaze/kernel/cpu/mb.c b/arch/microblaze/kernel/cpu/mb.c
index 7086e3564281..b4048af02615 100644
--- a/arch/microblaze/kernel/cpu/mb.c
+++ b/arch/microblaze/kernel/cpu/mb.c
@@ -51,11 +51,12 @@ static int show_cpuinfo(struct seq_file *m, void *v)
         count = seq_printf(m,
                         "CPU-Family:    MicroBlaze\n"
                         "FPGA-Arch:     %s\n"
-                        "CPU-Ver:       %s\n"
+                        "CPU-Ver:       %s, %s endian\n"
                         "CPU-MHz:       %d.%02d\n"
                         "BogoMips:      %lu.%02lu\n",
                         fpga_family,
                         cpu_ver,
+                        cpuinfo.endian ? "little" : "big",
                         cpuinfo.cpu_clock_freq /
                         1000000,
                         cpuinfo.cpu_clock_freq %