Merge branch 'linus' into cpumask-for-linus

Conflicts: arch/x86/kernel/cpu/common.c
2026-11-10 20:48:12 +00:00 · 2009-03-30 23:53:32 +02:00 · 2009-03-30 23:53:32 +02:00 · 65fb0d23fc
commit 65fb0d23fc
parent 8c083f081d dfbbe89e19
5258 changed files with 447350 additions and 227988 deletions
--- a/include/asm-arm/plat-s3c24xx/regs-iis.h
+++ b/include/asm-arm/plat-s3c24xx/regs-iis.h
--- a/include/asm-arm/plat-s3c24xx/regs-s3c2412-iis.h
+++ b/include/asm-arm/plat-s3c24xx/regs-s3c2412-iis.h
--- a/include/asm-frv/ide.h
+++ b/include/asm-frv/ide.h
--- a/include/asm-frv/socket.h
+++ b/include/asm-frv/socket.h
--- a/include/asm-generic/fcntl.h
+++ b/include/asm-generic/fcntl.h
--- a/include/asm-generic/siginfo.h
+++ b/include/asm-generic/siginfo.h
--- a/include/asm-generic/statfs.h
+++ b/include/asm-generic/statfs.h
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
--- a/include/asm-m32r/socket.h
+++ b/include/asm-m32r/socket.h
--- a/include/asm-mn10300/ide.h
+++ b/include/asm-mn10300/ide.h
--- a/include/asm-mn10300/pci.h
+++ b/include/asm-mn10300/pci.h
--- a/include/asm-mn10300/socket.h
+++ b/include/asm-mn10300/socket.h
--- a/include/crypto/aes.h
+++ b/include/crypto/aes.h
--- a/include/crypto/compress.h
+++ b/include/crypto/compress.h
--- a/include/crypto/cryptd.h
+++ b/include/crypto/cryptd.h
--- a/include/crypto/crypto_wq.h
+++ b/include/crypto/crypto_wq.h
--- a/include/crypto/hash.h
+++ b/include/crypto/hash.h
--- a/include/crypto/internal/compress.h
+++ b/include/crypto/internal/compress.h
--- a/include/drm/drm.h
+++ b/include/drm/drm.h
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
--- a/include/drm/drm_mode.h
+++ b/include/drm/drm_mode.h
--- a/include/drm/drm_os_linux.h
+++ b/include/drm/drm_os_linux.h
--- a/include/drm/drm_pciids.h
+++ b/include/drm/drm_pciids.h
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
--- a/include/drm/mga_drm.h
+++ b/include/drm/mga_drm.h
--- a/include/drm/radeon_drm.h
+++ b/include/drm/radeon_drm.h
--- a/include/drm/via_drm.h
+++ b/include/drm/via_drm.h
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
--- a/include/linux/agpgart.h
+++ b/include/linux/agpgart.h
--- a/include/linux/arcdevice.h
+++ b/include/linux/arcdevice.h
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
--- a/include/linux/ath9k_platform.h
+++ b/include/linux/ath9k_platform.h
--- a/include/linux/atmlec.h
+++ b/include/linux/atmlec.h
--- a/include/linux/atmmpc.h
+++ b/include/linux/atmmpc.h
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
--- a/include/linux/bsg.h
+++ b/include/linux/bsg.h
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
--- a/include/linux/cm4000_cs.h
+++ b/include/linux/cm4000_cs.h
--- a/include/linux/cn_proc.h
+++ b/include/linux/cn_proc.h
--- a/include/linux/com20020.h
+++ b/include/linux/com20020.h
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
--- a/include/linux/compiler-gcc4.h
+++ b/include/linux/compiler-gcc4.h
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
--- a/include/linux/console.h
+++ b/include/linux/console.h
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
--- a/include/linux/cyclades.h
+++ b/include/linux/cyclades.h
--- a/include/linux/dca.h
+++ b/include/linux/dca.h
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
--- a/include/linux/device.h
+++ b/include/linux/device.h
--- a/include/linux/dlm_netlink.h
+++ b/include/linux/dlm_netlink.h
--- a/include/linux/dm-ioctl.h
+++ b/include/linux/dm-ioctl.h
--- a/include/linux/dma-debug.h
+++ b/include/linux/dma-debug.h
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
--- a/include/linux/dvb/audio.h
+++ b/include/linux/dvb/audio.h
--- a/include/linux/dvb/video.h
+++ b/include/linux/dvb/video.h
--- a/include/linux/dynamic_debug.h
+++ b/include/linux/dynamic_debug.h
--- a/include/linux/dynamic_printk.h
+++ b/include/linux/dynamic_printk.h
--- a/include/linux/errqueue.h
+++ b/include/linux/errqueue.h
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
--- a/include/linux/eventpoll.h
+++ b/include/linux/eventpoll.h
--- a/include/linux/firewire-cdev.h
+++ b/include/linux/firewire-cdev.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/fs_struct.h
+++ b/include/linux/fs_struct.h
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
--- a/include/linux/gen_stats.h
+++ b/include/linux/gen_stats.h
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
--- a/include/linux/hdlc.h
+++ b/include/linux/hdlc.h
--- a/include/linux/hdlcdrv.h
+++ b/include/linux/hdlcdrv.h
--- a/include/linux/i2c-algo-pca.h
+++ b/include/linux/i2c-algo-pca.h
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
--- a/include/linux/i2c-pca-platform.h
+++ b/include/linux/i2c-pca-platform.h
--- a/include/linux/ibmtr.h
+++ b/include/linux/ibmtr.h
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
--- a/include/linux/if.h
+++ b/include/linux/if.h
--- a/include/linux/if_arcnet.h
+++ b/include/linux/if_arcnet.h
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
--- a/include/linux/if_frad.h
+++ b/include/linux/if_frad.h
--- a/include/linux/if_pppol2tp.h
+++ b/include/linux/if_pppol2tp.h
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
--- a/include/linux/if_tun.h
+++ b/include/linux/if_tun.h
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
--- a/include/linux/ima.h
+++ b/include/linux/ima.h
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
--- a/include/linux/input.h
+++ b/include/linux/input.h
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
--- a/include/linux/ip_vs.h
+++ b/include/linux/ip_vs.h
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
--- a/include/linux/irqnr.h
+++ b/include/linux/irqnr.h
--- a/Show more
+++ b/Show more