$ git checkout master Already on "master" $ git reset --hard stable HEAD is now at c31f403 Merge branch 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip Merging origin/master $ git merge origin/master Updating c31f403..53d8f67 Fast forward Documentation/DMA-API.txt | 106 + Documentation/dvb/get_dvb_firmware | 85 +- Documentation/feature-removal-schedule.txt | 8 +- Documentation/ioctl/ioctl-number.txt | 2 - Documentation/kernel-parameters.txt | 10 + Documentation/powerpc/dts-bindings/fsl/dma.txt | 34 +- Documentation/powerpc/dts-bindings/fsl/esdhc.txt | 24 + Documentation/powerpc/dts-bindings/fsl/ssi.txt | 68 +- Documentation/video4linux/CARDLIST.bttv | 6 +- Documentation/video4linux/CARDLIST.cx23885 | 4 + Documentation/video4linux/CARDLIST.cx88 | 1 + Documentation/video4linux/CARDLIST.em28xx | 9 +- Documentation/video4linux/CARDLIST.saa7134 | 2 + Documentation/video4linux/Zoran | 3 +- Documentation/video4linux/bttv/Insmod-options | 10 - Documentation/video4linux/bttv/README | 4 +- Documentation/video4linux/cx2341x/README.hm12 | 4 + Documentation/video4linux/gspca.txt | 4 + Documentation/video4linux/si470x.txt | 11 +- Documentation/video4linux/v4l2-framework.txt | 187 +- Documentation/video4linux/v4lgrab.c | 4 +- Documentation/video4linux/zr364xx.txt | 1 + Documentation/x86/earlyprintk.txt | 101 + MAINTAINERS | 2 - arch/Kconfig | 2 + arch/arm/mach-pxa/pcm990-baseboard.c | 53 +- arch/arm/plat-mxc/include/mach/mx3_camera.h | 52 + arch/ia64/dig/Makefile | 4 +- arch/ia64/dig/dig_vtd_iommu.c | 59 - arch/ia64/hp/common/hwsw_iommu.c | 165 +- arch/ia64/hp/common/sba_iommu.c | 79 +- arch/ia64/include/asm/dma-mapping.h | 194 +- arch/ia64/include/asm/machvec.h | 102 +- arch/ia64/include/asm/machvec_dig_vtd.h | 20 - arch/ia64/include/asm/machvec_hpzx1.h | 23 +- arch/ia64/include/asm/machvec_hpzx1_swiotlb.h | 27 +- arch/ia64/include/asm/machvec_sn2.h | 27 +- arch/ia64/kernel/Makefile | 4 +- arch/ia64/kernel/dma-mapping.c | 13 + arch/ia64/kernel/machvec.c | 8 +- arch/ia64/kernel/pci-dma.c | 46 +- arch/ia64/kernel/pci-swiotlb.c | 30 +- arch/ia64/sn/pci/pci_dma.c | 99 +- arch/m68k/include/asm/ide.h | 73 - arch/mips/Kconfig | 12 +- arch/mips/Makefile | 6 + arch/mips/alchemy/Kconfig | 2 +- arch/mips/alchemy/common/gpio.c | 203 +- arch/mips/alchemy/devboards/pb1200/platform.c | 10 + arch/mips/cavium-octeon/Makefile | 2 + arch/mips/cavium-octeon/flash_setup.c | 2 +- arch/mips/cavium-octeon/octeon-irq.c | 2 +- arch/mips/emma/markeins/irq.c | 50 +- arch/mips/emma/markeins/platform.c | 3 + arch/mips/include/asm/cpu.h | 3 +- arch/mips/include/asm/hazards.h | 4 +- .../asm/mach-au1x00/cpu-feature-overrides.h | 49 + arch/mips/include/asm/mach-au1x00/gpio.h | 70 +- arch/mips/include/asm/mips-boards/generic.h | 2 - arch/mips/include/asm/smp-ops.h | 2 + arch/mips/include/asm/spinlock.h | 8 +- arch/mips/include/asm/types.h | 8 +- arch/mips/jazz/jazzdma.c | 3 +- arch/mips/kernel/cpu-probe.c | 21 +- arch/mips/kernel/irq-msc01.c | 6 +- arch/mips/kernel/irq_cpu.c | 3 +- arch/mips/kernel/linux32.c | 6 +- arch/mips/kernel/setup.c | 3 +- arch/mips/kernel/smp-up.c | 14 +- arch/mips/kernel/smp.c | 2 +- arch/mips/kernel/traps.c | 3 +- arch/mips/mm/c-r4k.c | 17 +- arch/mips/mm/highmem.c | 9 +- arch/mips/mm/init.c | 3 +- arch/mips/mm/ioremap.c | 9 +- arch/mips/mm/tlbex.c | 8 +- arch/mips/mti-malta/malta-init.c | 2 +- arch/mips/sgi-ip27/ip27-berr.c | 2 +- arch/mips/sgi-ip27/ip27-nmi.c | 4 +- arch/mips/sgi-ip32/ip32-irq.c | 63 +- arch/mips/sgi-ip32/ip32-memory.c | 2 +- arch/mips/sibyte/bcm1480/irq.c | 2 +- arch/mips/sibyte/sb1250/irq.c | 2 +- arch/mips/sni/a20r.c | 2 +- arch/mips/sni/pcimt.c | 2 +- arch/mips/sni/pcit.c | 4 +- arch/mips/sni/rm200.c | 2 +- arch/mips/txx9/Kconfig | 1 - arch/powerpc/Kconfig | 74 +- arch/powerpc/Kconfig.debug | 2 +- arch/powerpc/Makefile | 4 +- arch/powerpc/boot/Makefile | 9 +- arch/powerpc/boot/cuboot-amigaone.c | 35 + arch/powerpc/boot/dts/amigaone.dts | 173 + arch/powerpc/boot/dts/asp834x-redboot.dts | 82 +- arch/powerpc/boot/dts/canyonlands.dts | 28 + arch/powerpc/boot/dts/cm5200.dts | 49 +- arch/powerpc/boot/dts/digsy_mtc.dts | 254 + arch/powerpc/boot/dts/gef_ppc9a.dts | 367 + arch/powerpc/boot/dts/gef_sbc310.dts | 367 + arch/powerpc/boot/dts/gef_sbc610.dts | 41 +- arch/powerpc/boot/dts/ksi8560.dts | 79 +- arch/powerpc/boot/dts/lite5200.dts | 52 +- arch/powerpc/boot/dts/lite5200b.dts | 63 +- arch/powerpc/boot/dts/media5200.dts | 318 + arch/powerpc/boot/dts/motionpro.dts | 42 +- arch/powerpc/boot/dts/mpc8313erdb.dts | 11 +- arch/powerpc/boot/dts/mpc8315erdb.dts | 144 +- arch/powerpc/boot/dts/mpc8349emitx.dts | 69 +- arch/powerpc/boot/dts/mpc8349emitxgp.dts | 42 +- arch/powerpc/boot/dts/mpc834x_mds.dts | 81 +- arch/powerpc/boot/dts/mpc8377_mds.dts | 211 +- arch/powerpc/boot/dts/mpc8377_rdb.dts | 229 +- arch/powerpc/boot/dts/mpc8378_mds.dts | 209 +- arch/powerpc/boot/dts/mpc8378_rdb.dts | 229 +- arch/powerpc/boot/dts/mpc8379_mds.dts | 146 +- arch/powerpc/boot/dts/mpc8379_rdb.dts | 164 +- arch/powerpc/boot/dts/mpc8536ds.dts | 78 +- arch/powerpc/boot/dts/mpc8540ads.dts | 117 +- arch/powerpc/boot/dts/mpc8541cds.dts | 78 +- arch/powerpc/boot/dts/mpc8544ds.dts | 81 +- arch/powerpc/boot/dts/mpc8548cds.dts | 156 +- arch/powerpc/boot/dts/mpc8555cds.dts | 78 +- arch/powerpc/boot/dts/mpc8560ads.dts | 102 +- arch/powerpc/boot/dts/mpc8568mds.dts | 102 +- arch/powerpc/boot/dts/mpc8572ds.dts | 160 +- arch/powerpc/boot/dts/mpc8572ds_36b.dts | 799 + arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts | 49 +- arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts | 6 +- arch/powerpc/boot/dts/mpc8610_hpcd.dts | 2 + arch/powerpc/boot/dts/mpc8641_hpcn.dts | 157 +- arch/powerpc/boot/dts/pcm030.dts | 182 +- arch/powerpc/boot/dts/pcm032.dts | 392 + arch/powerpc/boot/dts/redwood.dts | 244 + arch/powerpc/boot/dts/sbc8349.dts | 80 +- arch/powerpc/boot/dts/sbc8548.dts | 78 +- arch/powerpc/boot/dts/sbc8560.dts | 100 +- arch/powerpc/boot/dts/sbc8641d.dts | 156 +- arch/powerpc/boot/dts/socrates.dts | 338 + arch/powerpc/boot/dts/stx_gp3_8560.dts | 78 +- arch/powerpc/boot/dts/tqm5200.dts | 32 +- arch/powerpc/boot/dts/tqm8540.dts | 122 +- arch/powerpc/boot/dts/tqm8541.dts | 95 +- arch/powerpc/boot/dts/tqm8548-bigflash.dts | 177 +- arch/powerpc/boot/dts/tqm8548.dts | 177 +- arch/powerpc/boot/dts/tqm8555.dts | 95 +- arch/powerpc/boot/dts/tqm8560.dts | 99 +- arch/powerpc/boot/dts/virtex440-ml507.dts | 124 +- arch/powerpc/boot/serial.c | 3 +- arch/powerpc/boot/wrapper | 7 +- arch/powerpc/configs/44x/canyonlands_defconfig | 266 +- arch/powerpc/configs/44x/redwood_defconfig | 1176 + arch/powerpc/configs/85xx/socrates_defconfig | 1410 ++ arch/powerpc/configs/86xx/gef_ppc9a_defconfig | 1889 ++ arch/powerpc/configs/86xx/gef_sbc310_defconfig | 1613 ++ arch/powerpc/configs/amigaone_defconfig | 1636 ++ arch/powerpc/configs/mpc5200_defconfig | 71 +- arch/powerpc/configs/ppc64_defconfig | 6 +- arch/powerpc/include/asm/code-patching.h | 4 +- arch/powerpc/include/asm/cputable.h | 4 +- arch/powerpc/include/asm/dbell.h | 43 + arch/powerpc/include/asm/dma-mapping.h | 12 +- arch/powerpc/include/asm/elf.h | 12 +- arch/powerpc/include/asm/fixmap.h | 2 +- arch/powerpc/include/asm/ftrace.h | 39 +- arch/powerpc/include/asm/highmem.h | 12 +- arch/powerpc/include/asm/hw_irq.h | 2 +- arch/powerpc/include/asm/io.h | 6 + arch/powerpc/include/asm/lppaca.h | 8 +- arch/powerpc/include/asm/machdep.h | 4 +- arch/powerpc/include/asm/mmu-44x.h | 2 + .../include/asm/{mmu-fsl-booke.h => mmu-book3e.h} | 66 +- arch/powerpc/include/asm/mmu-hash64.h | 2 - arch/powerpc/include/asm/mmu.h | 20 +- arch/powerpc/include/asm/mmu_context.h | 2 +- arch/powerpc/include/asm/mpc52xx.h | 1 + arch/powerpc/include/asm/page.h | 6 +- arch/powerpc/include/asm/page_32.h | 4 + arch/powerpc/include/asm/pgtable-4k.h | 117 - arch/powerpc/include/asm/pgtable-ppc32.h | 557 +- arch/powerpc/include/asm/pgtable-ppc64-4k.h | 74 + arch/powerpc/include/asm/pgtable-ppc64-64k.h | 42 + arch/powerpc/include/asm/pgtable-ppc64.h | 196 +- arch/powerpc/include/asm/pgtable.h | 134 + arch/powerpc/include/asm/ppc-opcode.h | 73 + arch/powerpc/include/asm/ppc_asm.h | 6 +- arch/powerpc/include/asm/processor.h | 19 + arch/powerpc/include/asm/ps3av.h | 2 +- arch/powerpc/include/asm/ps3fb.h | 1 + arch/powerpc/include/asm/pte-40x.h | 64 + arch/powerpc/include/asm/pte-44x.h | 102 + arch/powerpc/include/asm/pte-8xx.h | 67 + arch/powerpc/include/asm/pte-common.h | 180 + arch/powerpc/include/asm/pte-fsl-booke.h | 48 + arch/powerpc/include/asm/pte-hash32.h | 48 + arch/powerpc/include/asm/pte-hash64-4k.h | 17 + .../asm/{pgtable-64k.h => pte-hash64-64k.h} | 132 +- arch/powerpc/include/asm/pte-hash64.h | 54 + arch/powerpc/include/asm/reg.h | 2 + arch/powerpc/include/asm/reg_booke.h | 2 + arch/powerpc/include/asm/system.h | 2 +- arch/powerpc/include/asm/thread_info.h | 11 +- arch/powerpc/include/asm/udbg.h | 1 + arch/powerpc/kernel/Makefile | 12 +- arch/powerpc/kernel/align.c | 2 +- arch/powerpc/kernel/asm-offsets.c | 3 - arch/powerpc/kernel/cpu_setup_44x.S | 1 + arch/powerpc/kernel/cpu_setup_6xx.S | 5 + arch/powerpc/kernel/cpu_setup_fsl_booke.S | 31 + arch/powerpc/kernel/cputable.c | 166 +- arch/powerpc/kernel/crash_dump.c | 2 +- arch/powerpc/kernel/dbell.c | 44 + arch/powerpc/kernel/entry_32.S | 129 +- arch/powerpc/kernel/entry_64.S | 89 +- arch/powerpc/kernel/ftrace.c | 222 +- arch/powerpc/kernel/head_32.S | 101 +- arch/powerpc/kernel/head_64.S | 6 +- arch/powerpc/kernel/head_booke.h | 19 +- arch/powerpc/kernel/head_fsl_booke.S | 101 +- arch/powerpc/kernel/irq.c | 4 +- arch/powerpc/kernel/module_64.c | 2 +- arch/powerpc/kernel/pci-common.c | 45 +- arch/powerpc/kernel/pci_32.c | 36 +- arch/powerpc/kernel/pci_64.c | 19 - arch/powerpc/kernel/process.c | 58 + arch/powerpc/kernel/prom.c | 6 +- arch/powerpc/kernel/prom_init.c | 2 + arch/powerpc/kernel/prom_init_check.sh | 2 +- arch/powerpc/kernel/rtas.c | 10 +- arch/powerpc/kernel/setup-common.c | 36 + arch/powerpc/kernel/setup_64.c | 42 +- arch/powerpc/kernel/signal.c | 4 +- arch/powerpc/kernel/signal.h | 12 +- arch/powerpc/kernel/signal_32.c | 4 +- arch/powerpc/kernel/signal_64.c | 2 +- arch/powerpc/kernel/sysfs.c | 35 +- arch/powerpc/kernel/traps.c | 79 +- arch/powerpc/kernel/udbg.c | 7 + arch/powerpc/kernel/udbg_16550.c | 60 +- arch/powerpc/kernel/vmlinux.lds.S | 1 + arch/powerpc/lib/dma-noncoherent.c | 303 +- arch/powerpc/lib/feature-fixups.c | 4 +- arch/powerpc/math-emu/Makefile | 5 +- arch/powerpc/mm/Makefile | 4 +- arch/powerpc/mm/fault.c | 46 +- arch/powerpc/mm/fsl_booke_mmu.c | 95 +- arch/powerpc/mm/gup.c | 16 +- arch/powerpc/mm/hash_utils_64.c | 51 +- arch/powerpc/mm/mem.c | 33 - arch/powerpc/mm/{mmap.c => mmap_64.c} | 64 +- arch/powerpc/mm/mmu_context_nohash.c | 4 +- arch/powerpc/mm/numa.c | 174 +- arch/powerpc/mm/pgtable.c | 134 +- arch/powerpc/mm/pgtable_32.c | 18 +- arch/powerpc/mm/pgtable_64.c | 25 +- arch/powerpc/mm/ppc_mmu_32.c | 10 +- arch/powerpc/mm/tlb_hash64.c | 6 +- arch/powerpc/mm/tlb_nohash.c | 18 +- arch/powerpc/mm/tlb_nohash_low.S | 44 +- arch/powerpc/oprofile/op_model_7450.c | 21 +- arch/powerpc/platforms/44x/Kconfig | 19 + arch/powerpc/platforms/44x/ppc44x_simple.c | 1 + arch/powerpc/platforms/512x/Kconfig | 4 +- arch/powerpc/platforms/52xx/Kconfig | 15 +- arch/powerpc/platforms/52xx/Makefile | 3 +- arch/powerpc/platforms/52xx/media5200.c | 273 + arch/powerpc/platforms/52xx/mpc5200_simple.c | 4 +- arch/powerpc/platforms/52xx/mpc52xx_common.c | 40 +- arch/powerpc/platforms/52xx/mpc52xx_gpio.c | 85 - arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 396 + arch/powerpc/platforms/52xx/mpc52xx_pic.c | 170 +- arch/powerpc/platforms/82xx/Kconfig | 2 +- arch/powerpc/platforms/83xx/Kconfig | 2 +- arch/powerpc/platforms/83xx/asp834x.c | 1 + arch/powerpc/platforms/83xx/mpc831x_rdb.c | 2 + arch/powerpc/platforms/83xx/mpc834x_itx.c | 1 + arch/powerpc/platforms/83xx/mpc834x_mds.c | 1 + arch/powerpc/platforms/83xx/mpc837x_mds.c | 11 +- arch/powerpc/platforms/83xx/mpc837x_rdb.c | 3 + arch/powerpc/platforms/83xx/sbc834x.c | 1 + arch/powerpc/platforms/83xx/usb.c | 3 +- arch/powerpc/platforms/85xx/Kconfig | 6 + arch/powerpc/platforms/85xx/Makefile | 1 + arch/powerpc/platforms/85xx/ksi8560.c | 3 +- arch/powerpc/platforms/85xx/mpc8536_ds.c | 1 + arch/powerpc/platforms/85xx/mpc85xx_ads.c | 1 + arch/powerpc/platforms/85xx/mpc85xx_cds.c | 1 + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 1 + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 + arch/powerpc/platforms/85xx/sbc8548.c | 1 + arch/powerpc/platforms/85xx/sbc8560.c | 1 + arch/powerpc/platforms/85xx/smp.c | 43 +- arch/powerpc/platforms/85xx/socrates.c | 133 + arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 327 + arch/powerpc/platforms/85xx/socrates_fpga_pic.h | 16 + arch/powerpc/platforms/85xx/stx_gp3.c | 1 + arch/powerpc/platforms/85xx/tqm85xx.c | 1 + arch/powerpc/platforms/86xx/Kconfig | 20 +- arch/powerpc/platforms/86xx/Makefile | 2 + arch/powerpc/platforms/86xx/gef_gpio.c | 36 +- arch/powerpc/platforms/86xx/gef_ppc9a.c | 224 + arch/powerpc/platforms/86xx/gef_sbc310.c | 235 + arch/powerpc/platforms/86xx/gef_sbc610.c | 1 + arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 1 + arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 1 + arch/powerpc/platforms/86xx/sbc8641d.c | 1 + arch/powerpc/platforms/Kconfig | 39 +- arch/powerpc/platforms/Kconfig.cputype | 22 +- arch/powerpc/platforms/Makefile | 1 + arch/powerpc/platforms/amigaone/Kconfig | 18 + arch/powerpc/platforms/amigaone/Makefile | 1 + arch/powerpc/platforms/amigaone/setup.c | 170 + arch/powerpc/platforms/cell/Kconfig | 33 +- arch/powerpc/platforms/cell/Makefile | 2 +- arch/powerpc/platforms/cell/io-workarounds.c | 4 +- arch/powerpc/platforms/cell/iommu.c | 9 +- arch/powerpc/platforms/cell/qpace_setup.c | 15 +- arch/powerpc/platforms/cell/spu_base.c | 2 +- arch/powerpc/platforms/cell/spu_fault.c | 48 +- arch/powerpc/platforms/cell/spufs/context.c | 4 + arch/powerpc/platforms/cell/spufs/file.c | 20 +- arch/powerpc/platforms/cell/spufs/inode.c | 5 +- arch/powerpc/platforms/cell/spufs/run.c | 3 + arch/powerpc/platforms/cell/spufs/spufs.h | 8 +- arch/powerpc/platforms/chrp/Kconfig | 2 +- arch/powerpc/platforms/chrp/pegasos_eth.c | 72 +- arch/powerpc/platforms/embedded6xx/Kconfig | 2 +- arch/powerpc/platforms/iseries/Kconfig | 2 +- arch/powerpc/platforms/iseries/irq.c | 2 +- arch/powerpc/platforms/iseries/setup.c | 2 +- arch/powerpc/platforms/maple/Kconfig | 2 +- arch/powerpc/platforms/pasemi/Kconfig | 2 +- arch/powerpc/platforms/powermac/Kconfig | 2 +- arch/powerpc/platforms/powermac/cpufreq_64.c | 5 +- arch/powerpc/platforms/powermac/pic.h | 2 +- arch/powerpc/platforms/powermac/setup.c | 3 + arch/powerpc/platforms/prep/Kconfig | 2 +- arch/powerpc/platforms/ps3/Kconfig | 2 +- arch/powerpc/platforms/ps3/mm.c | 4 +- arch/powerpc/platforms/pseries/Kconfig | 17 +- arch/powerpc/platforms/pseries/Makefile | 3 +- arch/powerpc/platforms/pseries/dtl.c | 278 + arch/powerpc/platforms/pseries/eeh_driver.c | 68 +- arch/powerpc/platforms/pseries/msi.c | 248 +- arch/powerpc/platforms/pseries/pci_dlpar.c | 2 - arch/powerpc/platforms/pseries/plpar_wrappers.h | 10 + arch/powerpc/platforms/pseries/reconfig.c | 6 +- arch/powerpc/sysdev/cpm2.c | 4 +- arch/powerpc/sysdev/cpm_common.c | 2 +- arch/powerpc/sysdev/fsl_pci.c | 244 +- arch/powerpc/sysdev/fsl_soc.c | 4 + arch/powerpc/sysdev/ipic.c | 6 +- arch/powerpc/sysdev/msi_bitmap.c | 6 +- arch/powerpc/sysdev/pmi.c | 2 +- arch/powerpc/sysdev/ppc4xx_pci.c | 2 + arch/sh/boards/board-ap325rxa.c | 3 +- arch/sh/boards/mach-migor/setup.c | 5 +- arch/x86/Kconfig | 16 +- arch/x86/Kconfig.cpu | 17 +- arch/x86/Makefile | 29 +- arch/x86/boot/Makefile | 53 +- arch/x86/boot/header.S | 29 +- arch/x86/boot/pm.c | 44 - arch/x86/boot/pmjump.S | 1 + arch/x86/boot/setup.ld | 3 +- arch/x86/boot/tools/build.c | 9 +- arch/x86/boot/video-vga.c | 22 +- arch/x86/include/asm/apic.h | 37 +- arch/x86/include/asm/apicdef.h | 1 + arch/x86/include/asm/boot.h | 4 - arch/x86/include/asm/cacheflush.h | 3 + arch/x86/include/asm/cpu_debug.h | 226 + arch/x86/include/asm/desc.h | 3 +- arch/x86/include/asm/device.h | 2 +- arch/x86/include/asm/dma-mapping.h | 188 +- arch/x86/include/asm/dmi.h | 19 +- arch/x86/include/asm/e820.h | 2 +- arch/x86/include/asm/entry_arch.h | 2 + arch/x86/include/asm/ftrace.h | 25 - arch/x86/include/asm/hardirq.h | 1 + arch/x86/include/asm/highmem.h | 1 + arch/x86/include/asm/hw_irq.h | 1 + arch/x86/include/asm/init.h | 18 + arch/x86/include/asm/io_apic.h | 5 +- arch/x86/include/asm/iommu.h | 2 +- arch/x86/include/asm/irq.h | 1 + arch/x86/include/asm/irq_remapping.h | 2 - arch/x86/include/asm/irq_vectors.h | 5 + arch/x86/include/asm/kexec.h | 13 +- arch/x86/include/asm/linkage.h | 19 +- arch/x86/include/asm/mce.h | 35 +- arch/x86/include/asm/msidef.h | 1 + arch/x86/include/asm/msr-index.h | 5 + arch/x86/include/asm/page_32_types.h | 5 + arch/x86/include/asm/page_types.h | 6 - arch/x86/include/asm/paravirt.h | 19 +- arch/x86/include/asm/pat.h | 5 + arch/x86/include/asm/pgtable-2level.h | 7 - arch/x86/include/asm/pgtable-3level.h | 17 - arch/x86/include/asm/pgtable.h | 2 - arch/x86/include/asm/pgtable_32.h | 3 - arch/x86/include/asm/pgtable_32_types.h | 5 + arch/x86/include/asm/pgtable_types.h | 1 + arch/x86/include/asm/processor.h | 5 +- arch/x86/include/asm/sections.h | 7 + arch/x86/include/asm/setup.h | 39 +- arch/x86/include/asm/timer.h | 2 +- arch/x86/include/asm/uv/uv_hub.h | 4 + arch/x86/include/asm/xen/hypercall.h | 2 + arch/x86/kernel/Makefile | 6 +- arch/x86/kernel/alternative.c | 17 +- arch/x86/kernel/amd_iommu.c | 26 +- arch/x86/kernel/apic/apic.c | 35 +- arch/x86/kernel/apic/apic_flat_64.c | 18 +- arch/x86/kernel/apic/io_apic.c | 292 +- arch/x86/kernel/apic/probe_64.c | 7 + arch/x86/kernel/apic/x2apic_cluster.c | 6 + arch/x86/kernel/apic/x2apic_phys.c | 6 + arch/x86/kernel/apm_32.c | 15 +- arch/x86/kernel/check.c | 8 +- arch/x86/kernel/cpu/Makefile | 5 +- arch/x86/kernel/cpu/addon_cpuid_features.c | 2 +- arch/x86/kernel/cpu/amd.c | 54 +- arch/x86/kernel/cpu/centaur.c | 36 +- arch/x86/kernel/cpu/centaur_64.c | 37 - arch/x86/kernel/cpu/common.c | 396 +- arch/x86/kernel/cpu/cpu.h | 25 +- arch/x86/kernel/cpu/cpu_debug.c | 901 + arch/x86/kernel/cpu/cyrix.c | 16 +- arch/x86/kernel/cpu/intel.c | 32 +- arch/x86/kernel/cpu/intel_cacheinfo.c | 8 +- arch/x86/kernel/cpu/mcheck/Makefile | 1 + arch/x86/kernel/cpu/mcheck/mce_32.c | 14 - arch/x86/kernel/cpu/mcheck/mce_64.c | 530 +- arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 62 +- arch/x86/kernel/cpu/mcheck/mce_intel_64.c | 207 +- arch/x86/kernel/cpu/mcheck/threshold.c | 29 + arch/x86/kernel/cpu/mtrr/Makefile | 2 +- arch/x86/kernel/cpu/mtrr/cleanup.c | 1101 + arch/x86/kernel/cpu/mtrr/generic.c | 202 +- arch/x86/kernel/cpu/mtrr/main.c | 1069 +- arch/x86/kernel/cpu/mtrr/mtrr.h | 4 + arch/x86/kernel/cpu/transmeta.c | 2 +- arch/x86/kernel/cpu/umc.c | 2 +- arch/x86/kernel/dumpstack.c | 1 + arch/x86/kernel/e820.c | 142 +- arch/x86/kernel/early_printk.c | 20 +- arch/x86/kernel/entry_32.S | 18 +- arch/x86/kernel/entry_64.S | 6 +- arch/x86/kernel/ftrace.c | 75 +- arch/x86/kernel/head32.c | 5 +- arch/x86/kernel/head64.c | 2 +- arch/x86/kernel/head_32.S | 76 +- arch/x86/kernel/i8253.c | 68 +- arch/x86/kernel/io_delay.c | 27 +- arch/x86/kernel/irq.c | 88 +- arch/x86/kernel/irqinit_32.c | 3 + arch/x86/kernel/irqinit_64.c | 3 + arch/x86/kernel/kdebugfs.c | 82 +- arch/x86/kernel/kprobes.c | 2 +- arch/x86/kernel/kvm.c | 7 - arch/x86/kernel/machine_kexec_32.c | 17 +- arch/x86/kernel/machine_kexec_64.c | 99 +- arch/x86/kernel/mmconf-fam10h_64.c | 2 +- arch/x86/kernel/mpparse.c | 384 +- arch/x86/kernel/paravirt.c | 1 - arch/x86/kernel/pci-calgary_64.c | 38 +- arch/x86/kernel/pci-dma.c | 14 +- arch/x86/kernel/pci-gart_64.c | 34 +- arch/x86/kernel/pci-nommu.c | 39 +- .../x86/kernel/{pci-swiotlb_64.c => pci-swiotlb.c} | 19 +- arch/x86/kernel/process.c | 5 +- arch/x86/kernel/ptrace.c | 3 +- arch/x86/kernel/quirks.c | 3 +- arch/x86/kernel/relocate_kernel_32.S | 24 +- arch/x86/kernel/relocate_kernel_64.S | 189 +- arch/x86/kernel/rtc.c | 20 +- arch/x86/kernel/setup.c | 58 +- arch/x86/kernel/signal.c | 48 +- arch/x86/kernel/smpboot.c | 78 - arch/x86/kernel/tlb_uv.c | 3 +- arch/x86/kernel/topology.c | 14 +- arch/x86/kernel/uv_time.c | 393 + arch/x86/kernel/visws_quirks.c | 2 +- arch/x86/kernel/vmi_32.c | 6 - arch/x86/kernel/vmlinux_32.lds.S | 21 +- arch/x86/kernel/vmlinux_64.lds.S | 101 +- arch/x86/kernel/vsmp_64.c | 12 +- arch/x86/lguest/boot.c | 8 - arch/x86/lib/memcpy_64.S | 143 +- arch/x86/mm/highmem_32.c | 24 +- arch/x86/mm/init.c | 344 + arch/x86/mm/init_32.c | 256 +- arch/x86/mm/init_64.c | 280 +- arch/x86/mm/iomap_32.c | 26 +- arch/x86/mm/ioremap.c | 52 +- arch/x86/mm/kmmio.c | 2 +- arch/x86/mm/memtest.c | 3 + arch/x86/mm/numa_32.c | 5 +- arch/x86/mm/pageattr.c | 147 +- arch/x86/mm/pat.c | 5 +- arch/x86/mm/pgtable_32.c | 2 +- arch/x86/mm/tlb.c | 5 - arch/x86/pci/common.c | 4 +- arch/x86/pci/fixup.c | 4 +- arch/x86/pci/i386.c | 3 + arch/x86/xen/mmu.c | 7 +- drivers/base/iommu.c | 2 +- drivers/base/power/main.c | 20 +- drivers/base/sys.c | 8 + drivers/char/raw.c | 1 + drivers/gpu/drm/ati_pcigart.c | 40 +- drivers/gpu/drm/drm_bufs.c | 122 +- drivers/gpu/drm/drm_context.c | 4 +- drivers/gpu/drm/drm_drv.c | 88 +- drivers/gpu/drm/drm_edid.c | 183 +- drivers/gpu/drm/drm_fops.c | 1 + drivers/gpu/drm/drm_gem.c | 2 +- drivers/gpu/drm/drm_info.c | 6 +- drivers/gpu/drm/drm_ioc32.c | 4 + drivers/gpu/drm/drm_memory.c | 6 +- drivers/gpu/drm/drm_proc.c | 1 - drivers/gpu/drm/drm_stub.c | 93 +- drivers/gpu/drm/drm_sysfs.c | 37 +- drivers/gpu/drm/drm_vm.c | 32 +- drivers/gpu/drm/i810/i810_drv.h | 4 +- drivers/gpu/drm/i830/i830_drv.h | 4 +- drivers/gpu/drm/i915/i915_dma.c | 2 +- drivers/gpu/drm/i915/i915_drv.c | 38 + drivers/gpu/drm/i915/i915_gem.c | 7 +- drivers/gpu/drm/mga/mga_dma.c | 17 +- drivers/gpu/drm/mga/mga_drv.h | 8 +- drivers/gpu/drm/r128/r128_cce.c | 7 +- drivers/gpu/drm/radeon/Makefile | 2 +- drivers/gpu/drm/radeon/r300_cmdbuf.c | 11 +- drivers/gpu/drm/radeon/r300_reg.h | 5 + drivers/gpu/drm/radeon/r600_cp.c | 2253 ++ drivers/gpu/drm/radeon/r600_microcode.h |23297 ++++++++++++++++++++ drivers/gpu/drm/radeon/radeon_cp.c | 522 +- drivers/gpu/drm/radeon/radeon_drv.c | 22 +- drivers/gpu/drm/radeon/radeon_drv.h | 635 +- drivers/gpu/drm/radeon/radeon_irq.c | 14 +- drivers/gpu/drm/radeon/radeon_state.c | 51 +- drivers/gpu/drm/savage/savage_bci.c | 8 +- drivers/gpu/drm/via/via_drv.c | 6 - drivers/i2c/busses/i2c-mpc.c | 9 +- drivers/ide/alim15x3.c | 9 +- drivers/ide/at91_ide.c | 70 +- drivers/ide/au1xxx-ide.c | 39 +- drivers/ide/buddha.c | 11 +- drivers/ide/cmd64x.c | 6 +- drivers/ide/cs5536.c | 2 +- drivers/ide/delkin_cb.c | 1 + drivers/ide/dtc2278.c | 3 +- drivers/ide/falconide.c | 45 +- drivers/ide/gayle.c | 7 +- drivers/ide/hpt366.c | 6 +- drivers/ide/icside.c | 24 +- drivers/ide/ide-4drives.c | 3 +- drivers/ide/ide-acpi.c | 10 +- drivers/ide/ide-atapi.c | 123 +- drivers/ide/ide-cd.c | 155 +- drivers/ide/ide-cd.h | 4 +- drivers/ide/ide-cs.c | 1 + drivers/ide/ide-devsets.c | 4 +- drivers/ide/ide-disk.c | 171 +- drivers/ide/ide-disk_proc.c | 28 +- drivers/ide/ide-dma-sff.c | 37 +- drivers/ide/ide-dma.c | 39 +- drivers/ide/ide-eh.c | 30 +- drivers/ide/ide-floppy.c | 156 +- drivers/ide/ide-gd.c | 10 +- drivers/ide/ide-gd.h | 4 +- drivers/ide/ide-generic.c | 8 +- drivers/ide/ide-h8300.c | 66 +- drivers/ide/ide-io-std.c | 73 +- drivers/ide/ide-io.c | 285 +- drivers/ide/ide-ioctls.c | 44 +- drivers/ide/ide-iops.c | 66 +- drivers/ide/ide-lib.c | 20 +- drivers/ide/ide-park.c | 19 +- drivers/ide/ide-pm.c | 42 +- drivers/ide/ide-pnp.c | 6 +- drivers/ide/ide-probe.c | 95 +- drivers/ide/ide-proc.c | 16 +- drivers/ide/ide-tape.c | 123 +- drivers/ide/ide-taskfile.c | 448 +- drivers/ide/ide_arm.c | 6 +- drivers/ide/it821x.c | 2 +- drivers/ide/macide.c | 7 +- drivers/ide/ns87415.c | 36 +- drivers/ide/palm_bk3710.c | 13 +- drivers/ide/pdc202xx_old.c | 4 +- drivers/ide/pmac.c | 32 +- drivers/ide/q40ide.c | 15 +- drivers/ide/sc1200.c | 2 +- drivers/ide/scc_pata.c | 115 +- drivers/ide/setup-pci.c | 4 + drivers/ide/sgiioc4.c | 30 +- drivers/ide/siimage.c | 2 +- drivers/ide/sl82c105.c | 2 +- drivers/ide/tc86c001.c | 2 +- drivers/ide/trm290.c | 15 +- drivers/ide/tx4938ide.c | 68 +- drivers/ide/tx4939ide.c | 109 +- drivers/macintosh/therm_adt746x.c | 4 +- drivers/media/Kconfig | 2 +- drivers/media/common/ir-keymaps.c | 146 + drivers/media/common/saa7146_core.c | 15 +- drivers/media/common/saa7146_fops.c | 48 +- drivers/media/common/saa7146_i2c.c | 29 +- drivers/media/common/saa7146_video.c | 1268 +- drivers/media/common/tuners/Kconfig | 64 +- drivers/media/common/tuners/Makefile | 1 + drivers/media/common/tuners/mc44s803.c | 371 + drivers/media/common/tuners/mc44s803.h | 46 + drivers/media/common/tuners/mc44s803_priv.h | 208 + drivers/media/common/tuners/mt2060.c | 2 +- drivers/media/common/tuners/mt20xx.c | 2 +- drivers/media/common/tuners/mxl5005s.c | 7 +- drivers/media/common/tuners/mxl5007t.c | 428 +- drivers/media/common/tuners/tda18271-common.c | 6 +- drivers/media/common/tuners/tda18271-fe.c | 37 + drivers/media/common/tuners/tda18271-priv.h | 6 +- drivers/media/common/tuners/tda18271.h | 10 + drivers/media/common/tuners/tda827x.c | 237 +- drivers/media/common/tuners/tda8290.c | 9 +- drivers/media/common/tuners/tea5761.c | 2 +- drivers/media/common/tuners/tea5767.c | 2 +- drivers/media/common/tuners/xc5000.c | 14 +- drivers/media/dvb/b2c2/Kconfig | 2 +- drivers/media/dvb/b2c2/Makefile | 1 - drivers/media/dvb/b2c2/flexcop-common.h | 64 +- drivers/media/dvb/b2c2/flexcop-dma.c | 27 +- drivers/media/dvb/b2c2/flexcop-eeprom.c | 47 +- drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 6 +- drivers/media/dvb/b2c2/flexcop-hw-filter.c | 171 +- drivers/media/dvb/b2c2/flexcop-i2c.c | 61 +- drivers/media/dvb/b2c2/flexcop-misc.c | 68 +- drivers/media/dvb/b2c2/flexcop-pci.c | 165 +- drivers/media/dvb/b2c2/flexcop-reg.h | 21 +- drivers/media/dvb/b2c2/flexcop-sram.c | 112 +- drivers/media/dvb/b2c2/flexcop-usb.c | 368 +- drivers/media/dvb/b2c2/flexcop-usb.h | 62 +- drivers/media/dvb/b2c2/flexcop.c | 86 +- drivers/media/dvb/b2c2/flexcop.h | 20 +- drivers/media/dvb/b2c2/flexcop_ibi_value_be.h | 7 +- drivers/media/dvb/b2c2/flexcop_ibi_value_le.h | 7 +- drivers/media/dvb/bt8xx/Kconfig | 2 +- drivers/media/dvb/bt8xx/dst_ca.c | 14 +- drivers/media/dvb/bt8xx/dvb-bt8xx.c | 2 +- drivers/media/dvb/dm1105/Kconfig | 1 + drivers/media/dvb/dm1105/dm1105.c | 204 +- drivers/media/dvb/dvb-core/dmxdev.c | 2 +- drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 2 +- drivers/media/dvb/dvb-core/dvb_frontend.c | 2 +- drivers/media/dvb/dvb-core/dvb_net.c | 2 +- drivers/media/dvb/dvb-core/dvbdev.c | 4 +- drivers/media/dvb/dvb-core/dvbdev.h | 2 +- drivers/media/dvb/dvb-usb/Kconfig | 67 +- drivers/media/dvb/dvb-usb/Makefile | 2 + drivers/media/dvb/dvb-usb/af9015.c | 60 +- drivers/media/dvb/dvb-usb/af9015.h | 31 + drivers/media/dvb/dvb-usb/ce6230.c | 328 + drivers/media/dvb/dvb-usb/ce6230.h | 69 + drivers/media/dvb/dvb-usb/dib0700_core.c | 10 +- drivers/media/dvb/dvb-usb/dib0700_devices.c | 164 +- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 11 + drivers/media/dvb/dvb-usb/dvb-usb.h | 2 +- drivers/media/dvb/firewire/firedtv-avc.c | 2 +- drivers/media/dvb/frontends/Kconfig | 69 +- drivers/media/dvb/frontends/Makefile | 6 + drivers/media/dvb/frontends/au8522.h | 16 + drivers/media/dvb/frontends/au8522_decoder.c | 835 + .../media/dvb/frontends/{au8522.c => au8522_dig.c} | 96 +- drivers/media/dvb/frontends/au8522_priv.h | 412 + drivers/media/dvb/frontends/cx24113.c | 2 +- drivers/media/dvb/frontends/cx24116.c | 63 +- drivers/media/dvb/frontends/cx24123.c | 4 +- drivers/media/dvb/frontends/dib0070.h | 2 - drivers/media/dvb/frontends/dib3000mc.h | 36 +- drivers/media/dvb/frontends/dib7000m.h | 28 +- drivers/media/dvb/frontends/dib7000p.h | 35 +- drivers/media/dvb/frontends/dvb_dummy_fe.h | 19 + drivers/media/dvb/frontends/itd1000_priv.h | 2 +- drivers/media/dvb/frontends/lgdt3304.c | 1 - drivers/media/dvb/frontends/lgdt3305.c | 1087 + drivers/media/dvb/frontends/lgdt3305.h | 85 + drivers/media/dvb/frontends/lnbh24.h | 55 + drivers/media/dvb/frontends/lnbp21.c | 41 +- drivers/media/dvb/frontends/lnbp21.h | 34 +- drivers/media/dvb/frontends/s921_module.c | 1 - drivers/media/dvb/frontends/stb6100_cfg.h | 4 - drivers/media/dvb/frontends/stv0900.h | 62 + drivers/media/dvb/frontends/stv0900_core.c | 1949 ++ drivers/media/dvb/frontends/stv0900_init.h | 441 + drivers/media/dvb/frontends/stv0900_priv.h | 430 + drivers/media/dvb/frontends/stv0900_reg.h | 3787 ++++ drivers/media/dvb/frontends/stv0900_sw.c | 2847 +++ drivers/media/dvb/frontends/stv6110.c | 456 + drivers/media/dvb/frontends/stv6110.h | 62 + drivers/media/dvb/frontends/tda1004x.c | 30 +- drivers/media/dvb/frontends/zl10036.c | 519 + drivers/media/dvb/frontends/zl10036.h | 53 + drivers/media/dvb/frontends/zl10353.c | 8 +- drivers/media/dvb/frontends/zl10353.h | 4 + drivers/media/dvb/frontends/zl10353_priv.h | 8 +- drivers/media/dvb/pluto2/pluto2.c | 7 +- drivers/media/dvb/siano/Makefile | 4 +- drivers/media/dvb/siano/sms-cards.c | 92 +- drivers/media/dvb/siano/sms-cards.h | 5 +- drivers/media/dvb/siano/smscoreapi.c | 45 +- drivers/media/dvb/siano/smscoreapi.h | 41 +- drivers/media/dvb/siano/smsdvb.c | 60 +- drivers/media/dvb/siano/smsusb.c | 73 +- drivers/media/dvb/ttpci/Kconfig | 2 +- drivers/media/dvb/ttpci/av7110.c | 2 +- drivers/media/dvb/ttpci/av7110_av.c | 4 +- drivers/media/dvb/ttpci/av7110_ca.c | 2 +- drivers/media/dvb/ttpci/av7110_v4l.c | 480 +- drivers/media/dvb/ttpci/budget-av.c | 88 +- drivers/media/dvb/ttpci/budget-ci.c | 6 +- drivers/media/radio/dsbr100.c | 10 +- drivers/media/radio/radio-aimslab.c | 347 +- drivers/media/radio/radio-aztech.c | 378 +- drivers/media/radio/radio-cadet.c | 595 +- drivers/media/radio/radio-gemtek-pci.c | 329 +- drivers/media/radio/radio-gemtek.c | 396 +- drivers/media/radio/radio-maestro.c | 337 +- drivers/media/radio/radio-maxiradio.c | 374 +- drivers/media/radio/radio-mr800.c | 221 +- drivers/media/radio/radio-rtrack2.c | 276 +- drivers/media/radio/radio-sf16fmi.c | 283 +- drivers/media/radio/radio-sf16fmr2.c | 371 +- drivers/media/radio/radio-si470x.c | 200 +- drivers/media/radio/radio-terratec.c | 310 +- drivers/media/radio/radio-trust.c | 343 +- drivers/media/radio/radio-typhoon.c | 349 +- drivers/media/radio/radio-zoltrix.c | 378 +- drivers/media/video/Kconfig | 94 +- drivers/media/video/Makefile | 10 +- drivers/media/video/adv7170.c | 354 +- drivers/media/video/adv7175.c | 329 +- drivers/media/video/au0828/Kconfig | 10 +- drivers/media/video/au0828/Makefile | 2 +- drivers/media/video/au0828/au0828-cards.c | 127 +- drivers/media/video/au0828/au0828-core.c | 34 +- drivers/media/video/au0828/au0828-dvb.c | 2 +- drivers/media/video/au0828/au0828-i2c.c | 72 +- drivers/media/video/au0828/au0828-reg.h | 6 + drivers/media/video/au0828/au0828-video.c | 1712 ++ drivers/media/video/au0828/au0828.h | 181 +- drivers/media/video/bt819.c | 493 +- drivers/media/video/bt856.c | 291 +- drivers/media/video/bt866.c | 282 +- drivers/media/video/bt8xx/Kconfig | 2 +- drivers/media/video/bt8xx/bttv-cards.c | 1672 +- drivers/media/video/bt8xx/bttv-driver.c | 197 +- drivers/media/video/bt8xx/bttv-i2c.c | 61 +- drivers/media/video/bt8xx/bttv-if.c | 18 +- drivers/media/video/bt8xx/bttv-risc.c | 4 +- drivers/media/video/bt8xx/bttv-vbi.c | 2 +- drivers/media/video/bt8xx/bttv.h | 96 +- drivers/media/video/bt8xx/bttvp.h | 30 +- drivers/media/video/cafe_ccic.c | 432 +- drivers/media/video/cpia2/cpia2_v4l.c | 1 + drivers/media/video/cs5345.c | 7 - drivers/media/video/cs53l32a.c | 12 +- drivers/media/video/cx18/Kconfig | 2 +- drivers/media/video/cx18/cx18-audio.c | 52 +- drivers/media/video/cx18/cx18-audio.h | 2 - drivers/media/video/cx18/cx18-av-audio.c | 120 +- drivers/media/video/cx18/cx18-av-core.c | 796 +- drivers/media/video/cx18/cx18-av-core.h | 49 +- drivers/media/video/cx18/cx18-av-firmware.c | 16 +- drivers/media/video/cx18/cx18-av-vbi.c | 367 +- drivers/media/video/cx18/cx18-cards.c | 50 +- drivers/media/video/cx18/cx18-cards.h | 18 +- drivers/media/video/cx18/cx18-controls.c | 70 +- drivers/media/video/cx18/cx18-driver.c | 416 +- drivers/media/video/cx18/cx18-driver.h | 258 +- drivers/media/video/cx18/cx18-dvb.c | 2 +- drivers/media/video/cx18/cx18-fileops.c | 107 +- drivers/media/video/cx18/cx18-firmware.c | 22 +- drivers/media/video/cx18/cx18-gpio.c | 319 +- drivers/media/video/cx18/cx18-gpio.h | 10 +- drivers/media/video/cx18/cx18-i2c.c | 296 +- drivers/media/video/cx18/cx18-i2c.h | 5 +- drivers/media/video/cx18/cx18-ioctl.c | 273 +- drivers/media/video/cx18/cx18-mailbox.c | 44 +- drivers/media/video/cx18/cx18-queue.c | 4 +- drivers/media/video/cx18/cx18-queue.h | 4 +- drivers/media/video/cx18/cx18-streams.c | 210 +- drivers/media/video/cx18/cx18-vbi.c | 155 +- drivers/media/video/cx18/cx18-vbi.h | 2 +- drivers/media/video/cx18/cx18-version.h | 4 +- drivers/media/video/cx18/cx18-video.c | 3 +- drivers/media/video/cx18/cx23418.h | 16 + drivers/media/video/cx2341x.c | 196 +- drivers/media/video/cx23885/Kconfig | 15 +- drivers/media/video/cx23885/Makefile | 4 +- drivers/media/video/cx23885/cimax2.c | 472 + drivers/media/video/cx23885/cimax2.h | 47 + drivers/media/video/cx23885/cx23885-417.c | 49 +- drivers/media/video/cx23885/cx23885-cards.c | 94 +- drivers/media/video/cx23885/cx23885-core.c | 43 +- drivers/media/video/cx23885/cx23885-dvb.c | 166 +- drivers/media/video/cx23885/cx23885-i2c.c | 68 +- drivers/media/video/cx23885/cx23885-reg.h | 2 + drivers/media/video/cx23885/cx23885-video.c | 51 +- drivers/media/video/cx23885/cx23885.h | 20 +- drivers/media/video/cx23885/netup-eeprom.c | 107 + drivers/media/video/cx23885/netup-eeprom.h | 42 + drivers/media/video/cx23885/netup-init.c | 125 + drivers/media/video/cx23885/netup-init.h | 25 + drivers/media/video/cx25840/cx25840-audio.c | 121 +- drivers/media/video/cx25840/cx25840-core.c | 65 +- drivers/media/video/cx25840/cx25840-core.h | 8 +- drivers/media/video/cx25840/cx25840-vbi.c | 314 +- drivers/media/video/cx88/Kconfig | 2 +- drivers/media/video/cx88/cx88-blackbird.c | 8 +- drivers/media/video/cx88/cx88-cards.c | 99 +- drivers/media/video/cx88/cx88-core.c | 11 +- drivers/media/video/cx88/cx88-dvb.c | 18 +- drivers/media/video/cx88/cx88-i2c.c | 41 +- drivers/media/video/cx88/cx88-input.c | 29 +- drivers/media/video/cx88/cx88-video.c | 52 +- drivers/media/video/cx88/cx88.h | 24 +- drivers/media/video/dabusb.c | 83 +- drivers/media/video/em28xx/em28xx-audio.c | 77 +- drivers/media/video/em28xx/em28xx-cards.c | 195 +- drivers/media/video/em28xx/em28xx-core.c | 41 +- drivers/media/video/em28xx/em28xx-dvb.c | 3 - drivers/media/video/em28xx/em28xx-i2c.c | 12 +- drivers/media/video/em28xx/em28xx-input.c | 22 +- drivers/media/video/em28xx/em28xx-video.c | 61 +- drivers/media/video/em28xx/em28xx.h | 24 +- drivers/media/video/gspca/Kconfig | 27 + drivers/media/video/gspca/Makefile | 102 +- drivers/media/video/gspca/conex.c | 63 +- drivers/media/video/gspca/etoms.c | 36 +- drivers/media/video/gspca/finepix.c | 433 +- drivers/media/video/gspca/gspca.c | 166 +- drivers/media/video/gspca/gspca.h | 14 +- drivers/media/video/gspca/jpeg.h | 263 +- drivers/media/video/gspca/m5602/m5602_core.c | 7 +- drivers/media/video/gspca/mars.c | 506 +- drivers/media/video/gspca/mr97310a.c | 362 + drivers/media/video/gspca/ov519.c | 7 +- drivers/media/video/gspca/ov534.c | 820 +- drivers/media/video/gspca/pac207.c | 8 +- drivers/media/video/gspca/pac7311.c | 7 +- drivers/media/video/gspca/sonixb.c | 7 +- drivers/media/video/gspca/sonixj.c | 951 +- drivers/media/video/gspca/spca500.c | 99 +- drivers/media/video/gspca/spca501.c | 22 +- drivers/media/video/gspca/spca505.c | 525 +- drivers/media/video/gspca/spca506.c | 57 +- drivers/media/video/gspca/spca508.c | 128 +- drivers/media/video/gspca/spca561.c | 192 +- drivers/media/video/gspca/sq905.c | 456 + drivers/media/video/gspca/sq905c.c | 328 + drivers/media/video/gspca/stk014.c | 72 +- drivers/media/video/gspca/stv06xx/stv06xx.c | 7 +- drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c | 76 +- drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h | 65 - drivers/media/video/gspca/stv06xx/stv06xx_pb0100.c | 147 +- drivers/media/video/gspca/stv06xx/stv06xx_pb0100.h | 130 +- drivers/media/video/gspca/stv06xx/stv06xx_sensor.h | 8 - drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c | 123 +- drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | 58 +- drivers/media/video/gspca/sunplus.c | 124 +- drivers/media/video/gspca/t613.c | 564 +- drivers/media/video/gspca/tv8532.c | 483 +- drivers/media/video/gspca/vc032x.c | 1591 ++- drivers/media/video/gspca/zc3xx.c | 884 +- drivers/media/video/hdpvr/Kconfig | 10 + drivers/media/video/hdpvr/Makefile | 9 + drivers/media/video/hdpvr/hdpvr-control.c | 201 + drivers/media/video/hdpvr/hdpvr-core.c | 466 + drivers/media/video/hdpvr/hdpvr-i2c.c | 145 + drivers/media/video/hdpvr/hdpvr-video.c | 1248 ++ drivers/media/video/hdpvr/hdpvr.h | 303 + drivers/media/video/hexium_gemini.c | 292 +- drivers/media/video/hexium_orion.c | 103 +- drivers/media/video/indycam.c | 314 +- drivers/media/video/indycam.h | 19 +- drivers/media/video/ir-kbd-i2c.c | 84 +- drivers/media/video/ivtv/ivtv-controls.c | 1 + drivers/media/video/ivtv/ivtv-driver.c | 93 +- drivers/media/video/ivtv/ivtv-driver.h | 26 +- drivers/media/video/ivtv/ivtv-fileops.c | 10 +- drivers/media/video/ivtv/ivtv-firmware.c | 2 +- drivers/media/video/ivtv/ivtv-gpio.c | 4 +- drivers/media/video/ivtv/ivtv-i2c.c | 14 +- drivers/media/video/ivtv/ivtv-ioctl.c | 20 +- drivers/media/video/ivtv/ivtv-irq.c | 4 +- drivers/media/video/ivtv/ivtv-queue.c | 8 +- drivers/media/video/ivtv/ivtv-queue.h | 8 +- drivers/media/video/ivtv/ivtv-streams.c | 68 +- drivers/media/video/ivtv/ivtv-udma.c | 10 +- drivers/media/video/ivtv/ivtv-udma.h | 4 +- drivers/media/video/ivtv/ivtv-vbi.c | 2 + drivers/media/video/ivtv/ivtv-version.h | 2 +- drivers/media/video/ivtv/ivtv-yuv.c | 6 +- drivers/media/video/ivtv/ivtvfb.c | 6 +- drivers/media/video/ks0127.c | 677 +- drivers/media/video/ks0127.h | 2 - drivers/media/video/m52790.c | 7 - drivers/media/video/meye.c | 45 +- drivers/media/video/msp3400-driver.c | 142 +- drivers/media/video/mt9m001.c | 164 +- drivers/media/video/mt9m111.c | 64 +- drivers/media/video/mt9t031.c | 179 +- drivers/media/video/mt9v022.c | 205 +- drivers/media/video/mx3_camera.c | 1220 + drivers/media/video/mxb.c | 828 +- drivers/media/video/omap24xxcam.c | 7 - drivers/media/video/ov7670.c | 552 +- drivers/media/video/ov772x.c | 320 +- drivers/media/video/ovcamchip/ovcamchip_core.c | 197 +- drivers/media/video/ovcamchip/ovcamchip_priv.h | 7 + drivers/media/video/pvrusb2/Kconfig | 8 +- drivers/media/video/pvrusb2/Makefile | 7 +- drivers/media/video/pvrusb2/pvrusb2-audio.c | 142 +- drivers/media/video/pvrusb2/pvrusb2-audio.h | 6 +- drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c | 95 + .../{pvrusb2-tuner.h => pvrusb2-cs53l32a.h} | 21 +- drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | 245 +- drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h | 4 +- drivers/media/video/pvrusb2/pvrusb2-debugifc.c | 5 - drivers/media/video/pvrusb2/pvrusb2-debugifc.h | 12 +- drivers/media/video/pvrusb2/pvrusb2-devattr.c | 102 +- drivers/media/video/pvrusb2/pvrusb2-devattr.h | 34 +- drivers/media/video/pvrusb2/pvrusb2-dvb.c | 2 +- drivers/media/video/pvrusb2/pvrusb2-encoder.c | 2 +- drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 50 +- drivers/media/video/pvrusb2/pvrusb2-hdw.c | 648 +- drivers/media/video/pvrusb2/pvrusb2-hdw.h | 6 +- .../media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c | 113 - drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c | 322 - drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h | 50 - drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 417 +- drivers/media/video/pvrusb2/pvrusb2-i2c-core.h | 57 +- drivers/media/video/pvrusb2/pvrusb2-main.c | 4 +- drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 12 +- drivers/media/video/pvrusb2/pvrusb2-tuner.c | 120 - drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 18 +- drivers/media/video/pvrusb2/pvrusb2-video-v4l.c | 214 +- drivers/media/video/pvrusb2/pvrusb2-video-v4l.h | 7 +- drivers/media/video/pvrusb2/pvrusb2-wm8775.c | 134 +- drivers/media/video/pvrusb2/pvrusb2-wm8775.h | 4 +- drivers/media/video/pwc/Kconfig | 10 + drivers/media/video/pwc/pwc-if.c | 79 +- drivers/media/video/pwc/pwc.h | 6 + drivers/media/video/pxa_camera.c | 68 +- drivers/media/video/s2255drv.c | 41 +- drivers/media/video/saa5246a.c | 70 +- drivers/media/video/saa5249.c | 71 +- drivers/media/video/saa6588.c | 207 +- drivers/media/video/saa7110.c | 472 +- drivers/media/video/saa7111.c | 492 - drivers/media/video/saa7114.c | 1068 - drivers/media/video/saa7115.c | 64 +- drivers/media/video/saa7127.c | 1 - drivers/media/video/saa7134/Kconfig | 13 +- drivers/media/video/saa7134/saa6752hs.c | 581 +- drivers/media/video/saa7134/saa7134-cards.c | 333 +- drivers/media/video/saa7134/saa7134-core.c | 108 +- drivers/media/video/saa7134/saa7134-dvb.c | 75 +- drivers/media/video/saa7134/saa7134-empress.c | 27 +- drivers/media/video/saa7134/saa7134-i2c.c | 23 +- drivers/media/video/saa7134/saa7134-ts.c | 15 +- drivers/media/video/saa7134/saa7134-video.c | 75 +- drivers/media/video/saa7134/saa7134.h | 40 +- drivers/media/video/saa7146.h | 2 - drivers/media/video/saa717x.c | 10 +- drivers/media/video/saa7185.c | 239 +- drivers/media/video/saa7191.c | 500 +- drivers/media/video/saa7191.h | 26 +- drivers/media/video/sh_mobile_ceu_camera.c | 82 +- drivers/media/video/sn9c102/sn9c102_devtable.h | 4 +- drivers/media/video/soc_camera.c | 135 +- drivers/media/video/soc_camera_platform.c | 9 +- drivers/media/video/stk-webcam.c | 24 +- drivers/media/video/tcm825x.c | 22 +- drivers/media/video/tcm825x.h | 2 +- drivers/media/video/tda7432.c | 22 +- drivers/media/video/tda9840.c | 82 +- drivers/media/video/tda9840.h | 14 - drivers/media/video/tda9875.c | 19 +- drivers/media/video/tea6415c.c | 53 +- drivers/media/video/tea6415c.h | 12 - drivers/media/video/tea6420.c | 69 +- drivers/media/video/tea6420.h | 27 +- drivers/media/video/tlv320aic23b.c | 12 +- drivers/media/video/tuner-core.c | 152 +- drivers/media/video/tvaudio.c | 173 +- drivers/media/video/tveeprom.c | 7 +- drivers/media/video/tvp514x.c | 113 +- drivers/media/video/tvp5150.c | 10 +- drivers/media/video/tw9910.c | 36 +- drivers/media/video/upd64031a.c | 7 - drivers/media/video/upd64083.c | 7 - drivers/media/video/usbvideo/vicam.c | 2 +- drivers/media/video/usbvision/usbvision-core.c | 49 +- drivers/media/video/usbvision/usbvision-i2c.c | 153 +- drivers/media/video/usbvision/usbvision-video.c | 125 +- drivers/media/video/usbvision/usbvision.h | 10 +- drivers/media/video/uvc/uvc_ctrl.c | 2 +- drivers/media/video/uvc/uvc_driver.c | 45 +- drivers/media/video/uvc/uvc_status.c | 16 +- drivers/media/video/uvc/uvc_v4l2.c | 20 +- drivers/media/video/uvc/uvc_video.c | 133 +- drivers/media/video/uvc/uvcvideo.h | 8 +- drivers/media/video/v4l2-common.c | 265 +- drivers/media/video/v4l2-compat-ioctl32.c | 1 - drivers/media/video/v4l2-dev.c | 54 +- drivers/media/video/v4l2-device.c | 58 +- drivers/media/video/v4l2-ioctl.c | 192 +- drivers/media/video/v4l2-subdev.c | 18 + drivers/media/video/videobuf-dma-contig.c | 2 +- drivers/media/video/videobuf-vmalloc.c | 2 +- drivers/media/video/vino.c | 1655 +- drivers/media/video/vivi.c | 495 +- drivers/media/video/vp27smpx.c | 7 - drivers/media/video/vpx3220.c | 491 +- drivers/media/video/w9966.c | 2 +- drivers/media/video/w9968cf.c | 133 +- drivers/media/video/w9968cf.h | 24 +- drivers/media/video/wm8739.c | 7 - drivers/media/video/wm8775.c | 12 +- drivers/media/video/zc0301/zc0301_sensor.h | 8 + drivers/media/video/zoran/Kconfig | 8 +- drivers/media/video/zoran/videocodec.h | 9 +- drivers/media/video/zoran/zoran.h | 97 +- drivers/media/video/zoran/zoran_card.c | 555 +- drivers/media/video/zoran/zoran_card.h | 3 +- drivers/media/video/zoran/zoran_device.c | 529 +- drivers/media/video/zoran/zoran_device.h | 14 +- drivers/media/video/zoran/zoran_driver.c | 4385 ++--- drivers/media/video/zoran/zoran_procfs.c | 2 +- drivers/media/video/zoran/zr36016.c | 5 - drivers/media/video/zoran/zr36050.c | 4 - drivers/media/video/zoran/zr36060.c | 4 - drivers/media/video/zr364xx.c | 17 +- drivers/net/fec_mpc52xx.c | 6 +- drivers/net/meth.c | 2 +- drivers/net/smc91x.h | 32 - drivers/pci/dmar.c | 296 +- drivers/pci/intel-iommu.c | 270 +- drivers/pci/intr_remapping.c | 110 +- drivers/pci/pci-driver.c | 177 +- drivers/pci/pci.c | 142 +- drivers/pci/pci.h | 1 - drivers/ps3/ps3av.c | 16 +- drivers/serial/cpm_uart/cpm_uart_core.c | 14 +- drivers/serial/mpc52xx_uart.c | 40 +- drivers/sh/maple/maple.c | 2 +- drivers/spi/xilinx_spi.c | 9 +- drivers/video/aty/radeon_pm.c | 2 +- drivers/watchdog/Kconfig | 2 +- drivers/xen/manage.c | 16 +- fs/fcntl.c | 10 +- fs/fuse/file.c | 3 +- fs/jfs/Kconfig | 1 + fs/jfs/jfs_extent.c | 63 +- fs/jfs/jfs_imap.c | 10 +- fs/jfs/jfs_metapage.c | 18 +- fs/jfs/jfs_types.h | 29 - fs/jfs/jfs_xtree.c | 263 +- fs/jfs/jfs_xtree.h | 2 - fs/jfs/super.c | 4 + fs/reiserfs/Makefile | 4 +- fs/reiserfs/README | 4 +- fs/reiserfs/bitmap.c | 72 +- fs/reiserfs/dir.c | 28 +- fs/reiserfs/do_balan.c | 313 +- fs/reiserfs/file.c | 34 +- fs/reiserfs/fix_node.c | 1021 +- fs/reiserfs/hashes.c | 2 +- fs/reiserfs/ibalance.c | 22 +- fs/reiserfs/inode.c | 203 +- fs/reiserfs/ioctl.c | 2 +- fs/reiserfs/item_ops.c | 68 +- fs/reiserfs/journal.c | 1077 +- fs/reiserfs/lbalance.c | 66 +- fs/reiserfs/namei.c | 180 +- fs/reiserfs/objectid.c | 12 +- fs/reiserfs/prints.c | 134 +- fs/reiserfs/procfs.c | 11 +- fs/reiserfs/resize.c | 6 +- fs/reiserfs/stree.c | 1168 +- fs/reiserfs/super.c | 303 +- fs/reiserfs/tail_conversion.c | 96 +- fs/reiserfs/xattr.c | 1375 +- fs/reiserfs/xattr_acl.c | 257 +- fs/reiserfs/xattr_security.c | 80 +- fs/reiserfs/xattr_trusted.c | 45 +- fs/reiserfs/xattr_user.c | 31 +- include/drm/drmP.h | 68 +- include/drm/drm_crtc.h | 6 +- include/drm/drm_os_linux.h | 19 + include/drm/drm_pciids.h | 113 + include/drm/radeon_drm.h | 5 +- include/linux/Kbuild | 2 - include/linux/dma-debug.h | 174 + include/linux/dma-mapping.h | 48 + include/linux/dmar.h | 52 +- include/linux/fs.h | 2 +- include/linux/ftrace.h | 24 + include/linux/i2c-id.h | 2 + include/linux/ide.h | 239 +- include/linux/intel-iommu.h | 12 +- include/linux/interrupt.h | 9 + include/linux/irq.h | 3 + include/linux/ivtv.h | 10 +- include/linux/mm.h | 3 +- include/linux/pci.h | 1 + include/linux/pci_ids.h | 8 + include/linux/reiserfs_acl.h | 22 +- include/linux/reiserfs_fs.h | 168 +- include/linux/reiserfs_fs_i.h | 4 +- include/linux/reiserfs_fs_sb.h | 31 +- include/linux/reiserfs_xattr.h | 154 +- include/linux/swiotlb.h | 41 +- include/linux/video_decoder.h | 48 - include/linux/video_encoder.h | 23 - include/linux/videodev.h | 18 + include/linux/videodev2.h | 69 +- include/media/bt819.h | 33 + include/media/cx2341x.h | 6 +- include/media/cx25840.h | 12 + include/media/ir-common.h | 3 + include/media/ir-kbd-i2c.h | 3 +- include/media/ov772x.h | 5 + include/media/saa7146.h | 8 + include/media/saa7146_vv.h | 17 +- include/media/sh_mobile_ceu.h | 5 +- include/media/soc_camera.h | 24 +- include/media/v4l2-chip-ident.h | 94 +- include/media/v4l2-common.h | 24 +- include/media/v4l2-dev.h | 2 + include/media/v4l2-device.h | 40 +- include/media/v4l2-ioctl.h | 2 + include/media/v4l2-subdev.h | 22 +- include/media/videobuf-core.h | 1 + include/sound/tea575x-tuner.h | 8 +- kernel/irq/Makefile | 1 + kernel/irq/internals.h | 2 + kernel/irq/manage.c | 31 +- kernel/irq/pm.c | 79 + kernel/kexec.c | 19 +- kernel/power/disk.c | 138 +- kernel/power/main.c | 55 +- kernel/sched.c | 15 +- kernel/trace/trace_functions_graph.c | 75 + lib/Kconfig.debug | 11 + lib/Makefile | 2 + lib/dma-debug.c | 955 + lib/lmb.c | 42 +- lib/swiotlb.c | 88 +- mm/memory.c | 6 +- sound/i2c/other/tea575x-tuner.c | 302 +- sound/pci/Kconfig | 2 +- usr/Kconfig | 54 +- 1166 files changed, 110031 insertions(+), 43137 deletions(-) create mode 100644 Documentation/powerpc/dts-bindings/fsl/esdhc.txt create mode 100644 Documentation/x86/earlyprintk.txt create mode 100644 arch/arm/plat-mxc/include/mach/mx3_camera.h delete mode 100644 arch/ia64/dig/dig_vtd_iommu.c create mode 100644 arch/ia64/kernel/dma-mapping.c create mode 100644 arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h create mode 100644 arch/powerpc/boot/cuboot-amigaone.c create mode 100644 arch/powerpc/boot/dts/amigaone.dts create mode 100644 arch/powerpc/boot/dts/digsy_mtc.dts create mode 100644 arch/powerpc/boot/dts/gef_ppc9a.dts create mode 100644 arch/powerpc/boot/dts/gef_sbc310.dts create mode 100644 arch/powerpc/boot/dts/media5200.dts create mode 100644 arch/powerpc/boot/dts/mpc8572ds_36b.dts create mode 100644 arch/powerpc/boot/dts/pcm032.dts create mode 100644 arch/powerpc/boot/dts/redwood.dts create mode 100644 arch/powerpc/boot/dts/socrates.dts create mode 100644 arch/powerpc/configs/44x/redwood_defconfig create mode 100644 arch/powerpc/configs/85xx/socrates_defconfig create mode 100644 arch/powerpc/configs/86xx/gef_ppc9a_defconfig create mode 100644 arch/powerpc/configs/86xx/gef_sbc310_defconfig create mode 100644 arch/powerpc/configs/amigaone_defconfig create mode 100644 arch/powerpc/include/asm/dbell.h rename arch/powerpc/include/asm/{mmu-fsl-booke.h => mmu-book3e.h} (53%) delete mode 100644 arch/powerpc/include/asm/pgtable-4k.h create mode 100644 arch/powerpc/include/asm/pgtable-ppc64-4k.h create mode 100644 arch/powerpc/include/asm/pgtable-ppc64-64k.h create mode 100644 arch/powerpc/include/asm/ppc-opcode.h create mode 100644 arch/powerpc/include/asm/pte-40x.h create mode 100644 arch/powerpc/include/asm/pte-44x.h create mode 100644 arch/powerpc/include/asm/pte-8xx.h create mode 100644 arch/powerpc/include/asm/pte-common.h create mode 100644 arch/powerpc/include/asm/pte-fsl-booke.h create mode 100644 arch/powerpc/include/asm/pte-hash32.h create mode 100644 arch/powerpc/include/asm/pte-hash64-4k.h rename arch/powerpc/include/asm/{pgtable-64k.h => pte-hash64-64k.h} (73%) create mode 100644 arch/powerpc/include/asm/pte-hash64.h create mode 100644 arch/powerpc/kernel/cpu_setup_fsl_booke.S create mode 100644 arch/powerpc/kernel/dbell.c rename arch/powerpc/mm/{mmap.c => mmap_64.c} (65%) create mode 100644 arch/powerpc/platforms/52xx/media5200.c create mode 100644 arch/powerpc/platforms/52xx/mpc52xx_gpt.c create mode 100644 arch/powerpc/platforms/85xx/socrates.c create mode 100644 arch/powerpc/platforms/85xx/socrates_fpga_pic.c create mode 100644 arch/powerpc/platforms/85xx/socrates_fpga_pic.h create mode 100644 arch/powerpc/platforms/86xx/gef_ppc9a.c create mode 100644 arch/powerpc/platforms/86xx/gef_sbc310.c create mode 100644 arch/powerpc/platforms/amigaone/Kconfig create mode 100644 arch/powerpc/platforms/amigaone/Makefile create mode 100644 arch/powerpc/platforms/amigaone/setup.c create mode 100644 arch/powerpc/platforms/pseries/dtl.c create mode 100755 arch/x86/include/asm/cpu_debug.h create mode 100644 arch/x86/include/asm/init.h delete mode 100644 arch/x86/kernel/cpu/centaur_64.c create mode 100755 arch/x86/kernel/cpu/cpu_debug.c create mode 100644 arch/x86/kernel/cpu/mcheck/threshold.c create mode 100644 arch/x86/kernel/cpu/mtrr/cleanup.c rename arch/x86/kernel/{pci-swiotlb_64.c => pci-swiotlb.c} (81%) create mode 100644 arch/x86/kernel/uv_time.c create mode 100644 drivers/gpu/drm/radeon/r600_cp.c create mode 100644 drivers/gpu/drm/radeon/r600_microcode.h create mode 100644 drivers/media/common/tuners/mc44s803.c create mode 100644 drivers/media/common/tuners/mc44s803.h create mode 100644 drivers/media/common/tuners/mc44s803_priv.h create mode 100644 drivers/media/dvb/dvb-usb/ce6230.c create mode 100644 drivers/media/dvb/dvb-usb/ce6230.h create mode 100644 drivers/media/dvb/frontends/au8522_decoder.c rename drivers/media/dvb/frontends/{au8522.c => au8522_dig.c} (91%) create mode 100644 drivers/media/dvb/frontends/au8522_priv.h create mode 100644 drivers/media/dvb/frontends/lgdt3305.c create mode 100644 drivers/media/dvb/frontends/lgdt3305.h create mode 100644 drivers/media/dvb/frontends/lnbh24.h create mode 100644 drivers/media/dvb/frontends/stv0900.h create mode 100644 drivers/media/dvb/frontends/stv0900_core.c create mode 100644 drivers/media/dvb/frontends/stv0900_init.h create mode 100644 drivers/media/dvb/frontends/stv0900_priv.h create mode 100644 drivers/media/dvb/frontends/stv0900_reg.h create mode 100644 drivers/media/dvb/frontends/stv0900_sw.c create mode 100644 drivers/media/dvb/frontends/stv6110.c create mode 100644 drivers/media/dvb/frontends/stv6110.h create mode 100644 drivers/media/dvb/frontends/zl10036.c create mode 100644 drivers/media/dvb/frontends/zl10036.h create mode 100644 drivers/media/video/au0828/au0828-video.c create mode 100644 drivers/media/video/cx23885/cimax2.c create mode 100644 drivers/media/video/cx23885/cimax2.h create mode 100644 drivers/media/video/cx23885/netup-eeprom.c create mode 100644 drivers/media/video/cx23885/netup-eeprom.h create mode 100644 drivers/media/video/cx23885/netup-init.c create mode 100644 drivers/media/video/cx23885/netup-init.h create mode 100644 drivers/media/video/gspca/mr97310a.c create mode 100644 drivers/media/video/gspca/sq905.c create mode 100644 drivers/media/video/gspca/sq905c.c create mode 100644 drivers/media/video/hdpvr/Kconfig create mode 100644 drivers/media/video/hdpvr/Makefile create mode 100644 drivers/media/video/hdpvr/hdpvr-control.c create mode 100644 drivers/media/video/hdpvr/hdpvr-core.c create mode 100644 drivers/media/video/hdpvr/hdpvr-i2c.c create mode 100644 drivers/media/video/hdpvr/hdpvr-video.c create mode 100644 drivers/media/video/hdpvr/hdpvr.h create mode 100644 drivers/media/video/mx3_camera.c create mode 100644 drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c rename drivers/media/video/pvrusb2/{pvrusb2-tuner.h => pvrusb2-cs53l32a.h} (64%) delete mode 100644 drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c delete mode 100644 drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c delete mode 100644 drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h delete mode 100644 drivers/media/video/pvrusb2/pvrusb2-tuner.c delete mode 100644 drivers/media/video/saa7111.c delete mode 100644 drivers/media/video/saa7114.c delete mode 100644 drivers/media/video/tda9840.h create mode 100644 include/linux/dma-debug.h delete mode 100644 include/linux/video_decoder.h delete mode 100644 include/linux/video_encoder.h create mode 100644 include/media/bt819.h create mode 100644 kernel/irq/pm.c create mode 100644 lib/dma-debug.c Merging arm-current/master $ git merge arm-current/master Already up-to-date. Merging m68k-current/for-linus $ git merge m68k-current/for-linus Already up-to-date. Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging sparc-current/master $ git merge sparc-current/master Merge made by recursive. arch/sparc/include/asm/mmu_context_64.h | 8 +++--- arch/sparc/include/asm/smp_64.h | 3 +- arch/sparc/include/asm/system_32.h | 2 +- arch/sparc/include/asm/topology_64.h | 7 +----- arch/sparc/kernel/ds.c | 2 +- arch/sparc/kernel/irq_64.c | 4 +- arch/sparc/kernel/mdesc.c | 2 +- arch/sparc/kernel/nmi.c | 23 +++++++++++++++++++- arch/sparc/kernel/prom_64.c | 4 +- arch/sparc/kernel/smp_32.c | 36 +++++++++++++++--------------- arch/sparc/kernel/smp_64.c | 14 ++++++------ arch/sparc/kernel/sun4d_smp.c | 11 ++++----- arch/sparc/kernel/sun4m_smp.c | 10 +++----- arch/sparc/mm/init_64.c | 2 +- arch/sparc/mm/srmmu.c | 2 +- 15 files changed, 72 insertions(+), 58 deletions(-) Merging scsi-rc-fixes/master $ git merge scsi-rc-fixes/master Already up-to-date. Merging net-current/master $ git merge net-current/master Merge made by recursive. drivers/net/gianfar.c | 2 +- drivers/net/hamradio/dmascc.c | 2 +- drivers/net/netconsole.c | 10 +++----- drivers/net/ni5010.c | 18 +++++++++++----- drivers/net/niu.c | 12 ++++++---- drivers/net/tg3.c | 4 +- drivers/net/ucc_geth.c | 11 +++++---- drivers/net/wireless/airo.c | 2 - drivers/net/wireless/ipw2x00/ipw2200.c | 1 - drivers/net/wireless/prism54/islpci_dev.c | 1 - drivers/net/wireless/zd1201.c | 1 - include/linux/kernel.h | 12 ----------- include/linux/netpoll.h | 2 +- include/linux/skbuff.h | 1 + net/core/netpoll.c | 31 ++++++++++++++--------------- net/core/skbuff.c | 2 +- net/netfilter/nf_conntrack_irc.c | 15 +++++++------ net/netfilter/xt_cluster.c | 11 ++++++++- 18 files changed, 68 insertions(+), 70 deletions(-) Merging sound-current/for-linus $ git merge sound-current/for-linus Already up-to-date. Merging pci-current/for-linus $ git merge pci-current/for-linus Already up-to-date. Merging wireless-current/master $ git merge wireless-current/master Already up-to-date. Merging kbuild-current/master $ git merge kbuild-current/master Already up-to-date. Merging quilt/driver-core.current $ git merge quilt/driver-core.current Already up-to-date. Merging quilt/usb.current $ git merge quilt/usb.current Auto-merging drivers/usb/core/message.c Auto-merging drivers/usb/gadget/f_rndis.c Auto-merging drivers/usb/storage/scsiglue.c Merge made by recursive. Merging cpufreq-current/fixes $ git merge cpufreq-current/fixes Already up-to-date. Merging input-current/for-linus $ git merge input-current/for-linus Already up-to-date. Merging md-current/for-linus $ git merge md-current/for-linus Already up-to-date. Merging audit-current/for-linus $ git merge audit-current/for-linus Already up-to-date. Merging crypto-current/master $ git merge crypto-current/master Merge made by recursive. crypto/shash.c | 3 + drivers/char/hw_random/timeriomem-rng.c | 39 ++++++- drivers/crypto/ixp4xx_crypto.c | 182 +++++++++++-------------------- include/linux/timeriomem-rng.h | 2 +- 4 files changed, 102 insertions(+), 124 deletions(-) Merging dwmw2/master $ git merge dwmw2/master Already up-to-date. Merging arm/devel $ git merge arm/devel Already up-to-date. Merging avr32/avr32-arch $ git merge avr32/avr32-arch Auto-merging arch/avr32/Kconfig Merge made by recursive. arch/avr32/Kconfig | 14 + arch/avr32/Makefile | 1 + arch/avr32/boards/atngw100/evklcd10x.c | 50 +- arch/avr32/boards/atngw100/setup.c | 5 - arch/avr32/boards/favr-32/setup.c | 7 +- arch/avr32/boards/hammerhead/setup.c | 4 +- arch/avr32/boards/merisc/Kconfig | 5 + arch/avr32/boards/merisc/Makefile | 1 + arch/avr32/boards/merisc/display.c | 65 ++ arch/avr32/boards/merisc/flash.c | 139 +++ arch/avr32/boards/merisc/merisc.h | 18 + arch/avr32/boards/merisc/merisc_sysfs.c | 65 ++ arch/avr32/boards/merisc/setup.c | 297 ++++++ arch/avr32/configs/merisc_defconfig | 1237 ++++++++++++++++++++++ arch/avr32/mach-at32ap/at32ap700x.c | 82 +- arch/avr32/mach-at32ap/include/mach/at32ap700x.h | 52 +- arch/avr32/mach-at32ap/include/mach/board.h | 17 +- drivers/usb/gadget/atmel_usba_udc.c | 14 +- 18 files changed, 1998 insertions(+), 75 deletions(-) create mode 100644 arch/avr32/boards/merisc/Kconfig create mode 100644 arch/avr32/boards/merisc/Makefile create mode 100644 arch/avr32/boards/merisc/display.c create mode 100644 arch/avr32/boards/merisc/flash.c create mode 100644 arch/avr32/boards/merisc/merisc.h create mode 100644 arch/avr32/boards/merisc/merisc_sysfs.c create mode 100644 arch/avr32/boards/merisc/setup.c create mode 100644 arch/avr32/configs/merisc_defconfig Merging blackfin/for-linus $ git merge blackfin/for-linus Already up-to-date. Merging cris/for-next $ git merge cris/for-next Already up-to-date. Merging ia64/test $ git merge ia64/test Auto-merging arch/ia64/kernel/Makefile Merge made by recursive. arch/ia64/include/asm/intrinsics.h | 6 +- arch/ia64/include/asm/mmu_context.h | 6 +- arch/ia64/include/asm/module.h | 6 + arch/ia64/include/asm/native/inst.h | 13 + arch/ia64/include/asm/native/patchlist.h | 38 ++ arch/ia64/include/asm/native/pvchk_inst.h | 8 + arch/ia64/include/asm/paravirt.h | 65 +++ arch/ia64/include/asm/paravirt_patch.h | 143 +++++ arch/ia64/include/asm/paravirt_privop.h | 365 +++++++++++++- arch/ia64/include/asm/smp.h | 3 +- arch/ia64/include/asm/timex.h | 1 + arch/ia64/include/asm/topology.h | 5 - arch/ia64/include/asm/xen/hypervisor.h | 39 +- arch/ia64/include/asm/xen/inst.h | 28 + arch/ia64/include/asm/xen/interface.h | 9 + arch/ia64/include/asm/xen/minstate.h | 11 +- arch/ia64/include/asm/xen/patchlist.h | 38 ++ arch/ia64/include/asm/xen/privop.h | 8 +- arch/ia64/kernel/Makefile | 39 +-- arch/ia64/kernel/Makefile.gate | 27 + arch/ia64/kernel/acpi.c | 8 +- arch/ia64/kernel/asm-offsets.c | 2 + arch/ia64/kernel/efi.c | 1 + arch/ia64/kernel/entry.S | 4 +- arch/ia64/kernel/fsys.S | 35 +- arch/ia64/kernel/gate.S | 171 ++++--- arch/ia64/kernel/gate.lds.S | 17 +- arch/ia64/kernel/head.S | 10 +- arch/ia64/kernel/ivt.S | 2 +- arch/ia64/kernel/mca.c | 6 +- arch/ia64/kernel/module.c | 32 ++ arch/ia64/kernel/paravirt.c | 539 +++++++++++++++++++- arch/ia64/kernel/paravirt_patch.c | 514 ++++++++++++++++++ arch/ia64/kernel/paravirt_patchlist.c | 79 +++ arch/ia64/kernel/paravirt_patchlist.h | 28 + arch/ia64/kernel/paravirtentry.S | 99 +++- arch/ia64/kernel/patch.c | 40 ++- arch/ia64/kernel/perfmon.c | 4 +- arch/ia64/kernel/salinfo.c | 6 +- arch/ia64/kernel/setup.c | 6 +- arch/ia64/kernel/smp.c | 6 +- arch/ia64/kernel/smpboot.c | 17 +- arch/ia64/kernel/time.c | 9 + arch/ia64/kernel/vmlinux.lds.S | 30 ++ arch/ia64/kvm/kvm-ia64.c | 2 +- arch/ia64/kvm/vcpu.c | 2 +- arch/ia64/kvm/vtlb.c | 2 + arch/ia64/mm/init.c | 9 +- arch/ia64/mm/tlb.c | 2 +- arch/ia64/scripts/pvcheck.sed | 1 + arch/ia64/sn/kernel/setup.c | 2 +- arch/ia64/sn/kernel/sn2/sn2_smp.c | 10 +- arch/ia64/sn/kernel/sn2/sn_hwperf.c | 2 +- arch/ia64/xen/Makefile | 19 +- arch/ia64/xen/gate-data.S | 3 + arch/ia64/xen/hypercall.S | 2 + arch/ia64/xen/time.c | 48 ++ arch/ia64/xen/xen_pv_ops.c | 800 ++++++++++++++++++++++++++++- 58 files changed, 3171 insertions(+), 256 deletions(-) create mode 100644 arch/ia64/include/asm/native/patchlist.h create mode 100644 arch/ia64/include/asm/paravirt_patch.h create mode 100644 arch/ia64/include/asm/xen/patchlist.h create mode 100644 arch/ia64/kernel/Makefile.gate create mode 100644 arch/ia64/kernel/paravirt_patch.c create mode 100644 arch/ia64/kernel/paravirt_patchlist.c create mode 100644 arch/ia64/kernel/paravirt_patchlist.h create mode 100644 arch/ia64/xen/gate-data.S Merging m68k/for-next $ git merge m68k/for-next Already up-to-date. Merging m68knommu/for-next $ git merge m68knommu/for-next Removing arch/m68k/include/asm/bootinfo_mm.h Removing arch/m68k/include/asm/bootinfo_no.h Removing arch/m68k/include/asm/bug_mm.h Removing arch/m68k/include/asm/bug_no.h Removing arch/m68k/include/asm/bugs_mm.h Removing arch/m68k/include/asm/bugs_no.h Removing arch/m68k/include/asm/cache_mm.h Removing arch/m68k/include/asm/cache_no.h Removing arch/m68k/include/asm/current_mm.h Removing arch/m68k/include/asm/current_no.h Removing arch/m68k/include/asm/div64_mm.h Removing arch/m68k/include/asm/div64_no.h Removing arch/m68k/include/asm/dma-mapping_mm.h Removing arch/m68k/include/asm/dma-mapping_no.h Removing arch/m68k/include/asm/elf_mm.h Removing arch/m68k/include/asm/elf_no.h Removing arch/m68k/include/asm/fb_mm.h Removing arch/m68k/include/asm/fb_no.h Removing arch/m68k/include/asm/fpu_mm.h Removing arch/m68k/include/asm/fpu_no.h Removing arch/m68k/include/asm/hw_irq_mm.h Removing arch/m68k/include/asm/hw_irq_no.h Removing arch/m68k/include/asm/kmap_types_mm.h Removing arch/m68k/include/asm/kmap_types_no.h Removing arch/m68k/include/asm/mc146818rtc_mm.h Removing arch/m68k/include/asm/mc146818rtc_no.h Removing arch/m68k/include/asm/mcfpci.h Removing arch/m68k/include/asm/mmu_context_mm.h Removing arch/m68k/include/asm/mmu_context_no.h Removing arch/m68k/include/asm/mmu_mm.h Removing arch/m68k/include/asm/mmu_no.h Removing arch/m68k/include/asm/module_mm.h Removing arch/m68k/include/asm/module_no.h Removing arch/m68k/include/asm/page_offset_mm.h Removing arch/m68k/include/asm/page_offset_no.h Removing arch/m68k/include/asm/pci_mm.h Removing arch/m68k/include/asm/pci_no.h Removing arch/m68k/include/asm/pgalloc_mm.h Removing arch/m68k/include/asm/pgalloc_no.h Removing arch/m68k/include/asm/scatterlist_mm.h Removing arch/m68k/include/asm/scatterlist_no.h Removing arch/m68k/include/asm/segment_mm.h Removing arch/m68k/include/asm/segment_no.h Removing arch/m68k/include/asm/timex_mm.h Removing arch/m68k/include/asm/timex_no.h Removing arch/m68k/include/asm/tlbflush_mm.h Removing arch/m68k/include/asm/tlbflush_no.h Removing arch/m68k/include/asm/ucontext_mm.h Removing arch/m68k/include/asm/ucontext_no.h Removing arch/m68k/include/asm/unaligned_mm.h Removing arch/m68k/include/asm/unaligned_no.h Merge made by recursive. arch/m68k/include/asm/bootinfo.h | 381 ++++++++++++++++++++++++++++- arch/m68k/include/asm/bootinfo_mm.h | 378 ---------------------------- arch/m68k/include/asm/bootinfo_no.h | 2 - arch/m68k/include/asm/bug.h | 31 ++- arch/m68k/include/asm/bug_mm.h | 29 --- arch/m68k/include/asm/bug_no.h | 4 - arch/m68k/include/asm/bugs.h | 21 ++- arch/m68k/include/asm/bugs_mm.h | 14 - arch/m68k/include/asm/bugs_no.h | 16 -- arch/m68k/include/asm/cache.h | 14 +- arch/m68k/include/asm/cache_mm.h | 11 - arch/m68k/include/asm/cache_no.h | 12 - arch/m68k/include/asm/current.h | 31 ++- arch/m68k/include/asm/current_mm.h | 6 - arch/m68k/include/asm/current_no.h | 24 -- arch/m68k/include/asm/div64.h | 37 +++- arch/m68k/include/asm/div64_mm.h | 28 -- arch/m68k/include/asm/div64_no.h | 1 - arch/m68k/include/asm/dma-mapping.h | 113 +++++++++- arch/m68k/include/asm/dma-mapping_mm.h | 112 --------- arch/m68k/include/asm/dma-mapping_no.h | 6 - arch/m68k/include/asm/elf.h | 120 +++++++++- arch/m68k/include/asm/elf_mm.h | 119 --------- arch/m68k/include/asm/elf_no.h | 110 --------- arch/m68k/include/asm/fb.h | 41 +++- arch/m68k/include/asm/fb_mm.h | 34 --- arch/m68k/include/asm/fb_no.h | 12 - arch/m68k/include/asm/fpu.h | 22 ++- arch/m68k/include/asm/fpu_mm.h | 21 -- arch/m68k/include/asm/fpu_no.h | 21 -- arch/m68k/include/asm/hw_irq.h | 9 +- arch/m68k/include/asm/hw_irq_mm.h | 6 - arch/m68k/include/asm/hw_irq_no.h | 4 - arch/m68k/include/asm/kmap_types.h | 26 ++- arch/m68k/include/asm/kmap_types_mm.h | 21 -- arch/m68k/include/asm/kmap_types_no.h | 21 -- arch/m68k/include/asm/m532xsim.h | 1 + arch/m68k/include/asm/mc146818rtc.h | 31 ++- arch/m68k/include/asm/mc146818rtc_mm.h | 26 -- arch/m68k/include/asm/mc146818rtc_no.h | 9 - arch/m68k/include/asm/mcfpci.h | 119 --------- arch/m68k/include/asm/mmu.h | 14 +- arch/m68k/include/asm/mmu_context.h | 176 +++++++++++++- arch/m68k/include/asm/mmu_context_mm.h | 154 ------------ arch/m68k/include/asm/mmu_context_no.h | 33 --- arch/m68k/include/asm/mmu_mm.h | 7 - arch/m68k/include/asm/mmu_no.h | 10 - arch/m68k/include/asm/module.h | 51 ++++- arch/m68k/include/asm/module_mm.h | 39 --- arch/m68k/include/asm/module_no.h | 11 - arch/m68k/include/asm/page_offset.h | 12 +- arch/m68k/include/asm/page_offset_mm.h | 8 - arch/m68k/include/asm/page_offset_no.h | 5 - arch/m68k/include/asm/pci.h | 17 +- arch/m68k/include/asm/pci_mm.h | 12 - arch/m68k/include/asm/pci_no.h | 29 --- arch/m68k/include/asm/pgalloc.h | 20 ++- arch/m68k/include/asm/pgalloc_mm.h | 19 -- arch/m68k/include/asm/pgalloc_no.h | 8 - arch/m68k/include/asm/pgtable_no.h | 2 + arch/m68k/include/asm/scatterlist.h | 26 ++- arch/m68k/include/asm/scatterlist_mm.h | 23 -- arch/m68k/include/asm/scatterlist_no.h | 22 -- arch/m68k/include/asm/segment.h | 64 +++++- arch/m68k/include/asm/segment_mm.h | 57 ----- arch/m68k/include/asm/segment_no.h | 51 ---- arch/m68k/include/asm/timex.h | 21 ++- arch/m68k/include/asm/timex_mm.h | 18 -- arch/m68k/include/asm/timex_no.h | 23 -- arch/m68k/include/asm/tlbflush.h | 268 ++++++++++++++++++++- arch/m68k/include/asm/tlbflush_mm.h | 219 ----------------- arch/m68k/include/asm/tlbflush_no.h | 55 ---- arch/m68k/include/asm/ucontext.h | 33 +++- arch/m68k/include/asm/ucontext_mm.h | 30 --- arch/m68k/include/asm/ucontext_no.h | 32 --- arch/m68k/include/asm/unaligned.h | 26 ++- arch/m68k/include/asm/unaligned_mm.h | 13 - arch/m68k/include/asm/unaligned_no.h | 25 -- arch/m68knommu/kernel/dma.c | 8 +- arch/m68knommu/kernel/irq.c | 2 +- arch/m68knommu/mm/init.c | 6 +- arch/m68knommu/platform/5249/config.c | 11 +- arch/m68knommu/platform/5307/config.c | 8 +- arch/m68knommu/platform/5407/config.c | 8 +- arch/m68knommu/platform/coldfire/Makefile | 2 +- arch/m68knommu/platform/coldfire/clk.c | 40 +++ drivers/serial/mcf.c | 2 +- 87 files changed, 1582 insertions(+), 2182 deletions(-) delete mode 100644 arch/m68k/include/asm/bootinfo_mm.h delete mode 100644 arch/m68k/include/asm/bootinfo_no.h delete mode 100644 arch/m68k/include/asm/bug_mm.h delete mode 100644 arch/m68k/include/asm/bug_no.h delete mode 100644 arch/m68k/include/asm/bugs_mm.h delete mode 100644 arch/m68k/include/asm/bugs_no.h delete mode 100644 arch/m68k/include/asm/cache_mm.h delete mode 100644 arch/m68k/include/asm/cache_no.h delete mode 100644 arch/m68k/include/asm/current_mm.h delete mode 100644 arch/m68k/include/asm/current_no.h delete mode 100644 arch/m68k/include/asm/div64_mm.h delete mode 100644 arch/m68k/include/asm/div64_no.h delete mode 100644 arch/m68k/include/asm/dma-mapping_mm.h delete mode 100644 arch/m68k/include/asm/dma-mapping_no.h delete mode 100644 arch/m68k/include/asm/elf_mm.h delete mode 100644 arch/m68k/include/asm/elf_no.h delete mode 100644 arch/m68k/include/asm/fb_mm.h delete mode 100644 arch/m68k/include/asm/fb_no.h delete mode 100644 arch/m68k/include/asm/fpu_mm.h delete mode 100644 arch/m68k/include/asm/fpu_no.h delete mode 100644 arch/m68k/include/asm/hw_irq_mm.h delete mode 100644 arch/m68k/include/asm/hw_irq_no.h delete mode 100644 arch/m68k/include/asm/kmap_types_mm.h delete mode 100644 arch/m68k/include/asm/kmap_types_no.h delete mode 100644 arch/m68k/include/asm/mc146818rtc_mm.h delete mode 100644 arch/m68k/include/asm/mc146818rtc_no.h delete mode 100644 arch/m68k/include/asm/mcfpci.h delete mode 100644 arch/m68k/include/asm/mmu_context_mm.h delete mode 100644 arch/m68k/include/asm/mmu_context_no.h delete mode 100644 arch/m68k/include/asm/mmu_mm.h delete mode 100644 arch/m68k/include/asm/mmu_no.h delete mode 100644 arch/m68k/include/asm/module_mm.h delete mode 100644 arch/m68k/include/asm/module_no.h delete mode 100644 arch/m68k/include/asm/page_offset_mm.h delete mode 100644 arch/m68k/include/asm/page_offset_no.h delete mode 100644 arch/m68k/include/asm/pci_mm.h delete mode 100644 arch/m68k/include/asm/pci_no.h delete mode 100644 arch/m68k/include/asm/pgalloc_mm.h delete mode 100644 arch/m68k/include/asm/pgalloc_no.h delete mode 100644 arch/m68k/include/asm/scatterlist_mm.h delete mode 100644 arch/m68k/include/asm/scatterlist_no.h delete mode 100644 arch/m68k/include/asm/segment_mm.h delete mode 100644 arch/m68k/include/asm/segment_no.h delete mode 100644 arch/m68k/include/asm/timex_mm.h delete mode 100644 arch/m68k/include/asm/timex_no.h delete mode 100644 arch/m68k/include/asm/tlbflush_mm.h delete mode 100644 arch/m68k/include/asm/tlbflush_no.h delete mode 100644 arch/m68k/include/asm/ucontext_mm.h delete mode 100644 arch/m68k/include/asm/ucontext_no.h delete mode 100644 arch/m68k/include/asm/unaligned_mm.h delete mode 100644 arch/m68k/include/asm/unaligned_no.h create mode 100644 arch/m68knommu/platform/coldfire/clk.c Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Already up-to-date. Merging parisc/master $ git merge parisc/master Already up-to-date. Merging powerpc/next $ git merge powerpc/next Already up-to-date. Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging galak/next $ git merge galak/next Already up-to-date. Merging pxa/for-next $ git merge pxa/for-next Already up-to-date. Merging s390/features $ git merge s390/features Already up-to-date. Merging sh/master $ git merge sh/master Merge made by recursive. arch/sh/Kconfig | 2 +- arch/sh/boards/board-urquell.c | 4 + arch/sh/include/asm/mmu.h | 35 +++--- arch/sh/include/cpu-sh4/cpu/sh7786.h | 214 +++++++++++------------------- arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c | 185 ++++++--------------------- 5 files changed, 142 insertions(+), 298 deletions(-) Merging sparc/master $ git merge sparc/master Already up-to-date. Merging x86/auto-x86-next $ git merge x86/auto-x86-next Merge made by recursive. arch/x86/include/asm/k8.h | 4 + arch/x86/kernel/cpu/intel_cacheinfo.c | 182 ++++++++++++++------------------ 2 files changed, 84 insertions(+), 102 deletions(-) Merging xtensa/master $ git merge xtensa/master Already up-to-date. Merging tip-core/auto-core-next $ git merge tip-core/auto-core-next Resolved 'include/linux/netfilter/xt_limit.h' using previous resolution. Resolved 'include/linux/netfilter/xt_statistic.h' using previous resolution. Resolved 'lib/Kconfig.debug' using previous resolution. Auto-merging Documentation/kernel-parameters.txt Auto-merging arch/parisc/kernel/irq.c Auto-merging arch/s390/include/asm/smp.h Auto-merging include/drm/radeon_drm.h Auto-merging include/linux/interrupt.h Auto-merging include/linux/kernel.h Auto-merging include/linux/netfilter/nfnetlink.h Auto-merging include/linux/netfilter/x_tables.h Auto-merging include/linux/netfilter/xt_limit.h CONFLICT (content): Merge conflict in include/linux/netfilter/xt_limit.h Auto-merging include/linux/netfilter/xt_statistic.h CONFLICT (content): Merge conflict in include/linux/netfilter/xt_statistic.h Auto-merging include/linux/sched.h Auto-merging include/linux/timer.h Auto-merging include/sound/asound.h Auto-merging kernel/sched.c Auto-merging kernel/sched_features.h Auto-merging kernel/timer.c Auto-merging lib/Kconfig Auto-merging lib/Kconfig.debug CONFLICT (content): Merge conflict in lib/Kconfig.debug Auto-merging mm/slob.c Auto-merging mm/slub.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 3d0346a] Merge commit 'tip-core/auto-core-next' $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 3 + Documentation/lockdep-design.txt | 30 +- arch/s390/include/asm/smp.h | 6 - block/blk-softirq.c | 2 +- include/linux/hrtimer.h | 5 + include/linux/interrupt.h | 14 + include/linux/irqflags.h | 8 +- include/linux/kernel.h | 17 + include/linux/lockdep.h | 50 +-- include/linux/mutex.h | 5 +- include/linux/pkt_sched.h | 2 +- include/linux/sched.h | 21 +- include/linux/smp.h | 7 +- include/linux/string.h | 7 + include/linux/timer.h | 93 +++- kernel/Makefile | 1 + kernel/extable.c | 25 +- kernel/fork.c | 8 +- kernel/hrtimer.c | 55 ++- kernel/hung_task.c | 217 ++++++++ kernel/lockdep.c | 543 ++++++++++--------- kernel/lockdep_internals.h | 45 ++- kernel/lockdep_proc.c | 22 +- kernel/lockdep_states.h | 9 + kernel/mutex-debug.c | 9 +- kernel/mutex-debug.h | 18 +- kernel/mutex.c | 121 ++++- kernel/mutex.h | 22 +- kernel/panic.c | 115 ++-- kernel/printk.c | 7 +- kernel/ptrace.c | 2 - kernel/rcupdate.c | 44 ++ kernel/sched.c | 79 +++- kernel/sched_features.h | 1 + kernel/smp.c | 432 ++++++++------- kernel/softirq.c | 17 +- kernel/softlockup.c | 100 ---- kernel/sysctl.c | 19 +- kernel/timer.c | 68 ++- lib/Kconfig | 3 + lib/Kconfig.debug | 40 ++- lib/debugobjects.c | 127 ++++- lib/locking-selftest.c | 4 +- lib/vsprintf.c | 1005 +++++++++++++++++++++++++++-------- mm/page_alloc.c | 5 + mm/slab.c | 4 + mm/slob.c | 2 + mm/slub.c | 1 + mm/vmscan.c | 2 + 49 files changed, 2398 insertions(+), 1044 deletions(-) create mode 100644 kernel/hung_task.c create mode 100644 kernel/lockdep_states.h Merging cpus4096/auto-cpus4096-next $ git merge cpus4096/auto-cpus4096-next Resolved 'arch/x86/kernel/cpu/common.c' using previous resolution. Resolved 'arch/x86/kernel/cpu/intel_cacheinfo.c' using previous resolution. Auto-merging arch/parisc/kernel/irq.c Auto-merging arch/x86/include/asm/processor.h Auto-merging arch/x86/kernel/apm_32.c Auto-merging arch/x86/kernel/cpu/common.c CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/common.c Auto-merging arch/x86/kernel/cpu/cpufreq/p4-clockmod.c Auto-merging arch/x86/kernel/cpu/cpufreq/powernow-k8.c Auto-merging arch/x86/kernel/cpu/cpufreq/speedstep-ich.c Auto-merging arch/x86/kernel/cpu/intel_cacheinfo.c CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/intel_cacheinfo.c Auto-merging arch/x86/kernel/cpu/mcheck/mce_amd_64.c Auto-merging arch/x86/kernel/cpu/mcheck/mce_intel_64.c Auto-merging arch/x86/kernel/process.c Auto-merging arch/x86/kernel/tlb_uv.c Auto-merging drivers/pci/pci-driver.c Auto-merging kernel/sched.c Auto-merging mm/page_alloc.c Auto-merging mm/slab.c Auto-merging mm/vmscan.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 69d8bd4] Merge commit 'cpus4096/auto-cpus4096-next' $ git diff -M --stat --summary HEAD^.. arch/powerpc/include/asm/mmzone.h | 1 + arch/sparc/include/asm/mmzone.h | 2 + arch/x86/include/asm/cpumask.h | 18 -- arch/x86/include/asm/pci.h | 5 - arch/x86/include/asm/processor.h | 3 +- arch/x86/include/asm/smp.h | 13 +- arch/x86/include/asm/topology.h | 89 ++-------- arch/x86/kernel/apic/bigsmp_32.c | 16 +- arch/x86/kernel/apic/es7000_32.c | 17 +- arch/x86/kernel/apic/nmi.c | 11 +- arch/x86/kernel/apic/numaq_32.c | 11 +- arch/x86/kernel/apic/probe_32.c | 3 +- arch/x86/kernel/apic/summit_32.c | 21 +-- arch/x86/kernel/apm_32.c | 248 ++++++++++++++++----------- arch/x86/kernel/cpu/common.c | 13 +-- arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 2 +- arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 13 +- arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 2 +- arch/x86/kernel/cpu/intel_cacheinfo.c | 22 ++-- arch/x86/kernel/cpu/mcheck/mce_64.c | 10 +- arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 6 +- arch/x86/kernel/cpu/mcheck/mce_intel_64.c | 2 +- arch/x86/kernel/cpu/proc.c | 6 +- arch/x86/kernel/microcode_amd.c | 43 +++--- arch/x86/kernel/microcode_core.c | 160 ++++++++++-------- arch/x86/kernel/microcode_intel.c | 83 +++++---- arch/x86/kernel/process.c | 20 ++- arch/x86/kernel/smpboot.c | 70 +++++--- arch/x86/kernel/tlb_uv.c | 9 +- arch/x86/mm/Makefile | 2 +- arch/x86/mm/mmio-mod.c | 19 ++- arch/x86/mm/numa.c | 67 +++++++ arch/x86/mm/numa_64.c | 111 +----------- arch/x86/oprofile/op_model_p4.c | 2 +- arch/x86/xen/smp.c | 6 +- block/blk.h | 2 +- drivers/base/node.c | 2 +- drivers/char/sysrq.c | 2 +- drivers/oprofile/buffer_sync.c | 20 +-- drivers/oprofile/buffer_sync.h | 4 - drivers/oprofile/oprof.c | 9 +- drivers/pci/pci-driver.c | 3 +- drivers/xen/cpu_hotplug.c | 4 +- include/linux/gfp.h | 1 + include/linux/mmzone.h | 6 - include/linux/topology.h | 11 +- kernel/sched.c | 43 +++--- mm/page_alloc.c | 6 +- mm/quicklist.c | 2 +- mm/slab.c | 2 +- mm/vmscan.c | 6 +- net/sunrpc/svc.c | 3 +- 52 files changed, 616 insertions(+), 636 deletions(-) create mode 100644 arch/x86/mm/numa.c Merging tracing/auto-tracing-next $ git merge tracing/auto-tracing-next Resolved 'include/linux/slub_def.h' using previous resolution. Resolved 'kernel/extable.c' using previous resolution. Resolved 'mm/slob.c' using previous resolution. Resolved 'mm/slub.c' using previous resolution. Auto-merging Documentation/kernel-parameters.txt Auto-merging MAINTAINERS Auto-merging arch/Kconfig Auto-merging arch/ia64/kernel/Makefile Auto-merging arch/ia64/kernel/entry.S Auto-merging arch/parisc/kernel/irq.c Auto-merging arch/x86/Kconfig Auto-merging arch/x86/include/asm/cacheflush.h Auto-merging arch/x86/kernel/Makefile Auto-merging arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c Auto-merging arch/x86/kernel/kprobes.c Auto-merging arch/x86/kernel/process.c Auto-merging arch/x86/kernel/ptrace.c Auto-merging arch/x86/kvm/Kconfig Removing block/blktrace.c Auto-merging drivers/char/sysrq.c Auto-merging fs/libfs.c Auto-merging fs/partitions/check.c Auto-merging include/asm-generic/vmlinux.lds.h Auto-merging include/linux/fs.h Auto-merging include/linux/interrupt.h Auto-merging include/linux/kernel.h Auto-merging include/linux/sched.h Auto-merging include/linux/security.h Auto-merging include/linux/slub_def.h CONFLICT (content): Merge conflict in include/linux/slub_def.h Auto-merging init/Kconfig Auto-merging kernel/extable.c CONFLICT (content): Merge conflict in kernel/extable.c Auto-merging kernel/irq/handle.c Auto-merging kernel/lockdep.c Auto-merging kernel/module.c Auto-merging kernel/relay.c Auto-merging kernel/sched.c Auto-merging kernel/sched_clock.c Auto-merging kernel/softirq.c Auto-merging mm/memory.c Auto-merging mm/slab.c Auto-merging mm/slob.c CONFLICT (content): Merge conflict in mm/slob.c Auto-merging mm/slub.c CONFLICT (content): Merge conflict in mm/slub.c Automatic merge failed; fix conflicts and then commit the result. Applying: net: tracing interface fixup $ git commit -v -a [master a172c55] Merge commit 'tracing/auto-tracing-next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/debugfs-kmemtrace | 71 + Documentation/ftrace.txt | 1134 +++++++---- Documentation/kernel-parameters.txt | 12 + Documentation/sysrq.txt | 2 + Documentation/tracepoints.txt | 21 +- Documentation/vm/kmemtrace.txt | 126 ++ MAINTAINERS | 6 + arch/Kconfig | 1 + arch/alpha/include/asm/ftrace.h | 1 + arch/alpha/include/asm/hardirq.h | 13 - arch/avr32/include/asm/ftrace.h | 1 + arch/avr32/include/asm/hardirq.h | 11 - arch/blackfin/include/asm/ftrace.h | 1 + arch/cris/include/asm/ftrace.h | 1 + arch/h8300/include/asm/ftrace.h | 1 + arch/ia64/Kconfig | 3 + arch/ia64/include/asm/ftrace.h | 28 + arch/ia64/include/asm/hardirq.h | 10 - arch/ia64/kernel/Makefile | 5 + arch/ia64/kernel/entry.S | 100 + arch/ia64/kernel/ftrace.c | 206 ++ arch/ia64/kernel/ia64_ksyms.c | 6 + arch/m68k/include/asm/ftrace.h | 1 + arch/mips/include/asm/ftrace.h | 1 + arch/parisc/include/asm/ftrace.h | 1 + arch/um/include/asm/ftrace.h | 1 + arch/x86/Kconfig | 2 + arch/x86/include/asm/cacheflush.h | 5 + arch/x86/include/asm/fixmap.h | 2 + arch/x86/include/asm/ftrace.h | 7 + arch/x86/include/asm/ptrace-abi.h | 3 - arch/x86/include/asm/thread_info.h | 9 +- arch/x86/kernel/Makefile | 3 +- arch/x86/kernel/alternative.c | 29 +- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 4 +- arch/x86/kernel/dumpstack.c | 6 + arch/x86/kernel/ftrace.c | 192 ++- arch/x86/kernel/kprobes.c | 17 +- arch/x86/kernel/process.c | 5 +- arch/x86/kernel/ptrace.c | 7 + arch/x86/kvm/Kconfig | 3 +- arch/x86/mm/init_32.c | 35 +- arch/x86/mm/init_64.c | 37 +- arch/xtensa/include/asm/ftrace.h | 1 + block/Kconfig | 16 - block/Makefile | 1 - block/blktrace.c | 860 -------- drivers/char/sysrq.c | 2 +- drivers/oprofile/cpu_buffer.c | 5 +- fs/befs/debug.c | 1 + fs/debugfs/inode.c | 16 + fs/libfs.c | 16 + fs/partitions/check.c | 4 + fs/squashfs/export.c | 1 + include/asm-frv/ftrace.h | 1 + include/asm-generic/vmlinux.lds.h | 29 +- include/asm-m32r/ftrace.h | 1 + include/asm-mn10300/ftrace.h | 1 + include/linux/blktrace_api.h | 5 + include/linux/compiler.h | 6 +- include/linux/debugfs.h | 8 + include/linux/fdtable.h | 4 +- include/linux/fs.h | 35 +- include/linux/ftrace.h | 247 ++- include/linux/ftrace_irq.h | 2 +- include/linux/hardirq.h | 73 +- include/linux/interrupt.h | 5 + include/linux/kernel.h | 133 ++ include/linux/key.h | 1 + include/linux/memory.h | 6 + include/linux/module.h | 5 + include/linux/rcuclassic.h | 16 +- include/linux/rcupdate.h | 1 - include/linux/rcupreempt.h | 53 +- include/linux/rcutree.h | 27 +- include/linux/ring_buffer.h | 38 +- include/linux/sched.h | 4 + include/linux/security.h | 24 + include/linux/slab_def.h | 68 +- include/linux/slob_def.h | 9 +- include/linux/slub_def.h | 49 +- include/linux/syscalls.h | 60 +- include/linux/trace_clock.h | 19 + include/linux/tracepoint.h | 116 +- include/trace/block.h | 70 +- include/trace/irq.h | 9 + include/trace/irq_event_types.h | 55 + include/trace/kmemtrace.h | 63 + include/trace/lockdep.h | 9 + include/trace/lockdep_event_types.h | 44 + include/trace/power.h | 32 + include/trace/sched.h | 49 +- include/trace/sched_event_types.h | 337 +++ include/trace/skb.h | 4 +- include/trace/trace_event_types.h | 5 + include/trace/trace_events.h | 5 + include/trace/workqueue.h | 25 + init/Kconfig | 2 +- init/main.c | 5 +- kernel/extable.c | 19 +- kernel/irq/handle.c | 6 + kernel/kprobes.c | 19 +- kernel/lockdep.c | 17 + kernel/module.c | 2 +- kernel/rcuclassic.c | 23 +- kernel/rcupreempt.c | 48 +- kernel/rcutree.c | 20 + kernel/rcutree.h | 10 + kernel/rcutree_trace.c | 2 + kernel/relay.c | 4 +- kernel/sched.c | 8 +- kernel/sched_clock.c | 12 + kernel/softirq.c | 28 +- kernel/trace/Kconfig | 138 ++- kernel/trace/Makefile | 13 + kernel/trace/blktrace.c | 1515 +++++++++++++ kernel/trace/events.c | 14 + kernel/trace/ftrace.c | 1700 +++++++++++++--- kernel/trace/kmemtrace.c | 464 ++++ kernel/trace/ring_buffer.c | 692 +++++-- kernel/trace/trace.c | 3045 +++++++++++++++------------ kernel/trace/trace.h | 325 +++- kernel/trace/trace_boot.c | 36 +- kernel/trace/trace_branch.c | 278 ++-- kernel/trace/trace_clock.c | 109 + kernel/trace/trace_event_profile.c | 31 + kernel/trace/trace_event_types.h | 173 ++ kernel/trace/trace_events.c | 824 ++++++++ kernel/trace/trace_events_filter.c | 427 ++++ kernel/trace/trace_events_stage_1.h | 39 + kernel/trace/trace_events_stage_2.h | 176 ++ kernel/trace/trace_events_stage_3.h | 281 +++ kernel/trace/trace_export.c | 102 + kernel/trace/trace_functions.c | 369 ++++- kernel/trace/trace_functions_graph.c | 593 ++++-- kernel/trace/trace_hw_branches.c | 185 ++- kernel/trace/trace_irqsoff.c | 54 +- kernel/trace/trace_mmiotrace.c | 45 +- kernel/trace/trace_nop.c | 6 +- kernel/trace/trace_output.c | 1027 +++++++++ kernel/trace/trace_output.h | 72 + kernel/trace/trace_power.c | 194 +- kernel/trace/trace_printk.c | 270 +++ kernel/trace/trace_sched_switch.c | 24 +- kernel/trace/trace_sched_wakeup.c | 96 +- kernel/trace/trace_selftest.c | 169 ++- kernel/trace/trace_stack.c | 19 +- kernel/trace/trace_stat.c | 326 +++ kernel/trace/trace_stat.h | 31 + kernel/trace/trace_syscalls.c | 250 +++ kernel/trace/trace_sysprof.c | 23 +- kernel/trace/trace_workqueue.c | 288 +++ kernel/tracepoint.c | 7 +- kernel/workqueue.c | 16 +- lib/decompress_bunzip2.c | 1 + lib/decompress_inflate.c | 1 + lib/decompress_unlzma.c | 1 + mm/failslab.c | 1 + mm/memory.c | 2 + mm/slab.c | 69 +- mm/slob.c | 33 +- mm/slub.c | 77 +- mm/util.c | 16 + samples/tracepoints/tp-samples-trace.h | 8 +- samples/tracepoints/tracepoint-sample.c | 24 +- scripts/Makefile.build | 13 +- scripts/kallsyms.c | 57 + scripts/recordmcount.pl | 37 +- 168 files changed, 15451 insertions(+), 4366 deletions(-) create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace create mode 100644 Documentation/vm/kmemtrace.txt create mode 100644 arch/alpha/include/asm/ftrace.h create mode 100644 arch/avr32/include/asm/ftrace.h create mode 100644 arch/blackfin/include/asm/ftrace.h create mode 100644 arch/cris/include/asm/ftrace.h create mode 100644 arch/h8300/include/asm/ftrace.h create mode 100644 arch/ia64/include/asm/ftrace.h create mode 100644 arch/ia64/kernel/ftrace.c create mode 100644 arch/m68k/include/asm/ftrace.h create mode 100644 arch/mips/include/asm/ftrace.h create mode 100644 arch/parisc/include/asm/ftrace.h create mode 100644 arch/um/include/asm/ftrace.h create mode 100644 arch/xtensa/include/asm/ftrace.h delete mode 100644 block/blktrace.c create mode 100644 include/asm-frv/ftrace.h create mode 100644 include/asm-m32r/ftrace.h create mode 100644 include/asm-mn10300/ftrace.h create mode 100644 include/linux/trace_clock.h create mode 100644 include/trace/irq.h create mode 100644 include/trace/irq_event_types.h create mode 100644 include/trace/kmemtrace.h create mode 100644 include/trace/lockdep.h create mode 100644 include/trace/lockdep_event_types.h create mode 100644 include/trace/power.h create mode 100644 include/trace/sched_event_types.h create mode 100644 include/trace/trace_event_types.h create mode 100644 include/trace/trace_events.h create mode 100644 include/trace/workqueue.h create mode 100644 kernel/rcutree.h create mode 100644 kernel/trace/blktrace.c create mode 100644 kernel/trace/events.c create mode 100644 kernel/trace/kmemtrace.c create mode 100644 kernel/trace/trace_clock.c create mode 100644 kernel/trace/trace_event_profile.c create mode 100644 kernel/trace/trace_event_types.h create mode 100644 kernel/trace/trace_events.c create mode 100644 kernel/trace/trace_events_filter.c create mode 100644 kernel/trace/trace_events_stage_1.h create mode 100644 kernel/trace/trace_events_stage_2.h create mode 100644 kernel/trace/trace_events_stage_3.h create mode 100644 kernel/trace/trace_export.c create mode 100644 kernel/trace/trace_output.c create mode 100644 kernel/trace/trace_output.h create mode 100644 kernel/trace/trace_printk.c create mode 100644 kernel/trace/trace_stat.c create mode 100644 kernel/trace/trace_stat.h create mode 100644 kernel/trace/trace_syscalls.c create mode 100644 kernel/trace/trace_workqueue.c Merging genirq/auto-genirq-next $ git merge genirq/auto-genirq-next Already uptodate! Merge made by recursive. Merging safe-poison-pointers/auto-safe-poison-pointers-next $ git merge safe-poison-pointers/auto-safe-poison-pointers-next Auto-merging arch/x86/Kconfig Merge made by recursive. arch/x86/Kconfig | 5 +++++ include/linux/poison.h | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) Merging sched/auto-sched-next $ git merge sched/auto-sched-next Already uptodate! Merge made by recursive. Merging stackprotector/auto-stackprotector-next $ git merge stackprotector/auto-stackprotector-next Already up-to-date. Merging timers/auto-timers-next $ git merge timers/auto-timers-next Already uptodate! Merge made by recursive. Merging pci/linux-next $ git merge pci/linux-next Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. Renaming arch/x86/kernel/io_apic.c => arch/x86/kernel/apic/io_apic.c Auto-merging arch/x86/kernel/apic/io_apic.c Auto-merging Documentation/feature-removal-schedule.txt CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt Auto-merging Documentation/kernel-parameters.txt Auto-merging arch/x86/include/asm/pci.h Auto-merging arch/x86/kernel/pci-dma.c Auto-merging arch/x86/pci/fixup.c Auto-merging drivers/pci/intel-iommu.c Auto-merging drivers/pci/pci-driver.c Auto-merging drivers/pci/pci.c Auto-merging drivers/pci/pci.h Auto-merging include/linux/acpi.h Auto-merging include/linux/pci.h Auto-merging include/linux/pci_ids.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 68ac745] Merge commit 'pci/linux-next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-bus-pci | 70 +++ Documentation/DocBook/kernel-api.tmpl | 1 + Documentation/PCI/MSI-HOWTO.txt | 814 +++++++++++---------------- Documentation/PCI/pci-iov-howto.txt | 99 ++++ Documentation/feature-removal-schedule.txt | 32 ++ Documentation/filesystems/sysfs-pci.txt | 10 + Documentation/kernel-parameters.txt | 11 + arch/alpha/include/asm/pci.h | 14 + arch/alpha/kernel/Makefile | 2 +- arch/alpha/kernel/pci-sysfs.c | 366 +++++++++++++ arch/powerpc/include/asm/pci.h | 4 + arch/powerpc/kernel/msi.c | 5 + arch/x86/include/asm/pci.h | 3 + arch/x86/kernel/apic/io_apic.c | 4 + arch/x86/kernel/pci-dma.c | 3 +- arch/x86/pci/early.c | 19 +- arch/x86/pci/fixup.c | 20 - arch/x86/pci/legacy.c | 3 +- arch/x86/pci/mmconfig-shared.c | 227 ++++++-- arch/x86/pci/mmconfig_64.c | 17 +- drivers/acpi/pci_root.c | 180 ++++++- drivers/pci/Kconfig | 10 + drivers/pci/Makefile | 2 + drivers/pci/bus.c | 8 +- drivers/pci/hotplug/acpi_pcihp.c | 58 +-- drivers/pci/hotplug/fakephp.c | 444 ++++------------ drivers/pci/hotplug/pciehp.h | 13 +- drivers/pci/hotplug/pciehp_acpi.c | 21 +- drivers/pci/hotplug/pciehp_core.c | 18 +- drivers/pci/hotplug/pciehp_hpc.c | 34 +- drivers/pci/hotplug/shpchp.h | 10 +- drivers/pci/hotplug/shpchp_pci.c | 2 +- drivers/pci/intel-iommu.c | 2 +- drivers/pci/iov.c | 680 +++++++++++++++++++++++ drivers/pci/msi.c | 426 ++++++++-------- drivers/pci/msi.h | 6 - drivers/pci/pci-acpi.c | 215 -------- drivers/pci/pci-driver.c | 81 +++- drivers/pci/pci-sysfs.c | 124 ++++- drivers/pci/pci.c | 193 ++++++- drivers/pci/pci.h | 65 +++ drivers/pci/pcie/aer/aerdrv.c | 28 +- drivers/pci/pcie/aer/aerdrv_acpi.c | 2 +- drivers/pci/pcie/aer/aerdrv_core.c | 10 +- drivers/pci/pcie/portdrv.h | 14 +- drivers/pci/pcie/portdrv_bus.c | 18 +- drivers/pci/pcie/portdrv_core.c | 379 +++++++++----- drivers/pci/pcie/portdrv_pci.c | 50 +- drivers/pci/probe.c | 210 +++++--- drivers/pci/quirks.c | 221 +++++++-- drivers/pci/remove.c | 4 + drivers/pci/search.c | 2 +- drivers/pci/setup-bus.c | 7 +- drivers/pci/setup-res.c | 15 + drivers/pci/slot.c | 18 +- include/linux/acpi.h | 34 ++ include/linux/msi.h | 13 +- include/linux/pci-acpi.h | 67 +-- include/linux/pci.h | 61 ++- include/linux/pci_ids.h | 1 + include/linux/pci_regs.h | 37 ++- include/linux/pcieport_if.h | 36 +- 62 files changed, 3641 insertions(+), 1902 deletions(-) create mode 100644 Documentation/PCI/pci-iov-howto.txt create mode 100644 arch/alpha/kernel/pci-sysfs.c create mode 100644 drivers/pci/iov.c Merging quilt/device-mapper $ git merge quilt/device-mapper Removing drivers/md/dm-snap.h Merge made by recursive. drivers/md/dm-bio-list.h | 10 + drivers/md/dm-bio-record.h | 26 +++ drivers/md/dm-crypt.c | 6 +- drivers/md/dm-exception-store.c | 252 +++++++++++++++++++++++++ drivers/md/dm-exception-store.h | 58 +++++- drivers/md/dm-io.c | 5 +- drivers/md/dm-log.c | 75 ++------ drivers/md/dm-path-selector.c | 21 +-- drivers/md/dm-raid1.c | 50 +++++- drivers/md/dm-snap-persistent.c | 153 +++++++++++----- drivers/md/dm-snap-transient.c | 86 +++++++-- drivers/md/dm-snap.c | 384 ++++++++++++++++++++------------------- drivers/md/dm-snap.h | 105 ----------- drivers/md/dm-table.c | 26 ++-- drivers/md/dm-target.c | 104 +++-------- drivers/md/dm.c | 134 +++++--------- drivers/md/dm.h | 2 +- include/linux/device-mapper.h | 3 + include/linux/dm-dirty-log.h | 13 ++ 19 files changed, 893 insertions(+), 620 deletions(-) delete mode 100644 drivers/md/dm-snap.h Merging hid/for-next $ git merge hid/for-next Auto-merging Documentation/feature-removal-schedule.txt Removing drivers/hid/hid-dummy.c Merge made by recursive. Documentation/feature-removal-schedule.txt | 7 - drivers/hid/Kconfig | 40 ++- drivers/hid/Makefile | 7 +- drivers/hid/hid-a4tech.c | 2 - drivers/hid/hid-apple.c | 26 +- drivers/hid/hid-belkin.c | 2 - drivers/hid/hid-cherry.c | 2 - drivers/hid/hid-chicony.c | 2 - drivers/hid/hid-core.c | 37 ++- drivers/hid/hid-cypress.c | 2 - drivers/hid/hid-drff.c | 188 +++++++++++ drivers/hid/hid-dummy.c | 78 ----- drivers/hid/hid-ezkey.c | 2 - drivers/hid/hid-gaff.c | 2 - drivers/hid/hid-gyration.c | 2 - drivers/hid/hid-ids.h | 10 + drivers/hid/hid-kensington.c | 63 ++++ drivers/hid/hid-kye.c | 69 ++++ drivers/hid/hid-lg.c | 2 - drivers/hid/hid-microsoft.c | 2 - drivers/hid/hid-monterey.c | 2 - drivers/hid/hid-ntrig.c | 2 - drivers/hid/hid-petalynx.c | 2 - drivers/hid/hid-pl.c | 52 +++- drivers/hid/hid-samsung.c | 2 - drivers/hid/hid-sony.c | 2 - drivers/hid/hid-sunplus.c | 2 - drivers/hid/hid-tmff.c | 2 - drivers/hid/hid-topseed.c | 2 - drivers/hid/hid-zpff.c | 2 - drivers/hid/hidraw.c | 17 +- drivers/hid/usbhid/hid-core.c | 475 ++++++++++++++++++++++------ drivers/hid/usbhid/hiddev.c | 22 ++- drivers/hid/usbhid/usbhid.h | 14 +- include/linux/hid.h | 23 +- 35 files changed, 851 insertions(+), 315 deletions(-) create mode 100644 drivers/hid/hid-drff.c delete mode 100644 drivers/hid/hid-dummy.c create mode 100644 drivers/hid/hid-kensington.c create mode 100644 drivers/hid/hid-kye.c Merging quilt/i2c $ git merge quilt/i2c Auto-merging Documentation/feature-removal-schedule.txt Merge made by recursive. Documentation/feature-removal-schedule.txt | 9 +++++++++ drivers/i2c/busses/Kconfig | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Merge made by recursive. Documentation/hwmon/ds1621 | 51 +------ Documentation/{i2c/chips => hwmon}/pcf8591 | 0 Documentation/hwmon/sysfs-interface | 22 +++ Documentation/hwmon/w83627ehf | 29 +++- drivers/firmware/dmi_scan.c | 18 ++- drivers/hwmon/Kconfig | 27 +++- drivers/hwmon/Makefile | 1 + drivers/hwmon/ds1621.c | 172 ++++++++++----------- drivers/hwmon/fschmd.c | 229 +++++++++++++++++++++------- drivers/hwmon/hdaps.c | 66 ++++---- drivers/{i2c/chips => hwmon}/pcf8591.c | 24 ++-- drivers/hwmon/w83627ehf.c | 170 +++++++++++++++------ drivers/i2c/busses/i2c-i801.c | 77 ++++++++++ drivers/i2c/chips/Kconfig | 13 -- drivers/i2c/chips/Makefile | 1 - drivers/platform/x86/dell-laptop.c | 4 +- drivers/watchdog/hpwdt.c | 4 +- include/linux/dmi.h | 7 +- 18 files changed, 588 insertions(+), 327 deletions(-) rename Documentation/{i2c/chips => hwmon}/pcf8591 (100%) rename drivers/{i2c/chips => hwmon}/pcf8591.c (96%) Merging quilt/kernel-doc $ git merge quilt/kernel-doc Recorded preimage for 'Documentation/kernel-parameters.txt' Auto-merging Documentation/kernel-parameters.txt CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'Documentation/kernel-parameters.txt'. [master 7d347b7] Merge branch 'quilt/kernel-doc' $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 503 ++++++++++++++++++----------------- 1 files changed, 252 insertions(+), 251 deletions(-) Merging v4l-dvb/master $ git merge v4l-dvb/master Recorded preimage for 'drivers/media/video/cx25840/cx25840-audio.c' Recorded preimage for 'drivers/media/video/em28xx/em28xx-audio.c' Recorded preimage for 'include/linux/i2c-id.h' Renaming drivers/media/dvb/frontends/au8522.c->drivers/media/dvb/frontends/au8522_dig.c Auto-merging drivers/media/dvb/frontends/au8522_dig.c Renaming drivers/media/video/pvrusb2/pvrusb2-tuner.h->drivers/media/video/pvrusb2/pvrusb2-cs53l32a.h Auto-merging drivers/media/video/pvrusb2/pvrusb2-cs53l32a.h Auto-merging Documentation/feature-removal-schedule.txt Auto-merging MAINTAINERS Auto-merging arch/arm/mach-pxa/pcm990-baseboard.c Auto-merging arch/sh/boards/board-ap325rxa.c Auto-merging arch/sh/boards/mach-migor/setup.c Auto-merging drivers/media/dvb/firewire/firedtv-avc.c Auto-merging drivers/media/video/Kconfig Auto-merging drivers/media/video/Makefile Auto-merging drivers/media/video/cx25840/cx25840-audio.c CONFLICT (content): Merge conflict in drivers/media/video/cx25840/cx25840-audio.c Auto-merging drivers/media/video/cx25840/cx25840-core.c Auto-merging drivers/media/video/cx25840/cx25840-core.h Auto-merging drivers/media/video/em28xx/em28xx-audio.c CONFLICT (content): Merge conflict in drivers/media/video/em28xx/em28xx-audio.c Auto-merging drivers/media/video/omap24xxcam.c Auto-merging drivers/media/video/pxa_camera.c Auto-merging include/linux/Kbuild Auto-merging include/linux/i2c-id.h CONFLICT (content): Merge conflict in include/linux/i2c-id.h Auto-merging sound/pci/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/media/video/cx25840/cx25840-audio.c'. Recorded resolution for 'drivers/media/video/em28xx/em28xx-audio.c'. Recorded resolution for 'include/linux/i2c-id.h'. [master 90bd848] Merge commit 'v4l-dvb/master' $ git diff -M --stat --summary HEAD^.. drivers/media/dvb/siano/smssdio.c | 356 ++++ drivers/media/video/Kconfig | 2 + drivers/media/video/Makefile | 1 + drivers/media/video/cx231xx/Kconfig | 35 + drivers/media/video/cx231xx/Makefile | 14 + drivers/media/video/cx231xx/cx231xx-audio.c | 585 ++++++ drivers/media/video/cx231xx/cx231xx-avcore.c | 2581 ++++++++++++++++++++++++ drivers/media/video/cx231xx/cx231xx-cards.c | 919 +++++++++ drivers/media/video/cx231xx/cx231xx-conf-reg.h | 494 +++++ drivers/media/video/cx231xx/cx231xx-core.c | 1200 +++++++++++ drivers/media/video/cx231xx/cx231xx-dvb.c | 559 +++++ drivers/media/video/cx231xx/cx231xx-i2c.c | 555 +++++ drivers/media/video/cx231xx/cx231xx-input.c | 246 +++ drivers/media/video/cx231xx/cx231xx-pcb-cfg.c | 795 ++++++++ drivers/media/video/cx231xx/cx231xx-pcb-cfg.h | 231 +++ drivers/media/video/cx231xx/cx231xx-reg.h | 1564 ++++++++++++++ drivers/media/video/cx231xx/cx231xx-vbi.c | 701 +++++++ drivers/media/video/cx231xx/cx231xx-vbi.h | 65 + drivers/media/video/cx231xx/cx231xx-video.c | 2439 ++++++++++++++++++++++ drivers/media/video/cx231xx/cx231xx.h | 779 +++++++ drivers/media/video/cx25840/cx25840-audio.c | 66 +- drivers/media/video/cx25840/cx25840-core.c | 165 ++- drivers/media/video/cx25840/cx25840-core.h | 1 + drivers/media/video/cx25840/cx25840-firmware.c | 11 +- include/linux/i2c-id.h | 1 + include/linux/mmc/sdio_ids.h | 8 + linux/drivers/media/dvb/siano/smssdio.c | 354 ++++ 27 files changed, 14664 insertions(+), 63 deletions(-) create mode 100644 drivers/media/dvb/siano/smssdio.c create mode 100644 drivers/media/video/cx231xx/Kconfig create mode 100644 drivers/media/video/cx231xx/Makefile create mode 100644 drivers/media/video/cx231xx/cx231xx-audio.c create mode 100644 drivers/media/video/cx231xx/cx231xx-avcore.c create mode 100644 drivers/media/video/cx231xx/cx231xx-cards.c create mode 100644 drivers/media/video/cx231xx/cx231xx-conf-reg.h create mode 100644 drivers/media/video/cx231xx/cx231xx-core.c create mode 100644 drivers/media/video/cx231xx/cx231xx-dvb.c create mode 100644 drivers/media/video/cx231xx/cx231xx-i2c.c create mode 100644 drivers/media/video/cx231xx/cx231xx-input.c create mode 100644 drivers/media/video/cx231xx/cx231xx-pcb-cfg.c create mode 100644 drivers/media/video/cx231xx/cx231xx-pcb-cfg.h create mode 100644 drivers/media/video/cx231xx/cx231xx-reg.h create mode 100644 drivers/media/video/cx231xx/cx231xx-vbi.c create mode 100644 drivers/media/video/cx231xx/cx231xx-vbi.h create mode 100644 drivers/media/video/cx231xx/cx231xx-video.c create mode 100644 drivers/media/video/cx231xx/cx231xx.h create mode 100644 linux/drivers/media/dvb/siano/smssdio.c Merging quota/for_next $ git merge quota/for_next Recorded preimage for 'fs/reiserfs/namei.c' Recorded preimage for 'fs/reiserfs/stree.c' Resolved 'fs/Kconfig' using previous resolution. Resolved 'fs/quota/dquot.c' using previous resolution. Renaming fs/dquot.c->fs/quota/dquot.c Auto-merging fs/quota/dquot.c CONFLICT (content): merge conflict in fs/quota/dquot.c Renaming fs/quota.c->fs/quota/quota.c Auto-merging fs/quota/quota.c Renaming fs/quota_tree.c->fs/quota/quota_tree.c Auto-merging fs/quota/quota_tree.c Renaming fs/quota_v1.c->fs/quota/quota_v1.c Auto-merging fs/quota/quota_v1.c Renaming fs/quota_v2.c->fs/quota/quota_v2.c Auto-merging fs/quota/quota_v2.c Auto-merging fs/Kconfig CONFLICT (content): Merge conflict in fs/Kconfig Auto-merging fs/Makefile Auto-merging fs/ext2/super.c Auto-merging fs/ext3/inode.c Auto-merging fs/ext3/namei.c Auto-merging fs/ext3/super.c Auto-merging fs/ext4/balloc.c Auto-merging fs/ext4/ext4.h Auto-merging fs/ext4/ialloc.c Auto-merging fs/ext4/inode.c Auto-merging fs/ext4/mballoc.c Auto-merging fs/ext4/namei.c Auto-merging fs/ext4/super.c Auto-merging fs/inode.c Auto-merging fs/jfs/jfs_extent.c Auto-merging fs/jfs/jfs_xtree.c Auto-merging fs/jfs/namei.c Auto-merging fs/namei.c Auto-merging fs/nfsd/vfs.c Auto-merging fs/ocfs2/quota_global.c Auto-merging fs/ramfs/file-nommu.c Auto-merging fs/reiserfs/bitmap.c Auto-merging fs/reiserfs/inode.c Auto-merging fs/reiserfs/namei.c CONFLICT (content): Merge conflict in fs/reiserfs/namei.c Auto-merging fs/reiserfs/stree.c CONFLICT (content): Merge conflict in fs/reiserfs/stree.c Auto-merging fs/reiserfs/super.c Auto-merging fs/super.c Auto-merging fs/sync.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'fs/reiserfs/namei.c'. Recorded resolution for 'fs/reiserfs/stree.c'. [master cf23c54] Merge commit 'quota/for_next' $ git diff -M --stat --summary HEAD^.. Merging jfs/next $ git merge jfs/next Already up-to-date. Merging kbuild/master $ git merge kbuild/master Already up-to-date. Merging quilt/ide $ git merge quilt/ide Auto-merging MAINTAINERS Removing drivers/ide/ide_arm.c Merge made by recursive. CREDITS | 9 + MAINTAINERS | 15 +- drivers/ide/Kconfig | 33 +-- drivers/ide/Makefile | 2 - drivers/ide/alim15x3.c | 10 +- drivers/ide/at91_ide.c | 36 +-- drivers/ide/au1xxx-ide.c | 26 +-- drivers/ide/cmd64x.c | 6 - drivers/ide/cs5530.c | 3 +- drivers/ide/cs5536.c | 1 - drivers/ide/falconide.c | 4 +- drivers/ide/gayle.c | 12 +- drivers/ide/hpt366.c | 10 +- drivers/ide/ht6560b.c | 20 ++- drivers/ide/icside.c | 8 - drivers/ide/ide-atapi.c | 160 ++++--------- drivers/ide/ide-cd.c | 525 +++++++++++++--------------------------- drivers/ide/ide-disk.c | 4 +- drivers/ide/ide-dma-sff.c | 17 +- drivers/ide/ide-dma.c | 118 ++++++---- drivers/ide/ide-eh.c | 14 +- drivers/ide/ide-floppy.c | 29 +-- drivers/ide/ide-floppy_ioctl.c | 5 +- drivers/ide/ide-generic.c | 86 +------ drivers/ide/ide-h8300.c | 34 +-- drivers/ide/ide-io-std.c | 130 ++++------ drivers/ide/ide-io.c | 27 ++- drivers/ide/ide-iops.c | 41 ++-- drivers/ide/ide-pm.c | 5 +- drivers/ide/ide-probe.c | 31 +-- drivers/ide/ide-tape.c | 36 ++-- drivers/ide/ide-taskfile.c | 96 ++++---- drivers/ide/ide-timings.c | 12 +- drivers/ide/ide-xfer-mode.c | 15 +- drivers/ide/ide_arm.c | 53 ---- drivers/ide/it821x.c | 3 +- drivers/ide/ns87415.c | 85 ++++---- drivers/ide/pdc202xx_old.c | 10 +- drivers/ide/pmac.c | 101 ++++---- drivers/ide/q40ide.c | 4 +- drivers/ide/qd65xx.c | 21 ++- drivers/ide/sc1200.c | 7 +- drivers/ide/scc_pata.c | 56 ++--- drivers/ide/sgiioc4.c | 24 +-- drivers/ide/siimage.c | 1 - drivers/ide/sl82c105.c | 10 +- drivers/ide/tc86c001.c | 1 - drivers/ide/trm290.c | 57 +++-- drivers/ide/tx4938ide.c | 41 +--- drivers/ide/tx4939ide.c | 61 ++---- include/linux/ide.h | 56 ++--- 51 files changed, 840 insertions(+), 1331 deletions(-) delete mode 100644 drivers/ide/ide_arm.c Merging libata/NEXT $ git merge libata/NEXT Already up-to-date. Merging nfs/linux-next $ git merge nfs/linux-next Auto-merging include/linux/fs.h Auto-merging init/Kconfig Auto-merging kernel/Makefile Auto-merging kernel/sysctl.c Auto-merging mm/vmscan.c Auto-merging net/sunrpc/svc.c Merge made by recursive. Documentation/filesystems/caching/backend-api.txt | 658 ++++++++++++++++ Documentation/filesystems/caching/cachefiles.txt | 501 ++++++++++++ Documentation/filesystems/caching/fscache.txt | 333 ++++++++ Documentation/filesystems/caching/netfs-api.txt | 800 +++++++++++++++++++ Documentation/filesystems/caching/object.txt | 313 ++++++++ Documentation/filesystems/caching/operations.txt | 213 +++++ Documentation/slow-work.txt | 174 +++++ fs/Kconfig | 7 + fs/Makefile | 2 + fs/afs/Kconfig | 8 + fs/afs/Makefile | 3 + fs/afs/cache.c | 503 ++++++++----- fs/afs/cache.h | 15 +- fs/afs/cell.c | 16 +- fs/afs/file.c | 220 ++++-- fs/afs/inode.c | 31 +- fs/afs/internal.h | 53 +- fs/afs/main.c | 27 +- fs/afs/mntpt.c | 4 +- fs/afs/vlocation.c | 25 +- fs/afs/volume.c | 14 +- fs/afs/write.c | 21 + fs/cachefiles/Kconfig | 39 + fs/cachefiles/Makefile | 18 + fs/cachefiles/cf-bind.c | 286 +++++++ fs/cachefiles/cf-daemon.c | 754 ++++++++++++++++++ fs/cachefiles/cf-interface.c | 449 +++++++++++ fs/cachefiles/cf-internal.h | 360 +++++++++ fs/cachefiles/cf-key.c | 159 ++++ fs/cachefiles/cf-main.c | 106 +++ fs/cachefiles/cf-namei.c | 772 +++++++++++++++++++ fs/cachefiles/cf-proc.c | 134 ++++ fs/cachefiles/cf-rdwr.c | 853 +++++++++++++++++++++ fs/cachefiles/cf-security.c | 116 +++ fs/cachefiles/cf-xattr.c | 291 +++++++ fs/ext2/inode.c | 2 + fs/ext3/inode.c | 9 +- fs/fscache/Kconfig | 56 ++ fs/fscache/Makefile | 19 + fs/fscache/fsc-cache.c | 415 ++++++++++ fs/fscache/fsc-cookie.c | 498 ++++++++++++ fs/fscache/fsc-fsdef.c | 144 ++++ fs/fscache/fsc-histogram.c | 109 +++ fs/fscache/fsc-internal.h | 380 +++++++++ fs/fscache/fsc-main.c | 124 +++ fs/fscache/fsc-netfs.c | 103 +++ fs/fscache/fsc-object.c | 810 +++++++++++++++++++ fs/fscache/fsc-operation.c | 459 +++++++++++ fs/fscache/fsc-page.c | 771 +++++++++++++++++++ fs/fscache/fsc-proc.c | 68 ++ fs/fscache/fsc-stats.c | 212 +++++ fs/lockd/clntlock.c | 51 +-- fs/lockd/svc.c | 42 +- fs/namei.c | 75 ++- fs/namespace.c | 56 ++- fs/nfs/Kconfig | 8 + fs/nfs/Makefile | 1 + fs/nfs/callback.c | 31 +- fs/nfs/callback.h | 1 + fs/nfs/client.c | 130 ++-- fs/nfs/dir.c | 9 +- fs/nfs/file.c | 69 ++- fs/nfs/fscache-index.c | 337 ++++++++ fs/nfs/fscache.c | 521 +++++++++++++ fs/nfs/fscache.h | 208 +++++ fs/nfs/getroot.c | 4 +- fs/nfs/inode.c | 323 ++++++--- fs/nfs/internal.h | 8 + fs/nfs/iostat.h | 18 + fs/nfs/namespace.c | 5 + fs/nfs/nfs2xdr.c | 9 +- fs/nfs/nfs3proc.c | 1 + fs/nfs/nfs3xdr.c | 37 +- fs/nfs/nfs4proc.c | 47 +- fs/nfs/nfs4state.c | 10 +- fs/nfs/nfs4xdr.c | 213 ++++-- fs/nfs/pagelist.c | 11 - fs/nfs/proc.c | 1 + fs/nfs/read.c | 27 +- fs/nfs/super.c | 239 ++++++- fs/nfs/write.c | 53 +- fs/nfsd/nfsctl.c | 6 +- fs/nfsd/nfssvc.c | 5 +- fs/splice.c | 3 +- fs/super.c | 1 + include/linux/fs.h | 7 + include/linux/fscache-cache.h | 504 ++++++++++++ include/linux/fscache.h | 592 ++++++++++++++ include/linux/mnt_namespace.h | 2 + include/linux/namei.h | 2 + include/linux/nfs_fs.h | 17 +- include/linux/nfs_fs_sb.h | 16 + include/linux/nfs_iostat.h | 12 + include/linux/nfs_xdr.h | 59 ++- include/linux/nsproxy.h | 1 + include/linux/page-flags.h | 43 +- include/linux/pagemap.h | 21 + include/linux/slow-work.h | 95 +++ include/linux/sunrpc/svc.h | 9 +- include/linux/sunrpc/svc_xprt.h | 52 +- include/linux/sunrpc/xprt.h | 2 + init/Kconfig | 12 + kernel/Makefile | 1 + kernel/nsproxy.c | 11 + kernel/slow-work.c | 640 ++++++++++++++++ kernel/sysctl.c | 9 + mm/filemap.c | 99 +++ mm/migrate.c | 10 +- mm/readahead.c | 40 +- mm/swap.c | 4 +- mm/truncate.c | 10 +- mm/vmscan.c | 6 +- net/sunrpc/Kconfig | 22 - net/sunrpc/clnt.c | 48 +- net/sunrpc/rpcb_clnt.c | 103 ++- net/sunrpc/svc.c | 158 ++-- net/sunrpc/svc_xprt.c | 31 +- net/sunrpc/svcsock.c | 14 +- net/sunrpc/xprt.c | 89 ++- net/sunrpc/xprtrdma/rpc_rdma.c | 26 +- net/sunrpc/xprtrdma/svc_rdma_sendto.c | 8 +- net/sunrpc/xprtsock.c | 363 ++++++---- security/security.c | 2 + 123 files changed, 16899 insertions(+), 1258 deletions(-) create mode 100644 Documentation/filesystems/caching/backend-api.txt create mode 100644 Documentation/filesystems/caching/cachefiles.txt create mode 100644 Documentation/filesystems/caching/fscache.txt create mode 100644 Documentation/filesystems/caching/netfs-api.txt create mode 100644 Documentation/filesystems/caching/object.txt create mode 100644 Documentation/filesystems/caching/operations.txt create mode 100644 Documentation/slow-work.txt create mode 100644 fs/cachefiles/Kconfig create mode 100644 fs/cachefiles/Makefile create mode 100644 fs/cachefiles/cf-bind.c create mode 100644 fs/cachefiles/cf-daemon.c create mode 100644 fs/cachefiles/cf-interface.c create mode 100644 fs/cachefiles/cf-internal.h create mode 100644 fs/cachefiles/cf-key.c create mode 100644 fs/cachefiles/cf-main.c create mode 100644 fs/cachefiles/cf-namei.c create mode 100644 fs/cachefiles/cf-proc.c create mode 100644 fs/cachefiles/cf-rdwr.c create mode 100644 fs/cachefiles/cf-security.c create mode 100644 fs/cachefiles/cf-xattr.c create mode 100644 fs/fscache/Kconfig create mode 100644 fs/fscache/Makefile create mode 100644 fs/fscache/fsc-cache.c create mode 100644 fs/fscache/fsc-cookie.c create mode 100644 fs/fscache/fsc-fsdef.c create mode 100644 fs/fscache/fsc-histogram.c create mode 100644 fs/fscache/fsc-internal.h create mode 100644 fs/fscache/fsc-main.c create mode 100644 fs/fscache/fsc-netfs.c create mode 100644 fs/fscache/fsc-object.c create mode 100644 fs/fscache/fsc-operation.c create mode 100644 fs/fscache/fsc-page.c create mode 100644 fs/fscache/fsc-proc.c create mode 100644 fs/fscache/fsc-stats.c create mode 100644 fs/nfs/fscache-index.c create mode 100644 fs/nfs/fscache.c create mode 100644 fs/nfs/fscache.h create mode 100644 include/linux/fscache-cache.h create mode 100644 include/linux/fscache.h create mode 100644 include/linux/slow-work.h create mode 100644 kernel/slow-work.c Merging xfs/master $ git merge xfs/master Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 3 +- fs/xfs/Makefile | 1 + fs/xfs/linux-2.6/xfs_ioctl.c | 117 +++++------- fs/xfs/linux-2.6/xfs_iops.c | 30 +-- fs/xfs/linux-2.6/xfs_linux.h | 11 - fs/xfs/linux-2.6/xfs_quotaops.c | 157 +++++++++++++++ fs/xfs/linux-2.6/xfs_super.c | 113 ++++------- fs/xfs/linux-2.6/xfs_super.h | 1 + fs/xfs/linux-2.6/xfs_sync.h | 1 + fs/xfs/linux-2.6/xfs_vnode.h | 32 --- fs/xfs/quota/xfs_dquot.c | 28 ++-- fs/xfs/quota/xfs_dquot.h | 14 +-- fs/xfs/quota/xfs_qm.c | 208 ++++++-------------- fs/xfs/quota/xfs_qm.h | 20 +- fs/xfs/quota/xfs_qm_bhv.c | 1 - fs/xfs/quota/xfs_qm_syscalls.c | 188 +----------------- fs/xfs/quota/xfs_quota_priv.h | 38 ++--- fs/xfs/quota/xfs_trans_dquot.c | 16 +- fs/xfs/support/debug.c | 1 + fs/xfs/xfs_ag.h | 4 +- fs/xfs/xfs_alloc.c | 26 ++- fs/xfs/xfs_alloc.h | 6 + fs/xfs/xfs_attr_leaf.c | 55 +++--- fs/xfs/xfs_bmap.c | 14 +- fs/xfs/xfs_da_btree.c | 2 +- fs/xfs/xfs_da_btree.h | 7 +- fs/xfs/xfs_dfrag.c | 68 ++++---- fs/xfs/xfs_dir2.c | 2 - fs/xfs/xfs_dir2_leaf.c | 2 +- fs/xfs/xfs_extfree_item.h | 6 - fs/xfs/xfs_filestream.c | 9 +- fs/xfs/xfs_ialloc.c | 10 +- fs/xfs/xfs_ialloc_btree.h | 22 +-- fs/xfs/xfs_inode_item.h | 2 - fs/xfs/xfs_itable.c | 7 +- fs/xfs/xfs_log.c | 57 +----- fs/xfs/xfs_log.h | 3 +- fs/xfs/xfs_log_priv.h | 3 +- fs/xfs/xfs_log_recover.c | 308 +++++++++++++++++------------- fs/xfs/xfs_mount.c | 89 ++++----- fs/xfs/xfs_mount.h | 9 +- fs/xfs/xfs_qmops.c | 1 - fs/xfs/xfs_quota.h | 3 +- fs/xfs/xfs_rtalloc.c | 10 + fs/xfs/xfs_rtalloc.h | 4 + fs/xfs/xfs_trans.h | 12 +- fs/xfs/xfs_trans_space.h | 2 +- fs/xfs/xfs_types.h | 8 - fs/xfs/xfs_vnodeops.c | 406 +++++++++------------------------------ fs/xfs/xfs_vnodeops.h | 3 - 50 files changed, 830 insertions(+), 1310 deletions(-) create mode 100644 fs/xfs/linux-2.6/xfs_quotaops.c Merging infiniband/for-next $ git merge infiniband/for-next Merge made by recursive. drivers/infiniband/hw/cxgb3/cxio_hal.c | 10 ++-- drivers/infiniband/hw/cxgb3/cxio_hal.h | 6 ++ drivers/infiniband/hw/cxgb3/iwch.c | 11 +++- drivers/infiniband/hw/cxgb3/iwch.h | 5 ++ drivers/infiniband/hw/cxgb3/iwch_cm.c | 116 ++++++++++++++++++++++---------- drivers/infiniband/hw/cxgb3/iwch_cm.h | 3 +- drivers/infiniband/hw/cxgb3/iwch_qp.c | 4 +- drivers/infiniband/hw/mlx4/main.c | 3 +- 8 files changed, 110 insertions(+), 48 deletions(-) Merging acpi/test $ git merge acpi/test Resolved 'arch/x86/kernel/cpu/cpufreq/longhaul.c' using previous resolution. Auto-merging arch/x86/kernel/acpi/boot.c Auto-merging arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c Auto-merging arch/x86/kernel/cpu/cpufreq/longhaul.c CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/longhaul.c Auto-merging arch/x86/kernel/reboot.c Auto-merging arch/x86/mm/srat_64.c Auto-merging drivers/acpi/acpica/tbxface.c Auto-merging drivers/acpi/osl.c Auto-merging drivers/acpi/processor_perflib.c Auto-merging drivers/acpi/tables.c Auto-merging drivers/gpu/drm/i915/i915_dma.c Auto-merging drivers/gpu/drm/i915/i915_drv.c Auto-merging drivers/gpu/drm/i915/i915_drv.h Auto-merging drivers/pci/pci-acpi.c Auto-merging drivers/platform/x86/sony-laptop.c Auto-merging include/acpi/acpiosxf.h Auto-merging include/acpi/acpixf.h Auto-merging include/linux/acpi.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master e4fad0f] Merge commit 'acpi/test' $ git diff -M --stat --summary HEAD^.. arch/x86/kernel/acpi/boot.c | 54 +++- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 12 + arch/x86/kernel/cpu/cpufreq/longhaul.c | 6 +- arch/x86/kernel/reboot.c | 2 +- arch/x86/mm/srat_64.c | 30 ++ drivers/acpi/Kconfig | 150 +++++---- drivers/acpi/Makefile | 8 +- drivers/acpi/acpica/Makefile | 4 +- drivers/acpi/acpica/acglobal.h | 11 +- drivers/acpi/acpica/achware.h | 12 +- drivers/acpi/acpica/aclocal.h | 60 +++- drivers/acpi/acpica/acmacros.h | 4 - drivers/acpi/acpica/acobject.h | 1 - drivers/acpi/acpica/acpredef.h | 41 ++- drivers/acpi/acpica/actables.h | 9 +- drivers/acpi/acpica/acutils.h | 15 + drivers/acpi/acpica/dsinit.c | 16 +- drivers/acpi/acpica/dsmthdat.c | 2 +- drivers/acpi/acpica/dsobject.c | 6 +- drivers/acpi/acpica/dsopcode.c | 32 +-- drivers/acpi/acpica/dsutils.c | 2 +- drivers/acpi/acpica/dswexec.c | 5 +- drivers/acpi/acpica/evevent.c | 18 +- drivers/acpi/acpica/evgpe.c | 7 +- drivers/acpi/acpica/evgpeblk.c | 70 ++-- drivers/acpi/acpica/evmisc.c | 16 +- drivers/acpi/acpica/evregion.c | 5 +- drivers/acpi/acpica/evrgnini.c | 22 +- drivers/acpi/acpica/evxface.c | 3 +- drivers/acpi/acpica/evxfevnt.c | 24 +- drivers/acpi/acpica/evxfregn.c | 3 +- drivers/acpi/acpica/exconfig.c | 17 +- drivers/acpi/acpica/exconvrt.c | 11 +- drivers/acpi/acpica/exdump.c | 59 +--- drivers/acpi/acpica/exfield.c | 29 +- drivers/acpi/acpica/exfldio.c | 14 +- drivers/acpi/acpica/exmisc.c | 14 +- drivers/acpi/acpica/exoparg1.c | 13 +- drivers/acpi/acpica/exoparg2.c | 2 +- drivers/acpi/acpica/exoparg3.c | 7 +- drivers/acpi/acpica/exprep.c | 2 +- drivers/acpi/acpica/exregion.c | 4 +- drivers/acpi/acpica/exresnte.c | 8 +- drivers/acpi/acpica/exresolv.c | 9 +- drivers/acpi/acpica/exresop.c | 23 +- drivers/acpi/acpica/exstore.c | 18 +- drivers/acpi/acpica/exstoren.c | 29 +- drivers/acpi/acpica/exutils.c | 2 +- drivers/acpi/acpica/hwacpi.c | 9 +- drivers/acpi/acpica/hwgpe.c | 21 +- drivers/acpi/acpica/hwregs.c | 322 ++++++++++++----- drivers/acpi/acpica/hwsleep.c | 130 ++++---- drivers/acpi/acpica/hwvalid.c | 258 +++++++++++++ drivers/acpi/acpica/hwxface.c | 279 ++++++--------- drivers/acpi/acpica/nsaccess.c | 54 ++-- drivers/acpi/acpica/nsalloc.c | 24 +- drivers/acpi/acpica/nsdump.c | 24 +- drivers/acpi/acpica/nseval.c | 2 +- drivers/acpi/acpica/nsinit.c | 19 +- drivers/acpi/acpica/nsload.c | 4 +- drivers/acpi/acpica/nsobject.c | 18 +- drivers/acpi/acpica/nsparse.c | 10 +- drivers/acpi/acpica/nspredef.c | 38 ++- drivers/acpi/acpica/nssearch.c | 14 +- drivers/acpi/acpica/nsutils.c | 27 +- drivers/acpi/acpica/nswalk.c | 12 +- drivers/acpi/acpica/nsxfeval.c | 36 ++- drivers/acpi/acpica/rscalc.c | 7 +- drivers/acpi/acpica/rscreate.c | 15 +- drivers/acpi/acpica/tbfadt.c | 363 +++++++++++-------- drivers/acpi/acpica/tbinstal.c | 82 ++++- drivers/acpi/acpica/tbutils.c | 106 ++++-- drivers/acpi/acpica/tbxface.c | 71 +--- drivers/acpi/acpica/tbxfroot.c | 4 +- drivers/acpi/acpica/utcopy.c | 30 +- drivers/acpi/acpica/utdelete.c | 6 +- drivers/acpi/acpica/uteval.c | 98 ++++-- drivers/acpi/acpica/utglobal.c | 17 +- drivers/acpi/acpica/utlock.c | 175 +++++++++ drivers/acpi/acpica/utmisc.c | 3 +- drivers/acpi/acpica/utmutex.c | 23 +- drivers/acpi/acpica/utobject.c | 11 +- drivers/acpi/battery.c | 12 +- drivers/acpi/bus.c | 15 + drivers/acpi/debug.c | 14 +- drivers/acpi/ec.c | 7 +- drivers/acpi/fan.c | 20 +- drivers/acpi/glue.c | 6 +- drivers/acpi/internal.h | 43 +++ drivers/acpi/numa.c | 44 +++ drivers/acpi/osl.c | 92 ++++-- drivers/acpi/pci_irq.c | 2 +- drivers/acpi/pci_link.c | 147 +++----- drivers/acpi/power.c | 8 +- drivers/acpi/proc.c | 7 +- drivers/acpi/processor_core.c | 26 ++ drivers/acpi/processor_idle.c | 73 ++--- drivers/acpi/processor_perflib.c | 46 ++-- drivers/acpi/processor_thermal.c | 20 +- drivers/acpi/processor_throttling.c | 6 +- drivers/acpi/sbs.c | 27 +- drivers/acpi/scan.c | 23 +- drivers/acpi/sleep.c | 22 ++- drivers/acpi/system.c | 60 +++- drivers/acpi/tables.c | 24 ++ drivers/acpi/thermal.c | 539 +++++----------------------- drivers/acpi/video.c | 301 ++++++++++++---- drivers/acpi/video_detect.c | 3 + drivers/acpi/wakeup.c | 9 +- drivers/gpu/drm/i915/i915_dma.c | 5 +- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/i915_opregion.c | 65 ++++- drivers/pci/pci-acpi.c | 4 +- drivers/platform/x86/hp-wmi.c | 25 ++ drivers/platform/x86/intel_menlow.c | 29 +- drivers/platform/x86/sony-laptop.c | 514 ++++++++++++++++++++------- drivers/platform/x86/tc1100-wmi.c | 7 +- drivers/power/power_supply_sysfs.c | 2 + drivers/thermal/thermal_sys.c | 356 ++++++++++++++++++- include/acpi/acexcep.h | 6 +- include/acpi/acpi_bus.h | 16 - include/acpi/acpi_drivers.h | 23 -- include/acpi/acpiosxf.h | 4 - include/acpi/acpixf.h | 16 +- include/acpi/actbl.h | 74 ++-- include/acpi/actypes.h | 18 +- include/acpi/video.h | 11 + include/linux/acpi.h | 1 + include/linux/power_supply.h | 2 + include/linux/sonypi.h | 8 + include/linux/thermal.h | 48 ++- 132 files changed, 3744 insertions(+), 2315 deletions(-) create mode 100644 drivers/acpi/acpica/hwvalid.c create mode 100644 drivers/acpi/acpica/utlock.c create mode 100644 drivers/acpi/internal.h create mode 100644 include/acpi/video.h Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Auto-merging fs/nfsd/nfsctl.c Auto-merging fs/nfsd/nfssvc.c Auto-merging fs/nfsd/vfs.c Auto-merging include/linux/sunrpc/svc.h Auto-merging include/linux/sunrpc/svc_xprt.h Auto-merging include/linux/sunrpc/xprt.h Auto-merging net/sunrpc/clnt.c Auto-merging net/sunrpc/svc.c Auto-merging net/sunrpc/svc_xprt.c Auto-merging net/sunrpc/svcsock.c Auto-merging net/sunrpc/xprt.c Auto-merging net/sunrpc/xprtsock.c Merge made by recursive. Documentation/filesystems/knfsd-stats.txt | 159 ++++ Documentation/filesystems/nfs41-server.txt | 148 ++++ fs/lockd/svclock.c | 13 +- fs/nfsd/Kconfig | 10 + fs/nfsd/nfs3proc.c | 10 +- fs/nfsd/nfs4callback.c | 312 +++++++- fs/nfsd/nfs4proc.c | 239 ++++-- fs/nfsd/nfs4recover.c | 74 +- fs/nfsd/nfs4state.c | 1229 ++++++++++++++++++++++++---- fs/nfsd/nfs4xdr.c | 653 ++++++++++++++- fs/nfsd/nfsctl.c | 12 + fs/nfsd/nfsproc.c | 3 +- fs/nfsd/nfssvc.c | 64 +- fs/nfsd/vfs.c | 37 +- include/linux/lockd/xdr.h | 12 +- include/linux/lockd/xdr4.h | 10 +- include/linux/nfs.h | 1 - include/linux/nfs4.h | 138 +++- include/linux/nfsd/cache.h | 5 + include/linux/nfsd/nfsd.h | 246 ++++-- include/linux/nfsd/nfsfh.h | 7 + include/linux/nfsd/state.h | 93 ++- include/linux/nfsd/stats.h | 9 +- include/linux/nfsd/xdr4.h | 133 +++- include/linux/sunrpc/clnt.h | 1 + include/linux/sunrpc/svc.h | 18 + include/linux/sunrpc/svcsock.h | 1 + include/linux/sunrpc/xdr.h | 42 +- include/linux/sunrpc/xprt.h | 4 + net/sunrpc/clnt.c | 1 + net/sunrpc/svc.c | 3 +- net/sunrpc/svc_xprt.c | 127 +++- net/sunrpc/svcsock.c | 116 ++- net/sunrpc/xprt.c | 41 +- net/sunrpc/xprtsock.c | 286 +++++++- 35 files changed, 3684 insertions(+), 573 deletions(-) create mode 100644 Documentation/filesystems/knfsd-stats.txt create mode 100644 Documentation/filesystems/nfs41-server.txt Merging ieee1394/for-next $ git merge ieee1394/for-next Already up-to-date. Merging ubi/linux-next $ git merge ubi/linux-next Merge made by recursive. drivers/mtd/ubi/cdev.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) Merging kvm/master $ git merge kvm/master Auto-merging arch/ia64/kvm/kvm-ia64.c Auto-merging arch/ia64/kvm/vcpu.c Auto-merging arch/ia64/kvm/vtlb.c Auto-merging arch/x86/kernel/kvm.c Merge made by recursive. arch/ia64/include/asm/kvm_host.h | 5 +- arch/ia64/include/asm/pgtable.h | 2 + arch/ia64/kvm/kvm-ia64.c | 159 +++++++--- arch/ia64/kvm/kvm_fw.c | 28 ++- arch/ia64/kvm/lapic.h | 6 +- arch/ia64/kvm/optvfault.S | 30 ++ arch/ia64/kvm/process.c | 5 + arch/ia64/kvm/vcpu.c | 20 +- arch/ia64/kvm/vmm.c | 12 +- arch/ia64/kvm/vmm_ivt.S | 18 +- arch/ia64/kvm/vtlb.c | 3 +- arch/powerpc/kvm/powerpc.c | 6 + arch/s390/kvm/interrupt.c | 6 + arch/x86/include/asm/kvm.h | 1 + arch/x86/include/asm/kvm_host.h | 4 +- arch/x86/kernel/kvm.c | 4 + arch/x86/kvm/Makefile | 2 +- arch/x86/kvm/i8254.c | 95 +++--- arch/x86/kvm/i8254.h | 12 +- arch/x86/kvm/kvm_timer.h | 18 + arch/x86/kvm/lapic.c | 251 +++++---------- arch/x86/kvm/lapic.h | 12 +- arch/x86/kvm/mmu.c | 8 - arch/x86/kvm/paging_tmpl.h | 3 +- arch/x86/kvm/svm.c | 43 +-- arch/x86/kvm/timer.c | 46 +++ arch/x86/kvm/vmx.c | 205 +++++++------ arch/x86/kvm/x86.c | 72 +++-- arch/x86/kvm/x86.h | 18 + include/linux/kvm.h | 40 +++- include/linux/kvm_host.h | 20 +- include/linux/kvm_types.h | 27 ++ virt/kvm/ioapic.c | 153 ++-------- virt/kvm/ioapic.h | 27 +-- virt/kvm/irq_comm.c | 109 ++++--- virt/kvm/kvm_main.c | 642 +++++++++++++++++++++++++++----------- 36 files changed, 1280 insertions(+), 832 deletions(-) create mode 100644 arch/x86/kvm/kvm_timer.h create mode 100644 arch/x86/kvm/timer.c Merging dlm/next $ git merge dlm/next Already up-to-date. Merging scsi/master $ git merge scsi/master Already up-to-date. Merging ocfs2/linux-next $ git merge ocfs2/linux-next Merge made by recursive. fs/ocfs2/alloc.c | 57 + fs/ocfs2/alloc.h | 3 + fs/ocfs2/aops.c | 23 +- fs/ocfs2/cluster/heartbeat.c | 96 ++- fs/ocfs2/cluster/heartbeat.h | 3 +- fs/ocfs2/cluster/nodemanager.c | 9 +- fs/ocfs2/dir.c | 2806 ++++++++++++++++++++++++++++++++++++++-- fs/ocfs2/dir.h | 57 +- fs/ocfs2/dlm/dlmcommon.h | 58 +- fs/ocfs2/dlm/dlmdebug.c | 87 +- fs/ocfs2/dlm/dlmdomain.c | 29 +- fs/ocfs2/dlm/dlmmaster.c | 387 +++--- fs/ocfs2/dlm/dlmthread.c | 20 +- fs/ocfs2/dlmglue.c | 46 + fs/ocfs2/dlmglue.h | 2 + fs/ocfs2/export.c | 84 ++- fs/ocfs2/inode.c | 48 +- fs/ocfs2/inode.h | 5 + fs/ocfs2/journal.c | 173 +++- fs/ocfs2/journal.h | 77 +- fs/ocfs2/localalloc.c | 86 -- fs/ocfs2/namei.c | 250 ++-- fs/ocfs2/ocfs2.h | 76 +- fs/ocfs2/ocfs2_fs.h | 136 ++- fs/ocfs2/ocfs2_lockid.h | 4 + fs/ocfs2/suballoc.c | 254 ++++- fs/ocfs2/suballoc.h | 4 + fs/ocfs2/super.c | 188 +++ fs/ocfs2/xattr.c | 8 +- fs/ocfs2/xattr.h | 2 +- 30 files changed, 4389 insertions(+), 689 deletions(-) Merging ext4/next $ git merge ext4/next Merge made by recursive. Documentation/filesystems/ext4.txt | 30 +++- fs/ext4/balloc.c | 14 +- fs/ext4/dir.c | 16 +- fs/ext4/ext4.h | 91 ++++---- fs/ext4/ext4_extents.h | 1 + fs/ext4/ext4_i.h | 6 +- fs/ext4/ext4_sb.h | 14 +- fs/ext4/extents.c | 127 ++++++++++-- fs/ext4/file.c | 7 +- fs/ext4/ialloc.c | 273 ++++++++++++++++------- fs/ext4/inode.c | 422 ++++++++++++++++++++++-------------- fs/ext4/ioctl.c | 17 ++- fs/ext4/mballoc.c | 158 +++++--------- fs/ext4/mballoc.h | 8 +- fs/ext4/namei.c | 164 +++++++++----- fs/ext4/resize.c | 8 +- fs/ext4/super.c | 327 ++++++++++++++++++++++------ fs/jbd2/commit.c | 5 +- fs/jbd2/revoke.c | 24 ++- fs/jbd2/transaction.c | 2 + include/linux/jbd2.h | 6 + 21 files changed, 1141 insertions(+), 579 deletions(-) Merging async_tx/next $ git merge async_tx/next Auto-merging drivers/dma/dw_dmac.c Auto-merging drivers/dma/ipu/ipu_idmac.c Merge made by recursive. crypto/async_tx/async_tx.c | 6 +- crypto/async_tx/async_xor.c | 7 +- drivers/dma/Kconfig | 11 ++ drivers/dma/dmaengine.c | 60 +++++++-- drivers/dma/dmatest.c | 307 ++++++++++++++++++++++++++++++------------- drivers/dma/dw_dmac.c | 1 - drivers/dma/fsldma.c | 1 - drivers/dma/ioat_dma.c | 1 - drivers/dma/iop-adma.c | 1 - drivers/dma/ipu/ipu_idmac.c | 308 ++++++++++++++++++++++++++++--------------- drivers/dma/ipu/ipu_irq.c | 2 +- drivers/dma/mv_xor.c | 1 - include/linux/async_tx.h | 9 ++ include/linux/dmaengine.h | 30 ++++- 14 files changed, 514 insertions(+), 231 deletions(-) Merging udf/for_next $ git merge udf/for_next Auto-merging fs/udf/balloc.c Auto-merging fs/udf/ialloc.c Merge made by recursive. Documentation/filesystems/udf.txt | 2 + fs/udf/balloc.c | 113 ++++---- fs/udf/dir.c | 14 +- fs/udf/directory.c | 38 ++-- fs/udf/ecma_167.h | 416 ++++++++++++++-------------- fs/udf/ialloc.c | 4 +- fs/udf/inode.c | 213 ++++++++------- fs/udf/misc.c | 29 +- fs/udf/namei.c | 86 +++--- fs/udf/osta_udf.h | 22 +- fs/udf/partition.c | 2 +- fs/udf/super.c | 561 +++++++++++++++++++------------------ fs/udf/truncate.c | 44 ++-- fs/udf/udf_i.h | 6 +- fs/udf/udf_sb.h | 7 +- fs/udf/udfdecl.h | 46 ++-- fs/udf/udfend.h | 28 +- fs/udf/udftime.c | 6 +- fs/udf/unicode.c | 62 +++-- 19 files changed, 878 insertions(+), 821 deletions(-) Merging net/master $ git merge net/master Already up-to-date. Merging wireless/master $ git merge wireless/master Already up-to-date. Merging mtd/master $ git merge mtd/master Resolved 'drivers/mtd/maps/Makefile' using previous resolution. Auto-merging drivers/mtd/maps/Kconfig Auto-merging drivers/mtd/maps/Makefile CONFLICT (content): Merge conflict in drivers/mtd/maps/Makefile Removing drivers/mtd/maps/sharpsl-flash.c Auto-merging drivers/mtd/nand/Kconfig Auto-merging drivers/mtd/nand/pxa3xx_nand.c Removing fs/romfs/inode.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master d92e646] Merge commit 'mtd/master' $ git diff -M --stat --summary HEAD^.. arch/arm/mach-davinci/include/mach/nand.h | 80 +++ arch/arm/mach-pxa/include/mach/pxa3xx_nand.h | 3 + arch/blackfin/kernel/process.c | 2 +- arch/mips/include/asm/txx9/ndfmc.h | 30 ++ arch/mips/include/asm/txx9/rbtx4939.h | 9 + arch/mips/include/asm/txx9/tx4938.h | 1 + arch/mips/include/asm/txx9/tx4939.h | 2 + arch/mips/txx9/generic/setup.c | 21 + arch/mips/txx9/generic/setup_tx4938.c | 21 + arch/mips/txx9/generic/setup_tx4939.c | 17 + arch/mips/txx9/rbtx4938/setup.c | 2 + arch/mips/txx9/rbtx4939/setup.c | 161 +++++++ drivers/mtd/Makefile | 2 +- drivers/mtd/ar7part.c | 6 +- drivers/mtd/chips/cfi_cmdset_0001.c | 8 +- drivers/mtd/chips/jedec_probe.c | 16 + drivers/mtd/chips/map_ram.c | 17 + drivers/mtd/chips/map_rom.c | 17 + drivers/mtd/cmdlinepart.c | 6 +- drivers/mtd/devices/doc2000.c | 1 - drivers/mtd/devices/doc2001.c | 1 - drivers/mtd/devices/doc2001plus.c | 1 - drivers/mtd/devices/docecc.c | 1 - drivers/mtd/devices/m25p80.c | 17 +- drivers/mtd/devices/mtd_dataflash.c | 16 +- drivers/mtd/devices/mtdram.c | 14 + drivers/mtd/inftlmount.c | 1 - drivers/mtd/internal.h | 17 + drivers/mtd/maps/Kconfig | 12 +- drivers/mtd/maps/Makefile | 2 +- drivers/mtd/maps/rbtx4939-flash.c | 208 ++++++++ drivers/mtd/maps/sharpsl-flash.c | 116 ----- drivers/mtd/mtdbdi.c | 43 ++ drivers/mtd/mtdchar.c | 64 +++- drivers/mtd/mtdconcat.c | 47 ++ drivers/mtd/mtdcore.c | 15 + drivers/mtd/mtdoops.c | 16 +- drivers/mtd/mtdpart.c | 15 + drivers/mtd/nand/Kconfig | 15 +- drivers/mtd/nand/Makefile | 2 + drivers/mtd/nand/bf5xx_nand.c | 18 +- drivers/mtd/nand/davinci_nand.c | 568 ++++++++++++++++++++++ drivers/mtd/nand/nand_base.c | 107 ++++- drivers/mtd/nand/pxa3xx_nand.c | 119 +++++- drivers/mtd/nand/sh_flctl.c | 18 +- drivers/mtd/nand/txx9ndfmc.c | 428 +++++++++++++++++ drivers/mtd/nftlcore.c | 3 +- drivers/mtd/ofpart.c | 7 + drivers/mtd/onenand/omap2.c | 4 + drivers/mtd/onenand/onenand_base.c | 145 ++++-- fs/jffs2/acl.c | 4 +- fs/jffs2/malloc.c | 6 +- fs/romfs/Kconfig | 48 ++- fs/romfs/Makefile | 9 +- fs/romfs/inode.c | 665 -------------------------- fs/romfs/internal.h | 47 ++ fs/romfs/mmap-nommu.c | 75 +++ fs/romfs/storage.c | 261 ++++++++++ fs/romfs/super.c | 648 +++++++++++++++++++++++++ include/linux/mtd/mtd.h | 14 + include/linux/mtd/partitions.h | 12 + 61 files changed, 3339 insertions(+), 912 deletions(-) create mode 100644 arch/arm/mach-davinci/include/mach/nand.h create mode 100644 arch/mips/include/asm/txx9/ndfmc.h create mode 100644 drivers/mtd/internal.h create mode 100644 drivers/mtd/maps/rbtx4939-flash.c delete mode 100644 drivers/mtd/maps/sharpsl-flash.c create mode 100644 drivers/mtd/mtdbdi.c create mode 100644 drivers/mtd/nand/davinci_nand.c create mode 100644 drivers/mtd/nand/txx9ndfmc.c delete mode 100644 fs/romfs/inode.c create mode 100644 fs/romfs/internal.h create mode 100644 fs/romfs/mmap-nommu.c create mode 100644 fs/romfs/storage.c create mode 100644 fs/romfs/super.c Merging crypto/master $ git merge crypto/master Auto-merging drivers/char/hw_random/omap-rng.c Merge made by recursive. arch/x86/crypto/Makefile | 2 + arch/x86/crypto/aesni-intel_glue.c | 267 ++++++++++++++- arch/x86/crypto/fpu.c | 166 +++++++++ crypto/Kconfig | 10 + crypto/api.c | 5 +- crypto/cryptd.c | 14 +- crypto/pcompress.c | 1 + crypto/tcrypt.c | 16 +- crypto/testmgr.c | 6 +- drivers/char/hw_random/omap-rng.c | 2 +- drivers/crypto/talitos.c | 713 ++++++++++++++++++++++++++---------- 11 files changed, 987 insertions(+), 215 deletions(-) create mode 100644 arch/x86/crypto/fpu.c Merging vfs/for-next $ git merge vfs/for-next Already up-to-date. Merging sound/for-next $ git merge sound/for-next Already up-to-date. Merging cpufreq/next $ git merge cpufreq/next Already up-to-date. Merging v9fs/for-next $ git merge v9fs/for-next Resolved 'net/9p/protocol.c' using previous resolution. Auto-merging net/9p/protocol.c CONFLICT (content): Merge conflict in net/9p/protocol.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master d45c6d3] Merge commit 'v9fs/for-next' $ git diff -M --stat --summary HEAD^.. Merging quilt/rr $ git merge quilt/rr Recorded preimage for 'drivers/oprofile/buffer_sync.c' Resolved 'arch/x86/include/asm/topology.h' using previous resolution. Resolved 'drivers/hid/hid-core.c' using previous resolution. Resolved 'drivers/media/video/saa7134/saa7134-core.c' using previous resolution. Resolved 'drivers/media/video/saa7134/saa7134.h' using previous resolution. Resolved 'kernel/extable.c' using previous resolution. Resolved 'kernel/module.c' using previous resolution. Auto-merging arch/ia64/include/asm/topology.h Auto-merging arch/mips/emma/markeins/irq.c Auto-merging arch/mips/sgi-ip27/ip27-nmi.c Auto-merging arch/mips/sgi-ip32/ip32-irq.c Auto-merging arch/mips/sni/rm200.c Auto-merging arch/powerpc/platforms/85xx/mpc85xx_cds.c Auto-merging arch/sparc/include/asm/topology_64.h Auto-merging arch/x86/include/asm/topology.h CONFLICT (content): Merge conflict in arch/x86/include/asm/topology.h Auto-merging arch/x86/kernel/irqinit_32.c Auto-merging arch/x86/kernel/irqinit_64.c Auto-merging arch/x86/kernel/setup.c Auto-merging arch/x86/lguest/boot.c Auto-merging drivers/hid/hid-core.c CONFLICT (content): Merge conflict in drivers/hid/hid-core.c Auto-merging drivers/media/video/bt8xx/bttv-driver.c Auto-merging drivers/media/video/bt8xx/bttvp.h Auto-merging drivers/media/video/cx88/cx88.h Auto-merging drivers/media/video/em28xx/em28xx-cards.c Auto-merging drivers/media/video/em28xx/em28xx.h Auto-merging drivers/media/video/saa7134/saa7134-core.c CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134-core.c Auto-merging drivers/media/video/saa7134/saa7134.h CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134.h Auto-merging drivers/mtd/nand/nand_base.c Auto-merging drivers/oprofile/buffer_sync.c CONFLICT (content): Merge conflict in drivers/oprofile/buffer_sync.c Auto-merging include/linux/compiler.h Auto-merging include/linux/module.h Auto-merging include/linux/string.h Auto-merging init/main.c Auto-merging kernel/extable.c CONFLICT (content): Merge conflict in kernel/extable.c Auto-merging kernel/fork.c Auto-merging kernel/module.c CONFLICT (content): Merge conflict in kernel/module.c Auto-merging kernel/workqueue.c Auto-merging net/sunrpc/svc.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/oprofile/buffer_sync.c'. [master af04b1b] Merge branch 'quilt/rr' $ git diff -M --stat --summary HEAD^.. Documentation/lguest/lguest.c | 7 + arch/arm/boot/compressed/misc.c | 5 +- arch/cris/arch-v10/kernel/time.c | 1 - arch/cris/arch-v32/kernel/smp.c | 1 - arch/cris/arch-v32/kernel/time.c | 1 - arch/frv/kernel/irq-mb93091.c | 4 - arch/frv/kernel/irq-mb93093.c | 1 - arch/frv/kernel/irq-mb93493.c | 2 - arch/frv/kernel/time.c | 1 - arch/h8300/kernel/timer/itu.c | 1 - arch/h8300/kernel/timer/timer16.c | 1 - arch/h8300/kernel/timer/timer8.c | 1 - arch/h8300/kernel/timer/tpu.c | 1 - arch/ia64/include/asm/topology.h | 5 - arch/m32r/kernel/time.c | 1 - arch/mips/cobalt/irq.c | 1 - arch/mips/emma/markeins/irq.c | 1 - arch/mips/include/asm/mach-ip27/topology.h | 1 - arch/mips/jazz/irq.c | 1 - arch/mips/kernel/cevt-bcm1480.c | 1 - arch/mips/kernel/cevt-sb1250.c | 1 - arch/mips/kernel/i8253.c | 2 - arch/mips/kernel/i8259.c | 1 - arch/mips/lasat/interrupt.c | 1 - arch/mips/lemote/lm2e/irq.c | 1 - arch/mips/sgi-ip27/ip27-nmi.c | 2 +- arch/mips/sgi-ip32/ip32-irq.c | 2 - arch/mips/sni/rm200.c | 3 +- arch/mips/vr41xx/common/irq.c | 1 - arch/mn10300/kernel/time.c | 1 - arch/powerpc/include/asm/topology.h | 5 - arch/powerpc/platforms/85xx/mpc85xx_cds.c | 1 - arch/powerpc/platforms/8xx/m8xx_setup.c | 1 - arch/powerpc/platforms/chrp/setup.c | 1 - arch/powerpc/platforms/powermac/pic.c | 2 - arch/powerpc/platforms/powermac/smp.c | 1 - arch/powerpc/sysdev/cpm1.c | 1 - arch/sh/include/asm/topology.h | 1 - arch/sh/kernel/time_64.c | 1 - arch/sh/kernel/timers/timer-cmt.c | 1 - arch/sh/kernel/timers/timer-mtu2.c | 1 - arch/sh/kernel/timers/timer-tmu.c | 1 - arch/sparc/include/asm/topology_64.h | 5 - arch/sparc/kernel/irq_32.c | 2 - arch/sparc/kernel/sun4d_irq.c | 1 - arch/x86/include/asm/lguest_hcall.h | 24 +-- arch/x86/include/asm/topology.h | 12 -- arch/x86/kernel/irqinit_32.c | 2 - arch/x86/kernel/irqinit_64.c | 1 - arch/x86/kernel/mfgpt_32.c | 1 - arch/x86/kernel/setup.c | 1 - arch/x86/kernel/time_64.c | 2 - arch/x86/kernel/vmiclock_32.c | 1 - arch/x86/lguest/boot.c | 86 ++++++--- arch/x86/lguest/i386_head.S | 4 +- drivers/base/cpu.c | 2 +- drivers/hid/hid-core.c | 4 + drivers/lguest/core.c | 4 +- drivers/lguest/interrupts_and_traps.c | 28 ++-- drivers/lguest/lg.h | 8 +- drivers/lguest/lguest_device.c | 4 +- drivers/lguest/page_tables.c | 22 ++- drivers/lguest/segments.c | 2 +- drivers/lguest/x86/core.c | 62 ++++++- drivers/media/video/bt8xx/bttv-driver.c | 8 +- drivers/media/video/bt8xx/bttvp.h | 3 - drivers/media/video/cx88/cx88-mpeg.c | 14 +- drivers/media/video/cx88/cx88.h | 1 - drivers/media/video/em28xx/em28xx-cards.c | 17 +-- drivers/media/video/em28xx/em28xx.h | 2 - drivers/media/video/saa7134/saa7134-core.c | 17 +-- drivers/media/video/saa7134/saa7134.h | 2 - drivers/mtd/nand/nand_base.c | 4 +- drivers/video/aty/aty128fb.c | 2 +- drivers/video/cyber2000fb.c | 9 +- drivers/video/uvesafb.c | 10 +- drivers/virtio/virtio_ring.c | 22 ++- fs/seq_file.c | 2 +- include/asm-frv/gdb-stub.h | 1 - include/asm-generic/topology.h | 10 - include/asm-mn10300/gdb-stub.h | 1 - include/linux/compiler.h | 5 + include/linux/cpu.h | 5 - include/linux/cpuset.h | 4 +- include/linux/kallsyms.h | 15 ++ include/linux/kmod.h | 11 +- include/linux/module.h | 63 ++++++- include/linux/moduleparam.h | 50 ++++- include/linux/seq_file.h | 9 +- include/linux/string.h | 9 + init/main.c | 6 +- kernel/cpu.c | 17 +- kernel/extable.c | 6 +- kernel/fork.c | 2 +- kernel/kallsyms.c | 19 ++ kernel/kmod.c | 12 +- kernel/kthread.c | 28 ++-- kernel/module.c | 274 ++++++++++++++++------------ kernel/params.c | 60 +++++- kernel/rcutorture.c | 25 ++- kernel/sched_cpupri.h | 2 +- kernel/stop_machine.c | 2 +- kernel/workqueue.c | 42 +++-- mm/allocpercpu.c | 2 +- mm/pdflush.c | 2 +- mm/vmstat.c | 2 +- net/sunrpc/svc.c | 2 +- scripts/mod/modpost.c | 4 +- 108 files changed, 665 insertions(+), 486 deletions(-) Merging cifs/master $ git merge cifs/master Merge made by recursive. fs/cifs/inode.c | 58 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 30 insertions(+), 28 deletions(-) Merging mmc/next $ git merge mmc/next Auto-merging MAINTAINERS Auto-merging drivers/mmc/host/atmel-mci.c Auto-merging drivers/mmc/host/omap_hsmmc.c Merge made by recursive. MAINTAINERS | 20 +- drivers/mmc/card/block.c | 2 + drivers/mmc/core/bus.c | 8 + drivers/mmc/core/core.c | 18 + drivers/mmc/core/debugfs.c | 67 +++ drivers/mmc/core/sdio_cis.c | 8 + drivers/mmc/core/sdio_ops.c | 8 + drivers/mmc/host/Kconfig | 29 ++ drivers/mmc/host/Makefile | 2 + drivers/mmc/host/atmel-mci.c | 2 +- drivers/mmc/host/mmc_spi.c | 40 ++- drivers/mmc/host/mvsdio.c | 885 +++++++++++++++++++++++++++++++++++++++++ drivers/mmc/host/mvsdio.h | 190 +++++++++ drivers/mmc/host/omap_hsmmc.c | 355 ++++++++++------- drivers/mmc/host/sdhci-of.c | 309 ++++++++++++++ drivers/mmc/host/sdhci.c | 317 ++++++++++----- drivers/mmc/host/sdhci.h | 112 ++++++ drivers/mmc/host/tmio_mmc.c | 6 +- drivers/mmc/host/tmio_mmc.h | 3 + 19 files changed, 2109 insertions(+), 272 deletions(-) create mode 100644 drivers/mmc/host/mvsdio.c create mode 100644 drivers/mmc/host/mvsdio.h create mode 100644 drivers/mmc/host/sdhci-of.c Merging gfs2/master $ git merge gfs2/master Already up-to-date. Merging input/next $ git merge input/next Auto-merging drivers/input/mouse/Kconfig Merge made by recursive. Documentation/input/rotary-encoder.txt | 101 +++ arch/mips/include/asm/mach-rc32434/gpio.h | 3 + arch/mips/rb532/devices.c | 19 +- drivers/input/input.c | 13 +- drivers/input/keyboard/atkbd.c | 135 ++--- drivers/input/keyboard/bf54x-keys.c | 4 +- drivers/input/keyboard/hilkbd.c | 140 +++-- drivers/input/misc/Kconfig | 23 + drivers/input/misc/Makefile | 28 +- drivers/input/misc/ati_remote2.c | 277 ++++++++- drivers/input/misc/rb532_button.c | 120 ++++ drivers/input/misc/rotary_encoder.c | 221 +++++++ drivers/input/mouse/Kconfig | 11 + drivers/input/mouse/Makefile | 9 +- drivers/input/mouse/hgpk.c | 2 +- drivers/input/mouse/maplemouse.c | 147 +++++ drivers/input/mouse/pc110pad.c | 5 +- drivers/input/touchscreen/Kconfig | 58 ++ drivers/input/touchscreen/Makefile | 3 + drivers/input/touchscreen/ad7877.c | 844 ++++++++++++++++++++++++++ drivers/input/touchscreen/ad7879.c | 782 ++++++++++++++++++++++++ drivers/input/touchscreen/mainstone-wm97xx.c | 3 +- drivers/input/touchscreen/ucb1400_ts.c | 5 +- drivers/input/touchscreen/wm97xx-core.c | 13 +- drivers/input/touchscreen/zylonite-wm97xx.c | 240 ++++++++ include/linux/rotary_encoder.h | 13 + include/linux/spi/ad7879.h | 35 ++ 27 files changed, 3054 insertions(+), 200 deletions(-) create mode 100644 Documentation/input/rotary-encoder.txt create mode 100644 drivers/input/misc/rb532_button.c create mode 100644 drivers/input/misc/rotary_encoder.c create mode 100644 drivers/input/mouse/maplemouse.c create mode 100644 drivers/input/touchscreen/ad7877.c create mode 100644 drivers/input/touchscreen/ad7879.c create mode 100644 drivers/input/touchscreen/zylonite-wm97xx.c create mode 100644 include/linux/rotary_encoder.h create mode 100644 include/linux/spi/ad7879.h Merging bkl-removal/bkl-removal $ git merge bkl-removal/bkl-removal Already up-to-date. Merging ubifs/linux-next $ git merge ubifs/linux-next Auto-merging fs/ubifs/super.c Merge made by recursive. fs/ubifs/budget.c | 37 ++--- fs/ubifs/debug.c | 6 +- fs/ubifs/file.c | 16 ++- fs/ubifs/find.c | 12 +- fs/ubifs/gc.c | 428 +++++++++++++++++++++++++++++++++--------------- fs/ubifs/journal.c | 7 +- fs/ubifs/key.h | 6 +- fs/ubifs/log.c | 5 +- fs/ubifs/lpt_commit.c | 34 ++-- fs/ubifs/replay.c | 2 +- fs/ubifs/sb.c | 36 ++++- fs/ubifs/shrinker.c | 6 +- fs/ubifs/super.c | 37 +++- fs/ubifs/tnc.c | 2 +- fs/ubifs/ubifs-media.h | 30 +++- fs/ubifs/ubifs.h | 13 +- 16 files changed, 459 insertions(+), 218 deletions(-) Merging lsm/for-next $ git merge lsm/for-next Already up-to-date. Merging block/for-next $ git merge block/for-next Auto-merging block/blk.h Merge made by recursive. block/blk-core.c | 13 ++++--------- block/blk-merge.c | 29 +++++++++++++++++------------ block/blk-sysfs.c | 4 ++++ block/blk.h | 14 ++++++++++---- block/elevator.c | 42 ++++++++++++++++++++++++++++-------------- drivers/block/cciss.c | 10 +++++++++- include/linux/elevator.h | 1 + 7 files changed, 73 insertions(+), 40 deletions(-) Merging embedded/master $ git merge embedded/master Already up-to-date. Merging firmware/master $ git merge firmware/master Resolved 'firmware/Makefile' using previous resolution. Resolved 'firmware/WHENCE' using previous resolution. Resolved 'sound/isa/Kconfig' using previous resolution. Auto-merging drivers/media/dvb/ttpci/Kconfig Auto-merging drivers/media/dvb/ttpci/av7110.c Removing drivers/media/dvb/ttpci/fdump.c Removing drivers/scsi/ql1040_fw.h Removing drivers/scsi/ql12160_fw.h Removing drivers/scsi/ql1280_fw.h Removing drivers/scsi/qlogicpti_asm.c Auto-merging firmware/Makefile CONFLICT (content): Merge conflict in firmware/Makefile Auto-merging firmware/WHENCE CONFLICT (content): Merge conflict in firmware/WHENCE Auto-merging sound/isa/Kconfig CONFLICT (content): Merge conflict in sound/isa/Kconfig Removing sound/isa/wavefront/yss225.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 117ed55] Merge commit 'firmware/master' $ git diff -M --stat --summary HEAD^.. drivers/media/dvb/ttpci/Kconfig | 23 +- drivers/media/dvb/ttpci/Makefile | 9 - drivers/media/dvb/ttpci/av7110.c | 16 - drivers/media/dvb/ttpci/av7110_hw.c | 35 +- drivers/media/dvb/ttpci/av7110_hw.h | 3 +- drivers/media/dvb/ttpci/fdump.c | 44 - drivers/scsi/advansys.c | 1731 ++----------------- drivers/scsi/ql1040_fw.h | 2130 ---------------------- drivers/scsi/ql12160_fw.h | 1811 ------------------- drivers/scsi/ql1280_fw.h | 2048 --------------------- drivers/scsi/qla1280.c | 114 +- drivers/scsi/qla1280.h | 6 + drivers/scsi/qlogicpti.c | 63 +- drivers/scsi/qlogicpti_asm.c | 1160 ------------ firmware/.gitignore | 1 + firmware/Makefile | 29 +- firmware/WHENCE | 59 + firmware/advansys/3550.bin.ihex | 317 ++++ firmware/advansys/38C0800.bin.ihex | 336 ++++ firmware/advansys/38C1600.bin.ihex | 398 +++++ firmware/advansys/mcode.bin.ihex | 147 ++ firmware/av7110/Boot.S | 109 ++ firmware/av7110/bootcode.bin.ihex | 15 + {scripts => firmware}/ihex2fw.c | 0 firmware/qlogic/1040.bin.ihex | 2111 ++++++++++++++++++++++ firmware/qlogic/12160.bin.ihex | 1771 +++++++++++++++++++ firmware/qlogic/1280.bin.ihex | 2008 +++++++++++++++++++++ firmware/qlogic/isp1000.bin.ihex | 1158 ++++++++++++ firmware/yamaha/yss225_registers.bin.ihex | 998 +++++++++++ scripts/.gitignore | 1 - scripts/Makefile | 3 +- sound/isa/Kconfig | 10 - sound/isa/wavefront/wavefront_fx.c | 16 - sound/isa/wavefront/yss225.c | 2739 ----------------------------- 34 files changed, 9695 insertions(+), 11724 deletions(-) delete mode 100644 drivers/media/dvb/ttpci/fdump.c delete mode 100644 drivers/scsi/ql1040_fw.h delete mode 100644 drivers/scsi/ql12160_fw.h delete mode 100644 drivers/scsi/ql1280_fw.h delete mode 100644 drivers/scsi/qlogicpti_asm.c create mode 100644 firmware/advansys/3550.bin.ihex create mode 100644 firmware/advansys/38C0800.bin.ihex create mode 100644 firmware/advansys/38C1600.bin.ihex create mode 100644 firmware/advansys/mcode.bin.ihex create mode 100644 firmware/av7110/Boot.S create mode 100644 firmware/av7110/bootcode.bin.ihex rename {scripts => firmware}/ihex2fw.c (100%) create mode 100644 firmware/qlogic/1040.bin.ihex create mode 100644 firmware/qlogic/12160.bin.ihex create mode 100644 firmware/qlogic/1280.bin.ihex create mode 100644 firmware/qlogic/isp1000.bin.ihex create mode 100644 firmware/yamaha/yss225_registers.bin.ihex delete mode 100644 sound/isa/wavefront/yss225.c Merging pcmcia/master $ git merge pcmcia/master Already up-to-date. Merging battery/master $ git merge battery/master Merge made by recursive. drivers/power/pcf50633-charger.c | 88 +++++++++++++++++++++++++++++------- drivers/power/pda_power.c | 89 ++++++++++++++++++++++++++++++++----- include/linux/mfd/pcf50633/core.h | 2 + include/linux/mfd/pcf50633/mbc.h | 1 - include/linux/pda_power.h | 2 + 5 files changed, 152 insertions(+), 30 deletions(-) Merging leds/for-mm $ git merge leds/for-mm Auto-merging drivers/leds/Kconfig Merge made by recursive. Documentation/powerpc/dts-bindings/gpio/led.txt | 46 ++++- drivers/leds/Kconfig | 54 +++++- drivers/leds/Makefile | 6 + drivers/leds/led-class.c | 21 ++- drivers/leds/led-triggers.c | 10 +- drivers/leds/leds-dac124s085.c | 150 ++++++++++++++ drivers/leds/leds-gpio.c | 216 ++++++++++++++++---- drivers/leds/leds-pca9532.c | 2 +- drivers/leds/leds-pwm.c | 153 +++++++++++++++ drivers/leds/leds-rb532.c | 77 ++++++++ drivers/leds/leds.h | 4 +- drivers/leds/ledtrig-default-on.c | 2 +- drivers/leds/ledtrig-gpio.c | 239 +++++++++++++++++++++++ drivers/leds/ledtrig-heartbeat.c | 4 +- drivers/leds/ledtrig-ide-disk.c | 3 +- drivers/leds/ledtrig-timer.c | 2 +- include/linux/leds.h | 4 +- include/linux/leds_pwm.h | 21 ++ 18 files changed, 949 insertions(+), 65 deletions(-) create mode 100644 drivers/leds/leds-dac124s085.c create mode 100644 drivers/leds/leds-pwm.c create mode 100644 drivers/leds/leds-rb532.c create mode 100644 drivers/leds/ledtrig-gpio.c create mode 100644 include/linux/leds_pwm.h Merging backlight/for-mm $ git merge backlight/for-mm Merge made by recursive. drivers/video/backlight/Kconfig | 18 +++ drivers/video/backlight/Makefile | 2 + drivers/video/backlight/jornada720_bl.c | 161 +++++++++++++++++++++++++ drivers/video/backlight/jornada720_lcd.c | 153 ++++++++++++++++++++++++ drivers/video/backlight/mbp_nvidia_bl.c | 191 ++++++++++++++++++++++++------ drivers/video/backlight/pwm_bl.c | 4 +- 6 files changed, 491 insertions(+), 38 deletions(-) create mode 100644 drivers/video/backlight/jornada720_bl.c create mode 100644 drivers/video/backlight/jornada720_lcd.c Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Auto-merging arch/x86/kernel/kgdb.c Merge made by recursive. Documentation/DocBook/kgdb.tmpl | 2 +- arch/x86/kernel/kgdb.c | 3 +- include/linux/kgdb.h | 50 +++++++++++++++++++++++++++++++++----- kernel/kgdb.c | 6 ++-- 4 files changed, 49 insertions(+), 12 deletions(-) Merging slab/for-next $ git merge slab/for-next Auto-merging include/linux/rcupdate.h Auto-merging init/Kconfig Auto-merging lib/Kconfig.debug Auto-merging mm/Makefile Merge made by recursive. Documentation/vm/slqbinfo.c | 1054 +++++++++++++ include/linux/rcu_types.h | 18 + include/linux/rcupdate.h | 11 +- include/linux/slab.h | 10 +- include/linux/slqb_def.h | 296 ++++ init/Kconfig | 9 +- lib/Kconfig.debug | 20 + mm/Makefile | 1 + mm/slqb.c | 3622 +++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 5027 insertions(+), 14 deletions(-) create mode 100644 Documentation/vm/slqbinfo.c create mode 100644 include/linux/rcu_types.h create mode 100644 include/linux/slqb_def.h create mode 100644 mm/slqb.c Merging uclinux/for-next $ git merge uclinux/for-next Already up-to-date. Merging md/for-next $ git merge md/for-next Auto-merging drivers/md/md.c Auto-merging fs/compat_ioctl.c Removing include/linux/raid/md.h Merge made by recursive. Documentation/md.txt | 37 +- crypto/xor.c | 2 +- drivers/md/Kconfig | 4 + drivers/md/Makefile | 16 +- drivers/md/bitmap.c | 49 +- {include/linux/raid => drivers/md}/bitmap.h | 0 drivers/md/faulty.c | 19 +- drivers/md/linear.c | 25 +- {include/linux/raid => drivers/md}/linear.h | 2 - drivers/md/md.c | 611 +++++++++--- include/linux/raid/md_k.h => drivers/md/md.h | 65 +- drivers/md/mktables.c | 14 +- drivers/md/multipath.c | 17 +- {include/linux/raid => drivers/md}/multipath.h | 2 - drivers/md/raid0.c | 66 +- {include/linux/raid => drivers/md}/raid0.h | 2 - drivers/md/raid1.c | 35 +- {include/linux/raid => drivers/md}/raid1.h | 2 - drivers/md/raid10.c | 42 +- {include/linux/raid => drivers/md}/raid10.h | 2 - drivers/md/raid5.c | 1277 ++++++++++++++++-------- {include/linux/raid => drivers/md}/raid5.h | 104 ++- drivers/md/raid6algos.c | 23 +- drivers/md/raid6altivec.uc | 4 +- drivers/md/raid6int.uc | 4 +- drivers/md/raid6mmx.c | 4 +- drivers/md/raid6recov.c | 10 +- drivers/md/raid6sse1.c | 4 +- drivers/md/raid6sse2.c | 4 +- drivers/md/raid6test/Makefile | 2 +- drivers/md/raid6test/test.c | 2 +- drivers/md/raid6x86.h | 2 +- fs/compat_ioctl.c | 2 +- include/linux/raid/md.h | 81 -- include/linux/raid/md_u.h | 35 + drivers/md/raid6.h => include/linux/raid/pq.h | 11 +- include/linux/raid/xor.h | 2 - init/do_mounts.h | 1 + init/do_mounts_md.c | 5 +- 39 files changed, 1810 insertions(+), 779 deletions(-) rename {include/linux/raid => drivers/md}/bitmap.h (100%) rename {include/linux/raid => drivers/md}/linear.h (95%) rename include/linux/raid/md_k.h => drivers/md/md.h (83%) rename {include/linux/raid => drivers/md}/multipath.h (96%) rename {include/linux/raid => drivers/md}/raid0.h (96%) rename {include/linux/raid => drivers/md}/raid1.h (99%) rename {include/linux/raid => drivers/md}/raid10.h (99%) rename {include/linux/raid => drivers/md}/raid5.h (82%) delete mode 100644 include/linux/raid/md.h rename drivers/md/raid6.h => include/linux/raid/pq.h (92%) Merging mfd/for-next $ git merge mfd/for-next Auto-merging MAINTAINERS Auto-merging arch/arm/mach-pxa/magician.c Removing include/linux/ds1wm.h Merge made by recursive. MAINTAINERS | 3 +- arch/arm/mach-pxa/magician.c | 1 - drivers/mfd/Kconfig | 1 + drivers/mfd/htc-pasic3.c | 169 ++++++++++++++++----------------------- drivers/mfd/pcf50633-core.c | 1 - drivers/mfd/t7l66xb.c | 4 +- drivers/mfd/tc6393xb.c | 2 +- drivers/mfd/twl4030-irq.c | 2 +- drivers/mfd/wm8350-core.c | 39 +++++++--- drivers/w1/masters/ds1wm.c | 58 ++++++------- include/linux/ds1wm.h | 12 --- include/linux/mfd/ds1wm.h | 6 ++ include/linux/mfd/htc-pasic3.h | 1 - include/linux/mfd/wm8350/core.h | 2 + 14 files changed, 138 insertions(+), 163 deletions(-) delete mode 100644 include/linux/ds1wm.h create mode 100644 include/linux/mfd/ds1wm.h Merging hdlc/hdlc-next $ git merge hdlc/hdlc-next Already up-to-date. Merging drm/drm-next $ git merge drm/drm-next Already up-to-date. Merging voltage/for-next $ git merge voltage/for-next Auto-merging MAINTAINERS Auto-merging drivers/mmc/core/core.c Merge made by recursive. Documentation/ABI/testing/sysfs-class-regulator | 57 +++- MAINTAINERS | 2 +- drivers/mfd/twl4030-core.c | 2 - drivers/mmc/core/core.c | 100 +++++ drivers/regulator/Kconfig | 13 +- drivers/regulator/Makefile | 1 + drivers/regulator/bq24022.c | 3 +- drivers/regulator/core.c | 386 ++++++++++++++---- drivers/regulator/da903x.c | 3 +- drivers/regulator/fixed.c | 3 +- drivers/regulator/pcf50633-regulator.c | 3 +- drivers/regulator/twl4030-regulator.c | 497 +++++++++++++++++++++++ drivers/regulator/virtual.c | 14 +- drivers/regulator/wm8350-regulator.c | 57 +++- drivers/regulator/wm8400-regulator.c | 36 ++- include/linux/i2c/twl4030.h | 47 +++ include/linux/mmc/host.h | 5 + include/linux/regulator/bq24022.h | 3 + include/linux/regulator/consumer.h | 6 +- include/linux/regulator/driver.h | 81 ++++- include/linux/regulator/fixed.h | 3 + include/linux/regulator/machine.h | 12 +- 22 files changed, 1217 insertions(+), 117 deletions(-) create mode 100644 drivers/regulator/twl4030-regulator.c Merging security-testing/next $ git merge security-testing/next Already up-to-date. Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging quilt/ttydev $ git merge quilt/ttydev Resolved 'fs/devpts/inode.c' using previous resolution. Auto-merging arch/x86/kernel/kprobes.c Auto-merging drivers/pci/quirks.c Auto-merging drivers/serial/Kconfig Auto-merging fs/devpts/inode.c CONFLICT (content): Merge conflict in fs/devpts/inode.c Auto-merging include/linux/pci_ids.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 4e529c7] Merge branch 'quilt/ttydev' $ git diff -M --stat --summary HEAD^.. drivers/char/applicom.c | 1 + drivers/char/cyclades.c | 2 + drivers/char/isicom.c | 1 + drivers/char/moxa.c | 9 +- drivers/char/mxser.c | 1 - drivers/char/rio/rio_linux.c | 2 +- drivers/char/riscom8.c | 2 + drivers/char/specialix.c | 1 + drivers/serial/8250_pci.c | 411 +++++++++++++++++++++++++++++++++++++++ drivers/serial/8250_pnp.c | 7 +- drivers/serial/Kconfig | 4 +- drivers/serial/bfin_5xx.c | 22 ++- drivers/serial/icom.c | 14 +-- drivers/serial/jsm/jsm_driver.c | 9 +- drivers/serial/jsm/jsm_tty.c | 4 +- drivers/serial/ucc_uart.c | 1 + drivers/usb/class/cdc-acm.c | 2 +- include/linux/pci_ids.h | 26 +++ include/linux/serial_core.h | 2 +- 19 files changed, 484 insertions(+), 37 deletions(-) Merging agp/agp-next $ git merge agp/agp-next Already up-to-date. Merging generic-ipi/auto-generic-ipi-next $ git merge generic-ipi/auto-generic-ipi-next Already up-to-date. Merging oprofile/auto-oprofile-next $ git merge oprofile/auto-oprofile-next Already uptodate! Merge made by recursive. Merging fastboot/auto-fastboot-next $ git merge fastboot/auto-fastboot-next Already up-to-date. Merging sparseirq/auto-sparseirq-next $ git merge sparseirq/auto-sparseirq-next Already uptodate! Merge made by recursive. Merging iommu/auto-iommu-next $ git merge iommu/auto-iommu-next Already up-to-date. Merging uwb/for-upstream $ git merge uwb/for-upstream Already up-to-date. Merging watchdog/master $ git merge watchdog/master Merge made by recursive. drivers/watchdog/i6300esb.c | 155 ++++++++++++++++++++-------------------- drivers/watchdog/orion5x_wdt.c | 57 +++++++++++---- 2 files changed, 119 insertions(+), 93 deletions(-) Merging proc/proc $ git merge proc/proc Auto-merging drivers/acpi/battery.c Auto-merging drivers/acpi/fan.c Auto-merging drivers/acpi/processor_core.c Auto-merging drivers/acpi/sbs.c Auto-merging drivers/acpi/thermal.c Auto-merging drivers/acpi/video.c Auto-merging drivers/input/input.c Auto-merging drivers/net/wireless/airo.c Auto-merging fs/nfs/client.c Removing fs/proc/inode-alloc.txt Merge made by recursive. Documentation/DocBook/procfs_example.c | 9 -- arch/alpha/kernel/srm_env.c | 5 - arch/blackfin/mm/sram-alloc.c | 1 - arch/ia64/kernel/palinfo.c | 2 - arch/ia64/sn/kernel/sn2/prominfo_proc.c | 9 +- arch/powerpc/kernel/rtas_flash.c | 1 - arch/sparc/kernel/led.c | 1 - arch/x86/kernel/cpu/mtrr/if.c | 10 +-- drivers/acpi/ac.c | 1 - drivers/acpi/battery.c | 1 - drivers/acpi/button.c | 3 - drivers/acpi/fan.c | 2 - drivers/acpi/processor_core.c | 2 - drivers/acpi/sbs.c | 1 - drivers/acpi/thermal.c | 2 - drivers/acpi/video.c | 5 - drivers/block/ps3vram.c | 2 - drivers/char/ipmi/ipmi_msghandler.c | 12 +- drivers/char/ipmi/ipmi_si_intf.c | 6 +- drivers/input/input.c | 2 - drivers/isdn/hardware/eicon/divasi.c | 1 - drivers/media/video/cpia.c | 4 +- drivers/message/i2o/i2o_proc.c | 2 - drivers/net/bonding/bond_main.c | 35 +----- drivers/net/irda/vlsi_ir.c | 7 - drivers/net/wireless/airo.c | 1 - drivers/platform/x86/asus_acpi.c | 3 - drivers/platform/x86/thinkpad_acpi.c | 2 - drivers/platform/x86/toshiba_acpi.c | 3 - drivers/rtc/rtc-proc.c | 10 +- drivers/s390/block/dasd_proc.c | 2 - drivers/scsi/scsi_devinfo.c | 2 - drivers/scsi/scsi_proc.c | 3 - drivers/video/via/viafbdev.c | 5 - fs/afs/proc.c | 1 - fs/cifs/cifs_debug.c | 1 - fs/jfs/jfs_debug.c | 1 - fs/nfs/client.c | 2 - fs/proc/Makefile | 1 + fs/proc/automount.c | 28 ++++ fs/proc/base.c | 26 ++-- fs/proc/generic.c | 110 +++++++++++---- fs/proc/inode-alloc.txt | 14 -- fs/proc/inode.c | 23 +--- fs/proc/internal.h | 16 ++- fs/proc/proc_net.c | 236 +++++++++++++++++++++++-------- fs/proc/proc_tty.c | 1 - fs/proc/task_mmu.c | 8 +- fs/proc/uptime.c | 38 +++--- fs/reiserfs/procfs.c | 5 +- include/linux/ipmi_smi.h | 2 +- include/linux/magic.h | 1 + include/linux/proc_fs.h | 14 +-- include/net/net_namespace.h | 1 + kernel/exit.c | 2 +- net/appletalk/atalk_proc.c | 1 - net/atm/mpoa_proc.c | 1 - net/atm/proc.c | 1 - net/can/bcm.c | 4 - net/can/proc.c | 2 - net/core/pktgen.c | 1 - net/irda/irproc.c | 1 - net/llc/llc_proc.c | 1 - net/sctp/protocol.c | 8 +- net/sunrpc/cache.c | 4 - net/sunrpc/stats.c | 10 +- security/selinux/hooks.c | 29 +++- sound/core/info.c | 31 +---- 68 files changed, 398 insertions(+), 384 deletions(-) create mode 100644 fs/proc/automount.c delete mode 100644 fs/proc/inode-alloc.txt Merging bdev/master $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master $ git merge dwmw2-iommu/master Resolved 'arch/x86/Kconfig' using previous resolution. Resolved 'drivers/pci/intel-iommu.c' using previous resolution. Auto-merging arch/x86/Kconfig CONFLICT (content): Merge conflict in arch/x86/Kconfig Auto-merging arch/x86/kernel/amd_iommu.c Auto-merging drivers/base/iommu.c Auto-merging drivers/pci/intel-iommu.c CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c Auto-merging include/linux/intel-iommu.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master e3ae1e0] Merge commit 'dwmw2-iommu/master' $ git diff -M --stat --summary HEAD^.. arch/x86/Kconfig | 2 +- arch/x86/kernel/amd_iommu.c | 7 +++ drivers/base/iommu.c | 7 +++ drivers/pci/intel-iommu.c | 115 ++++++++++++++++++++++++++++++++++------- include/linux/dma_remapping.h | 1 + include/linux/intel-iommu.h | 2 +- include/linux/iommu.h | 13 +++++ 7 files changed, 126 insertions(+), 21 deletions(-) Merging cputime/cputime $ git merge cputime/cputime Already up-to-date. Merging osd/linux-next $ git merge osd/linux-next Auto-merging MAINTAINERS Auto-merging drivers/scsi/Kconfig Auto-merging drivers/scsi/Makefile Auto-merging fs/Kconfig Auto-merging fs/Makefile Auto-merging include/scsi/scsi.h Merge made by recursive. Documentation/filesystems/exofs.txt | 176 +++++ fs/Kconfig | 2 + fs/Makefile | 1 + fs/exofs/BUGS | 3 + fs/exofs/Kbuild | 30 + fs/exofs/Kconfig | 13 + fs/exofs/common.h | 185 +++++ fs/exofs/dir.c | 671 ++++++++++++++++++ fs/exofs/exofs.h | 184 +++++ fs/exofs/file.c | 86 +++ fs/exofs/inode.c | 1298 +++++++++++++++++++++++++++++++++++ fs/exofs/namei.c | 342 +++++++++ fs/exofs/osd.c | 153 ++++ fs/exofs/super.c | 581 ++++++++++++++++ fs/exofs/symlink.c | 57 ++ 15 files changed, 3782 insertions(+), 0 deletions(-) create mode 100644 Documentation/filesystems/exofs.txt create mode 100644 fs/exofs/BUGS create mode 100644 fs/exofs/Kbuild create mode 100644 fs/exofs/Kconfig create mode 100644 fs/exofs/common.h create mode 100644 fs/exofs/dir.c create mode 100644 fs/exofs/exofs.h create mode 100644 fs/exofs/file.c create mode 100644 fs/exofs/inode.c create mode 100644 fs/exofs/namei.c create mode 100644 fs/exofs/osd.c create mode 100644 fs/exofs/super.c create mode 100644 fs/exofs/symlink.c Merging fatfs/master $ git merge fatfs/master Already up-to-date. Merging fuse/for-next $ git merge fuse/for-next Already up-to-date. Merging jc_docs/docs-next $ git merge jc_docs/docs-next Merge made by recursive. Documentation/SubmittingPatches | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) Merging nommu/master $ git merge nommu/master Already up-to-date. Merging trivial/for-next $ git merge trivial/for-next Auto-merging CREDITS Auto-merging Documentation/kernel-parameters.txt Auto-merging MAINTAINERS Auto-merging arch/avr32/Kconfig Auto-merging arch/h8300/kernel/timer/tpu.c Auto-merging arch/mips/Kconfig Auto-merging arch/powerpc/Kconfig Auto-merging arch/powerpc/platforms/Kconfig Auto-merging arch/sh/Kconfig Auto-merging arch/x86/Kconfig Auto-merging drivers/acpi/thermal.c Auto-merging drivers/base/sys.c Auto-merging drivers/hid/Kconfig Auto-merging drivers/leds/Kconfig Auto-merging drivers/leds/leds-pca9532.c Auto-merging drivers/media/common/tuners/Kconfig Auto-merging drivers/media/dvb/frontends/Kconfig Auto-merging drivers/mfd/Kconfig Auto-merging drivers/mmc/host/Kconfig Auto-merging drivers/net/tg3.c Auto-merging drivers/net/wireless/ipw2x00/ipw2200.c Auto-merging drivers/pci/pci.c Auto-merging drivers/platform/x86/thinkpad_acpi.c Auto-merging drivers/serial/Kconfig Auto-merging init/Kconfig Auto-merging kernel/power/disk.c Auto-merging kernel/trace/Kconfig Auto-merging kernel/trace/ftrace.c Auto-merging mm/page_alloc.c Auto-merging net/sunrpc/Kconfig Merge made by recursive. CREDITS | 10 ++++++- Documentation/00-INDEX | 4 +- Documentation/cgroups/00-INDEX | 18 +++++++++++++++ Documentation/cgroups/cgroups.txt | 10 ++++---- Documentation/cgroups/cpusets.txt | 12 +++++----- Documentation/cgroups/devices.txt | 2 +- Documentation/cgroups/memcg_test.txt | 2 +- Documentation/cgroups/memory.txt | 2 +- Documentation/filesystems/ext3.txt | 14 ++++++++++- Documentation/ia64/kvm.txt | 2 +- Documentation/kernel-parameters.txt | 4 +- .../dts-bindings/fsl/cpm_qe/qe/firmware.txt | 2 +- Documentation/scheduler/sched-rt-group.txt | 2 +- Documentation/vm/numa_memory_policy.txt | 3 +- Documentation/vm/page_migration | 3 +- Documentation/x86/x86_64/fake-numa-for-cpusets | 5 ++- MAINTAINERS | 11 +++++++++ arch/arm/mach-netx/include/mach/netx-regs.h | 2 +- arch/arm/mach-omap1/Kconfig | 2 +- arch/avr32/Kconfig | 6 ++-- arch/blackfin/Kconfig | 6 ++-- arch/cris/Kconfig | 6 ++-- arch/cris/arch-v32/Kconfig | 2 +- arch/cris/arch-v32/drivers/Kconfig | 2 +- arch/cris/arch-v32/mach-fs/Kconfig | 2 +- arch/h8300/kernel/timer/tpu.c | 2 +- arch/mips/Kconfig | 2 +- arch/mips/sgi-ip27/ip27-smp.c | 2 +- arch/powerpc/Kconfig | 2 +- arch/powerpc/platforms/Kconfig | 2 +- arch/powerpc/sysdev/bestcomm/Kconfig | 4 +- arch/sh/Kconfig | 4 +- arch/sparc/kernel/head_64.S | 2 +- arch/x86/Kconfig | 4 +- drivers/acpi/thermal.c | 2 +- drivers/ata/Kconfig | 2 +- drivers/base/sys.c | 2 +- drivers/char/bsr.c | 2 +- drivers/gpio/Kconfig | 6 ++-- drivers/hid/Kconfig | 2 +- drivers/hwmon/f75375s.c | 4 +- drivers/input/Kconfig | 2 +- drivers/input/mouse/gpio_mouse.c | 2 +- drivers/input/touchscreen/ads7846.c | 2 +- drivers/isdn/mISDN/Kconfig | 10 +++++--- drivers/isdn/mISDN/l1oip_codec.c | 2 +- drivers/leds/Kconfig | 6 ++-- drivers/leds/leds-pca9532.c | 4 +- drivers/media/common/tuners/Kconfig | 2 +- drivers/media/dvb/frontends/Kconfig | 2 +- drivers/media/dvb/frontends/drx397xD.c | 2 +- drivers/mfd/Kconfig | 2 +- drivers/misc/Kconfig | 6 ++-- drivers/mmc/host/Kconfig | 2 +- drivers/mtd/nand/diskonchip.c | 2 +- drivers/mtd/tests/mtd_oobtest.c | 24 ++++++++++---------- drivers/mtd/tests/mtd_readtest.c | 2 +- drivers/net/sb1250-mac.c | 2 +- drivers/net/skfp/h/hwmtm.h | 2 +- drivers/net/tg3.c | 2 +- drivers/net/wan/farsync.c | 2 +- drivers/net/wireless/ipw2x00/ipw2100.c | 2 +- drivers/net/wireless/ipw2x00/ipw2200.c | 2 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +- drivers/net/wireless/libertas/cmd.c | 2 +- drivers/pci/pci.c | 2 +- drivers/platform/x86/thinkpad_acpi.c | 2 +- drivers/power/bq27x00_battery.c | 2 +- drivers/scsi/Kconfig | 4 +- drivers/serial/Kconfig | 2 +- drivers/staging/Kconfig | 4 +- drivers/staging/comedi/Kconfig | 4 +- drivers/staging/go7007/Kconfig | 4 +- drivers/staging/otus/hal/hpmain.c | 2 +- drivers/staging/panel/Kconfig | 2 +- drivers/usb/atm/ueagle-atm.c | 2 +- drivers/usb/gadget/Kconfig | 2 +- drivers/usb/serial/ChangeLog.history | 2 +- drivers/usb/serial/Kconfig | 4 +- drivers/usb/wusbcore/security.c | 2 +- drivers/uwb/Kconfig | 4 +- drivers/xen/Kconfig | 2 +- fs/bio.c | 3 +- fs/ext4/Kconfig | 2 +- fs/file_table.c | 1 - fs/fs-writeback.c | 2 +- fs/proc/nommu.c | 2 +- fs/ubifs/Kconfig | 4 +- include/linux/cgroup.h | 5 +++- include/linux/jbd.h | 2 +- include/linux/libata.h | 2 +- include/linux/pwm.h | 2 +- include/linux/usb/wusb.h | 3 +- init/Kconfig | 8 +++--- kernel/power/disk.c | 4 +- kernel/trace/Kconfig | 9 +++---- mm/page_alloc.c | 2 +- net/Kconfig | 2 +- net/ipv6/Kconfig | 18 +++++++------- net/mac80211/Kconfig | 2 +- net/netfilter/Kconfig | 2 +- net/phonet/Kconfig | 2 +- net/sunrpc/Kconfig | 2 +- net/wimax/Kconfig | 2 +- sound/oss/pss.c | 2 +- sound/sh/aica.c | 2 +- sound/soc/blackfin/Kconfig | 2 +- 108 files changed, 225 insertions(+), 176 deletions(-) create mode 100644 Documentation/cgroups/00-INDEX Merging audit/for-next $ git merge audit/for-next Already up-to-date. Merging squashfs/master $ git merge squashfs/master Already up-to-date. Merging omap/for-next $ git merge omap/for-next Already up-to-date. Merging quilt/aoe $ git merge quilt/aoe Already up-to-date. Merging kmemleak/kmemleak $ git merge kmemleak/kmemleak Resolved 'Documentation/kernel-parameters.txt' using previous resolution. Resolved 'MAINTAINERS' using previous resolution. Resolved 'include/linux/percpu.h' using previous resolution. Resolved 'init/main.c' using previous resolution. Resolved 'kernel/module.c' using previous resolution. Resolved 'lib/Kconfig.debug' using previous resolution. Resolved 'mm/slob.c' using previous resolution. Resolved 'mm/vmalloc.c' using previous resolution. Auto-merging Documentation/kernel-parameters.txt CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt Auto-merging MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS Auto-merging arch/arm/kernel/vmlinux.lds.S Auto-merging arch/x86/kernel/vmlinux_32.lds.S Auto-merging arch/x86/kernel/vmlinux_64.lds.S Auto-merging drivers/char/vt.c Auto-merging include/linux/percpu.h CONFLICT (content): Merge conflict in include/linux/percpu.h Auto-merging include/linux/slab.h Auto-merging init/main.c CONFLICT (content): Merge conflict in init/main.c Auto-merging kernel/module.c CONFLICT (content): Merge conflict in kernel/module.c Auto-merging lib/Kconfig.debug CONFLICT (content): Merge conflict in lib/Kconfig.debug Auto-merging mm/Makefile Auto-merging mm/page_alloc.c Auto-merging mm/slab.c Auto-merging mm/slob.c CONFLICT (content): Merge conflict in mm/slob.c Auto-merging mm/slub.c Auto-merging mm/vmalloc.c CONFLICT (content): Merge conflict in mm/vmalloc.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master d929686] Merge commit 'kmemleak/kmemleak' $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 4 + Documentation/kmemleak.txt | 142 ++++ MAINTAINERS | 6 + arch/arm/kernel/vmlinux.lds.S | 2 + arch/x86/kernel/vmlinux_32.lds.S | 1 + arch/x86/kernel/vmlinux_64.lds.S | 1 + drivers/char/vt.c | 7 + include/linux/kmemleak.h | 96 +++ include/linux/percpu.h | 5 + include/linux/slab.h | 2 + init/main.c | 4 +- kernel/module.c | 56 ++ lib/Kconfig.debug | 33 + mm/Makefile | 2 + mm/kmemleak-test.c | 111 +++ mm/kmemleak.c | 1488 +++++++++++++++++++++++++++++++++++ mm/page_alloc.c | 11 + mm/slab.c | 32 +- mm/slob.c | 7 + mm/slub.c | 5 +- mm/vmalloc.c | 30 +- 21 files changed, 2038 insertions(+), 7 deletions(-) create mode 100644 Documentation/kmemleak.txt create mode 100644 include/linux/kmemleak.h create mode 100644 mm/kmemleak-test.c create mode 100644 mm/kmemleak.c Merging suspend/linux-next $ git merge suspend/linux-next Already up-to-date. Merging quilt/driver-core $ git merge quilt/driver-core Resolved 'drivers/media/video/v4l2-device.c' using previous resolution. Resolved 'drivers/net/wimax/i2400m/usb-notif.c' using previous resolution. Resolved 'drivers/sh/maple/maple.c' using previous resolution. Resolved 'lib/Kconfig.debug' using previous resolution. Resolved 'lib/Makefile' using previous resolution. Auto-merging Documentation/kernel-parameters.txt Auto-merging drivers/base/power/main.c Auto-merging drivers/base/sys.c Auto-merging drivers/char/vt.c Auto-merging drivers/dma/dw_dmac.c Auto-merging drivers/gpu/drm/drm_sysfs.c Auto-merging drivers/i2c/i2c-core.c Auto-merging drivers/ide/au1xxx-ide.c Auto-merging drivers/media/video/v4l2-device.c CONFLICT (content): Merge conflict in drivers/media/video/v4l2-device.c Auto-merging drivers/mmc/host/atmel-mci.c Auto-merging drivers/net/au1000_eth.c Auto-merging drivers/net/bmac.c Auto-merging drivers/net/cpmac.c Auto-merging drivers/net/depca.c Auto-merging drivers/net/ehea/ehea_main.c Auto-merging drivers/net/macb.c Auto-merging drivers/net/mv643xx_eth.c Auto-merging drivers/net/sb1250-mac.c Auto-merging drivers/net/smc91x.c Auto-merging drivers/net/smsc911x.c Auto-merging drivers/net/smsc9420.c Auto-merging drivers/net/tc35815.c Auto-merging drivers/net/wimax/i2400m/driver.c Auto-merging drivers/net/wimax/i2400m/usb-notif.c CONFLICT (content): Merge conflict in drivers/net/wimax/i2400m/usb-notif.c Auto-merging drivers/s390/cio/ccwgroup.c Auto-merging drivers/s390/cio/css.c Auto-merging drivers/s390/cio/device.c Auto-merging drivers/s390/net/qeth_l3_main.c Auto-merging drivers/sh/maple/maple.c CONFLICT (content): Merge conflict in drivers/sh/maple/maple.c Auto-merging drivers/spi/omap2_mcspi.c Auto-merging drivers/spi/omap_uwire.c Auto-merging drivers/spi/pxa2xx_spi.c Auto-merging drivers/usb/gadget/ci13xxx_udc.c Auto-merging drivers/usb/gadget/imx_udc.c Auto-merging drivers/video/sh_mobile_lcdcfb.c Auto-merging fs/partitions/check.c Auto-merging fs/sysfs/dir.c Auto-merging include/asm-generic/vmlinux.lds.h Auto-merging include/linux/kernel.h Auto-merging init/main.c Auto-merging kernel/module.c Auto-merging lib/Kconfig.debug CONFLICT (content): Merge conflict in lib/Kconfig.debug Auto-merging lib/Makefile CONFLICT (content): Merge conflict in lib/Makefile Auto-merging lib/kobject.c Auto-merging lib/kobject_uevent.c Auto-merging net/netfilter/nf_conntrack_pptp.c Auto-merging scripts/Makefile.lib Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 621fb2b] Merge branch 'quilt/driver-core' $ git diff -M --stat --summary HEAD^.. include/linux/init.h | 1 + init/main.c | 9 +++++++++ lib/kobject.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 0 deletions(-) Merging quilt/usb $ git merge quilt/usb Renaming arch/arm/mach-s3c2410/include/mach/usb-control.h->arch/arm/plat-s3c/include/plat/usb-control.h Auto-merging arch/arm/plat-s3c/include/plat/usb-control.h CONFLICT (rename/delete): Rename drivers/usb/misc/phidget.h->arch/arm/mach-gemini/include/mach/vmalloc.h in HEAD and deleted in quilt/usb Renaming drivers/usb/serial/cp2101.c->drivers/usb/serial/cp210x.c Auto-merging drivers/usb/serial/cp210x.c Renaming drivers/usb/storage/cypress_atacb.h->drivers/usb/storage/unusual_freecom.h Auto-merging drivers/usb/storage/unusual_freecom.h Renaming drivers/usb/storage/freecom.h->drivers/usb/storage/unusual_alauda.h Auto-merging drivers/usb/storage/unusual_alauda.h Renaming drivers/usb/storage/isd200.h->drivers/usb/storage/unusual_karma.h Auto-merging drivers/usb/storage/unusual_karma.h Renaming drivers/usb/storage/sddr55.h->drivers/usb/storage/unusual_onetouch.h Auto-merging drivers/usb/storage/unusual_onetouch.h Auto-merging drivers/usb/gadget/Kconfig Auto-merging drivers/usb/gadget/atmel_usba_udc.c Auto-merging drivers/usb/gadget/file_storage.c Auto-merging drivers/usb/gadget/gmidi.c Auto-merging drivers/usb/host/ohci-hcd.c Auto-merging drivers/usb/serial/Kconfig Auto-merging drivers/usb/storage/transport.c Auto-merging drivers/usb/wusbcore/security.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 4d09395] Merge branch 'quilt/usb' $ git diff -M --stat --summary HEAD^.. Merging quilt/staging $ git merge quilt/staging Auto-merging drivers/staging/Kconfig Auto-merging drivers/staging/comedi/Kconfig Removing drivers/staging/epl/EdrvFec5282.h Removing drivers/staging/epl/EplObjDef.h Removing drivers/staging/epl/EplTimeruNull.c Removing drivers/staging/epl/EplTimeruWin32.c Removing drivers/staging/epl/ShbIpc-Win32.c Removing drivers/staging/epl/kernel/EplNmtkCal.h Removing drivers/staging/epl/kernel/EplObdkCal.h Removing drivers/staging/frontier/frontier_compat.h Removing drivers/staging/frontier/surface_sysfs.h Auto-merging drivers/staging/otus/hal/hpmain.c Removing drivers/staging/slicoss/gbdownload.h Removing drivers/staging/slicoss/gbrcvucode.h Removing drivers/staging/slicoss/oasisdbgdownload.h Removing drivers/staging/slicoss/oasisdownload.h Removing drivers/staging/slicoss/oasisrcvucode.h Removing drivers/staging/slicoss/slic_os.h Removing drivers/staging/slicoss/slicbuild.h Removing drivers/staging/slicoss/slicdbg.h Removing drivers/staging/slicoss/slicdump.h Removing drivers/staging/slicoss/slicinc.h Removing drivers/staging/sxg/saharadbgdownload.h Removing drivers/staging/sxg/sxgphycode.h Removing drivers/staging/winbond/bss_f.h Removing drivers/staging/winbond/bssdscpt.h Removing drivers/staging/winbond/common.h Removing drivers/staging/winbond/ds_tkip.h Removing drivers/staging/winbond/gl_80211.h Removing drivers/staging/winbond/ioctls.h Removing drivers/staging/winbond/mlme_mib.h Removing drivers/staging/winbond/mto_f.h Removing drivers/staging/winbond/os_common.h Removing drivers/staging/winbond/sme_s.h Removing drivers/staging/winbond/wb35_ver.h Removing drivers/staging/wlan-ng/p80211metamib.h Removing drivers/staging/wlan-ng/p80211metamsg.h Removing drivers/staging/wlan-ng/wlan_compat.h Auto-merging firmware/Makefile Auto-merging firmware/WHENCE Auto-merging include/linux/connector.h Auto-merging mm/filemap.c Merge made by recursive. .../filesystems/pohmelfs/design_notes.txt | 70 + Documentation/filesystems/pohmelfs/info.txt | 86 + .../filesystems/pohmelfs/network_protocol.txt | 227 + drivers/staging/Kconfig | 22 + drivers/staging/Makefile | 11 + drivers/staging/agnx/agnx.h | 14 +- drivers/staging/agnx/debug.h | 21 +- drivers/staging/agnx/pci.c | 75 +- drivers/staging/agnx/phy.c | 32 +- drivers/staging/agnx/rf.c | 23 +- drivers/staging/agnx/sta.c | 21 +- drivers/staging/agnx/sta.h | 2 +- drivers/staging/agnx/table.c | 12 +- drivers/staging/agnx/xmit.c | 216 +- drivers/staging/altpciechdma/altpciechdma.c | 80 +- drivers/staging/android/binder.c | 18 +- drivers/staging/android/ram_console.c | 8 +- drivers/staging/asus_oled/asus_oled.c | 149 +- drivers/staging/at76_usb/TODO | 9 +- drivers/staging/at76_usb/at76_usb.c | 21 +- drivers/staging/at76_usb/at76_usb.h | 87 + drivers/staging/b3dfg/Kconfig | 9 + drivers/staging/b3dfg/Makefile | 1 + drivers/staging/b3dfg/TODO | 4 + drivers/staging/b3dfg/b3dfg.c | 1119 +++ drivers/staging/comedi/Kconfig | 14 + drivers/staging/comedi/comedi.h | 83 +- drivers/staging/comedi/comedi_compat32.c | 128 +- drivers/staging/comedi/comedi_fops.c | 293 +- drivers/staging/comedi/comedi_fops.h | 1 + drivers/staging/comedi/comedi_ksyms.c | 12 +- drivers/staging/comedi/comedi_rt.h | 9 +- drivers/staging/comedi/comedidev.h | 202 +- drivers/staging/comedi/comedilib.h | 114 +- drivers/staging/comedi/drivers.c | 187 +- drivers/staging/comedi/drivers/8253.h | 420 + drivers/staging/comedi/drivers/8255.c | 442 + drivers/staging/comedi/drivers/8255.h | 57 + drivers/staging/comedi/drivers/Makefile | 113 +- drivers/staging/comedi/drivers/acl7225b.c | 149 + .../comedi/drivers/addi-data/APCI1710_82x54.c | 1047 +++ .../comedi/drivers/addi-data/APCI1710_82x54.h | 73 + .../comedi/drivers/addi-data/APCI1710_Chrono.c | 2032 +++++ .../comedi/drivers/addi-data/APCI1710_Chrono.h | 74 + .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 1020 +++ .../comedi/drivers/addi-data/APCI1710_Dig_io.h | 46 + .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 5363 ++++++++++++ .../comedi/drivers/addi-data/APCI1710_INCCPT.h | 271 + .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 861 ++ .../comedi/drivers/addi-data/APCI1710_Inp_cpt.h | 47 + .../comedi/drivers/addi-data/APCI1710_Pwm.c | 3588 ++++++++ .../comedi/drivers/addi-data/APCI1710_Pwm.h | 76 + .../comedi/drivers/addi-data/APCI1710_Ssi.c | 848 ++ .../comedi/drivers/addi-data/APCI1710_Ssi.h | 43 + .../comedi/drivers/addi-data/APCI1710_Tor.c | 2049 +++++ .../comedi/drivers/addi-data/APCI1710_Tor.h | 57 + .../comedi/drivers/addi-data/APCI1710_Ttl.c | 1038 +++ .../comedi/drivers/addi-data/APCI1710_Ttl.h | 44 + .../comedi/drivers/addi-data/addi_amcc_S5920.c | 203 + .../comedi/drivers/addi-data/addi_amcc_S5920.h | 27 + .../comedi/drivers/addi-data/addi_amcc_s5933.h | 476 + .../staging/comedi/drivers/addi-data/addi_common.c | 3062 +++++++ .../staging/comedi/drivers/addi-data/addi_common.h | 462 + .../staging/comedi/drivers/addi-data/addi_eeprom.c | 1158 +++ .../comedi/drivers/addi-data/amcc_s5933_58.h | 457 + .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 1265 +++ .../comedi/drivers/addi-data/hwdrv_APCI1710.h | 71 + .../comedi/drivers/addi-data/hwdrv_apci035.c | 600 ++ .../comedi/drivers/addi-data/hwdrv_apci035.h | 123 + .../comedi/drivers/addi-data/hwdrv_apci1032.c | 285 + .../comedi/drivers/addi-data/hwdrv_apci1032.h | 63 + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 3045 +++++++ .../comedi/drivers/addi-data/hwdrv_apci1500.h | 165 + .../comedi/drivers/addi-data/hwdrv_apci1516.c | 542 ++ .../comedi/drivers/addi-data/hwdrv_apci1516.h | 64 + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 1105 +++ .../comedi/drivers/addi-data/hwdrv_apci1564.h | 119 + .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 780 ++ .../comedi/drivers/addi-data/hwdrv_apci16xx.h | 94 + .../comedi/drivers/addi-data/hwdrv_apci2016.c | 460 + .../comedi/drivers/addi-data/hwdrv_apci2016.h | 70 + .../comedi/drivers/addi-data/hwdrv_apci2032.c | 579 ++ .../comedi/drivers/addi-data/hwdrv_apci2032.h | 81 + .../comedi/drivers/addi-data/hwdrv_apci2200.c | 549 ++ .../comedi/drivers/addi-data/hwdrv_apci2200.h | 61 + .../comedi/drivers/addi-data/hwdrv_apci3120.c | 2697 ++++++ .../comedi/drivers/addi-data/hwdrv_apci3120.h | 241 + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 3642 ++++++++ .../comedi/drivers/addi-data/hwdrv_apci3200.h | 187 + .../comedi/drivers/addi-data/hwdrv_apci3501.c | 742 ++ .../comedi/drivers/addi-data/hwdrv_apci3501.h | 94 + .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 1691 ++++ .../comedi/drivers/addi-data/hwdrv_apci3xxx.h | 62 + drivers/staging/comedi/drivers/addi_apci_035.c | 5 + drivers/staging/comedi/drivers/addi_apci_1032.c | 3 + drivers/staging/comedi/drivers/addi_apci_1500.c | 3 + drivers/staging/comedi/drivers/addi_apci_1516.c | 3 + drivers/staging/comedi/drivers/addi_apci_1564.c | 3 + drivers/staging/comedi/drivers/addi_apci_16xx.c | 3 + drivers/staging/comedi/drivers/addi_apci_1710.c | 3 + drivers/staging/comedi/drivers/addi_apci_2016.c | 3 + drivers/staging/comedi/drivers/addi_apci_2032.c | 3 + drivers/staging/comedi/drivers/addi_apci_2200.c | 3 + drivers/staging/comedi/drivers/addi_apci_3001.c | 3 + drivers/staging/comedi/drivers/addi_apci_3120.c | 3 + drivers/staging/comedi/drivers/addi_apci_3200.c | 3 + drivers/staging/comedi/drivers/addi_apci_3300.c | 3 + drivers/staging/comedi/drivers/addi_apci_3501.c | 3 + drivers/staging/comedi/drivers/addi_apci_3xxx.c | 3 + drivers/staging/comedi/drivers/addi_apci_all.c | 18 + drivers/staging/comedi/drivers/adl_pci6208.c | 391 + drivers/staging/comedi/drivers/adl_pci7296.c | 174 + drivers/staging/comedi/drivers/adl_pci7432.c | 202 + drivers/staging/comedi/drivers/adl_pci8164.c | 512 ++ drivers/staging/comedi/drivers/adl_pci9111.c | 1391 +++ drivers/staging/comedi/drivers/adl_pci9118.c | 2100 +++++ drivers/staging/comedi/drivers/adq12b.c | 394 + drivers/staging/comedi/drivers/adv_pci1710.c | 1568 ++++ drivers/staging/comedi/drivers/adv_pci1723.c | 465 + drivers/staging/comedi/drivers/adv_pci_dio.c | 1077 +++ drivers/staging/comedi/drivers/aio_aio12_8.c | 226 + drivers/staging/comedi/drivers/aio_iiro_16.c | 177 + drivers/staging/comedi/drivers/am9513.h | 79 + drivers/staging/comedi/drivers/amcc_s5933.h | 172 + drivers/staging/comedi/drivers/amplc_dio200.c | 1483 ++++ drivers/staging/comedi/drivers/amplc_pc236.c | 654 ++ drivers/staging/comedi/drivers/amplc_pc263.c | 431 + drivers/staging/comedi/drivers/amplc_pci224.c | 1545 ++++ drivers/staging/comedi/drivers/amplc_pci230.c | 2977 +++++++ drivers/staging/comedi/drivers/c6xdigio.c | 517 ++ drivers/staging/comedi/drivers/cb_das16_cs.c | 976 +++ drivers/staging/comedi/drivers/cb_pcidas.c | 1831 ++++ drivers/staging/comedi/drivers/cb_pcidas64.c | 4222 +++++++++ drivers/staging/comedi/drivers/cb_pcidda.c | 841 ++ drivers/staging/comedi/drivers/cb_pcidio.c | 294 + drivers/staging/comedi/drivers/cb_pcimdas.c | 484 ++ drivers/staging/comedi/drivers/cb_pcimdda.c | 474 + drivers/staging/comedi/drivers/comedi_bond.c | 56 +- drivers/staging/comedi/drivers/comedi_fc.c | 14 +- drivers/staging/comedi/drivers/comedi_fc.h | 18 +- drivers/staging/comedi/drivers/comedi_parport.c | 44 +- drivers/staging/comedi/drivers/comedi_rt_timer.c | 728 ++ drivers/staging/comedi/drivers/comedi_test.c | 80 +- drivers/staging/comedi/drivers/contec_pci_dio.c | 230 + drivers/staging/comedi/drivers/daqboard2000.c | 877 ++ drivers/staging/comedi/drivers/das08.c | 1068 +++ drivers/staging/comedi/drivers/das08.h | 78 + drivers/staging/comedi/drivers/das08_cs.c | 488 ++ drivers/staging/comedi/drivers/das16.c | 1730 ++++ drivers/staging/comedi/drivers/das16m1.c | 765 ++ drivers/staging/comedi/drivers/das1800.c | 1758 ++++ drivers/staging/comedi/drivers/das6402.c | 354 + drivers/staging/comedi/drivers/das800.c | 894 ++ drivers/staging/comedi/drivers/dmm32at.c | 1081 +++ drivers/staging/comedi/drivers/dt2801.c | 697 ++ drivers/staging/comedi/drivers/dt2811.c | 604 ++ drivers/staging/comedi/drivers/dt2814.c | 383 + drivers/staging/comedi/drivers/dt2815.c | 264 + drivers/staging/comedi/drivers/dt2817.c | 178 + drivers/staging/comedi/drivers/dt282x.c | 1471 ++++ drivers/staging/comedi/drivers/dt3000.c | 983 +++ drivers/staging/comedi/drivers/dt9812.c | 40 +- drivers/staging/comedi/drivers/fl512.c | 186 + drivers/staging/comedi/drivers/gsc_hpdi.c | 1060 +++ drivers/staging/comedi/drivers/icp_multi.c | 392 +- drivers/staging/comedi/drivers/icp_multi.h | 19 +- drivers/staging/comedi/drivers/ii_pci20kc.c | 612 ++ drivers/staging/comedi/drivers/jr3_pci.c | 976 +++ drivers/staging/comedi/drivers/jr3_pci.h | 681 ++ drivers/staging/comedi/drivers/ke_counter.c | 254 + drivers/staging/comedi/drivers/me4000.c | 296 +- drivers/staging/comedi/drivers/me4000.h | 268 +- drivers/staging/comedi/drivers/me_daq.c | 55 +- drivers/staging/comedi/drivers/mite.c | 63 +- drivers/staging/comedi/drivers/mite.h | 68 +- drivers/staging/comedi/drivers/mpc624.c | 386 + drivers/staging/comedi/drivers/mpc8260cpm.c | 169 + drivers/staging/comedi/drivers/multiq3.c | 333 + drivers/staging/comedi/drivers/ni_6527.c | 489 ++ drivers/staging/comedi/drivers/ni_65xx.c | 809 ++ drivers/staging/comedi/drivers/ni_660x.c | 1324 +++ drivers/staging/comedi/drivers/ni_670x.c | 337 + drivers/staging/comedi/drivers/ni_at_a2150.c | 909 ++ drivers/staging/comedi/drivers/ni_at_ao.c | 454 + drivers/staging/comedi/drivers/ni_atmio.c | 513 ++ drivers/staging/comedi/drivers/ni_atmio16d.c | 860 ++ drivers/staging/comedi/drivers/ni_daq_700.c | 841 ++ drivers/staging/comedi/drivers/ni_daq_dio24.c | 598 ++ drivers/staging/comedi/drivers/ni_labpc.c | 2005 +++++ drivers/staging/comedi/drivers/ni_labpc.h | 85 + drivers/staging/comedi/drivers/ni_labpc_cs.c | 573 ++ drivers/staging/comedi/drivers/ni_mio_common.c | 5862 +++++++++++++ drivers/staging/comedi/drivers/ni_mio_cs.c | 551 ++ drivers/staging/comedi/drivers/ni_pcidio.c | 1302 +++ drivers/staging/comedi/drivers/ni_pcimio.c | 1788 ++++ drivers/staging/comedi/drivers/ni_stc.h | 1498 ++++ drivers/staging/comedi/drivers/ni_tio.c | 1691 ++++ drivers/staging/comedi/drivers/ni_tio.h | 163 + drivers/staging/comedi/drivers/ni_tio_internal.h | 774 ++ drivers/staging/comedi/drivers/ni_tiocmd.c | 523 ++ drivers/staging/comedi/drivers/pcl711.c | 623 ++ drivers/staging/comedi/drivers/pcl724.c | 222 + drivers/staging/comedi/drivers/pcl725.c | 111 + drivers/staging/comedi/drivers/pcl726.c | 377 + drivers/staging/comedi/drivers/pcl730.c | 168 + drivers/staging/comedi/drivers/pcl812.c | 1605 ++++ drivers/staging/comedi/drivers/pcl816.c | 1251 +++ drivers/staging/comedi/drivers/pcl818.c | 1988 +++++ drivers/staging/comedi/drivers/pcm3724.c | 307 + drivers/staging/comedi/drivers/pcm3730.c | 152 + drivers/staging/comedi/drivers/pcmad.c | 173 + drivers/staging/comedi/drivers/pcmda12.c | 306 + drivers/staging/comedi/drivers/pcmmio.c | 1333 +++ drivers/staging/comedi/drivers/pcmuio.c | 1101 +++ drivers/staging/comedi/drivers/plx9052.h | 86 + drivers/staging/comedi/drivers/plx9080.h | 80 +- drivers/staging/comedi/drivers/poc.c | 247 + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 1363 +++ drivers/staging/comedi/drivers/rtd520.c | 277 +- drivers/staging/comedi/drivers/rtd520.h | 676 +- drivers/staging/comedi/drivers/rti800.c | 458 + drivers/staging/comedi/drivers/rti802.c | 151 + drivers/staging/comedi/drivers/s526.c | 977 +++ drivers/staging/comedi/drivers/s626.c | 2538 +++--- drivers/staging/comedi/drivers/s626.h | 1226 ++-- drivers/staging/comedi/drivers/serial2002.c | 870 ++ drivers/staging/comedi/drivers/skel.c | 624 ++ drivers/staging/comedi/drivers/ssv_dnp.c | 311 + drivers/staging/comedi/drivers/unioxx5.c | 515 ++ drivers/staging/comedi/drivers/usbdux.c | 304 +- drivers/staging/comedi/drivers/usbduxfast.c | 2028 +++-- drivers/staging/comedi/interrupt.h | 9 - drivers/staging/comedi/kcomedilib/data.c | 22 +- drivers/staging/comedi/kcomedilib/dio.c | 18 +- drivers/staging/comedi/kcomedilib/get.c | 132 +- .../staging/comedi/kcomedilib/kcomedilib_main.c | 138 +- drivers/staging/comedi/kcomedilib/ksyms.c | 4 - drivers/staging/comedi/pci_ids.h | 2 +- drivers/staging/comedi/proc.c | 17 +- drivers/staging/comedi/range.c | 35 +- drivers/staging/comedi/rt.c | 29 +- drivers/staging/comedi/rt_pend_tq.c | 8 +- drivers/staging/dst/Kconfig | 67 + drivers/staging/dst/Makefile | 3 + drivers/staging/dst/crypto.c | 731 ++ drivers/staging/dst/dcore.c | 995 +++ drivers/staging/dst/export.c | 657 ++ drivers/staging/dst/state.c | 839 ++ drivers/staging/dst/thread_pool.c | 345 + drivers/staging/dst/trans.c | 335 + drivers/staging/echo/bit_operations.h | 30 +- drivers/staging/echo/echo.c | 42 +- drivers/staging/echo/echo.h | 2 - drivers/staging/echo/fir.h | 28 +- drivers/staging/echo/mmx.h | 408 +- drivers/staging/epl/Benchmark.h | 12 - drivers/staging/epl/Debug.h | 48 +- drivers/staging/epl/Edrv8139.c | 108 +- drivers/staging/epl/EdrvFec.h | 6 +- drivers/staging/epl/EdrvFec5282.h | 340 - drivers/staging/epl/EdrvSim.h | 4 +- drivers/staging/epl/Epl.h | 139 +- drivers/staging/epl/EplAmi.h | 121 +- drivers/staging/epl/EplApiGeneric.c | 188 +- drivers/staging/epl/EplApiLinuxKernel.c | 105 +- drivers/staging/epl/EplApiProcessImage.c | 31 +- drivers/staging/epl/EplDll.h | 50 +- drivers/staging/epl/EplDllCal.h | 2 +- drivers/staging/epl/EplDllk.c | 134 +- drivers/staging/epl/EplDllkCal.c | 14 +- drivers/staging/epl/EplDlluCal.c | 6 +- drivers/staging/epl/EplErrorHandlerk.c | 36 +- drivers/staging/epl/EplEvent.h | 8 +- drivers/staging/epl/EplEventk.c | 24 +- drivers/staging/epl/EplEventu.c | 25 +- drivers/staging/epl/EplFrame.h | 166 +- drivers/staging/epl/EplIdentu.c | 26 +- drivers/staging/epl/EplInc.h | 23 +- drivers/staging/epl/EplInstDef.h | 60 +- drivers/staging/epl/EplNmt.h | 2 +- drivers/staging/epl/EplNmtCnu.c | 39 +- drivers/staging/epl/EplNmtMnu.c | 121 +- drivers/staging/epl/EplNmtk.c | 30 +- drivers/staging/epl/EplNmtkCal.c | 2 - drivers/staging/epl/EplNmtu.c | 22 +- drivers/staging/epl/EplNmtuCal.c | 2 +- drivers/staging/epl/EplObd.c | 444 +- drivers/staging/epl/EplObd.h | 58 +- drivers/staging/epl/EplObdMacro.h | 40 +- drivers/staging/epl/EplObdkCal.c | 1 - drivers/staging/epl/EplObdu.c | 69 +- drivers/staging/epl/EplObduCal.c | 75 +- drivers/staging/epl/EplObjDef.h | 208 - drivers/staging/epl/EplPdo.h | 6 +- drivers/staging/epl/EplPdok.c | 73 +- drivers/staging/epl/EplPdou.c | 34 +- drivers/staging/epl/EplSdo.h | 24 +- drivers/staging/epl/EplSdoAsndu.c | 26 +- drivers/staging/epl/EplSdoAsySequ.c | 72 +- drivers/staging/epl/EplSdoComu.c | 153 +- drivers/staging/epl/EplSdoUdpu.c | 163 +- drivers/staging/epl/EplStatusu.c | 19 +- drivers/staging/epl/EplTarget.h | 109 +- drivers/staging/epl/EplTimer.h | 3 +- drivers/staging/epl/EplTimeruLinuxKernel.c | 26 +- drivers/staging/epl/EplTimeruNull.c | 312 - drivers/staging/epl/EplTimeruWin32.c | 513 -- drivers/staging/epl/SharedBuff.c | 111 +- drivers/staging/epl/SharedBuff.h | 17 - drivers/staging/epl/ShbIpc-LinuxKernel.c | 48 +- drivers/staging/epl/ShbIpc-Win32.c | 1202 --- drivers/staging/epl/ShbIpc.h | 26 - drivers/staging/epl/TimerHighReskX86.c | 34 +- drivers/staging/epl/VirtualEthernetLinux.c | 5 +- drivers/staging/epl/amix86.c | 316 +- drivers/staging/epl/demo_main.c | 84 +- drivers/staging/epl/edrv.h | 22 +- drivers/staging/epl/global.h | 1253 +--- drivers/staging/epl/kernel/EplDllk.h | 24 +- drivers/staging/epl/kernel/EplDllkCal.h | 14 +- drivers/staging/epl/kernel/EplErrorHandlerk.h | 20 +- drivers/staging/epl/kernel/EplEventk.h | 28 +- drivers/staging/epl/kernel/EplNmtk.h | 25 +- drivers/staging/epl/kernel/EplNmtkCal.h | 89 - drivers/staging/epl/kernel/EplObdk.h | 122 +- drivers/staging/epl/kernel/EplObdkCal.h | 89 - drivers/staging/epl/kernel/EplPdok.h | 12 - drivers/staging/epl/kernel/EplPdokCal.h | 13 - drivers/staging/epl/kernel/EplTimerHighResk.h | 43 +- drivers/staging/epl/kernel/EplTimerk.h | 36 +- drivers/staging/epl/kernel/VirtualEthernet.h | 16 +- drivers/staging/epl/proc_fs.c | 23 +- drivers/staging/epl/user/EplCfgMau.h | 80 +- drivers/staging/epl/user/EplDllu.h | 14 +- drivers/staging/epl/user/EplDlluCal.h | 15 +- drivers/staging/epl/user/EplEventu.h | 28 +- drivers/staging/epl/user/EplIdentu.h | 34 +- drivers/staging/epl/user/EplLedu.h | 32 +- drivers/staging/epl/user/EplNmtCnu.h | 32 +- drivers/staging/epl/user/EplNmtMnu.h | 42 +- drivers/staging/epl/user/EplNmtu.h | 38 +- drivers/staging/epl/user/EplNmtuCal.h | 17 +- drivers/staging/epl/user/EplObdu.h | 83 +- drivers/staging/epl/user/EplObduCal.h | 94 +- drivers/staging/epl/user/EplPdou.h | 22 +- drivers/staging/epl/user/EplSdoAsndu.h | 33 +- drivers/staging/epl/user/EplSdoAsySequ.h | 41 +- drivers/staging/epl/user/EplSdoComu.h | 48 +- drivers/staging/epl/user/EplSdoUdpu.h | 34 +- drivers/staging/epl/user/EplStatusu.h | 32 +- drivers/staging/epl/user/EplTimeru.h | 38 +- drivers/staging/et131x/et1310_rx.c | 3 +- drivers/staging/frontier/README | 53 +- drivers/staging/frontier/alphatrack.c | 383 +- drivers/staging/frontier/alphatrack.h | 80 +- drivers/staging/frontier/frontier_compat.h | 63 - drivers/staging/frontier/surface_sysfs.h | 100 - drivers/staging/frontier/tranzport.c | 685 +- drivers/staging/go7007/go7007-v4l2.c | 1 - drivers/staging/go7007/s2250-board.c | 7 +- drivers/staging/heci/Kconfig | 6 + drivers/staging/heci/Makefile | 9 + drivers/staging/heci/TODO | 6 + drivers/staging/heci/heci.h | 176 + drivers/staging/heci/heci_data_structures.h | 530 ++ drivers/staging/heci/heci_init.c | 1077 +++ drivers/staging/heci/heci_interface.c | 485 ++ drivers/staging/heci/heci_interface.h | 170 + drivers/staging/heci/heci_main.c | 1564 ++++ drivers/staging/heci/heci_version.h | 54 + drivers/staging/heci/interrupt.c | 1553 ++++ drivers/staging/heci/io_heci.c | 847 ++ drivers/staging/line6/Kconfig | 21 + drivers/staging/line6/Makefile | 15 + drivers/staging/line6/audio.c | 72 + drivers/staging/line6/audio.h | 24 + drivers/staging/line6/capture.c | 372 + drivers/staging/line6/capture.h | 32 + drivers/staging/line6/config.h | 48 + drivers/staging/line6/control.c | 840 ++ drivers/staging/line6/control.h | 187 + drivers/staging/line6/driver.c | 1102 +++ drivers/staging/line6/driver.h | 204 + drivers/staging/line6/dumprequest.c | 151 + drivers/staging/line6/dumprequest.h | 90 + drivers/staging/line6/midi.c | 422 + drivers/staging/line6/midi.h | 87 + drivers/staging/line6/midibuf.c | 262 + drivers/staging/line6/midibuf.h | 39 + drivers/staging/line6/pcm.c | 301 + drivers/staging/line6/pcm.h | 222 + drivers/staging/line6/playback.c | 427 + drivers/staging/line6/playback.h | 30 + drivers/staging/line6/pod.c | 1151 +++ drivers/staging/line6/pod.h | 204 + drivers/staging/line6/revision.h | 4 + drivers/staging/line6/toneport.c | 241 + drivers/staging/line6/toneport.h | 45 + drivers/staging/line6/usbdefs.h | 74 + drivers/staging/line6/variax.c | 546 ++ drivers/staging/line6/variax.h | 108 + drivers/staging/me4000/me4000.c | 193 +- drivers/staging/meilhaus/me0600_device.c | 4 +- drivers/staging/meilhaus/me0600_dio.c | 18 +- drivers/staging/meilhaus/me0600_ext_irq.c | 8 +- drivers/staging/meilhaus/me0600_optoi.c | 14 +- drivers/staging/meilhaus/me0600_relay.c | 14 +- drivers/staging/meilhaus/me0600_ttli.c | 12 +- drivers/staging/meilhaus/me0900_device.c | 4 +- drivers/staging/meilhaus/me0900_di.c | 12 +- drivers/staging/meilhaus/me0900_do.c | 14 +- drivers/staging/meilhaus/me1000_device.c | 8 +- drivers/staging/meilhaus/me1000_dio.c | 4 +- drivers/staging/meilhaus/me1400_device.c | 4 +- drivers/staging/meilhaus/me1400_ext_irq.c | 7 +- drivers/staging/meilhaus/me1600_ao.c | 70 +- drivers/staging/meilhaus/me1600_ao.h | 4 - drivers/staging/meilhaus/me1600_device.c | 8 +- drivers/staging/meilhaus/me4600_ai.c | 157 +- drivers/staging/meilhaus/me4600_ai.h | 4 - drivers/staging/meilhaus/me4600_ao.c | 191 +- drivers/staging/meilhaus/me4600_ao.h | 4 - drivers/staging/meilhaus/me4600_device.c | 4 +- drivers/staging/meilhaus/me4600_di.c | 14 +- drivers/staging/meilhaus/me4600_dio.c | 16 +- drivers/staging/meilhaus/me4600_do.c | 16 +- drivers/staging/meilhaus/me4600_ext_irq.c | 21 +- drivers/staging/meilhaus/me6000_ao.c | 146 +- drivers/staging/meilhaus/me6000_ao.h | 4 - drivers/staging/meilhaus/me6000_device.c | 4 +- drivers/staging/meilhaus/me6000_dio.c | 16 +- drivers/staging/meilhaus/me8100_device.c | 4 +- drivers/staging/meilhaus/me8100_di.c | 24 +- drivers/staging/meilhaus/me8100_do.c | 16 +- drivers/staging/meilhaus/me8200_device.c | 4 +- drivers/staging/meilhaus/me8200_di.c | 58 +- drivers/staging/meilhaus/me8200_dio.c | 16 +- drivers/staging/meilhaus/me8200_do.c | 26 +- drivers/staging/meilhaus/me8254.c | 14 +- drivers/staging/meilhaus/me8255.c | 4 +- drivers/staging/meilhaus/mecirc_buf.h | 16 +- drivers/staging/meilhaus/medevice.c | 14 +- drivers/staging/meilhaus/medlist.c | 6 +- drivers/staging/meilhaus/medlock.c | 4 +- drivers/staging/meilhaus/medummy.c | 84 +- drivers/staging/meilhaus/memain.c | 34 +- drivers/staging/meilhaus/meslist.c | 6 +- drivers/staging/meilhaus/meslock.c | 2 +- drivers/staging/meilhaus/mesubdevice.c | 12 +- drivers/staging/meilhaus/metempl_device.c | 4 +- drivers/staging/meilhaus/metempl_sub.c | 10 +- drivers/staging/mimio/Kconfig | 2 +- drivers/staging/otus/80211core/amsdu.c | 145 +- drivers/staging/otus/80211core/cmmsta.c | 5 +- drivers/staging/otus/80211core/coid.c | 8 +- drivers/staging/otus/80211core/cwm.c | 6 +- drivers/staging/otus/TODO | 9 +- drivers/staging/otus/hal/hpani.c | 46 +- drivers/staging/otus/hal/hpmain.c | 99 +- drivers/staging/otus/hal/hpreg.c | 9 +- drivers/staging/otus/hal/hprw.c | 30 +- drivers/staging/otus/hal/hpusb.c | 11 +- drivers/staging/otus/ioctl.c | 4789 +++++------ drivers/staging/otus/usbdrv.c | 12 +- drivers/staging/otus/wwrap.c | 6 +- drivers/staging/p9auth/Kconfig | 9 + drivers/staging/p9auth/Makefile | 1 + drivers/staging/p9auth/p9auth.c | 383 + drivers/staging/phison/Kconfig | 5 + drivers/staging/phison/Makefile | 1 + drivers/staging/phison/phison.c | 106 + drivers/staging/pohmelfs/Kconfig | 28 + drivers/staging/pohmelfs/Makefile | 3 + drivers/staging/pohmelfs/config.c | 478 + drivers/staging/pohmelfs/crypto.c | 880 ++ drivers/staging/pohmelfs/dir.c | 1093 +++ drivers/staging/pohmelfs/inode.c | 1976 +++++ drivers/staging/pohmelfs/lock.c | 182 + drivers/staging/pohmelfs/mcache.c | 171 + drivers/staging/pohmelfs/net.c | 1247 +++ drivers/staging/pohmelfs/netfs.h | 932 ++ drivers/staging/pohmelfs/path_entry.c | 114 + drivers/staging/pohmelfs/trans.c | 715 ++ drivers/staging/rspiusb/rspiusb.c | 5 +- drivers/staging/rt2860/2860_main_dev.c | 50 +- drivers/staging/rt2860/Makefile | 1 - drivers/staging/rt2860/TODO | 4 +- drivers/staging/rt2860/common/cmm_data.c | 27 +- drivers/staging/rt2860/common/cmm_data_2860.c | 144 +- drivers/staging/rt2860/common/cmm_info.c | 6 - drivers/staging/rt2860/common/cmm_sync.c | 2 +- drivers/staging/rt2860/common/cmm_wpa.c | 40 +- drivers/staging/rt2860/common/mlme.c | 289 +- drivers/staging/rt2860/common/rtmp_init.c | 157 +- drivers/staging/rt2860/common/spectrum.c | 2 +- drivers/staging/rt2860/config.mk | 4 - drivers/staging/rt2860/oid.h | 2 + drivers/staging/rt2860/rt2860.h | 22 +- drivers/staging/rt2860/rt28xx.h | 4 - drivers/staging/rt2860/rt_ate.c | 18 +- drivers/staging/rt2860/rt_ate.h | 6 - drivers/staging/rt2860/rt_config.h | 2 - drivers/staging/rt2860/rt_linux.c | 29 +- drivers/staging/rt2860/rt_linux.h | 49 +- drivers/staging/rt2860/rt_main_dev.c | 149 +- drivers/staging/rt2860/rt_profile.c | 2 +- drivers/staging/rt2860/rtmp.h | 61 +- drivers/staging/rt2860/rtmp_def.h | 29 +- drivers/staging/rt2860/sta/assoc.c | 23 +- drivers/staging/rt2860/sta/connect.c | 45 +- drivers/staging/rt2860/sta/dls.c | 4 - drivers/staging/rt2860/sta/rtmp_data.c | 29 +- drivers/staging/rt2860/sta/sync.c | 16 +- drivers/staging/rt2860/sta/wpa.c | 10 +- drivers/staging/rt2860/sta_ioctl.c | 96 +- drivers/staging/rt2860/wpa.h | 1 + drivers/staging/rt2870/2870_main_dev.c | 67 +- drivers/staging/rt2870/TODO | 9 +- drivers/staging/rt2870/common/2870_rtmp_init.c | 35 +- drivers/staging/rt2870/common/cmm_data.c | 3 - drivers/staging/rt2870/common/rtmp_init.c | 2 +- drivers/staging/rt2870/common/rtusb_io.c | 3 +- drivers/staging/rt2870/common/spectrum.c | 2 +- drivers/staging/rt2870/rt2870.h | 7 +- drivers/staging/rt2870/rt_linux.c | 2 +- drivers/staging/rt2870/rt_linux.h | 12 +- drivers/staging/rt2870/sta_ioctl.c | 2 +- drivers/staging/rt3070/2870_main_dev.c | 1627 ++++ drivers/staging/rt3070/Kconfig | 6 + drivers/staging/rt3070/Makefile | 47 + drivers/staging/rt3070/action.h | 68 + drivers/staging/rt3070/aironet.h | 210 + drivers/staging/rt3070/ap.h | 557 ++ drivers/staging/rt3070/chlist.h | 1253 +++ drivers/staging/rt3070/common/2870_rtmp_init.c | 1762 ++++ drivers/staging/rt3070/common/action.c | 1038 +++ drivers/staging/rt3070/common/ba_action.c | 1810 ++++ drivers/staging/rt3070/common/cmm_data.c | 2827 ++++++ drivers/staging/rt3070/common/cmm_data_2870.c | 980 +++ drivers/staging/rt3070/common/cmm_info.c | 3395 ++++++++ drivers/staging/rt3070/common/cmm_sanity.c | 1669 ++++ drivers/staging/rt3070/common/cmm_sync.c | 711 ++ drivers/staging/rt3070/common/cmm_wpa.c | 1606 ++++ drivers/staging/rt3070/common/dfs.c | 441 + drivers/staging/rt3070/common/eeprom.c | 1498 ++++ drivers/staging/rt3070/common/md5.c | 1427 +++ drivers/staging/rt3070/common/mlme.c | 9136 ++++++++++++++++++++ drivers/staging/rt3070/common/netif_block.c | 136 + drivers/staging/rt3070/common/rtmp_init.c | 4197 +++++++++ drivers/staging/rt3070/common/rtmp_tkip.c | 1613 ++++ drivers/staging/rt3070/common/rtmp_wep.c | 508 ++ drivers/staging/rt3070/common/rtusb_bulk.c | 1382 +++ drivers/staging/rt3070/common/rtusb_data.c | 218 + drivers/staging/rt3070/common/rtusb_io.c | 1908 ++++ drivers/staging/rt3070/common/spectrum.c | 1876 ++++ drivers/staging/rt3070/dfs.h | 100 + drivers/staging/rt3070/firmware.h | 558 ++ drivers/staging/rt3070/leap.h | 215 + drivers/staging/rt3070/link_list.h | 134 + drivers/staging/rt3070/md4.h | 42 + drivers/staging/rt3070/md5.h | 107 + drivers/staging/rt3070/mlme.h | 1468 ++++ drivers/staging/rt3070/netif_block.h | 58 + drivers/staging/rt3070/oid.h | 1142 +++ drivers/staging/rt3070/rt2870.h | 756 ++ drivers/staging/rt3070/rt28xx.h | 2725 ++++++ drivers/staging/rt3070/rt_ate.c | 6506 ++++++++++++++ drivers/staging/rt3070/rt_ate.h | 294 + drivers/staging/rt3070/rt_config.h | 121 + drivers/staging/rt3070/rt_linux.c | 1063 +++ drivers/staging/rt3070/rt_linux.h | 887 ++ drivers/staging/rt3070/rt_main_dev.c | 1800 ++++ drivers/staging/rt3070/rt_profile.c | 2041 +++++ drivers/staging/rt3070/rtmp.h | 7728 +++++++++++++++++ drivers/staging/rt3070/rtmp_ckipmic.h | 113 + drivers/staging/rt3070/rtmp_def.h | 1559 ++++ drivers/staging/rt3070/rtmp_type.h | 95 + drivers/staging/rt3070/spectrum.h | 322 + drivers/staging/rt3070/spectrum_def.h | 95 + drivers/staging/rt3070/sta/aironet.c | 1312 +++ drivers/staging/rt3070/sta/assoc.c | 2060 +++++ drivers/staging/rt3070/sta/auth.c | 475 + drivers/staging/rt3070/sta/auth_rsp.c | 167 + drivers/staging/rt3070/sta/connect.c | 2857 ++++++ drivers/staging/rt3070/sta/dls.c | 2170 +++++ drivers/staging/rt3070/sta/rtmp_data.c | 2637 ++++++ drivers/staging/rt3070/sta/sanity.c | 420 + drivers/staging/rt3070/sta/sync.c | 1755 ++++ drivers/staging/rt3070/sta/wpa.c | 2099 +++++ drivers/staging/rt3070/sta_ioctl.c | 7203 +++++++++++++++ drivers/staging/rt3070/wpa.h | 356 + drivers/staging/rtl8187se/dot11d.h | 202 +- drivers/staging/rtl8187se/ieee80211/dot11d.c | 492 +- drivers/staging/rtl8187se/ieee80211/dot11d.h | 204 +- drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 4 +- drivers/staging/rtl8187se/r8180_core.c | 2 +- drivers/staging/rtl8187se/r8180_dm.c | 3450 ++++---- drivers/staging/rtl8187se/r8180_dm.h | 82 +- drivers/staging/rtl8187se/r8180_wx.c | 12 +- drivers/staging/serqt_usb/Kconfig | 9 + drivers/staging/serqt_usb/Makefile | 1 + drivers/staging/serqt_usb/TODO | 8 + drivers/staging/serqt_usb/serqt_usb.c | 2828 ++++++ drivers/staging/slicoss/gbdownload.h | 8215 ------------------ drivers/staging/slicoss/gbrcvucode.h | 238 - drivers/staging/slicoss/oasisdbgdownload.h | 6850 --------------- drivers/staging/slicoss/oasisdownload.h | 6848 --------------- drivers/staging/slicoss/oasisrcvucode.h | 205 - drivers/staging/slicoss/slic.h | 86 +- drivers/staging/slicoss/slic_os.h | 84 - drivers/staging/slicoss/slicbuild.h | 96 - drivers/staging/slicoss/slicdbg.h | 100 - drivers/staging/slicoss/slicdump.h | 278 - drivers/staging/slicoss/slichw.h | 1038 ++-- drivers/staging/slicoss/slicinc.h | 185 - drivers/staging/slicoss/slicoss.c | 2913 ++----- drivers/staging/stlc45xx/Kconfig | 8 + drivers/staging/stlc45xx/Makefile | 1 + drivers/staging/stlc45xx/stlc45xx.c | 2606 ++++++ drivers/staging/stlc45xx/stlc45xx.h | 283 + drivers/staging/stlc45xx/stlc45xx_lmac.h | 434 + drivers/staging/sxg/Kconfig | 2 +- drivers/staging/sxg/Makefile | 4 +- drivers/staging/sxg/saharadbgdownload.h | 4854 ----------- drivers/staging/sxg/sxg.c | 2885 ++++--- drivers/staging/sxg/sxg.h | 919 +- drivers/staging/sxg/sxg_ethtool.c | 328 + drivers/staging/sxg/sxg_os.h | 100 +- drivers/staging/sxg/sxgdbg.h | 129 +- drivers/staging/sxg/sxghif.h | 1110 ++- drivers/staging/sxg/sxghw.h | 1564 ++-- drivers/staging/sxg/sxgphycode-1.2.h | 130 + drivers/staging/sxg/sxgphycode.h | 349 - drivers/staging/uc2322/Kconfig | 10 + drivers/staging/uc2322/Makefile | 1 + drivers/staging/uc2322/TODO | 7 + drivers/staging/uc2322/aten2011.c | 2452 ++++++ drivers/staging/usbip/stub_rx.c | 4 +- drivers/staging/usbip/vhci_sysfs.c | 3 +- drivers/staging/winbond/bss_f.h | 63 - drivers/staging/winbond/bssdscpt.h | 164 - drivers/staging/winbond/common.h | 27 - drivers/staging/winbond/core.h | 7 +- drivers/staging/winbond/ds_tkip.h | 37 - drivers/staging/winbond/gl_80211.h | 126 - drivers/staging/winbond/ioctls.h | 678 -- drivers/staging/winbond/mds.c | 26 +- drivers/staging/winbond/mds_s.h | 24 +- drivers/staging/winbond/mlme_mib.h | 84 - drivers/staging/winbond/mlmetxrx.c | 2 +- drivers/staging/winbond/mto.c | 24 +- drivers/staging/winbond/mto.h | 12 +- drivers/staging/winbond/mto_f.h | 13 - drivers/staging/winbond/os_common.h | 2 - drivers/staging/winbond/phy_calibration.c | 28 +- drivers/staging/winbond/phy_calibration.h | 2 +- drivers/staging/winbond/reg.c | 81 +- drivers/staging/winbond/sme_api.h | 3 - drivers/staging/winbond/sme_s.h | 236 - drivers/staging/winbond/wb35_ver.h | 30 - drivers/staging/winbond/wb35reg.c | 41 +- drivers/staging/winbond/wb35reg_f.h | 70 +- drivers/staging/winbond/wb35rx.c | 43 +- drivers/staging/winbond/wb35rx_f.h | 6 +- drivers/staging/winbond/wb35rx_s.h | 8 +- drivers/staging/winbond/wb35tx.c | 54 +- drivers/staging/winbond/wb35tx_f.h | 8 +- drivers/staging/winbond/wb35tx_s.h | 6 +- drivers/staging/winbond/wbhal.c | 50 +- drivers/staging/winbond/wbhal_f.h | 94 +- drivers/staging/winbond/wbhal_s.h | 87 +- drivers/staging/winbond/wbusb.c | 20 +- drivers/staging/winbond/wbusb_s.h | 16 +- drivers/staging/wlan-ng/README | 4 +- drivers/staging/wlan-ng/hfa384x.h | 2638 ++----- drivers/staging/wlan-ng/hfa384x_usb.c | 2295 ++--- drivers/staging/wlan-ng/p80211conv.c | 377 +- drivers/staging/wlan-ng/p80211conv.h | 131 +- drivers/staging/wlan-ng/p80211hdr.h | 146 +- drivers/staging/wlan-ng/p80211ioctl.h | 46 +- drivers/staging/wlan-ng/p80211meta.h | 110 +- drivers/staging/wlan-ng/p80211metadef.h | 544 -- drivers/staging/wlan-ng/p80211metamib.h | 105 - drivers/staging/wlan-ng/p80211metamsg.h | 105 - drivers/staging/wlan-ng/p80211metastruct.h | 424 +- drivers/staging/wlan-ng/p80211mgmt.h | 441 +- drivers/staging/wlan-ng/p80211msg.h | 48 +- drivers/staging/wlan-ng/p80211netdev.c | 411 +- drivers/staging/wlan-ng/p80211netdev.h | 218 +- drivers/staging/wlan-ng/p80211req.c | 235 +- drivers/staging/wlan-ng/p80211req.h | 17 +- drivers/staging/wlan-ng/p80211types.h | 505 +- drivers/staging/wlan-ng/p80211wep.c | 24 +- drivers/staging/wlan-ng/p80211wext.c | 1214 ++-- drivers/staging/wlan-ng/prism2mgmt.c | 899 +- drivers/staging/wlan-ng/prism2mgmt.h | 69 +- drivers/staging/wlan-ng/prism2mib.c | 905 +-- drivers/staging/wlan-ng/prism2sta.c | 1561 ++-- drivers/staging/wlan-ng/prism2usb.c | 158 +- drivers/staging/wlan-ng/wlan_compat.h | 193 - firmware/Makefile | 6 + firmware/WHENCE | 26 + firmware/slicoss/gbdownload.sys.ihex | 6148 +++++++++++++ firmware/slicoss/gbrcvucode.sys.ihex | 162 + firmware/slicoss/oasisdbgdownload.sys.ihex | 5124 +++++++++++ firmware/slicoss/oasisdownload.sys.ihex | 5124 +++++++++++ firmware/slicoss/oasisrcvucode.sys.ihex | 162 + firmware/sxg/saharadbgdownloadB.sys.ihex | 3937 +++++++++ firmware/sxg/saharadownloadB.sys.ihex | 3385 ++++++++ include/linux/connector.h | 4 +- include/linux/dst.h | 587 ++ mm/filemap.c | 2 + 712 files changed, 312495 insertions(+), 64555 deletions(-) create mode 100644 Documentation/filesystems/pohmelfs/design_notes.txt create mode 100644 Documentation/filesystems/pohmelfs/info.txt create mode 100644 Documentation/filesystems/pohmelfs/network_protocol.txt create mode 100644 drivers/staging/b3dfg/Kconfig create mode 100644 drivers/staging/b3dfg/Makefile create mode 100644 drivers/staging/b3dfg/TODO create mode 100644 drivers/staging/b3dfg/b3dfg.c create mode 100644 drivers/staging/comedi/drivers/8253.h create mode 100644 drivers/staging/comedi/drivers/8255.c create mode 100644 drivers/staging/comedi/drivers/8255.h create mode 100644 drivers/staging/comedi/drivers/acl7225b.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c create mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.h create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_common.c create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_common.h create mode 100644 drivers/staging/comedi/drivers/addi-data/addi_eeprom.c create mode 100644 drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c create mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h create mode 100644 drivers/staging/comedi/drivers/addi_apci_035.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_1032.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_1500.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_1516.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_1564.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_16xx.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_1710.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_2016.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_2032.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_2200.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_3001.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_3120.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_3200.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_3300.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_3501.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_3xxx.c create mode 100644 drivers/staging/comedi/drivers/addi_apci_all.c create mode 100644 drivers/staging/comedi/drivers/adl_pci6208.c create mode 100644 drivers/staging/comedi/drivers/adl_pci7296.c create mode 100644 drivers/staging/comedi/drivers/adl_pci7432.c create mode 100644 drivers/staging/comedi/drivers/adl_pci8164.c create mode 100644 drivers/staging/comedi/drivers/adl_pci9111.c create mode 100644 drivers/staging/comedi/drivers/adl_pci9118.c create mode 100644 drivers/staging/comedi/drivers/adq12b.c create mode 100644 drivers/staging/comedi/drivers/adv_pci1710.c create mode 100644 drivers/staging/comedi/drivers/adv_pci1723.c create mode 100644 drivers/staging/comedi/drivers/adv_pci_dio.c create mode 100644 drivers/staging/comedi/drivers/aio_aio12_8.c create mode 100644 drivers/staging/comedi/drivers/aio_iiro_16.c create mode 100644 drivers/staging/comedi/drivers/am9513.h create mode 100644 drivers/staging/comedi/drivers/amcc_s5933.h create mode 100644 drivers/staging/comedi/drivers/amplc_dio200.c create mode 100644 drivers/staging/comedi/drivers/amplc_pc236.c create mode 100644 drivers/staging/comedi/drivers/amplc_pc263.c create mode 100644 drivers/staging/comedi/drivers/amplc_pci224.c create mode 100644 drivers/staging/comedi/drivers/amplc_pci230.c create mode 100644 drivers/staging/comedi/drivers/c6xdigio.c create mode 100644 drivers/staging/comedi/drivers/cb_das16_cs.c create mode 100644 drivers/staging/comedi/drivers/cb_pcidas.c create mode 100644 drivers/staging/comedi/drivers/cb_pcidas64.c create mode 100644 drivers/staging/comedi/drivers/cb_pcidda.c create mode 100644 drivers/staging/comedi/drivers/cb_pcidio.c create mode 100644 drivers/staging/comedi/drivers/cb_pcimdas.c create mode 100644 drivers/staging/comedi/drivers/cb_pcimdda.c create mode 100644 drivers/staging/comedi/drivers/comedi_rt_timer.c create mode 100644 drivers/staging/comedi/drivers/contec_pci_dio.c create mode 100644 drivers/staging/comedi/drivers/daqboard2000.c create mode 100644 drivers/staging/comedi/drivers/das08.c create mode 100644 drivers/staging/comedi/drivers/das08.h create mode 100644 drivers/staging/comedi/drivers/das08_cs.c create mode 100644 drivers/staging/comedi/drivers/das16.c create mode 100644 drivers/staging/comedi/drivers/das16m1.c create mode 100644 drivers/staging/comedi/drivers/das1800.c create mode 100644 drivers/staging/comedi/drivers/das6402.c create mode 100644 drivers/staging/comedi/drivers/das800.c create mode 100644 drivers/staging/comedi/drivers/dmm32at.c create mode 100644 drivers/staging/comedi/drivers/dt2801.c create mode 100644 drivers/staging/comedi/drivers/dt2811.c create mode 100644 drivers/staging/comedi/drivers/dt2814.c create mode 100644 drivers/staging/comedi/drivers/dt2815.c create mode 100644 drivers/staging/comedi/drivers/dt2817.c create mode 100644 drivers/staging/comedi/drivers/dt282x.c create mode 100644 drivers/staging/comedi/drivers/dt3000.c create mode 100644 drivers/staging/comedi/drivers/fl512.c create mode 100644 drivers/staging/comedi/drivers/gsc_hpdi.c create mode 100644 drivers/staging/comedi/drivers/ii_pci20kc.c create mode 100644 drivers/staging/comedi/drivers/jr3_pci.c create mode 100644 drivers/staging/comedi/drivers/jr3_pci.h create mode 100644 drivers/staging/comedi/drivers/ke_counter.c create mode 100644 drivers/staging/comedi/drivers/mpc624.c create mode 100644 drivers/staging/comedi/drivers/mpc8260cpm.c create mode 100644 drivers/staging/comedi/drivers/multiq3.c create mode 100644 drivers/staging/comedi/drivers/ni_6527.c create mode 100644 drivers/staging/comedi/drivers/ni_65xx.c create mode 100644 drivers/staging/comedi/drivers/ni_660x.c create mode 100644 drivers/staging/comedi/drivers/ni_670x.c create mode 100644 drivers/staging/comedi/drivers/ni_at_a2150.c create mode 100644 drivers/staging/comedi/drivers/ni_at_ao.c create mode 100644 drivers/staging/comedi/drivers/ni_atmio.c create mode 100644 drivers/staging/comedi/drivers/ni_atmio16d.c create mode 100644 drivers/staging/comedi/drivers/ni_daq_700.c create mode 100644 drivers/staging/comedi/drivers/ni_daq_dio24.c create mode 100644 drivers/staging/comedi/drivers/ni_labpc.c create mode 100644 drivers/staging/comedi/drivers/ni_labpc.h create mode 100644 drivers/staging/comedi/drivers/ni_labpc_cs.c create mode 100644 drivers/staging/comedi/drivers/ni_mio_common.c create mode 100644 drivers/staging/comedi/drivers/ni_mio_cs.c create mode 100644 drivers/staging/comedi/drivers/ni_pcidio.c create mode 100644 drivers/staging/comedi/drivers/ni_pcimio.c create mode 100644 drivers/staging/comedi/drivers/ni_stc.h create mode 100644 drivers/staging/comedi/drivers/ni_tio.c create mode 100644 drivers/staging/comedi/drivers/ni_tio.h create mode 100644 drivers/staging/comedi/drivers/ni_tio_internal.h create mode 100644 drivers/staging/comedi/drivers/ni_tiocmd.c create mode 100644 drivers/staging/comedi/drivers/pcl711.c create mode 100644 drivers/staging/comedi/drivers/pcl724.c create mode 100644 drivers/staging/comedi/drivers/pcl725.c create mode 100644 drivers/staging/comedi/drivers/pcl726.c create mode 100644 drivers/staging/comedi/drivers/pcl730.c create mode 100644 drivers/staging/comedi/drivers/pcl812.c create mode 100644 drivers/staging/comedi/drivers/pcl816.c create mode 100644 drivers/staging/comedi/drivers/pcl818.c create mode 100644 drivers/staging/comedi/drivers/pcm3724.c create mode 100644 drivers/staging/comedi/drivers/pcm3730.c create mode 100644 drivers/staging/comedi/drivers/pcmad.c create mode 100644 drivers/staging/comedi/drivers/pcmda12.c create mode 100644 drivers/staging/comedi/drivers/pcmmio.c create mode 100644 drivers/staging/comedi/drivers/pcmuio.c create mode 100644 drivers/staging/comedi/drivers/plx9052.h create mode 100644 drivers/staging/comedi/drivers/poc.c create mode 100644 drivers/staging/comedi/drivers/quatech_daqp_cs.c create mode 100644 drivers/staging/comedi/drivers/rti800.c create mode 100644 drivers/staging/comedi/drivers/rti802.c create mode 100644 drivers/staging/comedi/drivers/s526.c create mode 100644 drivers/staging/comedi/drivers/serial2002.c create mode 100644 drivers/staging/comedi/drivers/skel.c create mode 100644 drivers/staging/comedi/drivers/ssv_dnp.c create mode 100644 drivers/staging/comedi/drivers/unioxx5.c create mode 100644 drivers/staging/dst/Kconfig create mode 100644 drivers/staging/dst/Makefile create mode 100644 drivers/staging/dst/crypto.c create mode 100644 drivers/staging/dst/dcore.c create mode 100644 drivers/staging/dst/export.c create mode 100644 drivers/staging/dst/state.c create mode 100644 drivers/staging/dst/thread_pool.c create mode 100644 drivers/staging/dst/trans.c delete mode 100644 drivers/staging/epl/EdrvFec5282.h delete mode 100644 drivers/staging/epl/EplObjDef.h delete mode 100644 drivers/staging/epl/EplTimeruNull.c delete mode 100644 drivers/staging/epl/EplTimeruWin32.c delete mode 100644 drivers/staging/epl/ShbIpc-Win32.c delete mode 100644 drivers/staging/epl/kernel/EplNmtkCal.h delete mode 100644 drivers/staging/epl/kernel/EplObdkCal.h delete mode 100644 drivers/staging/frontier/frontier_compat.h delete mode 100644 drivers/staging/frontier/surface_sysfs.h create mode 100644 drivers/staging/heci/Kconfig create mode 100644 drivers/staging/heci/Makefile create mode 100644 drivers/staging/heci/TODO create mode 100644 drivers/staging/heci/heci.h create mode 100644 drivers/staging/heci/heci_data_structures.h create mode 100644 drivers/staging/heci/heci_init.c create mode 100644 drivers/staging/heci/heci_interface.c create mode 100644 drivers/staging/heci/heci_interface.h create mode 100644 drivers/staging/heci/heci_main.c create mode 100644 drivers/staging/heci/heci_version.h create mode 100644 drivers/staging/heci/interrupt.c create mode 100644 drivers/staging/heci/io_heci.c create mode 100644 drivers/staging/line6/Kconfig create mode 100644 drivers/staging/line6/Makefile create mode 100644 drivers/staging/line6/audio.c create mode 100644 drivers/staging/line6/audio.h create mode 100644 drivers/staging/line6/capture.c create mode 100644 drivers/staging/line6/capture.h create mode 100644 drivers/staging/line6/config.h create mode 100644 drivers/staging/line6/control.c create mode 100644 drivers/staging/line6/control.h create mode 100644 drivers/staging/line6/driver.c create mode 100644 drivers/staging/line6/driver.h create mode 100644 drivers/staging/line6/dumprequest.c create mode 100644 drivers/staging/line6/dumprequest.h create mode 100644 drivers/staging/line6/midi.c create mode 100644 drivers/staging/line6/midi.h create mode 100644 drivers/staging/line6/midibuf.c create mode 100644 drivers/staging/line6/midibuf.h create mode 100644 drivers/staging/line6/pcm.c create mode 100644 drivers/staging/line6/pcm.h create mode 100644 drivers/staging/line6/playback.c create mode 100644 drivers/staging/line6/playback.h create mode 100644 drivers/staging/line6/pod.c create mode 100644 drivers/staging/line6/pod.h create mode 100644 drivers/staging/line6/revision.h create mode 100644 drivers/staging/line6/toneport.c create mode 100644 drivers/staging/line6/toneport.h create mode 100644 drivers/staging/line6/usbdefs.h create mode 100644 drivers/staging/line6/variax.c create mode 100644 drivers/staging/line6/variax.h create mode 100644 drivers/staging/p9auth/Kconfig create mode 100644 drivers/staging/p9auth/Makefile create mode 100644 drivers/staging/p9auth/p9auth.c create mode 100644 drivers/staging/phison/Kconfig create mode 100644 drivers/staging/phison/Makefile create mode 100644 drivers/staging/phison/phison.c create mode 100644 drivers/staging/pohmelfs/Kconfig create mode 100644 drivers/staging/pohmelfs/Makefile create mode 100644 drivers/staging/pohmelfs/config.c create mode 100644 drivers/staging/pohmelfs/crypto.c create mode 100644 drivers/staging/pohmelfs/dir.c create mode 100644 drivers/staging/pohmelfs/inode.c create mode 100644 drivers/staging/pohmelfs/lock.c create mode 100644 drivers/staging/pohmelfs/mcache.c create mode 100644 drivers/staging/pohmelfs/net.c create mode 100644 drivers/staging/pohmelfs/netfs.h create mode 100644 drivers/staging/pohmelfs/path_entry.c create mode 100644 drivers/staging/pohmelfs/trans.c create mode 100644 drivers/staging/rt3070/2870_main_dev.c create mode 100644 drivers/staging/rt3070/Kconfig create mode 100644 drivers/staging/rt3070/Makefile create mode 100644 drivers/staging/rt3070/action.h create mode 100644 drivers/staging/rt3070/aironet.h create mode 100644 drivers/staging/rt3070/ap.h create mode 100644 drivers/staging/rt3070/chlist.h create mode 100644 drivers/staging/rt3070/common/2870_rtmp_init.c create mode 100644 drivers/staging/rt3070/common/action.c create mode 100644 drivers/staging/rt3070/common/ba_action.c create mode 100644 drivers/staging/rt3070/common/cmm_data.c create mode 100644 drivers/staging/rt3070/common/cmm_data_2870.c create mode 100644 drivers/staging/rt3070/common/cmm_info.c create mode 100644 drivers/staging/rt3070/common/cmm_sanity.c create mode 100644 drivers/staging/rt3070/common/cmm_sync.c create mode 100644 drivers/staging/rt3070/common/cmm_wpa.c create mode 100644 drivers/staging/rt3070/common/dfs.c create mode 100644 drivers/staging/rt3070/common/eeprom.c create mode 100644 drivers/staging/rt3070/common/md5.c create mode 100644 drivers/staging/rt3070/common/mlme.c create mode 100644 drivers/staging/rt3070/common/netif_block.c create mode 100644 drivers/staging/rt3070/common/rtmp_init.c create mode 100644 drivers/staging/rt3070/common/rtmp_tkip.c create mode 100644 drivers/staging/rt3070/common/rtmp_wep.c create mode 100644 drivers/staging/rt3070/common/rtusb_bulk.c create mode 100644 drivers/staging/rt3070/common/rtusb_data.c create mode 100644 drivers/staging/rt3070/common/rtusb_io.c create mode 100644 drivers/staging/rt3070/common/spectrum.c create mode 100644 drivers/staging/rt3070/dfs.h create mode 100644 drivers/staging/rt3070/firmware.h create mode 100644 drivers/staging/rt3070/leap.h create mode 100644 drivers/staging/rt3070/link_list.h create mode 100644 drivers/staging/rt3070/md4.h create mode 100644 drivers/staging/rt3070/md5.h create mode 100644 drivers/staging/rt3070/mlme.h create mode 100644 drivers/staging/rt3070/netif_block.h create mode 100644 drivers/staging/rt3070/oid.h create mode 100644 drivers/staging/rt3070/rt2870.h create mode 100644 drivers/staging/rt3070/rt28xx.h create mode 100644 drivers/staging/rt3070/rt_ate.c create mode 100644 drivers/staging/rt3070/rt_ate.h create mode 100644 drivers/staging/rt3070/rt_config.h create mode 100644 drivers/staging/rt3070/rt_linux.c create mode 100644 drivers/staging/rt3070/rt_linux.h create mode 100644 drivers/staging/rt3070/rt_main_dev.c create mode 100644 drivers/staging/rt3070/rt_profile.c create mode 100644 drivers/staging/rt3070/rtmp.h create mode 100644 drivers/staging/rt3070/rtmp_ckipmic.h create mode 100644 drivers/staging/rt3070/rtmp_def.h create mode 100644 drivers/staging/rt3070/rtmp_type.h create mode 100644 drivers/staging/rt3070/spectrum.h create mode 100644 drivers/staging/rt3070/spectrum_def.h create mode 100644 drivers/staging/rt3070/sta/aironet.c create mode 100644 drivers/staging/rt3070/sta/assoc.c create mode 100644 drivers/staging/rt3070/sta/auth.c create mode 100644 drivers/staging/rt3070/sta/auth_rsp.c create mode 100644 drivers/staging/rt3070/sta/connect.c create mode 100644 drivers/staging/rt3070/sta/dls.c create mode 100644 drivers/staging/rt3070/sta/rtmp_data.c create mode 100644 drivers/staging/rt3070/sta/sanity.c create mode 100644 drivers/staging/rt3070/sta/sync.c create mode 100644 drivers/staging/rt3070/sta/wpa.c create mode 100644 drivers/staging/rt3070/sta_ioctl.c create mode 100644 drivers/staging/rt3070/wpa.h create mode 100644 drivers/staging/serqt_usb/Kconfig create mode 100644 drivers/staging/serqt_usb/Makefile create mode 100644 drivers/staging/serqt_usb/TODO create mode 100644 drivers/staging/serqt_usb/serqt_usb.c delete mode 100644 drivers/staging/slicoss/gbdownload.h delete mode 100644 drivers/staging/slicoss/gbrcvucode.h delete mode 100644 drivers/staging/slicoss/oasisdbgdownload.h delete mode 100644 drivers/staging/slicoss/oasisdownload.h delete mode 100644 drivers/staging/slicoss/oasisrcvucode.h delete mode 100644 drivers/staging/slicoss/slic_os.h delete mode 100644 drivers/staging/slicoss/slicbuild.h delete mode 100644 drivers/staging/slicoss/slicdbg.h delete mode 100644 drivers/staging/slicoss/slicdump.h delete mode 100644 drivers/staging/slicoss/slicinc.h create mode 100644 drivers/staging/stlc45xx/Kconfig create mode 100644 drivers/staging/stlc45xx/Makefile create mode 100644 drivers/staging/stlc45xx/stlc45xx.c create mode 100644 drivers/staging/stlc45xx/stlc45xx.h create mode 100644 drivers/staging/stlc45xx/stlc45xx_lmac.h delete mode 100644 drivers/staging/sxg/saharadbgdownload.h create mode 100644 drivers/staging/sxg/sxg_ethtool.c create mode 100644 drivers/staging/sxg/sxgphycode-1.2.h delete mode 100644 drivers/staging/sxg/sxgphycode.h create mode 100644 drivers/staging/uc2322/Kconfig create mode 100644 drivers/staging/uc2322/Makefile create mode 100644 drivers/staging/uc2322/TODO create mode 100644 drivers/staging/uc2322/aten2011.c delete mode 100644 drivers/staging/winbond/bss_f.h delete mode 100644 drivers/staging/winbond/bssdscpt.h delete mode 100644 drivers/staging/winbond/common.h delete mode 100644 drivers/staging/winbond/ds_tkip.h delete mode 100644 drivers/staging/winbond/gl_80211.h delete mode 100644 drivers/staging/winbond/ioctls.h delete mode 100644 drivers/staging/winbond/mlme_mib.h delete mode 100644 drivers/staging/winbond/mto_f.h delete mode 100644 drivers/staging/winbond/os_common.h delete mode 100644 drivers/staging/winbond/sme_s.h delete mode 100644 drivers/staging/winbond/wb35_ver.h delete mode 100644 drivers/staging/wlan-ng/p80211metamib.h delete mode 100644 drivers/staging/wlan-ng/p80211metamsg.h delete mode 100644 drivers/staging/wlan-ng/wlan_compat.h create mode 100644 firmware/slicoss/gbdownload.sys.ihex create mode 100644 firmware/slicoss/gbrcvucode.sys.ihex create mode 100644 firmware/slicoss/oasisdbgdownload.sys.ihex create mode 100644 firmware/slicoss/oasisdownload.sys.ihex create mode 100644 firmware/slicoss/oasisrcvucode.sys.ihex create mode 100644 firmware/sxg/saharadbgdownloadB.sys.ihex create mode 100644 firmware/sxg/saharadownloadB.sys.ihex create mode 100644 include/linux/dst.h Merging scsi-post-merge/master $ git merge scsi-post-merge/master Already up-to-date. $ git am -3 ../patches/0001-tracing-fixup-for-ftrace_push_return_trace-API-chan.patch Applying: tracing: fixup for ftrace_push_return_trace API change