| commit | 9a8a0caddec7f77174a33e53f5ee9e87181b6232 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Nov 05 07:54:40 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Nov 05 07:54:40 2010 -0700 |
| tree | 01b63361ff4ecab67a5f3114298df494ebf143cf | |
| parent | ff8b16d7e15a8ba2a6086645614a483e048e3fbf [diff] | |
| parent | ed35f654e4f0e08d39036353cc1dfda52a5cf129 [diff] |
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