diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-05 15:54:40 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-05 15:54:40 +0100 |
| commit | 9a8a0caddec7f77174a33e53f5ee9e87181b6232 (patch) | |
| tree | 01b63361ff4ecab67a5f3114298df494ebf143cf /kernel/relay.c | |
| parent | vmstat: fix offset calculation on void* (diff) | |
| parent | m68k, m68knommu: Do not include linux/hardirq.h in asm/irqflags.h (diff) | |
| download | linux-9a8a0caddec7f77174a33e53f5ee9e87181b6232.tar.xz linux-9a8a0caddec7f77174a33e53f5ee9e87181b6232.zip | |
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 '')
0 files changed, 0 insertions, 0 deletions