Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...

* '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.

diff --cc arch/m68k/include/asm/irq.h
Simple merge

diff --cc arch/m68k/kernel/process_mm.c
index 125f34e00bf01e8409634a1c3dbfd1d2d294f123,aa4ffb882366c01ca814ef109d4412d75ce9b777..099283ee1a8fd0810672f2a36ad038786799dc5d
--- 1/arch/m68k/kernel/process_mm.c
--- 2/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));
  }
  
  /*

diff --cc arch/m68k/kernel/traps.c
Simple merge

diff --cc arch/m68k/mm/cache.c
Simple merge

diff --cc drivers/scsi/mac_scsi.c
Simple merge