Merge branch 'linus' into x86/delay

Browse source

Conflicts:

	arch/x86/kernel/tsc_32.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

...

This commit is contained in:

Ingo Molnar 2008-06-25 12:30:10 +02:00

parent f3f3149f35 543cf4cb3f

commit 28f73e51d0

325 changed files with 10561 additions and 5949 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

1

.gitignore vendored

View file

20

Documentation/DocBook/kgdb.tmpl

View file

2

Documentation/cpusets.txt

View file

33

Documentation/hwmon/sysfs-interface

View file

6

MAINTAINERS

View file

2

Makefile

View file

1

arch/alpha/Makefile

View file

2

arch/alpha/kernel/core_t2.c

View file

17

arch/alpha/kernel/pci.c

View file

3

arch/alpha/kernel/traps.c

View file

1

arch/ia64/Makefile

View file

2

arch/ia64/kernel/iosapic.c

View file

10

arch/ia64/kernel/perfmon.c

View file

7

arch/ia64/kernel/sal.c

View file

3

arch/ia64/kernel/setup.c

View file

2

arch/ia64/sn/kernel/sn2/sn2_smp.c

View file

12

arch/ia64/uv/kernel/setup.c

View file

18

arch/mips/Makefile

View file

4

arch/mips/au1000/common/platform.c

View file

700

arch/mips/configs/sb1250-swarm_defconfig

View file

192

arch/mips/configs/tb0219_defconfig

View file

192

arch/mips/configs/tb0226_defconfig

View file

209

arch/mips/configs/tb0287_defconfig

View file

5

arch/mips/fw/arc/identify.c

View file

2

arch/mips/kernel/smp.c

View file

2

arch/mips/lasat/interrupt.c

View file

13

arch/mips/lasat/lasat_board.c

View file

172

arch/mips/lasat/sysctl.c

View file

24

arch/mips/lasat/sysctl.h

View file

4

arch/mips/mips-boards/generic/amon.c

View file

3

arch/mips/mips-boards/malta/Makefile

View file

33

arch/mips/mm/c-r4k.c

View file

1

arch/mips/mm/init.c

View file

2

arch/mips/mm/page.c

View file

11

arch/mips/nxp/pnx8550/jbs/board_setup.c

View file

10

arch/mips/nxp/pnx8550/stb810/board_setup.c

View file

8

arch/mips/pci/pci-sb1250.c

View file

14

arch/mips/pci/pci-vr41xx.c

View file

4

arch/mips/sibyte/swarm/Makefile

View file

1

arch/mn10300/kernel/process.c

View file

1

arch/mn10300/kernel/setup.c

View file

4

arch/powerpc/Makefile

View file

2

arch/powerpc/boot/Makefile

View file

233

arch/powerpc/boot/crtsavres.S

View file

8

arch/powerpc/boot/dts/mpc8377_rdb.dts

View file

8

arch/powerpc/boot/dts/mpc8378_rdb.dts

View file

8

arch/powerpc/boot/dts/mpc8379_rdb.dts

View file

4

arch/powerpc/boot/dts/mpc8548cds.dts

View file

155

arch/powerpc/configs/83xx/mpc8313_rdb_defconfig

View file

162

arch/powerpc/configs/83xx/mpc8315_rdb_defconfig

View file

146

arch/powerpc/configs/83xx/mpc832x_mds_defconfig

View file

150

arch/powerpc/configs/83xx/mpc832x_rdb_defconfig

View file

157

arch/powerpc/configs/83xx/mpc834x_itx_defconfig

View file

150

arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig

View file

146

arch/powerpc/configs/83xx/mpc834x_mds_defconfig

View file

146

arch/powerpc/configs/83xx/mpc836x_mds_defconfig

View file

146

arch/powerpc/configs/83xx/mpc837x_mds_defconfig

View file

224

arch/powerpc/configs/83xx/mpc837x_rdb_defconfig

View file

140

arch/powerpc/configs/83xx/sbc834x_defconfig

View file

168

arch/powerpc/configs/85xx/ksi8560_defconfig

View file

133

arch/powerpc/configs/85xx/mpc8540_ads_defconfig

View file

210

arch/powerpc/configs/85xx/mpc8544_ds_defconfig

View file

135

arch/powerpc/configs/85xx/mpc8560_ads_defconfig

View file

150

arch/powerpc/configs/85xx/mpc8568mds_defconfig

View file

210

arch/powerpc/configs/85xx/mpc8572_ds_defconfig

View file

137

arch/powerpc/configs/85xx/mpc85xx_cds_defconfig

View file

131

arch/powerpc/configs/85xx/sbc8548_defconfig

View file

135

arch/powerpc/configs/85xx/sbc8560_defconfig

View file

152

arch/powerpc/configs/85xx/stx_gp3_defconfig

View file

147

arch/powerpc/configs/85xx/tqm8540_defconfig

View file

146

arch/powerpc/configs/85xx/tqm8541_defconfig

View file

146

arch/powerpc/configs/85xx/tqm8555_defconfig

View file

146

arch/powerpc/configs/85xx/tqm8560_defconfig

View file

52

arch/powerpc/configs/adder875_defconfig

View file

124

arch/powerpc/configs/ep8248e_defconfig

View file

47

arch/powerpc/configs/ep88xc_defconfig

View file

62

arch/powerpc/configs/g5_defconfig

View file

172

arch/powerpc/configs/linkstation_defconfig

View file

136

arch/powerpc/configs/mpc7448_hpc2_defconfig

View file

126

arch/powerpc/configs/mpc8272_ads_defconfig

View file

151

arch/powerpc/configs/mpc83xx_defconfig

View file

230

arch/powerpc/configs/mpc85xx_defconfig

View file

316

arch/powerpc/configs/mpc8610_hpcd_defconfig

View file

210

arch/powerpc/configs/mpc8641_hpcn_defconfig

View file

128

arch/powerpc/configs/mpc866_ads_defconfig

View file

47

arch/powerpc/configs/mpc885_ads_defconfig

View file

66

arch/powerpc/configs/ppc64_defconfig

View file

133

arch/powerpc/configs/pq2fads_defconfig

View file

153

arch/powerpc/configs/prpmc2800_defconfig

View file

150

arch/powerpc/configs/sbc8641d_defconfig

View file

71

arch/powerpc/configs/storcenter_defconfig

View file

7

arch/powerpc/kernel/head_44x.S

View file

2

arch/powerpc/kernel/irq.c

View file

2

arch/powerpc/kernel/ppc_ksyms.c

View file

14

arch/powerpc/kernel/prom_init_check.sh

View file

2

arch/powerpc/kernel/vdso.c

View file

2

arch/powerpc/lib/Makefile

View file

229

arch/powerpc/lib/crtsavres.S

View file

4

arch/powerpc/mm/hash_low_64.S

View file

1

arch/powerpc/platforms/85xx/Kconfig

View file

Some files were not shown because too many files have changed in this diff Show more