Merge branch 'linux-m32r' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'linux-m32r' of git://www.linux-m32r.org/git/takata/linux-2.6_dev: m32r/kernel/: cleanups m32r: export __ndelay m32r: export empty_zero_page m32r: don't offer CONFIG_ISA m32r: remove the unused NOHIGHMEM option
Showing
- arch/m32r/Kconfig 1 addition, 9 deletionsarch/m32r/Kconfig
- arch/m32r/kernel/entry.S 1 addition, 1 deletionarch/m32r/kernel/entry.S
- arch/m32r/kernel/head.S 0 additions, 1 deletionarch/m32r/kernel/head.S
- arch/m32r/kernel/irq.c 0 additions, 6 deletionsarch/m32r/kernel/irq.c
- arch/m32r/kernel/m32r_ksyms.c 2 additions, 0 deletionsarch/m32r/kernel/m32r_ksyms.c
- arch/m32r/kernel/process.c 2 additions, 28 deletionsarch/m32r/kernel/process.c
- arch/m32r/kernel/smp.c 2 additions, 2 deletionsarch/m32r/kernel/smp.c
- arch/m32r/kernel/time.c 2 additions, 3 deletionsarch/m32r/kernel/time.c
- arch/m32r/kernel/traps.c 4 additions, 4 deletionsarch/m32r/kernel/traps.c
- arch/m32r/lib/delay.c 2 additions, 0 deletionsarch/m32r/lib/delay.c
Loading
Please register or sign in to comment