From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 Jan 2012 20:43:57 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0dbfe8ddaaab9fe5bc8672c064d3ede6cd66201a;p=deliverable%2Flinux.git

Merge branch 'for-linus' of git://git./linux/kernel/git/geert/linux-m68k

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Fix assembler constraint to prevent overeager gcc optimisation
  mac_esp: rename irq
  mac_scsi: dont enable mac_scsi irq before requesting it
  macfb: fix black and white modes
  m68k/irq: Remove obsolete IRQ_FLG_* definitions

Fix up trivial conflict in arch/m68k/kernel/process_mm.c as per Geert.
---

0dbfe8ddaaab9fe5bc8672c064d3ede6cd66201a
diff --cc arch/m68k/kernel/process_mm.c
index 125f34e00bf0,aa4ffb882366..099283ee1a8f
--- a/arch/m68k/kernel/process_mm.c
+++ b/arch/m68k/kernel/process_mm.c
@@@ -172,7 -188,9 +172,7 @@@ void flush_thread(void
  
  	current->thread.fs = __USER_DS;
  	if (!FPU_IS_EMU)
- 		asm volatile ("frestore %0@" : : "a" (&zero) : "memory");
 -		asm volatile (".chip 68k/68881\n\t"
 -			      "frestore %0\n\t"
 -			      ".chip 68k" : : "m" (zero));
++		asm volatile("frestore %0": :"m" (zero));
  }
  
  /*