From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 4 Jun 2014 20:53:02 +0000 (+0200)
Subject: Merge branch '3.15-fixes' into mips-for-linux-next
X-Git-Tag: firefly_0821_release~176^2~3807^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f8647b506d7116a1a3accd8d618184096e85f50b;p=firefly-linux-kernel-4.4.55.git

Merge branch '3.15-fixes' into mips-for-linux-next
---

f8647b506d7116a1a3accd8d618184096e85f50b
diff --cc arch/mips/mti-malta/malta-memory.c
index 1ca34887d990,f2364e419682..6d9773096750
--- a/arch/mips/mti-malta/malta-memory.c
+++ b/arch/mips/mti-malta/malta-memory.c
@@@ -26,8 -26,8 +26,8 @@@ unsigned long physical_memsize = 0L
  
  fw_memblock_t * __init fw_getmdesc(int eva)
  {
 -	char *memsize_str, *ememsize_str __maybe_unused = NULL, *ptr;
 -	unsigned long memsize = 0, ememsize __maybe_unused = 0;
 +	char *memsize_str, *ememsize_str = NULL, *ptr;
- 	unsigned long memsize, ememsize = 0;
++	unsigned long memsize = 0, ememsize = 0;
  	static char cmdline[COMMAND_LINE_SIZE] __initdata;
  	int tmp;