From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Nov 2010 14:54:40 +0000 (-0700)
Subject: Merge branch 'for-linus-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg... 
X-Git-Tag: firefly_0821_release~7613^2~3515
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9a8a0caddec7f77174a33e53f5ee9e87181b6232;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus-fixes' of git://git./linux/kernel/git/gerg/m68knommu

* 'for-linus-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k, m68knommu: Do not include linux/hardirq.h in asm/irqflags.h
  m68knommu: add back in declaration of do_IRQ
---

9a8a0caddec7f77174a33e53f5ee9e87181b6232