Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2026-09-28 19:20:30 +00:00 · 2010-08-26 15:11:25 -05:00 · 2010-08-26 15:11:25 -05:00 · 0a2f38193d
commit 0a2f38193d
parent 4684fe01c7 d4348c6789
159 changed files with 2261 additions and 5596 deletions
--- a/3
+++ b/3
--- a/arch/arm/mach-imx/mach-cpuimx27.c
+++ b/arch/arm/mach-imx/mach-cpuimx27.c
--- a/arch/arm/mach-imx/mach-pca100.c
+++ b/arch/arm/mach-imx/mach-pca100.c
--- a/arch/arm/mach-mx25/mach-cpuimx25.c
+++ b/arch/arm/mach-mx25/mach-cpuimx25.c
--- a/arch/arm/mach-mx3/mach-cpuimx35.c
+++ b/arch/arm/mach-mx3/mach-cpuimx35.c
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
--- a/arch/powerpc/boot/dts/canyonlands.dts
+++ b/arch/powerpc/boot/dts/canyonlands.dts
--- a/arch/powerpc/include/asm/mmu-hash64.h
+++ b/arch/powerpc/include/asm/mmu-hash64.h
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
--- a/arch/powerpc/include/asm/rwsem.h
+++ b/arch/powerpc/include/asm/rwsem.h
--- a/arch/powerpc/include/asm/systbl.h
+++ b/arch/powerpc/include/asm/systbl.h
--- a/arch/powerpc/include/asm/unistd.h
+++ b/arch/powerpc/include/asm/unistd.h
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
--- a/arch/powerpc/kernel/head_44x.S
+++ b/arch/powerpc/kernel/head_44x.S
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
--- a/arch/powerpc/kernel/idle.c
+++ b/arch/powerpc/kernel/idle.c
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
--- a/arch/powerpc/kernel/pci_of_scan.c
+++ b/arch/powerpc/kernel/pci_of_scan.c
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
--- a/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
--- a/arch/powerpc/mm/tlb_nohash_low.S
+++ b/arch/powerpc/mm/tlb_nohash_low.S
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
--- a/arch/powerpc/platforms/iseries/iommu.c
+++ b/arch/powerpc/platforms/iseries/iommu.c
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
--- a/arch/s390/include/asm/hugetlb.h
+++ b/arch/s390/include/asm/hugetlb.h
--- a/arch/s390/include/asm/mmu.h
+++ b/arch/s390/include/asm/mmu.h
--- a/arch/s390/include/asm/mmu_context.h
+++ b/arch/s390/include/asm/mmu_context.h
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
--- a/arch/s390/include/asm/tlb.h
+++ b/arch/s390/include/asm/tlb.h
--- a/arch/s390/include/asm/tlbflush.h
+++ b/arch/s390/include/asm/tlbflush.h
--- a/arch/s390/kernel/entry.h
+++ b/arch/s390/kernel/entry.h
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
--- a/arch/sparc/include/asm/atomic_64.h
+++ b/arch/sparc/include/asm/atomic_64.h
--- a/arch/sparc/include/asm/backoff.h
+++ b/arch/sparc/include/asm/backoff.h
--- a/arch/sparc/include/asm/oplib_64.h
+++ b/arch/sparc/include/asm/oplib_64.h
--- a/arch/sparc/include/asm/rwsem-const.h
+++ b/arch/sparc/include/asm/rwsem-const.h
--- a/arch/sparc/include/asm/rwsem.h
+++ b/arch/sparc/include/asm/rwsem.h
--- a/arch/sparc/include/asm/system_64.h
+++ b/arch/sparc/include/asm/system_64.h
--- a/arch/sparc/lib/Makefile
+++ b/arch/sparc/lib/Makefile
--- a/arch/sparc/lib/atomic_64.S
+++ b/arch/sparc/lib/atomic_64.S
--- a/arch/sparc/lib/bitops.S
+++ b/arch/sparc/lib/bitops.S
--- a/arch/sparc/lib/rwsem_64.S
+++ b/arch/sparc/lib/rwsem_64.S
--- a/arch/sparc/prom/cif.S
+++ b/arch/sparc/prom/cif.S
--- a/arch/sparc/prom/console_64.c
+++ b/arch/sparc/prom/console_64.c
--- a/arch/sparc/prom/devops_64.c
+++ b/arch/sparc/prom/devops_64.c
--- a/arch/sparc/prom/misc_64.c
+++ b/arch/sparc/prom/misc_64.c
--- a/arch/sparc/prom/p1275.c
+++ b/arch/sparc/prom/p1275.c
--- a/arch/sparc/prom/tree_64.c
+++ b/arch/sparc/prom/tree_64.c
--- a/arch/x86/include/asm/tsc.h
+++ b/arch/x86/include/asm/tsc.h
--- a/arch/x86/kernel/cpu/perf_event_p4.c
+++ b/arch/x86/kernel/cpu/perf_event_p4.c
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
--- a/arch/x86/power/cpu.c
+++ b/arch/x86/power/cpu.c
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
--- a/drivers/hwmon/ads7871.c
+++ b/drivers/hwmon/ads7871.c
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
--- a/drivers/hwmon/k8temp.c
+++ b/drivers/hwmon/k8temp.c
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
--- a/drivers/media/dvb/mantis/Kconfig
+++ b/drivers/media/dvb/mantis/Kconfig
--- a/drivers/platform/x86/intel_rar_register.c
+++ b/drivers/platform/x86/intel_rar_register.c
--- a/drivers/platform/x86/intel_scu_ipc.c
+++ b/drivers/platform/x86/intel_scu_ipc.c
--- a/drivers/serial/68328serial.c
+++ b/drivers/serial/68328serial.c
--- a/drivers/serial/8250_early.c
+++ b/drivers/serial/8250_early.c
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
--- a/drivers/staging/batman-adv/bat_sysfs.c
+++ b/drivers/staging/batman-adv/bat_sysfs.c
--- a/drivers/staging/batman-adv/hard-interface.c
+++ b/drivers/staging/batman-adv/hard-interface.c
--- a/drivers/staging/batman-adv/icmp_socket.c
+++ b/drivers/staging/batman-adv/icmp_socket.c
--- a/drivers/staging/batman-adv/main.c
+++ b/drivers/staging/batman-adv/main.c
--- a/drivers/staging/batman-adv/originator.c
+++ b/drivers/staging/batman-adv/originator.c
--- a/drivers/staging/batman-adv/routing.c
+++ b/drivers/staging/batman-adv/routing.c
--- a/drivers/staging/batman-adv/types.h
+++ b/drivers/staging/batman-adv/types.h
--- a/drivers/staging/sep/Kconfig
+++ b/drivers/staging/sep/Kconfig
--- a/drivers/staging/sep/Makefile
+++ b/drivers/staging/sep/Makefile
--- a/drivers/staging/sep/TODO
+++ b/drivers/staging/sep/TODO
--- a/drivers/staging/sep/sep_dev.h
+++ b/drivers/staging/sep/sep_dev.h
--- a/drivers/staging/sep/sep_driver.c
+++ b/drivers/staging/sep/sep_driver.c
--- a/drivers/staging/sep/sep_driver_api.h
+++ b/drivers/staging/sep/sep_driver_api.h
--- a/drivers/staging/sep/sep_driver_config.h
+++ b/drivers/staging/sep/sep_driver_config.h
--- a/drivers/staging/sep/sep_driver_hw_defs.h
+++ b/drivers/staging/sep/sep_driver_hw_defs.h
--- a/drivers/staging/spectra/ffsport.c
+++ b/drivers/staging/spectra/ffsport.c
--- a/drivers/staging/spectra/flash.c
+++ b/drivers/staging/spectra/flash.c
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
--- a/drivers/usb/gadget/m66592-udc.c
+++ b/drivers/usb/gadget/m66592-udc.c
--- a/drivers/usb/gadget/r8a66597-udc.c
+++ b/drivers/usb/gadget/r8a66597-udc.c
--- a/Show more
+++ b/Show more