Merge branch 'linus' into cpus4096

Browse source

Conflicts:

	drivers/acpi/processor_throttling.c

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

...

This commit is contained in:

Ingo Molnar 2008-07-18 22:00:54 +02:00

parent 82638844d9 5b664cb235

commit bb2c018b09

1754 changed files with 111002 additions and 200194 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

2

include/acpi/acconfig.h

View file

1

include/acpi/acdisasm.h

View file

2

include/acpi/acdispat.h

View file

10

include/acpi/acexcep.h

View file

2

include/acpi/acglobal.h

View file

4

include/acpi/achware.h

View file

5

include/acpi/acinterp.h

View file

6

include/acpi/aclocal.h

View file

38

include/acpi/acmacros.h

View file

30

include/acpi/acnamesp.h

View file

12

include/acpi/acpi_bus.h

View file

4

include/acpi/acpi_drivers.h

View file

2

include/acpi/acpiosxf.h

View file

12

include/acpi/acpixf.h

View file

10

include/acpi/acstruct.h

View file

27

include/acpi/actables.h

View file

23

include/acpi/actbl1.h

View file

16

include/acpi/actypes.h

View file

70

include/acpi/acutils.h

View file

2

include/acpi/processor.h

View file

14

include/acpi/reboot.h

View file

4

include/asm-arm/arch-at91/at91_mci.h

View file

20

include/asm-arm/arch-s3c2410/regs-sdi.h

View file

15

include/asm-arm/plat-s3c24xx/mci.h

View file

6

include/asm-avr32/arch-at32ap/board.h

View file

9

include/asm-avr32/atmel-mci.h

View file

6

include/asm-generic/vmlinux.lds.h

View file

2

include/asm-ia64/processor.h

View file

14

include/asm-mips/barrier.h

View file

6

include/asm-mips/bitops.h

View file

43

include/asm-mips/bootinfo.h

View file

4

include/asm-mips/cpu.h

View file

9

include/asm-mips/dec/kn05.h

View file

24

include/asm-mips/inventory.h

View file

17

include/asm-mips/io.h

View file

2

include/asm-mips/lasat/lasat.h

View file

60

include/asm-mips/mach-atlas/mc146818rtc.h

View file

16

include/asm-mips/mach-au1x00/au1100_mmc.h

View file

45

include/asm-mips/mach-db1x00/db1x00.h

View file

0

include/asm-mips/mach-mips/cpu-feature-overrides.h → include/asm-mips/mach-malta/cpu-feature-overrides.h

View file

0

include/asm-mips/mach-mips/irq.h → include/asm-mips/mach-malta/irq.h

View file

0

include/asm-mips/mach-mips/kernel-entry-init.h → include/asm-mips/mach-malta/kernel-entry-init.h

View file

0

include/asm-mips/mach-mips/mach-gt64120.h → include/asm-mips/mach-malta/mach-gt64120.h

View file

0

include/asm-mips/mach-mips/mc146818rtc.h → include/asm-mips/mach-malta/mc146818rtc.h

View file

0

include/asm-mips/mach-mips/war.h → include/asm-mips/mach-malta/war.h

View file

8

include/asm-mips/mach-jmr3927/ioremap.h → include/asm-mips/mach-tx39xx/ioremap.h

View file

13

include/asm-mips/mach-jmr3927/mangle-port.h → include/asm-mips/mach-tx39xx/mangle-port.h

View file

6

include/asm-mips/mach-jmr3927/war.h → include/asm-mips/mach-tx39xx/war.h

View file

3

include/asm-mips/mach-vr41xx/irq.h

View file

9

include/asm-mips/mips-boards/generic.h

View file

25

include/asm-mips/namei.h

View file

3

include/asm-mips/pci.h

View file

41

include/asm-mips/prctl.h

View file

2

include/asm-mips/setup.h

View file

3

include/asm-mips/signal.h

View file

1

include/asm-mips/traps.h

View file

46

include/asm-mips/tx4927/tx4927.h

View file

268

include/asm-mips/tx4927/tx4927_pci.h

View file

41

include/asm-mips/txx9/generic.h

View file

13

include/asm-mips/jmr3927/jmr3927.h → include/asm-mips/txx9/jmr3927.h

View file

36

include/asm-mips/txx9/pci.h

View file

52

include/asm-mips/tx4927/toshiba_rbtx4927.h → include/asm-mips/txx9/rbtx4927.h

View file

45

include/asm-mips/tx4938/rbtx4938.h → include/asm-mips/txx9/rbtx4938.h

View file

2

include/asm-mips/tx4927/smsc_fdc37m81x.h → include/asm-mips/txx9/smsc_fdc37m81x.h

View file

7

include/asm-mips/tx4938/spi.h → include/asm-mips/txx9/spi.h

View file

12

include/asm-mips/jmr3927/tx3927.h → include/asm-mips/txx9/tx3927.h

View file

219

include/asm-mips/txx9/tx4927.h

View file

199

include/asm-mips/txx9/tx4927pcic.h

View file

239

include/asm-mips/tx4938/tx4938.h → include/asm-mips/txx9/tx4938.h

View file

6

include/asm-mips/jmr3927/txx927.h → include/asm-mips/txx9/txx927.h

View file

56

include/asm-mips/vr41xx/cmbvr4133.h

View file

2

include/asm-powerpc/Kbuild

View file

51

include/asm-powerpc/asm-compat.h

View file

3

include/asm-powerpc/cache.h

View file

54

include/asm-powerpc/code-patching.h

View file

1

include/asm-powerpc/cpm.h

View file

20

include/asm-powerpc/cpm1.h

View file

26

include/asm-powerpc/cpm2.h

View file

84

include/asm-powerpc/cputable.h

View file

49

include/asm-powerpc/dcr-generic.h

View file

20

include/asm-powerpc/dcr-mmio.h

View file

16

include/asm-powerpc/dcr-native.h

View file

39

include/asm-powerpc/dcr.h

View file

125

include/asm-powerpc/dma-mapping.h

View file

37

include/asm-powerpc/elf.h

View file

126

include/asm-powerpc/feature-fixups.h

View file

13

include/asm-powerpc/firmware.h

View file

47

include/asm-powerpc/fsl_gtm.h

View file

59

include/asm-powerpc/io.h

View file

58

include/asm-powerpc/ioctl.h

View file

16

include/asm-powerpc/iommu.h

View file

13

include/asm-powerpc/irq.h

View file

13

include/asm-powerpc/kexec.h

View file

1

include/asm-powerpc/machdep.h

View file

36

include/asm-powerpc/mman.h

View file

28

include/asm-powerpc/mmu-hash32.h

View file

1

include/asm-powerpc/mmu-hash64.h

View file

6

include/asm-powerpc/mpc6xx.h

View file

2

include/asm-powerpc/mpic.h

View file

2

include/asm-powerpc/of_device.h

View file

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