diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 22:50:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 22:50:54 -0700 |
| commit | 3b76eefe0f970c2e19f165d4a1650abc523d10bc (patch) | |
| tree | 1987bc1b2b61ea70170094e3cb1204f5b0a0401e /arch/um | |
| parent | 91d44d99992ff2587104df5760bfffbb3564b3c2 (diff) | |
| parent | 8c9f08f9de38c9af3a946faf0cccd7fc46978443 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: Revive reporting of spurious interrupts
m68knommu: Move forward declaration of do_IRQ() from machdep.h to irq.h
m68k: fix some atomic operation asm address modes for ColdFire
m68k: use CPU_HAS_NO_BITFIELDS for signal functions
m68k: merge and clean up delay.h files
m68knommu: correctly use trap_init
m68knommu: merge ColdFire 5206 and 5206e platform code
m68k: merge mmu and non-mmu bitops.h
m68k: merge MMU and non MMU versions of system.h
m68k: merge MMU and non-MMU versions of asm/hardirq.h
m68k: merge the non-mmu and mmu versions of module.c
m68knommu: Fix printk() format in free_initrd_mem()
m68knommu: Make empty_zero_page "void *", like on m68k
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions