Merge commit '317f3941'
Conflicts:
arch/sparc/kernel/smp_32.c
With merge conflict help from Daniel Hellstrom.
Signed-off-by: 
David S. Miller <davem@davemloft.net>
No related branches found
No related tags found
Showing
- arch/alpha/kernel/smp.c 1 addition, 2 deletionsarch/alpha/kernel/smp.c
- arch/arm/kernel/smp.c 1 addition, 4 deletionsarch/arm/kernel/smp.c
- arch/blackfin/mach-common/smp.c 3 additions, 0 deletionsarch/blackfin/mach-common/smp.c
- arch/cris/arch-v32/kernel/smp.c 8 additions, 5 deletionsarch/cris/arch-v32/kernel/smp.c
- arch/ia64/kernel/irq_ia64.c 2 additions, 0 deletionsarch/ia64/kernel/irq_ia64.c
- arch/ia64/xen/irq_xen.c 9 additions, 1 deletionarch/ia64/xen/irq_xen.c
- arch/m32r/kernel/smp.c 1 addition, 3 deletionsarch/m32r/kernel/smp.c
- arch/mips/cavium-octeon/smp.c 2 additions, 0 deletionsarch/mips/cavium-octeon/smp.c
- arch/mips/kernel/smtc.c 1 addition, 1 deletionarch/mips/kernel/smtc.c
- arch/mips/mti-malta/malta-int.c 2 additions, 0 deletionsarch/mips/mti-malta/malta-int.c
- arch/mips/pmc-sierra/yosemite/smp.c 4 additions, 0 deletionsarch/mips/pmc-sierra/yosemite/smp.c
- arch/mips/sgi-ip27/ip27-irq.c 2 additions, 0 deletionsarch/mips/sgi-ip27/ip27-irq.c
- arch/mips/sibyte/bcm1480/smp.c 3 additions, 4 deletionsarch/mips/sibyte/bcm1480/smp.c
- arch/mips/sibyte/sb1250/smp.c 3 additions, 4 deletionsarch/mips/sibyte/sb1250/smp.c
- arch/mn10300/kernel/smp.c 1 addition, 4 deletionsarch/mn10300/kernel/smp.c
- arch/parisc/kernel/smp.c 1 addition, 4 deletionsarch/parisc/kernel/smp.c
- arch/powerpc/kernel/smp.c 2 additions, 2 deletionsarch/powerpc/kernel/smp.c
- arch/s390/kernel/smp.c 3 additions, 3 deletionsarch/s390/kernel/smp.c
- arch/sh/kernel/smp.c 2 additions, 0 deletionsarch/sh/kernel/smp.c
- arch/sparc/kernel/smp_32.c 4 additions, 4 deletionsarch/sparc/kernel/smp_32.c
Loading
Please register or sign in to comment