]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 Jan 2012 20:43:57 +0000 (12:43 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 Jan 2012 20:43:57 +0000 (12:43 -0800)
commit0dbfe8ddaaab9fe5bc8672c064d3ede6cd66201a
tree93eefb55eb9a9e41053e6de032e49e92c7be5574
parent87f71ae2dd7471c1b4c94100be1f218e91dc64c3
parent2a3535069e33d8b416f406c159ce924427315303
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.
arch/m68k/include/asm/irq.h
arch/m68k/kernel/process_mm.c
arch/m68k/kernel/traps.c
arch/m68k/mm/cache.c
drivers/scsi/mac_scsi.c