Merge branch 'linus' into x86/x2apic

Browse source

Conflicts:
	arch/x86/kernel/cpu/cyrix.c
	include/asm-x86/cpufeature.h

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

...

This commit is contained in:

Ingo Molnar 2008-09-04 13:02:35 +02:00

parent 11c231a962 d210baf53b

commit 42390cdec5

1808 changed files with 114527 additions and 88013 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

27

Documentation/ABI/testing/sysfs-firmware-sgi_uv

View file

15

Documentation/arm/Samsung-S3C24XX/GPIO.txt

View file

35

Documentation/arm/Samsung-S3C24XX/Overview.txt

View file

2

Documentation/dontdiff

View file

6

Documentation/filesystems/ext4.txt

View file

4

Documentation/filesystems/ntfs.txt

View file

19

Documentation/filesystems/proc.txt

View file

2

Documentation/filesystems/ubifs.txt

View file

33

Documentation/hwmon/ibmaem

View file

67

Documentation/ja_JP/HOWTO

View file

111

Documentation/ja_JP/SubmitChecklist

View file

5

Documentation/kernel-parameters.txt

View file

8

Documentation/lguest/lguest.c

View file

5

Documentation/rfkill.txt

View file

23

Documentation/scsi/ChangeLog.megaraid_sas

View file

10

Documentation/sound/alsa/ALSA-Configuration.txt

View file

9

Documentation/vm/page_migration

View file

119

MAINTAINERS

View file

2

Makefile

View file

0

include/asm-alpha/8253pit.h → arch/alpha/include/asm/8253pit.h

View file

0

include/asm-alpha/Kbuild → arch/alpha/include/asm/Kbuild

View file

0

include/asm-alpha/a.out-core.h → arch/alpha/include/asm/a.out-core.h

View file

0

include/asm-alpha/a.out.h → arch/alpha/include/asm/a.out.h

View file

0

include/asm-alpha/agp.h → arch/alpha/include/asm/agp.h

View file

0

include/asm-alpha/agp_backend.h → arch/alpha/include/asm/agp_backend.h

View file

0

include/asm-alpha/atomic.h → arch/alpha/include/asm/atomic.h

View file

0

include/asm-alpha/auxvec.h → arch/alpha/include/asm/auxvec.h

View file

0

include/asm-alpha/barrier.h → arch/alpha/include/asm/barrier.h

View file

0

include/asm-alpha/bitops.h → arch/alpha/include/asm/bitops.h

View file

0

include/asm-alpha/bug.h → arch/alpha/include/asm/bug.h

View file

0

include/asm-alpha/bugs.h → arch/alpha/include/asm/bugs.h

View file

0

include/asm-alpha/byteorder.h → arch/alpha/include/asm/byteorder.h

View file

0

include/asm-alpha/cache.h → arch/alpha/include/asm/cache.h

View file

0

include/asm-alpha/cacheflush.h → arch/alpha/include/asm/cacheflush.h

View file

0

include/asm-alpha/checksum.h → arch/alpha/include/asm/checksum.h

View file

0

include/asm-alpha/compiler.h → arch/alpha/include/asm/compiler.h

View file

0

include/asm-alpha/console.h → arch/alpha/include/asm/console.h

View file

0

include/asm-alpha/core_apecs.h → arch/alpha/include/asm/core_apecs.h

View file

0

include/asm-alpha/core_cia.h → arch/alpha/include/asm/core_cia.h

View file

0

include/asm-alpha/core_irongate.h → arch/alpha/include/asm/core_irongate.h

View file

0

include/asm-alpha/core_lca.h → arch/alpha/include/asm/core_lca.h

View file

0

include/asm-alpha/core_marvel.h → arch/alpha/include/asm/core_marvel.h

View file

0

include/asm-alpha/core_mcpcia.h → arch/alpha/include/asm/core_mcpcia.h

View file

0

include/asm-alpha/core_polaris.h → arch/alpha/include/asm/core_polaris.h

View file

0

include/asm-alpha/core_t2.h → arch/alpha/include/asm/core_t2.h

View file

0

include/asm-alpha/core_titan.h → arch/alpha/include/asm/core_titan.h

View file

0

include/asm-alpha/core_tsunami.h → arch/alpha/include/asm/core_tsunami.h

View file

0

include/asm-alpha/core_wildfire.h → arch/alpha/include/asm/core_wildfire.h

View file

0

include/asm-alpha/cputime.h → arch/alpha/include/asm/cputime.h

View file

0

include/asm-alpha/current.h → arch/alpha/include/asm/current.h

View file

0

include/asm-alpha/delay.h → arch/alpha/include/asm/delay.h

View file

0

include/asm-alpha/device.h → arch/alpha/include/asm/device.h

