Greg Ungerer 14be4252ea m68k: merge the MMU and non-MMU versions of the entry.S code ...

Some of the entry.S code is common to both MMU and non-MMU builds.
So merge the entry_no.S and entry_mm.S files back into a single file.
With a little code movement we only need a single #ifdef.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

2012-07-16 09:59:21 +10:00

..

alpha

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2012-06-01 11:53:44 -07:00

arm

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-07-14 11:50:36 -07:00

avr32

fixups for signal breakage

2012-06-04 17:47:34 -04:00

blackfin

Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-06-05 09:47:15 -07:00

c6x

new helper: signal_delivered()

2012-06-01 12:58:52 -04:00

cris

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2012-06-01 11:53:44 -07:00

frv

frv: Remove bogus closing parenthesis

2012-06-02 10:38:19 -04:00

h8300

h8300/uaccess: add mising __clear_user()

2012-07-11 16:04:46 -07:00

hexagon

new helper: signal_delivered()

2012-06-01 12:58:52 -04:00

ia64

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2012-06-01 11:53:44 -07:00

m32r

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2012-06-01 11:53:44 -07:00

m68k

m68k: merge the MMU and non-MMU versions of the entry.S code

2012-07-16 09:59:21 +10:00

microblaze

new helper: signal_delivered()

2012-06-01 12:58:52 -04:00

mips

mips: pci-lantiq: Fix check for valid gpio

2012-07-05 15:02:18 +02:00

mn10300

Merge branch 'akpm' (Andrew's patch-bomb)

2012-07-11 16:06:54 -07:00

openrisc

new helper: signal_delivered()

2012-06-01 12:58:52 -04:00

parisc

[PARISC] fix code to find libgcc

2012-06-05 14:10:23 +09:00

powerpc

Merge branch 'for-upstream-master' of git://github.com/agraf/linux-2.6

2012-07-11 18:49:20 +03:00

s390

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2012-06-01 11:53:44 -07:00

score

new helper: signal_delivered()

2012-06-01 12:58:52 -04:00

sh

SH: Convert out[bwl] macros to inline functions

2012-07-12 13:12:13 +09:00

sparc

Fix typo in printed messages

2012-06-24 11:03:52 -07:00

tile

arch/tile: big-endian: properly bswap instruction bundles when backtracing

2012-06-18 13:11:21 -04:00

um

Revert "rcu: Move PREEMPT_RCU preemption to switch_to() invocation"

2012-07-02 11:39:19 -07:00

unicore32

new helper: signal_delivered()

2012-06-01 12:58:52 -04:00

x86

vsyscall_64: add missing ifdef CONFIG_SECCOMP

2012-07-14 12:01:36 -07:00

xtensa

xtensa: fix incorrect memset

2012-07-11 16:04:49 -07:00

.gitignore

…

Kconfig

Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

2012-05-25 09:18:59 -07:00