From: Linus Torvalds 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-Url: https://git.stricted.de/?a=commitdiff_plain;h=9a8a0caddec7f77174a33e53f5ee9e87181b6232;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.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