View file

0

include/asm-alpha/div64.h → arch/alpha/include/asm/div64.h

View file

0

include/asm-alpha/dma-mapping.h → arch/alpha/include/asm/dma-mapping.h

View file

0

include/asm-alpha/dma.h → arch/alpha/include/asm/dma.h

View file

0

include/asm-alpha/elf.h → arch/alpha/include/asm/elf.h

View file

0

include/asm-alpha/emergency-restart.h → arch/alpha/include/asm/emergency-restart.h

View file

0

include/asm-alpha/err_common.h → arch/alpha/include/asm/err_common.h

View file

0

include/asm-alpha/err_ev6.h → arch/alpha/include/asm/err_ev6.h

View file

0

include/asm-alpha/err_ev7.h → arch/alpha/include/asm/err_ev7.h

View file

0

include/asm-alpha/errno.h → arch/alpha/include/asm/errno.h

View file

0

include/asm-alpha/fb.h → arch/alpha/include/asm/fb.h

View file

0

include/asm-alpha/fcntl.h → arch/alpha/include/asm/fcntl.h

View file

0

include/asm-alpha/floppy.h → arch/alpha/include/asm/floppy.h

View file

0

include/asm-alpha/fpu.h → arch/alpha/include/asm/fpu.h

View file

0

include/asm-alpha/futex.h → arch/alpha/include/asm/futex.h

View file

0

include/asm-alpha/gct.h → arch/alpha/include/asm/gct.h

View file

0

include/asm-alpha/gentrap.h → arch/alpha/include/asm/gentrap.h

View file

0

include/asm-alpha/hardirq.h → arch/alpha/include/asm/hardirq.h

View file

0

include/asm-alpha/hw_irq.h → arch/alpha/include/asm/hw_irq.h

View file

0

include/asm-alpha/hwrpb.h → arch/alpha/include/asm/hwrpb.h

View file

0

include/asm-alpha/io.h → arch/alpha/include/asm/io.h

View file

0

include/asm-alpha/io_trivial.h → arch/alpha/include/asm/io_trivial.h

View file

0

include/asm-alpha/ioctl.h → arch/alpha/include/asm/ioctl.h

View file

0

include/asm-alpha/ioctls.h → arch/alpha/include/asm/ioctls.h

View file

0

include/asm-alpha/ipcbuf.h → arch/alpha/include/asm/ipcbuf.h

View file

0

include/asm-alpha/irq.h → arch/alpha/include/asm/irq.h

View file

0

include/asm-alpha/irq_regs.h → arch/alpha/include/asm/irq_regs.h

View file

0

include/asm-alpha/jensen.h → arch/alpha/include/asm/jensen.h

View file

0

include/asm-alpha/kdebug.h → arch/alpha/include/asm/kdebug.h

View file

0

include/asm-alpha/kmap_types.h → arch/alpha/include/asm/kmap_types.h

View file

0

include/asm-alpha/linkage.h → arch/alpha/include/asm/linkage.h

View file

0

include/asm-alpha/local.h → arch/alpha/include/asm/local.h

View file

0

include/asm-alpha/machvec.h → arch/alpha/include/asm/machvec.h

View file

0

include/asm-alpha/mc146818rtc.h → arch/alpha/include/asm/mc146818rtc.h

View file

0

include/asm-alpha/md.h → arch/alpha/include/asm/md.h

View file

0

include/asm-alpha/mman.h → arch/alpha/include/asm/mman.h

View file

0

include/asm-alpha/mmu.h → arch/alpha/include/asm/mmu.h

View file

0

include/asm-alpha/mmu_context.h → arch/alpha/include/asm/mmu_context.h

View file

0

include/asm-alpha/mmzone.h → arch/alpha/include/asm/mmzone.h

View file

0

include/asm-alpha/module.h → arch/alpha/include/asm/module.h

View file

0

include/asm-alpha/msgbuf.h → arch/alpha/include/asm/msgbuf.h

View file

0

include/asm-alpha/mutex.h → arch/alpha/include/asm/mutex.h

View file

0

include/asm-alpha/page.h → arch/alpha/include/asm/page.h

View file

0

include/asm-alpha/pal.h → arch/alpha/include/asm/pal.h

View file

0

include/asm-alpha/param.h → arch/alpha/include/asm/param.h

View file

0

include/asm-alpha/parport.h → arch/alpha/include/asm/parport.h

View file

0

include/asm-alpha/pci.h → arch/alpha/include/asm/pci.h

View file

0

include/asm-alpha/percpu.h → arch/alpha/include/asm/percpu.h

View file

0

include/asm-alpha/pgalloc.h → arch/alpha/include/asm/pgalloc.h

View file

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