Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6: alpha: fix compile errors in dma-mapping-common.h alpha: remove trailing spaces in messages alpha: use __ratelimit
Showing
- arch/alpha/include/asm/core_marvel.h 0 additions, 1 deletionarch/alpha/include/asm/core_marvel.h
- arch/alpha/include/asm/core_mcpcia.h 0 additions, 1 deletionarch/alpha/include/asm/core_mcpcia.h
- arch/alpha/include/asm/core_titan.h 0 additions, 1 deletionarch/alpha/include/asm/core_titan.h
- arch/alpha/include/asm/core_tsunami.h 0 additions, 1 deletionarch/alpha/include/asm/core_tsunami.h
- arch/alpha/kernel/sys_dp264.c 1 addition, 1 deletionarch/alpha/kernel/sys_dp264.c
- arch/alpha/kernel/sys_titan.c 1 addition, 1 deletionarch/alpha/kernel/sys_titan.c
- arch/alpha/kernel/traps.c 3 additions, 7 deletionsarch/alpha/kernel/traps.c
Loading
Please register or sign in to comment