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-Tag: v3.3-rc2~27
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0dbfe8ddaaab9fe5bc8672c064d3ede6cd66201a;p=pandora-kernel.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
Reading git-diff-tree failed