From 69601edda74f0cbdbf07ebd263346e985b1fa3df Mon Sep 17 00:00:00 2001 From: Udo van den Heuvel Date: Tue, 14 Sep 2010 07:15:08 +0200 Subject: [PATCH] --- yaml --- r: 213778 b: refs/heads/master c: 892df7f81c31ce7f85778aa78094e8d1f19b8413 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/CREDITS | 8 +- trunk/Documentation/hwmon/sysfs-interface | 7 +- trunk/Documentation/networking/e1000.txt | 373 ++++++++++++----- trunk/Documentation/networking/e1000e.txt | 302 -------------- trunk/Documentation/networking/ixgbevf.txt | 40 +- .../power/regulator/overview.txt | 2 +- trunk/Documentation/vm/page-types.c | 2 +- trunk/Documentation/workqueue.txt | 380 ------------------ trunk/MAINTAINERS | 87 +--- trunk/Makefile | 2 +- trunk/arch/Kconfig | 4 +- trunk/arch/alpha/include/asm/cacheflush.h | 2 - trunk/arch/alpha/include/asm/unistd.h | 6 +- trunk/arch/alpha/kernel/entry.S | 81 ++-- trunk/arch/alpha/kernel/err_ev6.c | 12 +- trunk/arch/alpha/kernel/err_marvel.c | 33 +- trunk/arch/alpha/kernel/err_titan.c | 35 +- trunk/arch/alpha/kernel/osf_sys.c | 9 +- trunk/arch/alpha/kernel/pci-sysfs.c | 2 +- trunk/arch/alpha/kernel/process.c | 2 +- trunk/arch/alpha/kernel/signal.c | 97 ++++- trunk/arch/alpha/kernel/srm_env.c | 2 +- trunk/arch/alpha/kernel/systbls.S | 5 +- trunk/arch/alpha/kernel/time.c | 10 +- trunk/arch/alpha/kernel/traps.c | 3 + trunk/arch/arm/Kconfig | 27 +- trunk/arch/arm/boot/compressed/Makefile | 2 +- trunk/arch/arm/common/it8152.c | 8 - trunk/arch/arm/include/asm/pgtable.h | 4 - trunk/arch/arm/kernel/entry-common.S | 4 - .../arch/arm/mach-at91/at91sam9g45_devices.c | 4 +- trunk/arch/arm/mach-davinci/dm355.c | 3 +- trunk/arch/arm/mach-davinci/dm365.c | 3 +- trunk/arch/arm/mach-davinci/dm644x.c | 3 +- trunk/arch/arm/mach-davinci/dm646x.c | 3 +- trunk/arch/arm/mach-dove/include/mach/io.h | 6 +- trunk/arch/arm/mach-ixp4xx/common-pci.c | 8 - .../arm/mach-ixp4xx/include/mach/hardware.h | 2 - .../arm/mach-kirkwood/include/mach/kirkwood.h | 2 +- trunk/arch/arm/mach-kirkwood/pcie.c | 4 +- trunk/arch/arm/mach-mmp/include/mach/system.h | 7 +- trunk/arch/arm/mach-pxa/cpufreq-pxa2xx.c | 3 +- .../arch/arm/mach-pxa/include/mach/hardware.h | 14 +- trunk/arch/arm/mach-pxa/include/mach/io.h | 2 - trunk/arch/arm/mach-pxa/palm27x.c | 6 +- trunk/arch/arm/mach-pxa/vpac270.c | 1 - trunk/arch/arm/mach-s3c64xx/dev-spi.c | 3 +- trunk/arch/arm/mach-s3c64xx/mach-real6410.c | 104 ++--- trunk/arch/arm/mach-s5p6440/cpu.c | 1 - trunk/arch/arm/mach-s5p6442/cpu.c | 1 - trunk/arch/arm/mach-s5pc100/cpu.c | 1 - trunk/arch/arm/mach-s5pv210/clock.c | 25 +- trunk/arch/arm/mach-s5pv210/cpu.c | 3 +- trunk/arch/arm/mach-u300/include/mach/gpio.h | 3 - trunk/arch/arm/mach-vexpress/ct-ca9x4.c | 8 +- trunk/arch/arm/mm/alignment.c | 19 +- trunk/arch/arm/mm/mmu.c | 31 +- trunk/arch/arm/mm/proc-v7.S | 62 +-- trunk/arch/arm/oprofile/common.c | 7 +- trunk/arch/arm/plat-nomadik/timer.c | 33 +- trunk/arch/arm/plat-omap/Kconfig | 2 +- trunk/arch/arm/plat-omap/mcbsp.c | 2 +- trunk/arch/arm/plat-omap/sram.c | 25 +- trunk/arch/arm/plat-s5p/dev-fimc0.c | 9 +- trunk/arch/arm/plat-s5p/dev-fimc1.c | 9 +- trunk/arch/arm/plat-s5p/dev-fimc2.c | 9 +- trunk/arch/arm/plat-samsung/adc.c | 1 + trunk/arch/arm/plat-samsung/clock.c | 27 +- trunk/arch/arm/plat-samsung/gpio-config.c | 7 +- .../arm/plat-samsung/include/plat/gpio-cfg.h | 10 +- trunk/arch/avr32/kernel/module.c | 3 +- trunk/arch/frv/kernel/signal.c | 51 +-- trunk/arch/h8300/kernel/module.c | 3 +- trunk/arch/ia64/include/asm/compat.h | 2 +- trunk/arch/ia64/kernel/fsys.S | 42 +- trunk/arch/m32r/include/asm/signal.h | 1 + trunk/arch/m32r/include/asm/unistd.h | 1 - trunk/arch/m32r/kernel/entry.S | 5 +- trunk/arch/m32r/kernel/ptrace.c | 7 +- trunk/arch/m32r/kernel/signal.c | 105 +++-- trunk/arch/m68k/mac/macboing.c | 6 +- trunk/arch/mips/Kconfig | 21 +- trunk/arch/mips/alchemy/common/prom.c | 5 +- trunk/arch/mips/boot/compressed/Makefile | 2 +- trunk/arch/mips/cavium-octeon/Kconfig | 4 - trunk/arch/mips/cavium-octeon/cpu.c | 2 +- .../mips/cavium-octeon/executive/Makefile | 2 +- trunk/arch/mips/include/asm/atomic.h | 4 - trunk/arch/mips/include/asm/compat.h | 2 +- trunk/arch/mips/include/asm/cop2.h | 2 +- trunk/arch/mips/include/asm/gic.h | 1 - .../mips/include/asm/mach-tx49xx/kmalloc.h | 2 +- .../mips/include/asm/mips-boards/maltaint.h | 3 + trunk/arch/mips/include/asm/page.h | 14 - trunk/arch/mips/include/asm/siginfo.h | 1 - trunk/arch/mips/include/asm/thread_info.h | 3 +- trunk/arch/mips/include/asm/unistd.h | 21 +- trunk/arch/mips/kernel/irq-gic.c | 5 +- trunk/arch/mips/kernel/kgdb.c | 2 +- trunk/arch/mips/kernel/kspd.c | 2 +- trunk/arch/mips/kernel/linux32.c | 7 - trunk/arch/mips/kernel/scall32-o32.S | 5 +- trunk/arch/mips/kernel/scall64-64.S | 7 +- trunk/arch/mips/kernel/scall64-n32.S | 5 +- trunk/arch/mips/kernel/scall64-o32.S | 5 +- trunk/arch/mips/mm/dma-default.c | 28 +- trunk/arch/mips/mm/sc-rm7k.c | 2 +- trunk/arch/mips/mti-malta/malta-int.c | 3 - trunk/arch/mips/pci/pci-rc32434.c | 2 +- trunk/arch/mips/pnx8550/common/reset.c | 20 +- trunk/arch/mips/pnx8550/common/setup.c | 3 +- trunk/arch/mn10300/Kconfig | 1 + trunk/arch/mn10300/Kconfig.debug | 2 +- trunk/arch/mn10300/include/asm/bitops.h | 4 +- trunk/arch/mn10300/include/asm/signal.h | 2 +- trunk/arch/mn10300/kernel/mn10300-serial.c | 22 +- trunk/arch/mn10300/kernel/module.c | 3 +- trunk/arch/mn10300/kernel/signal.c | 35 +- trunk/arch/mn10300/mm/Makefile | 14 +- trunk/arch/mn10300/mm/cache-disabled.c | 21 - trunk/arch/mn10300/mm/cache.c | 20 +- trunk/arch/parisc/include/asm/compat.h | 2 +- trunk/arch/parisc/kernel/module.c | 3 +- trunk/arch/powerpc/include/asm/compat.h | 2 +- trunk/arch/powerpc/kernel/module.c | 6 + trunk/arch/powerpc/kernel/signal.c | 2 - trunk/arch/powerpc/kernel/signal_32.c | 3 +- trunk/arch/powerpc/kernel/signal_64.c | 2 +- trunk/arch/powerpc/platforms/512x/clock.c | 2 +- trunk/arch/powerpc/platforms/52xx/efika.c | 9 +- .../powerpc/platforms/52xx/mpc52xx_common.c | 8 +- trunk/arch/s390/include/asm/compat.h | 2 +- trunk/arch/s390/kernel/module.c | 3 +- trunk/arch/sh/kernel/module.c | 2 + trunk/arch/sparc/include/asm/compat.h | 2 +- trunk/arch/sparc/kernel/perf_event.c | 14 +- trunk/arch/sparc/kernel/signal32.c | 161 +++----- trunk/arch/sparc/kernel/signal_32.c | 55 +-- trunk/arch/sparc/kernel/signal_64.c | 45 +-- trunk/arch/tile/include/arch/chip_tile64.h | 3 - trunk/arch/tile/include/arch/chip_tilepro.h | 3 - trunk/arch/tile/include/asm/compat.h | 7 +- trunk/arch/tile/include/asm/io.h | 8 +- trunk/arch/tile/include/asm/processor.h | 12 - trunk/arch/tile/include/asm/ptrace.h | 15 +- trunk/arch/tile/include/asm/sigcontext.h | 18 +- trunk/arch/tile/include/asm/signal.h | 1 - trunk/arch/tile/include/asm/syscalls.h | 21 +- trunk/arch/tile/kernel/intvec_32.S | 7 + trunk/arch/tile/kernel/process.c | 30 +- trunk/arch/tile/kernel/signal.c | 27 +- trunk/arch/tile/kernel/stack.c | 2 +- trunk/arch/um/drivers/net_kern.c | 17 +- trunk/arch/um/kernel/exec.c | 6 +- trunk/arch/um/kernel/internal.h | 2 +- trunk/arch/um/kernel/syscall.c | 4 +- trunk/arch/x86/Makefile | 2 +- trunk/arch/x86/boot/early_serial_console.c | 14 +- trunk/arch/x86/ia32/ia32entry.S | 22 +- trunk/arch/x86/include/asm/amd_iommu_proto.h | 6 - trunk/arch/x86/include/asm/amd_iommu_types.h | 12 - trunk/arch/x86/include/asm/bitops.h | 2 +- trunk/arch/x86/include/asm/compat.h | 2 +- trunk/arch/x86/include/asm/cpufeature.h | 5 +- trunk/arch/x86/include/asm/hpet.h | 1 + trunk/arch/x86/include/asm/hw_breakpoint.h | 2 +- trunk/arch/x86/kernel/Makefile | 2 - trunk/arch/x86/kernel/acpi/cstate.c | 2 +- trunk/arch/x86/kernel/amd_iommu.c | 4 +- trunk/arch/x86/kernel/amd_iommu_init.c | 67 +-- trunk/arch/x86/kernel/apic/io_apic.c | 11 +- trunk/arch/x86/kernel/apic/x2apic_uv_x.c | 6 +- trunk/arch/x86/kernel/cpu/common.c | 2 +- trunk/arch/x86/kernel/cpu/cpu.h | 1 - .../arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c | 18 +- trunk/arch/x86/kernel/cpu/intel.c | 5 +- trunk/arch/x86/kernel/cpu/perf_event.c | 12 +- trunk/arch/x86/kernel/cpu/perf_event_p4.c | 6 +- trunk/arch/x86/kernel/cpu/scattered.c | 1 - trunk/arch/x86/kernel/early-quirks.c | 18 + trunk/arch/x86/kernel/hpet.c | 33 +- trunk/arch/x86/kernel/hw_breakpoint.c | 40 +- trunk/arch/x86/kernel/module.c | 3 +- trunk/arch/x86/kernel/quirks.c | 2 + trunk/arch/x86/lguest/boot.c | 13 +- trunk/arch/x86/oprofile/nmi_int.c | 5 +- trunk/arch/x86/xen/time.c | 5 +- trunk/block/blk-map.c | 2 +- trunk/block/blk-merge.c | 12 - trunk/block/cfq-iosched.c | 16 +- trunk/block/elevator.c | 12 +- trunk/drivers/Makefile | 2 +- trunk/drivers/acpi/Kconfig | 2 +- trunk/drivers/acpi/acpi_pad.c | 34 +- trunk/drivers/acpi/acpica/aclocal.h | 1 - trunk/drivers/acpi/acpica/exutils.c | 2 +- trunk/drivers/acpi/acpica/rsutils.c | 2 +- trunk/drivers/acpi/apei/Kconfig | 2 +- trunk/drivers/acpi/apei/apei-base.c | 21 +- trunk/drivers/acpi/apei/einj.c | 4 +- trunk/drivers/acpi/apei/erst-dbg.c | 18 +- trunk/drivers/acpi/apei/erst.c | 29 +- trunk/drivers/acpi/apei/ghes.c | 2 +- trunk/drivers/acpi/apei/hest.c | 11 +- trunk/drivers/acpi/atomicio.c | 2 +- trunk/drivers/acpi/battery.c | 1 + trunk/drivers/acpi/blacklist.c | 35 -- trunk/drivers/acpi/bus.c | 18 +- trunk/drivers/acpi/fan.c | 2 - trunk/drivers/acpi/processor_core.c | 7 +- trunk/drivers/acpi/processor_driver.c | 2 +- trunk/drivers/acpi/processor_perflib.c | 4 +- trunk/drivers/acpi/sleep.c | 22 - trunk/drivers/acpi/sysfs.c | 20 +- trunk/drivers/acpi/video_detect.c | 4 +- trunk/drivers/ata/ahci.c | 4 - trunk/drivers/ata/ahci.h | 12 +- trunk/drivers/ata/ahci_platform.c | 6 +- trunk/drivers/ata/libahci.c | 16 +- trunk/drivers/block/cciss.c | 2 +- trunk/drivers/block/pktcdvd.c | 2 +- trunk/drivers/block/virtio_blk.c | 6 +- trunk/drivers/char/agp/intel-agp.c | 2 - trunk/drivers/char/agp/intel-agp.h | 2 - trunk/drivers/char/ipmi/ipmi_si_intf.c | 17 +- trunk/drivers/char/mem.c | 3 +- trunk/drivers/char/virtio_console.c | 6 +- trunk/drivers/cpuidle/governors/menu.c | 2 +- trunk/drivers/dca/dca-core.c | 85 +--- trunk/drivers/dma/mv_xor.c | 2 +- trunk/drivers/dma/shdma.c | 3 +- trunk/drivers/edac/edac_mc.c | 3 - trunk/drivers/edac/i7core_edac.c | 1 - trunk/drivers/firewire/ohci.c | 1 - trunk/drivers/gpu/drm/drm_buffer.c | 6 +- trunk/drivers/gpu/drm/drm_crtc_helper.c | 10 +- trunk/drivers/gpu/drm/drm_gem.c | 39 +- trunk/drivers/gpu/drm/drm_info.c | 2 +- trunk/drivers/gpu/drm/drm_pci.c | 4 - trunk/drivers/gpu/drm/drm_platform.c | 5 - trunk/drivers/gpu/drm/drm_sysfs.c | 2 +- trunk/drivers/gpu/drm/drm_vm.c | 28 +- trunk/drivers/gpu/drm/i810/i810_dma.c | 2 +- trunk/drivers/gpu/drm/i830/i830_dma.c | 2 +- trunk/drivers/gpu/drm/i915/i915_dma.c | 9 +- trunk/drivers/gpu/drm/i915/i915_drv.c | 1 - trunk/drivers/gpu/drm/i915/i915_gem.c | 89 ++-- trunk/drivers/gpu/drm/i915/i915_gem_evict.c | 44 +- trunk/drivers/gpu/drm/i915/i915_suspend.c | 36 +- trunk/drivers/gpu/drm/i915/intel_crt.c | 10 +- trunk/drivers/gpu/drm/i915/intel_display.c | 70 ++-- trunk/drivers/gpu/drm/i915/intel_dp.c | 21 +- trunk/drivers/gpu/drm/i915/intel_drv.h | 1 + trunk/drivers/gpu/drm/i915/intel_dvo.c | 3 +- trunk/drivers/gpu/drm/i915/intel_fb.c | 4 +- trunk/drivers/gpu/drm/i915/intel_hdmi.c | 2 +- trunk/drivers/gpu/drm/i915/intel_lvds.c | 7 +- trunk/drivers/gpu/drm/i915/intel_sdvo.c | 20 +- trunk/drivers/gpu/drm/i915/intel_tv.c | 11 +- .../gpu/drm/nouveau/nouveau_connector.c | 12 +- trunk/drivers/gpu/drm/nouveau/nouveau_gem.c | 6 +- trunk/drivers/gpu/drm/radeon/atombios.h | 2 +- trunk/drivers/gpu/drm/radeon/atombios_crtc.c | 5 +- trunk/drivers/gpu/drm/radeon/evergreen.c | 27 +- trunk/drivers/gpu/drm/radeon/r100.c | 24 +- trunk/drivers/gpu/drm/radeon/r600.c | 5 +- trunk/drivers/gpu/drm/radeon/r600_blit_kms.c | 25 -- .../gpu/drm/radeon/r600_blit_shaders.h | 24 -- trunk/drivers/gpu/drm/radeon/r600_cs.c | 5 +- .../drivers/gpu/drm/radeon/radeon_atombios.c | 9 - trunk/drivers/gpu/drm/radeon/radeon_combios.c | 47 --- .../gpu/drm/radeon/radeon_connectors.c | 15 +- trunk/drivers/gpu/drm/radeon/radeon_display.c | 14 +- trunk/drivers/gpu/drm/radeon/radeon_fb.c | 13 +- trunk/drivers/gpu/drm/radeon/radeon_gem.c | 4 +- trunk/drivers/gpu/drm/radeon/radeon_kms.c | 4 - trunk/drivers/gpu/drm/radeon/radeon_mode.h | 3 +- trunk/drivers/gpu/drm/ttm/ttm_bo.c | 83 +--- trunk/drivers/gpu/drm/ttm/ttm_bo_util.c | 1 - trunk/drivers/gpu/drm/ttm/ttm_page_alloc.c | 8 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 145 ++----- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 8 - trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 5 - trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 3 - trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 17 - trunk/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 34 +- .../drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 - trunk/drivers/gpu/vga/vgaarb.c | 2 +- trunk/drivers/hid/hid-core.c | 4 +- trunk/drivers/hid/hid-ids.h | 4 - trunk/drivers/hid/hid-mosart.c | 1 - trunk/drivers/hid/hid-topseed.c | 1 - trunk/drivers/hid/usbhid/hid-core.c | 8 +- trunk/drivers/hid/usbhid/hid-quirks.c | 4 - trunk/drivers/hid/usbhid/hiddev.c | 2 +- trunk/drivers/hid/usbhid/usbhid.h | 1 - trunk/drivers/hwmon/Kconfig | 2 +- trunk/drivers/hwmon/adm1031.c | 43 +- trunk/drivers/hwmon/coretemp.c | 57 ++- trunk/drivers/hwmon/emc1403.c | 1 + trunk/drivers/hwmon/f71882fg.c | 32 +- trunk/drivers/hwmon/f75375s.c | 6 +- trunk/drivers/hwmon/lis3lv02d.c | 4 +- trunk/drivers/hwmon/lis3lv02d_i2c.c | 4 +- trunk/drivers/hwmon/lis3lv02d_spi.c | 4 +- trunk/drivers/hwmon/lm95241.c | 21 +- trunk/drivers/hwmon/pkgtemp.c | 23 +- trunk/drivers/hwmon/w83627ehf.c | 1 - trunk/drivers/i2c/busses/i2c-cpm.c | 5 - trunk/drivers/i2c/busses/i2c-davinci.c | 6 +- trunk/drivers/i2c/busses/i2c-ibm_iic.c | 3 - trunk/drivers/i2c/busses/i2c-mpc.c | 1 - trunk/drivers/i2c/busses/i2c-octeon.c | 2 +- trunk/drivers/i2c/busses/i2c-omap.c | 2 - trunk/drivers/i2c/busses/i2c-pca-isa.c | 12 +- trunk/drivers/i2c/busses/i2c-pca-platform.c | 11 +- trunk/drivers/i2c/busses/i2c-s3c2410.c | 4 +- trunk/drivers/i2c/i2c-core.c | 54 +-- trunk/drivers/ide/ide-probe.c | 12 +- trunk/drivers/idle/intel_idle.c | 30 +- trunk/drivers/infiniband/hw/cxgb3/iwch_cm.c | 6 +- trunk/drivers/input/joydev.c | 3 - trunk/drivers/input/misc/uinput.c | 7 - trunk/drivers/input/tablet/wacom_sys.c | 23 +- trunk/drivers/input/tablet/wacom_wac.c | 4 +- trunk/drivers/isdn/sc/interrupt.c | 18 +- trunk/drivers/leds/leds-ns2.c | 9 +- trunk/drivers/md/bitmap.c | 9 +- trunk/drivers/md/md.c | 6 +- trunk/drivers/md/raid1.c | 4 +- trunk/drivers/media/IR/ir-keytable.c | 9 +- trunk/drivers/media/IR/ir-lirc-codec.c | 2 +- trunk/drivers/media/IR/ir-raw-event.c | 4 +- trunk/drivers/media/IR/ir-sysfs.c | 17 +- trunk/drivers/media/IR/keymaps/rc-rc6-mce.c | 3 - trunk/drivers/media/IR/mceusb.c | 4 - .../drivers/media/dvb/dvb-usb/dib0700_core.c | 3 + .../media/dvb/dvb-usb/dib0700_devices.c | 56 +-- trunk/drivers/media/dvb/dvb-usb/opera1.c | 4 +- trunk/drivers/media/dvb/frontends/dib7000p.c | 8 +- trunk/drivers/media/dvb/frontends/dib7000p.h | 5 - trunk/drivers/media/dvb/siano/smscoreapi.c | 31 +- .../media/radio/si470x/radio-si470x-i2c.c | 2 +- trunk/drivers/media/video/cx231xx/Makefile | 1 - .../media/video/cx231xx/cx231xx-cards.c | 17 +- .../media/video/cx25840/cx25840-core.c | 2 +- trunk/drivers/media/video/cx88/Kconfig | 2 +- trunk/drivers/media/video/gspca/gspca.c | 1 - trunk/drivers/media/video/gspca/sn9c20x.c | 3 +- trunk/drivers/media/video/ivtv/ivtvfb.c | 2 - trunk/drivers/media/video/mem2mem_testdev.c | 3 +- trunk/drivers/media/video/mt9m111.c | 8 +- trunk/drivers/media/video/mt9v022.c | 3 + trunk/drivers/media/video/mx2_camera.c | 4 - .../media/video/pvrusb2/pvrusb2-ctrl.c | 6 +- .../drivers/media/video/s5p-fimc/fimc-core.c | 94 +++-- .../media/video/saa7134/saa7134-cards.c | 10 +- .../media/video/saa7164/saa7164-buffer.c | 5 +- trunk/drivers/media/video/uvc/uvc_driver.c | 24 -- trunk/drivers/media/video/uvc/uvcvideo.h | 1 - .../drivers/media/video/videobuf-dma-contig.c | 6 +- trunk/drivers/media/video/videobuf-dma-sg.c | 11 +- trunk/drivers/mfd/max8925-core.c | 13 +- trunk/drivers/mfd/wm831x-irq.c | 9 +- trunk/drivers/misc/Kconfig | 2 +- trunk/drivers/misc/Makefile | 2 +- trunk/drivers/misc/bh1780gli.c | 1 + .../misc/{vmw_balloon.c => vmware_balloon.c} | 0 trunk/drivers/mmc/host/sdhci-s3c.c | 12 +- trunk/drivers/mtd/nand/bf5xx_nand.c | 9 +- trunk/drivers/mtd/nand/mxc_nand.c | 47 +-- trunk/drivers/mtd/nand/omap2.c | 2 +- trunk/drivers/mtd/nand/pxa3xx_nand.c | 6 - trunk/drivers/mtd/onenand/samsung.c | 16 +- trunk/drivers/net/3c59x.c | 17 +- trunk/drivers/net/Kconfig | 4 +- trunk/drivers/net/atlx/atl1.c | 11 +- trunk/drivers/net/bonding/bond_3ad.c | 3 - trunk/drivers/net/bonding/bond_alb.c | 3 - trunk/drivers/net/bonding/bond_main.c | 9 - trunk/drivers/net/cxgb3/cxgb3_main.c | 2 - trunk/drivers/net/e1000e/hw.h | 1 - trunk/drivers/net/e1000e/ich8lan.c | 197 ++------- trunk/drivers/net/e1000e/netdev.c | 29 +- trunk/drivers/net/eql.c | 2 - trunk/drivers/net/ibm_newemac/core.c | 4 +- trunk/drivers/net/netxen/netxen_nic_init.c | 3 + trunk/drivers/net/pcmcia/pcnet_cs.c | 139 +++---- trunk/drivers/net/phy/mdio_bus.c | 4 +- trunk/drivers/net/ppp_generic.c | 9 +- trunk/drivers/net/qlcnic/qlcnic_init.c | 7 +- trunk/drivers/net/r8169.c | 5 +- trunk/drivers/net/rionet.c | 2 +- trunk/drivers/net/sgiseeq.c | 2 +- trunk/drivers/net/skge.c | 18 +- trunk/drivers/net/smsc911x.c | 1 - trunk/drivers/net/tulip/de2104x.c | 43 +- trunk/drivers/net/usb/hso.c | 2 - trunk/drivers/net/wireless/ath/ath9k/ani.c | 2 +- .../net/wireless/iwlwifi/iwl-agn-lib.c | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-core.c | 5 - .../net/wireless/iwlwifi/iwl3945-base.c | 2 +- trunk/drivers/pci/intel-iommu.c | 117 +++--- trunk/drivers/pci/iov.c | 2 +- trunk/drivers/pci/pci.h | 5 +- trunk/drivers/pci/quirks.c | 20 - trunk/drivers/pcmcia/pcmcia_resource.c | 57 ++- trunk/drivers/pcmcia/pd6729.c | 2 +- trunk/drivers/platform/x86/intel_ips.c | 122 ++---- trunk/drivers/platform/x86/thinkpad_acpi.c | 5 +- trunk/drivers/power/apm_power.c | 1 - trunk/drivers/power/intel_mid_battery.c | 6 +- trunk/drivers/regulator/88pm8607.c | 4 +- trunk/drivers/regulator/ab3100.c | 5 +- trunk/drivers/regulator/ab8500.c | 9 +- trunk/drivers/regulator/ad5398.c | 13 +- trunk/drivers/regulator/core.c | 6 +- trunk/drivers/regulator/isl6271a-regulator.c | 4 +- trunk/drivers/regulator/max1586.c | 12 +- trunk/drivers/regulator/max8649.c | 2 +- trunk/drivers/regulator/max8998.c | 8 +- trunk/drivers/regulator/tps6507x-regulator.c | 6 + trunk/drivers/regulator/tps6586x-regulator.c | 4 +- trunk/drivers/regulator/wm831x-ldo.c | 7 +- trunk/drivers/regulator/wm8350-regulator.c | 2 +- trunk/drivers/rtc/rtc-ab3100.c | 2 - trunk/drivers/rtc/rtc-ds3232.c | 2 + trunk/drivers/rtc/rtc-s3c.c | 13 +- trunk/drivers/s390/net/ctcm_main.c | 4 +- trunk/drivers/serial/amba-pl010.c | 9 +- trunk/drivers/serial/mfd.c | 18 +- trunk/drivers/serial/mrst_max3110.c | 1 - trunk/drivers/serial/serial_cs.c | 62 ++- trunk/drivers/spi/spi.c | 5 - trunk/drivers/spi/spi_gpio.c | 2 +- trunk/drivers/spi/spi_mpc8xxx.c | 10 +- .../staging/batman-adv/hard-interface.c | 13 + trunk/drivers/staging/batman-adv/send.c | 8 +- trunk/drivers/staging/ti-st/st.h | 1 + trunk/drivers/staging/ti-st/st_core.c | 9 +- trunk/drivers/staging/ti-st/st_core.h | 2 +- trunk/drivers/staging/ti-st/st_kim.c | 22 +- trunk/drivers/staging/tm6000/Kconfig | 2 +- trunk/drivers/staging/tm6000/tm6000-input.c | 61 +-- trunk/drivers/staging/vt6655/wpactl.c | 11 +- trunk/drivers/usb/core/Kconfig | 6 +- trunk/drivers/usb/core/file.c | 35 +- trunk/drivers/usb/core/message.c | 1 - trunk/drivers/usb/host/ehci-pci.c | 5 - trunk/drivers/usb/musb/cppi_dma.c | 1 - trunk/drivers/usb/musb/musb_debugfs.c | 5 +- trunk/drivers/usb/musb/musb_gadget.c | 75 ++-- trunk/drivers/usb/musb/musb_gadget.h | 2 - trunk/drivers/usb/musb/musb_gadget_ep0.c | 9 - trunk/drivers/usb/musb/musb_host.c | 6 - trunk/drivers/usb/otg/twl4030-usb.c | 78 ++-- trunk/drivers/usb/serial/mos7720.c | 3 - trunk/drivers/usb/serial/mos7840.c | 3 - trunk/drivers/vhost/net.c | 2 +- trunk/drivers/vhost/vhost.c | 7 +- trunk/drivers/video/console/fbcon.c | 5 +- trunk/drivers/video/efifb.c | 103 +---- trunk/drivers/video/pxa168fb.c | 4 +- trunk/drivers/video/sis/sis_main.c | 3 - trunk/drivers/video/via/ioctl.c | 2 - trunk/drivers/watchdog/Kconfig | 6 +- trunk/drivers/watchdog/sb_wdog.c | 12 +- trunk/drivers/watchdog/ts72xx_wdt.c | 3 - trunk/drivers/xen/xenbus/xenbus_probe.c | 9 +- trunk/fs/aio.c | 13 +- trunk/fs/ceph/Kconfig | 1 - trunk/fs/ceph/addr.c | 7 +- trunk/fs/ceph/caps.c | 58 +-- trunk/fs/ceph/dir.c | 10 +- trunk/fs/ceph/export.c | 21 +- trunk/fs/ceph/file.c | 2 +- trunk/fs/ceph/inode.c | 11 +- trunk/fs/ceph/mds_client.c | 2 - trunk/fs/ceph/osd_client.c | 2 +- trunk/fs/ceph/pagelist.c | 12 +- trunk/fs/ceph/snap.c | 92 +++-- trunk/fs/ceph/super.h | 5 +- trunk/fs/char_dev.c | 4 +- trunk/fs/cifs/cifssmb.c | 49 +-- trunk/fs/cifs/connect.c | 6 +- trunk/fs/cifs/inode.c | 2 - trunk/fs/coda/psdev.c | 4 +- trunk/fs/compat.c | 2 +- trunk/fs/exofs/inode.c | 8 +- trunk/fs/fs-writeback.c | 12 +- trunk/fs/fuse/dev.c | 2 +- trunk/fs/gfs2/log.c | 2 +- trunk/fs/nfs/Kconfig | 1 - trunk/fs/nfs/client.c | 2 +- trunk/fs/nfs/file.c | 4 + trunk/fs/nfs/super.c | 8 - trunk/fs/nfsd/Kconfig | 1 - trunk/fs/ocfs2/acl.c | 3 - trunk/fs/ocfs2/cluster/tcp.c | 2 +- trunk/fs/ocfs2/dir.c | 24 +- trunk/fs/ocfs2/dlm/dlmcommon.h | 1 - trunk/fs/ocfs2/dlm/dlmdebug.c | 9 +- trunk/fs/ocfs2/dlm/dlmdomain.c | 1 - trunk/fs/ocfs2/dlm/dlmmaster.c | 40 -- trunk/fs/ocfs2/dlmglue.h | 1 - trunk/fs/ocfs2/ocfs2_fs.h | 37 +- trunk/fs/ocfs2/ocfs2_ioctl.h | 8 +- trunk/fs/ocfs2/refcounttree.c | 5 +- trunk/fs/ocfs2/reservations.c | 22 +- trunk/fs/ocfs2/suballoc.c | 4 +- trunk/fs/ocfs2/symlink.c | 2 +- trunk/fs/ocfs2/xattr.c | 4 +- trunk/fs/proc/base.c | 4 +- trunk/fs/proc/task_mmu.c | 4 +- trunk/fs/proc/vmcore.c | 2 +- trunk/fs/reiserfs/ioctl.c | 7 +- trunk/fs/xfs/linux-2.6/xfs_sync.c | 19 +- trunk/fs/xfs/xfs_log_cil.c | 12 +- trunk/fs/xfs/xfs_log_priv.h | 37 +- trunk/include/acpi/acpixf.h | 2 +- trunk/include/drm/drmP.h | 29 +- trunk/include/drm/drm_crtc.h | 10 +- trunk/include/drm/drm_pciids.h | 2 +- trunk/include/drm/ttm/ttm_bo_api.h | 4 +- trunk/include/linux/compat.h | 3 - trunk/include/linux/cpuidle.h | 1 - trunk/include/linux/dma-mapping.h | 4 - trunk/include/linux/dmaengine.h | 2 +- trunk/include/linux/elevator.h | 1 - trunk/include/linux/fs.h | 4 - trunk/include/linux/module.h | 5 +- trunk/include/linux/netlink.h | 4 +- trunk/include/linux/netpoll.h | 8 +- trunk/include/linux/pci_ids.h | 3 - trunk/include/linux/rcupdate.h | 2 +- trunk/include/linux/socket.h | 2 +- trunk/include/linux/sunrpc/clnt.h | 2 +- trunk/include/linux/wait.h | 1 - trunk/include/linux/workqueue.h | 4 - trunk/include/media/videobuf-dma-sg.h | 1 - trunk/include/net/addrconf.h | 1 - trunk/include/net/bluetooth/bluetooth.h | 18 - trunk/include/net/dst.h | 1 - trunk/include/net/route.h | 2 - trunk/include/net/tcp.h | 18 +- trunk/include/net/xfrm.h | 4 +- trunk/ipc/sem.c | 2 - trunk/kernel/compat.c | 21 - trunk/kernel/fork.c | 2 +- trunk/kernel/hw_breakpoint.c | 3 +- trunk/kernel/kfifo.c | 2 + trunk/kernel/module.c | 4 - trunk/kernel/sched.c | 8 +- trunk/kernel/sched_fair.c | 2 +- trunk/kernel/signal.c | 8 - trunk/kernel/smp.c | 17 +- trunk/kernel/sysctl.c | 2 +- trunk/kernel/workqueue.c | 27 +- trunk/lib/bug.c | 6 +- trunk/lib/list_sort.c | 2 +- trunk/mm/backing-dev.c | 2 - trunk/mm/fremap.c | 7 +- trunk/mm/hugetlb.c | 24 +- trunk/mm/ksm.c | 6 +- trunk/mm/memcontrol.c | 10 +- trunk/mm/memory-failure.c | 12 +- trunk/mm/memory.c | 8 +- trunk/mm/mmap.c | 1 - trunk/mm/oom_kill.c | 49 ++- trunk/mm/page_alloc.c | 4 +- trunk/mm/percpu.c | 2 +- trunk/mm/rmap.c | 23 +- trunk/mm/vmscan.c | 43 +- trunk/net/8021q/vlan_core.c | 14 +- trunk/net/9p/trans_rdma.c | 29 +- trunk/net/9p/trans_virtio.c | 3 +- trunk/net/Kconfig | 2 +- trunk/net/atm/br2684.c | 12 +- trunk/net/bluetooth/l2cap.c | 62 +-- trunk/net/bluetooth/rfcomm/sock.c | 4 - trunk/net/caif/caif_socket.c | 21 +- trunk/net/core/dev.c | 2 +- trunk/net/core/ethtool.c | 2 +- trunk/net/core/iovec.c | 5 +- trunk/net/core/sock.c | 8 +- trunk/net/core/stream.c | 8 +- trunk/net/ipv4/Kconfig | 3 +- trunk/net/ipv4/igmp.c | 12 - trunk/net/ipv4/ip_gre.c | 8 +- trunk/net/ipv4/ip_output.c | 19 +- trunk/net/ipv4/ip_sockglue.c | 3 - trunk/net/ipv4/netfilter/ipt_REJECT.c | 1 - trunk/net/ipv4/netfilter/nf_defrag_ipv4.c | 4 +- trunk/net/ipv4/netfilter/nf_nat_snmp_basic.c | 6 +- trunk/net/ipv4/route.c | 2 +- trunk/net/ipv4/tcp.c | 9 +- trunk/net/ipv4/tcp_input.c | 5 +- trunk/net/ipv4/tcp_timer.c | 24 +- trunk/net/ipv4/xfrm4_policy.c | 2 +- trunk/net/ipv4/xfrm4_state.c | 33 +- trunk/net/ipv6/addrconf.c | 11 +- trunk/net/ipv6/addrlabel.c | 5 - trunk/net/ipv6/ip6_output.c | 18 +- trunk/net/ipv6/route.c | 30 +- trunk/net/ipv6/xfrm6_state.c | 33 +- trunk/net/llc/af_llc.c | 3 +- trunk/net/llc/llc_station.c | 2 +- trunk/net/mac80211/agg-tx.c | 2 - trunk/net/mac80211/rx.c | 4 + trunk/net/mac80211/status.c | 4 +- trunk/net/netfilter/nf_conntrack_extend.c | 4 +- trunk/net/netfilter/nf_conntrack_sip.c | 2 +- trunk/net/netfilter/nf_tproxy_core.c | 6 +- trunk/net/phonet/pep.c | 3 +- trunk/net/rds/tcp_connect.c | 4 +- trunk/net/rds/tcp_listen.c | 4 +- trunk/net/rds/tcp_recv.c | 4 +- trunk/net/rds/tcp_send.c | 4 +- trunk/net/rose/af_rose.c | 4 +- trunk/net/sched/cls_u32.c | 2 +- trunk/net/sched/sch_atm.c | 4 + trunk/net/sctp/auth.c | 8 +- trunk/net/sctp/output.c | 1 + trunk/net/sctp/socket.c | 13 +- trunk/net/sunrpc/auth.c | 2 +- trunk/net/sunrpc/auth_gss/auth_gss.c | 9 +- trunk/net/sunrpc/auth_gss/gss_krb5_mech.c | 10 +- trunk/net/sunrpc/auth_gss/gss_spkm3_mech.c | 5 +- trunk/net/sunrpc/clnt.c | 116 +++--- trunk/net/sunrpc/rpc_pipe.c | 20 +- trunk/net/sunrpc/xprtsock.c | 28 +- trunk/net/wireless/wext-priv.c | 2 +- trunk/net/xfrm/xfrm_output.c | 2 +- trunk/net/xfrm/xfrm_policy.c | 5 +- trunk/net/xfrm/xfrm_state.c | 45 +-- trunk/samples/kfifo/dma-example.c | 17 +- trunk/scripts/kconfig/conf.c | 2 +- trunk/scripts/kconfig/expr.h | 1 + trunk/scripts/kconfig/menu.c | 7 +- trunk/scripts/kconfig/symbol.c | 2 - trunk/security/tomoyo/common.c | 6 +- trunk/security/tomoyo/common.h | 3 + trunk/sound/core/control.c | 5 - trunk/sound/core/pcm.c | 33 +- trunk/sound/core/pcm_native.c | 2 - trunk/sound/i2c/other/ak4xxx-adda.c | 2 +- trunk/sound/oss/soundcard.c | 4 +- trunk/sound/pci/hda/hda_intel.c | 3 - trunk/sound/pci/hda/patch_analog.c | 1 - trunk/sound/pci/hda/patch_conexant.c | 1 - trunk/sound/pci/hda/patch_nvhdmi.c | 2 +- trunk/sound/pci/hda/patch_realtek.c | 32 +- trunk/sound/pci/hda/patch_sigmatel.c | 2 - trunk/sound/pci/oxygen/oxygen.c | 4 - trunk/sound/pci/rme9652/hdsp.c | 1 - trunk/sound/pci/rme9652/hdspm.c | 1 - trunk/sound/ppc/snd_ps3.c | 2 +- trunk/sound/soc/s3c24xx/s3c-dma.c | 3 +- trunk/sound/soc/sh/migor.c | 15 +- trunk/sound/soc/soc-cache.c | 5 +- trunk/tools/perf/Makefile | 2 +- trunk/tools/perf/util/trace-event-scripting.c | 4 +- trunk/tools/perf/util/ui/browsers/hists.c | 2 +- trunk/virt/kvm/eventfd.c | 3 +- trunk/virt/kvm/kvm_main.c | 4 +- 666 files changed, 3242 insertions(+), 6027 deletions(-) delete mode 100644 trunk/Documentation/networking/e1000e.txt mode change 100644 => 100755 trunk/Documentation/networking/ixgbevf.txt delete mode 100644 trunk/Documentation/workqueue.txt delete mode 100644 trunk/arch/mn10300/mm/cache-disabled.c mode change 100644 => 100755 trunk/drivers/idle/intel_idle.c rename trunk/drivers/misc/{vmw_balloon.c => vmware_balloon.c} (100%) diff --git a/[refs] b/[refs] index 4c4d835b2b1d..941d358212f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50f2d7f682f9c0ed58191d0982fe77888d59d162 +refs/heads/master: 892df7f81c31ce7f85778aa78094e8d1f19b8413 diff --git a/trunk/CREDITS b/trunk/CREDITS index 41d8e63d5165..72b487869788 100644 --- a/trunk/CREDITS +++ b/trunk/CREDITS @@ -3554,12 +3554,12 @@ E: cvance@nai.com D: portions of the Linux Security Module (LSM) framework and security modules N: Petr Vandrovec -E: petr@vandrovec.name +E: vandrove@vc.cvut.cz D: Small contributions to ncpfs D: Matrox framebuffer driver -S: 21513 Conradia Ct -S: Cupertino, CA 95014 -S: USA +S: Chudenicka 8 +S: 10200 Prague 10, Hostivar +S: Czech Republic N: Thibaut Varene E: T-Bone@parisc-linux.org diff --git a/trunk/Documentation/hwmon/sysfs-interface b/trunk/Documentation/hwmon/sysfs-interface index 48ceabedf55d..ff45d1f837c8 100644 --- a/trunk/Documentation/hwmon/sysfs-interface +++ b/trunk/Documentation/hwmon/sysfs-interface @@ -91,11 +91,12 @@ name The chip name. I2C devices get this attribute created automatically. RO -update_interval The interval at which the chip will update readings. +update_rate The rate at which the chip will update readings. Unit: millisecond RW - Some devices have a variable update rate or interval. - This attribute can be used to change it to the desired value. + Some devices have a variable update rate. This attribute + can be used to change the update rate to the desired + frequency. ************ diff --git a/trunk/Documentation/networking/e1000.txt b/trunk/Documentation/networking/e1000.txt index d9271e74e488..2df71861e578 100644 --- a/trunk/Documentation/networking/e1000.txt +++ b/trunk/Documentation/networking/e1000.txt @@ -1,35 +1,82 @@ Linux* Base Driver for the Intel(R) PRO/1000 Family of Adapters =============================================================== -Intel Gigabit Linux driver. -Copyright(c) 1999 - 2010 Intel Corporation. +September 26, 2006 + Contents ======== +- In This Release - Identifying Your Adapter +- Building and Installation - Command Line Parameters - Speed and Duplex Configuration - Additional Configurations +- Known Issues - Support + +In This Release +=============== + +This file describes the Linux* Base Driver for the Intel(R) PRO/1000 Family +of Adapters. This driver includes support for Itanium(R)2-based systems. + +For questions related to hardware requirements, refer to the documentation +supplied with your Intel PRO/1000 adapter. All hardware requirements listed +apply to use with Linux. + +The following features are now available in supported kernels: + - Native VLANs + - Channel Bonding (teaming) + - SNMP + +Channel Bonding documentation can be found in the Linux kernel source: +/Documentation/networking/bonding.txt + +The driver information previously displayed in the /proc filesystem is not +supported in this release. Alternatively, you can use ethtool (version 1.6 +or later), lspci, and ifconfig to obtain the same information. + +Instructions on updating ethtool can be found in the section "Additional +Configurations" later in this document. + +NOTE: The Intel(R) 82562v 10/100 Network Connection only provides 10/100 +support. + + Identifying Your Adapter ======================== For more information on how to identify your adapter, go to the Adapter & Driver ID Guide at: - http://support.intel.com/support/go/network/adapter/idguide.htm + http://support.intel.com/support/network/adapter/pro100/21397.htm For the latest Intel network drivers for Linux, refer to the following website. In the search field, enter your adapter name or type, or use the networking link on the left to search for your adapter: - http://support.intel.com/support/go/network/adapter/home.htm + http://downloadfinder.intel.com/scripts-df/support_intel.asp + Command Line Parameters ======================= +If the driver is built as a module, the following optional parameters +are used by entering them on the command line with the modprobe command +using this syntax: + + modprobe e1000 [