Merge branch 'master' of ssh://master.kernel.org/home/ftp/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask-for-sparc

Browse source

Conflicts:
	arch/sparc/kernel/smp_64.c

...

This commit is contained in:

David S. Miller 2009-03-29 15:44:22 -07:00

parent ffaba67409 81f1adf012

commit ed223129a3

14 changed files with 50 additions and 57 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

8

arch/sparc/include/asm/mmu_context_64.h

View file

3

arch/sparc/include/asm/smp_64.h

View file

2

arch/sparc/include/asm/system_32.h

View file

7

arch/sparc/include/asm/topology_64.h

View file

2

arch/sparc/kernel/ds.c

View file

4

arch/sparc/kernel/irq_64.c

View file

2

arch/sparc/kernel/mdesc.c

View file

4

arch/sparc/kernel/prom_64.c

View file

36

arch/sparc/kernel/smp_32.c

View file

14

arch/sparc/kernel/smp_64.c

View file

11

arch/sparc/kernel/sun4d_smp.c

View file

10

arch/sparc/kernel/sun4m_smp.c

View file

2

arch/sparc/mm/init_64.c

View file

2

arch/sparc/mm/srmmu.c

View file