diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-28 14:57:32 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-28 14:57:32 +1000 |
| commit | 9448a78521062b410038c8c91fad35b802c5abe3 (patch) | |
| tree | 30093ff10e9b08a16bbdc841666ca723ce53af65 | |
| parent | fa49128ada7a166efb8e3ff51237913b6ecfd94c (diff) | |
Add linux-next specific filesnext-20080428
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/Trees | 62 | ||||
| -rw-r--r-- | Next/merge.log | 4286 | ||||
| -rw-r--r-- | Next/quilt-import.log | 348 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 4697 insertions, 0 deletions
diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..2824fb4a0216 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,62 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git#for-linus +sched-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#merge +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-usb/ +x86 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git#for-akpm +sched git git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel.git#for-akpm +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#mm +i2c quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#stable +s390 git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#master +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild.git#master +ide quilt http://kernel.org/pub/linux/kernel/people/bart/pata-2.6/patches/ +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +xfs git git://oss.sgi.com:8090/xfs/xfs-2.6.git#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6#test +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git#for-linus +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +hwmon git git://lm-sensors.org/kernel/mhoffman/hwmon-2.6.git#testing +ubi git git://git.infradead.org/~dedekind/ubi-2.6.git#master +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#master +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +tests git git://git.kernel.org/pub/scm/linux/kernel/git/sam/tests.git#master +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git#linux-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6.git#for-akpm +m68k quilt http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-patches-2.6/ +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#powerpc-next +hrt git git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt.git#mm +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_testing#master +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#powerpc-next +mtd git git://git.infradead.org/mtd-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.26.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#vfs-2.6.25 +semaphore git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore +semaphore-removal git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore-removal +x86-latest git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git#latest +sched-latest git git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel.git#latest +ldp quilt http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-ldp/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..febedd84bcf3 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4286 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at 3dc5063 slab_err: Pass parameters correctly to slab_bug +Merging origin/master +$ git merge origin/master +Updating 3dc5063..064922a +Fast forward + .gitignore | 1 + + CREDITS | 8 + + Documentation/00-INDEX | 2 - + Documentation/ABI/stable/sysfs-class-ubi | 212 + + Documentation/DocBook/Makefile | 5 +- + Documentation/HOWTO | 30 +- + Documentation/arm/Samsung-S3C24XX/NAND.txt | 30 + + Documentation/arm/Samsung-S3C24XX/Overview.txt | 2 + + Documentation/device-mapper/dm-crypt.txt | 52 + + Documentation/filesystems/nfs-rdma.txt | 256 + + Documentation/filesystems/seq_file.txt | 19 +- + Documentation/i386/boot.txt | 26 + + Documentation/ia64/kvm.txt | 82 + + Documentation/ide/ide-tape.txt | 211 +- + Documentation/ide/ide.txt | 107 +- + Documentation/ioctl-number.txt | 2 + + Documentation/kbuild/modules.txt | 9 +- + Documentation/kernel-parameters.txt | 4 - + Documentation/leds-class.txt | 12 +- + Documentation/mips/AU1xxx_IDE.README | 46 - + Documentation/networking/phy.txt | 38 +- + Documentation/powerpc/booting-without-of.txt | 11 + + Documentation/powerpc/kvm_440.txt | 41 + + Documentation/s390/kvm.txt | 125 + + Documentation/smart-config.txt | 98 - + Documentation/sound/alsa/ALSA-Configuration.txt | 47 +- + Documentation/usb/anchors.txt | 50 + + Documentation/usb/callbacks.txt | 132 + + Documentation/usb/persist.txt | 43 +- + Documentation/usb/usb-serial.txt | 7 +- + Documentation/video4linux/CARDLIST.au0828 | 4 + + Documentation/video4linux/CARDLIST.bttv | 2 + + Documentation/video4linux/CARDLIST.cx23885 | 3 + + Documentation/video4linux/CARDLIST.cx88 | 9 + + Documentation/video4linux/CARDLIST.saa7134 | 13 +- + Documentation/video4linux/extract_xc3028.pl | 46 +- + MAINTAINERS | 58 +- + Makefile | 9 +- + arch/alpha/kernel/osf_sys.c | 1 + + arch/alpha/kernel/pci.c | 22 +- + arch/alpha/kernel/sys_nautilus.c | 2 + + arch/arm/mach-integrator/time.c | 5 +- + arch/arm/mach-lh7a40x/arch-kev7a400.c | 5 +- + arch/arm/mm/Kconfig | 6 + + arch/arm/mm/proc-arm1020.S | 2 +- + arch/arm/mm/proc-arm1020e.S | 2 +- + arch/arm/mm/proc-arm1022.S | 2 +- + arch/arm/mm/proc-arm1026.S | 2 +- + arch/arm/mm/proc-arm6_7.S | 4 +- + arch/arm/mm/proc-arm720.S | 2 +- + arch/arm/mm/proc-arm740.S | 1 + + arch/arm/mm/proc-arm7tdmi.S | 1 + + arch/arm/mm/proc-arm920.S | 2 +- + arch/arm/mm/proc-arm922.S | 2 +- + arch/arm/mm/proc-arm925.S | 2 +- + arch/arm/mm/proc-arm926.S | 2 +- + arch/arm/mm/proc-arm940.S | 1 + + arch/arm/mm/proc-arm946.S | 1 + + arch/arm/mm/proc-arm9tdmi.S | 1 + + arch/arm/mm/proc-feroceon.S | 2 +- + arch/arm/mm/proc-sa110.S | 2 +- + arch/arm/mm/proc-sa1100.S | 2 +- + arch/arm/mm/proc-v6.S | 2 +- + arch/arm/mm/proc-v7.S | 2 +- + arch/arm/mm/proc-xsc3.S | 1 + + arch/arm/mm/proc-xscale.S | 2 +- + arch/blackfin/Kconfig | 161 +- + arch/blackfin/Makefile | 5 + + arch/blackfin/boot/.gitignore | 1 + + arch/blackfin/configs/BF527-EZKIT_defconfig | 8 +- + arch/blackfin/configs/BF533-EZKIT_defconfig | 4 +- + arch/blackfin/configs/BF533-STAMP_defconfig | 4 +- + arch/blackfin/configs/BF537-STAMP_defconfig | 4 +- + arch/blackfin/configs/BF548-EZKIT_defconfig | 8 +- + arch/blackfin/configs/BF561-EZKIT_defconfig | 4 +- + .../configs/CM-BF533_defconfig} | 822 ++-- + .../configs/CM-BF537E_defconfig} | 830 ++-- + arch/blackfin/configs/CM-BF537U_defconfig | 940 ++++ + arch/blackfin/configs/CM-BF548_defconfig | 1373 ++++++ + arch/blackfin/configs/CM-BF561_defconfig | 876 ++++ + arch/blackfin/configs/H8606_defconfig | 4 +- + arch/blackfin/configs/IP0X_defconfig | 1252 +++++ + arch/blackfin/configs/PNAV-10_defconfig | 4 +- + arch/blackfin/configs/SRV1_defconfig | 1290 +++++ + arch/blackfin/kernel/Makefile | 8 +- + arch/blackfin/kernel/bfin_dma_5xx.c | 13 +- + arch/blackfin/kernel/bfin_gpio.c | 169 +- + arch/blackfin/kernel/cplb-mpu/cplbinfo.c | 8 - + arch/blackfin/kernel/cplb-mpu/cplbinit.c | 4 +- + arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 128 +- + arch/blackfin/kernel/cplb-nompu/cplbinfo.c | 15 +- + arch/blackfin/kernel/cplb-nompu/cplbinit.c | 31 + + arch/blackfin/kernel/dma-mapping.c | 4 +- + arch/blackfin/kernel/gptimers.c | 24 +- + arch/blackfin/kernel/process.c | 69 +- + arch/blackfin/kernel/ptrace.c | 7 +- + arch/blackfin/kernel/reboot.c | 69 +- + arch/blackfin/kernel/setup.c | 131 +- + arch/blackfin/kernel/signal.c | 24 +- + arch/blackfin/kernel/sys_bfin.c | 2 +- + arch/blackfin/kernel/time-ts.c | 219 + + arch/blackfin/kernel/time.c | 19 +- + arch/blackfin/kernel/traps.c | 94 +- + arch/blackfin/kernel/vmlinux.lds.S | 54 +- + arch/blackfin/mach-bf527/Makefile | 2 - + arch/blackfin/mach-bf527/boards/ezkit.c | 36 +- + arch/blackfin/mach-bf527/cpu.c | 161 - + arch/blackfin/mach-bf527/dma.c | 5 +- + arch/blackfin/mach-bf527/head.S | 18 - + arch/blackfin/mach-bf533/Makefile | 2 - + arch/blackfin/mach-bf533/boards/H8606.c | 25 +- + arch/blackfin/mach-bf533/boards/Kconfig | 6 + + arch/blackfin/mach-bf533/boards/Makefile | 1 + + arch/blackfin/mach-bf533/boards/cm_bf533.c | 25 +- + arch/blackfin/mach-bf533/boards/ezkit.c | 25 +- + arch/blackfin/mach-bf533/boards/generic_board.c | 2 +- + arch/blackfin/mach-bf533/boards/ip0x.c | 303 ++ + arch/blackfin/mach-bf533/boards/stamp.c | 62 +- + arch/blackfin/mach-bf533/cpu.c | 158 - + arch/blackfin/mach-bf533/dma.c | 5 +- + arch/blackfin/mach-bf533/head.S | 34 +- + arch/blackfin/mach-bf537/Makefile | 2 - + arch/blackfin/mach-bf537/boards/cm_bf537.c | 58 +- + arch/blackfin/mach-bf537/boards/generic_board.c | 34 +- + arch/blackfin/mach-bf537/boards/minotaur.c | 36 +- + arch/blackfin/mach-bf537/boards/pnav10.c | 31 +- + arch/blackfin/mach-bf537/boards/stamp.c | 93 +- + arch/blackfin/mach-bf537/cpu.c | 159 - + arch/blackfin/mach-bf537/dma.c | 5 +- + arch/blackfin/mach-bf537/head.S | 46 +- + arch/blackfin/mach-bf548/Makefile | 2 - + arch/blackfin/mach-bf548/boards/Kconfig | 6 + + arch/blackfin/mach-bf548/boards/Makefile | 1 + + arch/blackfin/mach-bf548/boards/cm_bf548.c | 664 +++ + arch/blackfin/mach-bf548/boards/ezkit.c | 105 +- + arch/blackfin/mach-bf548/cpu.c | 159 - + arch/blackfin/mach-bf548/dma.c | 4 +- + arch/blackfin/mach-bf548/head.S | 18 - + arch/blackfin/mach-bf561/boards/cm_bf561.c | 25 +- + arch/blackfin/mach-bf561/boards/ezkit.c | 32 +- + arch/blackfin/mach-bf561/boards/generic_board.c | 2 +- + arch/blackfin/mach-bf561/boards/tepla.c | 2 +- + arch/blackfin/mach-bf561/dma.c | 5 +- + arch/blackfin/mach-bf561/head.S | 34 +- + arch/blackfin/mach-common/Makefile | 3 +- + arch/blackfin/mach-common/arch_checks.c | 3 +- + arch/blackfin/mach-common/cpufreq.c | 194 + + arch/blackfin/mach-common/entry.S | 128 +- + arch/blackfin/mach-common/ints-priority.c | 56 +- + arch/blackfin/mach-common/lock.S | 2 +- + arch/blackfin/mm/blackfin_sram.c | 2 +- + arch/blackfin/oprofile/common.c | 2 +- + arch/blackfin/oprofile/op_model_bf533.c | 2 +- + arch/ia64/Kconfig | 3 + + arch/ia64/Makefile | 1 + + arch/ia64/kvm/Kconfig | 49 + + arch/ia64/kvm/Makefile | 61 + + arch/ia64/kvm/asm-offsets.c | 251 + + arch/ia64/kvm/kvm-ia64.c | 1806 +++++++ + arch/ia64/kvm/kvm_fw.c | 500 ++ + arch/ia64/kvm/kvm_minstate.h | 273 ++ + arch/ia64/kvm/lapic.h | 25 + + arch/ia64/kvm/misc.h | 93 + + arch/ia64/kvm/mmio.c | 341 ++ + arch/ia64/kvm/optvfault.S | 918 ++++ + arch/ia64/kvm/process.c | 970 ++++ + arch/ia64/kvm/trampoline.S | 1038 ++++ + arch/ia64/kvm/vcpu.c | 2163 +++++++++ + arch/ia64/kvm/vcpu.h | 740 +++ + arch/ia64/kvm/vmm.c | 66 + + arch/ia64/kvm/vmm_ivt.S | 1424 ++++++ + arch/ia64/kvm/vti.h | 290 ++ + arch/ia64/kvm/vtlb.c | 636 +++ + arch/powerpc/Kconfig | 84 +- + arch/powerpc/Kconfig.debug | 3 + + arch/powerpc/Makefile | 1 + + arch/powerpc/boot/.gitignore | 1 + + arch/powerpc/boot/Makefile | 2 +- + arch/powerpc/boot/dts/canyonlands.dts | 37 + + arch/powerpc/boot/dts/glacier.dts | 37 + + arch/powerpc/boot/ns16550.c | 5 + + arch/powerpc/kernel/Makefile | 9 + + arch/powerpc/kernel/asm-offsets.c | 39 +- + arch/powerpc/kernel/cpu_setup_44x.S | 1 - + arch/powerpc/kernel/cpu_setup_6xx.S | 8 +- + arch/powerpc/kernel/cputable.c | 4 +- + arch/powerpc/kernel/head_fsl_booke.S | 11 + + arch/powerpc/kernel/misc_32.S | 6 +- + arch/powerpc/kernel/misc_64.S | 20 +- + arch/powerpc/kernel/of_platform.c | 2 + + arch/powerpc/kernel/paca.c | 87 +- + arch/powerpc/kernel/ppc32.h | 2 - + arch/powerpc/kernel/process.c | 31 + + arch/powerpc/kernel/prom.c | 4 + + arch/powerpc/kernel/prom_init_check.sh | 58 + + arch/powerpc/kernel/ptrace32.c | 27 - + arch/powerpc/kernel/setup_64.c | 5 +- + arch/powerpc/kernel/stacktrace.c | 1 - + arch/powerpc/kernel/udbg.c | 4 +- + arch/powerpc/kvm/44x_tlb.c | 224 + + arch/powerpc/kvm/44x_tlb.h | 91 + + arch/powerpc/kvm/Kconfig | 42 + + arch/powerpc/kvm/Makefile | 15 + + arch/powerpc/kvm/booke_guest.c | 615 +++ + arch/powerpc/kvm/booke_host.c | 83 + + arch/powerpc/kvm/booke_interrupts.S | 436 ++ + arch/powerpc/kvm/emulate.c | 760 +++ + arch/powerpc/kvm/powerpc.c | 436 ++ + arch/powerpc/mm/fsl_booke_mmu.c | 2 +- + arch/powerpc/mm/hash_low_32.S | 4 +- + arch/powerpc/mm/init_32.c | 13 +- + arch/powerpc/mm/init_64.c | 3 +- + arch/powerpc/mm/mem.c | 37 +- + arch/powerpc/mm/numa.c | 1 + + arch/powerpc/mm/pgtable_32.c | 23 + + arch/powerpc/platforms/Kconfig | 1 - + arch/powerpc/platforms/Kconfig.cputype | 4 +- + arch/powerpc/platforms/Makefile | 1 - + arch/powerpc/platforms/cell/Kconfig | 13 + + arch/powerpc/platforms/cell/Makefile | 20 +- + arch/powerpc/platforms/cell/axon_msi.c | 6 +- + arch/powerpc/platforms/{celleb => cell}/beat.c | 2 +- + arch/powerpc/platforms/{celleb => cell}/beat.h | 0 + .../platforms/{celleb/htab.c => cell/beat_htab.c} | 0 + .../{celleb/hvCall.S => cell/beat_hvCall.S} | 0 + .../{celleb/interrupt.c => cell/beat_interrupt.c} | 2 +- + .../{celleb/interrupt.h => cell/beat_interrupt.h} | 0 + .../{celleb/iommu.c => cell/beat_iommu.c} | 0 + .../platforms/{celleb/smp.c => cell/beat_smp.c} | 2 +- + .../{celleb/spu_priv1.c => cell/beat_spu_priv1.c} | 0 + .../platforms/{celleb => cell}/beat_syscall.h | 0 + .../{celleb/udbg_beat.c => cell/beat_udbg.c} | 0 + .../platforms/{celleb => cell}/beat_wrapper.h | 0 + .../platforms/{celleb/pci.c => cell/celleb_pci.c} | 50 +- + .../platforms/{celleb/pci.h => cell/celleb_pci.h} | 19 +- + .../platforms/{celleb/scc.h => cell/celleb_scc.h} | 87 + + .../{celleb/scc_epci.c => cell/celleb_scc_epci.c} | 77 +- + arch/powerpc/platforms/cell/celleb_scc_pciex.c | 547 +++ + .../{celleb/scc_sio.c => cell/celleb_scc_sio.c} | 0 + .../{celleb/scc_uhc.c => cell/celleb_scc_uhc.c} | 2 +- + .../{celleb/setup.c => cell/celleb_setup.c} | 12 +- + arch/powerpc/platforms/cell/io-workarounds.c | 358 +- + arch/powerpc/platforms/cell/io-workarounds.h | 49 + + arch/powerpc/platforms/cell/setup.c | 43 +- + arch/powerpc/platforms/cell/spider-pci.c | 184 + + arch/powerpc/platforms/celleb/Kconfig | 12 - + arch/powerpc/platforms/celleb/Makefile | 9 - + arch/powerpc/platforms/celleb/io-workarounds.c | 280 -- + arch/powerpc/platforms/iseries/exception.S | 27 +- + arch/powerpc/platforms/ps3/os-area.c | 1 + + arch/powerpc/platforms/pseries/Kconfig | 5 + + arch/powerpc/platforms/pseries/Makefile | 4 + + arch/powerpc/platforms/pseries/eeh.c | 1 - + arch/powerpc/platforms/pseries/eeh_cache.c | 1 - + arch/powerpc/platforms/pseries/firmware.c | 10 +- + arch/powerpc/platforms/pseries/iommu.c | 39 +- + arch/powerpc/platforms/pseries/lpar.c | 36 +- + arch/powerpc/platforms/pseries/ras.c | 4 +- + arch/powerpc/platforms/pseries/rtasd.c | 14 +- + arch/powerpc/platforms/pseries/scanlog.c | 23 +- + arch/powerpc/platforms/pseries/setup.c | 17 +- + arch/powerpc/platforms/pseries/smp.c | 11 +- + arch/powerpc/platforms/pseries/xics.c | 1 - + arch/powerpc/sysdev/mv64x60_dev.c | 52 +- + arch/powerpc/sysdev/mv64x60_udbg.c | 2 +- + arch/ppc/8260_io/fcc_enet.c | 19 +- + arch/ppc/8xx_io/enet.c | 23 - + arch/ppc/Kconfig | 82 +- + arch/ppc/configs/mpc86x_ads_defconfig | 633 --- + arch/ppc/configs/mpc885ads_defconfig | 622 --- + arch/ppc/kernel/ppc_ksyms.c | 1 + + arch/ppc/lib/string.S | 14 + + arch/ppc/platforms/Makefile | 4 - + arch/ppc/platforms/fads.h | 25 - + arch/ppc/platforms/mpc8272ads_setup.c | 367 -- + arch/ppc/platforms/mpc885ads.h | 93 - + arch/ppc/platforms/mpc885ads_setup.c | 476 -- + arch/ppc/platforms/pq2ads.c | 53 - + arch/ppc/platforms/pq2ads.h | 94 - + arch/ppc/platforms/pq2ads_pd.h | 32 - + arch/ppc/syslib/m8260_setup.c | 6 - + arch/ppc/syslib/m82xx_pci.c | 38 - + arch/ppc/syslib/m8xx_setup.c | 10 - + arch/s390/Kconfig | 14 + + arch/s390/Makefile | 2 +- + arch/s390/kernel/early.c | 4 + + arch/s390/kernel/setup.c | 14 +- + arch/s390/kernel/vtime.c | 1 + + arch/s390/kvm/Kconfig | 46 + + arch/s390/kvm/Makefile | 14 + + arch/s390/kvm/diag.c | 67 + + arch/s390/kvm/gaccess.h | 274 ++ + arch/s390/kvm/intercept.c | 216 + + arch/s390/kvm/interrupt.c | 592 +++ + arch/s390/kvm/kvm-s390.c | 685 +++ + arch/s390/kvm/kvm-s390.h | 64 + + arch/s390/kvm/priv.c | 323 ++ + arch/s390/kvm/sie64a.S | 47 + + arch/s390/kvm/sigp.c | 288 ++ + arch/s390/mm/pgtable.c | 65 +- + arch/sparc/kernel/entry.S | 1 - + arch/sparc/kernel/signal.c | 5 - + arch/sparc64/Kconfig | 20 + + arch/sparc64/defconfig | 99 +- + arch/sparc64/kernel/ebus.c | 1 + + arch/sparc64/kernel/entry.S | 37 +- + arch/sparc64/kernel/entry.h | 1 - + arch/sparc64/kernel/etrap.S | 4 + + arch/sparc64/kernel/iommu.c | 33 +- + arch/sparc64/kernel/isa.c | 1 + + arch/sparc64/kernel/mdesc.c | 28 +- + arch/sparc64/kernel/of_device.c | 12 +- + arch/sparc64/kernel/pci.c | 12 + + arch/sparc64/kernel/pci_fire.c | 5 +- + arch/sparc64/kernel/pci_impl.h | 4 +- + arch/sparc64/kernel/pci_msi.c | 8 +- + arch/sparc64/kernel/pci_psycho.c | 5 +- + arch/sparc64/kernel/pci_sabre.c | 4 +- + arch/sparc64/kernel/pci_schizo.c | 5 +- + arch/sparc64/kernel/pci_sun4v.c | 13 +- + arch/sparc64/kernel/prom.c | 14 +- + arch/sparc64/kernel/rtrap.S | 21 +- + arch/sparc64/kernel/sbus.c | 3 +- + arch/sparc64/kernel/setup.c | 3 +- + arch/sparc64/kernel/signal.c | 25 +- + arch/sparc64/kernel/signal32.c | 20 +- + arch/sparc64/kernel/smp.c | 38 +- + arch/sparc64/kernel/sparc64_ksyms.c | 2 - + arch/sparc64/kernel/stacktrace.c | 16 +- + arch/sparc64/kernel/sun4v_tlb_miss.S | 16 +- + arch/sparc64/kernel/sys_sparc.c | 4 +- + arch/sparc64/kernel/sysfs.c | 12 + + arch/sparc64/kernel/traps.c | 19 +- + arch/sparc64/kernel/tsb.S | 2 +- + arch/sparc64/kernel/winfixup.S | 12 +- + arch/sparc64/mm/init.c | 989 +++-- + arch/sparc64/mm/tsb.c | 3 +- + arch/sparc64/mm/ultra.S | 4 +- + arch/um/Kconfig.x86_64 | 7 + + arch/um/os-Linux/helper.c | 1 + + arch/um/sys-i386/Makefile | 2 +- + arch/um/sys-x86_64/Makefile | 2 +- + arch/x86/Kconfig | 28 +- + arch/x86/Kconfig.cpu | 11 +- + arch/x86/Kconfig.debug | 24 + + arch/x86/boot/.gitignore | 5 +- + arch/x86/boot/header.S | 6 +- + arch/x86/configs/i386_defconfig | 1 + + arch/x86/configs/x86_64_defconfig | 1 + + arch/x86/ia32/ia32_signal.c | 10 - + arch/x86/ia32/ia32entry.S | 2 +- + arch/x86/kernel/Makefile | 2 + + arch/x86/kernel/acpi/boot.c | 4 - + arch/x86/kernel/acpi/realmode/.gitignore | 3 + + arch/x86/kernel/alternative.c | 39 +- + arch/x86/kernel/apic_32.c | 5 +- + arch/x86/kernel/apic_64.c | 7 +- + arch/x86/kernel/apm_32.c | 3 + + arch/x86/kernel/cpu/Makefile | 1 - + arch/x86/kernel/cpu/amd.c | 6 - + arch/x86/kernel/cpu/mcheck/mce_64.c | 18 +- + arch/x86/kernel/cpu/nexgen.c | 59 - + arch/x86/kernel/cpu/perfctr-watchdog.c | 14 +- + arch/x86/kernel/crash.c | 3 +- + arch/x86/kernel/e820_64.c | 35 +- + arch/x86/kernel/entry_32.S | 12 +- + arch/x86/kernel/genapic_64.c | 2 +- + arch/x86/kernel/head64.c | 25 +- + arch/x86/kernel/hpet.c | 2 +- + arch/x86/kernel/i8253.c | 6 +- + arch/x86/kernel/io_apic_32.c | 2 +- + arch/x86/kernel/io_apic_64.c | 2 +- + arch/x86/kernel/irq_32.c | 2 +- + arch/x86/kernel/kdebugfs.c | 163 +- + arch/x86/kernel/kvm.c | 248 + + arch/x86/kernel/kvmclock.c | 187 + + arch/x86/kernel/mfgpt_32.c | 3 +- + arch/x86/kernel/mpparse.c | 39 +- + arch/x86/kernel/paravirt.c | 12 +- + arch/x86/kernel/pci-calgary_64.c | 1 + + arch/x86/kernel/process.c | 117 + + arch/x86/kernel/process_32.c | 120 +- + arch/x86/kernel/process_64.c | 125 +- + arch/x86/kernel/ptrace.c | 95 +- + arch/x86/kernel/reboot.c | 17 +- + arch/x86/kernel/setup.c | 2 - + arch/x86/kernel/setup_32.c | 14 +- + arch/x86/kernel/setup_64.c | 36 +- + arch/x86/kernel/signal_32.c | 35 +- + arch/x86/kernel/signal_64.c | 30 +- + arch/x86/kernel/smpboot.c | 20 +- + arch/x86/kernel/summit_32.c | 5 +- + arch/x86/kernel/tlb_64.c | 6 +- + arch/x86/kernel/trampoline_32.S | 2 +- + arch/x86/kernel/traps_32.c | 2 +- + arch/x86/kernel/vmi_32.c | 22 +- + arch/x86/kernel/vsyscall_64.c | 2 +- + arch/x86/kvm/Kconfig | 13 +- + arch/x86/kvm/Makefile | 6 +- + arch/x86/kvm/i8254.c | 611 +++ + arch/x86/kvm/i8254.h | 63 + + arch/x86/kvm/irq.c | 18 + + arch/x86/kvm/irq.h | 3 + + arch/x86/kvm/kvm_svm.h | 2 + + arch/x86/kvm/lapic.c | 35 +- + arch/x86/kvm/mmu.c | 672 +++- + arch/x86/kvm/mmu.h | 6 + + arch/x86/kvm/paging_tmpl.h | 86 +- + arch/x86/kvm/segment_descriptor.h | 29 - + arch/x86/kvm/svm.c | 352 +- + arch/x86/kvm/svm.h | 3 + + arch/x86/kvm/tss.h | 59 + + arch/x86/kvm/vmx.c | 278 +- + arch/x86/kvm/vmx.h | 10 +- + arch/x86/kvm/x86.c | 897 +++- + arch/x86/kvm/x86_emulate.c | 285 +- + arch/x86/lib/Makefile | 3 +- + arch/x86/lib/bitops_32.c | 70 - + arch/x86/lib/bitops_64.c | 175 - + arch/x86/mach-visws/mpparse.c | 15 +- + arch/x86/mach-voyager/voyager_smp.c | 31 +- + arch/x86/mm/Makefile | 2 +- + arch/x86/mm/dump_pagetables.c | 2 +- + arch/x86/mm/init_32.c | 33 +- + arch/x86/mm/init_64.c | 65 +- + arch/x86/mm/ioremap.c | 31 +- + arch/x86/mm/numa_64.c | 42 +- + arch/x86/mm/pageattr.c | 6 +- + arch/x86/mm/pat.c | 208 +- + arch/x86/mm/pgtable.c | 276 ++ + arch/x86/mm/pgtable_32.c | 204 - + arch/x86/mm/srat_64.c | 2 +- + arch/x86/xen/Kconfig | 2 +- + arch/x86/xen/Makefile | 4 +- + arch/x86/xen/enlighten.c | 54 +- + arch/x86/xen/grant-table.c | 91 + + arch/x86/xen/mmu.c | 143 +- + arch/x86/xen/setup.c | 21 + + arch/x86/xen/smp.c | 22 +- + arch/x86/xen/xen-asm.S | 42 +- + arch/x86/xen/xen-ops.h | 8 +- + block/bsg.c | 43 +- + drivers/Kconfig | 2 + + drivers/acpi/processor_idle.c | 19 +- + drivers/ata/ahci.c | 15 +- + drivers/ata/ata_piix.c | 1 + + drivers/ata/libata-acpi.c | 4 - + drivers/ata/libata-core.c | 7 +- + drivers/ata/libata-eh.c | 1 + + drivers/ata/libata-sff.c | 4 +- + drivers/ata/libata.h | 1 - + drivers/ata/pata_at32.c | 3 + + drivers/ata/pata_bf54x.c | 3 +- + drivers/ata/pata_ixp4xx_cf.c | 1 + + drivers/ata/pata_platform.c | 1 + + drivers/ata/pata_rb500_cf.c | 3 + + drivers/ata/sata_mv.c | 583 ++-- + drivers/ata/sata_nv.c | 11 +- + drivers/ata/sata_sis.c | 12 +- + drivers/block/xen-blkfront.c | 23 +- + drivers/char/Kconfig | 28 + + drivers/char/Makefile | 1 + + drivers/char/agp/amd-k7-agp.c | 3 +- + drivers/char/agp/frontend.c | 4 +- + drivers/char/bfin-otp.c | 189 + + drivers/char/drm/ati_pcigart.c | 7 - + drivers/char/drm/drm.h | 17 + + drivers/char/drm/drmP.h | 133 +- + drivers/char/drm/drm_agpsupport.c | 2 +- + drivers/char/drm/drm_drv.c | 60 +- + drivers/char/drm/drm_fops.c | 41 +- + drivers/char/drm/drm_irq.c | 381 ++- + drivers/char/drm/drm_proc.c | 61 +- + drivers/char/drm/drm_stub.c | 138 +- + drivers/char/drm/drm_sysfs.c | 46 +- + drivers/char/drm/drm_vm.c | 22 +- + drivers/char/drm/i810_dma.c | 4 +- + drivers/char/drm/i830_dma.c | 4 +- + drivers/char/drm/i915_dma.c | 160 +- + drivers/char/drm/i915_drm.h | 45 +- + drivers/char/drm/i915_drv.c | 8 +- + drivers/char/drm/i915_drv.h | 105 +- + drivers/char/drm/i915_irq.c | 605 ++- + drivers/char/drm/mga_drv.c | 7 +- + drivers/char/drm/mga_drv.h | 6 +- + drivers/char/drm/mga_irq.c | 69 +- + drivers/char/drm/r128_drv.c | 7 +- + drivers/char/drm/r128_drv.h | 9 +- + drivers/char/drm/r128_irq.c | 55 +- + drivers/char/drm/radeon_drv.c | 8 +- + drivers/char/drm/radeon_drv.h | 19 +- + drivers/char/drm/radeon_irq.c | 171 +- + drivers/char/drm/via_drv.c | 6 +- + drivers/char/drm/via_drv.h | 7 +- + drivers/char/drm/via_irq.c | 81 +- + drivers/char/keyboard.c | 6 +- + drivers/char/mem.c | 133 +- + drivers/char/mwave/tp3780i.c | 14 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 2 +- + drivers/hid/usbhid/hid-quirks.c | 4 + + drivers/ide/Kconfig | 2 +- + drivers/ide/arm/bast-ide.c | 25 +- + drivers/ide/arm/icside.c | 69 +- + drivers/ide/arm/ide_arm.c | 20 +- + drivers/ide/arm/palm_bk3710.c | 68 +- + drivers/ide/arm/rapide.c | 11 +- + drivers/ide/cris/ide-cris.c | 53 +- + drivers/ide/h8300/ide-h8300.c | 10 +- + drivers/ide/ide-acpi.c | 30 +- + drivers/ide/ide-cd.c | 917 ++-- + drivers/ide/ide-cd.h | 4 - + drivers/ide/ide-disk.c | 159 +- + drivers/ide/ide-dma.c | 153 +- + drivers/ide/ide-floppy.c | 34 +- + drivers/ide/ide-generic.c | 36 +- + drivers/ide/ide-io.c | 59 +- + drivers/ide/ide-iops.c | 110 +- + drivers/ide/ide-lib.c | 44 +- + drivers/ide/ide-pnp.c | 45 +- + drivers/ide/ide-probe.c | 285 +- + drivers/ide/ide-proc.c | 169 +- + drivers/ide/ide-scan-pci.c | 2 +- + drivers/ide/ide-tape.c | 1204 +---- + drivers/ide/ide-taskfile.c | 48 +- + drivers/ide/ide.c | 491 +-- + drivers/ide/legacy/ali14xx.c | 44 +- + drivers/ide/legacy/buddha.c | 18 +- + drivers/ide/legacy/dtc2278.c | 39 +- + drivers/ide/legacy/falconide.c | 14 +- + drivers/ide/legacy/gayle.c | 22 +- + drivers/ide/legacy/hd.c | 78 +- + drivers/ide/legacy/ht6560b.c | 57 +- + drivers/ide/legacy/ide-4drives.c | 52 +- + drivers/ide/legacy/ide-cs.c | 84 +- + drivers/ide/legacy/ide_platform.c | 18 +- + drivers/ide/legacy/macide.c | 8 +- + drivers/ide/legacy/q40ide.c | 9 +- + drivers/ide/legacy/qd65xx.c | 238 +- + drivers/ide/legacy/qd65xx.h | 1 - + drivers/ide/legacy/umc8672.c | 92 +- + drivers/ide/mips/au1xxx-ide.c | 130 +- + drivers/ide/mips/swarm.c | 19 +- + drivers/ide/pci/aec62xx.c | 39 +- + drivers/ide/pci/alim15x3.c | 332 +-- + drivers/ide/pci/amd74xx.c | 19 +- + drivers/ide/pci/atiixp.c | 29 +- + drivers/ide/pci/cmd640.c | 294 +- + drivers/ide/pci/cmd64x.c | 153 +- + drivers/ide/pci/cs5520.c | 29 +- + drivers/ide/pci/cs5530.c | 18 +- + drivers/ide/pci/cs5535.c | 24 +- + drivers/ide/pci/cy82c693.c | 97 +- + drivers/ide/pci/delkin_cb.c | 20 +- + drivers/ide/pci/generic.c | 10 +- + drivers/ide/pci/hpt34x.c | 17 +- + drivers/ide/pci/hpt366.c | 132 +- + drivers/ide/pci/it8213.c | 34 +- + drivers/ide/pci/it821x.c | 52 +- + drivers/ide/pci/jmicron.c | 29 +- + drivers/ide/pci/ns87415.c | 40 +- + drivers/ide/pci/opti621.c | 82 +- + drivers/ide/pci/pdc202xx_new.c | 23 +- + drivers/ide/pci/pdc202xx_old.c | 126 +- + drivers/ide/pci/piix.c | 17 +- + drivers/ide/pci/rz1000.c | 2 +- + drivers/ide/pci/sc1200.c | 39 +- + drivers/ide/pci/scc_pata.c | 95 +- + drivers/ide/pci/serverworks.c | 38 +- + drivers/ide/pci/sgiioc4.c | 140 +- + drivers/ide/pci/siimage.c | 142 +- + drivers/ide/pci/sis5513.c | 253 +- + drivers/ide/pci/sl82c105.c | 83 +- + drivers/ide/pci/slc90e66.c | 22 +- + drivers/ide/pci/tc86c001.c | 54 +- + drivers/ide/pci/triflex.c | 12 +- + drivers/ide/pci/trm290.c | 47 +- + drivers/ide/pci/via82cxxx.c | 20 +- + drivers/ide/ppc/mpc8xx.c | 70 +- + drivers/ide/ppc/pmac.c | 183 +- + drivers/ide/setup-pci.c | 226 +- + drivers/ieee1394/dv1394.c | 2 + + drivers/ieee1394/iso.h | 2 + + drivers/ieee1394/ohci1394.c | 34 + + drivers/ieee1394/raw1394.c | 9 +- + drivers/ieee1394/video1394.c | 2 + + drivers/infiniband/hw/ehca/ehca_classes.h | 1 + + drivers/infiniband/hw/ehca/ehca_irq.c | 2 +- + drivers/infiniband/hw/ehca/ehca_main.c | 75 +- + drivers/infiniband/hw/ehca/ehca_mrmw.c | 16 +- + drivers/infiniband/hw/ehca/ehca_qp.c | 15 +- + drivers/infiniband/hw/ehca/ehca_reqs.c | 51 +- + drivers/infiniband/hw/ehca/ehca_uverbs.c | 6 +- + drivers/infiniband/hw/ehca/hcp_if.c | 23 +- + drivers/infiniband/hw/mlx4/cq.c | 6 +- + drivers/infiniband/hw/mlx4/doorbell.c | 122 +- + drivers/infiniband/hw/mlx4/main.c | 3 - + drivers/infiniband/hw/mlx4/mlx4_ib.h | 33 +- + drivers/infiniband/hw/mlx4/qp.c | 6 +- + drivers/infiniband/hw/mlx4/srq.c | 6 +- + drivers/infiniband/hw/nes/nes.c | 15 +- + drivers/infiniband/hw/nes/nes_cm.c | 27 +- + drivers/infiniband/hw/nes/nes_hw.c | 20 +- + drivers/infiniband/hw/nes/nes_hw.h | 2 +- + drivers/infiniband/hw/nes/nes_nic.c | 18 +- + drivers/infiniband/hw/nes/nes_utils.c | 4 +- + drivers/infiniband/hw/nes/nes_verbs.c | 8 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 20 +- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 125 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 19 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 3 +- + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 15 +- + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 1 + + drivers/input/Kconfig | 9 + + drivers/input/Makefile | 2 + + drivers/input/input-polldev.c | 6 +- + drivers/input/joystick/Kconfig | 12 + + drivers/input/joystick/Makefile | 3 +- + drivers/input/joystick/xpad.c | 233 +- + drivers/input/joystick/zhenhua.c | 243 + + drivers/input/keyboard/aaed2000_kbd.c | 4 + + drivers/input/keyboard/bf54x-keys.c | 37 +- + drivers/input/keyboard/corgikbd.c | 2 + + drivers/input/keyboard/gpio_keys.c | 5 +- + drivers/input/keyboard/jornada680_kbd.c | 2 + + drivers/input/keyboard/jornada720_kbd.c | 4 + + drivers/input/keyboard/locomokbd.c | 73 +- + drivers/input/keyboard/omap-keypad.c | 9 +- + drivers/input/keyboard/pxa27x_keypad.c | 4 + + drivers/input/keyboard/spitzkbd.c | 1 + + drivers/input/keyboard/tosakbd.c | 23 +- + drivers/input/misc/Kconfig | 1 + + drivers/input/misc/cobalt_btns.c | 3 + + drivers/input/mouse/gpio_mouse.c | 4 + + drivers/input/serio/Kconfig | 10 + + drivers/input/serio/Makefile | 1 + + drivers/input/serio/at32psif.c | 375 ++ + drivers/input/serio/i8042-x86ia64io.h | 12 +- + drivers/input/serio/rpckbd.c | 2 + + drivers/input/tablet/Kconfig | 10 +- + drivers/input/tablet/aiptek.c | 2 + + drivers/input/tablet/wacom.h | 3 + + drivers/input/tablet/wacom_sys.c | 76 +- + drivers/input/tablet/wacom_wac.c | 2 + + drivers/input/touchscreen/Kconfig | 53 + + drivers/input/touchscreen/Makefile | 7 + + drivers/input/touchscreen/ads7846.c | 22 +- + drivers/input/touchscreen/corgi_ts.c | 2 + + drivers/input/touchscreen/jornada720_ts.c | 4 + + drivers/input/touchscreen/mainstone-wm97xx.c | 302 ++ + drivers/input/touchscreen/ucb1400_ts.c | 4 - + drivers/input/touchscreen/usbtouchscreen.c | 31 +- + drivers/input/touchscreen/wm9705.c | 353 ++ + drivers/input/touchscreen/wm9712.c | 462 ++ + drivers/input/touchscreen/wm9713.c | 460 ++ + drivers/input/touchscreen/wm97xx-core.c | 829 ++++ + drivers/input/xen-kbdfront.c | 340 ++ + drivers/leds/Kconfig | 17 + + drivers/leds/Makefile | 2 + + drivers/leds/led-class.c | 12 + + drivers/leds/led-core.c | 4 +- + drivers/leds/led-triggers.c | 120 +- + drivers/leds/leds-clevo-mail.c | 16 +- + drivers/leds/leds-cobalt-qube.c | 2 +- + drivers/leds/leds-cobalt-raq.c | 6 +- + drivers/leds/leds-corgi.c | 11 +- + drivers/leds/leds-fsg.c | 261 + + drivers/leds/leds-gpio.c | 15 + + drivers/leds/leds-h1940.c | 64 +- + drivers/leds/leds-hp6xx.c | 6 +- + drivers/leds/leds-s3c24xx.c | 4 +- + drivers/leds/leds-spitz.c | 11 +- + drivers/leds/leds.h | 11 +- + drivers/leds/ledtrig-default-on.c | 45 + + drivers/leds/ledtrig-ide-disk.c | 2 +- + drivers/leds/ledtrig-timer.c | 35 +- + drivers/macintosh/mac_hid.c | 6 + + drivers/macintosh/windfarm_pm112.c | 3 +- + drivers/macintosh/windfarm_pm81.c | 4 +- + drivers/macintosh/windfarm_pm91.c | 3 +- + drivers/md/Makefile | 6 +- + drivers/md/dm-exception-store.c | 10 +- + drivers/md/dm-io.c | 38 +- + drivers/md/{kcopyd.c => dm-kcopyd.c} | 298 +- + drivers/md/dm-log.c | 254 +- + drivers/md/dm-raid1.c | 132 +- + drivers/md/dm-snap.c | 22 +- + drivers/md/dm-snap.h | 4 +- + drivers/md/dm-table.c | 42 +- + drivers/md/dm.c | 16 +- + drivers/md/dm.h | 98 +- + drivers/md/kcopyd.h | 42 - + drivers/media/Kconfig | 11 +- + drivers/media/common/ir-functions.c | 2 +- + drivers/media/common/ir-keymaps.c | 172 +- + drivers/media/common/saa7146_core.c | 8 +- + drivers/media/common/saa7146_i2c.c | 6 +- + drivers/media/common/saa7146_vbi.c | 4 +- + drivers/media/common/saa7146_video.c | 4 +- + drivers/media/dvb/b2c2/Kconfig | 5 + + drivers/media/dvb/b2c2/Makefile | 2 + + drivers/media/dvb/b2c2/flexcop-common.h | 17 +- + drivers/media/dvb/b2c2/flexcop-dma.c | 4 +- + drivers/media/dvb/b2c2/flexcop-eeprom.c | 9 +- + drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 211 +- + drivers/media/dvb/b2c2/flexcop-i2c.c | 180 +- + drivers/media/dvb/b2c2/flexcop-misc.c | 2 + + drivers/media/dvb/b2c2/flexcop-pci.c | 2 +- + drivers/media/dvb/b2c2/flexcop-reg.h | 2 + + drivers/media/dvb/b2c2/flexcop-sram.c | 28 +- + drivers/media/dvb/b2c2/flexcop-usb.c | 17 +- + drivers/media/dvb/b2c2/flexcop.c | 18 +- + drivers/media/dvb/bt8xx/Kconfig | 2 +- + drivers/media/dvb/bt8xx/Makefile | 5 +- + drivers/media/dvb/bt8xx/dst.c | 2 +- + drivers/media/dvb/bt8xx/dst_ca.c | 10 +- + drivers/media/dvb/bt8xx/dvb-bt8xx.c | 23 +- + drivers/media/dvb/bt8xx/dvb-bt8xx.h | 2 +- + drivers/media/dvb/cinergyT2/cinergyT2.c | 9 +- + drivers/media/dvb/dvb-core/demux.h | 2 + + drivers/media/dvb/dvb-core/dmxdev.c | 87 +- + drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 36 +- + drivers/media/dvb/dvb-core/dvb_demux.c | 6 +- + drivers/media/dvb/dvb-core/dvb_frontend.c | 30 +- + drivers/media/dvb/dvb-core/dvb_net.c | 32 +- + drivers/media/dvb/dvb-core/dvb_ringbuffer.c | 6 +- + drivers/media/dvb/dvb-core/dvb_ringbuffer.h | 8 + + drivers/media/dvb/dvb-core/dvbdev.c | 47 +- + drivers/media/dvb/dvb-core/dvbdev.h | 13 +- + drivers/media/dvb/dvb-usb/Kconfig | 1 + + drivers/media/dvb/dvb-usb/a800.c | 6 +- + drivers/media/dvb/dvb-usb/af9005.c | 5 +- + drivers/media/dvb/dvb-usb/au6610.c | 6 +- + drivers/media/dvb/dvb-usb/cxusb.c | 51 +- + drivers/media/dvb/dvb-usb/dib0700.h | 4 + + drivers/media/dvb/dvb-usb/dib0700_core.c | 9 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 325 ++- + drivers/media/dvb/dvb-usb/dibusb-mb.c | 14 +- + drivers/media/dvb/dvb-usb/dibusb-mc.c | 5 +- + drivers/media/dvb/dvb-usb/digitv.c | 8 +- + drivers/media/dvb/dvb-usb/dtt200u.c | 17 +- + drivers/media/dvb/dvb-usb/dvb-usb-common.h | 3 +- + drivers/media/dvb/dvb-usb/dvb-usb-dvb.c | 9 +- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 13 +- + drivers/media/dvb/dvb-usb/dvb-usb-init.c | 16 +- + drivers/media/dvb/dvb-usb/dvb-usb.h | 5 +- + drivers/media/dvb/dvb-usb/gl861.c | 6 +- + drivers/media/dvb/dvb-usb/gp8psk-fe.c | 4 +- + drivers/media/dvb/dvb-usb/gp8psk.c | 5 +- + drivers/media/dvb/dvb-usb/m920x.c | 34 +- + drivers/media/dvb/dvb-usb/nova-t-usb2.c | 5 +- + drivers/media/dvb/dvb-usb/opera1.c | 8 +- + drivers/media/dvb/dvb-usb/ttusb2.c | 67 +- + drivers/media/dvb/dvb-usb/umt-010.c | 5 +- + drivers/media/dvb/dvb-usb/vp702x-fe.c | 18 +- + drivers/media/dvb/dvb-usb/vp702x.c | 5 +- + drivers/media/dvb/dvb-usb/vp7045.c | 6 +- + drivers/media/dvb/frontends/Kconfig | 36 + + drivers/media/dvb/frontends/Makefile | 5 + + drivers/media/dvb/frontends/au8522.c | 692 +++ + drivers/media/dvb/frontends/au8522.h | 56 + + drivers/media/dvb/frontends/bcm3510.c | 4 +- + drivers/media/dvb/frontends/bcm3510.h | 2 +- + drivers/media/dvb/frontends/bsbe1.h | 58 +- + drivers/media/dvb/frontends/bsru6.h | 2 +- + drivers/media/dvb/frontends/cx22700.c | 12 +- + drivers/media/dvb/frontends/cx22700.h | 2 +- + drivers/media/dvb/frontends/cx22702.c | 26 +- + drivers/media/dvb/frontends/cx22702.h | 2 +- + drivers/media/dvb/frontends/cx24110.c | 6 +- + drivers/media/dvb/frontends/cx24110.h | 2 +- + drivers/media/dvb/frontends/cx24113.h | 48 + + drivers/media/dvb/frontends/cx24123.c | 304 +- + drivers/media/dvb/frontends/cx24123.h | 21 +- + drivers/media/dvb/frontends/dib3000.h | 2 +- + drivers/media/dvb/frontends/dib3000mc.h | 2 +- + drivers/media/dvb/frontends/dib7000p.c | 8 +- + drivers/media/dvb/frontends/dib7000p.h | 2 + + drivers/media/dvb/frontends/dvb-pll.c | 260 +- + drivers/media/dvb/frontends/dvb-pll.h | 33 +- + drivers/media/dvb/frontends/isl6405.c | 164 + + drivers/media/dvb/frontends/isl6405.h | 74 + + drivers/media/dvb/frontends/isl6421.h | 2 +- + drivers/media/dvb/frontends/itd1000.c | 400 ++ + drivers/media/dvb/frontends/itd1000.h | 42 + + drivers/media/dvb/frontends/itd1000_priv.h | 88 + + drivers/media/dvb/frontends/l64781.c | 2 +- + drivers/media/dvb/frontends/l64781.h | 2 +- + drivers/media/dvb/frontends/lgdt330x.c | 40 +- + drivers/media/dvb/frontends/lgdt330x.h | 2 +- + drivers/media/dvb/frontends/lnbp21.h | 2 +- + drivers/media/dvb/frontends/mt2060.h | 2 +- + drivers/media/dvb/frontends/mt2131.c | 14 +- + drivers/media/dvb/frontends/mt2131.h | 2 +- + drivers/media/dvb/frontends/mt2266.h | 2 +- + drivers/media/dvb/frontends/mt312.c | 151 +- + drivers/media/dvb/frontends/mt312.h | 5 +- + drivers/media/dvb/frontends/mt312_priv.h | 5 +- + drivers/media/dvb/frontends/mt352.c | 8 +- + drivers/media/dvb/frontends/mt352.h | 2 +- + drivers/media/dvb/frontends/nxt200x.c | 26 +- + drivers/media/dvb/frontends/nxt200x.h | 2 +- + drivers/media/dvb/frontends/nxt6000.c | 2 +- + drivers/media/dvb/frontends/nxt6000.h | 2 +- + drivers/media/dvb/frontends/or51132.c | 6 +- + drivers/media/dvb/frontends/or51132.h | 2 +- + drivers/media/dvb/frontends/or51211.c | 6 +- + drivers/media/dvb/frontends/or51211.h | 2 +- + drivers/media/dvb/frontends/qt1010.h | 2 +- + drivers/media/dvb/frontends/s5h1409.c | 50 +- + drivers/media/dvb/frontends/s5h1409.h | 2 +- + drivers/media/dvb/frontends/s5h1411.c | 888 ++++ + drivers/media/dvb/frontends/s5h1411.h | 90 + + drivers/media/dvb/frontends/s5h1420.c | 523 ++- + drivers/media/dvb/frontends/s5h1420.h | 64 +- + drivers/media/dvb/frontends/s5h1420_priv.h | 102 + + drivers/media/dvb/frontends/sp8870.c | 38 +- + drivers/media/dvb/frontends/sp8870.h | 2 +- + drivers/media/dvb/frontends/sp887x.c | 18 +- + drivers/media/dvb/frontends/sp887x.h | 2 +- + drivers/media/dvb/frontends/stv0297.c | 14 +- + drivers/media/dvb/frontends/stv0297.h | 2 +- + drivers/media/dvb/frontends/stv0299.c | 85 +- + drivers/media/dvb/frontends/stv0299.h | 13 +- + drivers/media/dvb/frontends/tda10021.c | 4 +- + drivers/media/dvb/frontends/tda10023.c | 4 +- + drivers/media/dvb/frontends/tda1002x.h | 4 +- + drivers/media/dvb/frontends/tda10048.c | 841 ++++ + drivers/media/dvb/frontends/tda10048.h | 63 + + drivers/media/dvb/frontends/tda1004x.c | 56 +- + drivers/media/dvb/frontends/tda1004x.h | 5 +- + drivers/media/dvb/frontends/tda10086.c | 147 +- + drivers/media/dvb/frontends/tda10086.h | 14 +- + drivers/media/dvb/frontends/tda18271-common.c | 57 +- + drivers/media/dvb/frontends/tda18271-fe.c | 418 +- + drivers/media/dvb/frontends/tda18271-priv.h | 18 +- + drivers/media/dvb/frontends/tda18271-tables.c | 84 +- + drivers/media/dvb/frontends/tda18271.h | 25 +- + drivers/media/dvb/frontends/tda8083.c | 4 +- + drivers/media/dvb/frontends/tda8083.h | 2 +- + drivers/media/dvb/frontends/tda826x.c | 25 +- + drivers/media/dvb/frontends/tda826x.h | 2 +- + drivers/media/dvb/frontends/tda827x.c | 167 +- + drivers/media/dvb/frontends/tda827x.h | 6 +- + drivers/media/dvb/frontends/tua6100.c | 2 +- + drivers/media/dvb/frontends/tua6100.h | 2 +- + drivers/media/dvb/frontends/ves1820.c | 4 +- + drivers/media/dvb/frontends/ves1820.h | 2 +- + drivers/media/dvb/frontends/ves1x93.c | 8 +- + drivers/media/dvb/frontends/ves1x93.h | 2 +- + drivers/media/dvb/frontends/xc5000.c | 46 +- + drivers/media/dvb/frontends/xc5000.h | 2 +- + drivers/media/dvb/frontends/zl10353.c | 8 +- + drivers/media/dvb/frontends/zl10353.h | 2 +- + drivers/media/dvb/pluto2/pluto2.c | 5 +- + drivers/media/dvb/ttpci/av7110.c | 16 +- + drivers/media/dvb/ttpci/av7110.h | 2 +- + drivers/media/dvb/ttpci/av7110_hw.c | 42 +- + drivers/media/dvb/ttpci/av7110_ir.c | 6 +- + drivers/media/dvb/ttpci/av7110_v4l.c | 4 +- + drivers/media/dvb/ttpci/budget-av.c | 16 +- + drivers/media/dvb/ttpci/budget-ci.c | 6 +- + drivers/media/dvb/ttpci/budget-core.c | 9 +- + drivers/media/dvb/ttpci/budget.c | 111 +- + drivers/media/dvb/ttpci/budget.h | 3 +- + drivers/media/dvb/ttpci/ttpci-eeprom.c | 2 +- + drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 58 +- + drivers/media/dvb/ttusb-dec/ttusb_dec.c | 112 +- + drivers/media/dvb/ttusb-dec/ttusbdecfe.c | 4 +- + drivers/media/radio/dsbr100.c | 2 + + drivers/media/radio/miropcm20-radio.c | 2 + + drivers/media/radio/miropcm20-rds.c | 2 +- + drivers/media/radio/radio-aimslab.c | 2 + + drivers/media/radio/radio-aztech.c | 2 + + drivers/media/radio/radio-cadet.c | 12 +- + drivers/media/radio/radio-gemtek-pci.c | 2 + + drivers/media/radio/radio-gemtek.c | 2 + + drivers/media/radio/radio-maestro.c | 2 + + drivers/media/radio/radio-maxiradio.c | 2 + + drivers/media/radio/radio-rtrack2.c | 2 + + drivers/media/radio/radio-sf16fmi.c | 2 + + drivers/media/radio/radio-sf16fmr2.c | 104 +- + drivers/media/radio/radio-si470x.c | 59 +- + drivers/media/radio/radio-terratec.c | 2 + + drivers/media/radio/radio-trust.c | 2 + + drivers/media/radio/radio-typhoon.c | 44 +- + drivers/media/radio/radio-zoltrix.c | 2 + + drivers/media/video/Kconfig | 56 + + drivers/media/video/Makefile | 12 +- + drivers/media/video/adv7170.c | 2 +- + drivers/media/video/adv7175.c | 2 +- + drivers/media/video/arv.c | 6 +- + drivers/media/video/au0828/Kconfig | 12 + + drivers/media/video/au0828/Makefile | 9 + + drivers/media/video/au0828/au0828-cards.c | 181 + + drivers/media/video/au0828/au0828-cards.h | 25 + + drivers/media/video/au0828/au0828-core.c | 256 + + drivers/media/video/au0828/au0828-dvb.c | 373 ++ + drivers/media/video/au0828/au0828-i2c.c | 381 ++ + drivers/media/video/au0828/au0828-reg.h | 38 + + drivers/media/video/au0828/au0828.h | 124 + + drivers/media/video/bt819.c | 2 +- + drivers/media/video/bt856.c | 2 +- + drivers/media/video/bt8xx/bttv-cards.c | 55 +- + drivers/media/video/bt8xx/bttv-driver.c | 36 +- + drivers/media/video/bt8xx/bttv-input.c | 6 + + drivers/media/video/bt8xx/bttv-vbi.c | 2 +- + drivers/media/video/bt8xx/bttv.h | 3 + + drivers/media/video/bt8xx/bttvp.h | 1 - + drivers/media/video/bw-qcam.c | 6 +- + drivers/media/video/c-qcam.c | 13 +- + drivers/media/video/cafe_ccic.c | 4 +- + drivers/media/video/cpia.c | 2 + + drivers/media/video/cpia.h | 4 +- + drivers/media/video/cpia2/cpia2_core.c | 16 +- + drivers/media/video/cpia2/cpia2_usb.c | 2 +- + drivers/media/video/cpia2/cpia2_v4l.c | 2 + + drivers/media/video/cpia_usb.c | 2 +- + drivers/media/video/cx23885/Kconfig | 2 + + drivers/media/video/cx23885/Makefile | 2 +- + drivers/media/video/cx23885/cx23885-417.c | 1764 +++++++ + drivers/media/video/cx23885/cx23885-cards.c | 116 +- + drivers/media/video/cx23885/cx23885-core.c | 310 +- + drivers/media/video/cx23885/cx23885-dvb.c | 172 +- + drivers/media/video/cx23885/cx23885-i2c.c | 46 +- + drivers/media/video/cx23885/cx23885-video.c | 58 +- + drivers/media/video/cx23885/cx23885.h | 27 + + drivers/media/video/cx25840/cx25840-core.c | 97 +- + drivers/media/video/cx25840/cx25840-core.h | 2 +- + drivers/media/video/cx25840/cx25840-firmware.c | 11 +- + drivers/media/video/cx25840/cx25840-vbi.c | 6 +- + drivers/media/video/cx88/Kconfig | 2 + + drivers/media/video/cx88/cx88-alsa.c | 14 +- + drivers/media/video/cx88/cx88-blackbird.c | 24 +- + drivers/media/video/cx88/cx88-cards.c | 586 +++- + drivers/media/video/cx88/cx88-core.c | 17 +- + drivers/media/video/cx88/cx88-dvb.c | 292 +- + drivers/media/video/cx88/cx88-i2c.c | 4 +- + drivers/media/video/cx88/cx88-input.c | 15 +- + drivers/media/video/cx88/cx88-mpeg.c | 20 +- + drivers/media/video/cx88/cx88-tvaudio.c | 30 +- + drivers/media/video/cx88/cx88-vbi.c | 2 +- + drivers/media/video/cx88/cx88-video.c | 63 +- + drivers/media/video/cx88/cx88.h | 14 +- + drivers/media/video/dabfirmware.h | 7 + + drivers/media/video/dabusb.c | 8 +- + drivers/media/video/dpc7146.c | 4 +- + drivers/media/video/em28xx/Kconfig | 14 +- + drivers/media/video/em28xx/Makefile | 1 + + drivers/media/video/em28xx/em28xx-audio.c | 2 +- + drivers/media/video/em28xx/em28xx-cards.c | 207 +- + drivers/media/video/em28xx/em28xx-core.c | 776 ++-- + drivers/media/video/em28xx/em28xx-dvb.c | 474 ++ + drivers/media/video/em28xx/em28xx-i2c.c | 160 +- + drivers/media/video/em28xx/em28xx-input.c | 26 +- + drivers/media/video/em28xx/em28xx-reg.h | 88 + + drivers/media/video/em28xx/em28xx-video.c | 1078 +++-- + drivers/media/video/em28xx/em28xx.h | 318 +- + drivers/media/video/et61x251/et61x251.h | 6 +- + drivers/media/video/et61x251/et61x251_core.c | 4 +- + drivers/media/video/hexium_gemini.c | 4 +- + drivers/media/video/hexium_orion.c | 4 +- + drivers/media/video/ir-kbd-i2c.c | 31 +- + drivers/media/video/ivtv/Kconfig | 1 + + drivers/media/video/ivtv/ivtv-cards.c | 7 +- + drivers/media/video/ivtv/ivtv-cards.h | 2 +- + drivers/media/video/ivtv/ivtv-driver.c | 46 +- + drivers/media/video/ivtv/ivtv-driver.h | 2 + + drivers/media/video/ivtv/ivtv-fileops.c | 6 +- + drivers/media/video/ivtv/ivtv-i2c.c | 12 +- + drivers/media/video/ivtv/ivtv-ioctl.c | 42 +- + drivers/media/video/ivtv/ivtv-irq.c | 25 +- + drivers/media/video/ivtv/ivtv-mailbox.c | 11 +- + drivers/media/video/ivtv/ivtv-queue.c | 4 +- + drivers/media/video/ivtv/ivtv-streams.c | 3 +- + drivers/media/video/ivtv/ivtv-yuv.c | 38 +- + drivers/media/video/meye.c | 1361 +++--- + drivers/media/video/msp3400-driver.c | 4 +- + drivers/media/video/msp3400-kthreads.c | 15 +- + drivers/media/video/mt20xx.c | 7 +- + drivers/media/video/mt20xx.h | 2 +- + drivers/media/video/mt9m001.c | 722 +++ + drivers/media/video/mt9v022.c | 844 ++++ + drivers/media/video/mxb.c | 4 +- + drivers/media/video/ov511.c | 4 +- + drivers/media/video/ov511.h | 2 +- + drivers/media/video/ovcamchip/ovcamchip_priv.h | 4 +- + drivers/media/video/pms.c | 6 +- + drivers/media/video/pvrusb2/Kconfig | 25 + + drivers/media/video/pvrusb2/Makefile | 6 + + drivers/media/video/pvrusb2/pvrusb2-context.c | 306 +- + drivers/media/video/pvrusb2/pvrusb2-context.h | 16 +- + drivers/media/video/pvrusb2/pvrusb2-ctrl.c | 19 +- + drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | 4 +- + drivers/media/video/pvrusb2/pvrusb2-debug.h | 2 +- + drivers/media/video/pvrusb2/pvrusb2-debugifc.c | 24 + + drivers/media/video/pvrusb2/pvrusb2-devattr.c | 298 ++- + drivers/media/video/pvrusb2/pvrusb2-devattr.h | 72 +- + drivers/media/video/pvrusb2/pvrusb2-dvb.c | 425 ++ + drivers/media/video/pvrusb2/pvrusb2-dvb.h | 41 + + drivers/media/video/pvrusb2/pvrusb2-encoder.c | 19 +- + drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h | 43 +- + drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 26 +- + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 903 +++- + drivers/media/video/pvrusb2/pvrusb2-hdw.h | 39 +- + drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 2 +- + drivers/media/video/pvrusb2/pvrusb2-io.c | 30 + + drivers/media/video/pvrusb2/pvrusb2-io.h | 12 + + drivers/media/video/pvrusb2/pvrusb2-main.c | 16 + + drivers/media/video/pvrusb2/pvrusb2-std.c | 9 +- + drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 53 +- + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 195 +- + drivers/media/video/pwc/pwc-if.c | 16 +- + drivers/media/video/pwc/pwc-v4l.c | 4 +- + drivers/media/video/pxa_camera.c | 1206 +++++ + drivers/media/video/saa5249.c | 2 + + drivers/media/video/saa6588.c | 8 +- + drivers/media/video/saa7110.c | 2 +- + drivers/media/video/saa7111.c | 2 +- + drivers/media/video/saa7114.c | 2 +- + drivers/media/video/saa7115.c | 4 +- + drivers/media/video/saa711x.c | 2 +- + drivers/media/video/saa7134/Kconfig | 1 + + drivers/media/video/saa7134/saa7134-alsa.c | 16 +- + drivers/media/video/saa7134/saa7134-cards.c | 507 ++- + drivers/media/video/saa7134/saa7134-core.c | 52 +- + drivers/media/video/saa7134/saa7134-dvb.c | 434 ++- + drivers/media/video/saa7134/saa7134-empress.c | 10 +- + drivers/media/video/saa7134/saa7134-i2c.c | 6 +- + drivers/media/video/saa7134/saa7134-input.c | 19 +- + drivers/media/video/saa7134/saa7134-reg.h | 3 + + drivers/media/video/saa7134/saa7134-ts.c | 2 +- + drivers/media/video/saa7134/saa7134-tvaudio.c | 21 +- + drivers/media/video/saa7134/saa7134-vbi.c | 2 +- + drivers/media/video/saa7134/saa7134-video.c | 17 +- + drivers/media/video/saa7134/saa7134.h | 22 +- + drivers/media/video/saa717x.c | 1516 ++++++ + drivers/media/video/saa7185.c | 2 +- + drivers/media/video/se401.c | 12 +- + drivers/media/video/sn9c102/sn9c102.h | 6 +- + drivers/media/video/sn9c102/sn9c102_core.c | 12 +- + drivers/media/video/sn9c102/sn9c102_sensor.h | 3 - + drivers/media/video/soc_camera.c | 1031 ++++ + drivers/media/video/stk-webcam.c | 6 +- + drivers/media/video/stradis.c | 6 +- + drivers/media/video/stv680.c | 13 +- + drivers/media/video/tcm825x.c | 2 +- + drivers/media/video/tda8290.c | 18 +- + drivers/media/video/tda8290.h | 6 +- + drivers/media/video/tda9840.c | 4 +- + drivers/media/video/tda9887.c | 42 +- + drivers/media/video/tda9887.h | 2 +- + drivers/media/video/tea5761.c | 22 +- + drivers/media/video/tea5761.h | 4 +- + drivers/media/video/tea5767.c | 39 +- + drivers/media/video/tea5767.h | 4 +- + drivers/media/video/tea6415c.c | 4 +- + drivers/media/video/tea6420.c | 4 +- + drivers/media/video/tuner-core.c | 111 +- + drivers/media/video/tuner-i2c.h | 118 +- + drivers/media/video/tuner-simple.c | 861 +++- + drivers/media/video/tuner-simple.h | 13 +- + drivers/media/video/tuner-types.c | 188 +- + drivers/media/video/tuner-xc2028-types.h | 23 +- + drivers/media/video/tuner-xc2028.c | 165 +- + drivers/media/video/tuner-xc2028.h | 6 +- + drivers/media/video/tvaudio.c | 8 +- + drivers/media/video/tveeprom.c | 103 - + drivers/media/video/tvp5150.c | 2 +- + drivers/media/video/usbvideo/ibmcam.c | 64 +- + drivers/media/video/usbvideo/konicawc.c | 4 +- + drivers/media/video/usbvideo/quickcam_messenger.c | 4 +- + drivers/media/video/usbvideo/ultracam.c | 4 +- + drivers/media/video/usbvideo/usbvideo.c | 148 +- + drivers/media/video/usbvideo/vicam.c | 4 +- + drivers/media/video/usbvision/usbvision-core.c | 45 +- + drivers/media/video/usbvision/usbvision-i2c.c | 8 +- + drivers/media/video/usbvision/usbvision-video.c | 46 +- + drivers/media/video/v4l1-compat.c | 1735 ++++--- + drivers/media/video/videobuf-core.c | 209 +- + drivers/media/video/videobuf-dma-sg.c | 156 +- + drivers/media/video/videobuf-dvb.c | 18 +- + drivers/media/video/videobuf-vmalloc.c | 211 +- + drivers/media/video/videocodec.c | 115 +- + drivers/media/video/videodev.c | 74 +- + drivers/media/video/vino.c | 10 +- + drivers/media/video/vivi.c | 352 +- + drivers/media/video/vpx3220.c | 2 +- + drivers/media/video/w9966.c | 8 +- + drivers/media/video/w9968cf.c | 4 +- + drivers/media/video/w9968cf.h | 6 +- + drivers/media/video/zc0301/zc0301.h | 6 +- + drivers/media/video/zc0301/zc0301_core.c | 4 +- + drivers/media/video/zoran.h | 16 - + drivers/media/video/zoran_card.c | 6 +- + drivers/media/video/zoran_card.h | 2 + + drivers/media/video/zoran_device.c | 12 +- + drivers/media/video/zoran_driver.c | 26 +- + drivers/media/video/zr36016.c | 5 +- + drivers/media/video/zr36050.c | 5 +- + drivers/media/video/zr36060.c | 6 +- + drivers/media/video/zr364xx.c | 4 +- + drivers/mfd/htc-pasic3.c | 3 - + drivers/misc/enclosure.c | 100 +- + drivers/mtd/Kconfig | 6 + + drivers/mtd/Makefile | 1 + + drivers/mtd/ar7part.c | 151 + + drivers/mtd/chips/cfi_cmdset_0001.c | 19 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 30 +- + drivers/mtd/chips/cfi_cmdset_0020.c | 15 +- + drivers/mtd/chips/cfi_probe.c | 7 +- + drivers/mtd/chips/cfi_util.c | 2 +- + drivers/mtd/chips/jedec_probe.c | 73 +- + drivers/mtd/cmdlinepart.c | 15 +- + drivers/mtd/devices/Kconfig | 7 + + drivers/mtd/devices/block2mtd.c | 10 +- + drivers/mtd/devices/lart.c | 16 +- + drivers/mtd/devices/m25p80.c | 40 +- + drivers/mtd/devices/mtdram.c | 1 + + drivers/mtd/devices/phram.c | 2 +- + drivers/mtd/ftl.c | 6 +- + drivers/mtd/inftlmount.c | 5 - + drivers/mtd/maps/Kconfig | 3 + + drivers/mtd/maps/bast-flash.c | 5 +- + drivers/mtd/maps/ck804xrom.c | 89 +- + drivers/mtd/maps/integrator-flash.c | 2 + + drivers/mtd/maps/ixp2000.c | 3 +- + drivers/mtd/maps/ixp4xx.c | 2 + + drivers/mtd/maps/omap_nor.c | 12 +- + drivers/mtd/maps/pcmciamtd.c | 2 +- + drivers/mtd/maps/physmap.c | 8 + + drivers/mtd/maps/plat-ram.c | 50 +- + drivers/mtd/maps/pmcmsp-flash.c | 2 +- + drivers/mtd/maps/sa1100-flash.c | 2 + + drivers/mtd/maps/sharpsl-flash.c | 2 +- + drivers/mtd/maps/tqm8xxl.c | 6 +- + drivers/mtd/mtdoops.c | 2 +- + drivers/mtd/nand/Kconfig | 56 + + drivers/mtd/nand/Makefile | 2 + + drivers/mtd/nand/at91_nand.c | 370 ++- + drivers/mtd/nand/bf5xx_nand.c | 17 +- + drivers/mtd/nand/cs553x_nand.c | 2 +- + drivers/mtd/nand/fsl_elbc_nand.c | 39 +- + drivers/mtd/nand/fsl_upm.c | 291 ++ + drivers/mtd/nand/nand_base.c | 21 + + drivers/mtd/nand/ndfc.c | 2 + + drivers/mtd/nand/orion_nand.c | 1 + + drivers/mtd/nand/plat_nand.c | 2 + + drivers/mtd/nand/pxa3xx_nand.c | 1249 +++++ + drivers/mtd/nand/rtc_from4.c | 50 +- + drivers/mtd/nand/s3c2410.c | 73 +- + drivers/mtd/nftlmount.c | 5 - + drivers/mtd/ofpart.c | 2 + + drivers/mtd/onenand/onenand_base.c | 51 +- + drivers/mtd/onenand/onenand_bbt.c | 3 - + drivers/mtd/rfd_ftl.c | 2 +- + drivers/mtd/ubi/Kconfig | 9 +- + drivers/mtd/ubi/build.c | 40 +- + drivers/mtd/ubi/debug.h | 4 +- + drivers/mtd/ubi/gluebi.c | 5 +- + drivers/mtd/ubi/io.c | 4 + + drivers/mtd/ubi/scan.c | 41 +- + drivers/mtd/ubi/scan.h | 2 +- + .../ubi-header.h => drivers/mtd/ubi/ubi-media.h | 8 +- + drivers/mtd/ubi/ubi.h | 7 +- + drivers/net/Kconfig | 5 +- + drivers/net/arm/at91_ether.c | 1 + + drivers/net/arm/ep93xx_eth.c | 2 + + drivers/net/atlx/atl1.c | 138 + + drivers/net/atlx/atlx.c | 177 - + drivers/net/ax88796.c | 1 + + drivers/net/bfin_mac.c | 7 +- + drivers/net/cpmac.c | 2 + + drivers/net/dm9000.c | 1 + + drivers/net/e1000e/82571.c | 6 - + drivers/net/e1000e/defines.h | 3 + + drivers/net/e1000e/e1000.h | 34 +- + drivers/net/e1000e/es2lan.c | 129 +- + drivers/net/e1000e/ethtool.c | 49 +- + drivers/net/e1000e/hw.h | 12 +- + drivers/net/e1000e/netdev.c | 159 +- + drivers/net/e1000e/phy.c | 73 +- + drivers/net/ehea/ehea_main.c | 4 +- + drivers/net/forcedeth.c | 432 ++- + drivers/net/gianfar.c | 104 +- + drivers/net/ibm_newemac/core.c | 83 +- + drivers/net/ibm_newemac/core.h | 14 +- + drivers/net/ibm_newemac/mal.c | 20 +- + drivers/net/ibm_newemac/rgmii.c | 2 +- + drivers/net/ibm_newemac/tah.c | 2 +- + drivers/net/ibm_newemac/zmii.c | 2 +- + drivers/net/igb/igb_main.c | 2 + + drivers/net/irda/ali-ircc.c | 2 + + drivers/net/irda/pxaficp_ir.c | 2 + + drivers/net/irda/sa1100_ir.c | 2 + + drivers/net/ixgbe/ixgbe_main.c | 2 + + drivers/net/jazzsonic.c | 2 + + drivers/net/korina.c | 39 +- + drivers/net/macb.c | 2 + + drivers/net/meth.c | 2 + + drivers/net/mlx4/alloc.c | 157 + + drivers/net/mlx4/cq.c | 2 +- + drivers/net/mlx4/main.c | 3 + + drivers/net/mlx4/mlx4.h | 3 + + drivers/net/mlx4/qp.c | 31 + + drivers/net/mv643xx_eth.c | 5 +- + drivers/net/netx-eth.c | 2 +- + drivers/net/netxen/netxen_nic_hw.c | 15 +- + drivers/net/niu.c | 371 ++- + drivers/net/niu.h | 12 + + drivers/net/phy/mdio_bus.c | 3 + + drivers/net/phy/phy.c | 4 +- + drivers/net/phy/phy_device.c | 129 +- + drivers/net/ppp_generic.c | 48 +- + drivers/net/s2io.c | 128 +- + drivers/net/s2io.h | 9 - + drivers/net/sgiseeq.c | 4 +- + drivers/net/smc911x.c | 8 +- + drivers/net/smc91x.c | 2 + + drivers/net/sni_82596.c | 2 + + drivers/net/tehuti.c | 15 + + drivers/net/tg3.c | 2 + + drivers/net/tsi108_eth.c | 2 + + drivers/net/tun.c | 21 +- + drivers/net/typhoon.c | 1 - + drivers/net/ucc_geth.c | 2 +- + drivers/net/via-velocity.c | 46 +- + drivers/net/wan/c101.c | 6 +- + drivers/net/wan/hdlc_fr.c | 4 - + drivers/net/wireless/Makefile | 3 +- + drivers/net/wireless/ath5k/hw.c | 14 +- + drivers/net/wireless/b43/dma.c | 47 +- + drivers/net/wireless/b43/main.c | 32 +- + drivers/net/wireless/b43/phy.c | 2 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 1 - + drivers/net/wireless/iwlwifi/iwl4965-base.c | 1 - + drivers/net/wireless/prism54/isl_ioctl.c | 2 +- + drivers/net/wireless/rndis_wlan.c | 5 +- + drivers/net/xen-netfront.c | 2 + + drivers/of/of_i2c.c | 3 + + drivers/pci/intel-iommu.c | 35 +- + drivers/pcmcia/Kconfig | 2 +- + drivers/s390/Makefile | 2 +- + drivers/s390/kvm/Makefile | 9 + + drivers/s390/kvm/kvm_virtio.c | 338 ++ + drivers/s390/scsi/zfcp_fsf.c | 39 +- + drivers/s390/scsi/zfcp_fsf.h | 18 +- + drivers/s390/scsi/zfcp_scsi.c | 114 + + drivers/scsi/FlashPoint.c | 2 +- + drivers/scsi/Kconfig | 10 + + drivers/scsi/Makefile | 1 + + drivers/scsi/aha152x.c | 7 +- + drivers/scsi/aha1542.c | 26 +- + drivers/scsi/aic7xxx/aic79xx.h | 23 +- + drivers/scsi/aic7xxx/aic79xx.reg | 115 +- + drivers/scsi/aic7xxx/aic79xx_core.c | 835 +++- + drivers/scsi/aic7xxx/aic79xx_inline.h | 859 +---- + drivers/scsi/aic7xxx/aic79xx_osm.c | 181 +- + drivers/scsi/aic7xxx/aic79xx_osm.h | 177 +- + drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 33 +- + drivers/scsi/aic7xxx/aic79xx_pci.c | 8 +- + drivers/scsi/aic7xxx/aic79xx_proc.c | 2 +- + drivers/scsi/aic7xxx/aic79xx_reg.h_shipped | 1145 +---- + drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped | 1555 +------ + drivers/scsi/aic7xxx/aic79xx_seq.h_shipped | 6 +- + drivers/scsi/aic7xxx/aic7xxx.h | 55 +- + drivers/scsi/aic7xxx/aic7xxx.reg | 45 +- + drivers/scsi/aic7xxx/aic7xxx_93cx6.c | 16 +- + drivers/scsi/aic7xxx/aic7xxx_core.c | 676 +++- + drivers/scsi/aic7xxx/aic7xxx_inline.h | 616 +--- + drivers/scsi/aic7xxx/aic7xxx_osm.c | 95 +- + drivers/scsi/aic7xxx/aic7xxx_osm.h | 142 +- + drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 73 +- + drivers/scsi/aic7xxx/aic7xxx_pci.c | 9 +- + drivers/scsi/aic7xxx/aic7xxx_proc.c | 4 +- + drivers/scsi/aic7xxx/aic7xxx_reg_print.c_shipped | 233 +- + drivers/scsi/aic7xxx/aic7xxx_seq.h_shipped | 6 +- + drivers/scsi/aic7xxx/aicasm/aicasm.c | 6 +- + drivers/scsi/aic7xxx/aicasm/aicasm_gram.y | 105 +- + drivers/scsi/aic7xxx/aicasm/aicasm_scan.l | 19 +- + drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c | 25 +- + drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h | 1 + + drivers/scsi/eata.c | 11 +- + drivers/scsi/esp_scsi.c | 35 +- + drivers/scsi/esp_scsi.h | 13 +- + drivers/scsi/hosts.c | 29 +- + drivers/scsi/ide-scsi.c | 19 +- + drivers/scsi/jazz_esp.c | 4 + + drivers/scsi/lpfc/lpfc_attr.c | 10 +- + drivers/scsi/mac_esp.c | 657 +++ + drivers/scsi/qla2xxx/qla_attr.c | 8 +- + drivers/scsi/qla2xxx/qla_dbg.c | 394 +- + drivers/scsi/qla2xxx/qla_fw.h | 26 +- + drivers/scsi/qla2xxx/qla_gbl.h | 4 - + drivers/scsi/qla2xxx/qla_gs.c | 4 +- + drivers/scsi/qla2xxx/qla_init.c | 2 +- + drivers/scsi/qla2xxx/qla_isr.c | 4 +- + drivers/scsi/qla2xxx/qla_mbx.c | 19 +- + drivers/scsi/qla2xxx/qla_os.c | 12 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/scsi_priv.h | 1 + + drivers/scsi/scsi_proc.c | 7 +- + drivers/scsi/scsi_scan.c | 84 +- + drivers/scsi/scsi_sysfs.c | 142 +- + drivers/scsi/scsi_transport_fc.c | 60 +- + drivers/scsi/scsi_transport_sas.c | 22 +- + drivers/scsi/scsi_transport_spi.c | 33 +- + drivers/scsi/sgiwd93.c | 4 +- + drivers/scsi/sni_53c710.c | 2 + + drivers/scsi/st.c | 10 +- + drivers/scsi/sun3x_esp.c | 2 + + drivers/scsi/u14-34f.c | 9 +- + drivers/serial/bfin_5xx.c | 56 +- + drivers/serial/of_serial.c | 14 +- + drivers/serial/sunzilog.c | 30 +- + drivers/ssb/pci.c | 5 + + drivers/usb/atm/cxacru.c | 2 +- + drivers/usb/atm/ueagle-atm.c | 6 +- + drivers/usb/atm/usbatm.c | 27 +- + drivers/usb/atm/usbatm.h | 2 +- + drivers/usb/class/cdc-acm.c | 98 +- + drivers/usb/class/cdc-acm.h | 7 +- + drivers/usb/core/Kconfig | 42 +- + drivers/usb/core/config.c | 17 + + drivers/usb/core/devio.c | 73 +- + drivers/usb/core/driver.c | 52 +- + drivers/usb/core/hcd-pci.c | 15 +- + drivers/usb/core/hcd.c | 25 +- + drivers/usb/core/hcd.h | 9 +- + drivers/usb/core/hub.c | 396 +- + drivers/usb/core/hub.h | 9 +- + drivers/usb/core/inode.c | 4 +- + drivers/usb/core/message.c | 17 +- + drivers/usb/core/quirks.c | 14 + + drivers/usb/core/sysfs.c | 22 +- + drivers/usb/core/urb.c | 26 +- + drivers/usb/core/usb.h | 2 - + drivers/usb/gadget/Kconfig | 18 +- + drivers/usb/gadget/amd5536udc.c | 10 + + drivers/usb/gadget/at91_udc.c | 9 +- + drivers/usb/gadget/dummy_hcd.c | 98 +- + drivers/usb/gadget/epautoconf.c | 12 +- + drivers/usb/gadget/ether.c | 18 +- + drivers/usb/gadget/file_storage.c | 36 +- + drivers/usb/gadget/fsl_usb2_udc.c | 4 +- + drivers/usb/gadget/fsl_usb2_udc.h | 2 +- + drivers/usb/gadget/gmidi.c | 2 +- + drivers/usb/gadget/goku_udc.c | 20 +- + drivers/usb/gadget/inode.c | 18 +- + drivers/usb/gadget/lh7a40x_udc.c | 132 +- + drivers/usb/gadget/m66592-udc.h | 2 +- + drivers/usb/gadget/net2280.h | 2 +- + drivers/usb/gadget/omap_udc.c | 20 +- + drivers/usb/gadget/printer.c | 92 +- + drivers/usb/gadget/pxa2xx_udc.c | 26 +- + drivers/usb/gadget/rndis.c | 148 +- + drivers/usb/gadget/serial.c | 3 +- + drivers/usb/host/Kconfig | 10 +- + drivers/usb/host/ehci-au1xxx.c | 5 +- + drivers/usb/host/ehci-dbg.c | 4 +- + drivers/usb/host/ehci-fsl.c | 9 +- + drivers/usb/host/ehci-hcd.c | 113 +- + drivers/usb/host/ehci-hub.c | 34 +- + drivers/usb/host/ehci-ixp4xx.c | 3 +- + drivers/usb/host/ehci-pci.c | 9 +- + drivers/usb/host/ehci-ppc-soc.c | 5 +- + drivers/usb/host/ehci-ps3.c | 1 - + drivers/usb/host/ehci-q.c | 104 +- + drivers/usb/host/ehci-sched.c | 46 +- + drivers/usb/host/isp116x-hcd.c | 14 +- + drivers/usb/host/ohci-at91.c | 2 +- + drivers/usb/host/ohci-au1xxx.c | 1 - + drivers/usb/host/ohci-dbg.c | 2 +- + drivers/usb/host/ohci-ep93xx.c | 5 +- + drivers/usb/host/ohci-hub.c | 128 +- + drivers/usb/host/ohci-lh7a404.c | 1 - + drivers/usb/host/ohci-omap.c | 8 +- + drivers/usb/host/ohci-pci.c | 47 +- + drivers/usb/host/ohci-pnx4008.c | 1 - + drivers/usb/host/ohci-pnx8550.c | 1 - + drivers/usb/host/ohci-ppc-of.c | 1 - + drivers/usb/host/ohci-ppc-soc.c | 1 - + drivers/usb/host/ohci-ps3.c | 2 - + drivers/usb/host/ohci-pxa27x.c | 6 +- + drivers/usb/host/ohci-s3c2410.c | 1 - + drivers/usb/host/ohci-sa1111.c | 1 - + drivers/usb/host/ohci-sh.c | 1 - + drivers/usb/host/ohci-sm501.c | 16 +- + drivers/usb/host/ohci-ssb.c | 37 +- + drivers/usb/host/pci-quirks.c | 6 +- + drivers/usb/host/r8a66597-hcd.c | 256 +- + drivers/usb/host/r8a66597.h | 51 +- + drivers/usb/host/sl811-hcd.c | 12 +- + drivers/usb/host/u132-hcd.c | 5124 ++++++++++---------- + drivers/usb/host/uhci-hcd.c | 35 +- + drivers/usb/host/uhci-q.c | 2 +- + drivers/usb/image/Kconfig | 4 +- + drivers/usb/image/microtek.c | 3 +- + drivers/usb/image/microtek.h | 1 - + drivers/usb/misc/Kconfig | 20 +- + drivers/usb/misc/adutux.c | 120 +- + drivers/usb/misc/appledisplay.c | 6 +- + drivers/usb/misc/auerswald.c | 135 +- + drivers/usb/misc/emi26.c | 30 +- + drivers/usb/misc/emi62.c | 32 +- + drivers/usb/misc/ftdi-elan.c | 2 +- + drivers/usb/misc/iowarrior.c | 10 +- + drivers/usb/misc/ldusb.c | 10 +- + drivers/usb/misc/legousbtower.c | 92 +- + drivers/usb/misc/phidgetkit.c | 6 +- + drivers/usb/misc/phidgetmotorcontrol.c | 2 +- + drivers/usb/misc/phidgetservo.c | 6 +- + drivers/usb/misc/usblcd.c | 8 +- + drivers/usb/misc/usbtest.c | 13 +- + drivers/usb/mon/Makefile | 2 +- + drivers/usb/mon/mon_bin.c | 9 +- + drivers/usb/mon/mon_main.c | 3 +- + drivers/usb/mon/mon_stat.c | 3 + + drivers/usb/serial/Kconfig | 76 +- + drivers/usb/serial/Makefile | 3 +- + drivers/usb/serial/aircable.c | 52 +- + drivers/usb/serial/airprime.c | 37 +- + drivers/usb/serial/ark3116.c | 10 +- + drivers/usb/serial/belkin_sa.c | 23 +- + drivers/usb/serial/ch341.c | 3 - + drivers/usb/serial/console.c | 10 +- + drivers/usb/serial/cp2101.c | 114 +- + drivers/usb/serial/cyberjack.c | 112 +- + drivers/usb/serial/cypress_m8.c | 579 +-- + drivers/usb/serial/digi_acceleport.c | 50 +- + drivers/usb/serial/empeg.c | 59 +- + drivers/usb/serial/ezusb.c | 8 +- + drivers/usb/serial/ftdi_sio.c | 171 +- + drivers/usb/serial/funsoft.c | 3 - + drivers/usb/serial/garmin_gps.c | 115 +- + drivers/usb/serial/generic.c | 56 +- + drivers/usb/serial/hp4x.c | 3 - + drivers/usb/serial/io_edgeport.c | 326 +- + drivers/usb/serial/io_tables.h | 12 - + drivers/usb/serial/io_ti.c | 398 +- + drivers/usb/serial/ipaq.c | 53 +- + drivers/usb/serial/ipw.c | 51 +- + drivers/usb/serial/ir-usb.c | 53 +- + drivers/usb/serial/iuu_phoenix.c | 165 +- + drivers/usb/serial/keyspan.c | 281 +- + drivers/usb/serial/keyspan.h | 16 - + drivers/usb/serial/keyspan_pda.c | 42 +- + drivers/usb/serial/kl5kusb105.c | 124 +- + drivers/usb/serial/kobil_sct.c | 75 +- + drivers/usb/serial/mct_u232.c | 41 +- + drivers/usb/serial/mos7720.c | 122 +- + drivers/usb/serial/mos7840.c | 164 +- + drivers/usb/serial/navman.c | 31 +- + drivers/usb/serial/omninet.c | 42 +- + drivers/usb/serial/option.c | 92 +- + drivers/usb/serial/oti6858.c | 121 +- + drivers/usb/serial/pl2303.c | 117 +- + drivers/usb/serial/safe_serial.c | 60 +- + drivers/usb/serial/sierra.c | 129 +- + drivers/usb/serial/spcp8x5.c | 1072 ++++ + drivers/usb/serial/ti_usb_3410_5052.c | 211 +- + drivers/usb/serial/usb-serial.c | 107 +- + drivers/usb/serial/usb_debug.c | 3 - + drivers/usb/serial/visor.c | 103 +- + drivers/usb/serial/whiteheat.c | 118 +- + drivers/usb/storage/Kconfig | 39 +- + drivers/usb/storage/Makefile | 1 + + drivers/usb/storage/cypress_atacb.c | 200 + + drivers/usb/storage/cypress_atacb.h | 25 + + drivers/usb/storage/libusual.c | 14 +- + drivers/usb/storage/scsiglue.c | 26 +- + drivers/usb/storage/transport.c | 23 +- + drivers/usb/storage/unusual_devs.h | 8 + + drivers/usb/storage/usb.c | 26 +- + drivers/usb/usb-skeleton.c | 8 +- + drivers/video/Kconfig | 14 + + drivers/video/Makefile | 1 + + drivers/video/xen-fbfront.c | 550 +++ + drivers/xen/Kconfig | 19 + + drivers/xen/Makefile | 4 +- + drivers/xen/balloon.c | 712 +++ + {arch/x86 => drivers}/xen/events.c | 121 +- + {arch/x86 => drivers}/xen/features.c | 0 + drivers/xen/grant-table.c | 37 +- + drivers/xen/xenbus/xenbus_client.c | 6 +- + drivers/xen/xenbus/xenbus_probe.c | 32 +- + drivers/xen/xencomm.c | 232 + + fs/9p/vfs_super.c | 7 +- + fs/Kconfig | 179 +- + fs/binfmt_elf.c | 23 +- + fs/binfmt_misc.c | 18 +- + fs/binfmt_som.c | 10 - + fs/cifs/CHANGES | 3 +- + fs/cifs/README | 9 +- + fs/cifs/cifs_dfs_ref.c | 31 +- + fs/cifs/cifsacl.c | 14 +- + fs/cifs/cifsacl.h | 1 + + fs/cifs/cifsfs.c | 10 +- + fs/cifs/cifsfs.h | 2 - + fs/cifs/cifspdu.h | 121 +- + fs/cifs/cifsproto.h | 9 +- + fs/cifs/cifssmb.c | 32 +- + fs/cifs/connect.c | 1 + + fs/cifs/inode.c | 15 +- + fs/cifs/transport.c | 18 + + fs/exec.c | 28 +- + fs/fcntl.c | 40 +- + fs/fuse/inode.c | 5 +- + fs/jffs2/README.Locking | 22 +- + fs/jffs2/build.c | 1 + + fs/jffs2/debug.c | 164 +- + fs/jffs2/debug.h | 6 + + fs/jffs2/dir.c | 58 +- + fs/jffs2/erase.c | 80 +- + fs/jffs2/file.c | 16 +- + fs/jffs2/fs.c | 42 +- + fs/jffs2/gc.c | 42 +- + fs/jffs2/ioctl.c | 1 + + fs/jffs2/jffs2_fs_i.h | 4 +- + fs/jffs2/jffs2_fs_sb.h | 7 +- + fs/jffs2/nodelist.h | 2 +- + fs/jffs2/nodemgmt.c | 24 +- + fs/jffs2/readinode.c | 38 +- + fs/jffs2/super.c | 14 +- + fs/jffs2/wbuf.c | 28 +- + fs/jffs2/write.c | 52 +- + fs/lockd/clntproc.c | 184 +- + fs/lockd/host.c | 93 +- + fs/lockd/mon.c | 113 +- + fs/lockd/svc.c | 162 +- + fs/lockd/svclock.c | 8 +- + fs/lockd/svcshare.c | 3 +- + fs/lockd/svcsubs.c | 69 +- + fs/locks.c | 33 +- + fs/namespace.c | 9 +- + fs/nfs/Makefile | 3 +- + fs/nfs/callback.c | 93 +- + fs/nfs/client.c | 23 + + fs/nfs/dir.c | 2 +- + fs/nfs/direct.c | 88 +- + fs/nfs/file.c | 18 +- + fs/nfs/inode.c | 45 +- + fs/nfs/internal.h | 13 +- + fs/nfs/namespace.c | 2 +- + fs/nfs/nfs2xdr.c | 113 +- + fs/nfs/nfs3xdr.c | 71 +- + fs/nfs/nfs4proc.c | 39 +- + fs/nfs/nfs4state.c | 49 +- + fs/nfs/nfs4xdr.c | 147 +- + fs/nfs/read.c | 94 +- + fs/nfs/super.c | 155 +- + fs/nfs/symlink.c | 1 - + fs/nfs/unlink.c | 2 +- + fs/nfs/write.c | 207 +- + fs/nfsd/auth.c | 1 + + fs/nfsd/export.c | 9 +- + fs/nfsd/nfs4callback.c | 28 +- + fs/nfsd/nfs4idmap.c | 2 +- + fs/nfsd/nfs4state.c | 74 +- + fs/nfsd/nfs4xdr.c | 27 +- + fs/nfsd/nfsctl.c | 87 +- + fs/nfsd/nfsfh.c | 228 +- + fs/nfsd/nfssvc.c | 2 - + fs/nfsd/vfs.c | 35 +- + fs/sysfs/file.c | 14 +- + fs/sysfs/group.c | 83 +- + fs/sysfs/sysfs.h | 2 + + include/asm-alpha/bitops.h | 5 + + include/asm-arm/arch-pxa/pxa3xx_nand.h | 18 + + include/asm-arm/arch-sa1100/ide.h | 6 +- + include/asm-arm/plat-s3c/nand.h | 5 + + include/asm-blackfin/.gitignore | 1 + + include/asm-blackfin/bfin-global.h | 10 - + include/asm-blackfin/bug.h | 13 + + include/asm-blackfin/cplb.h | 26 - + include/asm-blackfin/dma-mapping.h | 15 + + include/asm-blackfin/dma.h | 3 + + include/asm-blackfin/gptimers.h | 150 +- + include/asm-blackfin/mach-bf527/anomaly.h | 80 +- + include/asm-blackfin/mach-bf527/bfin_serial_5xx.h | 48 +- + include/asm-blackfin/mach-bf527/bfin_sir.h | 133 + + include/asm-blackfin/mach-bf527/blackfin.h | 15 + + include/asm-blackfin/mach-bf527/cdefBF52x_base.h | 90 +- + include/asm-blackfin/mach-bf527/dma.h | 3 - + include/asm-blackfin/mach-bf533/anomaly.h | 10 +- + include/asm-blackfin/mach-bf533/bfin_serial_5xx.h | 50 +- + include/asm-blackfin/mach-bf533/bfin_sir.h | 120 + + include/asm-blackfin/mach-bf533/blackfin.h | 15 + + include/asm-blackfin/mach-bf533/cdefBF532.h | 31 +- + include/asm-blackfin/mach-bf533/defBF532.h | 29 +- + include/asm-blackfin/mach-bf533/dma.h | 3 - + include/asm-blackfin/mach-bf533/mem_init.h | 10 +- + include/asm-blackfin/mach-bf537/anomaly.h | 17 +- + include/asm-blackfin/mach-bf537/bfin_serial_5xx.h | 48 +- + include/asm-blackfin/mach-bf537/bfin_sir.h | 133 + + include/asm-blackfin/mach-bf537/blackfin.h | 39 +- + include/asm-blackfin/mach-bf537/cdefBF534.h | 65 +- + include/asm-blackfin/mach-bf537/dma.h | 3 - + include/asm-blackfin/mach-bf548/anomaly.h | 1 + + include/asm-blackfin/mach-bf548/bfin_serial_5xx.h | 48 +- + include/asm-blackfin/mach-bf548/bfin_sir.h | 149 + + include/asm-blackfin/mach-bf548/blackfin.h | 38 +- + include/asm-blackfin/mach-bf548/cdefBF542.h | 12 +- + include/asm-blackfin/mach-bf548/cdefBF544.h | 33 - + include/asm-blackfin/mach-bf548/cdefBF547.h | 33 - + include/asm-blackfin/mach-bf548/cdefBF548.h | 33 - + include/asm-blackfin/mach-bf548/cdefBF549.h | 35 +- + include/asm-blackfin/mach-bf548/cdefBF54x_base.h | 418 +- + include/asm-blackfin/mach-bf548/dma.h | 2 - + include/asm-blackfin/mach-bf548/mem_init.h | 20 +- + include/asm-blackfin/mach-bf561/anomaly.h | 6 +- + include/asm-blackfin/mach-bf561/bfin_serial_5xx.h | 50 +- + include/asm-blackfin/mach-bf561/bfin_sir.h | 120 + + include/asm-blackfin/mach-bf561/blackfin.h | 14 + + include/asm-blackfin/mach-bf561/cdefBF561.h | 34 +- + include/asm-blackfin/mach-bf561/defBF561.h | 31 +- + include/asm-blackfin/mach-bf561/dma.h | 3 - + include/asm-blackfin/portmux.h | 4 +- + include/asm-blackfin/processor.h | 5 +- + include/asm-blackfin/signal.h | 2 +- + include/asm-blackfin/thread_info.h | 11 +- + include/asm-blackfin/time.h | 36 + + include/asm-blackfin/timex.h | 17 +- + include/asm-blackfin/trace.h | 4 +- + include/asm-blackfin/uaccess.h | 4 +- + include/asm-blackfin/unistd.h | 26 +- + include/asm-cris/arch-v10/ide.h | 11 +- + include/asm-generic/bitops/__fls.h | 43 + + include/asm-generic/bitops/find.h | 2 + + include/asm-generic/bitops/fls64.h | 22 + + include/asm-generic/iomap.h | 4 + + include/asm-ia64/bitops.h | 16 + + include/asm-ia64/gcc_intrin.h | 12 + + include/asm-ia64/kvm.h | 205 +- + include/asm-ia64/kvm_host.h | 524 ++ + include/asm-ia64/kvm_para.h | 29 + + include/asm-ia64/processor.h | 63 + + include/asm-mips/bitops.h | 5 + + include/asm-mips/mach-au1x00/au1xxx_ide.h | 42 - + include/asm-parisc/bitops.h | 1 + + include/asm-powerpc/bitops.h | 5 + + include/asm-powerpc/fixmap.h | 106 + + include/asm-powerpc/highmem.h | 41 +- + include/asm-powerpc/io-defs.h | 101 +- + include/asm-powerpc/io.h | 8 +- + include/asm-powerpc/kdump.h | 5 - + include/asm-powerpc/kvm.h | 53 +- + include/asm-powerpc/kvm_asm.h | 55 + + include/asm-powerpc/kvm_host.h | 152 + + include/asm-powerpc/kvm_para.h | 37 + + include/asm-powerpc/kvm_ppc.h | 88 + + include/asm-powerpc/mmu-44x.h | 2 + + include/asm-powerpc/paca.h | 1 + + include/asm-powerpc/page.h | 45 +- + include/asm-powerpc/page_32.h | 6 + + include/asm-powerpc/thread_info.h | 8 +- + include/asm-ppc/mmu.h | 2 - + include/asm-ppc/mpc8260.h | 4 - + include/asm-ppc/mpc8xx.h | 4 - + include/asm-s390/Kbuild | 1 + + include/asm-s390/bitops.h | 1 + + include/asm-s390/kvm.h | 41 +- + include/asm-s390/kvm_host.h | 234 + + include/asm-s390/kvm_para.h | 150 + + include/asm-s390/kvm_virtio.h | 53 + + include/asm-s390/lowcore.h | 15 +- + include/asm-s390/mmu.h | 1 + + include/asm-s390/mmu_context.h | 8 +- + include/asm-s390/pgtable.h | 93 +- + include/asm-s390/setup.h | 1 + + include/asm-sh/bitops.h | 1 + + include/asm-sparc/device.h | 2 + + include/asm-sparc/prom.h | 5 + + include/asm-sparc64/bitops.h | 1 + + include/asm-sparc64/iommu.h | 3 +- + include/asm-sparc64/mmzone.h | 17 + + include/asm-sparc64/numnodes.h | 6 - + include/asm-sparc64/ptrace.h | 18 +- + include/asm-sparc64/sparsemem.h | 2 +- + include/asm-sparc64/topology.h | 73 +- + include/asm-sparc64/ttable.h | 14 +- + include/asm-x86/bios_ebda.h | 2 + + include/asm-x86/bitops.h | 149 +- + include/asm-x86/bitops_32.h | 166 - + include/asm-x86/bitops_64.h | 162 - + include/asm-x86/bootparam.h | 14 + + include/asm-x86/e820_64.h | 3 +- + include/asm-x86/fixmap.h | 8 + + include/asm-x86/fixmap_32.h | 7 +- + include/asm-x86/fixmap_64.h | 4 +- + include/asm-x86/io.h | 8 + + include/asm-x86/io_32.h | 6 - + include/asm-x86/io_64.h | 6 - + include/asm-x86/io_apic.h | 6 +- + include/asm-x86/kvm.h | 41 + + include/asm-x86/kvm_host.h | 99 +- + include/asm-x86/kvm_para.h | 55 + + include/asm-x86/mach-default/smpboot_hooks.h | 2 +- + include/asm-x86/page.h | 1 + + include/asm-x86/paravirt.h | 43 +- + include/asm-x86/pgalloc.h | 111 +- + include/asm-x86/pgalloc_32.h | 95 - + include/asm-x86/pgalloc_64.h | 133 - + include/asm-x86/pgtable.h | 63 +- + include/asm-x86/pgtable_32.h | 26 +- + include/asm-x86/pgtable_64.h | 2 +- + include/asm-x86/posix_types.h | 8 +- + include/asm-x86/processor.h | 2 +- + include/asm-x86/ptrace.h | 2 + + include/asm-x86/reboot.h | 2 + + include/asm-x86/rio.h | 11 - + include/asm-x86/smp.h | 1 - + include/asm-x86/tsc.h | 1 - + include/asm-x86/unistd.h | 8 +- + include/asm-x86/xen/events.h | 22 + + include/asm-x86/xen/grant_table.h | 7 + + include/asm-x86/xen/hypercall.h | 6 + + include/asm-x86/xen/interface.h | 28 + + include/asm-x86/xen/page.h | 168 + + include/linux/Kbuild | 1 - + include/linux/bitops.h | 140 + + include/linux/bsg.h | 14 +- + include/linux/compiler-gcc.h | 13 +- + include/linux/device-mapper.h | 96 +- + .../md/dm-log.h => include/linux/dm-dirty-log.h | 84 +- + {drivers/md => include/linux}/dm-io.h | 18 +- + include/linux/dm-kcopyd.h | 47 + + include/linux/dvb/dmx.h | 3 +- + include/linux/exportfs.h | 2 +- + include/linux/file.h | 3 +- + include/linux/fs.h | 6 +- + include/linux/hdsmart.h | 126 - + include/linux/i2c-id.h | 1 + + include/linux/ide.h | 227 +- + include/linux/ieee80211.h | 20 +- + include/linux/input.h | 8 +- + include/linux/keyboard.h | 1 + + include/linux/kvm.h | 130 +- + include/linux/kvm_host.h | 59 +- + include/linux/kvm_para.h | 11 +- + include/linux/kvm_types.h | 2 + + include/linux/leds.h | 6 + + include/linux/libata.h | 1 - + include/linux/lockd/lockd.h | 26 +- + include/linux/lockd/sm_inter.h | 1 + + include/linux/meye.h | 2 +- + include/linux/mlx4/device.h | 40 + + include/linux/mlx4/qp.h | 4 + + include/linux/mm.h | 1 + + include/linux/mtd/inftl.h | 5 + + include/linux/mtd/nftl.h | 5 + + include/linux/mtd/onenand.h | 3 + + include/linux/mtd/plat-ram.h | 5 +- + include/linux/nfs3.h | 2 +- + include/linux/nfs_fs.h | 5 +- + include/linux/nfs_fs_sb.h | 10 + + include/linux/nfs_xdr.h | 10 +- + include/linux/nfsd/Kbuild | 4 +- + include/linux/nfsd/cache.h | 2 - + include/linux/nfsd/nfsd.h | 13 +- + include/linux/phy.h | 24 +- + include/linux/rtnetlink.h | 4 +- + include/linux/sched.h | 4 + + include/linux/seqlock.h | 46 +- + include/linux/serio.h | 1 + + include/linux/spi/ads7846.h | 3 +- + include/linux/sunrpc/auth.h | 17 +- + include/linux/sunrpc/auth_gss.h | 1 + + include/linux/sunrpc/cache.h | 1 - + include/linux/sunrpc/clnt.h | 9 +- + include/linux/sunrpc/gss_krb5.h | 6 +- + include/linux/sunrpc/sched.h | 41 +- + include/linux/sunrpc/svc.h | 1 - + include/linux/sunrpc/svcauth.h | 5 +- + include/linux/sunrpc/svcsock.h | 4 +- + include/linux/sunrpc/xprt.h | 10 +- + include/linux/sysfs.h | 4 +- + include/linux/usb.h | 196 +- + include/linux/usb/audio.h | 2 +- + include/linux/usb/cdc.h | 4 + + include/linux/usb/ch9.h | 17 +- + include/linux/usb/g_printer.h | 4 + + include/linux/usb/gadget.h | 2 +- + include/linux/usb/gadgetfs.h | 16 +- + include/linux/usb/input.h | 8 +- + include/linux/usb/iowarrior.h | 6 +- + include/linux/usb/isp116x.h | 6 +- + include/linux/usb/midi.h | 2 +- + include/linux/usb/net2280.h | 9 +- + include/linux/usb/otg.h | 6 +- + include/linux/usb/quirks.h | 5 + + include/linux/usb/rndis_host.h | 9 +- + include/linux/usb/serial.h | 21 +- + include/linux/usb/sl811.h | 5 +- + include/linux/usb/usbnet.h | 8 +- + include/linux/usb_usual.h | 1 + + include/linux/usbdevice_fs.h | 7 +- + include/linux/videodev2.h | 55 +- + include/linux/wm97xx.h | 314 ++ + include/linux/xfrm.h | 8 +- + include/media/ir-common.h | 3 + + include/media/soc_camera.h | 179 + + include/media/tuner-types.h | 17 +- + include/media/tuner.h | 2 +- + include/media/v4l2-chip-ident.h | 6 + + include/media/v4l2-dev.h | 4 + + include/media/videobuf-core.h | 24 +- + include/media/videobuf-dma-sg.h | 17 +- + include/media/videobuf-dvb.h | 3 +- + include/media/videobuf-vmalloc.h | 4 + + include/mtd/Kbuild | 1 - + include/net/ipv6.h | 9 + + include/scsi/scsi_device.h | 3 +- + include/sound/ac97_codec.h | 1 + + include/sound/ak4114.h | 1 + + include/sound/ak4xxx-adda.h | 2 +- + include/sound/asoundef.h | 8 + + include/sound/control.h | 7 + + include/sound/core.h | 10 +- + include/sound/mpu401.h | 15 + + include/sound/version.h | 4 +- + include/xen/balloon.h | 61 + + include/xen/events.h | 9 +- + include/xen/grant_table.h | 7 + + include/xen/interface/callback.h | 102 + + include/xen/interface/grant_table.h | 11 +- + include/xen/interface/io/fbif.h | 124 + + include/xen/interface/io/kbdif.h | 114 + + include/xen/interface/io/protocols.h | 21 + + include/xen/interface/memory.h | 12 +- + include/xen/interface/vcpu.h | 5 + + include/xen/interface/xen.h | 22 +- + include/xen/interface/xencomm.h | 41 + + include/xen/page.h | 181 +- + include/xen/xen-ops.h | 8 + + include/xen/xenbus.h | 1 + + include/xen/xencomm.h | 77 + + init/main.c | 7 +- + kernel/exit.c | 6 +- + kernel/fork.c | 60 +- + kernel/sched.c | 54 +- + kernel/time/tick-sched.c | 1 + + lib/Kconfig | 6 + + lib/Kconfig.debug | 11 + + lib/Makefile | 1 + + lib/find_next_bit.c | 77 +- + lib/lmb.c | 2 +- + mm/bootmem.c | 164 +- + mm/rmap.c | 7 +- + mm/sparse.c | 37 +- + net/can/raw.c | 3 +- + net/core/ethtool.c | 5 + + net/core/rtnetlink.c | 6 + + net/dccp/probe.c | 2 +- + net/ipv4/fib_hash.c | 17 +- + net/ipv4/fib_trie.c | 18 +- + net/ipv4/route.c | 11 +- + net/ipv4/tcp_ipv4.c | 36 +- + net/ipv4/tcp_probe.c | 9 +- + net/ipv4/udp.c | 15 +- + net/ipv6/Kconfig | 2 +- + net/ipv6/raw.c | 18 + + net/key/af_key.c | 5 +- + net/mac80211/mesh.h | 1 + + net/mac80211/mesh_hwmp.c | 1 - + net/mac80211/mlme.c | 28 +- + net/mac80211/rx.c | 2 +- + net/mac80211/wme.c | 2 +- + net/rxrpc/rxkad.c | 2 +- + net/sctp/objcnt.c | 9 +- + net/sunrpc/Makefile | 2 +- + net/sunrpc/auth.c | 71 +- + net/sunrpc/auth_generic.c | 177 + + net/sunrpc/auth_gss/auth_gss.c | 105 +- + net/sunrpc/auth_gss/gss_generic_token.c | 4 +- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 6 +- + net/sunrpc/auth_gss/gss_krb5_seal.c | 9 +- + net/sunrpc/auth_gss/gss_krb5_seqnum.c | 4 +- + net/sunrpc/auth_gss/gss_krb5_unseal.c | 2 +- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 8 +- + net/sunrpc/auth_gss/gss_spkm3_seal.c | 4 +- + net/sunrpc/auth_gss/svcauth_gss.c | 9 +- + net/sunrpc/auth_null.c | 3 +- + net/sunrpc/auth_unix.c | 59 +- + net/sunrpc/cache.c | 1 - + net/sunrpc/clnt.c | 50 +- + net/sunrpc/rpcb_clnt.c | 2 +- + net/sunrpc/sched.c | 264 +- + net/sunrpc/svc.c | 25 +- + net/sunrpc/svc_xprt.c | 30 +- + net/sunrpc/svcauth_unix.c | 118 +- + net/sunrpc/svcsock.c | 29 +- + net/sunrpc/xprt.c | 80 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 + + net/sunrpc/xprtsock.c | 82 +- + net/tipc/socket.c | 4 +- + net/unix/af_unix.c | 6 +- + scripts/Makefile.build | 6 +- + scripts/Makefile.clean | 2 +- + scripts/Makefile.host | 12 +- + scripts/Makefile.modpost | 8 + + scripts/checkpatch.pl | 7 + + scripts/kconfig/Makefile | 4 +- + scripts/mod/modpost.c | 27 +- + sound/arm/pxa2xx-ac97.c | 34 +- + sound/core/Kconfig | 4 + + sound/core/Makefile | 1 + + sound/core/init.c | 38 +- + sound/core/misc.c | 4 +- + sound/core/oss/mixer_oss.c | 2 + + sound/core/seq/oss/seq_oss_synth.c | 9 +- + sound/{pci/hda => core}/vmaster.c | 13 +- + sound/drivers/Kconfig | 18 + + sound/drivers/Makefile | 2 +- + sound/drivers/dummy.c | 37 +- + sound/drivers/ml403-ac97cr.c | 6 +- + sound/drivers/mpu401/mpu401_uart.c | 23 +- + sound/drivers/pcsp/Makefile | 2 + + sound/drivers/pcsp/pcsp.c | 235 + + sound/drivers/pcsp/pcsp.h | 82 + + sound/drivers/pcsp/pcsp_input.c | 116 + + sound/drivers/pcsp/pcsp_input.h | 14 + + sound/drivers/pcsp/pcsp_lib.c | 338 ++ + sound/drivers/pcsp/pcsp_mixer.c | 143 + + sound/i2c/other/ak4114.c | 24 +- + sound/i2c/other/ak4xxx-adda.c | 16 +- + sound/isa/sb/sb16_csp.c | 28 +- + sound/isa/sb/sb_common.c | 6 +- + sound/oss/dmabuf.c | 4 +- + sound/oss/trident.c | 12 +- + sound/oss/trident.h | 2 +- + sound/oss/vwsnd.c | 6 +- + sound/pci/Kconfig | 22 +- + sound/pci/Makefile | 1 + + sound/pci/ac97/ac97_patch.c | 46 +- + sound/pci/ac97/ac97_pcm.c | 1 - + sound/pci/ad1889.c | 6 +- + sound/pci/ali5451/ali5451.c | 32 +- + sound/pci/als300.c | 4 +- + sound/pci/atiixp.c | 2 +- + sound/pci/atiixp_modem.c | 2 +- + sound/pci/au88x0/au88x0.c | 2 - + sound/pci/au88x0/au88x0_pcm.c | 10 +- + sound/pci/aw2/Makefile | 3 + + sound/pci/aw2/aw2-alsa.c | 794 +++ + sound/pci/aw2/aw2-saa7146.c | 465 ++ + sound/pci/aw2/aw2-saa7146.h | 105 + + sound/pci/aw2/aw2-tsl.c | 110 + + sound/pci/aw2/saa7146.h | 168 + + sound/pci/azt3328.c | 7 +- + sound/pci/ca0106/ca0106_main.c | 21 +- + sound/pci/ca0106/ca0106_mixer.c | 59 +- + sound/pci/cmipci.c | 13 +- + sound/pci/cs46xx/cs46xx_lib.c | 6 +- + sound/pci/echoaudio/echoaudio.c | 7 +- + sound/pci/emu10k1/emu10k1_main.c | 15 +- + sound/pci/emu10k1/emu10k1x.c | 30 +- + sound/pci/emu10k1/emuproc.c | 2 +- + sound/pci/ens1370.c | 9 +- + sound/pci/es1938.c | 5 +- + sound/pci/es1968.c | 42 +- + sound/pci/fm801.c | 8 +- + sound/pci/hda/Makefile | 2 +- + sound/pci/hda/hda_codec.c | 201 +- + sound/pci/hda/hda_codec.h | 13 +- + sound/pci/hda/hda_generic.c | 4 +- + sound/pci/hda/hda_intel.c | 459 ++- + sound/pci/hda/hda_local.h | 20 +- + sound/pci/hda/hda_patch.h | 28 - + sound/pci/hda/patch_analog.c | 581 +++- + sound/pci/hda/patch_atihdmi.c | 8 + + sound/pci/hda/patch_cmedia.c | 13 +- + sound/pci/hda/patch_conexant.c | 68 +- + sound/pci/hda/patch_realtek.c | 1248 +++-- + sound/pci/hda/patch_si3054.c | 4 +- + sound/pci/hda/patch_sigmatel.c | 391 ++- + sound/pci/hda/patch_via.c | 14 +- + sound/pci/ice1712/delta.c | 22 +- + sound/pci/ice1712/delta.h | 2 + + sound/pci/ice1712/ews.c | 15 + + sound/pci/ice1712/ews.h | 4 +- + sound/pci/ice1712/hoontech.c | 21 +- + sound/pci/ice1712/ice1712.c | 45 +- + sound/pci/ice1712/ice1712.h | 17 +- + sound/pci/ice1712/ice1724.c | 431 +- + sound/pci/ice1712/juli.c | 486 ++- + sound/pci/ice1712/pontis.c | 4 +- + sound/pci/ice1712/prodigy192.c | 37 +- + sound/pci/ice1712/revo.c | 55 +- + sound/pci/intel8x0.c | 33 +- + sound/pci/intel8x0m.c | 9 +- + sound/pci/korg1212/korg1212.c | 1 - + sound/pci/maestro3.c | 38 +- + sound/pci/nm256/nm256.c | 4 +- + sound/pci/oxygen/cs4362a.h | 69 + + sound/pci/oxygen/cs4398.h | 69 + + sound/pci/oxygen/hifier.c | 36 +- + sound/pci/oxygen/oxygen.c | 129 +- + sound/pci/oxygen/oxygen.h | 23 +- + sound/pci/oxygen/oxygen_io.c | 23 +- + sound/pci/oxygen/oxygen_lib.c | 113 +- + sound/pci/oxygen/oxygen_mixer.c | 217 +- + sound/pci/oxygen/oxygen_pcm.c | 78 +- + sound/pci/oxygen/pcm1796.h | 58 + + sound/pci/oxygen/virtuoso.c | 594 ++- + sound/pci/oxygen/wm8785.h | 45 + + sound/pci/pcxhr/pcxhr.c | 7 +- + sound/pci/pcxhr/pcxhr_core.c | 33 +- + sound/pci/riptide/riptide.c | 14 +- + sound/pci/rme32.c | 3 +- + sound/pci/rme96.c | 3 +- + sound/pci/rme9652/hdsp.c | 54 +- + sound/pci/rme9652/hdspm.c | 19 +- + sound/pci/sis7019.c | 1 - + sound/pci/trident/trident_main.c | 4 +- + sound/pci/via82xx.c | 2 +- + sound/pci/via82xx_modem.c | 2 +- + sound/pci/ymfpci/ymfpci_main.c | 4 +- + sound/ppc/awacs.c | 265 +- + sound/ppc/awacs.h | 21 +- + sound/ppc/burgundy.c | 465 ++- + sound/ppc/burgundy.h | 31 +- + sound/ppc/pmac.c | 10 +- + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 2 +- + sound/soc/codecs/Kconfig | 4 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ac97.c | 16 +- + sound/soc/codecs/cs4270.c | 2 +- + sound/soc/codecs/tlv320aic3x.c | 22 + + sound/soc/codecs/wm8731.c | 23 +- + sound/soc/codecs/wm8750.c | 27 +- + sound/soc/codecs/wm8753.c | 5 +- + sound/soc/codecs/wm9712.c | 8 - + sound/soc/codecs/wm9713.c | 1300 +++++ + sound/soc/codecs/wm9713.h | 53 + + sound/soc/davinci/Kconfig | 19 + + sound/soc/davinci/Makefile | 11 + + sound/soc/davinci/davinci-evm.c | 208 + + sound/soc/davinci/davinci-i2s.c | 407 ++ + sound/soc/davinci/davinci-i2s.h | 17 + + sound/soc/davinci/davinci-pcm.c | 389 ++ + sound/soc/davinci/davinci-pcm.h | 29 + + sound/soc/fsl/fsl_dma.c | 1 - + sound/soc/fsl/fsl_ssi.c | 1 - + sound/soc/pxa/corgi.c | 11 +- + sound/soc/pxa/poodle.c | 8 +- + sound/soc/pxa/pxa2xx-ac97.c | 37 +- + sound/soc/pxa/pxa2xx-pcm.c | 9 +- + sound/soc/pxa/spitz.c | 6 +- + sound/soc/s3c24xx/neo1973_wm8753.c | 1 + + sound/soc/s3c24xx/s3c24xx-i2s.c | 41 +- + sound/soc/s3c24xx/s3c24xx-pcm.c | 30 +- + sound/soc/sh/Kconfig | 1 + + sound/soc/soc-core.c | 2 + + sound/soc/soc-dapm.c | 7 +- + sound/spi/at73c213.c | 44 +- + sound/usb/caiaq/caiaq-audio.c | 81 +- + sound/usb/caiaq/caiaq-device.c | 4 +- + sound/usb/usbaudio.c | 98 +- + sound/usb/usbquirks.h | 75 +- + virt/kvm/kvm_main.c | 230 +- + virt/kvm/kvm_trace.c | 276 ++ + 2062 files changed, 112011 insertions(+), 42093 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-class-ubi + create mode 100644 Documentation/arm/Samsung-S3C24XX/NAND.txt + create mode 100644 Documentation/device-mapper/dm-crypt.txt + create mode 100644 Documentation/filesystems/nfs-rdma.txt + create mode 100644 Documentation/ia64/kvm.txt + create mode 100644 Documentation/powerpc/kvm_440.txt + create mode 100644 Documentation/s390/kvm.txt + delete mode 100644 Documentation/smart-config.txt + create mode 100644 Documentation/usb/anchors.txt + create mode 100644 Documentation/usb/callbacks.txt + create mode 100644 Documentation/video4linux/CARDLIST.au0828 + create mode 100644 arch/blackfin/boot/.gitignore + copy arch/{ppc/configs/ads8272_defconfig => blackfin/configs/CM-BF533_defconfig} (51%) + rename arch/{ppc/configs/ads8272_defconfig => blackfin/configs/CM-BF537E_defconfig} (51%) + create mode 100644 arch/blackfin/configs/CM-BF537U_defconfig + create mode 100644 arch/blackfin/configs/CM-BF548_defconfig + create mode 100644 arch/blackfin/configs/CM-BF561_defconfig + create mode 100644 arch/blackfin/configs/IP0X_defconfig + create mode 100644 arch/blackfin/configs/SRV1_defconfig + create mode 100644 arch/blackfin/kernel/time-ts.c + delete mode 100644 arch/blackfin/mach-bf527/cpu.c + create mode 100644 arch/blackfin/mach-bf533/boards/ip0x.c + delete mode 100644 arch/blackfin/mach-bf533/cpu.c + delete mode 100644 arch/blackfin/mach-bf537/cpu.c + create mode 100644 arch/blackfin/mach-bf548/boards/cm_bf548.c + delete mode 100644 arch/blackfin/mach-bf548/cpu.c + create mode 100644 arch/blackfin/mach-common/cpufreq.c + create mode 100644 arch/ia64/kvm/Kconfig + create mode 100644 arch/ia64/kvm/Makefile + create mode 100644 arch/ia64/kvm/asm-offsets.c + create mode 100644 arch/ia64/kvm/kvm-ia64.c + create mode 100644 arch/ia64/kvm/kvm_fw.c + create mode 100644 arch/ia64/kvm/kvm_minstate.h + create mode 100644 arch/ia64/kvm/lapic.h + create mode 100644 arch/ia64/kvm/misc.h + create mode 100644 arch/ia64/kvm/mmio.c + create mode 100644 arch/ia64/kvm/optvfault.S + create mode 100644 arch/ia64/kvm/process.c + create mode 100644 arch/ia64/kvm/trampoline.S + create mode 100644 arch/ia64/kvm/vcpu.c + create mode 100644 arch/ia64/kvm/vcpu.h + create mode 100644 arch/ia64/kvm/vmm.c + create mode 100644 arch/ia64/kvm/vmm_ivt.S + create mode 100644 arch/ia64/kvm/vti.h + create mode 100644 arch/ia64/kvm/vtlb.c + create mode 100644 arch/powerpc/kernel/prom_init_check.sh + create mode 100644 arch/powerpc/kvm/44x_tlb.c + create mode 100644 arch/powerpc/kvm/44x_tlb.h + create mode 100644 arch/powerpc/kvm/Kconfig + create mode 100644 arch/powerpc/kvm/Makefile + create mode 100644 arch/powerpc/kvm/booke_guest.c + create mode 100644 arch/powerpc/kvm/booke_host.c + create mode 100644 arch/powerpc/kvm/booke_interrupts.S + create mode 100644 arch/powerpc/kvm/emulate.c + create mode 100644 arch/powerpc/kvm/powerpc.c + rename arch/powerpc/platforms/{celleb => cell}/beat.c (99%) + rename arch/powerpc/platforms/{celleb => cell}/beat.h (100%) + rename arch/powerpc/platforms/{celleb/htab.c => cell/beat_htab.c} (100%) + rename arch/powerpc/platforms/{celleb/hvCall.S => cell/beat_hvCall.S} (100%) + rename arch/powerpc/platforms/{celleb/interrupt.c => cell/beat_interrupt.c} (99%) + rename arch/powerpc/platforms/{celleb/interrupt.h => cell/beat_interrupt.h} (100%) + rename arch/powerpc/platforms/{celleb/iommu.c => cell/beat_iommu.c} (100%) + rename arch/powerpc/platforms/{celleb/smp.c => cell/beat_smp.c} (99%) + rename arch/powerpc/platforms/{celleb/spu_priv1.c => cell/beat_spu_priv1.c} (100%) + rename arch/powerpc/platforms/{celleb => cell}/beat_syscall.h (100%) + rename arch/powerpc/platforms/{celleb/udbg_beat.c => cell/beat_udbg.c} (100%) + rename arch/powerpc/platforms/{celleb => cell}/beat_wrapper.h (100%) + rename arch/powerpc/platforms/{celleb/pci.c => cell/celleb_pci.c} (93%) + rename arch/powerpc/platforms/{celleb/pci.h => cell/celleb_pci.h} (73%) + rename arch/powerpc/platforms/{celleb/scc.h => cell/celleb_scc.h} (68%) + rename arch/powerpc/platforms/{celleb/scc_epci.c => cell/celleb_scc_epci.c} (86%) + create mode 100644 arch/powerpc/platforms/cell/celleb_scc_pciex.c + rename arch/powerpc/platforms/{celleb/scc_sio.c => cell/celleb_scc_sio.c} (100%) + rename arch/powerpc/platforms/{celleb/scc_uhc.c => cell/celleb_scc_uhc.c} (99%) + rename arch/powerpc/platforms/{celleb/setup.c => cell/celleb_setup.c} (97%) + create mode 100644 arch/powerpc/platforms/cell/io-workarounds.h + create mode 100644 arch/powerpc/platforms/cell/spider-pci.c + delete mode 100644 arch/powerpc/platforms/celleb/Kconfig + delete mode 100644 arch/powerpc/platforms/celleb/Makefile + delete mode 100644 arch/powerpc/platforms/celleb/io-workarounds.c + delete mode 100644 arch/ppc/configs/mpc86x_ads_defconfig + delete mode 100644 arch/ppc/configs/mpc885ads_defconfig + delete mode 100644 arch/ppc/platforms/mpc8272ads_setup.c + delete mode 100644 arch/ppc/platforms/mpc885ads.h + delete mode 100644 arch/ppc/platforms/mpc885ads_setup.c + delete mode 100644 arch/ppc/platforms/pq2ads.c + delete mode 100644 arch/ppc/platforms/pq2ads.h + delete mode 100644 arch/ppc/platforms/pq2ads_pd.h + create mode 100644 arch/s390/kvm/Kconfig + create mode 100644 arch/s390/kvm/Makefile + create mode 100644 arch/s390/kvm/diag.c + create mode 100644 arch/s390/kvm/gaccess.h + create mode 100644 arch/s390/kvm/intercept.c + create mode 100644 arch/s390/kvm/interrupt.c + create mode 100644 arch/s390/kvm/kvm-s390.c + create mode 100644 arch/s390/kvm/kvm-s390.h + create mode 100644 arch/s390/kvm/priv.c + create mode 100644 arch/s390/kvm/sie64a.S + create mode 100644 arch/s390/kvm/sigp.c + create mode 100644 arch/x86/kernel/acpi/realmode/.gitignore + delete mode 100644 arch/x86/kernel/cpu/nexgen.c + create mode 100644 arch/x86/kernel/kvm.c + create mode 100644 arch/x86/kernel/kvmclock.c + create mode 100644 arch/x86/kvm/i8254.c + create mode 100644 arch/x86/kvm/i8254.h + delete mode 100644 arch/x86/kvm/segment_descriptor.h + create mode 100644 arch/x86/kvm/tss.h + delete mode 100644 arch/x86/lib/bitops_32.c + delete mode 100644 arch/x86/lib/bitops_64.c + create mode 100644 arch/x86/mm/pgtable.c + create mode 100644 arch/x86/xen/grant-table.c + create mode 100644 drivers/char/bfin-otp.c + create mode 100644 drivers/input/joystick/zhenhua.c + create mode 100644 drivers/input/serio/at32psif.c + create mode 100644 drivers/input/touchscreen/mainstone-wm97xx.c + create mode 100644 drivers/input/touchscreen/wm9705.c + create mode 100644 drivers/input/touchscreen/wm9712.c + create mode 100644 drivers/input/touchscreen/wm9713.c + create mode 100644 drivers/input/touchscreen/wm97xx-core.c + create mode 100644 drivers/input/xen-kbdfront.c + create mode 100644 drivers/leds/leds-fsg.c + create mode 100644 drivers/leds/ledtrig-default-on.c + rename drivers/md/{kcopyd.c => dm-kcopyd.c} (71%) + delete mode 100644 drivers/md/kcopyd.h + create mode 100644 drivers/media/dvb/frontends/au8522.c + create mode 100644 drivers/media/dvb/frontends/au8522.h + create mode 100644 drivers/media/dvb/frontends/cx24113.h + create mode 100644 drivers/media/dvb/frontends/isl6405.c + create mode 100644 drivers/media/dvb/frontends/isl6405.h + create mode 100644 drivers/media/dvb/frontends/itd1000.c + create mode 100644 drivers/media/dvb/frontends/itd1000.h + create mode 100644 drivers/media/dvb/frontends/itd1000_priv.h + create mode 100644 drivers/media/dvb/frontends/s5h1411.c + create mode 100644 drivers/media/dvb/frontends/s5h1411.h + create mode 100644 drivers/media/dvb/frontends/s5h1420_priv.h + create mode 100644 drivers/media/dvb/frontends/tda10048.c + create mode 100644 drivers/media/dvb/frontends/tda10048.h + create mode 100644 drivers/media/video/au0828/Kconfig + create mode 100644 drivers/media/video/au0828/Makefile + create mode 100644 drivers/media/video/au0828/au0828-cards.c + create mode 100644 drivers/media/video/au0828/au0828-cards.h + create mode 100644 drivers/media/video/au0828/au0828-core.c + create mode 100644 drivers/media/video/au0828/au0828-dvb.c + create mode 100644 drivers/media/video/au0828/au0828-i2c.c + create mode 100644 drivers/media/video/au0828/au0828-reg.h + create mode 100644 drivers/media/video/au0828/au0828.h + create mode 100644 drivers/media/video/cx23885/cx23885-417.c + create mode 100644 drivers/media/video/em28xx/em28xx-dvb.c + create mode 100644 drivers/media/video/em28xx/em28xx-reg.h + create mode 100644 drivers/media/video/mt9m001.c + create mode 100644 drivers/media/video/mt9v022.c + create mode 100644 drivers/media/video/pvrusb2/pvrusb2-dvb.c + create mode 100644 drivers/media/video/pvrusb2/pvrusb2-dvb.h + create mode 100644 drivers/media/video/pxa_camera.c + create mode 100644 drivers/media/video/saa717x.c + create mode 100644 drivers/media/video/soc_camera.c + create mode 100644 drivers/mtd/ar7part.c + create mode 100644 drivers/mtd/nand/fsl_upm.c + create mode 100644 drivers/mtd/nand/pxa3xx_nand.c + rename include/mtd/ubi-header.h => drivers/mtd/ubi/ubi-media.h (99%) + create mode 100644 drivers/s390/kvm/Makefile + create mode 100644 drivers/s390/kvm/kvm_virtio.c + create mode 100644 drivers/scsi/mac_esp.c + create mode 100644 drivers/usb/serial/spcp8x5.c + create mode 100644 drivers/usb/storage/cypress_atacb.c + create mode 100644 drivers/usb/storage/cypress_atacb.h + create mode 100644 drivers/video/xen-fbfront.c + create mode 100644 drivers/xen/Kconfig + create mode 100644 drivers/xen/balloon.c + rename {arch/x86 => drivers}/xen/events.c (82%) + rename {arch/x86 => drivers}/xen/features.c (100%) + create mode 100644 drivers/xen/xencomm.c + create mode 100644 include/asm-arm/arch-pxa/pxa3xx_nand.h + create mode 100644 include/asm-blackfin/.gitignore + create mode 100644 include/asm-blackfin/mach-bf527/bfin_sir.h + create mode 100644 include/asm-blackfin/mach-bf533/bfin_sir.h + create mode 100644 include/asm-blackfin/mach-bf537/bfin_sir.h + create mode 100644 include/asm-blackfin/mach-bf548/bfin_sir.h + create mode 100644 include/asm-blackfin/mach-bf561/bfin_sir.h + create mode 100644 include/asm-blackfin/time.h + create mode 100644 include/asm-generic/bitops/__fls.h + create mode 100644 include/asm-ia64/kvm_host.h + create mode 100644 include/asm-ia64/kvm_para.h + create mode 100644 include/asm-powerpc/fixmap.h + create mode 100644 include/asm-powerpc/kvm_asm.h + create mode 100644 include/asm-powerpc/kvm_host.h + create mode 100644 include/asm-powerpc/kvm_para.h + create mode 100644 include/asm-powerpc/kvm_ppc.h + create mode 100644 include/asm-s390/kvm_host.h + create mode 100644 include/asm-s390/kvm_para.h + create mode 100644 include/asm-s390/kvm_virtio.h + create mode 100644 include/asm-sparc64/mmzone.h + delete mode 100644 include/asm-sparc64/numnodes.h + delete mode 100644 include/asm-x86/bitops_32.h + delete mode 100644 include/asm-x86/bitops_64.h + delete mode 100644 include/asm-x86/pgalloc_32.h + delete mode 100644 include/asm-x86/pgalloc_64.h + create mode 100644 include/asm-x86/xen/events.h + create mode 100644 include/asm-x86/xen/grant_table.h + create mode 100644 include/asm-x86/xen/page.h + rename drivers/md/dm-log.h => include/linux/dm-dirty-log.h (53%) + rename {drivers/md => include/linux}/dm-io.h (84%) + create mode 100644 include/linux/dm-kcopyd.h + delete mode 100644 include/linux/hdsmart.h + create mode 100644 include/linux/wm97xx.h + create mode 100644 include/media/soc_camera.h + create mode 100644 include/xen/balloon.h + create mode 100644 include/xen/interface/callback.h + create mode 100644 include/xen/interface/io/fbif.h + create mode 100644 include/xen/interface/io/kbdif.h + create mode 100644 include/xen/interface/io/protocols.h + create mode 100644 include/xen/interface/xencomm.h + create mode 100644 include/xen/xen-ops.h + create mode 100644 include/xen/xencomm.h + create mode 100644 net/sunrpc/auth_generic.c + rename sound/{pci/hda => core}/vmaster.c (97%) + create mode 100644 sound/drivers/pcsp/Makefile + create mode 100644 sound/drivers/pcsp/pcsp.c + create mode 100644 sound/drivers/pcsp/pcsp.h + create mode 100644 sound/drivers/pcsp/pcsp_input.c + create mode 100644 sound/drivers/pcsp/pcsp_input.h + create mode 100644 sound/drivers/pcsp/pcsp_lib.c + create mode 100644 sound/drivers/pcsp/pcsp_mixer.c + create mode 100644 sound/pci/aw2/Makefile + create mode 100644 sound/pci/aw2/aw2-alsa.c + create mode 100644 sound/pci/aw2/aw2-saa7146.c + create mode 100644 sound/pci/aw2/aw2-saa7146.h + create mode 100644 sound/pci/aw2/aw2-tsl.c + create mode 100644 sound/pci/aw2/saa7146.h + create mode 100644 sound/pci/oxygen/cs4362a.h + create mode 100644 sound/pci/oxygen/cs4398.h + create mode 100644 sound/pci/oxygen/pcm1796.h + create mode 100644 sound/pci/oxygen/wm8785.h + create mode 100644 sound/soc/codecs/wm9713.c + create mode 100644 sound/soc/codecs/wm9713.h + create mode 100644 sound/soc/davinci/Kconfig + create mode 100644 sound/soc/davinci/Makefile + create mode 100644 sound/soc/davinci/davinci-evm.c + create mode 100644 sound/soc/davinci/davinci-i2s.c + create mode 100644 sound/soc/davinci/davinci-i2s.h + create mode 100644 sound/soc/davinci/davinci-pcm.c + create mode 100644 sound/soc/davinci/davinci-pcm.h + create mode 100644 virt/kvm/kvm_trace.c +Merging x86-fixes/for-linus +$ git merge x86-fixes/for-linus +Merge made by recursive. +Merging sched-fixes/for-linus +$ git merge sched-fixes/for-linus +Merge made by recursive. + kernel/sched.c | 24 +++++++++++++++--------- + 1 files changed, 15 insertions(+), 9 deletions(-) +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Auto-merged net/sunrpc/xprt.c +Merge made by recursive. + drivers/net/wireless/Makefile | 2 +- + drivers/net/wireless/iwlwifi/Kconfig | 6 ++ + include/net/compat.h | 3 + + net/can/raw.c | 21 +++--- + net/compat.c | 117 ++++++++++++++++++++++++++++++++++ + net/ipv4/ip_sockglue.c | 5 ++ + net/ipv4/tcp_input.c | 3 +- + net/ipv6/Kconfig | 2 +- + net/ipv6/ip6mr.c | 2 +- + net/ipv6/ipv6_sockglue.c | 5 ++ + net/mac80211/Kconfig | 4 +- + net/sunrpc/xprt.c | 2 +- + net/tipc/msg.h | 7 +- + net/xfrm/xfrm_algo.c | 3 +- + net/xfrm/xfrm_state.c | 2 +- + 15 files changed, 159 insertions(+), 25 deletions(-) +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merged arch/x86/kernel/apm_32.c +Auto-merged arch/x86/kernel/traps_32.c +Auto-merged drivers/net/phy/phy_device.c +CONFLICT (content): Merge conflict in drivers/net/phy/phy_device.c +Auto-merged fs/sysfs/file.c +Auto-merged fs/sysfs/sysfs.h +Auto-merged include/linux/sysfs.h +Auto-merged init/main.c +Recorded preimage for 'drivers/net/phy/phy_device.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + arch/x86/kernel/apm_32.c | 8 +- + arch/x86/kernel/traps_32.c | 1 + + arch/x86/kernel/traps_64.c | 1 + + drivers/base/base.h | 11 - + drivers/base/class.c | 638 +------------------------------------ + drivers/base/core.c | 1 + + drivers/base/platform.c | 296 +++++++++++++++++- + drivers/base/power/main.c | 675 ++++++++++++++++++++++++++++++--------- + drivers/base/power/power.h | 2 +- + drivers/base/power/trace.c | 4 +- + drivers/net/phy/phy_device.c | 8 +- + drivers/pci/pci-driver.c | 372 +++++++++++++++++++--- + fs/sysfs/file.c | 13 + + fs/sysfs/mount.c | 2 +- + fs/sysfs/sysfs.h | 1 + + include/linux/device.h | 106 +------ + include/linux/init.h | 1 + + include/linux/pci.h | 2 +- + include/linux/platform_device.h | 1 + + include/linux/pm.h | 314 +++++++++++++++++-- + include/linux/sysfs.h | 5 + + init/main.c | 9 + + kernel/power/disk.c | 22 +- + kernel/power/main.c | 6 +- + lib/kobject.c | 52 +++ + 25 files changed, 1556 insertions(+), 995 deletions(-) +Merging quilt/usb +$ git merge quilt/usb +Auto-merged drivers/Kconfig +Auto-merged drivers/input/joystick/xpad.c +CONFLICT (content): Merge conflict in drivers/input/joystick/xpad.c +Auto-merged drivers/usb/core/hub.c +CONFLICT (content): Merge conflict in drivers/usb/core/hub.c +Auto-merged drivers/usb/core/quirks.c +CONFLICT (content): Merge conflict in drivers/usb/core/quirks.c +Auto-merged drivers/usb/host/Kconfig +CONFLICT (content): Merge conflict in drivers/usb/host/Kconfig +Auto-merged drivers/usb/misc/Kconfig +Auto-merged include/linux/usb.h +CONFLICT (content): Merge conflict in include/linux/usb.h +Recorded preimage for 'drivers/input/joystick/xpad.c' +Recorded preimage for 'drivers/usb/core/hub.c' +Recorded preimage for 'drivers/usb/core/quirks.c' +Recorded preimage for 'drivers/usb/host/Kconfig' +Recorded preimage for 'include/linux/usb.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Documentation/usb/WUSB-Design-overview.txt | 448 +++++++ + Documentation/usb/wusb-cbaf | 136 ++ + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/usb/Kconfig | 2 + + drivers/usb/Makefile | 3 + + drivers/usb/core/hub.c | 83 ++ + drivers/usb/host/Kconfig | 15 + + drivers/usb/host/Makefile | 1 + + drivers/usb/host/hwa-hc.c | 925 +++++++++++++ + drivers/usb/misc/Kconfig | 9 + + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/gotemp.c | 295 +++++ + drivers/usb/wusbcore/Kconfig | 17 + + drivers/usb/wusbcore/Makefile | 20 + + drivers/usb/wusbcore/cbaf.c | 753 +++++++++++ + drivers/usb/wusbcore/crypto.c | 537 ++++++++ + drivers/usb/wusbcore/dev-sysfs.c | 199 +++ + drivers/usb/wusbcore/devconnect.c | 1307 +++++++++++++++++++ + drivers/usb/wusbcore/mmc.c | 329 +++++ + drivers/usb/wusbcore/pal.c | 39 + + drivers/usb/wusbcore/reservation.c | 127 ++ + drivers/usb/wusbcore/rh.c | 477 +++++++ + drivers/usb/wusbcore/security.c | 536 ++++++++ + drivers/usb/wusbcore/wa-hc.c | 83 ++ + drivers/usb/wusbcore/wa-hc.h | 420 ++++++ + drivers/usb/wusbcore/wa-nep.c | 313 +++++ + drivers/usb/wusbcore/wa-rpipe.c | 548 ++++++++ + drivers/usb/wusbcore/wa-xfer.c | 1710 ++++++++++++++++++++++++ + drivers/usb/wusbcore/wusbhc.c | 395 ++++++ + drivers/usb/wusbcore/wusbhc.h | 522 ++++++++ + drivers/uwb/Kconfig | 88 ++ + drivers/uwb/Makefile | 30 + + drivers/uwb/address.c | 380 ++++++ + drivers/uwb/beacon.c | 713 ++++++++++ + drivers/uwb/driver.c | 308 +++++ + drivers/uwb/drp-avail.c | 288 ++++ + drivers/uwb/drp-ie.c | 230 ++++ + drivers/uwb/drp.c | 406 ++++++ + drivers/uwb/est.c | 414 ++++++ + drivers/uwb/hwa-rc.c | 915 +++++++++++++ + drivers/uwb/i1480/Makefile | 2 + + drivers/uwb/i1480/dfu/Makefile | 9 + + drivers/uwb/i1480/dfu/dfu.c | 281 ++++ + drivers/uwb/i1480/dfu/i1480-dfu.h | 264 ++++ + drivers/uwb/i1480/dfu/mac.c | 530 ++++++++ + drivers/uwb/i1480/dfu/phy.c | 203 +++ + drivers/uwb/i1480/dfu/usb.c | 501 +++++++ + drivers/uwb/i1480/i1480-est.c | 99 ++ + drivers/uwb/i1480/i1480-wlp.h | 160 +++ + drivers/uwb/i1480/i1480u-wlp/Makefile | 8 + + drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h | 269 ++++ + drivers/uwb/i1480/i1480u-wlp/lc.c | 421 ++++++ + drivers/uwb/i1480/i1480u-wlp/netdev.c | 367 ++++++ + drivers/uwb/i1480/i1480u-wlp/rx.c | 492 +++++++ + drivers/uwb/i1480/i1480u-wlp/sysfs.c | 446 +++++++ + drivers/uwb/i1480/i1480u-wlp/tx.c | 641 +++++++++ + drivers/uwb/ie.c | 591 +++++++++ + drivers/uwb/lc-dev.c | 703 ++++++++++ + drivers/uwb/lc-rc.c | 499 +++++++ + drivers/uwb/neh.c | 616 +++++++++ + drivers/uwb/pal.c | 71 + + drivers/uwb/reset.c | 328 +++++ + drivers/uwb/rsv.c | 607 +++++++++ + drivers/uwb/scan.c | 160 +++ + drivers/uwb/umc-bus.c | 186 +++ + drivers/uwb/umc-dev.c | 104 ++ + drivers/uwb/umc-drv.c | 31 + + drivers/uwb/uwb-debug.c | 306 +++++ + drivers/uwb/uwb-internal.h | 288 ++++ + drivers/uwb/uwbd.c | 428 ++++++ + drivers/uwb/whc-rc.c | 552 ++++++++ + drivers/uwb/whci.c | 285 ++++ + drivers/uwb/wlp/Makefile | 10 + + drivers/uwb/wlp/driver.c | 43 + + drivers/uwb/wlp/eda.c | 449 +++++++ + drivers/uwb/wlp/messages.c | 1946 ++++++++++++++++++++++++++++ + drivers/uwb/wlp/sysfs.c | 715 ++++++++++ + drivers/uwb/wlp/txrx.c | 374 ++++++ + drivers/uwb/wlp/wlp-internal.h | 228 ++++ + drivers/uwb/wlp/wlp-lc.c | 565 ++++++++ + drivers/uwb/wlp/wss-lc.c | 1056 +++++++++++++++ + include/linux/bitmap.h | 1 + + include/linux/usb.h | 3 + + include/linux/usb/wusb-wa.h | 284 ++++ + include/linux/usb/wusb.h | 420 ++++++ + include/linux/uwb.h | 768 +++++++++++ + include/linux/uwb/bugs-macros.h | 64 + + include/linux/uwb/bugs.h | 18 + + include/linux/uwb/debug-cmd.h | 57 + + include/linux/uwb/debug.h | 82 ++ + include/linux/uwb/spec.h | 630 +++++++++ + include/linux/uwb/umc.h | 194 +++ + include/linux/uwb/util.h | 89 ++ + include/linux/uwb/whci.h | 117 ++ + include/linux/wlp.h | 728 +++++++++++ + lib/bitmap.c | 20 + + 97 files changed, 33334 insertions(+), 0 deletions(-) + create mode 100644 Documentation/usb/WUSB-Design-overview.txt + create mode 100644 Documentation/usb/wusb-cbaf + create mode 100644 drivers/usb/host/hwa-hc.c + create mode 100644 drivers/usb/misc/gotemp.c + create mode 100644 drivers/usb/wusbcore/Kconfig + create mode 100644 drivers/usb/wusbcore/Makefile + create mode 100644 drivers/usb/wusbcore/cbaf.c + create mode 100644 drivers/usb/wusbcore/crypto.c + create mode 100644 drivers/usb/wusbcore/dev-sysfs.c + create mode 100644 drivers/usb/wusbcore/devconnect.c + create mode 100644 drivers/usb/wusbcore/mmc.c + create mode 100644 drivers/usb/wusbcore/pal.c + create mode 100644 drivers/usb/wusbcore/reservation.c + create mode 100644 drivers/usb/wusbcore/rh.c + create mode 100644 drivers/usb/wusbcore/security.c + create mode 100644 drivers/usb/wusbcore/wa-hc.c + create mode 100644 drivers/usb/wusbcore/wa-hc.h + create mode 100644 drivers/usb/wusbcore/wa-nep.c + create mode 100644 drivers/usb/wusbcore/wa-rpipe.c + create mode 100644 drivers/usb/wusbcore/wa-xfer.c + create mode 100644 drivers/usb/wusbcore/wusbhc.c + create mode 100644 drivers/usb/wusbcore/wusbhc.h + create mode 100644 drivers/uwb/Kconfig + create mode 100644 drivers/uwb/Makefile + create mode 100644 drivers/uwb/address.c + create mode 100644 drivers/uwb/beacon.c + create mode 100644 drivers/uwb/driver.c + create mode 100644 drivers/uwb/drp-avail.c + create mode 100644 drivers/uwb/drp-ie.c + create mode 100644 drivers/uwb/drp.c + create mode 100644 drivers/uwb/est.c + create mode 100644 drivers/uwb/hwa-rc.c + create mode 100644 drivers/uwb/i1480/Makefile + create mode 100644 drivers/uwb/i1480/dfu/Makefile + create mode 100644 drivers/uwb/i1480/dfu/dfu.c + create mode 100644 drivers/uwb/i1480/dfu/i1480-dfu.h + create mode 100644 drivers/uwb/i1480/dfu/mac.c + create mode 100644 drivers/uwb/i1480/dfu/phy.c + create mode 100644 drivers/uwb/i1480/dfu/usb.c + create mode 100644 drivers/uwb/i1480/i1480-est.c + create mode 100644 drivers/uwb/i1480/i1480-wlp.h + create mode 100644 drivers/uwb/i1480/i1480u-wlp/Makefile + create mode 100644 drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h + create mode 100644 drivers/uwb/i1480/i1480u-wlp/lc.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/netdev.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/rx.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/sysfs.c + create mode 100644 drivers/uwb/i1480/i1480u-wlp/tx.c + create mode 100644 drivers/uwb/ie.c + create mode 100644 drivers/uwb/lc-dev.c + create mode 100644 drivers/uwb/lc-rc.c + create mode 100644 drivers/uwb/neh.c + create mode 100644 drivers/uwb/pal.c + create mode 100644 drivers/uwb/reset.c + create mode 100644 drivers/uwb/rsv.c + create mode 100644 drivers/uwb/scan.c + create mode 100644 drivers/uwb/umc-bus.c + create mode 100644 drivers/uwb/umc-dev.c + create mode 100644 drivers/uwb/umc-drv.c + create mode 100644 drivers/uwb/uwb-debug.c + create mode 100644 drivers/uwb/uwb-internal.h + create mode 100644 drivers/uwb/uwbd.c + create mode 100644 drivers/uwb/whc-rc.c + create mode 100644 drivers/uwb/whci.c + create mode 100644 drivers/uwb/wlp/Makefile + create mode 100644 drivers/uwb/wlp/driver.c + create mode 100644 drivers/uwb/wlp/eda.c + create mode 100644 drivers/uwb/wlp/messages.c + create mode 100644 drivers/uwb/wlp/sysfs.c + create mode 100644 drivers/uwb/wlp/txrx.c + create mode 100644 drivers/uwb/wlp/wlp-internal.h + create mode 100644 drivers/uwb/wlp/wlp-lc.c + create mode 100644 drivers/uwb/wlp/wss-lc.c + create mode 100644 include/linux/usb/wusb-wa.h + create mode 100644 include/linux/usb/wusb.h + create mode 100644 include/linux/uwb.h + create mode 100644 include/linux/uwb/bugs-macros.h + create mode 100644 include/linux/uwb/bugs.h + create mode 100644 include/linux/uwb/debug-cmd.h + create mode 100644 include/linux/uwb/debug.h + create mode 100644 include/linux/uwb/spec.h + create mode 100644 include/linux/uwb/umc.h + create mode 100644 include/linux/uwb/util.h + create mode 100644 include/linux/uwb/whci.h + create mode 100644 include/linux/wlp.h +Merging x86/for-akpm +$ git merge x86/for-akpm +Merge made by recursive. + arch/x86/kernel/e820_64.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging sched/for-akpm +$ git merge sched/for-akpm +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/process_32.c +Auto-merged arch/x86/kernel/process_64.c +Auto-merged arch/x86/lib/Makefile +Auto-merged include/linux/sched.h +Auto-merged kernel/fork.c +Auto-merged lib/Makefile +Merge made by recursive. + Makefile | 4 + + arch/x86/Kconfig | 1 + + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/alternative.c | 4 +- + arch/x86/kernel/entry_32.S | 68 + + arch/x86/kernel/entry_64.S | 102 ++ + arch/x86/kernel/ftrace.c | 159 ++ + arch/x86/kernel/machine_kexec_32.c | 4 + + arch/x86/kernel/machine_kexec_64.c | 4 + + arch/x86/kernel/process_32.c | 3 + + arch/x86/kernel/process_64.c | 3 + + arch/x86/kernel/vsyscall_64.c | 3 +- + arch/x86/lib/Makefile | 1 + + arch/x86/lib/thunk_32.S | 47 + + arch/x86/lib/thunk_64.S | 19 +- + arch/x86/vdso/vclock_gettime.c | 15 +- + arch/x86/vdso/vgetcpu.c | 3 +- + include/asm-x86/alternative.h | 2 + + include/asm-x86/irqflags.h | 24 +- + include/asm-x86/vsyscall.h | 3 +- + include/linux/ftrace.h | 123 ++ + include/linux/irqflags.h | 13 +- + include/linux/linkage.h | 2 + + include/linux/preempt.h | 34 +- + include/linux/rcupdate.h | 2 - + include/linux/sched.h | 48 + + kernel/Makefile | 10 + + kernel/fork.c | 2 +- + kernel/lockdep.c | 30 +- + kernel/printk.c | 31 +- + kernel/rcupreempt.c | 2 - + kernel/sched.c | 62 +- + kernel/softlockup.c | 4 +- + kernel/spinlock.c | 2 +- + kernel/sysctl.c | 11 + + kernel/trace/Kconfig | 131 ++ + kernel/trace/Makefile | 23 + + kernel/trace/ftrace.c | 1396 +++++++++++++++++ + kernel/trace/trace.c | 2685 +++++++++++++++++++++++++++++++++ + kernel/trace/trace.h | 301 ++++ + kernel/trace/trace_functions.c | 76 + + kernel/trace/trace_irqsoff.c | 502 ++++++ + kernel/trace/trace_sched_switch.c | 183 +++ + kernel/trace/trace_sched_wakeup.c | 288 ++++ + kernel/trace/trace_selftest.c | 551 +++++++ + kernel/trace/trace_selftest_dynamic.c | 7 + + kernel/trace/trace_sysprof.c | 355 +++++ + lib/Kconfig.debug | 2 + + lib/Makefile | 9 + + lib/smp_processor_id.c | 6 +- + 50 files changed, 7282 insertions(+), 79 deletions(-) + create mode 100644 arch/x86/kernel/ftrace.c + create mode 100644 arch/x86/lib/thunk_32.S + create mode 100644 include/linux/ftrace.h + create mode 100644 kernel/trace/Kconfig + create mode 100644 kernel/trace/Makefile + create mode 100644 kernel/trace/ftrace.c + create mode 100644 kernel/trace/trace.c + create mode 100644 kernel/trace/trace.h + create mode 100644 kernel/trace/trace_functions.c + create mode 100644 kernel/trace/trace_irqsoff.c + create mode 100644 kernel/trace/trace_sched_switch.c + create mode 100644 kernel/trace/trace_sched_wakeup.c + create mode 100644 kernel/trace/trace_selftest.c + create mode 100644 kernel/trace/trace_selftest_dynamic.c + create mode 100644 kernel/trace/trace_sysprof.c +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +Merging hid/mm +$ git merge hid/mm +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + MAINTAINERS | 2 ++ + drivers/i2c/busses/i2c-piix4.c | 10 ++-------- + drivers/i2c/busses/i2c-sis5595.c | 14 +++----------- + drivers/i2c/busses/i2c-sis630.c | 2 +- + drivers/i2c/busses/i2c-stub.c | 2 +- + drivers/i2c/chips/tps65010.c | 2 ++ + 6 files changed, 11 insertions(+), 21 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +CONFLICT (rename/delete): Renamed Documentation/smart-config.txt->Documentation/kbuild/smart-config.txt in quilt/kernel-doc and deleted in HEAD +Auto-merged Documentation/00-INDEX +Auto-merged Documentation/DocBook/kernel-locking.tmpl +CONFLICT (content): Merge conflict in Documentation/DocBook/kernel-locking.tmpl +Resolved 'Documentation/DocBook/kernel-locking.tmpl' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Documentation/DMA-API.txt | 4 +- + Documentation/DocBook/kernel-locking.tmpl | 25 ++++- + Documentation/kbuild/00-INDEX | 4 + + Documentation/kbuild/make-configs.txt | 188 +++++++++++++++++++++++++++++ + Documentation/kbuild/smart-config.txt | 98 +++++++++++++++ + Documentation/spi/spidev | 168 +------------------------- + Documentation/spi/spidev_fdx.c | 158 ++++++++++++++++++++++++ + README | 32 +++-- + scripts/kernel-doc | 25 +++- + 9 files changed, 514 insertions(+), 188 deletions(-) + create mode 100644 Documentation/kbuild/make-configs.txt + create mode 100644 Documentation/kbuild/smart-config.txt + create mode 100644 Documentation/spi/spidev_fdx.c +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging v4l-dvb/stable +$ git merge v4l-dvb/stable +Removed drivers/media/dvb/dvb-core/Kconfig +Merge made by recursive. + Documentation/video4linux/CARDLIST.saa7134 | 3 +- + drivers/media/Kconfig | 153 +-- + drivers/media/Makefile | 6 +- + drivers/media/common/Makefile | 6 +- + drivers/media/common/tuners/Kconfig | 146 ++ + drivers/media/common/tuners/Makefile | 25 + + .../{dvb/frontends => common/tuners}/mt2060.c | 0 + .../{dvb/frontends => common/tuners}/mt2060.h | 0 + .../{dvb/frontends => common/tuners}/mt2060_priv.h | 0 + drivers/media/{video => common/tuners}/mt20xx.c | 0 + drivers/media/{video => common/tuners}/mt20xx.h | 0 + .../{dvb/frontends => common/tuners}/mt2131.c | 0 + .../{dvb/frontends => common/tuners}/mt2131.h | 0 + .../{dvb/frontends => common/tuners}/mt2131_priv.h | 0 + .../{dvb/frontends => common/tuners}/mt2266.c | 0 + .../{dvb/frontends => common/tuners}/mt2266.h | 0 + .../{dvb/frontends => common/tuners}/qt1010.c | 0 + .../{dvb/frontends => common/tuners}/qt1010.h | 0 + .../{dvb/frontends => common/tuners}/qt1010_priv.h | 0 + .../frontends => common/tuners}/tda18271-common.c | 0 + .../{dvb/frontends => common/tuners}/tda18271-fe.c | 0 + .../tuners/tda18271-maps.c} | 0 + .../frontends => common/tuners}/tda18271-priv.h | 0 + .../{dvb/frontends => common/tuners}/tda18271.h | 0 + .../{dvb/frontends => common/tuners}/tda827x.c | 0 + .../{dvb/frontends => common/tuners}/tda827x.h | 0 + drivers/media/{video => common/tuners}/tda8290.c | 0 + drivers/media/{video => common/tuners}/tda8290.h | 0 + drivers/media/{video => common/tuners}/tda9887.c | 0 + drivers/media/{video => common/tuners}/tda9887.h | 0 + drivers/media/{video => common/tuners}/tea5761.c | 0 + drivers/media/{video => common/tuners}/tea5761.h | 0 + drivers/media/{video => common/tuners}/tea5767.c | 0 + drivers/media/{video => common/tuners}/tea5767.h | 0 + drivers/media/{video => common/tuners}/tuner-i2c.h | 0 + .../media/{video => common/tuners}/tuner-simple.c | 0 + .../media/{video => common/tuners}/tuner-simple.h | 0 + .../media/{video => common/tuners}/tuner-types.c | 0 + .../{video => common/tuners}/tuner-xc2028-types.h | 0 + .../media/{video => common/tuners}/tuner-xc2028.c | 0 + .../media/{video => common/tuners}/tuner-xc2028.h | 0 + .../{dvb/frontends => common/tuners}/xc5000.c | 0 + .../{dvb/frontends => common/tuners}/xc5000.h | 0 + .../{dvb/frontends => common/tuners}/xc5000_priv.h | 0 + drivers/media/dvb/Kconfig | 4 +- + drivers/media/dvb/b2c2/Makefile | 2 +- + drivers/media/dvb/bt8xx/Makefile | 2 +- + drivers/media/dvb/dvb-core/Kconfig | 34 - + drivers/media/dvb/dvb-usb/Makefile | 2 +- + drivers/media/dvb/frontends/Kconfig | 135 +-- + drivers/media/dvb/frontends/Makefile | 12 +- + drivers/media/dvb/frontends/drx397xD.c | 1504 ++++++++++++++++++++ + drivers/media/dvb/frontends/drx397xD.h | 130 ++ + drivers/media/dvb/frontends/drx397xD_fw.h | 40 + + drivers/media/video/Kconfig | 48 + + drivers/media/video/Makefile | 13 +- + drivers/media/video/au0828/Makefile | 2 +- + drivers/media/video/bt8xx/Makefile | 1 + + drivers/media/video/cx23885/Makefile | 1 + + drivers/media/video/cx88/Makefile | 1 + + drivers/media/video/cx88/cx88-cards.c | 50 +- + drivers/media/video/cx88/cx88-i2c.c | 32 +- + drivers/media/video/em28xx/Makefile | 1 + + drivers/media/video/ivtv/Makefile | 1 + + drivers/media/video/ivtv/ivtv-cards.c | 98 +- + drivers/media/video/ivtv/ivtv-cards.h | 5 +- + drivers/media/video/ivtv/ivtv-driver.c | 41 +- + drivers/media/video/ivtv/ivtv-gpio.c | 9 +- + drivers/media/video/ivtv/ivtv-i2c.c | 3 +- + drivers/media/video/ivtv/ivtv-ioctl.c | 42 +- + drivers/media/video/ivtv/ivtv-irq.c | 4 +- + drivers/media/video/ivtv/ivtv-version.h | 2 +- + drivers/media/video/ivtv/ivtvfb.c | 2 +- + drivers/media/video/pvrusb2/Makefile | 1 + + drivers/media/video/saa7134/Makefile | 1 + + drivers/media/video/saa7134/saa7134-cards.c | 260 ++-- + drivers/media/video/saa7134/saa7134-i2c.c | 42 - + drivers/media/video/saa7134/saa7134-input.c | 1 + + drivers/media/video/saa7134/saa7134.h | 1 + + drivers/media/{common => video/saa7146}/Kconfig | 0 + drivers/media/video/saa7146/Makefile | 5 + + .../media/{common => video/saa7146}/saa7146_core.c | 0 + .../media/{common => video/saa7146}/saa7146_fops.c | 0 + .../media/{common => video/saa7146}/saa7146_hlp.c | 0 + .../media/{common => video/saa7146}/saa7146_i2c.c | 0 + .../media/{common => video/saa7146}/saa7146_vbi.c | 0 + .../{common => video/saa7146}/saa7146_video.c | 0 + drivers/media/video/tuner-core.c | 4 +- + drivers/media/video/usbvision/Makefile | 1 + + 89 files changed, 2355 insertions(+), 521 deletions(-) + create mode 100644 drivers/media/common/tuners/Kconfig + create mode 100644 drivers/media/common/tuners/Makefile + rename drivers/media/{dvb/frontends => common/tuners}/mt2060.c (100%) + rename drivers/media/{dvb/frontends => common/tuners}/mt2060.h (100%) + rename drivers/media/{dvb/frontends => common/tuners}/mt2060_priv.h (100%) + rename drivers/media/{video => common/tuners}/mt20xx.c (100%) + rename drivers/media/{video => common/tuners}/mt20xx.h (100%) + rename drivers/media/{dvb/frontends => common/tuners}/mt2131.c (100%) + rename drivers/media/{dvb/frontends => common/tuners}/mt2131.h (100%) + rename drivers/media/{dvb/frontends => common/tuners}/mt2131_priv.h (100%) + rename drivers/media/{dvb/frontends => common/tuners}/mt2266.c (100%) + rename drivers/media/{dvb/frontends => common/tuners}/mt2266.h (100%) + rename drivers/media/{dvb/frontends => common/tuners}/qt1010.c (100%) + rename drivers/media/{dvb/frontends => common/tuners}/qt1010.h (100%) + rename drivers/media/{dvb/frontends => common/tuners}/qt1010_priv.h (100%) + rename drivers/media/{dvb/frontends => common/tuners}/tda18271-common.c (100%) + rename drivers/media/{dvb/frontends => common/tuners}/tda18271-fe.c (100%) + rename drivers/media/{dvb/frontends/tda18271-tables.c => common/tuners/tda18271-maps.c} (100%) + rename drivers/media/{dvb/frontends => common/tuners}/tda18271-priv.h (100%) + rename drivers/media/{dvb/frontends => common/tuners}/tda18271.h (100%) + rename drivers/media/{dvb/frontends => common/tuners}/tda827x.c (100%) + rename drivers/media/{dvb/frontends => common/tuners}/tda827x.h (100%) + rename drivers/media/{video => common/tuners}/tda8290.c (100%) + rename drivers/media/{video => common/tuners}/tda8290.h (100%) + rename drivers/media/{video => common/tuners}/tda9887.c (100%) + rename drivers/media/{video => common/tuners}/tda9887.h (100%) + rename drivers/media/{video => common/tuners}/tea5761.c (100%) + rename drivers/media/{video => common/tuners}/tea5761.h (100%) + rename drivers/media/{video => common/tuners}/tea5767.c (100%) + rename drivers/media/{video => common/tuners}/tea5767.h (100%) + rename drivers/media/{video => common/tuners}/tuner-i2c.h (100%) + rename drivers/media/{video => common/tuners}/tuner-simple.c (100%) + rename drivers/media/{video => common/tuners}/tuner-simple.h (100%) + rename drivers/media/{video => common/tuners}/tuner-types.c (100%) + rename drivers/media/{video => common/tuners}/tuner-xc2028-types.h (100%) + rename drivers/media/{video => common/tuners}/tuner-xc2028.c (100%) + rename drivers/media/{video => common/tuners}/tuner-xc2028.h (100%) + rename drivers/media/{dvb/frontends => common/tuners}/xc5000.c (100%) + rename drivers/media/{dvb/frontends => common/tuners}/xc5000.h (100%) + rename drivers/media/{dvb/frontends => common/tuners}/xc5000_priv.h (100%) + delete mode 100644 drivers/media/dvb/dvb-core/Kconfig + create mode 100644 drivers/media/dvb/frontends/drx397xD.c + create mode 100644 drivers/media/dvb/frontends/drx397xD.h + create mode 100644 drivers/media/dvb/frontends/drx397xD_fw.h + rename drivers/media/{common => video/saa7146}/Kconfig (100%) + create mode 100644 drivers/media/video/saa7146/Makefile + rename drivers/media/{common => video/saa7146}/saa7146_core.c (100%) + rename drivers/media/{common => video/saa7146}/saa7146_fops.c (100%) + rename drivers/media/{common => video/saa7146}/saa7146_hlp.c (100%) + rename drivers/media/{common => video/saa7146}/saa7146_i2c.c (100%) + rename drivers/media/{common => video/saa7146}/saa7146_vbi.c (100%) + rename drivers/media/{common => video/saa7146}/saa7146_video.c (100%) +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/kernel/Makefile | 2 -- + arch/s390/kernel/process.c | 18 ------------------ + arch/s390/kernel/smp.c | 31 ++++++++++++++++++++----------- + arch/s390/kernel/topology.c | 21 ++++++++++++++++++--- + arch/s390/kernel/traps.c | 26 ++++++++++++++++++++++---- + arch/s390/lib/Makefile | 2 -- + arch/s390/math-emu/Makefile | 1 - + drivers/s390/char/sclp_config.c | 17 ++++++++++++++++- + drivers/s390/cio/ccwgroup.c | 7 +++++-- + drivers/s390/cio/cio.c | 9 ++++----- + drivers/s390/cio/cio.h | 3 ++- + drivers/s390/cio/cmf.c | 11 ++++++++--- + drivers/s390/cio/css.c | 10 +++++++--- + drivers/s390/cio/device.c | 17 +++++++++++------ + drivers/s390/cio/device_fsm.c | 10 +++------- + drivers/s390/cio/device_ops.c | 2 +- + drivers/s390/cio/qdio.c | 8 ++++---- + include/asm-s390/processor.h | 9 --------- + include/asm-s390/smp.h | 6 ++++++ + include/asm-s390/sysinfo.h | 5 +++++ + include/asm-s390/topology.h | 4 ++++ + 21 files changed, 136 insertions(+), 83 deletions(-) +Merging sh/master +$ git merge sh/master +Removed arch/sh/boards/mpc1211/Makefile +Removed arch/sh/boards/mpc1211/pci.c +Removed arch/sh/boards/mpc1211/rtc.c +Removed arch/sh/boards/mpc1211/setup.c +Auto-merged drivers/mtd/maps/Kconfig +Removed drivers/mtd/maps/mpc1211.c +Removed include/asm-sh/keyboard.h +Removed include/asm-sh/mpc1211/dma.h +Removed include/asm-sh/mpc1211/io.h +Removed include/asm-sh/mpc1211/keyboard.h +Removed include/asm-sh/mpc1211/m1543c.h +Removed include/asm-sh/mpc1211/mc146818rtc.h +Removed include/asm-sh/mpc1211/mpc1211.h +Removed include/asm-sh/mpc1211/pci.h +Merge made by recursive. + arch/sh/Kconfig | 17 +- + arch/sh/Kconfig.debug | 1 + + arch/sh/Makefile | 1 - + arch/sh/boards/mpc1211/Makefile | 8 - + arch/sh/boards/mpc1211/pci.c | 295 ---------------------- + arch/sh/boards/mpc1211/rtc.c | 136 ---------- + arch/sh/boards/mpc1211/setup.c | 347 -------------------------- + arch/sh/boards/renesas/migor/setup.c | 11 +- + arch/sh/boards/renesas/r7780rp/irq-r7780mp.c | 2 +- + arch/sh/boards/renesas/r7780rp/irq-r7780rp.c | 2 +- + arch/sh/boards/renesas/r7780rp/irq-r7785rp.c | 2 +- + arch/sh/boards/renesas/r7780rp/setup.c | 24 +-- + arch/sh/boards/renesas/rts7751r2d/setup.c | 7 +- + arch/sh/boards/se/7722/setup.c | 6 + + arch/sh/boot/compressed/Makefile_32 | 1 - + arch/sh/boot/compressed/Makefile_64 | 1 - + arch/sh/kernel/cpu/irq/intc-sh5.c | 73 +++--- + arch/sh/kernel/cpu/irq/intc.c | 93 +++++++- + arch/sh/kernel/cpu/sh3/Makefile | 2 +- + arch/sh/kernel/cpu/sh3/setup-sh3.c | 71 ++++++ + arch/sh/kernel/cpu/sh3/setup-sh7705.c | 22 +-- + arch/sh/kernel/cpu/sh3/setup-sh770x.c | 32 +-- + arch/sh/kernel/cpu/sh3/setup-sh7710.c | 25 +-- + arch/sh/kernel/cpu/sh3/setup-sh7720.c | 35 +--- + arch/sh/kernel/cpu/sh5/entry.S | 28 ++ + arch/sh/kernel/cpu/sh5/probe.c | 4 + + arch/sh/kernel/early_printk.c | 30 ++- + arch/sh/kernel/setup.c | 46 ++++- + arch/sh/kernel/sh_ksyms_32.c | 2 - + arch/sh/kernel/sh_ksyms_64.c | 26 ++ + arch/sh/kernel/time_64.c | 5 +- + arch/sh/lib64/dbg.c | 2 +- + arch/sh/mm/Makefile_64 | 7 +- + arch/sh/mm/cache-sh5.c | 2 + + arch/sh/mm/ioremap_64.c | 2 + + arch/sh/mm/numa.c | 2 +- + arch/sh/tools/mach-types | 1 - + drivers/input/serio/i8042-io.h | 2 +- + drivers/mtd/maps/Kconfig | 9 +- + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/mpc1211.c | 80 ------ + drivers/rtc/rtc-sh.c | 14 +- + drivers/serial/sh-sci.c | 32 +-- + drivers/serial/sh-sci.h | 27 ++- + include/asm-sh/hw_irq.h | 19 ++ + include/asm-sh/io.h | 12 +- + include/asm-sh/keyboard.h | 13 - + include/asm-sh/mmu_context.h | 4 +- + include/asm-sh/mmzone.h | 2 + + include/asm-sh/mpc1211/dma.h | 303 ---------------------- + include/asm-sh/mpc1211/io.h | 22 -- + include/asm-sh/mpc1211/keyboard.h | 60 ----- + include/asm-sh/mpc1211/m1543c.h | 200 --------------- + include/asm-sh/mpc1211/mc146818rtc.h | 6 - + include/asm-sh/mpc1211/mpc1211.h | 18 -- + include/asm-sh/mpc1211/pci.h | 38 --- + include/asm-sh/r7780rp.h | 4 +- + include/asm-sh/tlb_64.h | 10 +- + include/asm-sh/uaccess_64.h | 2 + + 59 files changed, 466 insertions(+), 1783 deletions(-) + delete mode 100644 arch/sh/boards/mpc1211/Makefile + delete mode 100644 arch/sh/boards/mpc1211/pci.c + delete mode 100644 arch/sh/boards/mpc1211/rtc.c + delete mode 100644 arch/sh/boards/mpc1211/setup.c + create mode 100644 arch/sh/kernel/cpu/sh3/setup-sh3.c + delete mode 100644 drivers/mtd/maps/mpc1211.c + delete mode 100644 include/asm-sh/keyboard.h + delete mode 100644 include/asm-sh/mpc1211/dma.h + delete mode 100644 include/asm-sh/mpc1211/io.h + delete mode 100644 include/asm-sh/mpc1211/keyboard.h + delete mode 100644 include/asm-sh/mpc1211/m1543c.h + delete mode 100644 include/asm-sh/mpc1211/mc146818rtc.h + delete mode 100644 include/asm-sh/mpc1211/mpc1211.h + delete mode 100644 include/asm-sh/mpc1211/pci.h +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 +Removed drivers/ide/cris/Makefile +Removed drivers/ide/cris/ide-cris.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 3 - + arch/arm/Kconfig | 15 +- + drivers/ide/Kconfig | 34 -- + drivers/ide/Makefile | 2 +- + drivers/ide/arm/icside.c | 2 +- + drivers/ide/arm/palm_bk3710.c | 1 + + drivers/ide/arm/rapide.c | 1 + + drivers/ide/cris/Makefile | 3 - + drivers/ide/cris/ide-cris.c | 1086 ----------------------------------- + drivers/ide/h8300/ide-h8300.c | 108 ++++- + drivers/ide/ide-acpi.c | 6 +- + drivers/ide/ide-cd.c | 32 +- + drivers/ide/ide-dma.c | 13 +- + drivers/ide/ide-floppy.c | 27 +- + drivers/ide/ide-io.c | 68 +-- + drivers/ide/ide-iops.c | 344 +++++++----- + drivers/ide/ide-lib.c | 2 +- + drivers/ide/ide-probe.c | 8 +- + drivers/ide/ide-tape.c | 19 +- + drivers/ide/ide-taskfile.c | 70 +-- + drivers/ide/ide.c | 321 +---------- + drivers/ide/legacy/ali14xx.c | 2 +- + drivers/ide/legacy/falconide.c | 26 + + drivers/ide/legacy/gayle.c | 3 +- + drivers/ide/legacy/ht6560b.c | 2 +- + drivers/ide/legacy/ide_platform.c | 4 +- + drivers/ide/legacy/q40ide.c | 24 + + drivers/ide/legacy/qd65xx.c | 4 +- + drivers/ide/mips/au1xxx-ide.c | 15 +- + drivers/ide/mips/swarm.c | 1 + + drivers/ide/pci/aec62xx.c | 2 +- + drivers/ide/pci/alim15x3.c | 2 +- + drivers/ide/pci/amd74xx.c | 2 +- + drivers/ide/pci/cmd640.c | 8 +- + drivers/ide/pci/cmd64x.c | 4 +- + drivers/ide/pci/cy82c693.c | 2 +- + drivers/ide/pci/ns87415.c | 44 ++ + drivers/ide/pci/opti621.c | 2 +- + drivers/ide/pci/pdc202xx_new.c | 8 +- + drivers/ide/pci/piix.c | 1 + + drivers/ide/pci/scc_pata.c | 196 ++++++- + drivers/ide/pci/sgiioc4.c | 1 + + drivers/ide/pci/siimage.c | 539 ++++++++---------- + drivers/ide/pci/via82cxxx.c | 2 +- + drivers/ide/ppc/pmac.c | 1 + + drivers/pcmcia/Kconfig | 1 - + drivers/scsi/ide-scsi.c | 38 +- + include/linux/ide.h | 65 +-- + 48 files changed, 992 insertions(+), 2172 deletions(-) + delete mode 100644 drivers/ide/cris/Makefile + delete mode 100644 drivers/ide/cris/ide-cris.c +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already uptodate! +Merge made by recursive. +Merging xfs/master +$ git merge xfs/master +Auto-merged fs/xfs/linux-2.6/xfs_ioctl.c +Auto-merged fs/xfs/linux-2.6/xfs_iops.c +Auto-merged fs/xfs/linux-2.6/xfs_lrw.c +Merge made by recursive. + fs/xfs/Kconfig | 13 ++ + fs/xfs/linux-2.6/mrlock.h | 60 +++---- + fs/xfs/linux-2.6/xfs_buf.c | 2 +- + fs/xfs/linux-2.6/xfs_export.c | 2 +- + fs/xfs/linux-2.6/xfs_file.c | 75 --------- + fs/xfs/linux-2.6/xfs_ioctl.c | 8 +- + fs/xfs/linux-2.6/xfs_iops.c | 3 +- + fs/xfs/linux-2.6/xfs_linux.h | 1 - + fs/xfs/linux-2.6/xfs_lrw.c | 21 +-- + fs/xfs/linux-2.6/xfs_lrw.h | 1 - + fs/xfs/linux-2.6/xfs_super.c | 2 +- + fs/xfs/linux-2.6/xfs_vnode.h | 24 --- + fs/xfs/quota/xfs_dquot.c | 4 +- + fs/xfs/quota/xfs_qm.c | 27 ++-- + fs/xfs/quota/xfs_qm_syscalls.c | 6 - + fs/xfs/quota/xfs_quota_priv.h | 5 - + fs/xfs/quota/xfs_trans_dquot.c | 2 +- + fs/xfs/xfs.h | 2 +- + fs/xfs/xfs_acl.c | 53 ++----- + fs/xfs/xfs_attr.c | 93 ++++++----- + fs/xfs/xfs_attr.h | 6 +- + fs/xfs/xfs_bmap.c | 1 - + fs/xfs/xfs_dfrag.c | 4 +- + fs/xfs/xfs_dir2_node.c | 358 ++++++++++++++++++++++----------------- + fs/xfs/xfs_fsops.c | 4 +- + fs/xfs/xfs_iget.c | 140 +++++++++------- + fs/xfs/xfs_inode.c | 25 ++-- + fs/xfs/xfs_inode.h | 16 +-- + fs/xfs/xfs_inode_item.c | 12 +- + fs/xfs/xfs_iomap.c | 6 +- + fs/xfs/xfs_itable.c | 6 - + fs/xfs/xfs_mount.c | 83 +++++----- + fs/xfs/xfs_mount.h | 6 +- + fs/xfs/xfs_rename.c | 252 ++++++---------------------- + fs/xfs/xfs_trans_inode.c | 12 +- + fs/xfs/xfs_utils.c | 45 +----- + fs/xfs/xfs_utils.h | 2 - + fs/xfs/xfs_vnodeops.c | 274 ++++--------------------------- + fs/xfs/xfs_vnodeops.h | 8 +- + 39 files changed, 581 insertions(+), 1083 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/test +$ git merge acpi/test +Auto-merged arch/x86/kernel/apm_32.c +CONFLICT (content): Merge conflict in arch/x86/kernel/apm_32.c +Auto-merged drivers/acpi/processor_idle.c +Removed kernel/power/pm.c +Resolved 'arch/x86/kernel/apm_32.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + arch/frv/kernel/pm.c | 8 - + arch/mips/au1000/common/power.c | 35 +--- + arch/x86/kernel/apm_32.c | 16 - + drivers/acpi/bay.c | 2 + + drivers/acpi/dispatcher/dsfield.c | 171 +++++++----- + drivers/acpi/dispatcher/dsmethod.c | 58 ++--- + drivers/acpi/dispatcher/dsmthdat.c | 2 + + drivers/acpi/dispatcher/dsobject.c | 99 +++++-- + drivers/acpi/dispatcher/dsopcode.c | 258 ++++++++++++++++- + drivers/acpi/dispatcher/dsutils.c | 165 ++++++++++-- + drivers/acpi/dispatcher/dswexec.c | 76 +++--- + drivers/acpi/dispatcher/dswload.c | 35 ++- + drivers/acpi/dispatcher/dswstate.c | 515 +++++++-------------------------- + drivers/acpi/ec.c | 240 ++++++++-------- + drivers/acpi/events/evgpe.c | 9 +- + drivers/acpi/events/evmisc.c | 90 +++--- + drivers/acpi/events/evregion.c | 2 +- + drivers/acpi/events/evxface.c | 21 +- + drivers/acpi/executer/exconfig.c | 103 ++++++-- + drivers/acpi/executer/excreate.c | 115 +------- + drivers/acpi/executer/exdump.c | 67 +++-- + drivers/acpi/executer/exfield.c | 61 +---- + drivers/acpi/executer/exfldio.c | 44 +++- + drivers/acpi/executer/exmutex.c | 235 +++++++++++----- + drivers/acpi/executer/exoparg1.c | 23 ++- + drivers/acpi/executer/exoparg2.c | 19 +- + drivers/acpi/executer/exoparg3.c | 1 + + drivers/acpi/executer/exoparg6.c | 8 +- + drivers/acpi/executer/exprep.c | 15 + + drivers/acpi/executer/exregion.c | 8 +- + drivers/acpi/executer/exresnte.c | 10 +- + drivers/acpi/executer/exresolv.c | 53 ++-- + drivers/acpi/executer/exresop.c | 11 - + drivers/acpi/executer/exstore.c | 117 ++++++-- + drivers/acpi/executer/exsystem.c | 1 - + drivers/acpi/executer/exutils.c | 65 +++-- + drivers/acpi/glue.c | 20 ++ + drivers/acpi/hardware/hwsleep.c | 14 +- + drivers/acpi/namespace/nsaccess.c | 99 ++++--- + drivers/acpi/namespace/nsdump.c | 9 +- + drivers/acpi/namespace/nsinit.c | 10 + + drivers/acpi/namespace/nsload.c | 4 +- + drivers/acpi/namespace/nsnames.c | 6 + + drivers/acpi/namespace/nsparse.c | 31 ++- + drivers/acpi/namespace/nswalk.c | 4 +- + drivers/acpi/namespace/nsxfeval.c | 13 +- + drivers/acpi/parser/psargs.c | 61 +++-- + drivers/acpi/parser/psloop.c | 59 +++- + drivers/acpi/parser/psopcode.c | 36 ++- + drivers/acpi/parser/psparse.c | 43 ++- + drivers/acpi/parser/pstree.c | 2 + + drivers/acpi/processor_idle.c | 4 + + drivers/acpi/resources/rscalc.c | 24 ++- + drivers/acpi/resources/rsdump.c | 8 +- + drivers/acpi/resources/rsio.c | 39 +++- + drivers/acpi/resources/rsirq.c | 43 +++- + drivers/acpi/resources/rsmisc.c | 11 + + drivers/acpi/resources/rsutils.c | 6 +- + drivers/acpi/scan.c | 43 +++- + drivers/acpi/tables/tbfind.c | 32 ++- + drivers/acpi/tables/tbinstal.c | 22 +- + drivers/acpi/tables/tbutils.c | 2 +- + drivers/acpi/tables/tbxface.c | 89 ++++++ + drivers/acpi/utilities/utalloc.c | 2 +- + drivers/acpi/utilities/utcopy.c | 59 ++++- + drivers/acpi/utilities/utdebug.c | 17 +- + drivers/acpi/utilities/utdelete.c | 21 ++- + drivers/acpi/utilities/utglobal.c | 47 +++- + drivers/acpi/utilities/utinit.c | 3 + + drivers/acpi/utilities/utmath.c | 2 +- + drivers/acpi/utilities/utmisc.c | 4 + + drivers/acpi/utilities/utobject.c | 6 +- + drivers/acpi/utilities/utxface.c | 40 ++-- + drivers/acpi/utils.c | 2 +- + include/acpi/acconfig.h | 13 +- + include/acpi/acdisasm.h | 36 ++- + include/acpi/acdispat.h | 29 +- + include/acpi/acglobal.h | 36 ++- + include/acpi/acinterp.h | 13 +- + include/acpi/aclocal.h | 8 +- + include/acpi/acmacros.h | 69 +++--- + include/acpi/acnamesp.h | 3 +- + include/acpi/acobject.h | 3 +- + include/acpi/acopcode.h | 4 +- + include/acpi/acparser.h | 2 + + include/acpi/acpixf.h | 5 + + include/acpi/acresrc.h | 1 + + include/acpi/acstruct.h | 3 + + include/acpi/actbl1.h | 559 +++++++++++++++++++++++++++++++++++- + include/acpi/actypes.h | 91 ++++--- + include/acpi/acutils.h | 2 + + kernel/power/Kconfig | 10 - + kernel/power/Makefile | 1 - + kernel/power/pm.c | 205 ------------- + 94 files changed, 3040 insertions(+), 1748 deletions(-) + delete mode 100644 kernel/power/pm.c +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Auto-merged Documentation/filesystems/nfs-rdma.txt +CONFLICT (add/add): Merge conflict in Documentation/filesystems/nfs-rdma.txt +Auto-merged fs/Kconfig +Auto-merged fs/lockd/host.c +Auto-merged fs/lockd/svc.c +Auto-merged fs/lockd/svclock.c +Auto-merged fs/locks.c +Auto-merged fs/nfsd/nfs4state.c +Auto-merged fs/nfsd/nfs4xdr.c +Auto-merged fs/nfsd/nfsctl.c +Auto-merged fs/nfsd/vfs.c +Auto-merged include/linux/nfsd/nfsd.h +Auto-merged include/net/ipv6.h +Auto-merged net/sunrpc/svc.c +Recorded preimage for 'Documentation/filesystems/nfs-rdma.txt' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + include/net/ipv6.h | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/firewire/fw-card.c | 2 +- + drivers/firewire/fw-sbp2.c | 2 +- + drivers/firewire/fw-topology.c | 12 ++++++++++++ + drivers/firewire/fw-transaction.h | 9 +++++++++ + 4 files changed, 23 insertions(+), 2 deletions(-) +Merging hwmon/testing +$ git merge hwmon/testing +Merge made by recursive. + Documentation/hwmon/w83l785ts | 3 +- + drivers/hwmon/adm1026.c | 22 ++++++--- + drivers/hwmon/adm1029.c | 30 ++++++++----- + drivers/hwmon/adm1031.c | 20 ++++++-- + drivers/hwmon/adm9240.c | 20 ++++++--- + drivers/hwmon/adt7470.c | 40 ++++++++++------- + drivers/hwmon/adt7473.c | 99 ++++++++++++++++++++++------------------ + drivers/hwmon/asb100.c | 20 +++++--- + drivers/hwmon/dme1737.c | 5 ++ + drivers/hwmon/f71805f.c | 5 ++ + drivers/hwmon/f71882fg.c | 5 ++ + drivers/hwmon/it87.c | 5 ++ + drivers/hwmon/lm75.c | 5 +-- + drivers/hwmon/pc87360.c | 6 +++ + drivers/hwmon/pc87427.c | 5 ++ + drivers/hwmon/sis5595.c | 5 ++ + drivers/hwmon/smsc47b397.c | 22 ++++++++- + drivers/hwmon/smsc47m1.c | 5 ++ + drivers/hwmon/via686a.c | 5 ++ + drivers/hwmon/vt1211.c | 5 ++ + drivers/hwmon/vt8231.c | 5 ++ + drivers/hwmon/w83627ehf.c | 6 +++ + drivers/hwmon/w83627hf.c | 5 ++ + drivers/hwmon/w83793.c | 26 ++++++----- + drivers/hwmon/w83l785ts.c | 4 +- + 25 files changed, 257 insertions(+), 121 deletions(-) +Merging ubi/master +$ git merge ubi/master +Merge made by recursive. +Merging kvm/master +$ git merge kvm/master +Merge made by recursive. + virt/kvm/kvm_main.c | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Already up-to-date. +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging tests/master +$ git merge tests/master +Renamed drivers/misc/lkdtm.c => tests/lkdtm.c +Auto-merged tests/lkdtm.c +Auto-merged Makefile +Auto-merged drivers/misc/Makefile +Auto-merged kernel/Makefile +Auto-merged lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merged lib/Makefile +Resolved 'lib/Kconfig.debug' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Makefile | 1 + + drivers/misc/Makefile | 1 - + kernel/Makefile | 4 - + lib/Kconfig.debug | 72 +-------------------- + lib/Makefile | 1 - + tests/Kconfig | 80 +++++++++++++++++++++++ + tests/Makefile | 10 +++ + {kernel => tests}/backtracetest.c | 0 + {drivers/misc => tests}/lkdtm.c | 12 ++-- + {lib => tests}/locking-selftest-hardirq.h | 0 + {lib => tests}/locking-selftest-mutex.h | 0 + {lib => tests}/locking-selftest-rlock-hardirq.h | 0 + {lib => tests}/locking-selftest-rlock-softirq.h | 0 + {lib => tests}/locking-selftest-rlock.h | 0 + {lib => tests}/locking-selftest-rsem.h | 0 + {lib => tests}/locking-selftest-softirq.h | 0 + {lib => tests}/locking-selftest-spin-hardirq.h | 0 + {lib => tests}/locking-selftest-spin-softirq.h | 0 + {lib => tests}/locking-selftest-spin.h | 0 + {lib => tests}/locking-selftest-wlock-hardirq.h | 0 + {lib => tests}/locking-selftest-wlock-softirq.h | 0 + {lib => tests}/locking-selftest-wlock.h | 0 + {lib => tests}/locking-selftest-wsem.h | 0 + {lib => tests}/locking-selftest.c | 0 + {kernel => tests}/rcutorture.c | 0 + {kernel => tests}/rtmutex-tester.c | 2 +- + {kernel => tests}/test_kprobes.c | 0 + 27 files changed, 100 insertions(+), 83 deletions(-) + create mode 100644 tests/Kconfig + create mode 100644 tests/Makefile + rename {kernel => tests}/backtracetest.c (100%) + rename {drivers/misc => tests}/lkdtm.c (96%) + rename {lib => tests}/locking-selftest-hardirq.h (100%) + rename {lib => tests}/locking-selftest-mutex.h (100%) + rename {lib => tests}/locking-selftest-rlock-hardirq.h (100%) + rename {lib => tests}/locking-selftest-rlock-softirq.h (100%) + rename {lib => tests}/locking-selftest-rlock.h (100%) + rename {lib => tests}/locking-selftest-rsem.h (100%) + rename {lib => tests}/locking-selftest-softirq.h (100%) + rename {lib => tests}/locking-selftest-spin-hardirq.h (100%) + rename {lib => tests}/locking-selftest-spin-softirq.h (100%) + rename {lib => tests}/locking-selftest-spin.h (100%) + rename {lib => tests}/locking-selftest-wlock-hardirq.h (100%) + rename {lib => tests}/locking-selftest-wlock-softirq.h (100%) + rename {lib => tests}/locking-selftest-wlock.h (100%) + rename {lib => tests}/locking-selftest-wsem.h (100%) + rename {lib => tests}/locking-selftest.c (100%) + rename {kernel => tests}/rcutorture.c (100%) + rename {kernel => tests}/rtmutex-tester.c (99%) + rename {kernel => tests}/test_kprobes.c (100%) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Merge made by recursive. + fs/ocfs2/cluster/sys.c | 2 +- + fs/ocfs2/dlm/dlmdebug.c | 8 +++++--- + fs/ocfs2/file.c | 4 ++++ + fs/ocfs2/localalloc.c | 4 ++-- + fs/ocfs2/stack_o2cb.c | 2 +- + fs/ocfs2/stack_user.c | 2 +- + fs/ocfs2/symlink.c | 2 ++ + 7 files changed, 16 insertions(+), 8 deletions(-) +Merging selinux/for-akpm +$ git merge selinux/for-akpm +Already up-to-date. +Merging quilt/m68k +$ git merge quilt/m68k +Auto-merged drivers/ide/legacy/macide.c +Auto-merged drivers/video/Kconfig +Merge made by recursive. + arch/m68k/Kconfig | 9 +- + arch/m68k/configs/amiga_defconfig | 130 ++-- + arch/m68k/configs/apollo_defconfig | 112 ++-- + arch/m68k/configs/atari_defconfig | 115 ++-- + arch/m68k/configs/bvme6000_defconfig | 112 ++-- + arch/m68k/configs/hp300_defconfig | 114 ++-- + arch/m68k/configs/mac_defconfig | 115 ++-- + arch/m68k/configs/multi_defconfig | 1255 ++++++++++++++++++++++++++++++++++ + arch/m68k/configs/mvme147_defconfig | 112 ++-- + arch/m68k/configs/mvme16x_defconfig | 112 ++-- + arch/m68k/configs/q40_defconfig | 131 ++-- + arch/m68k/configs/sun3_defconfig | 112 ++-- + arch/m68k/configs/sun3x_defconfig | 112 ++-- + arch/m68k/kernel/head.S | 2 +- + drivers/block/amiflop.c | 6 +- + drivers/block/z2ram.c | 2 +- + drivers/char/vme_scc.c | 4 +- + drivers/ide/legacy/macide.c | 3 + + drivers/input/misc/hp_sdc_rtc.c | 5 + + drivers/input/serio/hp_sdc.c | 1 + + drivers/input/serio/hp_sdc_mlc.c | 5 + + drivers/input/serio/q40kbd.c | 2 +- + drivers/net/82596.c | 7 + + drivers/net/apne.c | 3 + + drivers/net/mac89x0.c | 3 + + drivers/net/macmace.c | 3 + + drivers/net/sun3lance.c | 3 + + drivers/video/Kconfig | 4 +- + drivers/video/amifb.c | 4 +- + drivers/video/dnfb.c | 3 + + drivers/video/hpfb.c | 2 +- + include/asm-m68k/bug.h | 4 +- + include/asm-m68k/uaccess.h | 6 +- + 33 files changed, 2085 insertions(+), 528 deletions(-) + create mode 100644 arch/m68k/configs/multi_defconfig +Merging powerpc/powerpc-next +$ git merge powerpc/powerpc-next +Already up-to-date. +Merging hrt/mm +$ git merge hrt/mm +Merge made by recursive. + kernel/hrtimer.c | 15 +++++++++++++-- + 1 files changed, 13 insertions(+), 2 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging ext4/next +$ git merge ext4/next +Auto-merged arch/sparc/kernel/sparc_ksyms.c +Auto-merged arch/sparc64/mm/init.c +Auto-merged fs/ext4/ialloc.c +Auto-merged fs/ext4/inode.c +Auto-merged fs/ext4/ioctl.c +Auto-merged fs/ext4/xattr.c +Auto-merged fs/jbd2/journal.c +CONFLICT (content): Merge conflict in fs/jbd2/journal.c +Auto-merged fs/jbd2/revoke.c +CONFLICT (content): Merge conflict in fs/jbd2/revoke.c +Resolved 'fs/jbd2/journal.c' using previous resolution. +Resolved 'fs/jbd2/revoke.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + arch/arm/mm/mmu.c | 1 + + arch/m68k/mm/init.c | 1 + + arch/sparc/kernel/sparc_ksyms.c | 2 + + arch/sparc64/mm/init.c | 1 + + fs/ext4/balloc.c | 43 ++++-- + fs/ext4/dir.c | 2 +- + fs/ext4/ext4_jbd2.c | 12 +- + fs/ext4/extents.c | 308 ++++++++++++++++++++++++++++++--------- + fs/ext4/file.c | 21 +++- + fs/ext4/fsync.c | 3 + + fs/ext4/ialloc.c | 122 ++++++++++++++-- + fs/ext4/inode.c | 52 ++++--- + fs/ext4/ioctl.c | 12 +- + fs/ext4/mballoc.c | 83 +++++------ + fs/ext4/migrate.c | 39 +++++- + fs/ext4/namei.c | 37 +++-- + fs/ext4/resize.c | 76 +++++----- + fs/ext4/super.c | 79 +++++++++-- + fs/ext4/xattr.c | 32 ++-- + fs/ext4/xattr.h | 7 - + fs/jbd2/commit.c | 19 +-- + fs/jbd2/journal.c | 38 +++-- + fs/jbd2/revoke.c | 163 +++++++++------------ + fs/jbd2/transaction.c | 41 +++++- + include/linux/ext4_fs.h | 32 ++++- + include/linux/ext4_fs_sb.h | 3 + + 26 files changed, 817 insertions(+), 412 deletions(-) +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging net/master +$ git merge net/master +Already up-to-date. +Merging galak/powerpc-next +$ git merge galak/powerpc-next +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Removed include/linux/mtd/jedec.h +Merge made by recursive. + drivers/mtd/nand/at91_nand.c | 42 +++++++++++++------------- + include/linux/mtd/jedec.h | 66 ------------------------------------------ + 2 files changed, 21 insertions(+), 87 deletions(-) + delete mode 100644 include/linux/mtd/jedec.h +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +Merging vfs/vfs-2.6.25 +$ git merge vfs/vfs-2.6.25 +Auto-merged kernel/fork.c +Auto-merged virt/kvm/kvm_main.c +Merge made by recursive. + arch/alpha/kernel/osf_sys.c | 69 +--------- + arch/ia64/kernel/perfmon.c | 199 +++++++++++--------------- + arch/mips/kernel/irixioctl.c | 55 ++------ + arch/mips/kernel/kspd.c | 1 + + arch/powerpc/platforms/cell/spufs/coredump.c | 1 + + drivers/char/tty_audit.c | 1 + + drivers/char/tty_io.c | 1 + + fs/anon_inodes.c | 13 +-- + fs/compat.c | 1 + + fs/eventfd.c | 15 +-- + fs/eventpoll.c | 23 +-- + fs/exec.c | 1 + + fs/fcntl.c | 1 + + fs/file.c | 23 +++- + fs/file_table.c | 1 + + fs/locks.c | 1 + + fs/open.c | 1 + + fs/proc/array.c | 1 + + fs/proc/base.c | 1 + + fs/select.c | 3 +- + fs/signalfd.c | 17 +-- + fs/timerfd.c | 11 +- + include/linux/anon_inodes.h | 3 +- + include/linux/fdtable.h | 99 +++++++++++++ + include/linux/file.h | 86 +----------- + include/linux/init_task.h | 2 +- + include/linux/poll.h | 2 + + kernel/exit.c | 1 + + kernel/fork.c | 1 + + kernel/kmod.c | 1 + + security/selinux/hooks.c | 1 + + virt/kvm/kvm_main.c | 21 +-- + 32 files changed, 272 insertions(+), 385 deletions(-) + create mode 100644 include/linux/fdtable.h +Merging semaphore/semaphore +$ git merge semaphore/semaphore +Auto-merged Documentation/DocBook/kernel-locking.tmpl +CONFLICT (content): Merge conflict in Documentation/DocBook/kernel-locking.tmpl +Auto-merged drivers/input/misc/hp_sdc_rtc.c +Auto-merged drivers/input/serio/hp_sdc.c +Recorded preimage for 'Documentation/DocBook/kernel-locking.tmpl' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/kernel-locking.tmpl | 57 ++++++++++++----------------- + drivers/input/keyboard/hil_kbd.c | 2 +- + drivers/input/misc/hp_sdc_rtc.c | 1 + + drivers/input/serio/hp_sdc.c | 1 + + include/asm-alpha/semaphore.h | 1 + + include/asm-arm/semaphore.h | 1 + + include/asm-avr32/semaphore.h | 1 + + include/asm-blackfin/semaphore.h | 1 + + include/asm-cris/semaphore.h | 1 + + include/asm-frv/semaphore.h | 1 + + include/asm-h8300/semaphore.h | 1 + + include/asm-ia64/semaphore.h | 1 + + include/asm-m32r/semaphore.h | 1 + + include/asm-m68k/semaphore.h | 1 + + include/asm-m68knommu/semaphore.h | 1 + + include/asm-mips/semaphore.h | 1 + + include/asm-mn10300/semaphore.h | 1 + + include/asm-parisc/semaphore.h | 1 + + include/asm-powerpc/semaphore.h | 1 + + include/asm-s390/semaphore.h | 1 + + include/asm-sh/semaphore.h | 1 + + include/asm-sparc/semaphore.h | 1 + + include/asm-sparc64/semaphore.h | 1 + + include/asm-um/semaphore.h | 1 + + include/asm-v850/semaphore.h | 1 + + include/asm-x86/semaphore.h | 1 + + include/asm-xtensa/semaphore.h | 1 + + include/linux/semaphore.h | 6 +-- + 28 files changed, 52 insertions(+), 38 deletions(-) +Merging semaphore-removal/semaphore-removal +$ git merge semaphore-removal/semaphore-removal +Auto-merged drivers/scsi/qla2xxx/qla_attr.c +Auto-merged drivers/scsi/qla2xxx/qla_mbx.c +Auto-merged drivers/scsi/qla2xxx/qla_os.c +Merge made by recursive. + arch/arm/mach-lh7a40x/clocks.c | 15 +++++++------ + drivers/atm/ambassador.c | 19 ++++++++------- + drivers/atm/ambassador.h | 2 +- + drivers/net/bonding/bond_main.c | 21 +++++++++-------- + drivers/net/bonding/bond_sysfs.c | 17 +++++++------- + drivers/net/ppp_async.c | 8 +++--- + drivers/net/ps3_gelic_net.c | 11 +++++---- + drivers/net/ps3_gelic_net.h | 2 +- + drivers/net/ps3_gelic_wireless.c | 41 ++++++++++++++++++----------------- + drivers/net/ps3_gelic_wireless.h | 4 +- + drivers/pci/hotplug/ibmphp_hpc.c | 30 ++++++++++++------------- + drivers/scsi/qla2xxx/qla_attr.c | 4 +- + drivers/scsi/qla2xxx/qla_def.h | 3 +- + drivers/scsi/qla2xxx/qla_mbx.c | 4 +- + drivers/scsi/qla2xxx/qla_mid.c | 18 +++++++------- + drivers/scsi/qla2xxx/qla_os.c | 14 +++++++----- + include/net/bluetooth/hci_core.h | 7 +++-- + net/9p/trans_virtio.c | 44 +++++++++++++++++++------------------ + net/bluetooth/hci_core.c | 2 +- + sound/soc/s3c24xx/s3c2443-ac97.c | 11 +++++---- + 20 files changed, 143 insertions(+), 134 deletions(-) +Applying idr.h-needs-spinlock.h +Merging x86-latest/latest +$ git merge x86-latest/latest +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/entry_32.S +Auto-merged arch/x86/kernel/entry_64.S +Auto-merged arch/x86/kernel/process_32.c +Auto-merged arch/x86/kernel/process_64.c +Auto-merged arch/x86/kernel/reboot.c +Auto-merged arch/x86/kernel/setup_64.c +Auto-merged arch/x86/kernel/traps_32.c +Auto-merged arch/x86/kernel/traps_64.c +Auto-merged drivers/base/core.c +Auto-merged drivers/base/power/trace.c +Auto-merged include/asm-x86/reboot.h +CONFLICT (content): Merge conflict in include/asm-x86/reboot.h +Auto-merged include/linux/ide.h +Auto-merged include/linux/pci.h +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/fork.c +Auto-merged kernel/printk.c +Auto-merged kernel/sysctl.c +Auto-merged lib/Kconfig.debug +Recorded preimage for 'include/asm-x86/reboot.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/sysfs-pci.txt | 1 + + Documentation/kernel-parameters.txt | 2 + + Documentation/kmemcheck.txt | 101 +++ + MAINTAINERS | 5 + + arch/avr32/kernel/vmlinux.lds.S | 2 - + arch/parisc/kernel/vmlinux.lds.S | 1 - + arch/powerpc/kernel/vmlinux.lds.S | 2 - + arch/s390/kernel/vmlinux.lds.S | 1 - + arch/sh/kernel/vmlinux_32.lds.S | 1 - + arch/sh/kernel/vmlinux_64.lds.S | 1 - + arch/um/Kconfig | 50 +- + arch/um/Kconfig.char | 6 +- + arch/um/Kconfig.i386 | 9 +- + arch/x86/Kconfig | 61 +-- + arch/x86/Kconfig.cpu | 24 +- + arch/x86/Kconfig.debug | 65 ++ + arch/x86/Makefile | 6 +- + arch/x86/Makefile_32.cpu | 3 +- + arch/x86/configs/i386_defconfig | 1 + + arch/x86/configs/x86_64_defconfig | 1 + + arch/x86/kernel/Makefile | 5 + + arch/x86/kernel/acpi/boot.c | 70 ++ + arch/x86/kernel/aperture_64.c | 283 ++++++--- + arch/x86/kernel/apic_32.c | 18 +- + arch/x86/kernel/cpu/common.c | 9 +- + arch/x86/kernel/cpu/intel.c | 3 +- + arch/x86/kernel/ds.c | 953 ++++++++++++++++++++-------- + arch/x86/kernel/early_printk.c | 2 +- + arch/x86/kernel/entry_32.S | 8 +- + arch/x86/kernel/entry_64.S | 8 +- + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/i8259_64.c | 30 +- + arch/x86/kernel/io_apic_32.c | 8 +- + arch/x86/kernel/io_apic_64.c | 6 +- + arch/x86/kernel/irq_32.c | 38 ++ + arch/x86/kernel/irq_64.c | 28 + + arch/x86/kernel/kmemcheck.c | 924 +++++++++++++++++++++++++++ + arch/x86/kernel/ldt.c | 6 +- + arch/x86/kernel/mfgpt_32.c | 8 +- + arch/x86/kernel/mmconf-fam10h_64.c | 243 +++++++ + arch/x86/kernel/pci-dma.c | 11 +- + arch/x86/kernel/pci-gart_64.c | 23 +- + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/process_32.c | 54 ++- + arch/x86/kernel/process_64.c | 50 ++- + arch/x86/kernel/ptrace.c | 444 ++++++++----- + arch/x86/kernel/reboot.c | 18 +- + arch/x86/kernel/reboot_fixups_32.c | 4 +- + arch/x86/kernel/setup_64.c | 23 +- + arch/x86/kernel/smpboot.c | 19 +- + arch/x86/kernel/traps_32.c | 18 +- + arch/x86/kernel/traps_64.c | 24 +- + arch/x86/kernel/vm86_32.c | 7 +- + arch/x86/kernel/vmlinux_32.lds.S | 16 +- + arch/x86/kernel/vmlinux_64.lds.S | 17 +- + arch/x86/kernel/vsmp_64.c | 2 +- + arch/x86/mach-voyager/voyager_smp.c | 24 +- + arch/x86/mm/fault.c | 32 +- + arch/x86/mm/highmem_32.c | 1 - + arch/x86/mm/init_32.c | 15 - + arch/x86/mm/init_64.c | 5 +- + arch/x86/mm/k8topology_64.c | 38 ++- + arch/x86/pci/Makefile_32 | 1 + + arch/x86/pci/Makefile_64 | 2 +- + arch/x86/pci/acpi.c | 81 +-- + arch/x86/pci/common.c | 76 ++- + arch/x86/pci/direct.c | 8 +- + arch/x86/pci/fixup.c | 17 + + arch/x86/pci/init.c | 17 +- + arch/x86/pci/irq.c | 4 +- + arch/x86/pci/k8-bus_64.c | 575 +++++++++++++++-- + arch/x86/pci/legacy.c | 4 +- + arch/x86/pci/mmconfig-shared.c | 247 ++++++- + arch/x86/pci/mmconfig_32.c | 4 + + arch/x86/pci/mmconfig_64.c | 22 +- + arch/x86/pci/mp_bus_to_node.c | 23 + + arch/x86/pci/pci.h | 6 +- + arch/x86/video/fbdev.c | 2 + + drivers/acpi/bus.c | 2 + + drivers/base/core.c | 14 +- + drivers/base/power/trace.c | 2 +- + drivers/char/agp/amd64-agp.c | 77 +-- + drivers/input/misc/pcspkr.c | 16 +- + drivers/pci/pci-sysfs.c | 84 ++- + drivers/pci/probe.c | 21 +- + drivers/video/geode/display_gx.h | 1 - + drivers/video/geode/gxfb_core.c | 3 +- + drivers/video/geode/lxfb.h | 8 - + drivers/video/geode/lxfb_ops.c | 19 +- + drivers/video/geode/video_gx.c | 5 +- + drivers/video/geode/video_gx.h | 3 - + fs/proc/proc_misc.c | 9 + + include/asm-generic/siginfo.h | 8 + + include/asm-generic/vmlinux.lds.h | 21 + + include/asm-x86/desc.h | 22 + + include/asm-x86/ds.h | 258 ++++++-- + include/asm-x86/fixmap_32.h | 8 +- + include/asm-x86/gart.h | 38 ++ + include/asm-x86/geode.h | 16 +- + include/asm-x86/hardirq.h | 6 + + include/asm-x86/hw_irq_64.h | 3 +- + include/asm-x86/i8253.h | 31 +- + include/asm-x86/irq_64.h | 8 +- + include/asm-x86/kdebug.h | 3 +- + include/asm-x86/kmemcheck.h | 30 + + include/asm-x86/mach-default/irq_vectors.h | 1 - + include/asm-x86/mach-visws/irq_vectors.h | 1 - + include/asm-x86/pci.h | 2 + + include/asm-x86/pda.h | 2 - + include/asm-x86/pgalloc.h | 32 +- + include/asm-x86/pgtable.h | 33 +- + include/asm-x86/pgtable_32.h | 6 + + include/asm-x86/processor.h | 15 +- + include/asm-x86/ptrace-abi.h | 14 +- + include/asm-x86/ptrace.h | 38 +- + include/asm-x86/reboot.h | 2 +- + include/asm-x86/required-features.h | 6 +- + include/asm-x86/resume-trace.h | 2 +- + include/asm-x86/stackprotector.h | 38 ++ + include/asm-x86/string_32.h | 313 ++++++---- + include/asm-x86/string_64.h | 1 + + include/asm-x86/system.h | 115 ++-- + include/asm-x86/topology.h | 16 + + include/linux/acpi.h | 5 + + include/linux/fs.h | 4 +- + include/linux/gfp.h | 3 +- + include/linux/ide.h | 3 +- + include/linux/kernel.h | 2 +- + include/linux/kernel_stat.h | 2 +- + include/linux/kmemcheck.h | 29 + + include/linux/magic.h | 1 + + include/linux/netdevice.h | 4 +- + include/linux/pci.h | 12 +- + include/linux/pci_ids.h | 2 + + include/linux/percpu.h | 7 + + include/linux/resume-trace.h | 2 +- + include/linux/sched.h | 3 +- + include/linux/skbuff.h | 3 +- + include/linux/slab.h | 7 + + include/linux/slub_kmemcheck.h | 21 + + include/linux/stackprotector.h | 16 + + include/net/inet_sock.h | 3 +- + include/net/tcp.h | 11 + + init/do_mounts.c | 8 +- + init/main.c | 9 + + kernel/fork.c | 20 +- + kernel/panic.c | 77 +++- + kernel/printk.c | 2 +- + kernel/signal.c | 12 + + kernel/sysctl.c | 12 + + lib/Kconfig.debug | 1 - + localversion-x86-latest.git | 1 + + mm/Makefile | 3 + + mm/slub.c | 25 +- + mm/slub_kmemcheck.c | 100 +++ + net/core/skbuff.c | 19 +- + 156 files changed, 5289 insertions(+), 1424 deletions(-) + create mode 100644 Documentation/kmemcheck.txt + create mode 100644 arch/x86/kernel/kmemcheck.c + create mode 100644 arch/x86/kernel/mmconf-fam10h_64.c + create mode 100644 arch/x86/pci/mp_bus_to_node.c + create mode 100644 include/asm-x86/kmemcheck.h + create mode 100644 include/asm-x86/stackprotector.h + create mode 100644 include/linux/kmemcheck.h + create mode 100644 include/linux/slub_kmemcheck.h + create mode 100644 include/linux/stackprotector.h + create mode 100644 localversion-x86-latest.git + create mode 100644 mm/slub_kmemcheck.c +Merging sched-latest/latest +$ git merge sched-latest/latest +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged arch/powerpc/Kconfig +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/e820_64.c +CONFLICT (content): Merge conflict in arch/x86/kernel/e820_64.c +Auto-merged arch/x86/kernel/entry_32.S +Auto-merged arch/x86/kernel/entry_64.S +Auto-merged arch/x86/kernel/process_32.c +Auto-merged arch/x86/kernel/process_64.c +Auto-merged arch/x86/kernel/reboot.c +Auto-merged arch/x86/kernel/setup_64.c +Auto-merged arch/x86/kernel/traps_32.c +Auto-merged arch/x86/kernel/traps_64.c +Auto-merged arch/x86/kernel/vmlinux_32.lds.S +Auto-merged arch/x86/kernel/vmlinux_64.lds.S +Auto-merged arch/x86/kvm/x86.c +Auto-merged arch/x86/mm/fault.c +CONFLICT (content): Merge conflict in arch/x86/mm/fault.c +Auto-merged arch/x86/mm/init_32.c +Auto-merged arch/x86/mm/init_64.c +CONFLICT (content): Merge conflict in arch/x86/mm/init_64.c +Auto-merged arch/x86/mm/numa_64.c +CONFLICT (content): Merge conflict in arch/x86/mm/numa_64.c +Auto-merged arch/x86/pci/k8-bus_64.c +CONFLICT (content): Merge conflict in arch/x86/pci/k8-bus_64.c +Auto-merged arch/x86/pci/mmconfig-shared.c +CONFLICT (content): Merge conflict in arch/x86/pci/mmconfig-shared.c +Auto-merged drivers/base/core.c +Auto-merged drivers/base/power/trace.c +Auto-merged drivers/pci/pci-driver.c +Auto-merged fs/compat.c +Auto-merged fs/exec.c +Auto-merged fs/open.c +Auto-merged fs/select.c +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged include/asm-x86/kdebug.h +Auto-merged include/asm-x86/processor.h +Auto-merged include/asm-x86/reboot.h +CONFLICT (content): Merge conflict in include/asm-x86/reboot.h +Auto-merged include/linux/ide.h +Auto-merged include/linux/kernel.h +Auto-merged include/linux/pci.h +Auto-merged include/linux/sched.h +Auto-merged init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merged kernel/Makefile +Auto-merged kernel/exit.c +Auto-merged kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merged kernel/printk.c +Auto-merged kernel/signal.c +Auto-merged kernel/sysctl.c +Auto-merged lib/Kconfig.debug +Auto-merged mm/bootmem.c +CONFLICT (content): Merge conflict in mm/bootmem.c +Recorded preimage for 'arch/x86/kernel/e820_64.c' +Recorded preimage for 'arch/x86/mm/fault.c' +Recorded preimage for 'arch/x86/mm/init_64.c' +Recorded preimage for 'arch/x86/mm/numa_64.c' +Recorded preimage for 'arch/x86/pci/k8-bus_64.c' +Recorded preimage for 'arch/x86/pci/mmconfig-shared.c' +Recorded preimage for 'include/asm-x86/reboot.h' +Recorded preimage for 'init/main.c' +Recorded preimage for 'kernel/fork.c' +Recorded preimage for 'mm/bootmem.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Documentation/RCU/NMI-RCU.txt | 3 + + Documentation/RCU/RTFP.txt | 108 ++++ + Documentation/RCU/checklist.txt | 89 ++- + Documentation/RCU/whatisRCU.txt | 58 ++- + Documentation/immediate.txt | 221 ++++++++ + Documentation/kernel-parameters.txt | 3 + + Documentation/markers.txt | 17 +- + Documentation/tracers/mmiotrace.txt | 153 +++++ + arch/alpha/kernel/irq.c | 2 +- + arch/ia64/kernel/kprobes.c | 2 - + arch/ia64/sn/kernel/irq.c | 1 + + arch/powerpc/Kconfig | 1 + + arch/powerpc/kernel/Makefile | 1 + + arch/powerpc/kernel/immediate.c | 70 +++ + arch/powerpc/kernel/kprobes.c | 2 - + arch/s390/kernel/kprobes.c | 2 - + arch/x86/Kconfig | 1 + + arch/x86/Kconfig.debug | 28 + + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/alternative.c | 18 +- + arch/x86/kernel/asm-offsets_32.c | 1 + + arch/x86/kernel/asm-offsets_64.c | 1 + + arch/x86/kernel/entry_32.S | 30 + + arch/x86/kernel/entry_64.S | 34 +- + arch/x86/kernel/ftrace.c | 4 +- + arch/x86/kernel/immediate.c | 559 ++++++++++++++++++ + arch/x86/kernel/kprobes.c | 2 - + arch/x86/kernel/paravirt.c | 3 + + arch/x86/kernel/paravirt_patch_32.c | 6 +- + arch/x86/kernel/paravirt_patch_64.c | 6 +- + arch/x86/kernel/traps_32.c | 11 +- + arch/x86/kernel/traps_64.c | 4 + + arch/x86/kernel/vmi_32.c | 2 + + arch/x86/kernel/vmlinux_32.lds.S | 1 + + arch/x86/kernel/vmlinux_64.lds.S | 1 + + arch/x86/kvm/x86.c | 2 +- + arch/x86/lguest/boot.c | 1 + + arch/x86/mm/Makefile | 5 + + arch/x86/mm/fault.c | 17 +- + arch/x86/mm/init_32.c | 4 + + arch/x86/mm/init_64.c | 10 +- + arch/x86/mm/ioremap.c | 9 +- + arch/x86/mm/kmmio.c | 500 +++++++++++++++++ + arch/x86/mm/mmio-mod.c | 514 +++++++++++++++++ + arch/x86/mm/pageattr.c | 1 + + arch/x86/mm/pf_in.c | 489 ++++++++++++++++ + arch/x86/mm/pf_in.h | 39 ++ + arch/x86/mm/testmmiotrace.c | 71 +++ + arch/x86/xen/enlighten.c | 1 + + crypto/async_tx/async_tx.c | 1 + + drivers/base/cpu.c | 2 + + drivers/infiniband/hw/ipath/ipath_verbs.c | 1 + + drivers/infiniband/hw/ipath/ipath_verbs_mcast.c | 3 +- + drivers/net/macvlan.c | 2 +- + drivers/pci/pci-driver.c | 2 +- + fs/buffer.c | 3 + + fs/compat.c | 2 + + fs/exec.c | 2 + + fs/ioctl.c | 3 + + fs/open.c | 3 + + fs/read_write.c | 23 +- + fs/select.c | 5 + + include/asm-alpha/thread_info.h | 2 +- + include/asm-avr32/thread_info.h | 2 +- + include/asm-generic/vmlinux.lds.h | 5 +- + include/asm-powerpc/cacheflush.h | 4 +- + include/asm-powerpc/immediate.h | 75 +++ + include/asm-x86/immediate.h | 145 +++++ + include/asm-x86/irqflags.h | 56 ++ + include/asm-x86/kdebug.h | 12 + + include/asm-x86/kprobes.h | 9 - + include/asm-x86/paravirt.h | 7 +- + include/linux/bottom_half.h | 2 - + include/linux/cpumask.h | 5 + + include/linux/cpuset.h | 2 + + include/linux/dcache.h | 1 + + include/linux/hardirq.h | 27 +- + include/linux/immediate.h | 93 +++ + include/linux/irq.h | 7 - + include/linux/kernel.h | 6 - + include/linux/kprobes.h | 2 - + include/linux/list.h | 367 ------------ + include/linux/marker.h | 54 ++- + include/linux/memory.h | 7 + + include/linux/mmiotrace.h | 89 +++ + include/linux/module.h | 17 + + include/linux/profile.h | 5 +- + include/linux/rcuclassic.h | 3 + + include/linux/rculist.h | 373 ++++++++++++ + include/linux/rcupdate.h | 24 + + include/linux/rcupreempt.h | 42 ++- + include/linux/sched.h | 74 +-- + include/linux/stop_machine.h | 8 +- + include/linux/stringify.h | 5 + + include/linux/swapops.h | 8 + + include/linux/writeback.h | 2 + + init/Kconfig | 18 + + init/main.c | 10 + + ipc/msg.c | 6 +- + ipc/sem.c | 6 +- + ipc/shm.c | 6 +- + kernel/Makefile | 2 + + kernel/cpuset.c | 115 ++++- + kernel/exit.c | 8 + + kernel/fork.c | 5 + + kernel/immediate.c | 109 ++++ + kernel/irq/handle.c | 7 + + kernel/irq/manage.c | 65 +++ + kernel/itimer.c | 13 + + kernel/kprobes.c | 46 ++- + kernel/kthread.c | 55 ++- + kernel/lockdep.c | 23 + + kernel/marker.c | 40 +- + kernel/module.c | 60 ++- + kernel/pid.c | 1 + + kernel/printk.c | 103 ++-- + kernel/profile.c | 22 +- + kernel/rcuclassic.c | 30 +- + kernel/rcupdate.c | 71 ++- + kernel/rcupreempt.c | 416 ++++++++++++-- + kernel/sched.c | 174 ++++--- + kernel/sched_cpupri.c | 174 ++++++ + kernel/sched_cpupri.h | 36 ++ + kernel/sched_debug.c | 95 ++-- + kernel/sched_fair.c | 685 +++++++++++++++++------ + kernel/sched_features.h | 7 +- + kernel/sched_idletask.c | 2 +- + kernel/sched_rt.c | 124 ++--- + kernel/signal.c | 3 + + kernel/softirq.c | 27 +- + kernel/softlockup.c | 23 +- + kernel/stop_machine.c | 32 +- + kernel/sysctl.c | 11 + + kernel/time/tick-sched.c | 11 +- + kernel/timer.c | 13 +- + kernel/trace/Makefile | 1 + + kernel/trace/ftrace.c | 21 +- + kernel/trace/trace.c | 590 ++++++++++++++++---- + kernel/trace/trace.h | 69 ++- + kernel/trace/trace_functions.c | 2 + + kernel/trace/trace_mmiotrace.c | 220 ++++++++ + kernel/trace/trace_sched_switch.c | 174 +++++- + kernel/trace/trace_sched_wakeup.c | 106 ++++- + kernel/trace/trace_selftest.c | 16 +- + lib/Kconfig.debug | 26 +- + lib/textsearch.c | 1 + + localversion-sched-devel.git | 1 + + mm/filemap.c | 7 + + mm/hugetlb.c | 3 + + mm/memory.c | 75 +++- + mm/page-writeback.c | 10 +- + mm/page_alloc.c | 9 + + mm/page_io.c | 6 + + mm/swapfile.c | 23 + + net/802/psnap.c | 1 + + net/8021q/vlan.c | 1 + + net/bridge/br_fdb.c | 1 + + net/bridge/br_stp.c | 1 + + net/core/dev.c | 6 + + net/ipv4/devinet.c | 6 + + net/netlabel/netlabel_domainhash.c | 3 +- + net/socket.c | 19 + + tests/rcutorture.c | 34 +- + 163 files changed, 7505 insertions(+), 1282 deletions(-) + create mode 100644 Documentation/immediate.txt + create mode 100644 Documentation/tracers/mmiotrace.txt + create mode 100644 arch/powerpc/kernel/immediate.c + create mode 100644 arch/x86/kernel/immediate.c + create mode 100644 arch/x86/mm/kmmio.c + create mode 100644 arch/x86/mm/mmio-mod.c + create mode 100644 arch/x86/mm/pf_in.c + create mode 100644 arch/x86/mm/pf_in.h + create mode 100644 arch/x86/mm/testmmiotrace.c + create mode 100644 include/asm-powerpc/immediate.h + create mode 100644 include/asm-x86/immediate.h + create mode 100644 include/linux/immediate.h + create mode 100644 include/linux/mmiotrace.h + create mode 100644 include/linux/rculist.h + create mode 100644 kernel/immediate.c + create mode 100644 kernel/sched_cpupri.c + create mode 100644 kernel/sched_cpupri.h + create mode 100644 kernel/trace/trace_mmiotrace.c + create mode 100644 localversion-sched-devel.git +Merging quilt/ldp +$ git merge quilt/ldp +Auto-merged drivers/hid/usbhid/hid-quirks.c +Auto-merged drivers/media/dvb/Kconfig +Auto-merged drivers/media/video/Kconfig +Auto-merged drivers/media/video/Makefile +Auto-merged drivers/misc/Makefile +Auto-merged drivers/net/Kconfig +Merge made by recursive. + drivers/hid/usbhid/hid-quirks.c | 2 + + drivers/input/misc/Kconfig | 12 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/appleir.c | 360 + + drivers/media/dvb/Kconfig | 2 + + drivers/media/dvb/Makefile | 2 +- + drivers/media/dvb/firesat/Kconfig | 11 + + drivers/media/dvb/firesat/Makefile | 12 + + drivers/media/dvb/firesat/avc_api.c | 813 + + drivers/media/dvb/firesat/avc_api.h | 380 + + drivers/media/dvb/firesat/cmp.c | 230 + + drivers/media/dvb/firesat/cmp.h | 9 + + drivers/media/dvb/firesat/firesat-ci.c | 95 + + drivers/media/dvb/firesat/firesat-ci.h | 9 + + drivers/media/dvb/firesat/firesat-rc.c | 82 + + drivers/media/dvb/firesat/firesat-rc.h | 9 + + drivers/media/dvb/firesat/firesat.h | 85 + + drivers/media/dvb/firesat/firesat_1394.c | 468 + + drivers/media/dvb/firesat/firesat_dvb.c | 327 + + drivers/media/dvb/firesat/firesat_fe.c | 263 + + drivers/media/video/Kconfig | 1 + + drivers/media/video/Makefile | 2 + + drivers/media/video/go7007/Kconfig | 14 + + drivers/media/video/go7007/Makefile | 17 + + drivers/media/video/go7007/go7007-driver.c | 693 + + drivers/media/video/go7007/go7007-fw.c | 1643 ++ + drivers/media/video/go7007/go7007-i2c.c | 309 + + drivers/media/video/go7007/go7007-priv.h | 279 + + drivers/media/video/go7007/go7007-usb.c | 1229 + + drivers/media/video/go7007/go7007-v4l2.c | 1516 + + drivers/media/video/go7007/go7007.h | 120 + + drivers/media/video/go7007/saa7134-go7007.c | 484 + + drivers/media/video/go7007/snd-go7007.c | 315 + + drivers/media/video/go7007/wis-i2c.h | 55 + + drivers/media/video/go7007/wis-ov7640.c | 146 + + drivers/media/video/go7007/wis-saa7113.c | 378 + + drivers/media/video/go7007/wis-saa7115.c | 507 + + drivers/media/video/go7007/wis-sony-tuner.c | 757 + + drivers/media/video/go7007/wis-tw2804.c | 383 + + drivers/media/video/go7007/wis-tw9903.c | 378 + + drivers/media/video/go7007/wis-uda1342.c | 136 + + drivers/misc/Kconfig | 13 + + drivers/misc/Makefile | 2 + + drivers/misc/aectc/Makefile | 1 + + drivers/misc/aectc/aec_tc.c | 349 + + drivers/misc/aectc/aectc.h | 18 + + drivers/misc/aectc/read.c | 63 + + drivers/misc/aectc/write.c | 64 + + drivers/misc/me4000.c | 5435 ++++ + drivers/misc/me4000.h | 1014 + + drivers/misc/xilinx_firm.h |15416 ++++++++++ + drivers/net/Kconfig | 32 + + drivers/net/Makefile | 2 + + drivers/net/et131x/MODULE-PARAMETER.txt | 36 + + drivers/net/et131x/Makefile | 18 + + drivers/net/et131x/et1310_address_map.h | 2399 ++ + drivers/net/et131x/et1310_eeprom.c | 480 + + drivers/net/et131x/et1310_eeprom.h | 89 + + drivers/net/et131x/et1310_jagcore.c | 222 + + drivers/net/et131x/et1310_jagcore.h | 112 + + drivers/net/et131x/et1310_mac.c | 800 + + drivers/net/et131x/et1310_mac.h | 93 + + drivers/net/et131x/et1310_phy.c | 1297 + + drivers/net/et131x/et1310_phy.h | 910 + + drivers/net/et131x/et1310_pm.c | 209 + + drivers/net/et131x/et1310_pm.h | 126 + + drivers/net/et131x/et1310_rx.c | 1401 + + drivers/net/et131x/et1310_rx.h | 373 + + drivers/net/et131x/et1310_tx.c | 1541 + + drivers/net/et131x/et1310_tx.h | 242 + + drivers/net/et131x/et131x_adapter.h | 347 + + drivers/net/et131x/et131x_config.c | 312 + + drivers/net/et131x/et131x_config.h | 67 + + drivers/net/et131x/et131x_debug.c | 218 + + drivers/net/et131x/et131x_debug.h | 202 + + drivers/net/et131x/et131x_defs.h | 128 + + drivers/net/et131x/et131x_initpci.c | 1047 + + drivers/net/et131x/et131x_initpci.h | 73 + + drivers/net/et131x/et131x_isr.c | 492 + + drivers/net/et131x/et131x_isr.h | 65 + + drivers/net/et131x/et131x_netdev.c | 868 + + drivers/net/et131x/et131x_netdev.h | 64 + + drivers/net/et131x/et131x_version.h | 86 + + drivers/net/slicoss/Makefile | 1 + + drivers/net/slicoss/gbdownload.h | 8215 ++++++ + drivers/net/slicoss/gbrcvucode.h | 239 + + drivers/net/slicoss/oasisdbgdownload.h | 6850 +++++ + drivers/net/slicoss/oasisdownload.h | 6848 +++++ + drivers/net/slicoss/oasisrcvucode.h | 205 + + drivers/net/slicoss/slic.h | 619 + + drivers/net/slicoss/slic_os.h | 150 + + drivers/net/slicoss/slicbuild.h | 97 + + drivers/net/slicoss/slicdbg.h | 100 + + drivers/net/slicoss/slicdump.h | 282 + + drivers/net/slicoss/slichw.h | 855 + + drivers/net/slicoss/slicinc.h | 215 + + drivers/net/slicoss/slicoss.c | 6160 ++++ + drivers/net/usb/Kconfig | 10 + + drivers/net/usb/Makefile | 1 + + drivers/net/usb/hso.c | 3153 +++ + drivers/usb/image/Kconfig | 9 + + drivers/usb/image/Makefile | 1 + + drivers/usb/image/f2255usb.h |40334 +++++++++++++++++++++++++++ + drivers/usb/image/s2255drv.c | 2802 ++ + fs/Kconfig | 9 + + fs/Makefile | 1 + + fs/novfs/Makefile | 19 + + fs/novfs/commands.h | 1089 + + fs/novfs/daemon.c | 2444 ++ + fs/novfs/file.c | 2225 ++ + fs/novfs/inode.c | 5634 ++++ + fs/novfs/nwcapi.c | 2537 ++ + fs/novfs/nwcapi.h | 2213 ++ + fs/novfs/nwerror.h | 658 + + fs/novfs/proc.c | 152 + + fs/novfs/profile.c | 687 + + fs/novfs/scope.c | 738 + + fs/novfs/vfs.h | 447 + + 118 files changed, 145258 insertions(+), 1 deletions(-) + create mode 100644 drivers/input/misc/appleir.c + create mode 100644 drivers/media/dvb/firesat/Kconfig + create mode 100644 drivers/media/dvb/firesat/Makefile + create mode 100644 drivers/media/dvb/firesat/avc_api.c + create mode 100644 drivers/media/dvb/firesat/avc_api.h + create mode 100644 drivers/media/dvb/firesat/cmp.c + create mode 100644 drivers/media/dvb/firesat/cmp.h + create mode 100644 drivers/media/dvb/firesat/firesat-ci.c + create mode 100644 drivers/media/dvb/firesat/firesat-ci.h + create mode 100644 drivers/media/dvb/firesat/firesat-rc.c + create mode 100644 drivers/media/dvb/firesat/firesat-rc.h + create mode 100644 drivers/media/dvb/firesat/firesat.h + create mode 100644 drivers/media/dvb/firesat/firesat_1394.c + create mode 100644 drivers/media/dvb/firesat/firesat_dvb.c + create mode 100644 drivers/media/dvb/firesat/firesat_fe.c + create mode 100644 drivers/media/video/go7007/Kconfig + create mode 100644 drivers/media/video/go7007/Makefile + create mode 100644 drivers/media/video/go7007/go7007-driver.c + create mode 100644 drivers/media/video/go7007/go7007-fw.c + create mode 100644 drivers/media/video/go7007/go7007-i2c.c + create mode 100644 drivers/media/video/go7007/go7007-priv.h + create mode 100644 drivers/media/video/go7007/go7007-usb.c + create mode 100644 drivers/media/video/go7007/go7007-v4l2.c + create mode 100644 drivers/media/video/go7007/go7007.h + create mode 100644 drivers/media/video/go7007/saa7134-go7007.c + create mode 100644 drivers/media/video/go7007/snd-go7007.c + create mode 100644 drivers/media/video/go7007/wis-i2c.h + create mode 100644 drivers/media/video/go7007/wis-ov7640.c + create mode 100644 drivers/media/video/go7007/wis-saa7113.c + create mode 100644 drivers/media/video/go7007/wis-saa7115.c + create mode 100644 drivers/media/video/go7007/wis-sony-tuner.c + create mode 100644 drivers/media/video/go7007/wis-tw2804.c + create mode 100644 drivers/media/video/go7007/wis-tw9903.c + create mode 100644 drivers/media/video/go7007/wis-uda1342.c + create mode 100644 drivers/misc/aectc/Makefile + create mode 100644 drivers/misc/aectc/aec_tc.c + create mode 100644 drivers/misc/aectc/aectc.h + create mode 100644 drivers/misc/aectc/read.c + create mode 100644 drivers/misc/aectc/write.c + create mode 100644 drivers/misc/me4000.c + create mode 100644 drivers/misc/me4000.h + create mode 100644 drivers/misc/xilinx_firm.h + create mode 100644 drivers/net/et131x/MODULE-PARAMETER.txt + create mode 100644 drivers/net/et131x/Makefile + create mode 100644 drivers/net/et131x/et1310_address_map.h + create mode 100644 drivers/net/et131x/et1310_eeprom.c + create mode 100644 drivers/net/et131x/et1310_eeprom.h + create mode 100644 drivers/net/et131x/et1310_jagcore.c + create mode 100644 drivers/net/et131x/et1310_jagcore.h + create mode 100644 drivers/net/et131x/et1310_mac.c + create mode 100644 drivers/net/et131x/et1310_mac.h + create mode 100644 drivers/net/et131x/et1310_phy.c + create mode 100644 drivers/net/et131x/et1310_phy.h + create mode 100644 drivers/net/et131x/et1310_pm.c + create mode 100644 drivers/net/et131x/et1310_pm.h + create mode 100644 drivers/net/et131x/et1310_rx.c + create mode 100644 drivers/net/et131x/et1310_rx.h + create mode 100644 drivers/net/et131x/et1310_tx.c + create mode 100644 drivers/net/et131x/et1310_tx.h + create mode 100644 drivers/net/et131x/et131x_adapter.h + create mode 100644 drivers/net/et131x/et131x_config.c + create mode 100644 drivers/net/et131x/et131x_config.h + create mode 100644 drivers/net/et131x/et131x_debug.c + create mode 100644 drivers/net/et131x/et131x_debug.h + create mode 100644 drivers/net/et131x/et131x_defs.h + create mode 100644 drivers/net/et131x/et131x_initpci.c + create mode 100644 drivers/net/et131x/et131x_initpci.h + create mode 100644 drivers/net/et131x/et131x_isr.c + create mode 100644 drivers/net/et131x/et131x_isr.h + create mode 100644 drivers/net/et131x/et131x_netdev.c + create mode 100644 drivers/net/et131x/et131x_netdev.h + create mode 100644 drivers/net/et131x/et131x_version.h + create mode 100644 drivers/net/slicoss/Makefile + create mode 100644 drivers/net/slicoss/gbdownload.h + create mode 100644 drivers/net/slicoss/gbrcvucode.h + create mode 100644 drivers/net/slicoss/oasisdbgdownload.h + create mode 100644 drivers/net/slicoss/oasisdownload.h + create mode 100644 drivers/net/slicoss/oasisrcvucode.h + create mode 100644 drivers/net/slicoss/slic.h + create mode 100644 drivers/net/slicoss/slic_os.h + create mode 100644 drivers/net/slicoss/slicbuild.h + create mode 100644 drivers/net/slicoss/slicdbg.h + create mode 100644 drivers/net/slicoss/slicdump.h + create mode 100644 drivers/net/slicoss/slichw.h + create mode 100644 drivers/net/slicoss/slicinc.h + create mode 100644 drivers/net/slicoss/slicoss.c + create mode 100644 drivers/net/usb/hso.c + create mode 100644 drivers/usb/image/f2255usb.h + create mode 100644 drivers/usb/image/s2255drv.c + create mode 100644 fs/novfs/Makefile + create mode 100644 fs/novfs/commands.h + create mode 100644 fs/novfs/daemon.c + create mode 100644 fs/novfs/file.c + create mode 100644 fs/novfs/inode.c + create mode 100644 fs/novfs/nwcapi.c + create mode 100644 fs/novfs/nwcapi.h + create mode 100644 fs/novfs/nwerror.h + create mode 100644 fs/novfs/proc.c + create mode 100644 fs/novfs/profile.c + create mode 100644 fs/novfs/scope.c + create mode 100644 fs/novfs/vfs.h +$ git revert d735a5b1df0c8241c573d8f966744f713cf38efe +Auto-merged drivers/hid/usbhid/hid-quirks.c +Removed drivers/input/misc/appleir.c +Finished one revert. +Created commit 88849e6: Revert "Input: add appleir driver" + 4 files changed, 0 insertions(+), 375 deletions(-) + delete mode 100644 drivers/input/misc/appleir.c +Applying parport_pc: wrap PNP probe code in #ifdef CONFIG_PNP +Applying nsc-ircc: wrap PNP probe code in #ifdef CONFIG_PNP +Applying smsc-ircc2: wrap PNP probe code in #ifdef CONFIG_PNP diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..d16d9e516ec5 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,348 @@ +Importing driver-core based on 2.6.25-git6 +$ git branch -D quilt/driver-core +Deleted branch quilt/driver-core. +$ git checkout -b quilt/driver-core 563307b2fa15d687abc54bd980b9847ebf0e3231 +Switched to a new branch "quilt/driver-core" +$ git quiltimport --patches ../quilt/driver-core +net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch +pm-introduce-new-top-level-suspend-and-hibernation-callbacks.patch +pm-new-suspend-and-hibernation-callbacks-for-platform-bus-type.patch +pm-new-suspend-and-hibernation-callbacks-for-pci-bus-type.patch +driver-core-remove-no-longer-used-struct-class_device.patch +put_device-might_sleep.patch +warn-when-statically-allocated-kobjects-are-used.patch +sysfs-crash-debugging.patch +Importing usb based on quilt/driver-core +$ git branch -D quilt/usb +Deleted branch quilt/usb. +$ git checkout -b quilt/usb quilt/driver-core +Switched to a new branch "quilt/usb" +$ git quiltimport --patches ../quilt/usb +usb-cp2101-add-new-device-ids.patch +usb-fix-memory-leak-in-mon_stat_release.patch +usb-add-hp-hs2300-broadband-wireless-module-to-sierra.c.patch +usb-ehci-carry-out-port-handover-during-each-root-hub-resume.patch +usb-reorganize-code-in-hub.c.patch +usb-make-usb-persist-work-after-every-system-sleep.patch +usb-remove-config_usb_persist-setting.patch +.dotest/patch:225: space before tab in indent. + */ +warning: 1 line adds whitespace errors. +usb-check-serial-number-string-after-device-reset.patch +usb-enable-usb-persist-by-default.patch +checkpatch-usb_free_urb-can-take-null.patch +usb-add-usb_dt_cs_radio_control-define-to-ch9.h.patch +usb-convert-usb.h-struct-usb_device-to-kernel-doc.patch +usb-microtek-remove-unused-semaphore.patch +usb-libusual-locking-cleanup.patch +usb-make-usb_storage_onetouch-available-with-pm.patch +usb-usb-ohci-sm501-driver-use-the-conventional-convention-for-suspend-and-resume.patch +usb-usbatm-convert-heavy-init-dances-to-kthread-api.patch +usb-defines-for-usb-link-power-management-ecn.patch +usb-ehci-minor-cleanups.patch +usb-ohci-port-reset-paranoia-timeout.patch +usb-ehci-tolerates-some-buggy-devices.patch +usb-ehci-minor-soc-bus-glue-fixes.patch +usb-m66592-udc-reduce-size-of-data-structure.patch +usb-ehci-refactor-if-state-hc_state_halt.patch +usb-gadget-hangup-tty-on-g_serial-disconnect.patch +usb-io_ti.c-remove-pointless-eye-candy-in-debug-statements.patch +usb-cypress_m8-feature-buffer-fixes.patch +usb-cypress_m8-packet-format-is-separate-from-characteristic-size.patch +usb-cypress_m8-don-t-issue-get_config-for-certain-devices.patch +usb-cypress_m8-get-rid-of-pointless-null-check.patch +usb-cypress_m8-limit-baud-rate-to-4800-for-usb-low-speed-devices.patch +usb-misc-auerswald-cp_mutex-to-mutex.diff +usb-misc-auerswald-ccp_readmutex-to-mutex.diff +usb-misc-auerswald-ccp_mutex-to-mutex.diff +usb-minor-ehci-xitd-simplifications.patch +usb-usb-serial-prepare-for-bkl-push-down.patch +usb-ftdi_sio-note-missing-locking.patch +usb-serial-note-mos7480-and-option-don-t-lock-modem-status.patch +usb-iuu_phoenix-lock-priv-tiostatus-properly.patch +usb-kobil_sct-get-rid-of-unneeded-priv-line_state.patch +usb-ti_usb_3410_5052-extend-locking-to-msr-and-shadow-mcr.patch +usb-io_ti-lock-mcr-and-msr-shadows-properly.patch +usb-use-div_round_up.patch +usb-io_ti.c-remove-unneeded-null-tty-check.patch +usb-partial-usb-embedded-host-support.patch +usb-ehci-remove-obsolete-workaround-for-bogus-irqs.patch +usb-ipaq-fix-devices-having-more-than-one-endpoint.patch +usb-remove-dev-power.power_state.patch +usb-ehci-paranoia-reject-large-control-transfers.patch +usb-cypress_m8-speed-handling.patch +drivers-usb-core-devio.c-suppress-warning-with-64k-page_size.patch +usb-usb.h-reduce-syslog-clutter.patch +usb-standardize-inclusion-protection-and-add-where-missing.patch +usb-mass-storage-emulation-of-sat-scsi_pass_thru-with-atacb.patch +usb-remove-experimental-designation-from-usb-storage-kconfig-entries.patch +usb-remove-experimental-tags-from-some-usb-gadget-kconfig-entries.patch +usb-remove-experimental-designation-from-usb-misc-kconfig-entries.patch +usb-remove-experimental-designation-from-usb-serial-kconfig-entries.patch +usb-remove-experimental-designation-from-usb-mdc800-support.patch +usb-remove-experimental-from-dynamic-usb-minor-allocation.patch +usb-remove-experimental-designation-from-usb_ehci_root_hub_tt.patch +usb-fix-cut-and-paste-booboo-in-usbmon-makefile.patch +usbmon-restore-mmap.patch +usb-cdc-acm-tell-tty-layer-not-to-split-things-up.patch +usb-increase-cdc-acm-write-throughput.patch +usb-serial-sierra-clean-up.patch +usb-serial-sierra-c597-fix.patch +usb-serial-sierra-add-new-dev-group.patch +usb-add-usb-serial-spcp8x5-driver.patch +u132-hcd-fix-checkpatch-style-issues.patch +u132-hdc-semaphore-to-mutex.patch +usb-fix-comments-of-2-functions-in-hcd.c.patch +usb-serial-remove-obsolete-contact-addresses.patch +usb-test-for-null-return-from-platform_get_resource-in-ohci_hcd_sm501_drv_remove.patch +usb-g_printer-bugfixes.patch +usb-usb-storage-use-adaptive-dma-mask.patch +usb-mem-leak-fixes-for-amd-5536-udc-high-full-speed-usb-device-controller-driver.patch +usb-gadget-dummy_hcd.c-fix-nested-switch-statements.patch +usb-ohci-fix-bug-in-controller-resume.patch +usb-convert-away-from-urb-status-in-xpad-driver.patch +usb-root-hubs-don-t-lie-about-their-number-of-tts.patch +usb-clarify-usage-of-hcd-suspend-resume-methods.patch +usb-ohci-host-controller-resumes-leave-root-hub-suspended.patch +usb-replace-remaining-__pretty_function__-occurrences.patch +usb-rework-sysfs-removal-of-interface-files.patch +usb-gadget-section-fixes.patch +usb-dummy-hcd-use-dynamic-allocation-for-platform_devices.patch +usb-at91_udc-can-prefetch-data.patch +usb-ehci-shutdown-refactored.patch +usb-oti6858-fix-tcflsh-ioctl-handling.patch +usb-r8a66597-hcd-fix-interrupt-transfer-interval.patch +usb-r8a66597-hcd-fix-usb-device-connection-timing.patch +usb-r8a66597-hcd-add-support-for-sh7366-usb-host.patch +usb-add-extension-of-anchor-api-usb_unlink_anchored_urbs.patch +usb-remove-superfluous-depends-on-usb_serial-from-kconfig.patch +usb-update-comments-about-usb-driver-s-header.patch +usb-log-an-error-message-when-usb-enumeration-fails.patch +usb-ehci-qh-qtd-cleanup-comments.patch +usb-add-documentation-about-usb_anchor.patch +usb-option.c-correct-dtr-behaviour.patch +usb-serial-remove-unneeded-number-endpoints-settings.patch +usb-serial-remove-endpoints-setting-checks-from-core-and-header.patch +usb-g_file_storage-ignore-bulk-out-data-after-invalid-cbw.patch +usb-hcds-use-the-do_remote_wakeup-flag.patch +usb-ohci-turn-off-rd-when-remote-wakeup-is-disabled.patch +usb-don-t-explicitly-reenable-root-hub-status-interrupts.patch +usb-add-documentation-about-callbacks.patch +usb-cdc-acm-signedness-fix.patch +usb-ehci-qh_completions-cleanup-and-bugfix.patch +usb-fix-compile-problems-in-ehci-hcd.patch +usb-usbfs-export-the-urb_no_interrupt-flag-to-userspace.patch +usb-replace-remaining-__function__-occurrences.patch +.dotest/patch:2592: space before tab in indent. + dbg(1," %s : file is NULL", __func__); +.dotest/patch:2600: space before tab in indent. + dbg(1," %s : object is NULL", __func__); +.dotest/patch:8357: space before tab in indent. + dbg ("%s - start_sddr = %x, length = %d", __func__, start_address, length); +.dotest/patch:8732: space before tab in indent. + dbg ("%s - Update complete 0x%x", __func__, status); +.dotest/patch:8796: space before tab in indent. + dbg ("%s - Error downloading operational code image", __func__); +warning: squelched 5 whitespace errors +warning: 10 lines add whitespace errors. +usb-serial-more-fixes-and-groundwork-for-tty-changes.patch +.dotest/patch:345: space before tab in indent. + mct_u232_set_modem_ctrl(serial, priv->control_state); +warning: 1 line adds whitespace errors. +usb-remove-unnecessary-type-casting-of-urb-context.patch +wusb-add-authenticated-bit-to-usb-dev.patch +.dotest/patch:19: space before tab in indent. + unsigned authenticated:1; +warning: 1 line adds whitespace errors. +usb-add-usb_dev_reset_delayed.patch +wusb-add-link-wusb-usb-dev.patch +wusb-teach-choose-address-about-wireless-devices.patch +wusb-devices-dont-use-a-set-address.patch +.dotest/patch:14: space before tab in indent. + /* +.dotest/patch:15: space before tab in indent. + * If device is WUSB, we already assigned an +.dotest/patch:16: space before tab in indent. + * unauthorized address in the Connect Ack sequence; +.dotest/patch:17: space before tab in indent. + * authorization will assign the final address. +.dotest/patch:18: space before tab in indent. + */ +warning: squelched 2 whitespace errors +warning: 7 lines add whitespace errors. +wusb-make-ep0-reinit-available.patch +wusb-update-devnum.patch +wusb-documentation.patch +bitmap-add-bitmap_copy_le.patch +wusb-add-usb-specific-wusb-include-files.patch +wusb-add-the-uwb-include-files.patch +uwb-add-the-uwb-stack.patch +wusb-add-whc-rc-radio-control-driver.patch +.dotest/patch:494: space before tab in indent. + whcrc->umc_dev = umc_dev; +.dotest/patch:507: space before tab in indent. + result = whcrc_setup_rc_umc(whcrc); +.dotest/patch:509: space before tab in indent. + dev_err(dev, "Can't setup RC UMC interface: %d\n", result); +.dotest/patch:514: space before tab in indent. + dev_err(dev, "Can't setup RC interface: %d\n", result); +.dotest/patch:576: space before tab in indent. + .probe = whcrc_probe, +warning: squelched 1 whitespace error +warning: 6 lines add whitespace errors. +wusb-add-hwa-rc-radio-controller-driver.patch +wusb-add-uwb-core-for-wimedia-link-protocol.patch +wusb-add-the-i1480-driver.patch +.dotest/patch:969: space before tab in indent. + const struct firmware *fw; +.dotest/patch:1329: space before tab in indent. + const struct firmware *fw; +.dotest/patch:3487: space before tab in indent. + "Dropping\n", untd_hdr->reserved1); +.dotest/patch:4783: space before tab in indent. + /* +warning: 4 lines add whitespace errors. +wusb-add-the-usb-wireless-core-code.patch +wusb-add-the-usb-wusb-cbaf-driver.patch +wusb-add-the-wire-adapter-core.patch +wusb-add-hwa-hc-wireless-host-controller-driver.patch +usb-gotemp.patch +Importing device-mapper based on v2.6.25-3562-g3dc5063 +$ git branch -D quilt/device-mapper +Deleted branch quilt/device-mapper. +$ git checkout -b quilt/device-mapper v2.6.25-3562-g3dc5063 +Switched to a new branch "quilt/device-mapper" +$ git quiltimport --patches ../quilt/device-mapper +Importing i2c based on 2.6.25-git11 +$ git branch -D quilt/i2c +Deleted branch quilt/i2c. +$ git checkout -b quilt/i2c 064922a805ec7aadfafdd27aa6b4908d737c3c1d +Switched to a new branch "quilt/i2c" +$ git quiltimport --patches ../quilt/i2c +i2c-new-co-maintainer.patch +i2c-stub-no-newline-in-param-desc.patch +i2c-busses-spelling-successful.patch +i2c-piix4-cleanups.patch +i2c-sis5595-cleanps.patch +i2c-tps65010-missing-clientdata-init.patch +Importing kernel-doc based on 2.6.25-rc8 +$ git branch -D quilt/kernel-doc +Deleted branch quilt/kernel-doc. +$ git checkout -b quilt/kernel-doc v2.6.25-rc8 +Switched to a new branch "quilt/kernel-doc" +$ git quiltimport --patches ../quilt/kernel-doc +docsrc-spi-split-fix.patch +kconfig_allconfig_docv2.patch +move-smart-config.patch +kerndoc-dup-section-name-err.patch +docbook-klocking-tryfunc.patch +kerndoc-trailing-info.patch +doc-dma-api-txt.patch +Importing ide based on commit 064922a805ec7aadfafdd27aa6b4908d737c3c1d +$ git branch -D quilt/ide +Deleted branch quilt/ide. +$ git checkout -b quilt/ide 064922a805ec7aadfafdd27aa6b4908d737c3c1d +Switched to a new branch "quilt/ide" +$ git quiltimport --patches ../quilt/ide +falconide-q40ide-add-atapi_-put_bytes-and-ata_-put_data-methods-take-2.patch +ide-merge-atapi_-put_bytes-and-ata_-put_data-methods.patch +scc_pata-add-in-out-put_data-methods-take-2.patch +au1xxx-ide-add-in-out-put_data-methods-take-2.patch +ide-h8300-add-in-out-put_data-methods-take-2.patch +ide-add-ide_hflag_mmio-host-flag-take-2.patch +ide-remove-inswl-and-outswl-methods.patch +siimage-do-clocking-register-posting-earlier-in-setup_mmio_siimage.patch +siimage-add-sil_-io-ops.patch +siimage-remove-proc_reports_siimage.patch +ide-always-use-outbsync-method-for-executing-commands.patch +ide-floppy-tape-scsi-400ns-delay-is-required-after-executing-the-command.patch +ide-add-ide_execute_pkt_cmd-helper.patch +ide-factor-out-debugging-code-from-ide_tf_load.patch +ide-move-ide_tf_load-read-to-ide-iops-c.patch +ide-add-tf_load-and-tf_read-methods.patch +ide-cris-add-tf_load-read-methods.patch +ide-h8300-add-tf_load-read-methods.patch +scc_pata-add-tf_load-read-methods.patch +ns87415-add-tf_read-method.patch +ide-use-ide-io-helpers-directly-in-ide_tf_load-read.patch +ide-remove-inw-and-outw-methods.patch +ide-add-ide_pad_transfer-helper.patch +ide-skip-vlb-sync-if-host-uses-mmio.patch +scc_pata-add-dma_host_set-and-dma_start-methods.patch +ide-remove-dma_vendor1-3-fields-from-ide_hwif_t.patch +ide-remove-dma_prdtable-field-from-ide_hwif_t.patch +remove-the-broken-etrax_ide-driver.patch +ide-remove-obsoleted-idebus-kernel-parameter.patch +ide-remove-obsoleted-hdx-kernel-parameters.patch +ide-cleanup-init_ide_data.patch +ide-remove-obsoleted-ide-parameters.patch +ide-make-32-bit-io-support-for-ide-vlb-available-only-when-it-makes-sense.patch +arm-always-select-have_ide.patch +piix-add-asus-eee-701-controller-to-short-cable-list.patch +ide-add-tsstcorp-cddvdw-sh-s202h-to-ivb_list.patch +ide-cd-fix-test-unsigned-var-lt-0.patch +ide-cd-clean-up-cdrom_analyze_sense_data.patch +siimage-coding-style-cleanup-take-2.patch +Importing m68k based on 3dc5063786b273f1aee545844f6bd4e9651ebffe +$ git branch -D quilt/m68k +Deleted branch quilt/m68k. +$ git checkout -b quilt/m68k 3dc5063786b273f1aee545844f6bd4e9651ebffe +Switched to a new branch "quilt/m68k" +$ git quiltimport --patches ../quilt/m68k +m68k-convert-access_ok-to-inline-func.diff +m68k-kill-CONFIG_FB_DAFB.diff +m68k-correct-FB_HP300-dependencies.diff +m68k-whippet-serial-no-longer-exists.diff +m68k-vme_scc-globals.diff +m68k-silence-BUG-can-return-warnings.diff +m68k-hp300-breaks-multi-platform.diff +m68k-macide-breaks-multi-platform.diff +m68k-dnfb-breaks-multi-platform.diff +m68k-net-drivers-break-multiplatform.diff +m68k-input-drivers-break-multiplatform.diff +m68k-initcalls-should-return-ENODEV-if-device-not-found.diff +m68k-q40-floppy-is-broken.diff +m68k-update-defconfig.diff +m68k-add-multi_defconfig.diff +drivers-input-serio-hp_sdc.c-needs-linux-semaphore.h.diff +Importing ldp based on quilt/usb +$ git branch -D quilt/ldp +Deleted branch quilt/ldp. +$ git checkout -b quilt/ldp quilt/usb +Switched to a new branch "quilt/ldp" +$ git quiltimport --patches ../quilt/ldp +usb-add-sensoray-2255-v4l-driver.patch +dvb-add-firesat-driver.patch +usb-add-option-hso-driver.patch +video-add-the-go7007-driver.patch +.dotest/patch:1896: space before tab in indent. + 0xd3), +.dotest/patch:1911: space before tab in indent. + GO7007_SENSOR_TV) && +.dotest/patch:1915: space before tab in indent. + GO7007_SENSOR_TV) && +.dotest/patch:2125: space before tab in indent. + (1 << 14) | (1 << 9) : 0) | +.dotest/patch:2128: space before tab in indent. + GO7007_SENSOR_CONFIG_MASK), +warning: 5 lines add whitespace errors. +net-add-alacritech-slicoss-driver.patch +.dotest/patch:58: trailing whitespace. +obj-$(CONFIG_SLICOSS) += slicoss.o
+.dotest/patch:24450: space before tab in indent. + ushort DramRomFn; // 14 Dram/Rom function +warning: 2 lines add whitespace errors. +input-add-appleir-driver.patch +add-me4000-pci-data-collection-driver.patch +novfs-add-the-novell-filesystem-client-kernel-module.patch +aectc-add-the-aectc-driver.patch +net-add-et131x-driver.patch +.dotest/patch:2767: space before tab in indent. + /* bits 1:0 are equal to 1 */ +.dotest/patch:2822: space before tab in indent. + /* I2C write complete */ +.dotest/patch:7854: space before tab in indent. + pRxLocal->local_psr_full.bits.psr_full_wrap) { +.dotest/patch:12027: space before tab in indent. + * I need to call this function twice to get my card in a +warning: 4 lines add whitespace errors. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..0e9b9cf26f29 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20080428 |