summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-05 07:54:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-05 07:54:40 -0700
commit9a8a0caddec7f77174a33e53f5ee9e87181b6232 (patch)
tree01b63361ff4ecab67a5f3114298df494ebf143cf /kernel
parentff8b16d7e15a8ba2a6086645614a483e048e3fbf (diff)
parented35f654e4f0e08d39036353cc1dfda52a5cf129 (diff)
downloadop-kernel-dev-9a8a0caddec7f77174a33e53f5ee9e87181b6232.zip
op-kernel-dev-9a8a0caddec7f77174a33e53f5ee9e87181b6232.tar.gz
Merge branch 'for-linus-fixes' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud