Merge branch 'master' of...
Merge branch 'master' of ssh://master.kernel.org/home/ftp/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask-for-sparc Conflicts: arch/sparc/kernel/smp_64.c
No related branches found
No related tags found
Showing
- arch/sparc/include/asm/mmu_context_64.h 4 additions, 4 deletionsarch/sparc/include/asm/mmu_context_64.h
- arch/sparc/include/asm/smp_64.h 2 additions, 1 deletionarch/sparc/include/asm/smp_64.h
- arch/sparc/include/asm/system_32.h 1 addition, 1 deletionarch/sparc/include/asm/system_32.h
- arch/sparc/include/asm/topology_64.h 1 addition, 6 deletionsarch/sparc/include/asm/topology_64.h
- arch/sparc/kernel/ds.c 1 addition, 1 deletionarch/sparc/kernel/ds.c
- arch/sparc/kernel/irq_64.c 2 additions, 2 deletionsarch/sparc/kernel/irq_64.c
- arch/sparc/kernel/mdesc.c 1 addition, 1 deletionarch/sparc/kernel/mdesc.c
- arch/sparc/kernel/prom_64.c 2 additions, 2 deletionsarch/sparc/kernel/prom_64.c
- arch/sparc/kernel/smp_32.c 18 additions, 18 deletionsarch/sparc/kernel/smp_32.c
- arch/sparc/kernel/smp_64.c 7 additions, 7 deletionsarch/sparc/kernel/smp_64.c
- arch/sparc/kernel/sun4d_smp.c 5 additions, 6 deletionsarch/sparc/kernel/sun4d_smp.c
- arch/sparc/kernel/sun4m_smp.c 4 additions, 6 deletionsarch/sparc/kernel/sun4m_smp.c
- arch/sparc/mm/init_64.c 1 addition, 1 deletionarch/sparc/mm/init_64.c
- arch/sparc/mm/srmmu.c 1 addition, 1 deletionarch/sparc/mm/srmmu.c
Loading
Please register or sign in to comment