$ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 3af968e async: Fix lack of boot-time console due to insufficient synchronization Merging origin/master $ git merge origin/master Updating 3af968e..769f3e8 Fast forward .../ABI/testing/sysfs-devices-cache_disable | 18 + Documentation/DMA-API.txt | 12 + Documentation/futex-requeue-pi.txt | 131 +++ Documentation/kernel-parameters.txt | 15 +- Documentation/memory-barriers.txt | 129 +++- Documentation/scheduler/sched-rt-group.txt | 20 +- Documentation/trace/ftrace.txt | 15 +- Documentation/x86/boot.txt | 122 ++- Documentation/x86/x86_64/boot-options.txt | 5 - Documentation/x86/x86_64/mm.txt | 9 +- Makefile | 2 +- arch/alpha/kernel/sys_dp264.c | 8 +- arch/alpha/kernel/sys_titan.c | 4 +- arch/arm/common/gic.c | 4 +- arch/cris/arch-v32/kernel/irq.c | 4 +- arch/ia64/hp/sim/hpsim_irq.c | 3 +- arch/ia64/kernel/acpi.c | 5 +- arch/ia64/kernel/iosapic.c | 10 +- arch/ia64/kernel/msi_ia64.c | 16 +- arch/ia64/sn/kernel/irq.c | 4 +- arch/ia64/sn/kernel/msi_sn.c | 8 +- arch/mips/cavium-octeon/octeon-irq.c | 8 +- arch/mips/include/asm/irq.h | 2 +- arch/mips/kernel/irq-gic.c | 5 +- arch/mips/mti-malta/malta-smtc.c | 4 +- arch/mips/sibyte/bcm1480/irq.c | 8 +- arch/mips/sibyte/sb1250/irq.c | 8 +- arch/parisc/kernel/irq.c | 6 +- arch/powerpc/platforms/pseries/xics.c | 12 +- arch/powerpc/sysdev/mpic.c | 4 +- arch/powerpc/sysdev/mpic.h | 2 +- arch/sparc/include/asm/thread_info_64.h | 4 +- arch/sparc/kernel/irq_64.c | 12 +- arch/x86/Kbuild | 16 + arch/x86/Kconfig | 53 +- arch/x86/Kconfig.debug | 11 +- arch/x86/Makefile | 19 +- arch/x86/boot/.gitignore | 2 + arch/x86/boot/Makefile | 29 +- arch/x86/boot/a20.c | 9 +- arch/x86/boot/apm.c | 76 +- arch/x86/boot/bioscall.S | 82 ++ arch/x86/boot/boot.h | 48 + arch/x86/boot/compressed/.gitignore | 3 + arch/x86/boot/compressed/Makefile | 54 +- arch/x86/boot/compressed/head_32.S | 194 ++-- arch/x86/boot/compressed/head_64.S | 169 ++-- arch/x86/boot/compressed/misc.c | 12 +- arch/x86/boot/compressed/mkpiggy.c | 97 ++ .../compressed/{vmlinux_64.lds => vmlinux.lds.S} | 29 +- arch/x86/boot/compressed/vmlinux.scr | 10 - arch/x86/boot/compressed/vmlinux_32.lds | 43 - arch/x86/boot/edd.c | 71 +- arch/x86/boot/header.S | 30 +- arch/x86/boot/main.c | 39 +- arch/x86/boot/mca.c | 27 +- arch/x86/boot/memory.c | 79 +- arch/x86/boot/regs.c | 29 + arch/x86/boot/setup.ld | 6 + arch/x86/boot/tty.c | 52 +- arch/x86/boot/video-bios.c | 27 +- arch/x86/boot/video-vesa.c | 137 +-- arch/x86/boot/video-vga.c | 95 +- arch/x86/boot/video.c | 42 +- arch/x86/boot/video.h | 14 - arch/x86/configs/i386_defconfig | 148 ++- arch/x86/configs/x86_64_defconfig | 151 ++- arch/x86/include/asm/alternative.h | 59 +- arch/x86/include/asm/amd_iommu.h | 2 + arch/x86/include/asm/amd_iommu_types.h | 55 +- arch/x86/include/asm/apic.h | 33 +- arch/x86/include/asm/apicdef.h | 8 +- arch/x86/include/asm/boot.h | 15 + arch/x86/include/asm/bootparam.h | 3 +- arch/x86/include/asm/cpu_debug.h | 101 +-- arch/x86/include/asm/cpufeature.h | 7 +- arch/x86/include/asm/hw_irq.h | 25 +- arch/x86/include/asm/i387.h | 43 +- arch/x86/include/asm/i8259.h | 4 - arch/x86/include/asm/io_apic.h | 9 +- arch/x86/include/asm/iomap.h | 5 + arch/x86/include/asm/irq_remapping.h | 2 +- arch/x86/include/asm/irq_vectors.h | 1 + arch/x86/include/asm/k8.h | 13 + arch/x86/include/asm/microcode.h | 25 +- arch/x86/include/asm/mpspec.h | 15 +- arch/x86/include/asm/msr-index.h | 1 - arch/x86/include/asm/nmi.h | 2 +- arch/x86/include/asm/numa_64.h | 10 +- arch/x86/include/asm/page_32_types.h | 4 - arch/x86/include/asm/page_64_types.h | 22 +- arch/x86/include/asm/page_types.h | 6 + arch/x86/include/asm/paravirt.h | 22 +- arch/x86/include/asm/pgtable.h | 4 + arch/x86/include/asm/pgtable_64.h | 6 - arch/x86/include/asm/pgtable_64_types.h | 8 +- arch/x86/include/asm/pgtable_types.h | 1 - arch/x86/include/asm/processor.h | 12 +- arch/x86/include/asm/required-features.h | 8 +- arch/x86/include/asm/setup.h | 1 - arch/x86/include/asm/smp.h | 2 +- arch/x86/include/asm/sparsemem.h | 2 +- arch/x86/include/asm/syscalls.h | 45 +- arch/x86/include/asm/thread_info.h | 4 +- arch/x86/include/asm/topology.h | 3 +- arch/x86/include/asm/traps.h | 5 +- arch/x86/include/asm/uv/uv_bau.h | 2 +- arch/x86/include/asm/uv/uv_hub.h | 6 +- arch/x86/kernel/Makefile | 2 +- arch/x86/kernel/acpi/boot.c | 156 +-- arch/x86/kernel/acpi/realmode/Makefile | 2 +- arch/x86/kernel/acpi/realmode/bioscall.S | 1 + arch/x86/kernel/acpi/realmode/regs.c | 1 + arch/x86/kernel/amd_iommu.c | 500 ++++++--- arch/x86/kernel/amd_iommu_init.c | 273 +++-- arch/x86/kernel/apic/apic.c | 311 ++++-- arch/x86/kernel/apic/apic_flat_64.c | 4 +- arch/x86/kernel/apic/es7000_32.c | 2 +- arch/x86/kernel/apic/io_apic.c | 902 ++++++++-------- arch/x86/kernel/apic/nmi.c | 2 +- arch/x86/kernel/apic/probe_32.c | 1 - arch/x86/kernel/apic/probe_64.c | 2 +- arch/x86/kernel/apic/summit_32.c | 7 - arch/x86/kernel/apic/x2apic_cluster.c | 2 +- arch/x86/kernel/apic/x2apic_uv_x.c | 20 +- arch/x86/kernel/asm-offsets_32.c | 1 + arch/x86/kernel/asm-offsets_64.c | 1 + arch/x86/kernel/cpu/amd.c | 12 +- arch/x86/kernel/cpu/common.c | 23 +- arch/x86/kernel/cpu/cpu_debug.c | 431 ++------ arch/x86/kernel/cpu/cpufreq/Kconfig | 9 +- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 8 +- arch/x86/kernel/cpu/cpufreq/powernow-k7.c | 2 +- arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 2 +- arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 2 +- arch/x86/kernel/cpu/intel.c | 6 +- arch/x86/kernel/cpu/intel_cacheinfo.c | 153 ++-- arch/x86/kernel/cpu/mcheck/mce_64.c | 2 +- arch/x86/kernel/cpu/mcheck/mce_intel_64.c | 1 - arch/x86/kernel/cpu/mtrr/cleanup.c | 4 +- arch/x86/kernel/cpu/mtrr/generic.c | 24 +- arch/x86/kernel/cpu/mtrr/main.c | 2 +- arch/x86/kernel/cpu/mtrr/mtrr.h | 15 - arch/x86/kernel/cpu/mtrr/state.c | 6 +- arch/x86/kernel/dumpstack.h | 1 - arch/x86/kernel/e820.c | 46 +- arch/x86/kernel/early-quirks.c | 2 + arch/x86/kernel/entry_64.S | 5 + arch/x86/kernel/head_32.S | 7 - arch/x86/kernel/irq.c | 20 +- arch/x86/kernel/{irqinit_32.c => irqinit.c} | 149 ++- arch/x86/kernel/irqinit_64.c | 177 --- arch/x86/kernel/kgdb.c | 2 +- arch/x86/kernel/kvm.c | 2 +- arch/x86/kernel/microcode_amd.c | 70 +- arch/x86/kernel/microcode_core.c | 329 ++++--- arch/x86/kernel/microcode_intel.c | 90 +- arch/x86/kernel/mpparse.c | 34 +- arch/x86/kernel/paravirt.c | 56 +- arch/x86/kernel/pci-calgary_64.c | 54 +- arch/x86/kernel/pci-gart_64.c | 55 +- arch/x86/kernel/pci-swiotlb.c | 2 +- arch/x86/kernel/process.c | 15 + arch/x86/kernel/process_32.c | 17 +- arch/x86/kernel/process_64.c | 17 +- arch/x86/kernel/quirks.c | 37 + arch/x86/kernel/reboot.c | 9 + arch/x86/kernel/setup.c | 40 +- arch/x86/kernel/setup_percpu.c | 8 + arch/x86/kernel/smp.c | 20 +- arch/x86/kernel/smpboot.c | 22 +- arch/x86/kernel/tlb_uv.c | 17 +- arch/x86/kernel/traps.c | 10 +- arch/x86/kernel/tsc.c | 19 +- arch/x86/kernel/tsc_sync.c | 14 +- arch/x86/kernel/vm86_32.c | 13 +- arch/x86/kernel/vmi_32.c | 20 +- arch/x86/kernel/vmlinux.lds.S | 430 +++++++- arch/x86/kernel/vmlinux_32.lds.S | 229 ---- arch/x86/kernel/vmlinux_64.lds.S | 298 ----- arch/x86/kernel/vsyscall_64.c | 8 - arch/x86/lguest/boot.c | 18 +- arch/x86/mm/dump_pagetables.c | 7 +- arch/x86/mm/fault.c | 57 +- arch/x86/mm/highmem_32.c | 2 - arch/x86/mm/init.c | 78 ++- arch/x86/mm/init_32.c | 61 +- arch/x86/mm/init_64.c | 47 +- arch/x86/mm/iomap_32.c | 1 - arch/x86/mm/memtest.c | 14 +- arch/x86/mm/numa_64.c | 33 +- arch/x86/mm/pageattr.c | 14 - arch/x86/mm/srat_64.c | 98 +-- arch/x86/pci/irq.c | 84 +- arch/x86/vdso/vma.c | 1 + arch/x86/xen/enlighten.c | 65 +- arch/x86/xen/mmu.c | 23 +- arch/x86/xen/setup.c | 6 +- arch/x86/xen/xen-ops.h | 1 - block/bsg.c | 3 + drivers/acpi/pci_irq.c | 5 +- drivers/acpi/processor_core.c | 2 +- drivers/char/hpet.c | 4 +- drivers/char/mem.c | 5 +- drivers/char/mxser.c | 2 +- drivers/cpufreq/cpufreq.c | 2 +- drivers/md/raid5.c | 28 +- drivers/net/r8169.c | 11 +- drivers/parisc/iosapic.c | 6 +- drivers/pci/hotplug/ibmphp_core.c | 54 +- drivers/pci/htirq.c | 4 +- drivers/pci/intel-iommu.c | 9 - drivers/pci/intr_remapping.c | 54 +- drivers/pnp/pnpacpi/rsparser.c | 2 +- drivers/xen/Kconfig | 20 + drivers/xen/Makefile | 4 +- drivers/xen/events.c | 20 +- drivers/xen/evtchn.c | 507 +++++++++ drivers/xen/manage.c | 9 +- drivers/xen/sys-hypervisor.c | 445 ++++++++ drivers/xen/xenbus/xenbus_probe.c | 61 +- drivers/xen/xenbus/xenbus_xs.c | 2 + drivers/xen/xenfs/super.c | 19 +- fs/autofs4/waitq.c | 22 +- fs/jbd/commit.c | 6 +- fs/proc/loadavg.c | 18 +- include/Kbuild | 1 + include/asm-generic/pgtable.h | 21 +- include/linux/acpi.h | 2 +- include/linux/cpumask.h | 15 + include/linux/dma-debug.h | 7 + include/linux/dmar.h | 3 + include/linux/futex.h | 6 + include/linux/interrupt.h | 2 +- include/linux/irq.h | 58 +- include/linux/mm.h | 2 - include/linux/mutex.h | 1 + include/linux/sched.h | 28 +- include/linux/spinlock_up.h | 1 + include/linux/swiotlb.h | 3 +- include/linux/thread_info.h | 3 +- include/linux/wait.h | 2 - include/xen/Kbuild | 1 + include/xen/events.h | 3 + include/xen/evtchn.h | 88 ++ include/xen/interface/version.h | 3 + include/xen/xenbus.h | 3 +- ipc/shm.c | 7 +- kernel/futex.c | 1188 +++++++++++++++----- kernel/irq/Makefile | 2 +- kernel/irq/chip.c | 12 +- kernel/irq/handle.c | 58 +- kernel/irq/internals.h | 5 +- kernel/irq/manage.c | 17 +- kernel/irq/migration.c | 14 +- kernel/irq/numa_migrate.c | 38 +- kernel/mutex.c | 29 +- kernel/rtmutex.c | 248 ++++- kernel/rtmutex_common.h | 8 + kernel/sched.c | 304 +++++- kernel/sched_cpupri.c | 2 +- kernel/sched_fair.c | 13 +- kernel/sched_idletask.c | 3 +- kernel/sched_rt.c | 2 +- kernel/smp.c | 2 +- kernel/softirq.c | 2 +- kernel/sysctl.c | 8 + kernel/time/timekeeping.c | 2 +- kernel/timer.c | 86 +-- kernel/wait.c | 2 +- lib/cpumask.c | 12 + lib/dma-debug.c | 432 +++++++- lib/swiotlb.c | 119 +- lib/vsprintf.c | 56 +- mm/page_alloc.c | 69 -- mm/percpu.c | 141 +-- net/sched/cls_cgroup.c | 3 + scripts/Makefile.lib | 28 +- scripts/bin_size | 10 - virt/kvm/kvm_main.c | 2 +- 280 files changed, 8190 insertions(+), 5280 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-devices-cache_disable create mode 100644 Documentation/futex-requeue-pi.txt create mode 100644 arch/x86/Kbuild create mode 100644 arch/x86/boot/bioscall.S create mode 100644 arch/x86/boot/compressed/mkpiggy.c rename arch/x86/boot/compressed/{vmlinux_64.lds => vmlinux.lds.S} (57%) delete mode 100644 arch/x86/boot/compressed/vmlinux.scr delete mode 100644 arch/x86/boot/compressed/vmlinux_32.lds create mode 100644 arch/x86/boot/regs.c create mode 100644 arch/x86/kernel/acpi/realmode/bioscall.S create mode 100644 arch/x86/kernel/acpi/realmode/regs.c rename arch/x86/kernel/{irqinit_32.c => irqinit.c} (68%) delete mode 100644 arch/x86/kernel/irqinit_64.c delete mode 100644 arch/x86/kernel/vmlinux_32.lds.S delete mode 100644 arch/x86/kernel/vmlinux_64.lds.S create mode 100644 drivers/xen/evtchn.c create mode 100644 drivers/xen/sys-hypervisor.c create mode 100644 include/xen/Kbuild create mode 100644 include/xen/evtchn.h delete mode 100644 scripts/bin_size Merging fixes/fixes $ git merge fixes/fixes Already up-to-date. Merging arm-current/master $ git merge arm-current/master Already up-to-date. Merging m68k-current/for-linus $ git merge m68k-current/for-linus Already up-to-date. Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging sparc-current/master $ git merge sparc-current/master 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 Already up-to-date. Merging sound-current/for-linus $ git merge sound-current/for-linus Removing include/sound/driver.h Merge made by recursive. Documentation/sound/alsa/ALSA-Configuration.txt | 36 +- Documentation/sound/alsa/HD-Audio-Models.txt | 18 +- Documentation/sound/alsa/README.maya44 | 163 ++ Documentation/sound/alsa/soc/dapm.txt | 1 + MAINTAINERS | 6 +- arch/powerpc/include/asm/mpc52xx_psc.h | 11 + include/linux/pci_ids.h | 12 + include/sound/asound.h | 1 + include/sound/core.h | 11 +- include/sound/driver.h | 1 - include/sound/pcm.h | 76 +- include/sound/soc-dai.h | 30 +- include/sound/soc-dapm.h | 24 +- include/sound/soc.h | 34 +- include/sound/wm9081.h | 25 + sound/aoa/fabrics/layout.c | 8 +- sound/aoa/soundbus/i2sbus/core.c | 8 +- sound/core/Kconfig | 2 + sound/core/init.c | 61 +- sound/core/oss/pcm_oss.c | 5 +- sound/core/pcm_lib.c | 92 +- sound/core/pcm_native.c | 23 +- sound/core/seq/Kconfig | 16 + sound/core/seq/Makefile | 18 +- sound/drivers/opl3/Makefile | 10 +- sound/drivers/opl4/Makefile | 10 +- sound/isa/Kconfig | 7 +- sound/isa/es1688/es1688.c | 2 +- sound/isa/gus/gusextreme.c | 2 +- sound/isa/sb/Makefile | 10 +- sound/isa/sc6000.c | 134 +- sound/mips/sgio2audio.c | 3 +- sound/parisc/harmony.c | 4 +- sound/pci/Kconfig | 27 +- sound/pci/Makefile | 2 + sound/pci/au88x0/au88x0_core.c | 10 +- sound/pci/bt87x.c | 2 + sound/pci/ca0106/ca0106_main.c | 1 - sound/pci/ca0106/ca0106_mixer.c | 10 +- sound/pci/ctxfi/Makefile | 5 + sound/pci/ctxfi/ct20k1reg.h | 636 +++++++ sound/pci/ctxfi/ct20k2reg.h | 85 + sound/pci/ctxfi/ctamixer.c | 488 +++++ sound/pci/ctxfi/ctamixer.h | 96 + sound/pci/ctxfi/ctatc.c | 1619 ++++++++++++++++ sound/pci/ctxfi/ctatc.h | 147 ++ sound/pci/ctxfi/ctdaio.c | 769 ++++++++ sound/pci/ctxfi/ctdaio.h | 122 ++ sound/pci/ctxfi/cthardware.c | 91 + sound/pci/ctxfi/cthardware.h | 196 ++ sound/pci/ctxfi/cthw20k1.c | 2248 ++++++++++++++++++++++ sound/pci/ctxfi/cthw20k1.h | 26 + sound/pci/ctxfi/cthw20k2.c | 2137 +++++++++++++++++++++ sound/pci/ctxfi/cthw20k2.h | 26 + sound/pci/ctxfi/ctimap.c | 112 ++ sound/pci/ctxfi/ctimap.h | 40 + sound/pci/ctxfi/ctmixer.c | 1123 +++++++++++ sound/pci/ctxfi/ctmixer.h | 67 + sound/pci/ctxfi/ctpcm.c | 426 +++++ sound/pci/ctxfi/ctpcm.h | 27 + sound/pci/ctxfi/ctresource.c | 301 +++ sound/pci/ctxfi/ctresource.h | 72 + sound/pci/ctxfi/ctsrc.c | 886 +++++++++ sound/pci/ctxfi/ctsrc.h | 149 ++ sound/pci/ctxfi/cttimer.c | 441 +++++ sound/pci/ctxfi/cttimer.h | 29 + sound/pci/ctxfi/ctvmem.c | 250 +++ sound/pci/ctxfi/ctvmem.h | 61 + sound/pci/ctxfi/xfi.c | 142 ++ sound/pci/emu10k1/Makefile | 10 +- sound/pci/emu10k1/emu10k1x.c | 1 - sound/pci/emu10k1/emupcm.c | 2 +- sound/pci/hda/Kconfig | 13 + sound/pci/hda/Makefile | 4 + sound/pci/hda/hda_beep.c | 55 +- sound/pci/hda/hda_beep.h | 5 +- sound/pci/hda/hda_codec.c | 239 ++- sound/pci/hda/hda_codec.h | 13 +- sound/pci/hda/hda_hwdep.c | 9 +- sound/pci/hda/hda_intel.c | 197 ++- sound/pci/hda/hda_proc.c | 8 +- sound/pci/hda/patch_ca0110.c | 573 ++++++ sound/pci/hda/patch_nvhdmi.c | 279 +++- sound/pci/hda/patch_realtek.c | 2328 +++++++++++++---------- sound/pci/hda/patch_sigmatel.c | 275 +++- sound/pci/hda/patch_via.c | 111 +- sound/pci/ice1712/Makefile | 2 +- sound/pci/ice1712/ice1712.h | 12 +- sound/pci/ice1712/ice1724.c | 96 +- sound/pci/ice1712/maya44.c | 779 ++++++++ sound/pci/ice1712/maya44.h | 10 + sound/pci/lx6464es/Makefile | 2 + sound/pci/lx6464es/lx6464es.c | 1152 +++++++++++ sound/pci/lx6464es/lx6464es.h | 114 ++ sound/pci/lx6464es/lx_core.c | 1444 ++++++++++++++ sound/pci/lx6464es/lx_core.h | 242 +++ sound/pci/lx6464es/lx_defs.h | 376 ++++ sound/pci/oxygen/oxygen_pcm.c | 6 +- sound/pci/oxygen/virtuoso.c | 64 +- sound/pci/riptide/riptide.c | 347 ++-- sound/pci/rme9652/hdsp.c | 11 +- sound/pci/rme9652/hdspm.c | 4 +- sound/ppc/awacs.c | 54 +- sound/ppc/beep.c | 2 +- sound/ppc/burgundy.c | 26 +- sound/ppc/daca.c | 2 +- sound/ppc/keywest.c | 10 +- sound/ppc/pmac.c | 12 +- sound/ppc/tumbler.c | 16 +- sound/soc/Kconfig | 2 + sound/soc/Makefile | 2 + sound/soc/atmel/Kconfig | 8 + sound/soc/atmel/Makefile | 1 + sound/soc/atmel/playpaq_wm8510.c | 2 +- sound/soc/atmel/snd-soc-afeb9260.c | 203 ++ sound/soc/blackfin/bf5xx-ac97.c | 9 + sound/soc/blackfin/bf5xx-sport.c | 4 +- sound/soc/codecs/Kconfig | 24 + sound/soc/codecs/Makefile | 12 + sound/soc/codecs/ac97.c | 4 +- sound/soc/codecs/ad1980.c | 4 +- sound/soc/codecs/cs4270.c | 105 +- sound/soc/codecs/spdif_transciever.c | 71 + sound/soc/codecs/spdif_transciever.h | 17 + sound/soc/codecs/ssm2602.c | 33 +- sound/soc/codecs/stac9766.c | 463 +++++ sound/soc/codecs/stac9766.h | 21 + sound/soc/codecs/tlv320aic23.c | 16 +- sound/soc/codecs/twl4030.c | 1116 +++++++++--- sound/soc/codecs/twl4030.h | 43 +- sound/soc/codecs/uda134x.c | 4 +- sound/soc/codecs/wm8350.c | 2 +- sound/soc/codecs/wm8350.h | 1 + sound/soc/codecs/wm8400.c | 8 +- sound/soc/codecs/wm8510.c | 2 +- sound/soc/codecs/wm8580.c | 4 +- sound/soc/codecs/wm8731.c | 4 +- sound/soc/codecs/wm8753.c | 6 +- sound/soc/codecs/wm8900.c | 6 +- sound/soc/codecs/wm8903.c | 119 +- sound/soc/codecs/wm8940.c | 955 ++++++++++ sound/soc/codecs/wm8940.h | 104 + sound/soc/codecs/wm8960.c | 969 ++++++++++ sound/soc/codecs/wm8960.h | 127 ++ sound/soc/codecs/wm8988.c | 1097 +++++++++++ sound/soc/codecs/wm8988.h | 60 + sound/soc/codecs/wm8990.c | 2 +- sound/soc/codecs/wm9081.c | 1534 +++++++++++++++ sound/soc/codecs/wm9081.h | 787 ++++++++ sound/soc/codecs/wm9705.c | 4 +- sound/soc/codecs/wm9712.c | 8 +- sound/soc/codecs/wm9713.c | 48 +- sound/soc/fsl/Kconfig | 32 +- sound/soc/fsl/Makefile | 7 + sound/soc/fsl/efika-audio-fabric.c | 90 + sound/soc/fsl/fsl_ssi.c | 11 +- sound/soc/fsl/mpc5200_dma.c | 564 ++++++ sound/soc/fsl/mpc5200_dma.h | 80 + sound/soc/fsl/mpc5200_psc_ac97.c | 329 ++++ sound/soc/fsl/mpc5200_psc_ac97.h | 15 + sound/soc/fsl/mpc5200_psc_i2s.c | 754 +------- sound/soc/fsl/mpc5200_psc_i2s.h | 12 + sound/soc/fsl/pcm030-audio-fabric.c | 90 + sound/soc/omap/Kconfig | 8 + sound/soc/omap/Makefile | 2 + sound/soc/omap/n810.c | 7 +- sound/soc/omap/omap-mcbsp.c | 43 +- sound/soc/omap/omap-pcm.c | 9 +- sound/soc/omap/omap2evm.c | 2 +- sound/soc/omap/omap3beagle.c | 28 +- sound/soc/omap/omap3evm.c | 147 ++ sound/soc/omap/omap3pandora.c | 4 +- sound/soc/omap/overo.c | 2 +- sound/soc/omap/sdp3430.c | 94 +- sound/soc/pxa/Kconfig | 13 +- sound/soc/pxa/Makefile | 2 + sound/soc/pxa/em-x270.c | 9 +- sound/soc/pxa/imote2.c | 114 ++ sound/soc/pxa/magician.c | 13 +- sound/soc/pxa/pxa-ssp.c | 218 +-- sound/soc/pxa/pxa2xx-i2s.c | 39 +- sound/soc/s3c24xx/s3c-i2s-v2.c | 91 +- sound/soc/s3c24xx/s3c2412-i2s.c | 2 +- sound/soc/s3c24xx/s3c64xx-i2s.c | 157 +- sound/soc/s3c24xx/s3c64xx-i2s.h | 6 +- sound/soc/s6000/Kconfig | 19 + sound/soc/s6000/Makefile | 11 + sound/soc/s6000/s6000-i2s.c | 629 ++++++ sound/soc/s6000/s6000-i2s.h | 25 + sound/soc/s6000/s6000-pcm.c | 497 +++++ sound/soc/s6000/s6000-pcm.h | 35 + sound/soc/s6000/s6105-ipcam.c | 244 +++ sound/soc/sh/ssi.c | 2 +- sound/soc/soc-core.c | 165 +- sound/soc/soc-dapm.c | 427 +++-- sound/soc/txx9/Kconfig | 29 + sound/soc/txx9/Makefile | 11 + sound/soc/txx9/txx9aclc-ac97.c | 255 +++ sound/soc/txx9/txx9aclc-generic.c | 98 + sound/soc/txx9/txx9aclc.c | 430 +++++ sound/soc/txx9/txx9aclc.h | 83 + sound/synth/Makefile | 12 +- sound/synth/emux/Makefile | 12 +- sound/usb/caiaq/audio.c | 88 +- sound/usb/caiaq/device.c | 108 +- sound/usb/caiaq/device.h | 1 - sound/usb/caiaq/midi.c | 24 +- sound/usb/usbaudio.c | 39 +- sound/usb/usbquirks.h | 43 + 209 files changed, 33268 insertions(+), 3662 deletions(-) create mode 100644 Documentation/sound/alsa/README.maya44 delete mode 100644 include/sound/driver.h create mode 100644 include/sound/wm9081.h create mode 100644 sound/core/seq/Kconfig create mode 100644 sound/pci/ctxfi/Makefile create mode 100644 sound/pci/ctxfi/ct20k1reg.h create mode 100644 sound/pci/ctxfi/ct20k2reg.h create mode 100644 sound/pci/ctxfi/ctamixer.c create mode 100644 sound/pci/ctxfi/ctamixer.h create mode 100644 sound/pci/ctxfi/ctatc.c create mode 100644 sound/pci/ctxfi/ctatc.h create mode 100644 sound/pci/ctxfi/ctdaio.c create mode 100644 sound/pci/ctxfi/ctdaio.h create mode 100644 sound/pci/ctxfi/cthardware.c create mode 100644 sound/pci/ctxfi/cthardware.h create mode 100644 sound/pci/ctxfi/cthw20k1.c create mode 100644 sound/pci/ctxfi/cthw20k1.h create mode 100644 sound/pci/ctxfi/cthw20k2.c create mode 100644 sound/pci/ctxfi/cthw20k2.h create mode 100644 sound/pci/ctxfi/ctimap.c create mode 100644 sound/pci/ctxfi/ctimap.h create mode 100644 sound/pci/ctxfi/ctmixer.c create mode 100644 sound/pci/ctxfi/ctmixer.h create mode 100644 sound/pci/ctxfi/ctpcm.c create mode 100644 sound/pci/ctxfi/ctpcm.h create mode 100644 sound/pci/ctxfi/ctresource.c create mode 100644 sound/pci/ctxfi/ctresource.h create mode 100644 sound/pci/ctxfi/ctsrc.c create mode 100644 sound/pci/ctxfi/ctsrc.h create mode 100644 sound/pci/ctxfi/cttimer.c create mode 100644 sound/pci/ctxfi/cttimer.h create mode 100644 sound/pci/ctxfi/ctvmem.c create mode 100644 sound/pci/ctxfi/ctvmem.h create mode 100644 sound/pci/ctxfi/xfi.c create mode 100644 sound/pci/hda/patch_ca0110.c create mode 100644 sound/pci/ice1712/maya44.c create mode 100644 sound/pci/ice1712/maya44.h create mode 100644 sound/pci/lx6464es/Makefile create mode 100644 sound/pci/lx6464es/lx6464es.c create mode 100644 sound/pci/lx6464es/lx6464es.h create mode 100644 sound/pci/lx6464es/lx_core.c create mode 100644 sound/pci/lx6464es/lx_core.h create mode 100644 sound/pci/lx6464es/lx_defs.h create mode 100644 sound/soc/atmel/snd-soc-afeb9260.c create mode 100644 sound/soc/codecs/spdif_transciever.c create mode 100644 sound/soc/codecs/spdif_transciever.h create mode 100644 sound/soc/codecs/stac9766.c create mode 100644 sound/soc/codecs/stac9766.h create mode 100644 sound/soc/codecs/wm8940.c create mode 100644 sound/soc/codecs/wm8940.h create mode 100644 sound/soc/codecs/wm8960.c create mode 100644 sound/soc/codecs/wm8960.h create mode 100644 sound/soc/codecs/wm8988.c create mode 100644 sound/soc/codecs/wm8988.h create mode 100644 sound/soc/codecs/wm9081.c create mode 100644 sound/soc/codecs/wm9081.h create mode 100644 sound/soc/fsl/efika-audio-fabric.c create mode 100644 sound/soc/fsl/mpc5200_dma.c create mode 100644 sound/soc/fsl/mpc5200_dma.h create mode 100644 sound/soc/fsl/mpc5200_psc_ac97.c create mode 100644 sound/soc/fsl/mpc5200_psc_ac97.h create mode 100644 sound/soc/fsl/mpc5200_psc_i2s.h create mode 100644 sound/soc/fsl/pcm030-audio-fabric.c create mode 100644 sound/soc/omap/omap3evm.c create mode 100644 sound/soc/pxa/imote2.c create mode 100644 sound/soc/s6000/Kconfig create mode 100644 sound/soc/s6000/Makefile create mode 100644 sound/soc/s6000/s6000-i2s.c create mode 100644 sound/soc/s6000/s6000-i2s.h create mode 100644 sound/soc/s6000/s6000-pcm.c create mode 100644 sound/soc/s6000/s6000-pcm.h create mode 100644 sound/soc/s6000/s6105-ipcam.c create mode 100644 sound/soc/txx9/Kconfig create mode 100644 sound/soc/txx9/Makefile create mode 100644 sound/soc/txx9/txx9aclc-ac97.c create mode 100644 sound/soc/txx9/txx9aclc-generic.c create mode 100644 sound/soc/txx9/txx9aclc.c create mode 100644 sound/soc/txx9/txx9aclc.h Merging pci-current/for-linus $ git merge pci-current/for-linus Already up-to-date. Merging wireless-current/master $ git merge wireless-current/master Already up-to-date. Merging kbuild-current/master $ git merge kbuild-current/master Already up-to-date. Merging quilt/driver-core.current $ git merge quilt/driver-core.current Already up-to-date. Merging quilt/usb.current $ git merge quilt/usb.current Merge made by recursive. drivers/usb/misc/sisusbvga/Kconfig | 2 +- drivers/usb/serial/ftdi_sio.c | 1 + drivers/usb/serial/ftdi_sio.h | 3 +++ drivers/usb/serial/option.c | 5 +++++ 4 files changed, 10 insertions(+), 1 deletions(-) Merging cpufreq-current/fixes $ git merge cpufreq-current/fixes Already up-to-date. Merging input-current/for-linus $ git merge input-current/for-linus Already up-to-date. Merging md-current/for-linus $ git merge md-current/for-linus Already up-to-date. Merging audit-current/for-linus $ git merge audit-current/for-linus Already up-to-date. Merging crypto-current/master $ git merge crypto-current/master Already up-to-date. Merging dwmw2/master $ git merge dwmw2/master Already up-to-date. Merging arm/devel $ git merge arm/devel Auto-merging MAINTAINERS Removing arch/arm/include/asm/hardware/arm_twd.h Removing arch/arm/mach-davinci/id.c Removing arch/arm/mach-davinci/include/mach/board-dm6446evm.h Removing arch/arm/mach-ep93xx/edb9302.c Removing arch/arm/mach-ep93xx/edb9302a.c Removing arch/arm/mach-ep93xx/edb9307.c Removing arch/arm/mach-ep93xx/edb9307a.c Removing arch/arm/mach-ep93xx/edb9312.c Removing arch/arm/mach-ep93xx/edb9315.c Removing arch/arm/mach-ep93xx/edb9315a.c Removing arch/arm/mach-imx/Kconfig Removing arch/arm/mach-imx/Makefile Removing arch/arm/mach-imx/Makefile.boot Removing arch/arm/mach-imx/clock.c Removing arch/arm/mach-imx/cpufreq.c Removing arch/arm/mach-imx/dma.c Removing arch/arm/mach-imx/generic.c Removing arch/arm/mach-imx/generic.h Removing arch/arm/mach-imx/include/mach/debug-macro.S Removing arch/arm/mach-imx/include/mach/dma.h Removing arch/arm/mach-imx/include/mach/entry-macro.S Removing arch/arm/mach-imx/include/mach/gpio.h Removing arch/arm/mach-imx/include/mach/hardware.h Removing arch/arm/mach-imx/include/mach/imx-dma.h Removing arch/arm/mach-imx/include/mach/imx-regs.h Removing arch/arm/mach-imx/include/mach/imx-uart.h Removing arch/arm/mach-imx/include/mach/irqs.h Removing arch/arm/mach-imx/include/mach/mmc.h Removing arch/arm/mach-imx/include/mach/spi_imx.h Removing arch/arm/mach-imx/include/mach/uncompress.h Removing arch/arm/mach-imx/irq.c Removing arch/arm/mach-imx/leds-mx1ads.c Removing arch/arm/mach-imx/leds.c Removing arch/arm/mach-imx/leds.h Removing arch/arm/mach-imx/mx1ads.c Removing arch/arm/mach-imx/time.c Auto-merging arch/arm/mach-mx2/clock_imx21.c Auto-merging arch/arm/mach-mx3/clock-imx35.c Auto-merging arch/arm/mach-mx3/clock.c Removing arch/arm/mach-omap2/pm.c Removing arch/arm/mach-realview/include/mach/scu.h Removing arch/arm/plat-mxc/include/mach/mxc_timer.h Auto-merging drivers/mmc/host/omap_hsmmc.c Auto-merging drivers/serial/imx.c Auto-merging include/linux/amba/serial.h Auto-merging sound/soc/s3c24xx/s3c2412-i2s.c Merge made by recursive. Documentation/arm/Samsung-S3C24XX/GPIO.txt | 10 +- MAINTAINERS | 77 +- arch/arm/Kconfig | 227 ++- arch/arm/Makefile | 121 +- arch/arm/common/Kconfig | 8 + arch/arm/common/clkdev.c | 18 + arch/arm/common/vic.c | 221 +++- arch/arm/configs/davinci_all_defconfig | 21 +- arch/arm/configs/ep93xx_defconfig | 853 ++++++---- arch/arm/configs/kirkwood_defconfig | 5 +- arch/arm/configs/mx21_defconfig | 1170 ++++++++++++ arch/arm/configs/omap3_evm_defconfig | 1528 ++++++++++++++++ arch/arm/configs/omap_4430sdp_defconfig | 866 +++++++++ arch/arm/configs/omap_zoom2_defconfig | 1211 +++++++++++++ arch/arm/configs/orion5x_defconfig | 3 +- arch/arm/configs/rx51_defconfig | 2 +- arch/arm/configs/stmp378x_defconfig | 1141 ++++++++++++ arch/arm/configs/stmp37xx_defconfig | 1002 +++++++++++ arch/arm/configs/u300_defconfig | 1115 ++++++++++++ arch/arm/include/asm/hardware/arm_twd.h | 21 - arch/arm/include/asm/hardware/pl080.h | 138 ++ arch/arm/include/asm/hardware/vic.h | 2 +- arch/arm/include/asm/localtimer.h | 63 + arch/arm/include/asm/mach/map.h | 8 + arch/arm/include/asm/pgtable.h | 2 +- arch/arm/include/asm/sizes.h | 1 + arch/arm/include/asm/smp.h | 42 +- arch/arm/include/asm/smp_scu.h | 7 + arch/arm/include/asm/smp_twd.h | 12 + arch/arm/kernel/Makefile | 2 + arch/arm/kernel/smp.c | 62 +- arch/arm/kernel/smp_scu.c | 48 + arch/arm/kernel/smp_twd.c | 175 ++ arch/arm/mach-at91/board-afeb-9260v1.c | 6 + arch/arm/mach-at91/board-sam9g20ek.c | 9 +- arch/arm/mach-at91/clock.c | 151 ++- arch/arm/mach-at91/include/mach/at91_pmc.h | 26 +- arch/arm/mach-davinci/Kconfig | 43 + arch/arm/mach-davinci/Makefile | 13 +- arch/arm/mach-davinci/board-dm355-evm.c | 298 ++++ arch/arm/mach-davinci/board-dm355-leopard.c | 296 ++++ arch/arm/mach-davinci/board-dm644x-evm.c | 68 +- arch/arm/mach-davinci/board-dm646x-evm.c | 262 +++ arch/arm/mach-davinci/board-sffsdr.c | 189 ++ arch/arm/mach-davinci/clock.c | 10 +- arch/arm/mach-davinci/clock.h | 4 + arch/arm/mach-davinci/common.c | 108 ++ arch/arm/mach-davinci/cp_intc.c | 161 ++ arch/arm/mach-davinci/devices.c | 211 +++ arch/arm/mach-davinci/dm355.c | 730 ++++++++ arch/arm/mach-davinci/dm644x.c | 204 +++- arch/arm/mach-davinci/dm646x.c | 636 +++++++ arch/arm/mach-davinci/gpio.c | 63 +- arch/arm/mach-davinci/id.c | 116 -- .../mach-davinci/include/mach/board-dm6446evm.h | 20 - arch/arm/mach-davinci/include/mach/common.h | 55 +- arch/arm/mach-davinci/include/mach/cp_intc.h | 57 + arch/arm/mach-davinci/include/mach/cputype.h | 29 +- arch/arm/mach-davinci/include/mach/debug-macro.S | 31 +- arch/arm/mach-davinci/include/mach/dm355.h | 22 + arch/arm/mach-davinci/include/mach/dm644x.h | 1 + arch/arm/mach-davinci/include/mach/dm646x.h | 26 + arch/arm/mach-davinci/include/mach/edma.h | 4 - arch/arm/mach-davinci/include/mach/emac.h | 36 + arch/arm/mach-davinci/include/mach/entry-macro.S | 25 +- arch/arm/mach-davinci/include/mach/gpio.h | 14 +- arch/arm/mach-davinci/include/mach/irqs.h | 3 + arch/arm/mach-davinci/include/mach/memory.h | 1 - arch/arm/mach-davinci/include/mach/mmc.h | 33 + arch/arm/mach-davinci/include/mach/mux.h | 16 - arch/arm/mach-davinci/include/mach/psc.h | 8 +- arch/arm/mach-davinci/include/mach/serial.h | 4 +- arch/arm/mach-davinci/include/mach/sram.h | 27 + arch/arm/mach-davinci/include/mach/time.h | 35 + arch/arm/mach-davinci/include/mach/uncompress.h | 19 +- arch/arm/mach-davinci/io.c | 38 - arch/arm/mach-davinci/irq.c | 217 +--- arch/arm/mach-davinci/mux.c | 24 +- arch/arm/mach-davinci/psc.c | 32 +- arch/arm/mach-davinci/serial.c | 74 +- arch/arm/mach-davinci/sram.c | 74 + arch/arm/mach-davinci/time.c | 247 ++- arch/arm/mach-ep93xx/Kconfig | 82 +- arch/arm/mach-ep93xx/Makefile | 8 +- arch/arm/mach-ep93xx/Makefile.boot | 7 +- arch/arm/mach-ep93xx/clock.c | 54 +- arch/arm/mach-ep93xx/core.c | 27 +- arch/arm/mach-ep93xx/edb9302.c | 68 - arch/arm/mach-ep93xx/edb9302a.c | 68 - arch/arm/mach-ep93xx/edb9307.c | 68 - arch/arm/mach-ep93xx/edb9307a.c | 80 - arch/arm/mach-ep93xx/edb9312.c | 69 - arch/arm/mach-ep93xx/edb9315.c | 68 - arch/arm/mach-ep93xx/edb9315a.c | 68 - arch/arm/mach-ep93xx/edb93xx.c | 217 +++ arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 20 +- arch/arm/mach-ep93xx/include/mach/memory.h | 6 + arch/arm/mach-imx/Kconfig | 11 - arch/arm/mach-imx/Makefile | 18 - arch/arm/mach-imx/Makefile.boot | 2 - arch/arm/mach-imx/clock.c | 210 --- arch/arm/mach-imx/cpufreq.c | 315 ---- arch/arm/mach-imx/dma.c | 597 ------- arch/arm/mach-imx/generic.c | 271 --- arch/arm/mach-imx/generic.h | 16 - arch/arm/mach-imx/include/mach/debug-macro.S | 34 - arch/arm/mach-imx/include/mach/dma.h | 56 - arch/arm/mach-imx/include/mach/entry-macro.S | 32 - arch/arm/mach-imx/include/mach/gpio.h | 106 -- arch/arm/mach-imx/include/mach/hardware.h | 91 - arch/arm/mach-imx/include/mach/imx-dma.h | 98 - arch/arm/mach-imx/include/mach/imx-regs.h | 376 ---- arch/arm/mach-imx/include/mach/imx-uart.h | 12 - arch/arm/mach-imx/include/mach/irqs.h | 121 -- arch/arm/mach-imx/include/mach/mmc.h | 15 - arch/arm/mach-imx/include/mach/spi_imx.h | 72 - arch/arm/mach-imx/include/mach/uncompress.h | 71 - arch/arm/mach-imx/irq.c | 311 ---- arch/arm/mach-imx/leds-mx1ads.c | 53 - arch/arm/mach-imx/leds.c | 31 - arch/arm/mach-imx/leds.h | 9 - arch/arm/mach-imx/mx1ads.c | 180 -- arch/arm/mach-imx/time.c | 220 --- arch/arm/mach-ixp4xx/Kconfig | 6 + arch/arm/mach-ixp4xx/Makefile | 1 + arch/arm/mach-ixp4xx/goramo_mlr.c | 507 ++++++ arch/arm/mach-ixp4xx/include/mach/cpu.h | 7 +- arch/arm/mach-ixp4xx/include/mach/qmgr.h | 69 +- arch/arm/mach-ixp4xx/ixp4xx_npe.c | 9 - arch/arm/mach-ixp4xx/ixp4xx_qmgr.c | 135 ++- arch/arm/mach-kirkwood/Kconfig | 6 + arch/arm/mach-kirkwood/Makefile | 3 + arch/arm/mach-kirkwood/addr-map.c | 14 +- arch/arm/mach-kirkwood/common.c | 159 ++ arch/arm/mach-kirkwood/common.h | 4 +- arch/arm/mach-kirkwood/cpuidle.c | 96 + arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 31 +- arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 21 + arch/arm/mach-kirkwood/include/mach/io.h | 25 + arch/arm/mach-kirkwood/include/mach/kirkwood.h | 18 +- arch/arm/mach-kirkwood/mpp.c | 3 + arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 173 ++ arch/arm/mach-kirkwood/pcie.c | 4 + arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 - arch/arm/mach-kirkwood/rd88f6281-setup.c | 31 +- arch/arm/mach-kirkwood/sheevaplug-setup.c | 32 +- arch/arm/mach-mv78xx0/irq.c | 3 + arch/arm/mach-mx1/generic.c | 5 +- arch/arm/mach-mx1/mx1ads.c | 92 +- arch/arm/mach-mx1/scb9328.c | 2 +- arch/arm/mach-mx2/Kconfig | 21 + arch/arm/mach-mx2/Makefile | 4 + arch/arm/mach-mx2/clock_imx21.c | 77 +- arch/arm/mach-mx2/generic.c | 12 +- arch/arm/mach-mx2/mx21ads.c | 286 +++ arch/arm/mach-mx2/mx27ads.c | 315 ++-- arch/arm/mach-mx2/mx27lite.c | 95 + arch/arm/mach-mx2/mx27pdk.c | 95 + arch/arm/mach-mx2/pcm038.c | 195 +-- arch/arm/mach-mx2/pcm970-baseboard.c | 123 +- arch/arm/mach-mx3/Kconfig | 34 +- arch/arm/mach-mx3/Makefile | 4 + arch/arm/mach-mx3/armadillo5x0.c | 295 +++ arch/arm/mach-mx3/clock-imx35.c | 38 +- arch/arm/mach-mx3/clock.c | 17 +- arch/arm/mach-mx3/devices.c | 66 +- arch/arm/mach-mx3/devices.h | 4 + arch/arm/mach-mx3/iomux.c | 25 +- arch/arm/mach-mx3/mm.c | 11 +- arch/arm/mach-mx3/mx31ads.c | 4 +- arch/arm/mach-mx3/mx31lilly-db.c | 216 +++ arch/arm/mach-mx3/mx31lilly.c | 155 ++ arch/arm/mach-mx3/mx31lite.c | 74 +- arch/arm/mach-mx3/mx31moboard-devboard.c | 123 ++- arch/arm/mach-mx3/mx31moboard-marxbot.c | 128 ++- arch/arm/mach-mx3/mx31moboard.c | 117 +- arch/arm/mach-mx3/mx31pdk.c | 200 ++- arch/arm/mach-mx3/mx35pdk.c | 104 ++ arch/arm/mach-mx3/pcm037.c | 282 +++- arch/arm/mach-mx3/pcm043.c | 252 +++ arch/arm/mach-mx3/qong.c | 2 +- arch/arm/mach-netx/generic.c | 2 +- arch/arm/mach-omap1/Kconfig | 1 - arch/arm/mach-omap1/Makefile | 4 + arch/arm/mach-omap1/board-nokia770.c | 13 + arch/arm/mach-omap1/clock.c | 2 +- arch/arm/mach-omap1/pm.c | 11 +- .../{plat-omap/include/mach => mach-omap1}/pm.h | 85 +- arch/arm/mach-omap1/serial.c | 3 - arch/arm/mach-omap1/sleep.S | 2 +- arch/arm/mach-omap2/Kconfig | 14 +- arch/arm/mach-omap2/Makefile | 39 +- arch/arm/mach-omap2/board-2430sdp.c | 114 +- arch/arm/mach-omap2/board-3430sdp.c | 87 +- arch/arm/mach-omap2/board-4430sdp.c | 94 + arch/arm/mach-omap2/board-ldp.c | 219 +++- arch/arm/mach-omap2/board-omap3beagle.c | 108 +- arch/arm/mach-omap2/board-omap3evm.c | 329 ++++ arch/arm/mach-omap2/board-omap3pandora.c | 197 ++- arch/arm/mach-omap2/board-overo.c | 79 +- arch/arm/mach-omap2/board-rx51-peripherals.c | 232 ++-- arch/arm/mach-omap2/board-zoom-debugboard.c | 160 ++ arch/arm/mach-omap2/board-zoom2.c | 110 ++ arch/arm/mach-omap2/clock.c | 18 +- arch/arm/mach-omap2/clock24xx.c | 23 +- arch/arm/mach-omap2/clock24xx.h | 11 + arch/arm/mach-omap2/clock34xx.c | 23 +- arch/arm/mach-omap2/clock34xx.h | 35 +- arch/arm/mach-omap2/clockdomains.h | 2 +- arch/arm/mach-omap2/cm-regbits-34xx.h | 14 + arch/arm/mach-omap2/cm.h | 6 +- arch/arm/mach-omap2/gpmc-onenand.c | 330 ++++ arch/arm/mach-omap2/gpmc-smc91x.c | 189 ++ arch/arm/mach-omap2/gpmc.c | 6 + arch/arm/mach-omap2/id.c | 8 +- arch/arm/mach-omap2/io.c | 52 +- arch/arm/mach-omap2/iommu2.c | 323 ++++ arch/arm/mach-omap2/irq.c | 18 +- arch/arm/mach-omap2/mmc-twl4030.c | 280 ++-- arch/arm/mach-omap2/mmc-twl4030.h | 3 +- arch/arm/mach-omap2/omap-headsmp.S | 46 + arch/arm/mach-omap2/omap-smp.c | 178 ++ arch/arm/mach-omap2/omap3-iommu.c | 105 ++ arch/arm/mach-omap2/pm-debug.c | 152 ++ arch/arm/mach-omap2/pm.c | 111 -- arch/arm/mach-omap2/pm.h | 38 + arch/arm/mach-omap2/pm24xx.c | 549 ++++++ arch/arm/mach-omap2/pm34xx.c | 710 ++++++++ arch/arm/mach-omap2/prcm-common.h | 2 + arch/arm/mach-omap2/prm.h | 207 ++- arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h | 55 + .../mach-omap2/sdram-qimonda-hyb18m512160af-6.h | 54 + arch/arm/mach-omap2/sdrc.c | 24 +- arch/arm/mach-omap2/sdrc2xxx.c | 5 +- arch/arm/mach-omap2/serial.c | 465 +++++- arch/arm/mach-omap2/sleep24xx.S | 1 - arch/arm/mach-omap2/sleep34xx.S | 436 +++++ arch/arm/mach-omap2/sram242x.S | 10 +- arch/arm/mach-omap2/sram243x.S | 10 +- arch/arm/mach-omap2/sram34xx.S | 129 +- arch/arm/mach-omap2/timer-gp.c | 13 +- arch/arm/mach-omap2/timer-mpu.c | 34 + arch/arm/mach-omap2/usb-musb.c | 21 +- arch/arm/mach-orion5x/addr-map.c | 14 +- arch/arm/mach-orion5x/common.c | 42 +- arch/arm/mach-orion5x/common.h | 2 + arch/arm/mach-orion5x/include/mach/bridge-regs.h | 4 +- arch/arm/mach-orion5x/include/mach/orion5x.h | 6 + arch/arm/mach-orion5x/include/mach/system.h | 2 +- arch/arm/mach-orion5x/mpp.c | 3 + arch/arm/mach-orion5x/mss2-setup.c | 4 +- arch/arm/mach-orion5x/ts78xx-fpga.h | 1 + arch/arm/mach-orion5x/ts78xx-setup.c | 58 + arch/arm/mach-orion5x/wnr854t-setup.c | 16 + arch/arm/mach-pxa/clock.c | 17 - arch/arm/mach-pxa/include/mach/palmld.h | 1 - arch/arm/mach-pxa/palmld.c | 11 +- arch/arm/mach-realview/Kconfig | 1 - arch/arm/mach-realview/Makefile | 3 +- arch/arm/mach-realview/core.h | 3 - arch/arm/mach-realview/include/mach/scu.h | 13 - arch/arm/mach-realview/localtimer.c | 188 +-- arch/arm/mach-realview/platsmp.c | 49 +- arch/arm/mach-realview/realview_eb.c | 1 + arch/arm/mach-realview/realview_pb11mp.c | 1 + arch/arm/mach-s3c2400/gpio.c | 6 +- arch/arm/mach-s3c2410/Kconfig | 8 + arch/arm/mach-s3c2410/dma.c | 4 +- arch/arm/mach-s3c2410/gpio.c | 6 +- arch/arm/mach-s3c2410/h1940-bluetooth.c | 26 +- arch/arm/mach-s3c2410/include/mach/dma.h | 265 +--- arch/arm/mach-s3c2410/include/mach/gpio-core.h | 2 +- arch/arm/mach-s3c2410/include/mach/gpio-fns.h | 103 ++ arch/arm/mach-s3c2410/include/mach/gpio-nrs.h | 70 + arch/arm/mach-s3c2410/include/mach/gpio.h | 1 + arch/arm/mach-s3c2410/include/mach/hardware.h | 95 - arch/arm/mach-s3c2410/include/mach/map.h | 2 +- arch/arm/mach-s3c2410/include/mach/regs-gpio.h | 333 ---- arch/arm/mach-s3c2410/include/mach/system-reset.h | 36 +- arch/arm/mach-s3c2410/mach-amlm5900.c | 5 +- arch/arm/mach-s3c2410/mach-bast.c | 10 +- arch/arm/mach-s3c2410/mach-h1940.c | 2 +- arch/arm/mach-s3c2410/mach-n30.c | 51 +- arch/arm/mach-s3c2410/mach-qt2410.c | 19 +- arch/arm/mach-s3c2410/mach-vr1000.c | 11 +- arch/arm/mach-s3c2410/pm.c | 5 +- arch/arm/mach-s3c2410/usb-simtec.c | 32 +- arch/arm/mach-s3c2412/Kconfig | 3 + arch/arm/mach-s3c2412/dma.c | 3 +- arch/arm/mach-s3c2412/mach-jive.c | 43 +- arch/arm/mach-s3c2412/mach-smdk2413.c | 9 +- arch/arm/mach-s3c2440/Kconfig | 5 + arch/arm/mach-s3c2440/dma.c | 4 +- arch/arm/mach-s3c2440/mach-anubis.c | 3 +- arch/arm/mach-s3c2440/mach-at2440evb.c | 2 +- arch/arm/mach-s3c2440/mach-nexcoder.c | 17 +- arch/arm/mach-s3c2440/mach-osiris.c | 9 +- arch/arm/mach-s3c2443/dma.c | 3 +- arch/arm/mach-s3c6400/Kconfig | 25 +- arch/arm/mach-s3c6400/Makefile | 10 +- arch/arm/mach-s3c6400/include/mach/dma.h | 59 +- arch/arm/mach-s3c6400/include/mach/map.h | 6 + arch/arm/mach-s3c6400/include/mach/regs-clock.h | 16 + arch/arm/mach-s3c6400/include/mach/system.h | 8 +- arch/arm/mach-s3c6400/mach-smdk6400.c | 96 + arch/arm/mach-s3c6400/s3c6400.c | 89 + arch/arm/mach-s3c6400/setup-sdhci.c | 63 + arch/arm/mach-s3c6410/Kconfig | 37 + arch/arm/mach-s3c6410/Makefile | 4 + arch/arm/mach-s3c6410/cpu.c | 3 +- arch/arm/mach-s3c6410/mach-anw6410.c | 245 +++ arch/arm/mach-s3c6410/mach-ncp.c | 107 ++ arch/arm/mach-s3c6410/mach-smdk6410.c | 198 +++ arch/arm/mach-s3c6410/setup-sdhci.c | 34 - arch/arm/mach-stmp378x/Makefile | 2 + arch/arm/mach-stmp378x/Makefile.boot | 3 + arch/arm/mach-stmp378x/include/mach/entry-macro.S | 35 + arch/arm/mach-stmp378x/include/mach/irqs.h | 95 + arch/arm/mach-stmp378x/include/mach/pins.h | 151 ++ arch/arm/mach-stmp378x/include/mach/regs-apbh.h | 101 ++ arch/arm/mach-stmp378x/include/mach/regs-apbx.h | 119 ++ arch/arm/mach-stmp378x/include/mach/regs-audioin.h | 63 + .../arm/mach-stmp378x/include/mach/regs-audioout.h | 104 ++ arch/arm/mach-stmp378x/include/mach/regs-bch.h | 56 + arch/arm/mach-stmp378x/include/mach/regs-clkctrl.h | 88 + arch/arm/mach-stmp378x/include/mach/regs-dcp.h | 87 + arch/arm/mach-stmp378x/include/mach/regs-digctl.h | 38 + .../include/mach/regs-dram.h} | 17 +- arch/arm/mach-stmp378x/include/mach/regs-dri.h | 45 + arch/arm/mach-stmp378x/include/mach/regs-ecc8.h | 39 + .../include/mach/regs-emi.h} | 17 +- arch/arm/mach-stmp378x/include/mach/regs-gpmi.h | 78 + arch/arm/mach-stmp378x/include/mach/regs-i2c.h | 55 + arch/arm/mach-stmp378x/include/mach/regs-icoll.h | 45 + .../include/mach/regs-ir.h} | 17 +- arch/arm/mach-stmp378x/include/mach/regs-lcdif.h | 195 ++ arch/arm/mach-stmp378x/include/mach/regs-lradc.h | 99 + arch/arm/mach-stmp378x/include/mach/regs-ocotp.h | 40 + arch/arm/mach-stmp378x/include/mach/regs-pinctrl.h | 90 + arch/arm/mach-stmp378x/include/mach/regs-power.h | 63 + arch/arm/mach-stmp378x/include/mach/regs-pwm.h | 53 + arch/arm/mach-stmp378x/include/mach/regs-pxp.h | 140 ++ arch/arm/mach-stmp378x/include/mach/regs-rtc.h | 59 + .../include/mach/regs-saif.h} | 9 +- arch/arm/mach-stmp378x/include/mach/regs-spdif.h | 49 + arch/arm/mach-stmp378x/include/mach/regs-ssp.h | 102 ++ .../include/mach/regs-sydma.h} | 11 +- arch/arm/mach-stmp378x/include/mach/regs-timrot.h | 68 + arch/arm/mach-stmp378x/include/mach/regs-tvenc.h | 67 + arch/arm/mach-stmp378x/include/mach/regs-uartapp.h | 87 + arch/arm/mach-stmp378x/include/mach/regs-uartdbg.h | 268 +++ arch/arm/mach-stmp378x/include/mach/regs-usbctrl.h | 40 + arch/arm/mach-stmp378x/include/mach/regs-usbphy.h | 37 + arch/arm/mach-stmp378x/stmp378x.c | 299 ++++ arch/arm/mach-stmp378x/stmp378x.h | 25 + arch/arm/mach-stmp378x/stmp378x_devb.c | 334 ++++ arch/arm/mach-stmp37xx/Makefile | 2 + arch/arm/mach-stmp37xx/Makefile.boot | 3 + arch/arm/mach-stmp37xx/include/mach/entry-macro.S | 37 + arch/arm/mach-stmp37xx/include/mach/irqs.h | 99 + arch/arm/mach-stmp37xx/include/mach/pins.h | 147 ++ arch/arm/mach-stmp37xx/include/mach/regs-apbh.h | 97 + arch/arm/mach-stmp37xx/include/mach/regs-apbx.h | 113 ++ arch/arm/mach-stmp37xx/include/mach/regs-audioin.h | 61 + .../arm/mach-stmp37xx/include/mach/regs-audioout.h | 111 ++ arch/arm/mach-stmp37xx/include/mach/regs-clkctrl.h | 72 + .../include/mach/regs-digctl.h} | 16 +- arch/arm/mach-stmp37xx/include/mach/regs-ecc8.h | 37 + arch/arm/mach-stmp37xx/include/mach/regs-gpmi.h | 63 + arch/arm/mach-stmp37xx/include/mach/regs-i2c.h | 55 + .../include/mach/regs-icoll.h} | 35 +- arch/arm/mach-stmp37xx/include/mach/regs-lcdif.h | 89 + arch/arm/mach-stmp37xx/include/mach/regs-lradc.h | 97 + arch/arm/mach-stmp37xx/include/mach/regs-pinctrl.h | 88 + arch/arm/mach-stmp37xx/include/mach/regs-power.h | 56 + arch/arm/mach-stmp37xx/include/mach/regs-pwm.h | 51 + arch/arm/mach-stmp37xx/include/mach/regs-rtc.h | 57 + arch/arm/mach-stmp37xx/include/mach/regs-ssp.h | 101 ++ arch/arm/mach-stmp37xx/include/mach/regs-timrot.h | 49 + arch/arm/mach-stmp37xx/include/mach/regs-uartapp.h | 85 + arch/arm/mach-stmp37xx/include/mach/regs-uartdbg.h | 268 +++ .../include/mach/regs-usbctl.h} | 16 +- .../include/mach/regs-usbctrl.h} | 18 +- arch/arm/mach-stmp37xx/include/mach/regs-usbphy.h | 37 + arch/arm/mach-stmp37xx/stmp37xx.c | 219 +++ arch/arm/mach-stmp37xx/stmp37xx.h | 24 + arch/arm/mach-stmp37xx/stmp37xx_devb.c | 101 ++ arch/arm/mach-u300/Kconfig | 105 ++ arch/arm/mach-u300/Makefile | 11 + arch/arm/mach-u300/Makefile.boot | 15 + arch/arm/mach-u300/clock.c | 1487 ++++++++++++++++ arch/arm/mach-u300/clock.h | 53 + arch/arm/mach-u300/core.c | 649 +++++++ arch/arm/mach-u300/gpio.c | 703 ++++++++ arch/arm/mach-u300/include/mach/clkdev.h | 7 + arch/arm/mach-u300/include/mach/debug-macro.S | 22 + arch/arm/mach-u300/include/mach/entry-macro.S | 40 + arch/arm/mach-u300/include/mach/gpio.h | 290 +++ arch/arm/mach-u300/include/mach/hardware.h | 5 + arch/arm/mach-u300/include/mach/io.h | 20 + arch/arm/mach-u300/include/mach/irqs.h | 114 ++ arch/arm/mach-u300/include/mach/memory.h | 42 + arch/arm/mach-u300/include/mach/platform.h | 19 + arch/arm/mach-u300/include/mach/syscon.h | 644 +++++++ arch/arm/mach-u300/include/mach/system.h | 42 + arch/arm/mach-u300/include/mach/timex.h | 17 + arch/arm/mach-u300/include/mach/u300-regs.h | 187 ++ .../include/mach/uncompress.h} | 38 +- arch/arm/mach-u300/include/mach/vmalloc.h | 12 + arch/arm/mach-u300/mmc.c | 216 +++ arch/arm/mach-u300/mmc.h | 18 + arch/arm/mach-u300/padmux.c | 58 + arch/arm/mach-u300/padmux.h | 19 + arch/arm/mach-u300/timer.c | 422 +++++ arch/arm/mach-u300/u300.c | 55 + arch/arm/mach-versatile/core.c | 2 +- arch/arm/mach-w90x900/include/mach/irqs.h | 49 +- arch/arm/mach-w90x900/include/mach/map.h | 101 +- arch/arm/mach-w90x900/include/mach/regs-clock.h | 31 + arch/arm/mach-w90x900/include/mach/regs-usb.h | 35 + arch/arm/mach-w90x900/mach-w90p910evb.c | 162 ++- arch/arm/mach-w90x900/w90p910.c | 12 +- arch/arm/mm/Kconfig | 3 - arch/arm/mm/ioremap.c | 6 + arch/arm/mm/mmu.c | 15 + arch/arm/plat-mxc/Kconfig | 7 + arch/arm/plat-mxc/Makefile | 1 + arch/arm/plat-mxc/gpio.c | 49 +- .../arm/plat-mxc/include/mach/board-armadillo5x0.h | 22 + arch/arm/plat-mxc/include/mach/board-mx21ads.h | 58 + arch/arm/plat-mxc/include/mach/board-mx27lite.h | 19 + arch/arm/plat-mxc/include/mach/board-mx27pdk.h | 19 + arch/arm/plat-mxc/include/mach/board-mx31ads.h | 2 +- arch/arm/plat-mxc/include/mach/board-mx31lilly.h | 46 + arch/arm/plat-mxc/include/mach/board-mx31lite.h | 22 +- arch/arm/plat-mxc/include/mach/board-mx31moboard.h | 2 +- arch/arm/plat-mxc/include/mach/board-mx31pdk.h | 47 +- .../include/mach/board-mx35pdk.h} | 15 +- arch/arm/plat-mxc/include/mach/board-pcm037.h | 2 +- arch/arm/plat-mxc/include/mach/board-pcm038.h | 2 +- .../include/mach/board-pcm043.h} | 15 +- arch/arm/plat-mxc/include/mach/board-qong.h | 2 +- arch/arm/plat-mxc/include/mach/common.h | 6 +- arch/arm/plat-mxc/include/mach/debug-macro.S | 18 + arch/arm/plat-mxc/include/mach/gpio.h | 1 + arch/arm/plat-mxc/include/mach/imx-uart.h | 2 +- arch/arm/plat-mxc/include/mach/imxfb.h | 4 +- arch/arm/plat-mxc/include/mach/iomux-mx3.h | 36 +- arch/arm/plat-mxc/include/mach/iomux-mx35.h | 1267 +++++++++++++ arch/arm/plat-mxc/include/mach/iomux-v3.h | 121 ++ arch/arm/plat-mxc/include/mach/memory.h | 8 + arch/arm/plat-mxc/include/mach/mx1.h | 2 +- arch/arm/plat-mxc/include/mach/mx3x.h | 6 + arch/arm/plat-mxc/include/mach/mxc_timer.h | 158 -- arch/arm/plat-mxc/include/mach/usb.h | 2 +- arch/arm/plat-mxc/iomux-v3.c | 98 + arch/arm/plat-mxc/irq.c | 79 +- arch/arm/plat-mxc/pwm.c | 144 +- arch/arm/plat-mxc/time.c | 155 ++- arch/arm/plat-omap/Kconfig | 19 +- arch/arm/plat-omap/Makefile | 1 + arch/arm/plat-omap/clock.c | 37 +- arch/arm/plat-omap/common.c | 114 +- arch/arm/plat-omap/devices.c | 2 + arch/arm/plat-omap/dma.c | 102 +- arch/arm/plat-omap/dmtimer.c | 73 +- arch/arm/plat-omap/gpio.c | 134 ++- arch/arm/plat-omap/i2c.c | 2 +- arch/arm/plat-omap/include/mach/clock.h | 10 +- arch/arm/plat-omap/include/mach/common.h | 3 +- arch/arm/plat-omap/include/mach/control.h | 20 +- arch/arm/plat-omap/include/mach/cpu.h | 21 +- arch/arm/plat-omap/include/mach/debug-macro.S | 2 +- arch/arm/plat-omap/include/mach/dma.h | 4 +- arch/arm/plat-omap/include/mach/entry-macro.S | 83 +- arch/arm/plat-omap/include/mach/gpmc-smc91x.h | 42 + arch/arm/plat-omap/include/mach/hardware.h | 1 + arch/arm/plat-omap/include/mach/hwa742.h | 4 - arch/arm/plat-omap/include/mach/io.h | 37 + arch/arm/plat-omap/include/mach/iommu.h | 168 ++ arch/arm/plat-omap/include/mach/iommu2.h | 96 + arch/arm/plat-omap/include/mach/iovmm.h | 94 + arch/arm/plat-omap/include/mach/irqs.h | 92 + arch/arm/plat-omap/include/mach/keypad.h | 4 + arch/arm/plat-omap/include/mach/memory.h | 3 +- arch/arm/plat-omap/include/mach/omap24xx.h | 18 - arch/arm/plat-omap/include/mach/omap34xx.h | 13 - arch/arm/plat-omap/include/mach/omap44xx.h | 46 + arch/arm/plat-omap/include/mach/onenand.h | 22 +- arch/arm/plat-omap/include/mach/serial.h | 25 +- arch/arm/plat-omap/include/mach/smp.h | 51 + arch/arm/plat-omap/include/mach/sram.h | 6 +- arch/arm/plat-omap/include/mach/usb.h | 6 - arch/arm/plat-omap/include/mach/vmalloc.h | 2 +- arch/arm/plat-omap/io.c | 29 +- arch/arm/plat-omap/iommu.c | 996 +++++++++++ arch/arm/plat-omap/iopgtable.h | 72 + arch/arm/plat-omap/iovmm.c | 896 ++++++++++ arch/arm/plat-omap/mcbsp.c | 34 +- arch/arm/plat-omap/mux.c | 3 + arch/arm/plat-omap/sram.c | 66 +- arch/arm/plat-orion/gpio.c | 194 +-- arch/arm/plat-orion/include/plat/gpio.h | 17 +- .../include/plat/{orion5x_wdt.h => orion_wdt.h} | 8 +- arch/arm/plat-orion/time.c | 59 +- arch/arm/plat-s3c/Kconfig | 26 + arch/arm/plat-s3c/Makefile | 7 + arch/arm/plat-s3c/dev-usb-hsotg.c | 41 + arch/arm/plat-s3c/dev-usb.c | 50 + arch/arm/plat-s3c/dma.c | 86 + arch/arm/plat-s3c/gpio.c | 11 +- arch/arm/plat-s3c/include/plat/adc.h | 10 +- arch/arm/plat-s3c/include/plat/clock.h | 1 + arch/arm/plat-s3c/include/plat/cpu.h | 3 + arch/arm/plat-s3c/include/plat/devs.h | 1 + arch/arm/plat-s3c/include/plat/dma-core.h | 22 + arch/arm/plat-s3c/include/plat/dma.h | 127 ++ arch/arm/plat-s3c/include/plat/gpio-core.h | 30 + arch/arm/plat-s3c/include/plat/pm.h | 15 + arch/arm/plat-s3c/include/plat/regs-serial.h | 5 + arch/arm/plat-s3c/include/plat/sdhci.h | 50 +- arch/arm/plat-s3c/include/plat/udc-hs.h | 29 + arch/arm/plat-s3c/include/plat/watchdog-reset.h | 49 + arch/arm/plat-s3c/pm-gpio.c | 380 ++++ arch/arm/plat-s3c/pm.c | 19 +- arch/arm/plat-s3c24xx/Kconfig | 1 + arch/arm/plat-s3c24xx/adc.c | 11 +- arch/arm/plat-s3c24xx/common-smdk.c | 25 +- arch/arm/plat-s3c24xx/devs.c | 30 - arch/arm/plat-s3c24xx/dma.c | 151 +- arch/arm/plat-s3c24xx/gpio.c | 34 +- arch/arm/plat-s3c24xx/gpiolib.c | 50 +- .../include/plat/{dma.h => dma-plat.h} | 12 +- arch/arm/plat-s3c24xx/include/plat/map.h | 1 - arch/arm/plat-s3c24xx/include/plat/pm-core.h | 5 + arch/arm/plat-s3c24xx/include/plat/regs-dma.h | 145 ++ arch/arm/plat-s3c24xx/pm.c | 222 +--- arch/arm/plat-s3c24xx/setup-i2c.c | 5 +- arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c | 20 +- arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c | 20 +- arch/arm/plat-s3c64xx/Kconfig | 10 + arch/arm/plat-s3c64xx/Makefile | 11 + arch/arm/plat-s3c64xx/clock.c | 19 + arch/arm/plat-s3c64xx/cpu.c | 32 + arch/arm/plat-s3c64xx/dma.c | 722 ++++++++ arch/arm/plat-s3c64xx/gpiolib.c | 10 +- arch/arm/plat-s3c64xx/include/plat/dma-plat.h | 70 + arch/arm/plat-s3c64xx/include/plat/irqs.h | 1 + arch/arm/plat-s3c64xx/include/plat/pm-core.h | 98 + arch/arm/plat-s3c64xx/include/plat/regs-clock.h | 1 + arch/arm/plat-s3c64xx/include/plat/s3c6400.h | 3 +- arch/arm/plat-s3c64xx/irq-eint.c | 3 + arch/arm/plat-s3c64xx/irq-pm.c | 111 ++ arch/arm/plat-s3c64xx/irq.c | 9 +- arch/arm/plat-s3c64xx/pm.c | 175 ++ arch/arm/plat-s3c64xx/s3c6400-clock.c | 106 ++- arch/arm/plat-s3c64xx/setup-sdhci-gpio.c | 55 + arch/arm/plat-s3c64xx/sleep.S | 144 ++ arch/arm/plat-stmp3xxx/Kconfig | 37 + arch/arm/plat-stmp3xxx/Makefile | 5 + arch/arm/plat-stmp3xxx/clock.c | 1135 ++++++++++++ arch/arm/plat-stmp3xxx/clock.h | 61 + arch/arm/plat-stmp3xxx/core.c | 128 ++ arch/arm/plat-stmp3xxx/devices.c | 389 ++++ arch/arm/plat-stmp3xxx/dma.c | 463 +++++ arch/arm/plat-stmp3xxx/include/mach/clkdev.h | 18 + arch/arm/plat-stmp3xxx/include/mach/cputype.h | 33 + arch/arm/plat-stmp3xxx/include/mach/debug-macro.S | 42 + arch/arm/plat-stmp3xxx/include/mach/dma.h | 153 ++ arch/arm/plat-stmp3xxx/include/mach/gpio.h | 28 + arch/arm/plat-stmp3xxx/include/mach/gpmi.h | 12 + arch/arm/plat-stmp3xxx/include/mach/hardware.h | 32 + arch/arm/plat-stmp3xxx/include/mach/io.h | 25 + arch/arm/plat-stmp3xxx/include/mach/memory.h | 22 + arch/arm/plat-stmp3xxx/include/mach/mmc.h | 14 + arch/arm/plat-stmp3xxx/include/mach/pinmux.h | 157 ++ arch/arm/plat-stmp3xxx/include/mach/pins.h | 30 + arch/arm/plat-stmp3xxx/include/mach/platform.h | 68 + arch/arm/plat-stmp3xxx/include/mach/stmp3xxx.h | 54 + arch/arm/plat-stmp3xxx/include/mach/system.h | 49 + arch/arm/plat-stmp3xxx/include/mach/timex.h | 20 + arch/arm/plat-stmp3xxx/include/mach/uncompress.h | 53 + arch/arm/plat-stmp3xxx/include/mach/vmalloc.h | 12 + arch/arm/plat-stmp3xxx/irq.c | 51 + arch/arm/plat-stmp3xxx/pinmux.c | 552 ++++++ arch/arm/plat-stmp3xxx/timer.c | 189 ++ drivers/ata/Kconfig | 9 + drivers/ata/Makefile | 1 + drivers/ata/pata_palmld.c | 150 ++ drivers/char/hw_random/Kconfig | 12 + drivers/char/hw_random/Makefile | 1 + drivers/char/hw_random/mxc-rnga.c | 247 +++ drivers/leds/leds-h1940.c | 2 + drivers/leds/leds-s3c24xx.c | 1 + drivers/media/video/Kconfig | 4 + drivers/mmc/host/Kconfig | 2 +- drivers/mmc/host/omap_hsmmc.c | 6 +- drivers/mmc/host/s3cmci.c | 5 +- drivers/mtd/onenand/omap2.c | 1 - drivers/net/arm/ixp4xx_eth.c | 26 +- drivers/net/wan/ixp4xx_hss.c | 11 +- drivers/rtc/rtc-ep93xx.c | 149 ++- drivers/serial/amba-pl011.c | 36 +- drivers/serial/imx.c | 13 +- drivers/spi/Kconfig | 11 +- drivers/spi/Makefile | 1 + drivers/spi/amba-pl022.c | 1866 ++++++++++++++++++++ drivers/spi/spi_s3c24xx_gpio.c | 1 + drivers/usb/host/ohci-ep93xx.c | 13 +- drivers/video/Kconfig | 2 +- drivers/video/mx3fb.c | 4 +- drivers/video/omap/hwa742.c | 26 +- drivers/watchdog/Kconfig | 10 +- drivers/watchdog/Makefile | 2 +- drivers/watchdog/{orion5x_wdt.c => orion_wdt.c} | 120 +- include/linux/amba/pl022.h | 264 +++ include/linux/amba/serial.h | 3 + include/linux/clk.h | 13 + sound/soc/s3c24xx/s3c2412-i2s.c | 1 + sound/soc/s3c24xx/s3c2443-ac97.c | 1 + sound/soc/s3c24xx/s3c24xx-i2s.c | 2 + sound/soc/s3c24xx/s3c24xx-pcm.c | 21 +- 622 files changed, 51615 insertions(+), 9378 deletions(-) create mode 100644 arch/arm/configs/mx21_defconfig create mode 100644 arch/arm/configs/omap3_evm_defconfig create mode 100644 arch/arm/configs/omap_4430sdp_defconfig create mode 100644 arch/arm/configs/omap_zoom2_defconfig create mode 100644 arch/arm/configs/stmp378x_defconfig create mode 100644 arch/arm/configs/stmp37xx_defconfig create mode 100644 arch/arm/configs/u300_defconfig delete mode 100644 arch/arm/include/asm/hardware/arm_twd.h create mode 100644 arch/arm/include/asm/hardware/pl080.h create mode 100644 arch/arm/include/asm/localtimer.h create mode 100644 arch/arm/include/asm/smp_scu.h create mode 100644 arch/arm/include/asm/smp_twd.h create mode 100644 arch/arm/kernel/smp_scu.c create mode 100644 arch/arm/kernel/smp_twd.c create mode 100644 arch/arm/mach-davinci/board-dm355-evm.c create mode 100644 arch/arm/mach-davinci/board-dm355-leopard.c create mode 100644 arch/arm/mach-davinci/board-dm646x-evm.c create mode 100644 arch/arm/mach-davinci/board-sffsdr.c create mode 100644 arch/arm/mach-davinci/common.c create mode 100644 arch/arm/mach-davinci/cp_intc.c create mode 100644 arch/arm/mach-davinci/dm355.c create mode 100644 arch/arm/mach-davinci/dm646x.c delete mode 100644 arch/arm/mach-davinci/id.c delete mode 100644 arch/arm/mach-davinci/include/mach/board-dm6446evm.h create mode 100644 arch/arm/mach-davinci/include/mach/cp_intc.h create mode 100644 arch/arm/mach-davinci/include/mach/dm355.h create mode 100644 arch/arm/mach-davinci/include/mach/dm646x.h create mode 100644 arch/arm/mach-davinci/include/mach/emac.h create mode 100644 arch/arm/mach-davinci/include/mach/mmc.h create mode 100644 arch/arm/mach-davinci/include/mach/sram.h create mode 100644 arch/arm/mach-davinci/include/mach/time.h create mode 100644 arch/arm/mach-davinci/sram.c delete mode 100644 arch/arm/mach-ep93xx/edb9302.c delete mode 100644 arch/arm/mach-ep93xx/edb9302a.c delete mode 100644 arch/arm/mach-ep93xx/edb9307.c delete mode 100644 arch/arm/mach-ep93xx/edb9307a.c delete mode 100644 arch/arm/mach-ep93xx/edb9312.c delete mode 100644 arch/arm/mach-ep93xx/edb9315.c delete mode 100644 arch/arm/mach-ep93xx/edb9315a.c create mode 100644 arch/arm/mach-ep93xx/edb93xx.c delete mode 100644 arch/arm/mach-imx/Kconfig delete mode 100644 arch/arm/mach-imx/Makefile delete mode 100644 arch/arm/mach-imx/Makefile.boot delete mode 100644 arch/arm/mach-imx/clock.c delete mode 100644 arch/arm/mach-imx/cpufreq.c delete mode 100644 arch/arm/mach-imx/dma.c delete mode 100644 arch/arm/mach-imx/generic.c delete mode 100644 arch/arm/mach-imx/generic.h delete mode 100644 arch/arm/mach-imx/include/mach/debug-macro.S delete mode 100644 arch/arm/mach-imx/include/mach/dma.h delete mode 100644 arch/arm/mach-imx/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-imx/include/mach/gpio.h delete mode 100644 arch/arm/mach-imx/include/mach/hardware.h delete mode 100644 arch/arm/mach-imx/include/mach/imx-dma.h delete mode 100644 arch/arm/mach-imx/include/mach/imx-regs.h delete mode 100644 arch/arm/mach-imx/include/mach/imx-uart.h delete mode 100644 arch/arm/mach-imx/include/mach/irqs.h delete mode 100644 arch/arm/mach-imx/include/mach/mmc.h delete mode 100644 arch/arm/mach-imx/include/mach/spi_imx.h delete mode 100644 arch/arm/mach-imx/include/mach/uncompress.h delete mode 100644 arch/arm/mach-imx/irq.c delete mode 100644 arch/arm/mach-imx/leds-mx1ads.c delete mode 100644 arch/arm/mach-imx/leds.c delete mode 100644 arch/arm/mach-imx/leds.h delete mode 100644 arch/arm/mach-imx/mx1ads.c delete mode 100644 arch/arm/mach-imx/time.c create mode 100644 arch/arm/mach-ixp4xx/goramo_mlr.c create mode 100644 arch/arm/mach-kirkwood/cpuidle.c create mode 100644 arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c create mode 100644 arch/arm/mach-mx2/mx21ads.c create mode 100644 arch/arm/mach-mx2/mx27lite.c create mode 100644 arch/arm/mach-mx2/mx27pdk.c create mode 100644 arch/arm/mach-mx3/armadillo5x0.c create mode 100644 arch/arm/mach-mx3/mx31lilly-db.c create mode 100644 arch/arm/mach-mx3/mx31lilly.c create mode 100644 arch/arm/mach-mx3/mx35pdk.c create mode 100644 arch/arm/mach-mx3/pcm043.c rename arch/arm/{plat-omap/include/mach => mach-omap1}/pm.h (76%) create mode 100644 arch/arm/mach-omap2/board-4430sdp.c create mode 100644 arch/arm/mach-omap2/board-omap3evm.c create mode 100644 arch/arm/mach-omap2/board-zoom-debugboard.c create mode 100644 arch/arm/mach-omap2/board-zoom2.c create mode 100644 arch/arm/mach-omap2/gpmc-onenand.c create mode 100644 arch/arm/mach-omap2/gpmc-smc91x.c create mode 100644 arch/arm/mach-omap2/iommu2.c create mode 100644 arch/arm/mach-omap2/omap-headsmp.S create mode 100644 arch/arm/mach-omap2/omap-smp.c create mode 100644 arch/arm/mach-omap2/omap3-iommu.c create mode 100644 arch/arm/mach-omap2/pm-debug.c delete mode 100644 arch/arm/mach-omap2/pm.c create mode 100644 arch/arm/mach-omap2/pm.h create mode 100644 arch/arm/mach-omap2/pm24xx.c create mode 100644 arch/arm/mach-omap2/pm34xx.c create mode 100644 arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h create mode 100644 arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h create mode 100644 arch/arm/mach-omap2/sleep34xx.S create mode 100644 arch/arm/mach-omap2/timer-mpu.c delete mode 100644 arch/arm/mach-realview/include/mach/scu.h create mode 100644 arch/arm/mach-s3c2410/include/mach/gpio-fns.h create mode 100644 arch/arm/mach-s3c6400/include/mach/regs-clock.h create mode 100644 arch/arm/mach-s3c6400/mach-smdk6400.c create mode 100644 arch/arm/mach-s3c6400/s3c6400.c create mode 100644 arch/arm/mach-s3c6400/setup-sdhci.c create mode 100644 arch/arm/mach-s3c6410/mach-anw6410.c create mode 100644 arch/arm/mach-s3c6410/mach-ncp.c create mode 100644 arch/arm/mach-stmp378x/Makefile create mode 100644 arch/arm/mach-stmp378x/Makefile.boot create mode 100644 arch/arm/mach-stmp378x/include/mach/entry-macro.S create mode 100644 arch/arm/mach-stmp378x/include/mach/irqs.h create mode 100644 arch/arm/mach-stmp378x/include/mach/pins.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-apbh.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-apbx.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-audioin.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-audioout.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-bch.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-clkctrl.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-dcp.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-digctl.h copy arch/arm/{mach-imx/include/mach/timex.h => mach-stmp378x/include/mach/regs-dram.h} (67%) create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-dri.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ecc8.h copy arch/arm/{mach-imx/include/mach/timex.h => mach-stmp378x/include/mach/regs-emi.h} (70%) create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-gpmi.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-i2c.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-icoll.h rename arch/arm/{mach-imx/include/mach/memory.h => mach-stmp378x/include/mach/regs-ir.h} (72%) create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-lcdif.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-lradc.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ocotp.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-pinctrl.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-power.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-pwm.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-pxp.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-rtc.h copy arch/arm/{mach-imx/include/mach/vmalloc.h => mach-stmp378x/include/mach/regs-saif.h} (78%) create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-spdif.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ssp.h rename arch/arm/{mach-imx/include/mach/vmalloc.h => mach-stmp378x/include/mach/regs-sydma.h} (71%) create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-timrot.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-tvenc.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-uartapp.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-uartdbg.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-usbctrl.h create mode 100644 arch/arm/mach-stmp378x/include/mach/regs-usbphy.h create mode 100644 arch/arm/mach-stmp378x/stmp378x.c create mode 100644 arch/arm/mach-stmp378x/stmp378x.h create mode 100644 arch/arm/mach-stmp378x/stmp378x_devb.c create mode 100644 arch/arm/mach-stmp37xx/Makefile create mode 100644 arch/arm/mach-stmp37xx/Makefile.boot create mode 100644 arch/arm/mach-stmp37xx/include/mach/entry-macro.S create mode 100644 arch/arm/mach-stmp37xx/include/mach/irqs.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/pins.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-apbh.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-apbx.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-audioin.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-audioout.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-clkctrl.h copy arch/arm/{mach-imx/include/mach/timex.h => mach-stmp37xx/include/mach/regs-digctl.h} (70%) create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-ecc8.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-gpmi.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-i2c.h rename arch/arm/{mach-imx/include/mach/mx1ads.h => mach-stmp37xx/include/mach/regs-icoll.h} (51%) create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-lcdif.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-lradc.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-pinctrl.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-power.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-pwm.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-rtc.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-ssp.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-timrot.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-uartapp.h create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-uartdbg.h copy arch/arm/{mach-imx/include/mach/timex.h => mach-stmp37xx/include/mach/regs-usbctl.h} (73%) rename arch/arm/{mach-imx/include/mach/io.h => mach-stmp37xx/include/mach/regs-usbctrl.h} (73%) create mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-usbphy.h create mode 100644 arch/arm/mach-stmp37xx/stmp37xx.c create mode 100644 arch/arm/mach-stmp37xx/stmp37xx.h create mode 100644 arch/arm/mach-stmp37xx/stmp37xx_devb.c create mode 100644 arch/arm/mach-u300/Kconfig create mode 100644 arch/arm/mach-u300/Makefile create mode 100644 arch/arm/mach-u300/Makefile.boot create mode 100644 arch/arm/mach-u300/clock.c create mode 100644 arch/arm/mach-u300/clock.h create mode 100644 arch/arm/mach-u300/core.c create mode 100644 arch/arm/mach-u300/gpio.c create mode 100644 arch/arm/mach-u300/include/mach/clkdev.h create mode 100644 arch/arm/mach-u300/include/mach/debug-macro.S create mode 100644 arch/arm/mach-u300/include/mach/entry-macro.S create mode 100644 arch/arm/mach-u300/include/mach/gpio.h create mode 100644 arch/arm/mach-u300/include/mach/hardware.h create mode 100644 arch/arm/mach-u300/include/mach/io.h create mode 100644 arch/arm/mach-u300/include/mach/irqs.h create mode 100644 arch/arm/mach-u300/include/mach/memory.h create mode 100644 arch/arm/mach-u300/include/mach/platform.h create mode 100644 arch/arm/mach-u300/include/mach/syscon.h create mode 100644 arch/arm/mach-u300/include/mach/system.h create mode 100644 arch/arm/mach-u300/include/mach/timex.h create mode 100644 arch/arm/mach-u300/include/mach/u300-regs.h rename arch/arm/{mach-imx/include/mach/system.h => mach-u300/include/mach/uncompress.h} (54%) create mode 100644 arch/arm/mach-u300/include/mach/vmalloc.h create mode 100644 arch/arm/mach-u300/mmc.c create mode 100644 arch/arm/mach-u300/mmc.h create mode 100644 arch/arm/mach-u300/padmux.c create mode 100644 arch/arm/mach-u300/padmux.h create mode 100644 arch/arm/mach-u300/timer.c create mode 100644 arch/arm/mach-u300/u300.c create mode 100644 arch/arm/mach-w90x900/include/mach/regs-clock.h create mode 100644 arch/arm/mach-w90x900/include/mach/regs-usb.h create mode 100644 arch/arm/plat-mxc/include/mach/board-armadillo5x0.h create mode 100644 arch/arm/plat-mxc/include/mach/board-mx21ads.h create mode 100644 arch/arm/plat-mxc/include/mach/board-mx27lite.h create mode 100644 arch/arm/plat-mxc/include/mach/board-mx27pdk.h create mode 100644 arch/arm/plat-mxc/include/mach/board-mx31lilly.h copy arch/arm/{mach-imx/include/mach/timex.h => plat-mxc/include/mach/board-mx35pdk.h} (68%) rename arch/arm/{mach-imx/include/mach/timex.h => plat-mxc/include/mach/board-pcm043.h} (69%) create mode 100644 arch/arm/plat-mxc/include/mach/iomux-mx35.h create mode 100644 arch/arm/plat-mxc/include/mach/iomux-v3.h delete mode 100644 arch/arm/plat-mxc/include/mach/mxc_timer.h create mode 100644 arch/arm/plat-mxc/iomux-v3.c create mode 100644 arch/arm/plat-omap/include/mach/gpmc-smc91x.h create mode 100644 arch/arm/plat-omap/include/mach/iommu.h create mode 100644 arch/arm/plat-omap/include/mach/iommu2.h create mode 100644 arch/arm/plat-omap/include/mach/iovmm.h create mode 100644 arch/arm/plat-omap/include/mach/omap44xx.h create mode 100644 arch/arm/plat-omap/include/mach/smp.h create mode 100644 arch/arm/plat-omap/iommu.c create mode 100644 arch/arm/plat-omap/iopgtable.h create mode 100644 arch/arm/plat-omap/iovmm.c rename arch/arm/plat-orion/include/plat/{orion5x_wdt.h => orion_wdt.h} (64%) create mode 100644 arch/arm/plat-s3c/dev-usb-hsotg.c create mode 100644 arch/arm/plat-s3c/dev-usb.c create mode 100644 arch/arm/plat-s3c/dma.c create mode 100644 arch/arm/plat-s3c/include/plat/dma-core.h create mode 100644 arch/arm/plat-s3c/include/plat/dma.h create mode 100644 arch/arm/plat-s3c/include/plat/udc-hs.h create mode 100644 arch/arm/plat-s3c/include/plat/watchdog-reset.h create mode 100644 arch/arm/plat-s3c/pm-gpio.c rename arch/arm/plat-s3c24xx/include/plat/{dma.h => dma-plat.h} (86%) create mode 100644 arch/arm/plat-s3c24xx/include/plat/regs-dma.h create mode 100644 arch/arm/plat-s3c64xx/dma.c create mode 100644 arch/arm/plat-s3c64xx/include/plat/dma-plat.h create mode 100644 arch/arm/plat-s3c64xx/include/plat/pm-core.h create mode 100644 arch/arm/plat-s3c64xx/irq-pm.c create mode 100644 arch/arm/plat-s3c64xx/pm.c create mode 100644 arch/arm/plat-s3c64xx/setup-sdhci-gpio.c create mode 100644 arch/arm/plat-s3c64xx/sleep.S create mode 100644 arch/arm/plat-stmp3xxx/Kconfig create mode 100644 arch/arm/plat-stmp3xxx/Makefile create mode 100644 arch/arm/plat-stmp3xxx/clock.c create mode 100644 arch/arm/plat-stmp3xxx/clock.h create mode 100644 arch/arm/plat-stmp3xxx/core.c create mode 100644 arch/arm/plat-stmp3xxx/devices.c create mode 100644 arch/arm/plat-stmp3xxx/dma.c create mode 100644 arch/arm/plat-stmp3xxx/include/mach/clkdev.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/cputype.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/debug-macro.S create mode 100644 arch/arm/plat-stmp3xxx/include/mach/dma.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/gpio.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/gpmi.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/hardware.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/io.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/memory.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/mmc.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/pinmux.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/pins.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/platform.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/stmp3xxx.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/system.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/timex.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/uncompress.h create mode 100644 arch/arm/plat-stmp3xxx/include/mach/vmalloc.h create mode 100644 arch/arm/plat-stmp3xxx/irq.c create mode 100644 arch/arm/plat-stmp3xxx/pinmux.c create mode 100644 arch/arm/plat-stmp3xxx/timer.c create mode 100644 drivers/ata/pata_palmld.c create mode 100644 drivers/char/hw_random/mxc-rnga.c create mode 100644 drivers/spi/amba-pl022.c rename drivers/watchdog/{orion5x_wdt.c => orion_wdt.c} (64%) create mode 100644 include/linux/amba/pl022.h Merging avr32/avr32-arch $ git merge avr32/avr32-arch Merge made by recursive. arch/avr32/boards/atngw100/Kconfig | 27 +- arch/avr32/boards/atngw100/Kconfig_mrmt | 80 ++ arch/avr32/boards/atngw100/Makefile | 1 + arch/avr32/boards/atngw100/mrmt.c | 373 ++++++++ arch/avr32/boards/atngw100/setup.c | 5 + arch/avr32/boards/merisc/setup.c | 7 +- arch/avr32/configs/atngw100_mrmt_defconfig | 1363 ++++++++++++++++++++++++++++ arch/avr32/include/asm/hw_irq.h | 2 +- drivers/mmc/host/atmel-mci.c | 12 +- include/linux/atmel-mci.h | 2 + 10 files changed, 1863 insertions(+), 9 deletions(-) create mode 100644 arch/avr32/boards/atngw100/Kconfig_mrmt create mode 100644 arch/avr32/boards/atngw100/mrmt.c create mode 100644 arch/avr32/configs/atngw100_mrmt_defconfig Merging blackfin/for-linus $ git merge blackfin/for-linus Already up-to-date. Merging cris/for-next $ git merge cris/for-next Merge made by recursive. arch/cris/arch-v32/lib/Makefile | 2 +- arch/cris/arch-v32/lib/strcmp.S | 21 +++++++++++++++++++++ arch/cris/include/arch-v32/arch/spinlock.h | 6 +++--- arch/cris/include/asm/string.h | 6 ++++++ 4 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 arch/cris/arch-v32/lib/strcmp.S Merging ia64/test $ git merge ia64/test Merge made by recursive. arch/ia64/hp/common/sba_iommu.c | 2 +- arch/ia64/include/asm/gcc_intrin.h | 18 ++++---- arch/ia64/include/asm/mca.h | 38 +++++++++--------- arch/ia64/include/asm/meminit.h | 18 ++++---- arch/ia64/include/asm/pal.h | 24 +++++------ arch/ia64/include/asm/processor.h | 56 +++++++++++++------------- arch/ia64/include/asm/sal.h | 8 ++-- arch/ia64/include/asm/sn/sn_sal.h | 2 +- arch/ia64/include/asm/types.h | 13 ++++-- arch/ia64/kernel/efi.c | 10 ++-- arch/ia64/kernel/mca.c | 18 ++++---- arch/ia64/kernel/module.c | 14 ++++-- arch/ia64/kernel/palinfo.c | 68 +++++++++++++++--------------- arch/ia64/kernel/pci-dma.c | 2 +- arch/ia64/kernel/perfmon.c | 6 +- arch/ia64/kernel/setup.c | 32 +++++++------- arch/ia64/kernel/smp.c | 2 +- arch/ia64/kernel/smpboot.c | 2 +- arch/ia64/kernel/time.c | 2 +- arch/ia64/kernel/topology.c | 4 +- arch/ia64/kernel/uncached.c | 3 +- arch/ia64/mm/contig.c | 9 ++-- arch/ia64/mm/init.c | 15 +++---- arch/ia64/mm/tlb.c | 4 +- arch/ia64/pci/pci.c | 12 +++--- arch/ia64/sn/kernel/io_acpi_init.c | 4 +- arch/ia64/sn/kernel/io_common.c | 2 +- arch/ia64/sn/kernel/sn2/sn_hwperf.c | 4 +- arch/ia64/sn/kernel/sn2/sn_proc_fs.c | 2 +- arch/ia64/sn/kernel/tiocx.c | 2 +- arch/ia64/sn/pci/pcibr/pcibr_provider.c | 2 +- arch/ia64/sn/pci/tioca_provider.c | 6 +- arch/ia64/sn/pci/tioce_provider.c | 6 +- drivers/char/agp/hp-agp.c | 5 +- drivers/firmware/pcdp.c | 4 +- include/linux/efi.h | 2 +- 36 files changed, 212 insertions(+), 209 deletions(-) Merging m68k/for-next $ git merge m68k/for-next Merge made by recursive. drivers/rtc/Kconfig | 19 +++ drivers/rtc/Makefile | 2 + drivers/rtc/rtc-msm6242.c | 268 +++++++++++++++++++++++++++++++++++++++++++++ drivers/rtc/rtc-rp5c01.c | 222 +++++++++++++++++++++++++++++++++++++ 4 files changed, 511 insertions(+), 0 deletions(-) create mode 100644 drivers/rtc/rtc-msm6242.c create mode 100644 drivers/rtc/rtc-rp5c01.c Merging m68knommu/for-next $ git merge m68knommu/for-next Removing arch/m68k/include/asm/checksum_mm.h Removing arch/m68k/include/asm/checksum_no.h Removing arch/m68k/include/asm/dma_mm.h Removing arch/m68k/include/asm/dma_no.h Removing arch/m68k/include/asm/hardirq_mm.h Removing arch/m68k/include/asm/hardirq_no.h Removing arch/m68k/include/asm/irq_mm.h Removing arch/m68k/include/asm/irq_no.h Removing arch/m68k/include/asm/processor_mm.h Removing arch/m68k/include/asm/processor_no.h Merge made by recursive. arch/m68k/include/asm/checksum.h | 160 ++++++++- arch/m68k/include/asm/checksum_mm.h | 148 -------- arch/m68k/include/asm/checksum_no.h | 132 ------- arch/m68k/include/asm/dma.h | 493 +++++++++++++++++++++++++- arch/m68k/include/asm/dma_mm.h | 16 - arch/m68k/include/asm/dma_no.h | 494 -------------------------- arch/m68k/include/asm/hardirq.h | 21 +- arch/m68k/include/asm/hardirq_mm.h | 16 - arch/m68k/include/asm/hardirq_no.h | 27 -- arch/m68k/include/asm/irq.h | 135 +++++++- arch/m68k/include/asm/irq_mm.h | 126 ------- arch/m68k/include/asm/irq_no.h | 26 -- arch/m68k/include/asm/m520xsim.h | 28 ++- arch/m68k/include/asm/m523xsim.h | 9 + arch/m68k/include/asm/m527xsim.h | 9 + arch/m68k/include/asm/m528xsim.h | 8 + arch/m68k/include/asm/m532xsim.h | 55 +-- arch/m68k/include/asm/mcfsim.h | 14 - arch/m68k/include/asm/processor.h | 171 +++++++++- arch/m68k/include/asm/processor_mm.h | 130 ------- arch/m68k/include/asm/processor_no.h | 143 -------- arch/m68k/include/asm/system_no.h | 107 ------ arch/m68knommu/kernel/entry.S | 1 - arch/m68knommu/kernel/irq.c | 21 -- arch/m68knommu/lib/checksum.c | 9 - arch/m68knommu/platform/5206/config.c | 18 +- arch/m68knommu/platform/5206e/config.c | 18 +- arch/m68knommu/platform/520x/config.c | 35 +-- arch/m68knommu/platform/523x/config.c | 69 +---- arch/m68knommu/platform/5249/config.c | 18 +- arch/m68knommu/platform/5272/config.c | 18 +- arch/m68knommu/platform/527x/config.c | 54 +--- arch/m68knommu/platform/528x/config.c | 54 +--- arch/m68knommu/platform/5307/config.c | 16 +- arch/m68knommu/platform/532x/config.c | 44 +-- arch/m68knommu/platform/5407/config.c | 16 +- arch/m68knommu/platform/68328/ints.c | 72 ++-- arch/m68knommu/platform/68360/ints.c | 44 ++- arch/m68knommu/platform/coldfire/Makefile | 22 +- arch/m68knommu/platform/coldfire/intc-2.c | 93 +++++ arch/m68knommu/platform/coldfire/intc-simr.c | 78 ++++ arch/m68knommu/platform/coldfire/intc.c | 55 +++ arch/m68knommu/platform/coldfire/pit.c | 8 - arch/m68knommu/platform/coldfire/vectors.c | 27 +-- 44 files changed, 1439 insertions(+), 1819 deletions(-) delete mode 100644 arch/m68k/include/asm/checksum_mm.h delete mode 100644 arch/m68k/include/asm/checksum_no.h delete mode 100644 arch/m68k/include/asm/dma_mm.h delete mode 100644 arch/m68k/include/asm/dma_no.h delete mode 100644 arch/m68k/include/asm/hardirq_mm.h delete mode 100644 arch/m68k/include/asm/hardirq_no.h delete mode 100644 arch/m68k/include/asm/irq_mm.h delete mode 100644 arch/m68k/include/asm/irq_no.h delete mode 100644 arch/m68k/include/asm/processor_mm.h delete mode 100644 arch/m68k/include/asm/processor_no.h create mode 100644 arch/m68knommu/platform/coldfire/intc-2.c create mode 100644 arch/m68knommu/platform/coldfire/intc-simr.c create mode 100644 arch/m68knommu/platform/coldfire/intc.c Merging microblaze/next $ git merge microblaze/next Auto-merging drivers/spi/Kconfig Auto-merging drivers/video/Kconfig Merge made by recursive. arch/microblaze/Kconfig | 121 +++- arch/microblaze/Makefile | 6 + arch/microblaze/boot/Makefile | 2 + arch/microblaze/configs/mmu_defconfig | 798 ++++++++++++++++++ arch/microblaze/include/asm/Kbuild | 25 +- arch/microblaze/include/asm/cacheflush.h | 20 +- arch/microblaze/include/asm/checksum.h | 14 +- arch/microblaze/include/asm/current.h | 8 + arch/microblaze/include/asm/dma-mapping.h | 130 +--- arch/microblaze/include/asm/dma.h | 5 + arch/microblaze/include/asm/elf.h | 93 ++ arch/microblaze/include/asm/entry.h | 37 +- arch/microblaze/include/asm/exceptions.h | 24 +- arch/microblaze/include/asm/gpio.h | 6 +- arch/microblaze/include/asm/io.h | 31 + arch/microblaze/include/asm/mmu.h | 104 +++- arch/microblaze/include/asm/mmu_context.h | 26 +- arch/microblaze/include/asm/mmu_context_mm.h | 140 +++ arch/microblaze/include/asm/mmu_context_no.h | 23 + arch/microblaze/include/asm/page.h | 166 +++- arch/microblaze/include/asm/pgalloc.h | 191 +++++ arch/microblaze/include/asm/pgtable.h | 538 ++++++++++++ arch/microblaze/include/asm/posix_types.h | 2 +- arch/microblaze/include/asm/processor.h | 95 ++- arch/microblaze/include/asm/ptrace.h | 1 - arch/microblaze/include/asm/registers.h | 21 +- arch/microblaze/include/asm/sections.h | 3 + arch/microblaze/include/asm/segment.h | 20 +- arch/microblaze/include/asm/setup.h | 10 +- arch/microblaze/include/asm/stat.h | 77 +- arch/microblaze/include/asm/string.h | 2 +- arch/microblaze/include/asm/syscalls.h | 3 + arch/microblaze/include/asm/thread_info.h | 20 + arch/microblaze/include/asm/tlb.h | 8 + arch/microblaze/include/asm/tlbflush.h | 48 ++ arch/microblaze/include/asm/uaccess.h | 305 ++++++-- arch/microblaze/kernel/Makefile | 1 + arch/microblaze/kernel/asm-offsets.c | 21 +- arch/microblaze/kernel/early_printk.c | 3 + arch/microblaze/kernel/entry-nommu.S | 2 +- arch/microblaze/kernel/entry.S | 1116 +++++++++++++++++++++++++ arch/microblaze/kernel/exceptions.c | 45 +- arch/microblaze/kernel/head.S | 190 +++++ arch/microblaze/kernel/hw_exception_handler.S | 746 ++++++++++++++++- arch/microblaze/kernel/microblaze_ksyms.c | 2 + arch/microblaze/kernel/misc.S | 120 +++ arch/microblaze/kernel/process.c | 59 ++ arch/microblaze/kernel/prom.c | 7 +- arch/microblaze/kernel/setup.c | 62 +- arch/microblaze/kernel/signal.c | 109 +-- arch/microblaze/kernel/syscall_table.S | 6 +- arch/microblaze/kernel/traps.c | 42 +- arch/microblaze/kernel/vmlinux.lds.S | 5 +- arch/microblaze/lib/Makefile | 3 +- arch/microblaze/lib/checksum.c | 31 +- arch/microblaze/lib/memcpy.c | 5 - arch/microblaze/lib/uaccess_old.S | 135 +++ arch/microblaze/mm/Makefile | 2 + arch/microblaze/mm/fault.c | 304 +++++++ arch/microblaze/mm/init.c | 169 ++++- arch/microblaze/mm/mmu_context.c | 70 ++ arch/microblaze/mm/pgtable.c | 286 +++++++ drivers/block/Kconfig | 2 +- drivers/char/Kconfig | 2 +- drivers/gpio/Kconfig | 2 +- drivers/input/serio/Kconfig | 2 +- drivers/of/Kconfig | 8 +- drivers/spi/Kconfig | 2 +- drivers/usb/Kconfig | 1 + drivers/video/Kconfig | 2 +- 70 files changed, 6128 insertions(+), 557 deletions(-) create mode 100644 arch/microblaze/configs/mmu_defconfig create mode 100644 arch/microblaze/include/asm/mmu_context_mm.h create mode 100644 arch/microblaze/include/asm/mmu_context_no.h create mode 100644 arch/microblaze/kernel/entry.S create mode 100644 arch/microblaze/kernel/misc.S create mode 100644 arch/microblaze/lib/uaccess_old.S create mode 100644 arch/microblaze/mm/fault.c create mode 100644 arch/microblaze/mm/mmu_context.c create mode 100644 arch/microblaze/mm/pgtable.c Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Resolved 'drivers/char/hw_random/Kconfig' using previous resolution. Resolved 'drivers/char/hw_random/Makefile' using previous resolution. Auto-merging arch/mips/Kconfig Auto-merging arch/mips/cavium-octeon/octeon-irq.c Auto-merging drivers/char/hw_random/Kconfig CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig Auto-merging drivers/char/hw_random/Makefile CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 36b5813] Merge commit 'mips/mips-for-linux-next' $ git diff -M --stat --summary HEAD^.. arch/mips/Kconfig | 2 + arch/mips/cavium-octeon/Makefile | 4 + arch/mips/cavium-octeon/dma-octeon.c | 311 +++- arch/mips/cavium-octeon/executive/Makefile | 1 + .../cavium-octeon/executive/cvmx-helper-errata.c | 70 + .../cavium-octeon/executive/cvmx-helper-jtag.c | 144 ++ arch/mips/cavium-octeon/msi.c | 288 +++ arch/mips/cavium-octeon/octeon-irq.c | 2 + arch/mips/cavium-octeon/pci-common.c | 137 ++ arch/mips/cavium-octeon/pci-common.h | 39 + arch/mips/cavium-octeon/pci.c | 568 +++++ arch/mips/cavium-octeon/pcie.c | 1370 +++++++++++ arch/mips/include/asm/cpu-features.h | 4 + .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 1 + .../include/asm/mach-cavium-octeon/dma-coherence.h | 6 +- arch/mips/include/asm/mach-generic/dma-coherence.h | 6 +- arch/mips/include/asm/mach-ip27/dma-coherence.h | 6 +- arch/mips/include/asm/mach-ip32/dma-coherence.h | 6 +- arch/mips/include/asm/mach-jazz/dma-coherence.h | 6 +- arch/mips/include/asm/mach-lemote/dma-coherence.h | 6 +- .../asm/mach-rc32434/cpu-feature-overrides.h | 5 - arch/mips/include/asm/octeon/cvmx-helper-errata.h | 33 + arch/mips/include/asm/octeon/cvmx-helper-jtag.h | 43 + arch/mips/include/asm/octeon/cvmx-npei-defs.h | 2560 ++++++++++++++++++++ arch/mips/include/asm/octeon/cvmx-npi-defs.h | 1735 +++++++++++++ arch/mips/include/asm/octeon/cvmx-pci-defs.h | 1645 +++++++++++++ arch/mips/include/asm/octeon/cvmx-pcieep-defs.h | 1365 +++++++++++ arch/mips/include/asm/octeon/cvmx-pciercx-defs.h | 1397 +++++++++++ arch/mips/include/asm/octeon/cvmx-pescx-defs.h | 410 ++++ arch/mips/include/asm/octeon/cvmx-pexp-defs.h | 229 ++ arch/mips/include/asm/octeon/cvmx.h | 12 + arch/mips/include/asm/octeon/octeon.h | 2 + arch/mips/include/asm/r4kcache.h | 1 + arch/mips/include/asm/txx9/dmac.h | 51 + arch/mips/include/asm/txx9/generic.h | 6 + arch/mips/include/asm/txx9/tx4927.h | 4 + arch/mips/include/asm/txx9/tx4938.h | 3 + arch/mips/include/asm/txx9/tx4939.h | 6 + arch/mips/kernel/cevt-txx9.c | 67 +- arch/mips/mm/c-r4k.c | 12 + arch/mips/mm/dma-default.c | 23 +- arch/mips/mm/tlbex.c | 91 +- arch/mips/rb532/irq.c | 5 +- arch/mips/sibyte/Kconfig | 7 - arch/mips/sibyte/swarm/setup.c | 4 - arch/mips/txx9/Kconfig | 3 + arch/mips/txx9/generic/setup.c | 175 ++ arch/mips/txx9/generic/setup_tx4927.c | 55 + arch/mips/txx9/generic/setup_tx4938.c | 38 +- arch/mips/txx9/generic/setup_tx4939.c | 53 +- arch/mips/txx9/rbtx4927/setup.c | 8 + arch/mips/txx9/rbtx4938/setup.c | 4 + arch/mips/txx9/rbtx4939/setup.c | 5 + drivers/char/hw_random/Kconfig | 13 + drivers/char/hw_random/Makefile | 1 + drivers/char/hw_random/tx4939-rng.c | 184 ++ drivers/dma/Kconfig | 8 + drivers/dma/Makefile | 1 + drivers/dma/txx9dmac.c | 1354 +++++++++++ drivers/dma/txx9dmac.h | 307 +++ 60 files changed, 14801 insertions(+), 101 deletions(-) create mode 100644 arch/mips/cavium-octeon/executive/cvmx-helper-errata.c create mode 100644 arch/mips/cavium-octeon/executive/cvmx-helper-jtag.c create mode 100644 arch/mips/cavium-octeon/msi.c create mode 100644 arch/mips/cavium-octeon/pci-common.c create mode 100644 arch/mips/cavium-octeon/pci-common.h create mode 100644 arch/mips/cavium-octeon/pci.c create mode 100644 arch/mips/cavium-octeon/pcie.c create mode 100644 arch/mips/include/asm/octeon/cvmx-helper-errata.h create mode 100644 arch/mips/include/asm/octeon/cvmx-helper-jtag.h create mode 100644 arch/mips/include/asm/octeon/cvmx-npei-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-npi-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-pci-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-pcieep-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-pciercx-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-pescx-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-pexp-defs.h create mode 100644 arch/mips/include/asm/txx9/dmac.h create mode 100644 drivers/char/hw_random/tx4939-rng.c create mode 100644 drivers/dma/txx9dmac.c create mode 100644 drivers/dma/txx9dmac.h Merging parisc/master $ git merge parisc/master Already up-to-date. Merging powerpc/next $ git merge powerpc/next Auto-merging Documentation/kernel-parameters.txt Removing arch/powerpc/include/asm/mpc86xx.h Auto-merging arch/powerpc/sysdev/mpic.c Auto-merging drivers/dma/fsldma.c Auto-merging include/linux/pci_ids.h Merge made by recursive. Documentation/kernel-parameters.txt | 7 + Documentation/powerpc/dts-bindings/ecm.txt | 64 ++ .../powerpc/dts-bindings/fsl/cpm_qe/qe.txt | 3 + Documentation/powerpc/dts-bindings/fsl/esdhc.txt | 5 +- Documentation/powerpc/dts-bindings/fsl/mcm.txt | 64 ++ arch/powerpc/Kconfig | 16 +- arch/powerpc/Kconfig.debug | 13 + arch/powerpc/Makefile | 1 + arch/powerpc/boot/dts/gef_ppc9a.dts | 14 +- arch/powerpc/boot/dts/gef_sbc310.dts | 14 +- arch/powerpc/boot/dts/gef_sbc610.dts | 14 +- arch/powerpc/boot/dts/ksi8560.dts | 13 + arch/powerpc/boot/dts/mpc832x_mds.dts | 3 +- arch/powerpc/boot/dts/mpc832x_rdb.dts | 3 +- arch/powerpc/boot/dts/mpc8349emitx.dts | 2 - arch/powerpc/boot/dts/mpc8349emitxgp.dts | 1 - arch/powerpc/boot/dts/mpc834x_mds.dts | 2 - arch/powerpc/boot/dts/mpc836x_mds.dts | 3 +- arch/powerpc/boot/dts/mpc836x_rdk.dts | 2 + arch/powerpc/boot/dts/mpc8377_mds.dts | 1 - arch/powerpc/boot/dts/mpc8378_mds.dts | 1 - arch/powerpc/boot/dts/mpc8379_mds.dts | 1 - arch/powerpc/boot/dts/mpc8536ds.dts | 18 +- arch/powerpc/boot/dts/mpc8540ads.dts | 15 +- arch/powerpc/boot/dts/mpc8541cds.dts | 16 +- arch/powerpc/boot/dts/mpc8544ds.dts | 18 +- arch/powerpc/boot/dts/mpc8548cds.dts | 17 +- arch/powerpc/boot/dts/mpc8555cds.dts | 16 +- arch/powerpc/boot/dts/mpc8560ads.dts | 15 +- arch/powerpc/boot/dts/mpc8568mds.dts | 51 +- arch/powerpc/boot/dts/mpc8569mds.dts | 583 +++++++++++ arch/powerpc/boot/dts/mpc8572ds.dts | 17 +- arch/powerpc/boot/dts/mpc8572ds_36b.dts | 39 +- arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts | 16 +- arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts | 2 - arch/powerpc/boot/dts/mpc8610_hpcd.dts | 16 +- arch/powerpc/boot/dts/mpc8641_hpcn.dts | 16 +- arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts | 609 +++++++++++ arch/powerpc/boot/dts/p2020ds.dts | 704 +++++++++++++ arch/powerpc/boot/dts/sbc8349.dts | 1 - arch/powerpc/boot/dts/sbc8548.dts | 16 +- arch/powerpc/boot/dts/sbc8560.dts | 15 +- arch/powerpc/boot/dts/sbc8641d.dts | 16 +- arch/powerpc/boot/dts/socrates.dts | 15 +- arch/powerpc/boot/dts/stx_gp3_8560.dts | 15 +- arch/powerpc/boot/dts/tqm8540.dts | 15 +- arch/powerpc/boot/dts/tqm8541.dts | 15 +- arch/powerpc/boot/dts/tqm8548-bigflash.dts | 16 +- arch/powerpc/boot/dts/tqm8548.dts | 16 +- arch/powerpc/boot/dts/tqm8555.dts | 15 +- arch/powerpc/boot/dts/tqm8560.dts | 15 +- arch/powerpc/boot/dts/virtex440-ml510.dts | 465 +++++++++ arch/powerpc/boot/dts/warp.dts | 27 +- arch/powerpc/include/asm/cpm2.h | 4 - arch/powerpc/include/asm/dma-mapping.h | 11 + arch/powerpc/include/asm/elf.h | 4 +- arch/powerpc/include/asm/emulated_ops.h | 73 ++ arch/powerpc/include/asm/feature-fixups.h | 25 +- arch/powerpc/include/asm/lppaca.h | 6 + arch/powerpc/include/asm/machdep.h | 4 + arch/powerpc/include/asm/mmu.h | 9 +- arch/powerpc/include/asm/mpc86xx.h | 33 - arch/powerpc/include/asm/paca.h | 12 +- arch/powerpc/include/asm/page.h | 5 + arch/powerpc/include/asm/pci-bridge.h | 13 +- arch/powerpc/include/asm/pgtable-ppc64.h | 5 + arch/powerpc/include/asm/ppc-opcode.h | 25 +- arch/powerpc/include/asm/ppc_asm.h | 10 - arch/powerpc/include/asm/ptrace.h | 4 + arch/powerpc/include/asm/qe.h | 21 +- arch/powerpc/include/asm/scatterlist.h | 6 +- arch/powerpc/include/asm/swiotlb.h | 27 + arch/powerpc/include/asm/system.h | 2 +- arch/powerpc/include/asm/xilinx_pci.h | 21 + arch/powerpc/kernel/Makefile | 4 +- arch/powerpc/kernel/align.c | 20 +- arch/powerpc/kernel/asm-offsets.c | 32 +- arch/powerpc/kernel/cputable.c | 6 +- arch/powerpc/kernel/dma-swiotlb.c | 163 +++ arch/powerpc/kernel/dma.c | 2 +- arch/powerpc/kernel/exceptions-64s.S | 978 +++++++++++++++++ arch/powerpc/kernel/ftrace.c | 29 +- arch/powerpc/kernel/head_32.S | 95 -- arch/powerpc/kernel/head_64.S | 1095 +------------------- arch/powerpc/kernel/head_booke.h | 10 +- arch/powerpc/kernel/irq.c | 127 ++-- arch/powerpc/kernel/lparcfg.c | 40 +- arch/powerpc/kernel/misc_64.S | 92 -- arch/powerpc/kernel/paca.c | 14 +- arch/powerpc/kernel/pci-common.c | 3 +- arch/powerpc/kernel/pci_32.c | 19 - arch/powerpc/kernel/pci_64.c | 17 +- arch/powerpc/kernel/pci_dn.c | 28 +- arch/powerpc/kernel/process.c | 2 +- arch/powerpc/kernel/prom.c | 2 +- arch/powerpc/kernel/ptrace.c | 23 +- arch/powerpc/kernel/rtas_pci.c | 10 +- arch/powerpc/kernel/setup_32.c | 6 + arch/powerpc/kernel/setup_64.c | 11 +- arch/powerpc/kernel/time.c | 21 +- arch/powerpc/kernel/traps.c | 130 +++- arch/powerpc/kernel/vector.S | 210 ++++ arch/powerpc/mm/Makefile | 7 +- arch/powerpc/mm/hash_native_64.c | 13 +- arch/powerpc/mm/init_64.c | 2 + arch/powerpc/mm/mmu_context_nohash.c | 19 +- arch/powerpc/mm/numa.c | 2 + arch/powerpc/oprofile/op_model_fsl_emb.c | 14 - arch/powerpc/platforms/40x/virtex.c | 2 + arch/powerpc/platforms/44x/Kconfig | 13 +- arch/powerpc/platforms/44x/Makefile | 1 + arch/powerpc/platforms/44x/virtex.c | 2 + arch/powerpc/platforms/44x/virtex_ml510.c | 29 + arch/powerpc/platforms/44x/warp.c | 76 +- arch/powerpc/platforms/52xx/efika.c | 4 +- arch/powerpc/platforms/52xx/mpc52xx_pci.c | 4 +- arch/powerpc/platforms/82xx/pq2ads.h | 13 - arch/powerpc/platforms/85xx/Kconfig | 1 + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 43 +- arch/powerpc/platforms/85xx/mpc85xx_mds.c | 52 +- arch/powerpc/platforms/86xx/gef_ppc9a.c | 1 - arch/powerpc/platforms/86xx/gef_sbc310.c | 1 - arch/powerpc/platforms/86xx/gef_sbc610.c | 1 - arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 1 - arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 1 - arch/powerpc/platforms/86xx/mpc86xx_smp.c | 8 +- arch/powerpc/platforms/86xx/sbc8641d.c | 1 - arch/powerpc/platforms/8xx/mpc885ads.h | 4 - arch/powerpc/platforms/Kconfig | 4 + arch/powerpc/platforms/Kconfig.cputype | 26 +- arch/powerpc/platforms/cell/celleb_pci.c | 10 +- arch/powerpc/platforms/cell/celleb_scc_epci.c | 13 +- arch/powerpc/platforms/cell/celleb_scc_pciex.c | 12 +- arch/powerpc/platforms/cell/spufs/inode.c | 6 - arch/powerpc/platforms/chrp/pci.c | 8 +- arch/powerpc/platforms/fsl_uli1575.c | 24 +- arch/powerpc/platforms/iseries/iommu.c | 2 +- arch/powerpc/platforms/iseries/pci.c | 8 +- arch/powerpc/platforms/powermac/pic.c | 2 +- arch/powerpc/platforms/powermac/setup.c | 2 +- arch/powerpc/platforms/ps3/smp.c | 16 +- arch/powerpc/platforms/pseries/iommu.c | 4 +- arch/powerpc/platforms/pseries/lpar.c | 52 + arch/powerpc/platforms/pseries/rtasd.c | 76 +- arch/powerpc/platforms/pseries/setup.c | 25 + arch/powerpc/sysdev/Makefile | 1 + arch/powerpc/sysdev/cpm2.c | 2 +- arch/powerpc/sysdev/fsl_msi.c | 9 +- arch/powerpc/sysdev/fsl_pci.c | 138 +++- arch/powerpc/sysdev/fsl_pci.h | 6 +- arch/powerpc/sysdev/fsl_rio.c | 15 +- arch/powerpc/sysdev/fsl_soc.c | 14 +- arch/powerpc/sysdev/indirect_pci.c | 4 +- arch/powerpc/sysdev/mpic.c | 23 +- arch/powerpc/sysdev/ppc4xx_pci.c | 4 +- arch/powerpc/sysdev/qe_lib/qe.c | 75 ++- arch/powerpc/sysdev/tsi108_pci.c | 4 +- arch/powerpc/sysdev/xilinx_intc.c | 81 ++- arch/powerpc/sysdev/xilinx_pci.c | 132 +++ arch/powerpc/xmon/xmon.c | 47 + drivers/char/viotape.c | 2 +- drivers/macintosh/therm_adt746x.c | 4 +- drivers/net/ucc_geth.c | 24 +- drivers/net/ucc_geth.h | 4 +- drivers/of/base.c | 1 + drivers/pci/Makefile | 1 - drivers/rapidio/rio-scan.c | 6 +- drivers/video/xilinxfb.c | 290 +++--- include/linux/pci_ids.h | 4 + 169 files changed, 5950 insertions(+), 2132 deletions(-) create mode 100644 Documentation/powerpc/dts-bindings/ecm.txt create mode 100644 Documentation/powerpc/dts-bindings/fsl/mcm.txt create mode 100644 arch/powerpc/boot/dts/mpc8569mds.dts create mode 100644 arch/powerpc/boot/dts/mpc8641_hpcn_36b.dts create mode 100644 arch/powerpc/boot/dts/p2020ds.dts create mode 100644 arch/powerpc/boot/dts/virtex440-ml510.dts create mode 100644 arch/powerpc/include/asm/emulated_ops.h delete mode 100644 arch/powerpc/include/asm/mpc86xx.h create mode 100644 arch/powerpc/include/asm/swiotlb.h create mode 100644 arch/powerpc/include/asm/xilinx_pci.h create mode 100644 arch/powerpc/kernel/dma-swiotlb.c create mode 100644 arch/powerpc/kernel/exceptions-64s.S create mode 100644 arch/powerpc/platforms/44x/virtex_ml510.c create mode 100644 arch/powerpc/sysdev/xilinx_pci.c Merging 4xx/next $ git merge 4xx/next Removing arch/powerpc/platforms/40x/kilauea.c Removing arch/powerpc/platforms/40x/makalu.c Merge made by recursive. arch/powerpc/boot/dts/sequoia.dts | 22 +++++ arch/powerpc/configs/40x/acadia_defconfig | 2 +- arch/powerpc/configs/40x/ep405_defconfig | 2 +- arch/powerpc/configs/40x/kilauea_defconfig | 81 +++++++++++++----- arch/powerpc/configs/40x/makalu_defconfig | 81 +++++++++++++----- arch/powerpc/configs/40x/virtex_defconfig | 2 +- arch/powerpc/configs/44x/arches_defconfig | 2 +- arch/powerpc/configs/44x/bamboo_defconfig | 2 +- arch/powerpc/configs/44x/canyonlands_defconfig | 6 +- arch/powerpc/configs/44x/ebony_defconfig | 2 +- arch/powerpc/configs/44x/katmai_defconfig | 2 +- arch/powerpc/configs/44x/rainier_defconfig | 2 +- arch/powerpc/configs/44x/redwood_defconfig | 2 +- arch/powerpc/configs/44x/sam440ep_defconfig | 2 +- arch/powerpc/configs/44x/sequoia_defconfig | 111 ++++++++++++++++-------- arch/powerpc/configs/44x/taishan_defconfig | 2 +- arch/powerpc/configs/44x/virtex5_defconfig | 2 +- arch/powerpc/platforms/40x/Kconfig | 2 + arch/powerpc/platforms/40x/Makefile | 2 - arch/powerpc/platforms/40x/kilauea.c | 60 ------------- arch/powerpc/platforms/40x/makalu.c | 60 ------------- arch/powerpc/platforms/40x/ppc40x_simple.c | 5 +- drivers/i2c/busses/i2c-ibm_iic.c | 6 +- 23 files changed, 237 insertions(+), 223 deletions(-) delete mode 100644 arch/powerpc/platforms/40x/kilauea.c delete mode 100644 arch/powerpc/platforms/40x/makalu.c Merging galak/next $ git merge galak/next Already up-to-date. Merging pxa/for-next $ git merge pxa/for-next Resolved 'arch/arm/mach-pxa/viper.c' using previous resolution. Auto-merging MAINTAINERS Auto-merging arch/arm/mach-pxa/devices.c Auto-merging arch/arm/mach-pxa/imote2.c Auto-merging arch/arm/mach-pxa/palmld.c Auto-merging arch/arm/mach-pxa/viper.c CONFLICT (content): Merge conflict in arch/arm/mach-pxa/viper.c Auto-merging drivers/video/Kconfig Auto-merging sound/soc/pxa/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 47e0333] Merge commit 'pxa/for-next' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 7 + arch/arm/configs/cm_x300_defconfig | 329 ++++++-- arch/arm/configs/magician_defconfig | 5 +- arch/arm/mach-mmp/include/mach/irqs.h | 1 + arch/arm/mach-mmp/include/mach/mfp-pxa168.h | 27 + arch/arm/mach-mmp/include/mach/mfp-pxa910.h | 8 + arch/arm/mach-mmp/include/mach/pxa168.h | 44 + arch/arm/mach-mmp/include/mach/pxa910.h | 44 + arch/arm/mach-mmp/include/mach/regs-apbc.h | 14 +- arch/arm/mach-mmp/pxa168.c | 18 + arch/arm/mach-mmp/pxa910.c | 18 + arch/arm/mach-pxa/Kconfig | 21 +- arch/arm/mach-pxa/Makefile | 3 +- arch/arm/mach-pxa/cm-x270.c | 4 + arch/arm/mach-pxa/cm-x300.c | 55 ++- arch/arm/mach-pxa/corgi.c | 47 +- arch/arm/mach-pxa/csb726.c | 20 +- arch/arm/mach-pxa/devices.c | 4 +- arch/arm/mach-pxa/em-x270.c | 173 ++++- arch/arm/mach-pxa/ezx.c | 177 ++++- arch/arm/mach-pxa/hx4700.c | 851 ++++++++++++++++++++ arch/arm/mach-pxa/imote2.c | 52 +- arch/arm/mach-pxa/include/mach/hx4700.h | 131 +++ arch/arm/mach-pxa/include/mach/irqs.h | 18 +- arch/arm/mach-pxa/include/mach/mfp-pxa320.h | 14 + arch/arm/mach-pxa/include/mach/pxa27x.h | 3 + arch/arm/mach-pxa/include/mach/uncompress.h | 3 +- arch/arm/mach-pxa/littleton.c | 19 +- arch/arm/mach-pxa/lpd270.c | 5 + arch/arm/mach-pxa/lubbock.c | 6 + arch/arm/mach-pxa/magician.c | 14 +- arch/arm/mach-pxa/mainstone.c | 7 +- arch/arm/mach-pxa/mioa701.c | 7 +- arch/arm/mach-pxa/palmld.c | 31 +- arch/arm/mach-pxa/palmt5.c | 46 +- arch/arm/mach-pxa/palmte2.c | 32 +- arch/arm/mach-pxa/palmtx.c | 45 +- arch/arm/mach-pxa/pcm990-baseboard.c | 9 +- arch/arm/mach-pxa/poodle.c | 17 +- arch/arm/mach-pxa/pxa27x.c | 21 +- arch/arm/mach-pxa/pxa3xx.c | 4 +- arch/arm/mach-pxa/saar.c | 2 +- arch/arm/mach-pxa/spitz.c | 78 +-- arch/arm/mach-pxa/stargate2.c | 796 ++++++++++++++++++ arch/arm/mach-pxa/tosa.c | 2 +- arch/arm/mach-pxa/trizeps4.c | 9 +- arch/arm/mach-pxa/viper.c | 8 +- arch/arm/mach-pxa/zylonite_pxa300.c | 2 +- arch/arm/plat-pxa/Makefile | 2 + .../include/mach => plat-pxa/include/plat}/i2c.h | 0 arch/arm/{mach-pxa => plat-pxa}/pwm.c | 119 ++-- drivers/i2c/busses/i2c-pxa.c | 22 +- drivers/net/smc91x.h | 5 +- drivers/pcmcia/Kconfig | 2 +- drivers/pcmcia/Makefile | 1 + drivers/pcmcia/pxa2xx_stargate2.c | 174 ++++ drivers/video/Kconfig | 10 + drivers/video/Makefile | 1 + drivers/video/pxa168fb.c | 798 ++++++++++++++++++ drivers/video/pxa168fb.h | 558 +++++++++++++ include/video/pxa168fb.h | 128 +++ sound/soc/pxa/Kconfig | 7 +- sound/soc/pxa/palm27x.c | 2 +- 63 files changed, 4609 insertions(+), 471 deletions(-) create mode 100644 arch/arm/mach-pxa/hx4700.c create mode 100644 arch/arm/mach-pxa/include/mach/hx4700.h create mode 100644 arch/arm/mach-pxa/stargate2.c rename arch/arm/{mach-pxa/include/mach => plat-pxa/include/plat}/i2c.h (100%) rename arch/arm/{mach-pxa => plat-pxa}/pwm.c (77%) create mode 100644 drivers/pcmcia/pxa2xx_stargate2.c create mode 100644 drivers/video/pxa168fb.c create mode 100644 drivers/video/pxa168fb.h create mode 100644 include/video/pxa168fb.h Merging s390/features $ git merge s390/features Removing arch/s390/include/asm/cpu.h Merge made by recursive. arch/s390/Kconfig | 23 +++ arch/s390/include/asm/compat.h | 19 ++- arch/s390/include/asm/cpu.h | 32 ---- arch/s390/include/asm/cputime.h | 19 ++ arch/s390/include/asm/ftrace.h | 21 +++ arch/s390/include/asm/lowcore.h | 9 +- arch/s390/include/asm/pgtable.h | 7 +- arch/s390/include/asm/seccomp.h | 16 ++ arch/s390/include/asm/spinlock.h | 19 ++- arch/s390/include/asm/syscall.h | 1 + arch/s390/include/asm/thread_info.h | 12 +- arch/s390/include/asm/uaccess.h | 16 +- arch/s390/kernel/Makefile | 7 +- arch/s390/kernel/early.c | 4 + arch/s390/kernel/entry.S | 7 +- arch/s390/kernel/entry64.S | 7 +- arch/s390/kernel/ftrace.c | 260 ++++++++++++++++++++++++++++ arch/s390/kernel/head.S | 65 +++++-- arch/s390/kernel/kprobes.c | 33 +---- arch/s390/kernel/mcount.S | 212 ++++++++++++++++++++--- arch/s390/kernel/nmi.c | 2 +- arch/s390/kernel/process.c | 3 +- arch/s390/kernel/ptrace.c | 23 ++- arch/s390/kernel/s390_ext.c | 5 +- arch/s390/kernel/sclp.S | 327 +++++++++++++++++++++++++++++++++++ arch/s390/kernel/setup.c | 2 + arch/s390/kernel/signal.c | 3 +- arch/s390/kernel/smp.c | 3 +- arch/s390/kernel/time.c | 9 +- arch/s390/kernel/vdso.c | 19 ++- arch/s390/kernel/vmlinux.lds.S | 1 + arch/s390/kernel/vtime.c | 2 +- arch/s390/kvm/kvm-s390.c | 2 +- arch/s390/lib/spinlock.c | 40 +++++ arch/s390/mm/Makefile | 2 +- arch/s390/mm/fault.c | 3 +- arch/s390/mm/maccess.c | 61 +++++++ arch/s390/mm/mmap.c | 11 +- arch/s390/mm/pgtable.c | 16 ++- drivers/s390/block/dasd.c | 4 +- drivers/s390/block/dasd_eckd.c | 36 +++-- drivers/s390/block/dasd_fba.c | 22 ++- drivers/s390/block/dasd_int.h | 2 +- drivers/s390/block/dcssblk.c | 4 +- drivers/s390/char/con3270.c | 38 ++--- drivers/s390/char/tty3270.c | 57 ++---- drivers/s390/cio/cio.c | 6 +- drivers/s390/cio/device_ops.c | 24 +-- drivers/s390/cio/qdio_main.c | 46 ++---- drivers/s390/cio/qdio_perf.c | 12 -- drivers/s390/cio/qdio_perf.h | 10 +- mm/maccess.c | 2 +- scripts/recordmcount.pl | 13 ++ 53 files changed, 1270 insertions(+), 329 deletions(-) delete mode 100644 arch/s390/include/asm/cpu.h create mode 100644 arch/s390/include/asm/seccomp.h create mode 100644 arch/s390/kernel/ftrace.c create mode 100644 arch/s390/kernel/sclp.S create mode 100644 arch/s390/mm/maccess.c Merging sh/master $ git merge sh/master Removing arch/sh/boards/mach-se/7751/pci.c Removing arch/sh/boot/compressed/Makefile_32 Removing arch/sh/boot/compressed/Makefile_64 Removing arch/sh/boot/compressed/vmlinux_64.lds Removing arch/sh/drivers/pci/fixups-lboxre2.c Removing arch/sh/drivers/pci/fixups-se7780.c Removing arch/sh/drivers/pci/fixups-sh7785lcr.c Removing arch/sh/drivers/pci/ops-landisk.c Removing arch/sh/drivers/pci/ops-lboxre2.c Removing arch/sh/drivers/pci/ops-r7780rp.c Removing arch/sh/drivers/pci/ops-rts7751r2d.c Removing arch/sh/drivers/pci/ops-sdk7780.c Removing arch/sh/drivers/pci/ops-se7780.c Removing arch/sh/drivers/pci/ops-sh03.c Removing arch/sh/drivers/pci/ops-sh7785lcr.c Removing arch/sh/drivers/pci/ops-snapgear.c Removing arch/sh/drivers/pci/ops-titan.c Removing arch/sh/drivers/pci/pci-auto.c Removing arch/sh/include/asm/timer.h Removing arch/sh/include/cpu-sh3/cpu/timer.h Removing arch/sh/include/cpu-sh4/cpu/timer.h Removing arch/sh/kernel/time_32.c Removing arch/sh/kernel/time_64.c Removing arch/sh/kernel/timers/Makefile Removing arch/sh/kernel/timers/timer-cmt.c Removing arch/sh/kernel/timers/timer-mtu2.c Removing arch/sh/kernel/timers/timer-tmu.c Removing arch/sh/kernel/timers/timer.c Removing arch/sh/kernel/vmlinux_32.lds.S Removing arch/sh/kernel/vmlinux_64.lds.S Removing arch/sh/lib64/.gitignore Auto-merging drivers/rtc/Kconfig Removing include/linux/sh_cmt.h Auto-merging kernel/time/timekeeping.c Merge made by recursive. arch/sh/Kconfig | 114 +- arch/sh/Kconfig.cpu | 8 - arch/sh/Kconfig.debug | 23 +- arch/sh/Makefile | 72 +- arch/sh/boards/Kconfig | 15 +- arch/sh/boards/board-sh7785lcr.c | 44 +- arch/sh/boards/mach-cayman/Makefile | 2 +- arch/sh/boards/mach-cayman/irq.c | 17 +- arch/sh/boards/mach-cayman/panic.c | 49 + arch/sh/boards/mach-cayman/setup.c | 2 +- arch/sh/boards/mach-dreamcast/setup.c | 6 - arch/sh/boards/mach-r2d/setup.c | 50 + arch/sh/boards/mach-se/7724/Makefile | 10 + arch/sh/boards/mach-se/7724/irq.c | 139 ++ arch/sh/boards/mach-se/7724/setup.c | 448 ++++ arch/sh/boards/mach-se/7751/Makefile | 2 - arch/sh/boards/mach-se/7751/io.c | 16 - arch/sh/boards/mach-se/7751/pci.c | 147 -- arch/sh/boards/mach-se/7780/irq.c | 27 +- arch/sh/boards/mach-se/Makefile | 1 + arch/sh/boards/mach-sh03/rtc.c | 10 +- arch/sh/boards/mach-snapgear/io.c | 16 - arch/sh/boards/mach-systemh/io.c | 16 - arch/sh/boards/mach-titan/io.c | 20 +- arch/sh/boot/Makefile | 6 +- arch/sh/boot/compressed/Makefile | 50 +- arch/sh/boot/compressed/Makefile_32 | 46 - arch/sh/boot/compressed/Makefile_64 | 43 - arch/sh/boot/compressed/head_64.S | 5 +- arch/sh/boot/compressed/vmlinux_64.lds | 64 - arch/sh/cchips/Kconfig | 5 - arch/sh/cchips/hd6446x/hd64461.c | 2 +- arch/sh/configs/ap325rxa_defconfig | 37 +- arch/sh/configs/cayman_defconfig | 71 +- arch/sh/configs/dreamcast_defconfig | 39 +- arch/sh/configs/edosk7705_defconfig | 29 +- arch/sh/configs/edosk7760_defconfig | 32 +- arch/sh/configs/espt_defconfig | 39 +- arch/sh/configs/hp6xx_defconfig | 35 +- arch/sh/configs/landisk_defconfig | 48 +- arch/sh/configs/lboxre2_defconfig | 44 +- arch/sh/configs/magicpanelr2_defconfig | 30 +- arch/sh/configs/microdev_defconfig | 36 +- arch/sh/configs/migor_defconfig | 36 +- arch/sh/configs/polaris_defconfig | 30 +- arch/sh/configs/r7780mp_defconfig | 38 +- arch/sh/configs/r7785rp_defconfig | 38 +- arch/sh/configs/rsk7201_defconfig | 37 +- arch/sh/configs/rsk7203_defconfig | 40 +- arch/sh/configs/rts7751r2d1_defconfig | 43 +- arch/sh/configs/rts7751r2dplus_defconfig | 130 ++- arch/sh/configs/sdk7780_defconfig | 38 +- arch/sh/configs/se7206_defconfig | 35 +- arch/sh/configs/se7343_defconfig | 42 +- arch/sh/configs/se7619_defconfig | 35 +- arch/sh/configs/se7705_defconfig | 34 +- arch/sh/configs/se7712_defconfig | 30 +- arch/sh/configs/se7721_defconfig | 33 +- arch/sh/configs/se7722_defconfig | 38 +- arch/sh/configs/se7724_defconfig | 1552 ++++++++++++++ arch/sh/configs/se7750_defconfig | 34 +- arch/sh/configs/se7751_defconfig | 34 +- arch/sh/configs/se7780_defconfig | 38 +- arch/sh/configs/sh03_defconfig | 43 +- arch/sh/configs/sh7710voipgw_defconfig | 35 +- arch/sh/configs/sh7724_generic_defconfig | 707 +++++++ arch/sh/configs/sh7763rdp_defconfig | 35 +- arch/sh/configs/sh7770_generic_defconfig | 700 ++++++ arch/sh/configs/sh7785lcr_32bit_defconfig | 37 +- arch/sh/configs/sh7785lcr_defconfig | 6 +- arch/sh/configs/shmin_defconfig | 31 +- arch/sh/configs/shx3_defconfig | 32 +- arch/sh/configs/snapgear_defconfig | 40 +- arch/sh/configs/systemh_defconfig | 39 +- arch/sh/configs/titan_defconfig | 40 +- arch/sh/configs/ul2_defconfig | 37 +- arch/sh/configs/urquell_defconfig | 39 +- arch/sh/drivers/dma/Kconfig | 3 +- arch/sh/drivers/pci/Kconfig | 18 - arch/sh/drivers/pci/Makefile | 28 +- .../drivers/pci/{ops-cayman.c => fixups-cayman.c} | 12 - arch/sh/drivers/pci/fixups-dreamcast.c | 9 +- arch/sh/drivers/pci/fixups-landisk.c | 34 + arch/sh/drivers/pci/fixups-lboxre2.c | 41 - arch/sh/drivers/pci/fixups-r7780rp.c | 41 +- arch/sh/drivers/pci/fixups-rts7751r2d.c | 48 +- arch/sh/drivers/pci/fixups-sdk7780.c | 63 +- arch/sh/drivers/pci/fixups-se7751.c | 111 + arch/sh/drivers/pci/fixups-se7780.c | 60 - arch/sh/drivers/pci/fixups-sh7785lcr.c | 46 - arch/sh/drivers/pci/fixups-snapgear.c | 38 + arch/sh/drivers/pci/fixups-titan.c | 38 + arch/sh/drivers/pci/ops-dreamcast.c | 107 +- arch/sh/drivers/pci/ops-landisk.c | 67 - arch/sh/drivers/pci/ops-lboxre2.c | 63 - arch/sh/drivers/pci/ops-r7780rp.c | 68 - arch/sh/drivers/pci/ops-rts7751r2d.c | 74 - arch/sh/drivers/pci/ops-sdk7780.c | 73 - arch/sh/drivers/pci/ops-se7780.c | 96 - arch/sh/drivers/pci/ops-sh03.c | 45 - arch/sh/drivers/pci/ops-sh4.c | 79 +- arch/sh/drivers/pci/ops-sh5.c | 25 - arch/sh/drivers/pci/ops-sh7785lcr.c | 66 - arch/sh/drivers/pci/ops-snapgear.c | 94 - arch/sh/drivers/pci/ops-titan.c | 77 - arch/sh/drivers/pci/pci-auto.c | 545 ----- arch/sh/drivers/pci/pci-dreamcast.c | 102 + arch/sh/drivers/pci/pci-sh4.h | 19 +- arch/sh/drivers/pci/pci-sh5.c | 55 +- arch/sh/drivers/pci/pci-sh5.h | 3 - arch/sh/drivers/pci/pci-sh7751.c | 215 +- arch/sh/drivers/pci/pci-sh7751.h | 12 +- arch/sh/drivers/pci/pci-sh7780.c | 224 +- arch/sh/drivers/pci/pci-sh7780.h | 16 +- arch/sh/drivers/pci/pci.c | 279 ++- arch/sh/include/asm/cacheflush.h | 2 - arch/sh/include/asm/clock.h | 99 +- arch/sh/include/asm/device.h | 2 + arch/sh/include/asm/hd64461.h | 148 +- arch/sh/include/asm/io.h | 22 +- arch/sh/include/asm/irq.h | 3 +- arch/sh/include/asm/kprobes.h | 2 +- arch/sh/include/asm/machvec.h | 3 + arch/sh/include/asm/pci.h | 118 +- arch/sh/include/asm/pgtable.h | 4 + arch/sh/include/asm/processor.h | 6 +- arch/sh/include/asm/ptrace.h | 5 + arch/sh/include/asm/rtc.h | 11 + arch/sh/include/asm/swab.h | 12 +- arch/sh/include/asm/system_32.h | 2 +- arch/sh/include/asm/timer.h | 44 - arch/sh/include/asm/types.h | 4 +- arch/sh/include/asm/ubc.h | 11 + arch/sh/include/asm/unaligned-sh4a.h | 10 +- arch/sh/include/cpu-sh2a/cpu/ubc.h | 29 +- arch/sh/include/cpu-sh3/cpu/timer.h | 67 - arch/sh/include/cpu-sh4/cpu/cache.h | 2 + arch/sh/include/cpu-sh4/cpu/freq.h | 18 + arch/sh/include/cpu-sh4/cpu/sh7724.h | 255 +++ arch/sh/include/cpu-sh4/cpu/sh7785.h | 24 + arch/sh/include/cpu-sh4/cpu/timer.h | 60 - arch/sh/include/cpu-sh5/cpu/irq.h | 1 - arch/sh/include/mach-common/mach/sh7785lcr.h | 10 +- arch/sh/include/mach-dreamcast/mach/pci.h | 2 + arch/sh/include/mach-se/mach/se7724.h | 67 + arch/sh/kernel/Makefile_32 | 6 +- arch/sh/kernel/Makefile_64 | 9 +- arch/sh/kernel/cpu/Makefile | 1 + arch/sh/kernel/cpu/clock-cpg.c | 152 ++ arch/sh/kernel/cpu/clock.c | 593 ++++-- arch/sh/kernel/cpu/init.c | 7 + arch/sh/kernel/cpu/irq/imask.c | 68 +- arch/sh/kernel/cpu/irq/intc-sh5.c | 36 +- arch/sh/kernel/cpu/irq/ipr.c | 12 + arch/sh/kernel/cpu/sh2/clock-sh7619.c | 16 +- arch/sh/kernel/cpu/sh2/setup-sh7619.c | 84 + arch/sh/kernel/cpu/sh2a/clock-sh7201.c | 14 +- arch/sh/kernel/cpu/sh2a/clock-sh7203.c | 15 +- arch/sh/kernel/cpu/sh2a/clock-sh7206.c | 12 +- arch/sh/kernel/cpu/sh2a/setup-mxg.c | 111 +- arch/sh/kernel/cpu/sh2a/setup-sh7201.c | 115 + arch/sh/kernel/cpu/sh2a/setup-sh7203.c | 154 ++ arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 187 ++ arch/sh/kernel/cpu/sh3/clock-sh3.c | 12 +- arch/sh/kernel/cpu/sh3/clock-sh7705.c | 12 +- arch/sh/kernel/cpu/sh3/clock-sh7706.c | 12 +- arch/sh/kernel/cpu/sh3/clock-sh7709.c | 12 +- arch/sh/kernel/cpu/sh3/clock-sh7710.c | 12 +- arch/sh/kernel/cpu/sh3/clock-sh7712.c | 8 +- arch/sh/kernel/cpu/sh3/setup-sh7705.c | 108 + arch/sh/kernel/cpu/sh3/setup-sh770x.c | 108 + arch/sh/kernel/cpu/sh3/setup-sh7710.c | 108 + arch/sh/kernel/cpu/sh3/setup-sh7720.c | 270 +++ arch/sh/kernel/cpu/sh4/clock-sh4-202.c | 43 +- arch/sh/kernel/cpu/sh4/clock-sh4.c | 12 +- arch/sh/kernel/cpu/sh4/probe.c | 130 +- arch/sh/kernel/cpu/sh4/setup-sh4-202.c | 164 ++- arch/sh/kernel/cpu/sh4/setup-sh7750.c | 187 ++ arch/sh/kernel/cpu/sh4/setup-sh7760.c | 140 ++- arch/sh/kernel/cpu/sh4a/Makefile | 3 + arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 428 +++-- arch/sh/kernel/cpu/sh4a/clock-sh7763.c | 46 +- arch/sh/kernel/cpu/sh4a/clock-sh7770.c | 12 +- arch/sh/kernel/cpu/sh4a/clock-sh7780.c | 43 +- arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 208 +-- arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 47 +- arch/sh/kernel/cpu/sh4a/clock-shx3.c | 41 +- arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c | 2230 ++++++++++++++++++++ arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 122 +- arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 119 +- arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 123 +- arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 231 ++- arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 762 +++++++ arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 204 ++ arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 546 +++++ arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 204 ++ arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 210 ++ arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 393 ++++ arch/sh/kernel/cpu/sh4a/setup-shx3.c | 209 ++- arch/sh/kernel/cpu/sh5/Makefile | 3 + arch/sh/kernel/cpu/sh5/clock-sh5.c | 14 +- arch/sh/kernel/cpu/sh5/entry.S | 65 +- arch/sh/kernel/cpu/sh5/setup-sh5.c | 195 ++ arch/sh/kernel/io.c | 1 + arch/sh/kernel/io_trapped.c | 2 +- arch/sh/kernel/irq.c | 77 +- arch/sh/kernel/kgdb.c | 4 +- .../{timers/timer-broadcast.c => localtimer.c} | 0 arch/sh/kernel/machvec.c | 1 + arch/sh/kernel/module.c | 2 +- arch/sh/kernel/process_32.c | 4 +- arch/sh/kernel/ptrace_32.c | 8 + arch/sh/kernel/setup.c | 26 +- arch/sh/kernel/sh_ksyms_32.c | 9 - arch/sh/kernel/sh_ksyms_64.c | 2 + arch/sh/kernel/time.c | 125 ++ arch/sh/kernel/time_32.c | 240 --- arch/sh/kernel/time_64.c | 363 ---- arch/sh/kernel/timers/Makefile | 11 - arch/sh/kernel/timers/timer-cmt.c | 188 -- arch/sh/kernel/timers/timer-mtu2.c | 202 -- arch/sh/kernel/timers/timer-tmu.c | 297 --- arch/sh/kernel/timers/timer.c | 55 - arch/sh/kernel/traps.c | 6 +- arch/sh/kernel/traps_32.c | 15 +- arch/sh/kernel/traps_64.c | 35 +- arch/sh/kernel/vmlinux.lds.S | 179 ++- arch/sh/kernel/vmlinux_32.lds.S | 154 -- arch/sh/kernel/vmlinux_64.lds.S | 163 -- arch/sh/lib64/.gitignore | 1 - arch/sh/lib64/dbg.c | 182 -- arch/sh/lib64/panic.c | 43 - arch/sh/lib64/sdivsi3.S | 6 +- arch/sh/lib64/udelay.c | 2 +- arch/sh/mm/Kconfig | 31 +- arch/sh/mm/cache-sh5.c | 8 +- arch/sh/mm/init.c | 3 - arch/sh/mm/ioremap_32.c | 14 +- arch/sh/mm/ioremap_64.c | 266 +-- arch/sh/mm/mmap.c | 136 ++- arch/sh/oprofile/common.c | 1 + arch/sh/tools/mach-types | 1 + drivers/clocksource/Makefile | 2 + drivers/clocksource/sh_cmt.c | 116 +- drivers/clocksource/sh_mtu2.c | 357 ++++ drivers/clocksource/sh_tmu.c | 461 ++++ drivers/i2c/busses/i2c-sh7760.c | 2 +- drivers/rtc/Kconfig | 2 +- drivers/serial/sh-sci.c | 388 ++-- drivers/serial/sh-sci.h | 42 +- drivers/sh/intc.c | 17 +- drivers/video/hitfb.c | 4 +- include/linux/clocksource.h | 10 +- include/linux/serial_sci.h | 3 +- include/linux/sh_cmt.h | 13 - include/linux/sh_timer.h | 13 + include/linux/time.h | 15 + kernel/time/clocksource.c | 3 - kernel/time/timekeeping.c | 7 + sound/oss/Kconfig | 2 +- sound/oss/sh_dac_audio.c | 85 +- 261 files changed, 17189 insertions(+), 6712 deletions(-) create mode 100644 arch/sh/boards/mach-cayman/panic.c create mode 100644 arch/sh/boards/mach-se/7724/Makefile create mode 100644 arch/sh/boards/mach-se/7724/irq.c create mode 100644 arch/sh/boards/mach-se/7724/setup.c delete mode 100644 arch/sh/boards/mach-se/7751/pci.c delete mode 100644 arch/sh/boot/compressed/Makefile_32 delete mode 100644 arch/sh/boot/compressed/Makefile_64 delete mode 100644 arch/sh/boot/compressed/vmlinux_64.lds create mode 100644 arch/sh/configs/se7724_defconfig create mode 100644 arch/sh/configs/sh7724_generic_defconfig create mode 100644 arch/sh/configs/sh7770_generic_defconfig rename arch/sh/drivers/pci/{ops-cayman.c => fixups-cayman.c} (88%) create mode 100644 arch/sh/drivers/pci/fixups-landisk.c delete mode 100644 arch/sh/drivers/pci/fixups-lboxre2.c create mode 100644 arch/sh/drivers/pci/fixups-se7751.c delete mode 100644 arch/sh/drivers/pci/fixups-se7780.c delete mode 100644 arch/sh/drivers/pci/fixups-sh7785lcr.c create mode 100644 arch/sh/drivers/pci/fixups-snapgear.c create mode 100644 arch/sh/drivers/pci/fixups-titan.c delete mode 100644 arch/sh/drivers/pci/ops-landisk.c delete mode 100644 arch/sh/drivers/pci/ops-lboxre2.c delete mode 100644 arch/sh/drivers/pci/ops-r7780rp.c delete mode 100644 arch/sh/drivers/pci/ops-rts7751r2d.c delete mode 100644 arch/sh/drivers/pci/ops-sdk7780.c delete mode 100644 arch/sh/drivers/pci/ops-se7780.c delete mode 100644 arch/sh/drivers/pci/ops-sh03.c delete mode 100644 arch/sh/drivers/pci/ops-sh7785lcr.c delete mode 100644 arch/sh/drivers/pci/ops-snapgear.c delete mode 100644 arch/sh/drivers/pci/ops-titan.c delete mode 100644 arch/sh/drivers/pci/pci-auto.c create mode 100644 arch/sh/drivers/pci/pci-dreamcast.c delete mode 100644 arch/sh/include/asm/timer.h delete mode 100644 arch/sh/include/cpu-sh3/cpu/timer.h create mode 100644 arch/sh/include/cpu-sh4/cpu/sh7724.h delete mode 100644 arch/sh/include/cpu-sh4/cpu/timer.h create mode 100644 arch/sh/include/mach-se/mach/se7724.h create mode 100644 arch/sh/kernel/cpu/clock-cpg.c create mode 100644 arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c create mode 100644 arch/sh/kernel/cpu/sh4a/setup-sh7724.c create mode 100644 arch/sh/kernel/cpu/sh5/setup-sh5.c rename arch/sh/kernel/{timers/timer-broadcast.c => localtimer.c} (100%) create mode 100644 arch/sh/kernel/time.c delete mode 100644 arch/sh/kernel/time_32.c delete mode 100644 arch/sh/kernel/time_64.c delete mode 100644 arch/sh/kernel/timers/Makefile delete mode 100644 arch/sh/kernel/timers/timer-cmt.c delete mode 100644 arch/sh/kernel/timers/timer-mtu2.c delete mode 100644 arch/sh/kernel/timers/timer-tmu.c delete mode 100644 arch/sh/kernel/timers/timer.c delete mode 100644 arch/sh/kernel/vmlinux_32.lds.S delete mode 100644 arch/sh/kernel/vmlinux_64.lds.S delete mode 100644 arch/sh/lib64/.gitignore create mode 100644 drivers/clocksource/sh_mtu2.c create mode 100644 drivers/clocksource/sh_tmu.c delete mode 100644 include/linux/sh_cmt.h create mode 100644 include/linux/sh_timer.h Merging sparc/master $ git merge sparc/master Auto-merging arch/sparc/kernel/head_64.S Auto-merging arch/sparc/kernel/smp_64.c Merge made by recursive. arch/sparc/Kconfig | 3 + arch/sparc/include/asm/cpudata_64.h | 197 +----------------------------- arch/sparc/include/asm/mdesc.h | 3 +- arch/sparc/include/asm/percpu_64.h | 8 +- arch/sparc/include/asm/prom.h | 2 + arch/sparc/include/asm/trap_block.h | 207 +++++++++++++++++++++++++++++++ arch/sparc/kernel/ds.c | 3 +- arch/sparc/kernel/head_64.S | 22 ---- arch/sparc/kernel/mdesc.c | 149 +++++++++++++--------- arch/sparc/kernel/prom.h | 1 - arch/sparc/kernel/prom_64.c | 234 +++++++++++++++++++---------------- arch/sparc/kernel/prom_common.c | 2 - arch/sparc/kernel/smp_64.c | 192 ++++++++++++++++++++++++----- arch/sparc/kernel/traps_64.c | 170 ++++++++++++++------------ arch/sparc/mm/init_32.c | 1 + arch/sparc/mm/init_64.c | 16 +-- 16 files changed, 692 insertions(+), 518 deletions(-) create mode 100644 arch/sparc/include/asm/trap_block.h Merging xtensa/master $ git merge xtensa/master Auto-merging arch/xtensa/Kconfig Merge made by recursive. Merging configfs/linux-next $ git merge configfs/linux-next Merge made by recursive. fs/configfs/configfs_internal.h | 3 + fs/configfs/dir.c | 193 ++++++++++++++++++++++++++++----------- fs/configfs/inode.c | 38 ++++++++ 3 files changed, 180 insertions(+), 54 deletions(-) Merging ext4/next $ git merge ext4/next Auto-merging fs/buffer.c Removing fs/ext4/ext4_i.h Removing fs/ext4/ext4_sb.h Removing fs/ext4/group.h Removing fs/ext4/namei.h Merge made by recursive. fs/buffer.c | 2 + fs/ext2/super.c | 1 + fs/ext3/super.c | 1 + fs/ext4/Makefile | 4 +- fs/ext4/balloc.c | 28 +- fs/ext4/block_validity.c | 244 ++++++++++++++ fs/ext4/dir.c | 3 +- fs/ext4/ext4.h | 354 ++++++++++++++++++-- fs/ext4/ext4_i.h | 140 -------- fs/ext4/ext4_sb.h | 161 --------- fs/ext4/extents.c | 85 ++--- fs/ext4/group.h | 29 -- fs/ext4/ialloc.c | 73 ++--- fs/ext4/inode.c | 593 ++++++++++++++++++++------------- fs/ext4/mballoc.c | 166 ++++------ fs/ext4/mballoc.h | 1 - fs/ext4/namei.c | 27 +- fs/ext4/namei.h | 8 - fs/ext4/resize.c | 36 +- fs/ext4/super.c | 831 ++++++++++++++++++++++++---------------------- fs/ioctl.c | 14 +- fs/jbd2/journal.c | 8 +- fs/mpage.c | 6 +- 23 files changed, 1582 insertions(+), 1233 deletions(-) create mode 100644 fs/ext4/block_validity.c delete mode 100644 fs/ext4/ext4_i.h delete mode 100644 fs/ext4/ext4_sb.h delete mode 100644 fs/ext4/group.h delete mode 100644 fs/ext4/namei.h Merging fatfs/master $ git merge fatfs/master Merge made by recursive. Documentation/filesystems/vfat.txt | 5 + fs/fat/cache.c | 6 +- fs/fat/dir.c | 2 +- fs/fat/fat.h | 7 +- fs/fat/fatent.c | 4 +- fs/fat/file.c | 184 ++++++++++++++++++----------------- fs/fat/inode.c | 28 +++++- fs/fat/misc.c | 22 +++-- fs/fat/namei_msdos.c | 2 +- fs/fat/namei_vfat.c | 2 +- 10 files changed, 152 insertions(+), 110 deletions(-) Merging fuse/for-next $ git merge fuse/for-next Auto-merging fs/fuse/inode.c Merge made by recursive. fs/Kconfig | 10 + fs/fuse/Makefile | 1 + fs/fuse/cuse.c | 610 ++++++++++++++++++++++++++++++++++++++++++++++++++ fs/fuse/dev.c | 15 +- fs/fuse/dir.c | 33 +-- fs/fuse/file.c | 346 +++++++++++++++++------------ fs/fuse/fuse_i.h | 47 +++- fs/fuse/inode.c | 118 ++++++---- include/linux/fuse.h | 31 +++ 9 files changed, 980 insertions(+), 231 deletions(-) create mode 100644 fs/fuse/cuse.c Merging gfs2/master $ git merge gfs2/master Removing fs/gfs2/mount.c Removing fs/gfs2/ops_address.h Removing fs/gfs2/ops_super.c Merge made by recursive. Documentation/filesystems/gfs2-glocks.txt | 2 +- Documentation/filesystems/gfs2.txt | 19 +- fs/gfs2/Kconfig | 1 + fs/gfs2/Makefile | 4 +- fs/gfs2/{ops_address.c => aops.c} | 21 +- fs/gfs2/bmap.c | 12 +- fs/gfs2/{ops_dentry.c => dentry.c} | 0 fs/gfs2/dir.c | 11 +- fs/gfs2/eattr.c | 14 +- fs/gfs2/{ops_export.c => export.c} | 0 fs/gfs2/{ops_file.c => file.c} | 36 +- fs/gfs2/glock.c | 21 +- fs/gfs2/glops.c | 20 +- fs/gfs2/incore.h | 27 +- fs/gfs2/inode.c | 150 +----- fs/gfs2/inode.h | 52 +- fs/gfs2/log.c | 6 +- fs/gfs2/lops.c | 14 +- fs/gfs2/main.c | 8 + fs/gfs2/meta_io.c | 105 +++- fs/gfs2/mount.c | 185 ------ fs/gfs2/ops_address.h | 23 - fs/gfs2/ops_fstype.c | 68 +-- fs/gfs2/ops_inode.c | 146 +++++ fs/gfs2/ops_super.c | 723 ----------------------- fs/gfs2/quota.c | 1 - fs/gfs2/recovery.c | 102 +--- fs/gfs2/recovery.h | 2 +- fs/gfs2/rgrp.c | 141 +++-- fs/gfs2/rgrp.h | 47 +- fs/gfs2/super.c | 903 ++++++++++++++++++++++++++++- fs/gfs2/sys.c | 245 +++------ fs/gfs2/trans.c | 9 +- 33 files changed, 1534 insertions(+), 1584 deletions(-) rename fs/gfs2/{ops_address.c => aops.c} (98%) rename fs/gfs2/{ops_dentry.c => dentry.c} (100%) rename fs/gfs2/{ops_export.c => export.c} (100%) rename fs/gfs2/{ops_file.c => file.c} (97%) delete mode 100644 fs/gfs2/mount.c delete mode 100644 fs/gfs2/ops_address.h delete mode 100644 fs/gfs2/ops_super.c Merging jfs/next $ git merge jfs/next Merge made by recursive. fs/jfs/jfs_imap.c | 1 + fs/jfs/super.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) Merging nfs/linux-next $ git merge nfs/linux-next Auto-merging fs/nfs/nfs4proc.c Auto-merging fs/nfs/super.c Merge made by recursive. fs/nfs/Kconfig | 9 + fs/nfs/client.c | 124 ++++- fs/nfs/direct.c | 9 + fs/nfs/internal.h | 62 +++ fs/nfs/nfs4_fs.h | 37 ++- fs/nfs/nfs4proc.c | 1229 ++++++++++++++++++++++++++++++++++++++++-- fs/nfs/nfs4renewd.c | 6 +- fs/nfs/nfs4state.c | 130 ++++- fs/nfs/nfs4xdr.c | 1078 ++++++++++++++++++++++++++++++++----- fs/nfs/read.c | 33 +- fs/nfs/super.c | 12 + fs/nfs/unlink.c | 20 +- fs/nfs/write.c | 31 +- include/linux/nfs4.h | 18 + include/linux/nfs_fs_sb.h | 67 +++- include/linux/nfs_xdr.h | 174 ++++++ include/linux/nfsd/state.h | 1 - include/linux/sunrpc/clnt.h | 1 + include/linux/sunrpc/sched.h | 1 + net/sunrpc/clnt.c | 13 + net/sunrpc/sched.c | 2 +- 21 files changed, 2838 insertions(+), 219 deletions(-) Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Auto-merging fs/Kconfig Auto-merging fs/nfs/Kconfig Auto-merging include/linux/nfsd/state.h Merge made by recursive. Documentation/filesystems/00-INDEX | 4 + fs/Kconfig | 2 + fs/lockd/svclock.c | 2 + fs/locks.c | 3 +- fs/nfs/Kconfig | 2 +- fs/nfsd/export.c | 13 +- fs/nfsd/nfs3xdr.c | 1 + fs/nfsd/nfs4callback.c | 222 ++++++++++------ fs/nfsd/nfs4proc.c | 171 +++++++++---- fs/nfsd/nfs4state.c | 488 ++++++++++++++++-------------------- fs/nfsd/nfs4xdr.c | 351 +++++++++++++------------- fs/nfsd/nfscache.c | 33 ++- fs/nfsd/nfsctl.c | 284 +++++++++++++-------- fs/nfsd/nfsfh.c | 6 - fs/nfsd/nfssvc.c | 28 ++- include/linux/fs.h | 1 + include/linux/nfsd/cache.h | 3 +- include/linux/nfsd/nfsd.h | 7 + include/linux/nfsd/nfsfh.h | 7 + include/linux/nfsd/state.h | 86 ++++--- include/linux/nfsd/xdr4.h | 49 +++-- include/linux/sunrpc/svc.h | 2 - include/linux/sunrpc/svc_xprt.h | 7 +- include/linux/sunrpc/svcsock.h | 7 +- net/sunrpc/svc_xprt.c | 57 +++-- net/sunrpc/svcsock.c | 87 +++++-- 26 files changed, 1075 insertions(+), 848 deletions(-) Merging nilfs2/for-next $ git merge nilfs2/for-next Removing fs/nilfs2/seglist.h Merge made by recursive. Documentation/filesystems/nilfs2.txt | 5 +- fs/nilfs2/bmap.c | 272 +++++++------------------ fs/nilfs2/bmap.h | 135 ++++++++----- fs/nilfs2/btnode.c | 9 +- fs/nilfs2/btnode.h | 2 +- fs/nilfs2/btree.c | 366 +++++++++++++++++++--------------- fs/nilfs2/btree.h | 31 +--- fs/nilfs2/cpfile.c | 47 ++--- fs/nilfs2/cpfile.h | 4 +- fs/nilfs2/dat.c | 36 +--- fs/nilfs2/dat.h | 2 +- fs/nilfs2/direct.c | 139 +++++++------- fs/nilfs2/direct.h | 20 +-- fs/nilfs2/gcinode.c | 5 +- fs/nilfs2/inode.c | 18 +- fs/nilfs2/ioctl.c | 35 +--- fs/nilfs2/mdt.c | 3 +- fs/nilfs2/nilfs.h | 1 + fs/nilfs2/recovery.c | 37 +++-- fs/nilfs2/segbuf.c | 3 +- fs/nilfs2/seglist.h | 85 -------- fs/nilfs2/segment.c | 130 ++++--------- fs/nilfs2/segment.h | 12 +- fs/nilfs2/sufile.c | 119 ++++++++++- fs/nilfs2/sufile.h | 62 ++++-- fs/nilfs2/super.c | 9 +- fs/nilfs2/the_nilfs.c | 1 - 27 files changed, 727 insertions(+), 861 deletions(-) delete mode 100644 fs/nilfs2/seglist.h Merging ocfs2/linux-next $ git merge ocfs2/linux-next Merge made by recursive. fs/ocfs2/blockcheck.c | 184 ++++++++++++++++++++++++++++++++++++++++++-- fs/ocfs2/blockcheck.h | 29 +++++++- fs/ocfs2/cluster/masklog.h | 35 ++++---- fs/ocfs2/dir.c | 21 +++--- fs/ocfs2/dlmglue.c | 51 ++++++++++++ fs/ocfs2/dlmglue.h | 11 +++ fs/ocfs2/file.c | 56 ++++++++------ fs/ocfs2/journal.c | 111 ++++++++++++++++++++++++++ fs/ocfs2/journal.h | 4 + fs/ocfs2/ocfs2.h | 16 ++++ fs/ocfs2/ocfs2_lockid.h | 5 + fs/ocfs2/quota_global.c | 4 +- fs/ocfs2/quota_local.c | 21 ++++-- fs/ocfs2/super.c | 66 ++++++++++++---- fs/ocfs2/xattr.c | 5 +- 15 files changed, 532 insertions(+), 87 deletions(-) Merging squashfs/master $ git merge squashfs/master Already up-to-date. Merging v9fs/for-next $ git merge v9fs/for-next Resolved 'net/9p/protocol.c' using previous resolution. Auto-merging net/9p/protocol.c CONFLICT (content): Merge conflict in net/9p/protocol.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 1435818] Merge commit 'v9fs/for-next' $ git diff -M --stat --summary HEAD^.. Merging ubifs/linux-next $ git merge ubifs/linux-next Auto-merging fs/ubifs/super.c Merge made by recursive. fs/ubifs/budget.c | 4 +- fs/ubifs/dir.c | 19 +++++++++++++ fs/ubifs/io.c | 34 ++++++++++++++--------- fs/ubifs/recovery.c | 31 +++------------------ fs/ubifs/super.c | 76 ++++++++++++++++++++++++++++++++++----------------- fs/ubifs/ubifs.h | 13 +++++--- kernel/hrtimer.c | 2 + 7 files changed, 107 insertions(+), 72 deletions(-) Merging xfs/master $ git merge xfs/master Merge made by recursive. Merging reiserfs-bkl/reiserfs/kill-bkl-rc6 $ git merge reiserfs-bkl/reiserfs/kill-bkl-rc6 Merge made by recursive. fs/reiserfs/Makefile | 2 +- fs/reiserfs/bitmap.c | 4 ++ fs/reiserfs/dir.c | 8 +++ fs/reiserfs/do_balan.c | 17 ++---- fs/reiserfs/fix_node.c | 19 ++++++-- fs/reiserfs/inode.c | 73 ++++++++++++++++++--------- fs/reiserfs/ioctl.c | 6 ++- fs/reiserfs/journal.c | 109 ++++++++++++++++++++++++++++------------ fs/reiserfs/lock.c | 89 ++++++++++++++++++++++++++++++++ fs/reiserfs/namei.c | 13 ++++- fs/reiserfs/prints.c | 4 -- fs/reiserfs/resize.c | 2 + fs/reiserfs/stree.c | 53 ++++++++++++++++--- fs/reiserfs/super.c | 56 ++++++++++++++++++--- fs/reiserfs/xattr.c | 4 +- include/linux/reiserfs_fs.h | 68 +++++++++++++++++++++++-- include/linux/reiserfs_fs_sb.h | 20 +++++++ 17 files changed, 442 insertions(+), 105 deletions(-) create mode 100644 fs/reiserfs/lock.c Merging vfs/for-next $ git merge vfs/for-next Resolved 'fs/ext4/super.c' using previous resolution. Resolved 'fs/reiserfs/super.c' using previous resolution. Removing fs/ext2/fsync.c Auto-merging fs/ext2/super.c Auto-merging fs/ext3/super.c Auto-merging fs/ext4/super.c CONFLICT (content): Merge conflict in fs/ext4/super.c Auto-merging fs/fat/dir.c Auto-merging fs/fat/fat.h Auto-merging fs/fat/fatent.c Auto-merging fs/fat/file.c Auto-merging fs/fat/inode.c Auto-merging fs/fat/namei_msdos.c Auto-merging fs/fat/namei_vfat.c Auto-merging fs/gfs2/log.c CONFLICT (delete/modify): fs/gfs2/ops_super.c deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of fs/gfs2/ops_super.c left in tree. Auto-merging fs/jfs/super.c Auto-merging fs/nfs/super.c Auto-merging fs/nfsd/export.c Auto-merging fs/nilfs2/cpfile.c Auto-merging fs/nilfs2/super.c Auto-merging fs/nilfs2/the_nilfs.c Auto-merging fs/ocfs2/super.c Removing fs/qnx4/fsync.c Auto-merging fs/reiserfs/dir.c Auto-merging fs/reiserfs/super.c CONFLICT (content): Merge conflict in fs/reiserfs/super.c Auto-merging fs/reiserfs/xattr.c Auto-merging fs/ubifs/super.c Removing fs/udf/fsync.c Auto-merging include/linux/fs.h Auto-merging include/linux/reiserfs_fs_sb.h Automatic merge failed; fix conflicts and then commit the result. $ git rm -f fs/gfs2/ops_super.c fs/ext4/super.c: needs merge fs/gfs2/ops_super.c: needs merge fs/reiserfs/super.c: needs merge rm 'fs/gfs2/ops_super.c' $ git commit -v -a [master 2d9df66] Merge commit 'vfs/for-next' $ git diff -M --stat --summary HEAD^.. arch/alpha/kernel/osf_sys.c | 3 - drivers/ieee1394/dv1394.c | 5 +- drivers/ieee1394/ieee1394_core.h | 6 +- drivers/usb/core/inode.c | 5 + fs/adfs/adfs.h | 4 +- fs/adfs/dir.c | 10 +- fs/adfs/dir_f.c | 17 ++ fs/adfs/dir_fplus.c | 17 ++ fs/adfs/file.c | 2 +- fs/adfs/inode.c | 4 +- fs/adfs/map.c | 2 +- fs/adfs/super.c | 4 + fs/affs/affs.h | 1 + fs/affs/dir.c | 2 +- fs/affs/file.c | 14 ++- fs/affs/super.c | 54 +++++-- fs/afs/mntpt.c | 2 +- fs/afs/super.c | 4 + fs/autofs/dirhash.c | 5 +- fs/autofs4/autofs_i.h | 6 +- fs/autofs4/dev-ioctl.c | 195 +++++++---------------- fs/autofs4/expire.c | 15 +- fs/autofs4/root.c | 7 +- fs/befs/linuxvfs.c | 5 +- fs/bfs/dir.c | 8 +- fs/bfs/inode.c | 52 +++++-- fs/block_dev.c | 19 ++- fs/btrfs/inode.c | 7 - fs/btrfs/super.c | 11 -- fs/cachefiles/interface.c | 4 +- fs/char_dev.c | 14 ++- fs/cifs/cifs_dfs_ref.c | 2 +- fs/cifs/cifsfs.c | 6 +- fs/compat.c | 2 - fs/dcache.c | 7 +- fs/ecryptfs/super.c | 5 + fs/exofs/super.c | 25 +++- fs/ext2/Makefile | 2 +- fs/ext2/dir.c | 2 +- fs/ext2/ext2.h | 3 - fs/ext2/file.c | 4 +- fs/ext2/fsync.c | 50 ------ fs/ext2/inode.c | 11 +- fs/ext2/super.c | 60 +++++-- fs/ext3/balloc.c | 3 +- fs/ext3/ialloc.c | 3 +- fs/ext3/inode.c | 1 - fs/ext3/resize.c | 2 - fs/ext3/super.c | 34 ++--- fs/ext3/xattr.c | 1 - fs/ext4/super.c | 24 +++- fs/fat/dir.c | 16 +- fs/fat/fat.h | 6 + fs/fat/fatent.c | 13 +- fs/fat/file.c | 14 ++- fs/fat/inode.c | 31 ++++- fs/fat/namei_msdos.c | 4 +- fs/fat/namei_vfat.c | 4 +- fs/file_table.c | 40 +++++- fs/freevxfs/vxfs_super.c | 4 + fs/fs-writeback.c | 92 +++-------- fs/gfs2/log.c | 2 - fs/hfs/super.c | 23 +++- fs/hfsplus/super.c | 25 +++- fs/hpfs/super.c | 12 ++ fs/inode.c | 2 +- fs/internal.h | 17 ++ fs/isofs/inode.c | 5 + fs/jffs2/fs.c | 18 +-- fs/jffs2/os-linux.h | 1 - fs/jffs2/super.c | 26 +++ fs/jfs/super.c | 27 +++- fs/libfs.c | 25 +++ fs/minix/dir.c | 2 +- fs/minix/file.c | 20 +--- fs/minix/inode.c | 37 ++--- fs/minix/minix.h | 2 - fs/namei.c | 129 +++++++++------ fs/namespace.c | 327 ++++++++++++++++---------------------- fs/ncpfs/inode.c | 4 + fs/nfs/namespace.c | 2 +- fs/nfs/super.c | 2 + fs/nfsd/export.c | 78 ++++------ fs/nfsd/vfs.c | 54 +++--- fs/nilfs2/cpfile.c | 6 +- fs/nilfs2/sb.h | 1 + fs/nilfs2/super.c | 256 +++++++++++------------------- fs/nilfs2/the_nilfs.c | 113 +++++++++++++- fs/nilfs2/the_nilfs.h | 23 +++- fs/ntfs/super.c | 54 +++---- fs/ocfs2/super.c | 22 +-- fs/omfs/file.c | 17 +-- fs/open.c | 4 +- fs/proc/internal.h | 25 +++ fs/proc/proc_devtree.c | 1 + fs/qnx4/Makefile | 2 +- fs/qnx4/bitmap.c | 7 +- fs/qnx4/dir.c | 9 +- fs/qnx4/file.c | 5 +- fs/qnx4/fsync.c | 169 -------------------- fs/qnx4/inode.c | 58 ++----- fs/qnx4/namei.c | 13 +-- fs/qnx4/qnx4.h | 57 +++++++ fs/qnx4/truncate.c | 6 +- fs/quota/quota.c | 25 ++-- fs/reiserfs/dir.c | 10 +- fs/reiserfs/super.c | 32 +++-- fs/reiserfs/xattr.c | 3 +- fs/smbfs/inode.c | 4 + fs/squashfs/super.c | 4 + fs/super.c | 192 ++++------------------- fs/sync.c | 117 ++++++++++++-- fs/sysv/dir.c | 2 +- fs/sysv/file.c | 17 +-- fs/sysv/inode.c | 75 +++++---- fs/sysv/sysv.h | 1 - fs/ubifs/super.c | 17 ++- fs/udf/Makefile | 2 +- fs/udf/dir.c | 2 +- fs/udf/file.c | 2 +- fs/udf/fsync.c | 52 ------ fs/udf/super.c | 11 ++- fs/udf/udfdecl.h | 3 - fs/ufs/dir.c | 2 +- fs/ufs/file.c | 23 +--- fs/ufs/super.c | 65 ++++++-- fs/ufs/ufs.h | 1 - fs/xattr.c | 4 +- fs/xfs/linux-2.6/xfs_super.c | 12 -- fs/xfs/xfs_trans.c | 2 - include/linux/Kbuild | 2 +- include/linux/cdev.h | 2 + include/linux/cramfs_fs.h | 3 +- include/linux/dcache.h | 7 +- include/linux/fs.h | 21 +-- include/linux/magic.h | 2 + include/linux/mount.h | 25 +++- include/linux/namei.h | 5 +- include/linux/nfsd/export.h | 6 +- include/linux/proc_fs.h | 24 --- include/linux/qnx4_fs.h | 61 ------- include/linux/quotaops.h | 20 ++- include/linux/reiserfs_fs_sb.h | 2 + include/linux/writeback.h | 1 - kernel/audit_tree.c | 6 +- kernel/cgroup.c | 3 + 146 files changed, 1710 insertions(+), 1823 deletions(-) delete mode 100644 fs/ext2/fsync.c delete mode 100644 fs/qnx4/fsync.c create mode 100644 fs/qnx4/qnx4.h delete mode 100644 fs/udf/fsync.c $ git am -3 ../patches/0001-vfs-gfs2-fixup-merge-for-file-removal.patch Applying: vfs/gfs2: fixup merge for file removal $ git reset HEAD^ fs/gfs2/super.c: locally modified $ git add . $ git commit -v -a --amend [master 6907e85] Merge commit 'vfs/for-next' Merging pci/linux-next $ git merge pci/linux-next Auto-merging drivers/pci/hotplug/ibmphp_core.c Auto-merging drivers/pci/msi.c Auto-merging drivers/pci/probe.c Merge made by recursive. arch/x86/include/asm/pci.h | 1 + drivers/pci/bus.c | 7 +- drivers/pci/hotplug/Kconfig | 2 +- drivers/pci/hotplug/cpqphp.h | 167 +++--- drivers/pci/hotplug/cpqphp_core.c | 1101 +++++++++++++++++------------------- drivers/pci/hotplug/cpqphp_ctrl.c | 371 +++++++------ drivers/pci/hotplug/cpqphp_nvram.c | 97 ++-- drivers/pci/hotplug/cpqphp_pci.c | 599 ++++++++++---------- drivers/pci/hotplug/ibmphp_core.c | 1 + drivers/pci/msi.c | 2 +- drivers/pci/msi.h | 14 +- drivers/pci/pcie/portdrv_core.c | 2 +- drivers/pci/probe.c | 9 +- drivers/pci/search.c | 30 - drivers/pci/setup-bus.c | 53 ++- drivers/pci/setup-res.c | 49 ++- include/linux/ioport.h | 2 + include/linux/pci.h | 12 +- include/linux/pci_regs.h | 4 +- 19 files changed, 1269 insertions(+), 1254 deletions(-) Merging hid/for-next $ git merge hid/for-next Merge made by recursive. drivers/hid/Kconfig | 92 ++++++++++++--- drivers/hid/Makefile | 10 +- drivers/hid/hid-apple.c | 4 - drivers/hid/hid-core.c | 2 + drivers/hid/hid-debug.c | 23 ++++- drivers/hid/hid-drff.c | 8 ++ drivers/hid/hid-gaff.c | 8 ++ drivers/hid/hid-ids.h | 2 + drivers/hid/hid-lgff.c | 10 ++- drivers/hid/hid-ntrig.c | 222 +++++++++++++++++++++++++++++++++-- drivers/hid/hid-sjoy.c | 180 ++++++++++++++++++++++++++++ drivers/hid/hid-tmff.c | 17 ++- drivers/hid/hid-wacom.c | 259 +++++++++++++++++++++++++++++++++++++++++ drivers/hid/hid-zpff.c | 7 + drivers/hid/hidraw.c | 5 +- drivers/hid/usbhid/hid-core.c | 7 +- include/linux/hid.h | 36 ++++++ 17 files changed, 841 insertions(+), 51 deletions(-) create mode 100644 drivers/hid/hid-sjoy.c create mode 100644 drivers/hid/hid-wacom.c Merging quilt/i2c $ git merge quilt/i2c Auto-merging drivers/macintosh/therm_adt746x.c Merge made by recursive. Documentation/i2c/busses/i2c-viapro | 4 + arch/mips/configs/bigsur_defconfig | 2 +- arch/mips/configs/mtx1_defconfig | 2 +- arch/powerpc/configs/ppc6xx_defconfig | 2 +- drivers/i2c/busses/Kconfig | 6 +- drivers/i2c/busses/i2c-viapro.c | 4 + drivers/i2c/busses/i2c-voodoo3.c | 1 - drivers/i2c/chips/Kconfig | 15 --- drivers/i2c/chips/Makefile | 1 - drivers/i2c/i2c-core.c | 43 ++++++--- drivers/macintosh/therm_adt746x.c | 84 +++++++++--------- drivers/macintosh/therm_pm72.c | 95 +++++++++---------- drivers/macintosh/therm_windtunnel.c | 126 ++++++++++++------------- drivers/macintosh/windfarm_lm75_sensor.c | 129 +++++++++++++++----------- drivers/macintosh/windfarm_max6690_sensor.c | 103 ++++++++++++--------- drivers/macintosh/windfarm_smu_sat.c | 109 +++++++++++++--------- drivers/misc/eeprom/Kconfig | 14 +++ drivers/misc/eeprom/Makefile | 1 + drivers/{i2c/chips => misc/eeprom}/max6875.c | 2 +- drivers/video/tdfxfb.c | 1 - 20 files changed, 403 insertions(+), 341 deletions(-) rename drivers/{i2c/chips => misc/eeprom}/max6875.c (99%) Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Merge made by recursive. Documentation/hwmon/f71882fg | 12 +- Documentation/hwmon/ibmaem | 2 +- Documentation/hwmon/sysfs-interface | 19 + Documentation/hwmon/tmp401 | 42 +++ Documentation/hwmon/w83627ehf | 11 +- drivers/hwmon/Kconfig | 16 +- drivers/hwmon/Makefile | 1 + drivers/hwmon/f71882fg.c | 250 ++++++++++--- drivers/hwmon/hwmon.c | 29 ++ drivers/hwmon/ibmaem.c | 1 + drivers/hwmon/max6650.c | 86 +++++- drivers/hwmon/sht15.c | 10 +- drivers/hwmon/tmp401.c | 690 +++++++++++++++++++++++++++++++++++ drivers/hwmon/w83627ehf.c | 10 +- 14 files changed, 1103 insertions(+), 76 deletions(-) create mode 100644 Documentation/hwmon/tmp401 create mode 100644 drivers/hwmon/tmp401.c Merging quilt/kernel-doc $ git merge quilt/kernel-doc Already up-to-date. Merging v4l-dvb/master $ git merge v4l-dvb/master Auto-merging arch/arm/mach-pxa/pcm990-baseboard.c Auto-merging drivers/media/video/Kconfig Merge made by recursive. Documentation/dvb/get_dvb_firmware | 6 +- Documentation/video4linux/CARDLIST.cx88 | 1 + Documentation/video4linux/CARDLIST.em28xx | 1 + Documentation/video4linux/CARDLIST.saa7134 | 18 +- Documentation/video4linux/gspca.txt | 7 + Documentation/video4linux/pxa_camera.txt | 49 + Documentation/video4linux/v4l2-framework.txt | 5 + arch/arm/mach-pxa/pcm990-baseboard.c | 23 +- drivers/media/common/tuners/tuner-xc2028.c | 2 +- drivers/media/common/tuners/xc5000.c | 2 +- drivers/media/dvb/dvb-usb/af9015.c | 86 +- drivers/media/dvb/dvb-usb/dib0700_devices.c | 7 +- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 4 + drivers/media/dvb/dvb-usb/dvb-usb.h | 2 +- drivers/media/dvb/firewire/firedtv-1394.c | 4 +- drivers/media/dvb/firewire/firedtv-dvb.c | 2 +- drivers/media/dvb/firewire/firedtv-rc.c | 4 +- drivers/media/dvb/frontends/Kconfig | 22 + drivers/media/dvb/frontends/Makefile | 4 +- drivers/media/dvb/frontends/af9013.c | 2 +- drivers/media/dvb/frontends/cx24116.c | 2 +- drivers/media/dvb/frontends/drx397xD.c | 4 +- drivers/media/dvb/frontends/isl6423.c | 308 ++ drivers/media/dvb/frontends/isl6423.h | 63 + drivers/media/dvb/frontends/nxt200x.c | 6 +- drivers/media/dvb/frontends/or51132.c | 2 +- drivers/media/dvb/frontends/stv0900_priv.h | 2 - drivers/media/dvb/frontends/stv090x.c | 4299 ++++++++++++++++++++ drivers/media/dvb/frontends/stv090x.h | 106 + drivers/media/dvb/frontends/stv090x_priv.h | 269 ++ drivers/media/dvb/frontends/stv090x_reg.h | 2373 +++++++++++ drivers/media/dvb/frontends/stv6110x.c | 373 ++ drivers/media/dvb/frontends/stv6110x.h | 71 + drivers/media/dvb/frontends/stv6110x_priv.h | 75 + drivers/media/dvb/frontends/stv6110x_reg.h | 82 + drivers/media/dvb/frontends/tda10048.c | 224 +- drivers/media/dvb/frontends/tda10048.h | 17 + drivers/media/dvb/siano/smscoreapi.c | 36 - drivers/media/dvb/siano/smscoreapi.h | 176 +- drivers/media/dvb/siano/smsdvb.c | 41 +- drivers/media/dvb/siano/smsendian.c | 100 + drivers/media/dvb/siano/smsendian.h | 32 + drivers/media/dvb/siano/smsir.c | 301 ++ drivers/media/dvb/siano/smsir.h | 93 + drivers/media/dvb/siano/smssdio.c | 354 ++ drivers/media/dvb/ttpci/av7110_hw.c | 2 +- drivers/media/dvb/ttpci/av7110_v4l.c | 2 +- drivers/media/dvb/ttpci/budget-av.c | 2 +- drivers/media/dvb/ttpci/budget.c | 85 + drivers/media/radio/radio-sf16fmi.c | 16 +- drivers/media/radio/radio-sf16fmr2.c | 22 +- drivers/media/radio/radio-si470x.c | 1 - drivers/media/video/Kconfig | 20 +- drivers/media/video/Makefile | 11 +- drivers/media/video/adv7343.c | 534 +++ drivers/media/video/adv7343_regs.h | 185 + drivers/media/video/cpia2/cpia2_v4l.c | 6 +- drivers/media/video/cx18/cx18-audio.c | 44 +- drivers/media/video/cx18/cx18-av-core.c | 234 +- drivers/media/video/cx18/cx18-av-firmware.c | 82 +- drivers/media/video/cx18/cx18-controls.c | 6 +- drivers/media/video/cx18/cx18-driver.c | 97 +- drivers/media/video/cx18/cx18-driver.h | 17 +- drivers/media/video/cx18/cx18-dvb.c | 1 + drivers/media/video/cx18/cx18-fileops.c | 7 +- drivers/media/video/cx18/cx18-mailbox.c | 114 +- drivers/media/video/cx18/cx18-mailbox.h | 2 +- drivers/media/video/cx18/cx18-queue.c | 85 +- drivers/media/video/cx18/cx18-streams.c | 35 +- drivers/media/video/cx18/cx18-streams.h | 20 +- drivers/media/video/cx18/cx18-version.h | 2 +- drivers/media/video/cx231xx/cx231xx-avcore.c | 1 - drivers/media/video/cx231xx/cx231xx-vbi.c | 1 - drivers/media/video/cx23885/cimax2.c | 2 +- drivers/media/video/cx23885/cx23885-core.c | 10 +- drivers/media/video/cx23885/cx23885-dvb.c | 4 +- drivers/media/video/cx88/Makefile | 2 +- drivers/media/video/cx88/cx88-cards.c | 13 + drivers/media/video/cx88/cx88-core.c | 26 +- drivers/media/video/cx88/cx88-dsp.c | 312 ++ drivers/media/video/cx88/cx88-input.c | 4 + drivers/media/video/cx88/cx88-tvaudio.c | 115 +- drivers/media/video/cx88/cx88.h | 11 + drivers/media/video/em28xx/em28xx-cards.c | 27 + drivers/media/video/em28xx/em28xx-core.c | 2 +- drivers/media/video/em28xx/em28xx-dvb.c | 1 + drivers/media/video/em28xx/em28xx.h | 1 + drivers/media/video/gspca/finepix.c | 1 + drivers/media/video/gspca/gspca.c | 50 +- drivers/media/video/gspca/gspca.h | 6 +- drivers/media/video/gspca/m5602/Makefile | 3 +- drivers/media/video/gspca/m5602/m5602_bridge.h | 26 +- drivers/media/video/gspca/m5602/m5602_core.c | 44 +- drivers/media/video/gspca/m5602/m5602_mt9m111.c | 400 ++- drivers/media/video/gspca/m5602/m5602_mt9m111.h | 805 +---- drivers/media/video/gspca/m5602/m5602_ov7660.c | 227 + drivers/media/video/gspca/m5602/m5602_ov7660.h | 279 ++ drivers/media/video/gspca/m5602/m5602_ov9650.c | 195 +- drivers/media/video/gspca/m5602/m5602_ov9650.h | 57 +- drivers/media/video/gspca/m5602/m5602_po1030.c | 494 ++- drivers/media/video/gspca/m5602/m5602_po1030.h | 439 +-- drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 385 ++- drivers/media/video/gspca/m5602/m5602_s5k4aa.h | 93 +- drivers/media/video/gspca/m5602/m5602_s5k83a.c | 473 ++- drivers/media/video/gspca/m5602/m5602_s5k83a.h | 280 +-- drivers/media/video/gspca/m5602/m5602_sensor.h | 9 +- drivers/media/video/gspca/mr97310a.c | 8 +- drivers/media/video/gspca/ov534.c | 30 +- drivers/media/video/gspca/sonixb.c | 2 + drivers/media/video/gspca/sonixj.c | 66 +- drivers/media/video/gspca/spca500.c | 33 +- drivers/media/video/gspca/sq905.c | 1 + drivers/media/video/gspca/sq905c.c | 1 + drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c | 76 +- drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | 10 +- drivers/media/video/gspca/sunplus.c | 33 +- drivers/media/video/gspca/t613.c | 2 +- drivers/media/video/gspca/vc032x.c | 22 +- drivers/media/video/gspca/zc3xx.c | 22 +- drivers/media/video/hexium_gemini.c | 2 +- drivers/media/video/hexium_orion.c | 2 +- drivers/media/video/ivtv/ivtv-driver.c | 7 +- drivers/media/video/ivtv/ivtv-ioctl.c | 2 +- drivers/media/video/mt9m001.c | 108 +- drivers/media/video/mt9m111.c | 73 +- drivers/media/video/mt9t031.c | 135 +- drivers/media/video/mt9v022.c | 138 +- drivers/media/video/mx1_camera.c | 50 +- drivers/media/video/mx3_camera.c | 40 +- drivers/media/video/mxb.c | 4 +- drivers/media/video/pvrusb2/pvrusb2-devattr.c | 4 + drivers/media/video/pvrusb2/pvrusb2-devattr.h | 23 +- drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 3 + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 74 +- drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 51 +- drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 22 +- drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 6 +- drivers/media/video/pwc/pwc-v4l.c | 2 +- drivers/media/video/pxa_camera.c | 120 +- drivers/media/video/s2255drv.c | 62 +- drivers/media/video/saa7134/saa7134-cards.c | 438 ++- drivers/media/video/saa7134/saa7134-empress.c | 3 - drivers/media/video/saa7134/saa7134-input.c | 13 +- drivers/media/video/saa7134/saa7134-ts.c | 2 +- drivers/media/video/saa7134/saa7134.h | 15 +- drivers/media/video/sh_mobile_ceu_camera.c | 27 +- drivers/media/video/soc_camera.c | 106 +- drivers/media/video/stk-webcam.c | 4 +- drivers/media/video/tda7432.c | 14 - drivers/media/video/tea6415c.c | 1 - drivers/media/video/tea6420.c | 1 - drivers/media/video/ths7303.c | 151 + drivers/media/video/tuner-core.c | 27 - drivers/media/video/tveeprom.c | 2 +- drivers/media/video/usbvision/usbvision-video.c | 2 +- drivers/media/video/uvc/uvc_v4l2.c | 10 +- drivers/media/video/v4l2-common.c | 4 +- drivers/media/video/v4l2-device.c | 31 +- drivers/media/video/videobuf-core.c | 5 +- drivers/media/video/videobuf-dma-contig.c | 14 - drivers/media/video/zoran/zoran_card.c | 2 +- include/linux/mmc/sdio_ids.h | 8 + include/media/adv7343.h | 23 + include/media/soc_camera.h | 10 +- include/media/v4l2-chip-ident.h | 6 + include/media/v4l2-device.h | 23 +- include/media/v4l2-subdev.h | 5 + 167 files changed, 15255 insertions(+), 3016 deletions(-) create mode 100644 drivers/media/dvb/frontends/isl6423.c create mode 100644 drivers/media/dvb/frontends/isl6423.h create mode 100644 drivers/media/dvb/frontends/stv090x.c create mode 100644 drivers/media/dvb/frontends/stv090x.h create mode 100644 drivers/media/dvb/frontends/stv090x_priv.h create mode 100644 drivers/media/dvb/frontends/stv090x_reg.h create mode 100644 drivers/media/dvb/frontends/stv6110x.c create mode 100644 drivers/media/dvb/frontends/stv6110x.h create mode 100644 drivers/media/dvb/frontends/stv6110x_priv.h create mode 100644 drivers/media/dvb/frontends/stv6110x_reg.h create mode 100644 drivers/media/dvb/siano/smsendian.c create mode 100644 drivers/media/dvb/siano/smsendian.h create mode 100644 drivers/media/dvb/siano/smsir.c create mode 100644 drivers/media/dvb/siano/smsir.h create mode 100644 drivers/media/dvb/siano/smssdio.c create mode 100644 drivers/media/video/adv7343.c create mode 100644 drivers/media/video/adv7343_regs.h create mode 100644 drivers/media/video/cx88/cx88-dsp.c create mode 100644 drivers/media/video/gspca/m5602/m5602_ov7660.c create mode 100644 drivers/media/video/gspca/m5602/m5602_ov7660.h create mode 100644 drivers/media/video/ths7303.c create mode 100644 include/media/adv7343.h Merging quota/for_next $ git merge quota/for_next Already up-to-date. Merging kbuild/master $ git merge kbuild/master Auto-merging Makefile Merge made by recursive. .gitignore | 1 + Documentation/kbuild/kconfig.txt | 116 +++++++++-------- Documentation/kbuild/modules.txt | 2 +- Makefile | 26 ++--- README | 1 + include/asm-generic/vmlinux.lds.h | 236 ++++++++++++++++++++++++++++++++-- include/linux/init.h | 3 +- init/Kconfig | 16 +- kernel/kallsyms.c | 134 +++++++++++-------- scripts/Makefile.headersinst | 8 +- scripts/basic/docproc.c | 13 ++- scripts/gcc-version.sh | 2 +- scripts/headers.sh | 7 - scripts/headers_check.pl | 14 +- scripts/kconfig/.gitignore | 3 + scripts/kconfig/Makefile | 4 +- scripts/kconfig/conf.c | 7 +- scripts/kconfig/confdata.c | 20 ++- scripts/kconfig/lkc.h | 1 + scripts/kconfig/lxdialog/checklist.c | 3 +- scripts/kconfig/mconf.c | 10 ++- scripts/kconfig/qconf.cc | 48 ++++--- scripts/kconfig/util.c | 6 +- scripts/kernel-doc | 174 +++++++++++++------------- scripts/mod/modpost.c | 50 ++++++-- scripts/package/builddeb | 149 +++++++++++++++------- scripts/unifdef.c | 48 ++++++-- scripts/ver_linux | 2 +- 28 files changed, 740 insertions(+), 364 deletions(-) Merging ide/for-next $ git merge ide/for-next Auto-merging Documentation/kernel-parameters.txt Auto-merging block/blk-core.c Auto-merging include/linux/blkdev.h Auto-merging include/linux/genhd.h Merge made by recursive. Documentation/ide/ide.txt | 2 + Documentation/kernel-parameters.txt | 7 +- block/blk-core.c | 10 +- drivers/ide/alim15x3.c | 10 +- drivers/ide/at91_ide.c | 7 +- drivers/ide/au1xxx-ide.c | 8 +- drivers/ide/buddha.c | 9 +- drivers/ide/cmd640.c | 7 +- drivers/ide/cs5520.c | 4 +- drivers/ide/delkin_cb.c | 6 +- drivers/ide/falconide.c | 9 +- drivers/ide/gayle.c | 9 +- drivers/ide/hpt366.c | 25 +- drivers/ide/icside.c | 77 +--- drivers/ide/ide-4drives.c | 6 +- drivers/ide/ide-atapi.c | 170 +++++--- drivers/ide/ide-cd.c | 88 ++--- drivers/ide/ide-cd.h | 4 - drivers/ide/ide-cs.c | 6 +- drivers/ide/ide-disk.c | 76 +++- drivers/ide/ide-dma.c | 21 +- drivers/ide/ide-eh.c | 14 +- drivers/ide/ide-floppy.c | 24 +- drivers/ide/ide-gd.c | 14 + drivers/ide/ide-generic.c | 7 +- drivers/ide/ide-h8300.c | 10 +- drivers/ide/ide-io.c | 91 ++--- drivers/ide/ide-ioctls.c | 1 - drivers/ide/ide-iops.c | 26 +- drivers/ide/ide-legacy.c | 7 +- drivers/ide/ide-park.c | 7 +- drivers/ide/ide-pm.c | 38 +- drivers/ide/ide-pnp.c | 6 +- drivers/ide/ide-probe.c | 95 +++-- drivers/ide/ide-tape.c | 820 +++++++++-------------------------- drivers/ide/ide-taskfile.c | 21 +- drivers/ide/ide.c | 10 + drivers/ide/ide_platform.c | 9 +- drivers/ide/macide.c | 9 +- drivers/ide/palm_bk3710.c | 6 +- drivers/ide/pdc202xx_new.c | 26 -- drivers/ide/pdc202xx_old.c | 92 +---- drivers/ide/pmac.c | 13 +- drivers/ide/q40ide.c | 11 +- drivers/ide/rapide.c | 8 +- drivers/ide/scc_pata.c | 6 +- drivers/ide/setup-pci.c | 85 +--- drivers/ide/sgiioc4.c | 7 +- drivers/ide/siimage.c | 4 +- drivers/ide/sl82c105.c | 9 +- drivers/ide/tx4938ide.c | 5 +- drivers/ide/tx4939ide.c | 5 +- fs/partitions/check.c | 42 ++- include/linux/blkdev.h | 2 + include/linux/genhd.h | 1 + include/linux/ide.h | 73 ++-- 56 files changed, 809 insertions(+), 1356 deletions(-) Merging libata/NEXT $ git merge libata/NEXT Merge made by recursive. drivers/ata/ahci.c | 87 ++++++++++++++++++++++------ drivers/ata/ata_piix.c | 11 ++-- drivers/ata/libata-core.c | 11 ++-- drivers/ata/libata-sff.c | 20 ++++-- drivers/ata/sata_nv.c | 131 ++++++++++++++++++++++++++---------------- drivers/ata/sata_sil.c | 2 +- drivers/ata/sata_sx4.c | 11 ++- drivers/firmware/dmi_scan.c | 1 + 8 files changed, 181 insertions(+), 93 deletions(-) Merging infiniband/for-next $ git merge infiniband/for-next Merge made by recursive. drivers/infiniband/hw/amso1100/c2_cq.c | 4 +- drivers/infiniband/hw/cxgb3/cxio_wr.h | 2 +- drivers/infiniband/hw/cxgb3/iwch_provider.c | 32 ++++++- drivers/infiniband/hw/ehca/ehca_classes_pSeries.h | 28 ----- drivers/infiniband/hw/ehca/ehca_irq.c | 9 +- drivers/infiniband/hw/ehca/ehca_main.c | 2 +- drivers/infiniband/hw/ehca/ehca_qp.c | 112 +++++++++++---------- drivers/infiniband/hw/ehca/hcp_if.c | 6 +- drivers/infiniband/hw/ehca/hcp_if.h | 2 +- drivers/infiniband/hw/ehca/hcp_phyp.c | 11 ++- drivers/infiniband/hw/ehca/hcp_phyp.h | 2 +- drivers/infiniband/hw/ehca/ipz_pt_fn.c | 19 +++- drivers/infiniband/hw/mlx4/qp.c | 4 + drivers/infiniband/hw/mthca/mthca_cmd.c | 2 +- drivers/infiniband/hw/mthca/mthca_dev.h | 1 + drivers/infiniband/hw/mthca/mthca_main.c | 17 +++- drivers/infiniband/hw/mthca/mthca_mr.c | 16 ++-- drivers/infiniband/hw/mthca/mthca_profile.c | 4 +- drivers/infiniband/hw/nes/nes_hw.c | 14 ++-- drivers/net/mlx4/main.c | 14 ++- drivers/net/mlx4/mr.c | 6 +- drivers/net/mlx4/profile.c | 2 +- include/linux/mlx4/device.h | 1 + include/linux/mlx4/qp.h | 1 + 24 files changed, 177 insertions(+), 134 deletions(-) Merging acpi/test $ git merge acpi/test Auto-merging Documentation/kernel-parameters.txt Auto-merging MAINTAINERS Auto-merging arch/x86/kernel/acpi/boot.c Auto-merging arch/x86/kernel/reboot.c Auto-merging drivers/acpi/processor_core.c Auto-merging drivers/pnp/pnpacpi/rsparser.c Merge made by recursive. Documentation/kernel-parameters.txt | 8 - MAINTAINERS | 5 + arch/x86/kernel/acpi/boot.c | 12 - arch/x86/kernel/acpi/cstate.c | 16 +- arch/x86/kernel/reboot.c | 2 +- drivers/acpi/ac.c | 20 +- drivers/acpi/acpica/acevents.h | 2 +- drivers/acpi/acpica/acglobal.h | 3 - drivers/acpi/acpica/aclocal.h | 12 +- drivers/acpi/acpica/acnamesp.h | 13 +- drivers/acpi/acpica/amlcode.h | 2 +- drivers/acpi/acpica/dsobject.c | 5 +- drivers/acpi/acpica/dsopcode.c | 17 +- drivers/acpi/acpica/dswstate.c | 4 +- drivers/acpi/acpica/evregion.c | 12 +- drivers/acpi/acpica/evxfevnt.c | 4 +- drivers/acpi/acpica/exconfig.c | 125 ++++- drivers/acpi/acpica/excreate.c | 2 +- drivers/acpi/acpica/exdump.c | 6 +- drivers/acpi/acpica/exfldio.c | 20 +- drivers/acpi/acpica/exmutex.c | 45 ++- drivers/acpi/acpica/exstore.c | 4 +- drivers/acpi/acpica/hwregs.c | 4 +- drivers/acpi/acpica/nsalloc.c | 14 +- drivers/acpi/acpica/nsnames.c | 2 +- drivers/acpi/acpica/nsobject.c | 9 + drivers/acpi/acpica/nspredef.c | 7 +- drivers/acpi/acpica/nssearch.c | 4 + drivers/acpi/acpica/nswalk.c | 69 ++- drivers/acpi/acpica/nsxfname.c | 150 ++++++ drivers/acpi/acpica/nsxfobj.c | 9 +- drivers/acpi/acpica/rscalc.c | 5 +- drivers/acpi/acpica/rsxface.c | 8 +- drivers/acpi/acpica/tbfadt.c | 16 +- drivers/acpi/acpica/tbinstal.c | 2 +- drivers/acpi/acpica/utcopy.c | 23 + drivers/acpi/acpica/utdebug.c | 8 +- drivers/acpi/acpica/utdelete.c | 21 + drivers/acpi/acpica/utmisc.c | 20 +- drivers/acpi/acpica/utmutex.c | 26 +- drivers/acpi/battery.c | 22 +- drivers/acpi/bus.c | 91 +--- drivers/acpi/power.c | 28 +- drivers/acpi/processor_core.c | 32 +- drivers/acpi/processor_idle.c | 7 +- drivers/platform/x86/Kconfig | 15 + drivers/platform/x86/Makefile | 1 + drivers/platform/x86/asus-laptop.c | 23 +- drivers/platform/x86/asus_acpi.c | 30 +- drivers/platform/x86/eeepc-laptop.c | 105 ++++- drivers/platform/x86/oqo-wmi.c | 941 +++++++++++++++++++++++++++++++++++ drivers/platform/x86/toshiba_acpi.c | 206 ++++++++- drivers/pnp/pnpacpi/rsparser.c | 46 ++- include/acpi/acpi_bus.h | 5 +- include/acpi/acpi_drivers.h | 3 +- include/acpi/acpixf.h | 9 +- include/acpi/actypes.h | 20 +- include/acpi/platform/acgcc.h | 4 + include/acpi/platform/aclinux.h | 63 ++- 59 files changed, 1963 insertions(+), 424 deletions(-) create mode 100644 drivers/platform/x86/oqo-wmi.c Merging ieee1394/for-next $ git merge ieee1394/for-next Removing drivers/firewire/fw-device.h Removing drivers/firewire/fw-topology.h Removing drivers/firewire/fw-transaction.h Merge made by recursive. drivers/firewire/Makefile | 8 +- drivers/firewire/{fw-card.c => core-card.c} | 25 +- drivers/firewire/{fw-cdev.c => core-cdev.c} | 13 +- drivers/firewire/{fw-device.c => core-device.c} | 136 +++++- drivers/firewire/{fw-iso.c => core-iso.c} | 6 +- .../firewire/{fw-topology.c => core-topology.c} | 24 +- .../{fw-transaction.c => core-transaction.c} | 34 +- drivers/firewire/core.h | 293 +++++++++++++ drivers/firewire/fw-device.h | 202 --------- drivers/firewire/fw-topology.h | 77 ---- drivers/firewire/fw-transaction.h | 446 -------------------- drivers/firewire/{fw-ohci.c => ohci.c} | 19 +- drivers/firewire/{fw-ohci.h => ohci.h} | 6 +- drivers/firewire/{fw-sbp2.c => sbp2.c} | 58 ++- include/linux/firewire.h | 355 ++++++++++++++++ 15 files changed, 878 insertions(+), 824 deletions(-) rename drivers/firewire/{fw-card.c => core-card.c} (97%) rename drivers/firewire/{fw-cdev.c => core-cdev.c} (99%) rename drivers/firewire/{fw-device.c => core-device.c} (89%) rename drivers/firewire/{fw-iso.c => core-iso.c} (99%) rename drivers/firewire/{fw-topology.c => core-topology.c} (97%) rename drivers/firewire/{fw-transaction.c => core-transaction.c} (98%) create mode 100644 drivers/firewire/core.h delete mode 100644 drivers/firewire/fw-device.h delete mode 100644 drivers/firewire/fw-topology.h delete mode 100644 drivers/firewire/fw-transaction.h rename drivers/firewire/{fw-ohci.c => ohci.c} (99%) rename drivers/firewire/{fw-ohci.h => ohci.h} (98%) rename drivers/firewire/{fw-sbp2.c => sbp2.c} (97%) create mode 100644 include/linux/firewire.h Merging ubi/linux-next $ git merge ubi/linux-next Merge made by recursive. drivers/mtd/ubi/Kconfig | 13 +- drivers/mtd/ubi/Makefile | 2 +- drivers/mtd/ubi/build.c | 161 ++++++++++++++++++-- drivers/mtd/ubi/cdev.c | 32 ++-- drivers/mtd/ubi/eba.c | 99 ++++++++----- drivers/mtd/ubi/gluebi.c | 378 +++++++++++++++++++++++++++++++++++----------- drivers/mtd/ubi/io.c | 82 +++++++++- drivers/mtd/ubi/kapi.c | 117 ++++++++++++--- drivers/mtd/ubi/ubi.h | 84 ++++++----- drivers/mtd/ubi/upd.c | 8 +- drivers/mtd/ubi/vmt.c | 65 +++----- drivers/mtd/ubi/wl.c | 179 +++++++++++++--------- include/linux/mtd/ubi.h | 37 +++++ 13 files changed, 922 insertions(+), 335 deletions(-) Merging kvm/master $ git merge kvm/master Auto-merging arch/s390/kvm/kvm-s390.c Auto-merging arch/x86/include/asm/cpufeature.h Auto-merging arch/x86/kernel/cpu/mcheck/mce_64.c Auto-merging arch/x86/kernel/kvm.c Auto-merging arch/x86/kernel/smp.c Removing arch/x86/kvm/kvm_svm.h Auto-merging virt/kvm/kvm_main.c Merge made by recursive. arch/ia64/include/asm/kvm_host.h | 6 +- arch/ia64/include/asm/pgtable.h | 2 + arch/ia64/kernel/irq_ia64.c | 3 + arch/ia64/kvm/Kconfig | 9 +- arch/ia64/kvm/kvm-ia64.c | 265 ++++++---- arch/ia64/kvm/kvm_fw.c | 28 +- arch/ia64/kvm/lapic.h | 6 +- arch/ia64/kvm/optvfault.S | 30 ++ arch/ia64/kvm/process.c | 5 + arch/ia64/kvm/vcpu.c | 20 +- arch/ia64/kvm/vmm.c | 12 +- arch/ia64/kvm/vmm_ivt.S | 18 +- arch/ia64/kvm/vtlb.c | 3 +- arch/powerpc/include/asm/kvm_host.h | 1 - arch/powerpc/kvm/44x.c | 4 +- arch/powerpc/kvm/Kconfig | 3 +- arch/powerpc/kvm/booke.c | 2 +- arch/powerpc/kvm/e500.c | 7 +- arch/powerpc/kvm/e500_emulate.c | 3 + arch/powerpc/kvm/e500_tlb.c | 10 +- arch/powerpc/kvm/e500_tlb.h | 6 +- arch/powerpc/kvm/emulate.c | 4 +- arch/powerpc/kvm/powerpc.c | 6 + arch/s390/include/asm/kvm_host.h | 14 +- arch/s390/kvm/Kconfig | 6 +- arch/s390/kvm/gaccess.h | 23 +- arch/s390/kvm/intercept.c | 42 +- arch/s390/kvm/interrupt.c | 59 ++- arch/s390/kvm/kvm-s390.c | 72 ++- arch/s390/kvm/kvm-s390.h | 36 ++- arch/s390/kvm/priv.c | 4 +- arch/s390/kvm/sigp.c | 74 ++-- arch/x86/include/asm/cpufeature.h | 2 + arch/x86/include/asm/kvm.h | 2 + arch/x86/include/asm/kvm_host.h | 76 ++-- arch/x86/include/asm/kvm_x86_emulate.h | 6 + arch/x86/include/asm/mce.h | 30 +- arch/x86/include/asm/svm.h | 1 + arch/x86/include/asm/vmx.h | 2 + arch/x86/kernel/cpu/mcheck/mce_64.c | 1 + arch/x86/kernel/kvm.c | 4 + arch/x86/kernel/smp.c | 3 + arch/x86/kvm/Kconfig | 14 +- arch/x86/kvm/Makefile | 32 +- arch/x86/kvm/i8254.c | 166 ++++--- arch/x86/kvm/i8254.h | 14 +- arch/x86/kvm/i8259.c | 22 +- arch/x86/kvm/irq.c | 7 + arch/x86/kvm/kvm_cache_regs.h | 9 + arch/x86/kvm/kvm_svm.h | 51 -- arch/x86/kvm/kvm_timer.h | 18 + arch/x86/kvm/lapic.c | 287 ++++------- arch/x86/kvm/lapic.h | 12 +- arch/x86/kvm/mmu.c | 315 +++++++----- arch/x86/kvm/mmu.h | 5 + arch/x86/kvm/paging_tmpl.h | 56 ++- arch/x86/kvm/svm.c | 497 +++++++++++------- arch/x86/kvm/timer.c | 46 ++ arch/x86/kvm/vmx.c | 887 +++++++++++++++++++------------- arch/x86/kvm/x86.c | 677 ++++++++++++++++++------- arch/x86/kvm/x86.h | 14 +- arch/x86/kvm/x86_emulate.c | 156 +++--- fs/eventfd.c | 13 +- include/linux/kvm.h | 97 +++- include/linux/kvm_host.h | 55 ++- include/linux/kvm_types.h | 27 + virt/kvm/Kconfig | 11 + virt/kvm/coalesced_mmio.c | 44 +- virt/kvm/coalesced_mmio.h | 1 + virt/kvm/eventfd.c | 217 ++++++++ virt/kvm/ioapic.c | 180 ++----- virt/kvm/ioapic.h | 27 +- virt/kvm/iodev.h | 29 +- virt/kvm/iommu.c | 27 +- virt/kvm/irq_comm.c | 145 ++++-- virt/kvm/kvm_main.c | 705 ++++++++++++++++++------- 76 files changed, 3662 insertions(+), 2111 deletions(-) delete mode 100644 arch/x86/kvm/kvm_svm.h create mode 100644 arch/x86/kvm/kvm_timer.h create mode 100644 arch/x86/kvm/timer.c create mode 100644 virt/kvm/Kconfig create mode 100644 virt/kvm/eventfd.c Merging dlm/next $ git merge dlm/next Merge made by recursive. fs/dlm/dir.c | 7 ++++--- fs/dlm/lockspace.c | 17 ++++++++--------- fs/dlm/lowcomms.c | 22 ++++++++++++++++++---- fs/dlm/lowcomms.h | 3 ++- fs/dlm/member.c | 19 +++++++++++++------ fs/dlm/requestqueue.c | 2 +- include/linux/dlm.h | 4 ++-- 7 files changed, 48 insertions(+), 26 deletions(-) Merging scsi/master $ git merge scsi/master Auto-merging drivers/net/Makefile Removing drivers/scsi/mvsas.c Removing drivers/scsi/osd/Makefile Merge made by recursive. drivers/infiniband/ulp/iser/iscsi_iser.c | 10 +- drivers/message/fusion/mptbase.c | 1571 +++++-- drivers/message/fusion/mptbase.h | 180 +- drivers/message/fusion/mptctl.c | 692 ++-- drivers/message/fusion/mptdebug.h | 3 + drivers/message/fusion/mptfc.c | 15 +- drivers/message/fusion/mptsas.c | 3114 ++++++++++---- drivers/message/fusion/mptsas.h | 41 +- drivers/message/fusion/mptscsih.c | 1329 +++---- drivers/message/fusion/mptscsih.h | 7 +- drivers/message/fusion/mptspi.c | 71 +- drivers/net/Kconfig | 11 + drivers/net/Makefile | 1 + drivers/net/bnx2.c | 193 +- drivers/net/bnx2.h | 18 + drivers/net/cnic.c | 2711 +++++++++++ drivers/net/cnic.h | 299 ++ drivers/net/cnic_defs.h | 580 +++ drivers/net/cnic_if.h | 299 ++ drivers/s390/scsi/zfcp_ccw.c | 30 +- drivers/s390/scsi/zfcp_dbf.c | 10 +- drivers/s390/scsi/zfcp_def.h | 7 - drivers/s390/scsi/zfcp_erp.c | 8 +- drivers/s390/scsi/zfcp_ext.h | 1 + drivers/s390/scsi/zfcp_fc.c | 7 +- drivers/s390/scsi/zfcp_fsf.c | 29 +- drivers/s390/scsi/zfcp_scsi.c | 13 +- drivers/scsi/Kconfig | 31 +- drivers/scsi/Makefile | 3 +- drivers/scsi/NCR_D700.c | 2 +- drivers/scsi/bnx2i/57xx_iscsi_constants.h | 155 + drivers/scsi/bnx2i/57xx_iscsi_hsi.h | 1509 +++++++ drivers/scsi/bnx2i/Kconfig | 7 + drivers/scsi/bnx2i/Makefile | 3 + drivers/scsi/bnx2i/bnx2i.h | 771 ++++ drivers/scsi/bnx2i/bnx2i_hwi.c | 2405 ++++++++++ drivers/scsi/bnx2i/bnx2i_init.c | 438 ++ drivers/scsi/bnx2i/bnx2i_iscsi.c | 2064 +++++++++ drivers/scsi/bnx2i/bnx2i_sysfs.c | 142 + drivers/scsi/cxgb3i/cxgb3i.h | 1 - drivers/scsi/cxgb3i/cxgb3i_iscsi.c | 26 +- drivers/scsi/cxgb3i/cxgb3i_offload.c | 23 +- drivers/scsi/cxgb3i/cxgb3i_offload.h | 3 +- drivers/scsi/device_handler/scsi_dh_rdac.c | 6 + drivers/scsi/fcoe/fcoe.c | 95 +- drivers/scsi/fcoe/fcoe.h | 1 + drivers/scsi/fcoe/libfcoe.c | 21 +- drivers/scsi/fnic/fnic_main.c | 1 + drivers/scsi/gdth_proc.c | 5 +- drivers/scsi/ibmvscsi/ibmvfc.c | 434 ++- drivers/scsi/ibmvscsi/ibmvfc.h | 40 +- drivers/scsi/ibmvscsi/ibmvscsi.c | 463 ++- drivers/scsi/ibmvscsi/ibmvscsi.h | 4 + drivers/scsi/ibmvscsi/viosrp.h | 68 +- drivers/scsi/ipr.c | 5 +- drivers/scsi/libfc/fc_exch.c | 4 + drivers/scsi/libfc/fc_fcp.c | 2 +- drivers/scsi/libfc/fc_rport.c | 6 +- drivers/scsi/libiscsi.c | 468 +- drivers/scsi/libiscsi_tcp.c | 18 +- drivers/scsi/lpfc/lpfc.h | 123 +- drivers/scsi/lpfc/lpfc_attr.c | 250 +- drivers/scsi/lpfc/lpfc_crtn.h | 63 +- drivers/scsi/lpfc/lpfc_ct.c | 15 +- drivers/scsi/lpfc/lpfc_debugfs.c | 21 +- drivers/scsi/lpfc/lpfc_disc.h | 1 + drivers/scsi/lpfc/lpfc_els.c | 275 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 1365 ++++++- drivers/scsi/lpfc/lpfc_hw.h | 142 +- drivers/scsi/lpfc/lpfc_hw4.h | 2141 +++++++++ drivers/scsi/lpfc/lpfc_init.c | 5626 +++++++++++++++++++++--- drivers/scsi/lpfc/lpfc_logmsg.h | 54 +- drivers/scsi/lpfc/lpfc_mbox.c | 674 +++- drivers/scsi/lpfc/lpfc_mem.c | 206 +- drivers/scsi/lpfc/lpfc_nportdisc.c | 51 +- drivers/scsi/lpfc/lpfc_scsi.c | 930 ++++- drivers/scsi/lpfc/lpfc_scsi.h | 2 + drivers/scsi/lpfc/lpfc_sli.c | 6683 ++++++++++++++++++++++++++-- drivers/scsi/lpfc/lpfc_sli.h | 29 +- drivers/scsi/lpfc/lpfc_sli4.h | 467 ++ drivers/scsi/lpfc/lpfc_version.h | 2 +- drivers/scsi/lpfc/lpfc_vport.c | 62 +- drivers/scsi/mpt2sas/mpt2sas_base.h | 5 +- drivers/scsi/mpt2sas/mpt2sas_ctl.c | 32 +- drivers/scsi/mpt2sas/mpt2sas_scsih.c | 363 ++- drivers/scsi/mpt2sas/mpt2sas_transport.c | 36 +- drivers/scsi/mvsas.c | 3222 -------------- drivers/scsi/mvsas/Kconfig | 42 + drivers/scsi/mvsas/Makefile | 32 + drivers/scsi/mvsas/mv_64xx.c | 793 ++++ drivers/scsi/mvsas/mv_64xx.h | 151 + drivers/scsi/mvsas/mv_94xx.c | 672 +++ drivers/scsi/mvsas/mv_94xx.h | 222 + drivers/scsi/mvsas/mv_chips.h | 280 ++ drivers/scsi/mvsas/mv_defs.h | 502 +++ drivers/scsi/mvsas/mv_init.c | 703 +++ drivers/scsi/mvsas/mv_sas.c | 2154 +++++++++ drivers/scsi/mvsas/mv_sas.h | 406 ++ drivers/scsi/osd/Kbuild | 25 - drivers/scsi/osd/Makefile | 37 - drivers/scsi/osd/osd_initiator.c | 83 +- drivers/scsi/osd/osd_uld.c | 66 +- drivers/scsi/qla1280.c | 387 +- drivers/scsi/qla1280.h | 3 +- drivers/scsi/qla2xxx/qla_attr.c | 227 +- drivers/scsi/qla2xxx/qla_dbg.c | 13 +- drivers/scsi/qla2xxx/qla_def.h | 45 +- drivers/scsi/qla2xxx/qla_fw.h | 6 +- drivers/scsi/qla2xxx/qla_gbl.h | 43 +- drivers/scsi/qla2xxx/qla_gs.c | 5 +- drivers/scsi/qla2xxx/qla_init.c | 206 +- drivers/scsi/qla2xxx/qla_iocb.c | 55 +- drivers/scsi/qla2xxx/qla_isr.c | 240 +- drivers/scsi/qla2xxx/qla_mbx.c | 244 +- drivers/scsi/qla2xxx/qla_mid.c | 118 +- drivers/scsi/qla2xxx/qla_os.c | 294 +- drivers/scsi/qla2xxx/qla_sup.c | 47 +- drivers/scsi/qla2xxx/qla_version.h | 2 +- drivers/scsi/scsi.c | 4 +- drivers/scsi/scsi_debug.c | 2 +- drivers/scsi/scsi_error.c | 21 +- drivers/scsi/scsi_lib.c | 14 +- drivers/scsi/scsi_scan.c | 4 +- drivers/scsi/scsi_transport_iscsi.c | 173 +- drivers/scsi/sd.c | 45 +- drivers/scsi/st.c | 2 +- drivers/scsi/sym53c8xx_2/sym_glue.c | 66 +- drivers/scsi/sym53c8xx_2/sym_hipd.c | 49 +- drivers/scsi/sym53c8xx_2/sym_hipd.h | 2 + fs/exofs/common.h | 6 - fs/exofs/inode.c | 8 +- fs/exofs/osd.c | 26 - include/linux/if_ether.h | 1 + include/scsi/fc/fc_fip.h | 7 - include/scsi/iscsi_if.h | 49 +- include/scsi/libfc.h | 1 + include/scsi/libiscsi.h | 8 +- include/scsi/osd_attributes.h | 74 +- include/scsi/osd_initiator.h | 14 +- include/scsi/osd_protocol.h | 8 + include/scsi/scsi_transport_iscsi.h | 8 +- 141 files changed, 42941 insertions(+), 9068 deletions(-) create mode 100644 drivers/net/cnic.c create mode 100644 drivers/net/cnic.h create mode 100644 drivers/net/cnic_defs.h create mode 100644 drivers/net/cnic_if.h create mode 100644 drivers/scsi/bnx2i/57xx_iscsi_constants.h create mode 100644 drivers/scsi/bnx2i/57xx_iscsi_hsi.h create mode 100644 drivers/scsi/bnx2i/Kconfig create mode 100644 drivers/scsi/bnx2i/Makefile create mode 100644 drivers/scsi/bnx2i/bnx2i.h create mode 100644 drivers/scsi/bnx2i/bnx2i_hwi.c create mode 100644 drivers/scsi/bnx2i/bnx2i_init.c create mode 100644 drivers/scsi/bnx2i/bnx2i_iscsi.c create mode 100644 drivers/scsi/bnx2i/bnx2i_sysfs.c create mode 100644 drivers/scsi/lpfc/lpfc_hw4.h create mode 100644 drivers/scsi/lpfc/lpfc_sli4.h delete mode 100644 drivers/scsi/mvsas.c create mode 100644 drivers/scsi/mvsas/Kconfig create mode 100644 drivers/scsi/mvsas/Makefile create mode 100644 drivers/scsi/mvsas/mv_64xx.c create mode 100644 drivers/scsi/mvsas/mv_64xx.h create mode 100644 drivers/scsi/mvsas/mv_94xx.c create mode 100644 drivers/scsi/mvsas/mv_94xx.h create mode 100644 drivers/scsi/mvsas/mv_chips.h create mode 100644 drivers/scsi/mvsas/mv_defs.h create mode 100644 drivers/scsi/mvsas/mv_init.c create mode 100644 drivers/scsi/mvsas/mv_sas.c create mode 100644 drivers/scsi/mvsas/mv_sas.h delete mode 100755 drivers/scsi/osd/Makefile 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 net/master $ git merge net/master Resolved 'drivers/platform/x86/Kconfig' using previous resolution. Resolved 'drivers/platform/x86/toshiba_acpi.c' using previous resolution. Resolved 'drivers/scsi/fcoe/fcoe.c' using previous resolution. Resolved 'include/linux/mmc/sdio_ids.h' using previous resolution. Auto-merging MAINTAINERS Auto-merging arch/arm/mach-pxa/tosa.c Auto-merging arch/powerpc/include/asm/qe.h Auto-merging drivers/net/Kconfig Auto-merging drivers/net/Makefile Auto-merging drivers/net/arm/ixp4xx_eth.c Auto-merging drivers/net/bnx2.c Auto-merging drivers/net/bnx2.h Removing drivers/net/bnx2x_init_values.h Auto-merging drivers/net/mlx4/mr.c Auto-merging drivers/net/r8169.c Removing drivers/net/sfc/xenpack.h Auto-merging drivers/net/ucc_geth.c Auto-merging drivers/net/ucc_geth.h Auto-merging drivers/net/wan/ixp4xx_hss.c Auto-merging drivers/of/Kconfig Auto-merging drivers/of/base.c Auto-merging drivers/platform/x86/Kconfig CONFLICT (content): Merge conflict in drivers/platform/x86/Kconfig Auto-merging drivers/platform/x86/eeepc-laptop.c Auto-merging drivers/platform/x86/toshiba_acpi.c CONFLICT (content): Merge conflict in drivers/platform/x86/toshiba_acpi.c Auto-merging drivers/scsi/fcoe/fcoe.c CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe.c Auto-merging drivers/scsi/fcoe/libfcoe.c Removing firmware/cxgb3/t3fw-7.1.0.bin.ihex Auto-merging include/linux/Kbuild Auto-merging include/linux/if_ether.h Auto-merging include/linux/mmc/sdio_ids.h CONFLICT (content): Merge conflict in include/linux/mmc/sdio_ids.h Auto-merging include/linux/net_dropmon.h Auto-merging include/linux/pci_ids.h Auto-merging include/linux/sched.h Removing include/net/wireless.h Removing net/rfkill/rfkill-input.c Removing net/rfkill/rfkill.c Auto-merging net/sched/cls_cgroup.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 806d046] Merge commit 'net/master' $ git diff -M --stat --summary HEAD^.. CREDITS | 4 + Documentation/DocBook/mac80211.tmpl | 1 - Documentation/feature-removal-schedule.txt | 7 + Documentation/isdn/00-INDEX | 29 +- Documentation/isdn/INTERFACE.CAPI | 94 +- Documentation/isdn/README.gigaset | 42 +- Documentation/networking/can.txt | 235 +- Documentation/networking/ieee802154.txt | 76 + Documentation/networking/ip-sysctl.txt | 18 +- Documentation/networking/ipv6.txt | 37 + Documentation/networking/mac80211-injection.txt | 28 +- Documentation/networking/packet_mmap.txt | 140 +- Documentation/powerpc/dts-bindings/can/sja1000.txt | 53 + Documentation/rfkill.txt | 607 +- MAINTAINERS | 37 +- arch/alpha/include/asm/errno.h | 2 + arch/arm/kernel/signal.c | 6 +- arch/arm/mach-pxa/tosa-bt.c | 30 +- arch/arm/mach-pxa/tosa.c | 1 - arch/avr32/kernel/signal.c | 4 +- arch/mips/include/asm/errno.h | 2 + arch/parisc/include/asm/errno.h | 1 + arch/powerpc/include/asm/qe.h | 2 + arch/powerpc/platforms/82xx/ep8248e.c | 9 +- arch/powerpc/platforms/pasemi/gpio_mdio.c | 32 +- arch/sparc/include/asm/errno.h | 2 + drivers/Makefile | 1 + drivers/block/aoe/aoecmd.c | 7 - drivers/ieee802154/Kconfig | 22 + drivers/ieee802154/Makefile | 3 + drivers/ieee802154/fakehard.c | 270 + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 10 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 31 +- drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 10 +- drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 6 +- drivers/isdn/Kconfig | 2 + drivers/isdn/capi/capiutil.c | 67 +- drivers/isdn/capi/kcapi.c | 8 +- drivers/isdn/gigaset/Kconfig | 8 +- drivers/isdn/gigaset/asyncdata.c | 5 +- drivers/isdn/gigaset/common.c | 12 +- drivers/isdn/gigaset/ev-layer.c | 4 +- drivers/isdn/gigaset/gigaset.h | 5 +- drivers/isdn/gigaset/i4l.c | 12 +- drivers/isdn/gigaset/interface.c | 3 +- drivers/isdn/gigaset/isocdata.c | 4 + drivers/isdn/gigaset/proc.c | 2 +- drivers/isdn/gigaset/usb-gigaset.c | 62 +- drivers/isdn/hardware/avm/b1.c | 2 +- drivers/isdn/hardware/avm/b1dma.c | 2 +- drivers/isdn/hardware/avm/c4.c | 4 +- drivers/isdn/hardware/avm/t1isa.c | 2 +- drivers/isdn/hardware/mISDN/Kconfig | 11 +- drivers/isdn/hardware/mISDN/hfc_multi.h | 47 +- drivers/isdn/hardware/mISDN/hfc_multi_8xx.h | 167 + drivers/isdn/hardware/mISDN/hfcmulti.c | 614 +- drivers/isdn/hardware/mISDN/hfcpci.c | 98 +- drivers/isdn/hardware/mISDN/hfcsusb.c | 4 +- drivers/isdn/hysdn/hycapi.c | 4 +- drivers/isdn/i4l/Kconfig | 2 - drivers/isdn/mISDN/core.c | 8 +- drivers/isdn/mISDN/dsp.h | 19 +- drivers/isdn/mISDN/dsp_audio.c | 5 +- drivers/isdn/mISDN/dsp_cmx.c | 115 +- drivers/isdn/mISDN/dsp_core.c | 72 +- drivers/isdn/mISDN/dsp_dtmf.c | 3 + drivers/isdn/mISDN/dsp_ecdis.h | 2 +- drivers/isdn/mISDN/dsp_pipeline.c | 5 +- drivers/isdn/mISDN/dsp_tones.c | 23 +- drivers/isdn/mISDN/hwchannel.c | 4 +- drivers/isdn/mISDN/l1oip.h | 2 +- drivers/isdn/mISDN/l1oip_codec.c | 1 + drivers/isdn/mISDN/l1oip_core.c | 71 +- drivers/isdn/mISDN/layer2.c | 37 +- drivers/isdn/mISDN/layer2.h | 2 +- drivers/isdn/mISDN/socket.c | 45 +- drivers/isdn/mISDN/tei.c | 95 +- drivers/isdn/mISDN/timerdev.c | 2 +- drivers/net/3c501.c | 65 +- drivers/net/3c503.c | 36 +- drivers/net/3c505.c | 215 +- drivers/net/3c507.c | 55 +- drivers/net/3c509.c | 76 +- drivers/net/3c515.c | 124 +- drivers/net/3c523.c | 91 +- drivers/net/3c527.c | 46 +- drivers/net/3c59x.c | 214 +- drivers/net/8139cp.c | 32 +- drivers/net/8139too.c | 210 +- drivers/net/82596.c | 14 +- drivers/net/8390.c | 10 +- drivers/net/8390p.c | 19 +- drivers/net/Kconfig | 57 +- drivers/net/Makefile | 6 + drivers/net/acenic.c | 1 - drivers/net/appletalk/ipddp.c | 43 +- drivers/net/arm/ep93xx_eth.c | 4 +- drivers/net/arm/ixp4xx_eth.c | 8 +- drivers/net/atl1c/atl1c_main.c | 73 +- drivers/net/atl1e/atl1e.h | 1 - drivers/net/atl1e/atl1e_main.c | 11 +- drivers/net/atlx/atl1.c | 8 +- drivers/net/b44.c | 4 +- drivers/net/b44.h | 1 - drivers/net/benet/be_main.c | 86 +- drivers/net/bfin_mac.c | 235 +- drivers/net/bmac.c | 16 +- drivers/net/bnx2.c | 44 +- drivers/net/bnx2.h | 2 + drivers/net/bnx2x.h | 15 + drivers/net/bnx2x_fw_file_hdr.h | 37 + drivers/net/bnx2x_init.h | 605 +- drivers/net/bnx2x_init_ops.h | 442 + drivers/net/bnx2x_init_values.h |16322 -------------------- drivers/net/bnx2x_main.c | 359 +- drivers/net/bonding/bond_3ad.c | 5 +- drivers/net/bonding/bond_3ad.h | 4 +- drivers/net/bonding/bond_main.c | 76 +- drivers/net/bonding/bond_sysfs.c | 9 +- drivers/net/bonding/bonding.h | 3 +- drivers/net/can/Kconfig | 62 + drivers/net/can/Makefile | 7 + drivers/net/can/dev.c | 657 + drivers/net/can/sja1000/Makefile | 11 + drivers/net/can/sja1000/ems_pci.c | 320 + drivers/net/can/sja1000/kvaser_pci.c | 412 + drivers/net/can/sja1000/sja1000.c | 637 + drivers/net/can/sja1000/sja1000.h | 181 + drivers/net/can/sja1000/sja1000_of_platform.c | 235 + drivers/net/can/sja1000/sja1000_platform.c | 165 + drivers/net/chelsio/common.h | 2 +- drivers/net/chelsio/cphy.h | 51 +- drivers/net/chelsio/cxgb2.c | 36 +- drivers/net/chelsio/mv88e1xxx.c | 5 +- drivers/net/chelsio/mv88x201x.c | 50 +- drivers/net/chelsio/my3126.c | 14 +- drivers/net/chelsio/sge.c | 5 +- drivers/net/chelsio/subr.c | 46 +- drivers/net/cpmac.c | 33 +- drivers/net/cxgb3/Makefile | 2 +- drivers/net/cxgb3/adapter.h | 2 +- drivers/net/cxgb3/ael1002.c | 958 +- drivers/net/cxgb3/aq100x.c | 355 + drivers/net/cxgb3/common.h | 67 +- drivers/net/cxgb3/cxgb3_main.c | 74 +- drivers/net/cxgb3/sge.c | 71 +- drivers/net/cxgb3/t3_hw.c | 89 +- drivers/net/cxgb3/version.h | 4 +- drivers/net/cxgb3/vsc8211.c | 70 +- drivers/net/davinci_emac.c | 2830 ++++ drivers/net/de600.c | 19 +- drivers/net/de620.c | 61 +- drivers/net/declance.c | 5 + drivers/net/depca.c | 4 +- drivers/net/dl2k.c | 8 +- drivers/net/dm9000.c | 30 +- drivers/net/e100.c | 11 +- drivers/net/e1000/e1000_main.c | 44 +- drivers/net/e1000e/82571.c | 99 +- drivers/net/e1000e/defines.h | 25 + drivers/net/e1000e/e1000.h | 61 + drivers/net/e1000e/es2lan.c | 3 + drivers/net/e1000e/ethtool.c | 46 +- drivers/net/e1000e/hw.h | 20 +- drivers/net/e1000e/ich8lan.c | 448 +- drivers/net/e1000e/lib.c | 38 + drivers/net/e1000e/netdev.c | 280 +- drivers/net/e1000e/param.c | 2 + drivers/net/e1000e/phy.c | 699 +- drivers/net/ehea/ehea_main.c | 8 +- drivers/net/enic/enic_main.c | 2 - drivers/net/eql.c | 1 + drivers/net/fec.c | 897 +- drivers/net/fec.h | 127 +- drivers/net/fec_mpc52xx.c | 180 +- drivers/net/fec_mpc52xx_phy.c | 26 +- drivers/net/forcedeth.c | 240 +- drivers/net/fs_enet/fs_enet-main.c | 108 +- drivers/net/fs_enet/fs_enet.h | 5 - drivers/net/fs_enet/mac-fec.c | 34 - drivers/net/fs_enet/mii-bitbang.c | 29 +- drivers/net/fs_enet/mii-fec.c | 32 +- drivers/net/fsl_pq_mdio.c | 59 +- drivers/net/gianfar.c | 112 +- drivers/net/gianfar.h | 4 +- drivers/net/hamachi.c | 3 +- drivers/net/hp100.c | 4 +- drivers/net/hplance.c | 21 +- drivers/net/ibmveth.c | 40 +- drivers/net/ifb.c | 1 + drivers/net/igb/e1000_82575.h | 1 + drivers/net/igb/e1000_defines.h | 3 +- drivers/net/igb/e1000_mbx.c | 8 +- drivers/net/igb/e1000_phy.h | 2 +- drivers/net/igb/e1000_regs.h | 1 + drivers/net/igb/igb.h | 15 +- drivers/net/igb/igb_ethtool.c | 37 +- drivers/net/igb/igb_main.c | 148 +- drivers/net/igbvf/ethtool.c | 36 +- drivers/net/igbvf/igbvf.h | 6 +- drivers/net/igbvf/netdev.c | 23 +- drivers/net/irda/au1k_ir.c | 18 +- drivers/net/irda/irda-usb.c | 40 + drivers/net/irda/pxaficp_ir.c | 16 +- drivers/net/irda/sa1100_ir.c | 18 +- drivers/net/iseries_veth.c | 17 +- drivers/net/ixgb/ixgb_hw.c | 20 +- drivers/net/ixgb/ixgb_hw.h | 14 +- drivers/net/ixgb/ixgb_main.c | 20 +- drivers/net/ixgb/ixgb_osdep.h | 2 +- drivers/net/ixgbe/Makefile | 2 + drivers/net/ixgbe/ixgbe.h | 161 +- drivers/net/ixgbe/ixgbe_82598.c | 330 +- drivers/net/ixgbe/ixgbe_82599.c | 1489 ++- drivers/net/ixgbe/ixgbe_common.c | 316 +- drivers/net/ixgbe/ixgbe_common.h | 8 +- drivers/net/ixgbe/ixgbe_dcb_82598.c | 4 + drivers/net/ixgbe/ixgbe_dcb_82599.c | 2 +- drivers/net/ixgbe/ixgbe_dcb_nl.c | 119 +- drivers/net/ixgbe/ixgbe_ethtool.c | 961 ++- drivers/net/ixgbe/ixgbe_fcoe.c | 556 + drivers/net/ixgbe/ixgbe_fcoe.h | 67 + drivers/net/ixgbe/ixgbe_main.c | 1708 ++- drivers/net/ixgbe/ixgbe_phy.c | 166 +- drivers/net/ixgbe/ixgbe_phy.h | 5 +- drivers/net/ixgbe/ixgbe_type.h | 333 +- drivers/net/ixp2000/ixpdev.c | 19 +- drivers/net/jazzsonic.c | 19 +- drivers/net/jme.c | 1 - drivers/net/korina.c | 39 +- drivers/net/ks8842.c | 732 + drivers/net/lasi_82596.c | 6 +- drivers/net/lib82596.c | 23 +- drivers/net/ll_temac.h | 374 + drivers/net/ll_temac_main.c | 969 ++ drivers/net/ll_temac_mdio.c | 120 + drivers/net/loopback.c | 22 +- drivers/net/mac8390.c | 19 +- drivers/net/mac89x0.c | 2 - drivers/net/macb.c | 18 + drivers/net/mace.c | 16 +- drivers/net/macmace.c | 18 +- drivers/net/macvlan.c | 34 +- drivers/net/mdio.c | 414 + drivers/net/meth.c | 28 +- drivers/net/mii.c | 91 +- drivers/net/mipsnet.c | 15 +- drivers/net/mlx4/Makefile | 2 +- drivers/net/mlx4/en_cq.c | 3 + drivers/net/mlx4/{en_params.c => en_ethtool.c} | 67 +- drivers/net/mlx4/en_main.c | 68 +- drivers/net/mlx4/en_netdev.c | 199 +- drivers/net/mlx4/en_rx.c | 139 +- drivers/net/mlx4/en_tx.c | 112 +- drivers/net/mlx4/eq.c | 4 +- drivers/net/mlx4/mlx4_en.h | 49 +- drivers/net/mlx4/mr.c | 7 +- drivers/net/mv643xx_eth.c | 98 +- drivers/net/mvme147.c | 17 +- drivers/net/myri10ge/myri10ge.c | 68 +- drivers/net/ne2k-pci.c | 2 +- drivers/net/ne3210.c | 4 +- drivers/net/netx-eth.c | 17 +- drivers/net/netxen/netxen_nic.h | 624 +- drivers/net/netxen/netxen_nic_ctx.c | 241 +- drivers/net/netxen/netxen_nic_ethtool.c | 106 +- drivers/net/netxen/netxen_nic_hdr.h | 8 - drivers/net/netxen/netxen_nic_hw.c | 737 +- drivers/net/netxen/netxen_nic_hw.h | 76 +- drivers/net/netxen/netxen_nic_init.c | 536 +- drivers/net/netxen/netxen_nic_main.c | 411 +- drivers/net/netxen/netxen_nic_niu.c | 341 +- drivers/net/netxen/netxen_nic_phan_reg.h | 27 +- drivers/net/niu.c | 66 +- drivers/net/ns83820.c | 6 +- drivers/net/pasemi_mac.c | 58 +- drivers/net/pasemi_mac.h | 1 - drivers/net/pci-skeleton.c | 19 +- drivers/net/pcmcia/3c574_cs.c | 2 +- drivers/net/pcmcia/3c589_cs.c | 4 +- drivers/net/pcnet32.c | 5 +- drivers/net/phy/marvell.c | 1 + drivers/net/phy/mdio_bus.c | 29 +- drivers/net/phy/phy_device.c | 163 +- drivers/net/ppp_generic.c | 1 + drivers/net/pppol2tp.c | 14 +- drivers/net/qla3xxx.c | 1 - drivers/net/qlge/qlge.h | 18 +- drivers/net/qlge/qlge_ethtool.c | 6 +- drivers/net/qlge/qlge_main.c | 104 +- drivers/net/qlge/qlge_mpi.c | 58 +- drivers/net/r6040.c | 18 +- drivers/net/r8169.c | 216 +- drivers/net/rionet.c | 14 +- drivers/net/s2io-regs.h | 5 - drivers/net/s2io.c | 44 +- drivers/net/s2io.h | 9 - drivers/net/sb1250-mac.c | 35 +- drivers/net/sfc/Kconfig | 2 +- drivers/net/sfc/boards.c | 2 - drivers/net/sfc/efx.c | 29 +- drivers/net/sfc/ethtool.c | 19 +- drivers/net/sfc/falcon.c | 137 +- drivers/net/sfc/falcon_hwdefs.h | 3 - drivers/net/sfc/falcon_xmac.c | 2 +- drivers/net/sfc/mdio_10g.c | 385 +- drivers/net/sfc/mdio_10g.h | 282 +- drivers/net/sfc/net_driver.h | 34 +- drivers/net/sfc/rx.c | 26 +- drivers/net/sfc/selftest.c | 22 +- drivers/net/sfc/selftest.h | 2 +- drivers/net/sfc/sfe4001.c | 3 - drivers/net/sfc/tenxpress.c | 240 +- drivers/net/sfc/tx.c | 7 - drivers/net/sfc/xenpack.h | 62 - drivers/net/sfc/xfp_phy.c | 55 +- drivers/net/sgiseeq.c | 18 +- drivers/net/sh_eth.c | 497 +- drivers/net/sh_eth.h | 278 +- drivers/net/sis190.c | 59 +- drivers/net/skfp/skfddi.c | 156 +- drivers/net/skge.c | 2 - drivers/net/sky2.c | 1 - drivers/net/smc-mca.c | 4 +- drivers/net/smc911x.c | 23 +- drivers/net/smsc911x.c | 63 +- drivers/net/sun3lance.c | 17 +- drivers/net/sundance.c | 53 +- drivers/net/tc35815.c | 13 +- drivers/net/tehuti.c | 5 +- drivers/net/tg3.c | 107 +- drivers/net/tg3.h | 6 + drivers/net/tulip/de4x5.c | 6 +- drivers/net/tulip/winbond-840.c | 3 +- drivers/net/tun.c | 110 +- drivers/net/ucc_geth.c | 187 +- drivers/net/ucc_geth.h | 31 +- drivers/net/usb/Kconfig | 8 + drivers/net/usb/Makefile | 1 + drivers/net/usb/cdc_ether.c | 33 +- drivers/net/usb/dm9601.c | 12 +- drivers/net/usb/hso.c | 51 +- drivers/net/usb/int51x1.c | 253 + drivers/net/usb/kaweth.c | 33 +- drivers/net/usb/rtl8150.c | 9 +- drivers/net/usb/smsc95xx.c | 4 +- drivers/net/usb/usbnet.c | 37 +- drivers/net/veth.c | 2 - drivers/net/via-rhine.c | 58 +- drivers/net/via-velocity.c | 22 +- drivers/net/via-velocity.h | 1 - drivers/net/virtio_net.c | 21 +- drivers/net/vxge/vxge-main.c | 6 +- drivers/net/vxge/vxge-traffic.c | 4 +- drivers/net/wan/hdlc_fr.c | 1 + drivers/net/wan/ixp4xx_hss.c | 4 +- drivers/net/wan/pc300_drv.c | 20 +- drivers/net/wimax/i2400m/control.c | 100 +- drivers/net/wimax/i2400m/driver.c | 5 +- drivers/net/wimax/i2400m/i2400m.h | 5 + drivers/net/wimax/i2400m/netdev.c | 4 +- drivers/net/wimax/i2400m/rx.c | 6 +- drivers/net/wimax/i2400m/sdio.c | 18 +- drivers/net/wireless/Kconfig | 18 +- drivers/net/wireless/Makefile | 8 +- drivers/net/wireless/adm8211.c | 14 +- drivers/net/wireless/at76c50x-usb.c | 19 +- drivers/net/wireless/ath/Kconfig | 8 + drivers/net/wireless/ath/Makefile | 6 + drivers/net/wireless/{ => ath}/ar9170/Kconfig | 1 + drivers/net/wireless/{ => ath}/ar9170/Makefile | 0 drivers/net/wireless/{ => ath}/ar9170/ar9170.h | 42 +- drivers/net/wireless/{ => ath}/ar9170/cmd.c | 0 drivers/net/wireless/{ => ath}/ar9170/cmd.h | 0 drivers/net/wireless/{ => ath}/ar9170/eeprom.h | 0 drivers/net/wireless/{ => ath}/ar9170/hw.h | 20 +- drivers/net/wireless/{ => ath}/ar9170/led.c | 17 +- drivers/net/wireless/{ => ath}/ar9170/mac.c | 86 +- drivers/net/wireless/{ => ath}/ar9170/main.c | 739 +- drivers/net/wireless/{ => ath}/ar9170/phy.c | 6 +- drivers/net/wireless/{ => ath}/ar9170/usb.c | 73 +- drivers/net/wireless/{ => ath}/ar9170/usb.h | 4 +- drivers/net/wireless/{ => ath}/ath5k/Kconfig | 1 + drivers/net/wireless/{ => ath}/ath5k/Makefile | 0 drivers/net/wireless/{ => ath}/ath5k/ath5k.h | 42 +- drivers/net/wireless/{ => ath}/ath5k/attach.c | 1 - drivers/net/wireless/{ => ath}/ath5k/base.c | 340 +- drivers/net/wireless/{ => ath}/ath5k/base.h | 1 - drivers/net/wireless/{ => ath}/ath5k/caps.c | 0 drivers/net/wireless/{ => ath}/ath5k/debug.c | 0 drivers/net/wireless/{ => ath}/ath5k/debug.h | 0 drivers/net/wireless/{ => ath}/ath5k/desc.c | 0 drivers/net/wireless/{ => ath}/ath5k/desc.h | 0 drivers/net/wireless/{ => ath}/ath5k/dma.c | 2 - drivers/net/wireless/{ => ath}/ath5k/eeprom.c | 73 +- drivers/net/wireless/{ => ath}/ath5k/eeprom.h | 46 +- drivers/net/wireless/{ => ath}/ath5k/gpio.c | 0 drivers/net/wireless/{ => ath}/ath5k/initvals.c | 8 +- drivers/net/wireless/{ => ath}/ath5k/led.c | 10 +- drivers/net/wireless/{ => ath}/ath5k/pcu.c | 10 +- drivers/net/wireless/{ => ath}/ath5k/phy.c | 496 +- drivers/net/wireless/{ => ath}/ath5k/qcu.c | 7 +- drivers/net/wireless/{ => ath}/ath5k/reg.h | 9 +- drivers/net/wireless/{ => ath}/ath5k/reset.c | 75 +- drivers/net/wireless/{ => ath}/ath5k/rfbuffer.h | 0 drivers/net/wireless/{ => ath}/ath5k/rfgain.h | 0 drivers/net/wireless/{ => ath}/ath9k/Kconfig | 1 + drivers/net/wireless/{ => ath}/ath9k/Makefile | 1 - drivers/net/wireless/{ => ath}/ath9k/ahb.c | 0 drivers/net/wireless/{ => ath}/ath9k/ani.c | 8 +- drivers/net/wireless/{ => ath}/ath9k/ani.h | 0 drivers/net/wireless/{ => ath}/ath9k/ath9k.h | 122 +- drivers/net/wireless/{ => ath}/ath9k/beacon.c | 133 +- drivers/net/wireless/{ => ath}/ath9k/calib.c | 129 +- drivers/net/wireless/{ => ath}/ath9k/calib.h | 33 +- drivers/net/wireless/{ => ath}/ath9k/debug.c | 158 +- drivers/net/wireless/{ => ath}/ath9k/debug.h | 35 +- drivers/net/wireless/{ => ath}/ath9k/eeprom.c | 75 +- drivers/net/wireless/{ => ath}/ath9k/eeprom.h | 4 +- drivers/net/wireless/{ => ath}/ath9k/hw.c | 269 +- drivers/net/wireless/{ => ath}/ath9k/hw.h | 95 +- drivers/net/wireless/{ => ath}/ath9k/initvals.h | 0 drivers/net/wireless/{ => ath}/ath9k/mac.c | 63 +- drivers/net/wireless/{ => ath}/ath9k/mac.h | 0 drivers/net/wireless/{ => ath}/ath9k/main.c | 780 +- drivers/net/wireless/{ => ath}/ath9k/pci.c | 15 - drivers/net/wireless/{ => ath}/ath9k/phy.c | 11 +- drivers/net/wireless/{ => ath}/ath9k/phy.h | 5 +- drivers/net/wireless/{ => ath}/ath9k/rc.c | 96 +- drivers/net/wireless/{ => ath}/ath9k/rc.h | 4 - drivers/net/wireless/{ => ath}/ath9k/recv.c | 279 +- drivers/net/wireless/{ => ath}/ath9k/reg.h | 0 drivers/net/wireless/{ => ath}/ath9k/virtual.c | 0 drivers/net/wireless/{ => ath}/ath9k/xmit.c | 86 +- drivers/net/wireless/ath/main.c | 22 + drivers/net/wireless/{ath9k => ath}/regd.c | 276 +- drivers/net/wireless/{ath9k => ath}/regd.h | 40 +- drivers/net/wireless/{ath9k => ath}/regd_common.h | 0 drivers/net/wireless/atmel_cs.c | 2 +- drivers/net/wireless/b43/Kconfig | 10 +- drivers/net/wireless/b43/b43.h | 8 +- drivers/net/wireless/b43/leds.c | 2 +- drivers/net/wireless/b43/main.c | 149 +- drivers/net/wireless/b43/phy_a.c | 4 +- drivers/net/wireless/b43/phy_common.c | 17 +- drivers/net/wireless/b43/phy_common.h | 4 +- drivers/net/wireless/b43/phy_g.c | 4 +- drivers/net/wireless/b43/phy_lp.c | 2 +- drivers/net/wireless/b43/phy_n.c | 2 +- drivers/net/wireless/b43/rfkill.c | 124 +- drivers/net/wireless/b43/rfkill.h | 5 +- drivers/net/wireless/b43legacy/Kconfig | 10 +- drivers/net/wireless/b43legacy/b43legacy.h | 12 +- drivers/net/wireless/b43legacy/leds.c | 3 +- drivers/net/wireless/b43legacy/main.c | 329 +- drivers/net/wireless/b43legacy/pio.c | 2 +- drivers/net/wireless/b43legacy/rfkill.c | 124 +- drivers/net/wireless/b43legacy/rfkill.h | 6 +- drivers/net/wireless/b43legacy/xmit.c | 2 +- drivers/net/wireless/b43legacy/xmit.h | 4 +- drivers/net/wireless/hostap/hostap_hw.c | 2 +- drivers/net/wireless/hostap/hostap_plx.c | 2 +- drivers/net/wireless/ipw2x00/ipw2100.c | 8 +- drivers/net/wireless/ipw2x00/ipw2200.c | 54 +- drivers/net/wireless/ipw2x00/libipw_module.c | 4 - drivers/net/wireless/iwlwifi/Kconfig | 5 +- drivers/net/wireless/iwlwifi/iwl-3945-led.c | 66 +- drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 16 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 412 +- drivers/net/wireless/iwlwifi/iwl-3945.h | 8 +- drivers/net/wireless/iwlwifi/iwl-4965.c | 95 +- drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 12 + drivers/net/wireless/iwlwifi/iwl-5000.c | 175 +- drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 593 +- drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 27 + drivers/net/wireless/iwlwifi/iwl-agn.c | 1237 +- drivers/net/wireless/iwlwifi/iwl-calib.c | 2 +- drivers/net/wireless/iwlwifi/iwl-commands.h | 35 +- drivers/net/wireless/iwlwifi/iwl-core.c | 1111 ++- drivers/net/wireless/iwlwifi/iwl-core.h | 91 +- drivers/net/wireless/iwlwifi/iwl-csr.h | 22 +- drivers/net/wireless/iwlwifi/iwl-debug.h | 3 +- drivers/net/wireless/iwlwifi/iwl-debugfs.c | 191 +- drivers/net/wireless/iwlwifi/iwl-dev.h | 64 +- drivers/net/wireless/iwlwifi/iwl-eeprom.c | 153 +- drivers/net/wireless/iwlwifi/iwl-eeprom.h | 4 + drivers/net/wireless/iwlwifi/iwl-io.h | 253 +- drivers/net/wireless/iwlwifi/iwl-led.c | 4 - drivers/net/wireless/iwlwifi/iwl-power.c | 233 +- drivers/net/wireless/iwlwifi/iwl-power.h | 39 +- drivers/net/wireless/iwlwifi/iwl-rfkill.c | 70 +- drivers/net/wireless/iwlwifi/iwl-rx.c | 70 +- drivers/net/wireless/iwlwifi/iwl-scan.c | 214 +- drivers/net/wireless/iwlwifi/iwl-sta.c | 47 +- drivers/net/wireless/iwlwifi/iwl-sta.h | 7 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 29 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 1416 +-- drivers/net/wireless/iwmc3200wifi/Kconfig | 23 + drivers/net/wireless/iwmc3200wifi/Makefile | 5 + drivers/net/wireless/iwmc3200wifi/bus.h | 57 + drivers/net/wireless/iwmc3200wifi/cfg80211.c | 409 + drivers/net/wireless/iwmc3200wifi/cfg80211.h | 31 + drivers/net/wireless/iwmc3200wifi/commands.c | 920 ++ drivers/net/wireless/iwmc3200wifi/commands.h | 419 + drivers/net/wireless/iwmc3200wifi/debug.h | 124 + drivers/net/wireless/iwmc3200wifi/debugfs.c | 453 + drivers/net/wireless/iwmc3200wifi/eeprom.c | 187 + drivers/net/wireless/iwmc3200wifi/eeprom.h | 114 + drivers/net/wireless/iwmc3200wifi/fw.c | 388 + drivers/net/wireless/iwmc3200wifi/fw.h | 100 + drivers/net/wireless/iwmc3200wifi/hal.c | 464 + drivers/net/wireless/iwmc3200wifi/hal.h | 236 + drivers/net/wireless/iwmc3200wifi/iwm.h | 346 + drivers/net/wireless/iwmc3200wifi/lmac.h | 457 + drivers/net/wireless/iwmc3200wifi/main.c | 680 + drivers/net/wireless/iwmc3200wifi/netdev.c | 162 + drivers/net/wireless/iwmc3200wifi/rx.c | 1431 ++ drivers/net/wireless/iwmc3200wifi/rx.h | 60 + drivers/net/wireless/iwmc3200wifi/sdio.c | 516 + drivers/net/wireless/iwmc3200wifi/sdio.h | 67 + drivers/net/wireless/iwmc3200wifi/tx.c | 492 + drivers/net/wireless/iwmc3200wifi/umac.h | 744 + drivers/net/wireless/iwmc3200wifi/wext.c | 723 + drivers/net/wireless/libertas/11d.c | 26 +- drivers/net/wireless/libertas/11d.h | 29 +- drivers/net/wireless/libertas/assoc.c | 758 +- drivers/net/wireless/libertas/assoc.h | 13 - drivers/net/wireless/libertas/cmd.c | 42 +- drivers/net/wireless/libertas/cmdresp.c | 17 +- drivers/net/wireless/libertas/debugfs.c | 8 +- drivers/net/wireless/libertas/defs.h | 21 + drivers/net/wireless/libertas/dev.h | 9 +- drivers/net/wireless/libertas/host.h | 5 +- drivers/net/wireless/libertas/hostcmd.h | 69 +- drivers/net/wireless/libertas/if_cs.c | 34 +- drivers/net/wireless/libertas/if_sdio.c | 176 +- drivers/net/wireless/libertas/if_sdio.h | 10 + drivers/net/wireless/libertas/if_spi.c | 47 +- drivers/net/wireless/libertas/if_usb.c | 3 +- drivers/net/wireless/libertas/main.c | 44 +- drivers/net/wireless/libertas/rx.c | 48 +- drivers/net/wireless/libertas/scan.c | 63 +- drivers/net/wireless/libertas/tx.c | 8 +- drivers/net/wireless/libertas/types.h | 152 +- drivers/net/wireless/libertas_tf/if_usb.c | 3 +- drivers/net/wireless/libertas_tf/main.c | 56 +- drivers/net/wireless/mac80211_hwsim.c | 105 +- drivers/net/wireless/mwl8k.c | 20 +- drivers/net/wireless/p54/p54.h | 74 +- drivers/net/wireless/p54/p54common.c | 348 +- drivers/net/wireless/p54/p54spi.c | 175 +- drivers/net/wireless/p54/p54usb.c | 314 +- drivers/net/wireless/p54/p54usb.h | 16 +- drivers/net/wireless/ray_cs.c | 2 +- drivers/net/wireless/rndis_wlan.c | 868 +- drivers/net/wireless/rt2x00/Kconfig | 17 + drivers/net/wireless/rt2x00/Makefile | 2 + drivers/net/wireless/rt2x00/rt2400pci.c | 35 +- drivers/net/wireless/rt2x00/rt2500pci.c | 35 +- drivers/net/wireless/rt2x00/rt2500usb.c | 22 +- drivers/net/wireless/rt2x00/rt2800usb.c | 3078 ++++ drivers/net/wireless/rt2x00/rt2800usb.h | 1945 +++ drivers/net/wireless/rt2x00/rt2x00.h | 57 +- drivers/net/wireless/rt2x00/rt2x00config.c | 9 + drivers/net/wireless/rt2x00/rt2x00crypto.c | 89 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 134 +- drivers/net/wireless/rt2x00/rt2x00ht.c | 69 + drivers/net/wireless/rt2x00/rt2x00lib.h | 65 +- drivers/net/wireless/rt2x00/rt2x00link.c | 2 +- drivers/net/wireless/rt2x00/rt2x00mac.c | 88 +- drivers/net/wireless/rt2x00/rt2x00pci.c | 16 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 48 +- drivers/net/wireless/rt2x00/rt2x00queue.h | 53 +- drivers/net/wireless/rt2x00/rt61pci.c | 38 +- drivers/net/wireless/rt2x00/rt61pci.h | 6 - drivers/net/wireless/rt2x00/rt73usb.c | 34 +- drivers/net/wireless/rtl818x/Makefile | 2 +- drivers/net/wireless/rtl818x/rtl8180_dev.c | 33 +- drivers/net/wireless/rtl818x/rtl8187.h | 7 + drivers/net/wireless/rtl818x/rtl8187_dev.c | 76 +- drivers/net/wireless/rtl818x/rtl8187_leds.c | 218 + drivers/net/wireless/rtl818x/rtl8187_leds.h | 57 + drivers/net/wireless/strip.c | 2 +- drivers/net/wireless/wavelan.c | 4 - drivers/net/wireless/wavelan_cs.c | 5 - drivers/net/wireless/wl12xx/Kconfig | 11 + drivers/net/wireless/wl12xx/Makefile | 4 + drivers/net/wireless/wl12xx/acx.c | 689 + drivers/net/wireless/wl12xx/acx.h | 1245 ++ drivers/net/wireless/wl12xx/boot.c | 295 + drivers/net/wireless/wl12xx/boot.h | 40 + drivers/net/wireless/wl12xx/cmd.c | 353 + drivers/net/wireless/wl12xx/cmd.h | 265 + drivers/net/wireless/wl12xx/debugfs.c | 508 + drivers/net/wireless/wl12xx/debugfs.h | 33 + drivers/net/wireless/wl12xx/event.c | 127 + drivers/net/wireless/wl12xx/event.h | 121 + drivers/net/wireless/wl12xx/init.c | 200 + drivers/net/wireless/wl12xx/init.h | 40 + drivers/net/wireless/wl12xx/main.c | 1358 ++ drivers/net/wireless/wl12xx/ps.c | 151 + drivers/net/wireless/wl12xx/ps.h | 36 + drivers/net/wireless/wl12xx/reg.h | 745 + drivers/net/wireless/wl12xx/rx.c | 208 + drivers/net/wireless/wl12xx/rx.h | 122 + drivers/net/wireless/wl12xx/spi.c | 358 + drivers/net/wireless/wl12xx/spi.h | 109 + drivers/net/wireless/wl12xx/tx.c | 557 + drivers/net/wireless/wl12xx/tx.h | 215 + drivers/net/wireless/wl12xx/wl1251.c | 709 + drivers/net/wireless/wl12xx/wl1251.h | 165 + drivers/net/wireless/wl12xx/wl12xx.h | 409 + drivers/net/wireless/wl12xx/wl12xx_80211.h | 156 + drivers/net/wireless/zd1211rw/zd_mac.c | 86 +- drivers/net/wireless/zd1211rw/zd_mac.h | 2 +- drivers/net/yellowfin.c | 3 +- drivers/of/Kconfig | 6 + drivers/of/Makefile | 1 + drivers/of/base.c | 24 + drivers/of/of_mdio.c | 139 + drivers/pci/quirks.c | 2 + drivers/platform/x86/Kconfig | 14 +- drivers/platform/x86/acer-wmi.c | 51 +- drivers/platform/x86/dell-laptop.c | 101 +- drivers/platform/x86/eeepc-laptop.c | 99 +- drivers/platform/x86/hp-wmi.c | 106 +- drivers/platform/x86/sony-laptop.c | 195 +- drivers/platform/x86/thinkpad_acpi.c | 873 +- drivers/platform/x86/toshiba_acpi.c | 160 +- drivers/s390/net/ctcm_main.c | 6 +- drivers/s390/net/qeth_core_main.c | 7 +- drivers/s390/net/qeth_core_mpc.c | 2 + drivers/s390/net/qeth_core_mpc.h | 2 + drivers/s390/net/qeth_l2_main.c | 36 +- drivers/s390/net/qeth_l3_main.c | 33 +- drivers/scsi/fcoe/fcoe.c | 197 +- drivers/scsi/fcoe/libfcoe.c | 10 +- drivers/serial/serial_cs.c | 22 +- drivers/staging/agnx/pci.c | 15 +- drivers/usb/gadget/f_phonet.c | 21 +- firmware/Makefile | 5 +- firmware/WHENCE | 42 +- firmware/bnx2x-e1-4.8.53.0.fw.ihex |10364 +++++++++++++ firmware/bnx2x-e1h-4.8.53.0.fw.ihex |12028 +++++++++++++++ firmware/cis/3CCFEM556.cis.ihex | 13 + firmware/cis/3CXEM556.cis.ihex | 13 + firmware/cxgb3/t3fw-7.1.0.bin.ihex | 1885 --- firmware/cxgb3/t3fw-7.4.0.bin.ihex | 1917 +++ include/asm-generic/errno.h | 2 + include/linux/Kbuild | 1 + include/linux/can/Kbuild | 1 + include/linux/can/dev.h | 70 + include/linux/can/netlink.h | 113 + include/linux/can/platform/sja1000.h | 35 + include/linux/etherdevice.h | 27 + include/linux/ethtool.h | 23 +- include/linux/fs_enet_pd.h | 6 +- include/linux/ieee80211.h | 61 +- include/linux/if.h | 3 + include/linux/if_arp.h | 2 + include/linux/if_ether.h | 1 + include/linux/if_packet.h | 21 +- include/linux/if_tun.h | 1 + include/linux/if_tunnel.h | 2 +- include/linux/if_vlan.h | 6 +- include/linux/in.h | 1 + include/linux/ipv6.h | 6 + include/linux/isdn/capilli.h | 2 +- include/linux/mISDNdsp.h | 4 +- include/linux/mISDNhw.h | 2 +- include/linux/mISDNif.h | 19 +- include/linux/mdio.h | 347 + include/linux/mii.h | 34 +- include/linux/mmc/sdio_ids.h | 2 + include/linux/net_dropmon.h | 8 + include/linux/netdevice.h | 232 +- include/linux/nl80211.h | 178 +- include/linux/nl802154.h | 119 + include/linux/notifier.h | 1 + include/linux/of.h | 3 + include/linux/of_mdio.h | 22 + include/linux/pci_ids.h | 42 +- include/linux/phy.h | 10 +- include/linux/rfkill.h | 398 +- include/linux/sched.h | 6 + include/linux/sctp.h | 20 +- include/linux/skbuff.h | 60 +- include/linux/smsc911x.h | 10 + include/linux/snmp.h | 10 +- include/linux/socket.h | 11 +- include/linux/spi/wl12xx.h | 31 + include/linux/tcp.h | 4 +- include/linux/usb/usbnet.h | 1 + include/linux/wimax.h | 7 +- include/net/bluetooth/bluetooth.h | 9 - include/net/cfg80211.h | 1059 ++- include/net/dst.h | 12 +- include/net/fib_rules.h | 2 - include/net/genetlink.h | 2 + include/net/ieee802154/af_ieee802154.h | 60 + include/net/ieee802154/mac_def.h | 160 + include/net/ieee802154/netdevice.h | 115 + include/net/ieee802154/nl802154.h | 41 + include/net/inet6_hashtables.h | 2 +- include/net/inet_hashtables.h | 2 +- include/net/inet_sock.h | 3 +- include/net/ip.h | 3 + include/net/ip6_route.h | 2 +- include/net/ip_fib.h | 3 - include/net/ipip.h | 7 + include/net/ipv6.h | 15 +- include/net/iucv/af_iucv.h | 9 + include/net/mac80211.h | 261 +- include/net/pkt_sched.h | 7 +- include/net/regulatory.h | 101 + include/net/route.h | 2 +- include/net/sctp/structs.h | 6 +- include/net/sctp/user.h | 2 + include/net/snmp.h | 19 +- include/net/tcp.h | 59 +- include/net/wimax.h | 8 +- include/net/wireless.h | 472 - include/net/xfrm.h | 4 +- include/scsi/libfcoe.h | 2 + include/trace/napi.h | 11 + net/802/fddi.c | 4 - net/802/hippi.c | 5 - net/8021q/vlan.c | 6 +- net/8021q/vlan_core.c | 4 +- net/8021q/vlan_dev.c | 49 +- net/8021q/vlanproc.c | 3 +- net/Kconfig | 1 + net/Makefile | 1 + net/appletalk/ddp.c | 31 +- net/appletalk/dev.c | 11 - net/atm/br2684.c | 28 +- net/atm/clip.c | 42 +- net/bluetooth/cmtp/capi.c | 2 +- net/bridge/br_fdb.c | 2 +- net/bridge/br_netfilter.c | 33 +- net/bridge/br_sysfs_br.c | 3 +- net/bridge/br_sysfs_if.c | 3 +- net/can/af_can.c | 2 + net/core/datagram.c | 241 +- net/core/dev.c | 666 +- net/core/drop_monitor.c | 137 +- net/core/fib_rules.c | 4 +- net/core/gen_estimator.c | 4 +- net/core/iovec.c | 33 +- net/core/neighbour.c | 11 +- net/core/net-sysfs.c | 9 +- net/core/net-traces.c | 4 + net/core/net_namespace.c | 54 +- net/core/netpoll.c | 7 +- net/core/pktgen.c | 7 +- net/core/skb_dma_map.c | 13 +- net/core/skbuff.c | 308 +- net/core/sock.c | 106 +- net/core/stream.c | 3 +- net/core/user_dma.c | 46 +- net/dccp/ipv4.c | 10 +- net/dccp/ipv6.c | 8 +- net/dccp/output.c | 2 +- net/decnet/af_decnet.c | 25 +- net/decnet/dn_neigh.c | 8 +- net/decnet/dn_nsp_in.c | 17 +- net/decnet/dn_nsp_out.c | 14 +- net/decnet/dn_route.c | 25 +- net/decnet/dn_rules.c | 4 +- net/dsa/slave.c | 10 +- net/econet/af_econet.c | 18 +- net/ethernet/eth.c | 5 - net/ieee802154/Kconfig | 12 + net/ieee802154/Makefile | 5 + net/ieee802154/af802154.h | 36 + net/ieee802154/af_ieee802154.c | 372 + net/ieee802154/dgram.c | 394 + net/ieee802154/netlink.c | 523 + net/ieee802154/nl_policy.c | 52 + net/ieee802154/raw.c | 254 + net/ipv4/af_inet.c | 25 +- net/ipv4/arp.c | 6 +- net/ipv4/devinet.c | 3 +- net/ipv4/fib_frontend.c | 1 - net/ipv4/fib_hash.c | 1 - net/ipv4/fib_lookup.h | 3 +- net/ipv4/fib_rules.c | 4 +- net/ipv4/fib_semantics.c | 3 +- net/ipv4/fib_trie.c | 3 +- net/ipv4/icmp.c | 20 +- net/ipv4/igmp.c | 8 +- net/ipv4/inet_diag.c | 2 - net/ipv4/inet_timewait_sock.c | 23 +- net/ipv4/ip_forward.c | 6 +- net/ipv4/ip_fragment.c | 6 +- net/ipv4/ip_gre.c | 28 +- net/ipv4/ip_input.c | 21 +- net/ipv4/ip_options.c | 18 +- net/ipv4/ip_output.c | 48 +- net/ipv4/ip_sockglue.c | 86 +- net/ipv4/ipconfig.c | 41 +- net/ipv4/ipip.c | 16 +- net/ipv4/ipmr.c | 19 +- net/ipv4/netfilter.c | 28 +- net/ipv4/netfilter/ipt_MASQUERADE.c | 2 +- net/ipv4/netfilter/ipt_REJECT.c | 7 +- net/ipv4/netfilter/nf_nat_helper.c | 4 +- net/ipv4/netfilter/nf_nat_proto_sctp.c | 5 +- net/ipv4/netfilter/nf_nat_standalone.c | 7 +- net/ipv4/proc.c | 10 +- net/ipv4/raw.c | 2 +- net/ipv4/route.c | 43 +- net/ipv4/syncookies.c | 5 +- net/ipv4/tcp.c | 47 +- net/ipv4/tcp_input.c | 100 +- net/ipv4/tcp_ipv4.c | 12 +- net/ipv4/tcp_output.c | 4 +- net/ipv4/udp.c | 4 +- net/ipv4/xfrm4_input.c | 2 +- net/ipv4/xfrm4_mode_tunnel.c | 4 +- net/ipv4/xfrm4_output.c | 6 +- net/ipv6/addrconf.c | 87 +- net/ipv6/af_inet6.c | 35 +- net/ipv6/exthdrs.c | 40 +- net/ipv6/fib6_rules.c | 4 +- net/ipv6/inet6_connection_sock.c | 2 +- net/ipv6/ip6_input.c | 15 +- net/ipv6/ip6_output.c | 73 +- net/ipv6/ip6_tunnel.c | 30 +- net/ipv6/ip6mr.c | 13 +- net/ipv6/mcast.c | 34 +- net/ipv6/ndisc.c | 17 +- net/ipv6/netfilter.c | 16 +- net/ipv6/netfilter/ip6t_REJECT.c | 2 +- net/ipv6/netfilter/nf_conntrack_reasm.c | 4 +- net/ipv6/proc.c | 10 +- net/ipv6/raw.c | 4 +- net/ipv6/reassembly.c | 26 +- net/ipv6/route.c | 12 +- net/ipv6/sit.c | 118 +- net/ipv6/syncookies.c | 4 +- net/ipv6/tcp_ipv6.c | 17 +- net/ipv6/udp.c | 7 +- net/ipv6/xfrm6_mode_tunnel.c | 4 +- net/ipv6/xfrm6_output.c | 4 +- net/irda/irlap_frame.c | 18 +- net/irda/irnetlink.c | 19 +- net/iucv/af_iucv.c | 408 +- net/iucv/iucv.c | 43 +- net/llc/af_llc.c | 2 +- net/llc/llc_conn.c | 4 - net/mac80211/Kconfig | 21 +- net/mac80211/agg-rx.c | 19 +- net/mac80211/agg-tx.c | 13 +- net/mac80211/cfg.c | 209 +- net/mac80211/debugfs.c | 74 +- net/mac80211/driver-ops.h | 191 + net/mac80211/event.c | 17 +- net/mac80211/ht.c | 84 - net/mac80211/ibss.c | 501 +- net/mac80211/ieee80211_i.h | 151 +- net/mac80211/iface.c | 117 +- net/mac80211/key.c | 29 +- net/mac80211/key.h | 3 +- net/mac80211/main.c | 307 +- net/mac80211/mesh.c | 46 +- net/mac80211/mesh.h | 16 +- net/mac80211/mesh_hwmp.c | 8 +- net/mac80211/mesh_plink.c | 21 + net/mac80211/mlme.c | 749 +- net/mac80211/pm.c | 182 +- net/mac80211/rc80211_minstrel.c | 8 +- net/mac80211/rc80211_pid_algo.c | 8 +- net/mac80211/rx.c | 292 +- net/mac80211/scan.c | 436 +- net/mac80211/spectmgmt.c | 103 +- net/mac80211/sta_info.c | 112 +- net/mac80211/sta_info.h | 7 +- net/mac80211/tkip.c | 6 +- net/mac80211/tx.c | 53 +- net/mac80211/util.c | 405 +- net/mac80211/wext.c | 637 +- net/mac80211/wme.c | 32 +- net/mac80211/wpa.c | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 18 +- net/netfilter/ipvs/ip_vs_xmit.c | 48 +- net/netfilter/nf_conntrack_netbios_ns.c | 2 +- net/netfilter/nf_conntrack_proto_gre.c | 2 +- net/netfilter/nfnetlink_queue.c | 4 +- net/netfilter/xt_TCPMSS.c | 6 +- net/netfilter/xt_policy.c | 2 +- net/netfilter/xt_realm.c | 2 +- net/netlabel/netlabel_cipso_v4.c | 16 +- net/netlabel/netlabel_mgmt.c | 16 +- net/netlabel/netlabel_unlabeled.c | 16 +- net/netlink/genetlink.c | 46 + net/packet/af_packet.c | 604 +- net/phonet/pep-gprs.c | 9 +- net/phonet/pep.c | 4 +- net/rds/af_rds.c | 1 - net/rds/connection.c | 4 +- net/rds/ib.c | 4 +- net/rds/ib.h | 2 +- net/rds/ib_recv.c | 2 +- net/rds/ib_ring.c | 2 +- net/rds/ib_send.c | 10 +- net/rds/info.c | 5 +- net/rds/iw.c | 4 +- net/rds/iw.h | 2 +- net/rds/iw_recv.c | 2 +- net/rds/iw_ring.c | 2 +- net/rds/iw_send.c | 10 +- net/rds/rdma.c | 7 +- net/rds/rdma_transport.c | 12 +- net/rds/rds.h | 2 +- net/rds/send.c | 10 +- net/rfkill/Kconfig | 21 +- net/rfkill/Makefile | 5 +- net/rfkill/core.c | 1228 ++ net/rfkill/input.c | 342 + net/rfkill/rfkill-input.c | 459 - net/rfkill/rfkill.c | 882 -- net/rfkill/{rfkill-input.h => rfkill.h} | 10 +- net/sched/cls_cgroup.c | 6 - net/sched/cls_flow.c | 8 +- net/sched/cls_route.c | 2 +- net/sched/em_meta.c | 8 +- net/sched/sch_generic.c | 40 +- net/sched/sch_hfsc.c | 8 +- net/sched/sch_sfq.c | 2 +- net/sched/sch_teql.c | 24 +- net/sctp/associola.c | 64 +- net/sctp/input.c | 4 +- net/sctp/output.c | 23 +- net/sctp/protocol.c | 10 +- net/sctp/sm_make_chunk.c | 16 +- net/sctp/sm_sideeffect.c | 8 +- net/sctp/sm_statefuns.c | 14 +- net/sctp/sm_statetable.c | 2 +- net/sctp/socket.c | 48 +- net/sctp/sysctl.c | 6 +- net/sctp/ulpevent.c | 7 +- net/sunrpc/auth_gss/auth_gss.c | 1 + net/sunrpc/xprtsock.c | 2 +- net/tipc/eth_media.c | 2 +- net/tipc/netlink.c | 38 +- net/wimax/Kconfig | 15 +- net/wimax/Makefile | 1 + net/wimax/debug-levels.h | 1 + net/wimax/debugfs.c | 1 + net/wimax/op-msg.c | 17 +- net/wimax/op-rfkill.c | 124 +- net/wimax/op-state-get.c | 86 + net/wimax/stack.c | 5 +- net/wireless/Kconfig | 11 +- net/wireless/Makefile | 3 +- net/wireless/core.c | 137 +- net/wireless/core.h | 42 +- net/wireless/debugfs.c | 131 + net/wireless/debugfs.h | 14 + net/wireless/ibss.c | 369 + net/wireless/mlme.c | 50 +- net/wireless/nl80211.c | 923 +- net/wireless/nl80211.h | 32 +- net/wireless/reg.c | 267 +- net/wireless/scan.c | 66 +- net/wireless/util.c | 370 +- net/wireless/wext-compat.c | 600 +- net/wireless/wext.c | 48 +- net/xfrm/xfrm_algo.c | 41 +- net/xfrm/xfrm_input.c | 3 +- net/xfrm/xfrm_output.c | 21 +- net/xfrm/xfrm_policy.c | 8 +- security/selinux/hooks.c | 2 +- security/selinux/xfrm.c | 2 +- 975 files changed, 100480 insertions(+), 44111 deletions(-) create mode 100644 Documentation/networking/ieee802154.txt create mode 100644 Documentation/powerpc/dts-bindings/can/sja1000.txt create mode 100644 drivers/ieee802154/Kconfig create mode 100644 drivers/ieee802154/Makefile create mode 100644 drivers/ieee802154/fakehard.c create mode 100644 drivers/isdn/hardware/mISDN/hfc_multi_8xx.h create mode 100644 drivers/net/bnx2x_fw_file_hdr.h create mode 100644 drivers/net/bnx2x_init_ops.h delete mode 100644 drivers/net/bnx2x_init_values.h create mode 100644 drivers/net/can/dev.c create mode 100644 drivers/net/can/sja1000/Makefile create mode 100644 drivers/net/can/sja1000/ems_pci.c create mode 100644 drivers/net/can/sja1000/kvaser_pci.c create mode 100644 drivers/net/can/sja1000/sja1000.c create mode 100644 drivers/net/can/sja1000/sja1000.h create mode 100644 drivers/net/can/sja1000/sja1000_of_platform.c create mode 100644 drivers/net/can/sja1000/sja1000_platform.c create mode 100644 drivers/net/cxgb3/aq100x.c create mode 100644 drivers/net/davinci_emac.c create mode 100644 drivers/net/ixgbe/ixgbe_fcoe.c create mode 100644 drivers/net/ixgbe/ixgbe_fcoe.h create mode 100644 drivers/net/ks8842.c create mode 100644 drivers/net/ll_temac.h create mode 100644 drivers/net/ll_temac_main.c create mode 100644 drivers/net/ll_temac_mdio.c create mode 100644 drivers/net/mdio.c rename drivers/net/mlx4/{en_params.c => en_ethtool.c} (86%) delete mode 100644 drivers/net/sfc/xenpack.h create mode 100644 drivers/net/usb/int51x1.c create mode 100644 drivers/net/wireless/ath/Kconfig create mode 100644 drivers/net/wireless/ath/Makefile rename drivers/net/wireless/{ => ath}/ar9170/Kconfig (96%) rename drivers/net/wireless/{ => ath}/ar9170/Makefile (100%) rename drivers/net/wireless/{ => ath}/ar9170/ar9170.h (86%) rename drivers/net/wireless/{ => ath}/ar9170/cmd.c (100%) rename drivers/net/wireless/{ => ath}/ar9170/cmd.h (100%) rename drivers/net/wireless/{ => ath}/ar9170/eeprom.h (100%) rename drivers/net/wireless/{ => ath}/ar9170/hw.h (96%) rename drivers/net/wireless/{ => ath}/ar9170/led.c (94%) rename drivers/net/wireless/{ => ath}/ar9170/mac.c (86%) rename drivers/net/wireless/{ => ath}/ar9170/main.c (74%) rename drivers/net/wireless/{ => ath}/ar9170/phy.c (99%) rename drivers/net/wireless/{ => ath}/ar9170/usb.c (93%) rename drivers/net/wireless/{ => ath}/ar9170/usb.h (97%) rename drivers/net/wireless/{ => ath}/ath5k/Kconfig (98%) rename drivers/net/wireless/{ => ath}/ath5k/Makefile (100%) rename drivers/net/wireless/{ => ath}/ath5k/ath5k.h (97%) rename drivers/net/wireless/{ => ath}/ath5k/attach.c (99%) rename drivers/net/wireless/{ => ath}/ath5k/base.c (94%) rename drivers/net/wireless/{ => ath}/ath5k/base.h (99%) rename drivers/net/wireless/{ => ath}/ath5k/caps.c (100%) rename drivers/net/wireless/{ => ath}/ath5k/debug.c (100%) rename drivers/net/wireless/{ => ath}/ath5k/debug.h (100%) rename drivers/net/wireless/{ => ath}/ath5k/desc.c (100%) rename drivers/net/wireless/{ => ath}/ath5k/desc.h (100%) rename drivers/net/wireless/{ => ath}/ath5k/dma.c (99%) rename drivers/net/wireless/{ => ath}/ath5k/eeprom.c (96%) rename drivers/net/wireless/{ => ath}/ath5k/eeprom.h (94%) rename drivers/net/wireless/{ => ath}/ath5k/gpio.c (100%) rename drivers/net/wireless/{ => ath}/ath5k/initvals.c (99%) rename drivers/net/wireless/{ => ath}/ath5k/led.c (94%) rename drivers/net/wireless/{ => ath}/ath5k/pcu.c (99%) rename drivers/net/wireless/{ => ath}/ath5k/phy.c (83%) rename drivers/net/wireless/{ => ath}/ath5k/qcu.c (98%) rename drivers/net/wireless/{ => ath}/ath5k/reg.h (99%) rename drivers/net/wireless/{ => ath}/ath5k/reset.c (96%) rename drivers/net/wireless/{ => ath}/ath5k/rfbuffer.h (100%) rename drivers/net/wireless/{ => ath}/ath5k/rfgain.h (100%) rename drivers/net/wireless/{ => ath}/ath9k/Kconfig (97%) rename drivers/net/wireless/{ => ath}/ath9k/Makefile (96%) rename drivers/net/wireless/{ => ath}/ath9k/ahb.c (100%) rename drivers/net/wireless/{ => ath}/ath9k/ani.c (99%) rename drivers/net/wireless/{ => ath}/ath9k/ani.h (100%) rename drivers/net/wireless/{ => ath}/ath9k/ath9k.h (88%) rename drivers/net/wireless/{ => ath}/ath9k/beacon.c (90%) rename drivers/net/wireless/{ => ath}/ath9k/calib.c (90%) rename drivers/net/wireless/{ => ath}/ath9k/calib.h (81%) rename drivers/net/wireless/{ => ath}/ath9k/debug.c (87%) rename drivers/net/wireless/{ => ath}/ath9k/debug.h (84%) rename drivers/net/wireless/{ => ath}/ath9k/eeprom.c (98%) rename drivers/net/wireless/{ => ath}/ath9k/eeprom.h (99%) rename drivers/net/wireless/{ => ath}/ath9k/hw.c (95%) rename drivers/net/wireless/{ => ath}/ath9k/hw.h (87%) rename drivers/net/wireless/{ => ath}/ath9k/initvals.h (100%) rename drivers/net/wireless/{ => ath}/ath9k/mac.c (93%) rename drivers/net/wireless/{ => ath}/ath9k/mac.h (100%) rename drivers/net/wireless/{ => ath}/ath9k/main.c (87%) rename drivers/net/wireless/{ => ath}/ath9k/pci.c (93%) rename drivers/net/wireless/{ => ath}/ath9k/phy.c (98%) rename drivers/net/wireless/{ => ath}/ath9k/phy.h (99%) rename drivers/net/wireless/{ => ath}/ath9k/rc.c (95%) rename drivers/net/wireless/{ => ath}/ath9k/rc.h (98%) rename drivers/net/wireless/{ => ath}/ath9k/recv.c (75%) rename drivers/net/wireless/{ => ath}/ath9k/reg.h (100%) rename drivers/net/wireless/{ => ath}/ath9k/virtual.c (100%) rename drivers/net/wireless/{ => ath}/ath9k/xmit.c (97%) create mode 100644 drivers/net/wireless/ath/main.c rename drivers/net/wireless/{ath9k => ath}/regd.c (61%) rename drivers/net/wireless/{ath9k => ath}/regd.h (85%) rename drivers/net/wireless/{ath9k => ath}/regd_common.h (100%) create mode 100644 drivers/net/wireless/iwmc3200wifi/Kconfig create mode 100644 drivers/net/wireless/iwmc3200wifi/Makefile create mode 100644 drivers/net/wireless/iwmc3200wifi/bus.h create mode 100644 drivers/net/wireless/iwmc3200wifi/cfg80211.c create mode 100644 drivers/net/wireless/iwmc3200wifi/cfg80211.h create mode 100644 drivers/net/wireless/iwmc3200wifi/commands.c create mode 100644 drivers/net/wireless/iwmc3200wifi/commands.h create mode 100644 drivers/net/wireless/iwmc3200wifi/debug.h create mode 100644 drivers/net/wireless/iwmc3200wifi/debugfs.c create mode 100644 drivers/net/wireless/iwmc3200wifi/eeprom.c create mode 100644 drivers/net/wireless/iwmc3200wifi/eeprom.h create mode 100644 drivers/net/wireless/iwmc3200wifi/fw.c create mode 100644 drivers/net/wireless/iwmc3200wifi/fw.h create mode 100644 drivers/net/wireless/iwmc3200wifi/hal.c create mode 100644 drivers/net/wireless/iwmc3200wifi/hal.h create mode 100644 drivers/net/wireless/iwmc3200wifi/iwm.h create mode 100644 drivers/net/wireless/iwmc3200wifi/lmac.h create mode 100644 drivers/net/wireless/iwmc3200wifi/main.c create mode 100644 drivers/net/wireless/iwmc3200wifi/netdev.c create mode 100644 drivers/net/wireless/iwmc3200wifi/rx.c create mode 100644 drivers/net/wireless/iwmc3200wifi/rx.h create mode 100644 drivers/net/wireless/iwmc3200wifi/sdio.c create mode 100644 drivers/net/wireless/iwmc3200wifi/sdio.h create mode 100644 drivers/net/wireless/iwmc3200wifi/tx.c create mode 100644 drivers/net/wireless/iwmc3200wifi/umac.h create mode 100644 drivers/net/wireless/iwmc3200wifi/wext.c create mode 100644 drivers/net/wireless/rt2x00/rt2800usb.c create mode 100644 drivers/net/wireless/rt2x00/rt2800usb.h create mode 100644 drivers/net/wireless/rt2x00/rt2x00ht.c create mode 100644 drivers/net/wireless/rtl818x/rtl8187_leds.c create mode 100644 drivers/net/wireless/rtl818x/rtl8187_leds.h create mode 100644 drivers/net/wireless/wl12xx/Kconfig create mode 100644 drivers/net/wireless/wl12xx/Makefile create mode 100644 drivers/net/wireless/wl12xx/acx.c create mode 100644 drivers/net/wireless/wl12xx/acx.h create mode 100644 drivers/net/wireless/wl12xx/boot.c create mode 100644 drivers/net/wireless/wl12xx/boot.h create mode 100644 drivers/net/wireless/wl12xx/cmd.c create mode 100644 drivers/net/wireless/wl12xx/cmd.h create mode 100644 drivers/net/wireless/wl12xx/debugfs.c create mode 100644 drivers/net/wireless/wl12xx/debugfs.h create mode 100644 drivers/net/wireless/wl12xx/event.c create mode 100644 drivers/net/wireless/wl12xx/event.h create mode 100644 drivers/net/wireless/wl12xx/init.c create mode 100644 drivers/net/wireless/wl12xx/init.h create mode 100644 drivers/net/wireless/wl12xx/main.c create mode 100644 drivers/net/wireless/wl12xx/ps.c create mode 100644 drivers/net/wireless/wl12xx/ps.h create mode 100644 drivers/net/wireless/wl12xx/reg.h create mode 100644 drivers/net/wireless/wl12xx/rx.c create mode 100644 drivers/net/wireless/wl12xx/rx.h create mode 100644 drivers/net/wireless/wl12xx/spi.c create mode 100644 drivers/net/wireless/wl12xx/spi.h create mode 100644 drivers/net/wireless/wl12xx/tx.c create mode 100644 drivers/net/wireless/wl12xx/tx.h create mode 100644 drivers/net/wireless/wl12xx/wl1251.c create mode 100644 drivers/net/wireless/wl12xx/wl1251.h create mode 100644 drivers/net/wireless/wl12xx/wl12xx.h create mode 100644 drivers/net/wireless/wl12xx/wl12xx_80211.h create mode 100644 drivers/of/of_mdio.c create mode 100644 firmware/bnx2x-e1-4.8.53.0.fw.ihex create mode 100644 firmware/bnx2x-e1h-4.8.53.0.fw.ihex create mode 100644 firmware/cis/3CCFEM556.cis.ihex create mode 100644 firmware/cis/3CXEM556.cis.ihex delete mode 100644 firmware/cxgb3/t3fw-7.1.0.bin.ihex create mode 100644 firmware/cxgb3/t3fw-7.4.0.bin.ihex create mode 100644 include/linux/can/dev.h create mode 100644 include/linux/can/netlink.h create mode 100644 include/linux/can/platform/sja1000.h create mode 100644 include/linux/mdio.h create mode 100644 include/linux/nl802154.h create mode 100644 include/linux/of_mdio.h create mode 100644 include/linux/spi/wl12xx.h create mode 100644 include/net/ieee802154/af_ieee802154.h create mode 100644 include/net/ieee802154/mac_def.h create mode 100644 include/net/ieee802154/netdevice.h create mode 100644 include/net/ieee802154/nl802154.h create mode 100644 include/net/regulatory.h delete mode 100644 include/net/wireless.h create mode 100644 include/trace/napi.h create mode 100644 net/ieee802154/Kconfig create mode 100644 net/ieee802154/Makefile create mode 100644 net/ieee802154/af802154.h create mode 100644 net/ieee802154/af_ieee802154.c create mode 100644 net/ieee802154/dgram.c create mode 100644 net/ieee802154/netlink.c create mode 100644 net/ieee802154/nl_policy.c create mode 100644 net/ieee802154/raw.c create mode 100644 net/mac80211/driver-ops.h create mode 100644 net/rfkill/core.c create mode 100644 net/rfkill/input.c delete mode 100644 net/rfkill/rfkill-input.c delete mode 100644 net/rfkill/rfkill.c rename net/rfkill/{rfkill-input.h => rfkill.h} (60%) create mode 100644 net/wimax/op-state-get.c create mode 100644 net/wireless/debugfs.c create mode 100644 net/wireless/debugfs.h create mode 100644 net/wireless/ibss.c Merging wireless/master $ git merge wireless/master Removing drivers/net/wireless/iwlwifi/iwl-rfkill.c Removing drivers/net/wireless/iwlwifi/iwl-rfkill.h Auto-merging drivers/platform/x86/eeepc-laptop.c Merge made by recursive. drivers/net/wireless/Kconfig | 2 +- drivers/net/wireless/ath/ar9170/ar9170.h | 34 +- drivers/net/wireless/ath/ar9170/hw.h | 3 + drivers/net/wireless/ath/ar9170/main.c | 676 ++++++++++++++++++--------- drivers/net/wireless/ath/ar9170/usb.c | 122 ++++- drivers/net/wireless/ath/ar9170/usb.h | 7 +- drivers/net/wireless/ath/ath5k/Makefile | 1 + drivers/net/wireless/ath/ath5k/ath5k.h | 4 + drivers/net/wireless/ath/ath5k/base.c | 7 + drivers/net/wireless/ath/ath5k/base.h | 12 + drivers/net/wireless/ath/ath5k/reset.c | 17 - drivers/net/wireless/ath/ath5k/rfkill.c | 121 +++++ drivers/net/wireless/ath/ath9k/xmit.c | 1 + drivers/net/wireless/b43/Kconfig | 7 - drivers/net/wireless/b43/Makefile | 2 +- drivers/net/wireless/b43/b43.h | 17 +- drivers/net/wireless/b43/dma.c | 2 +- drivers/net/wireless/b43/leds.c | 7 +- drivers/net/wireless/b43/main.c | 83 +++-- drivers/net/wireless/b43/main.h | 1 - drivers/net/wireless/b43/phy_common.h | 2 +- drivers/net/wireless/b43/pio.c | 2 +- drivers/net/wireless/b43/rfkill.c | 113 +---- drivers/net/wireless/b43/rfkill.h | 44 +-- drivers/net/wireless/b43/xmit.c | 5 +- drivers/net/wireless/b43legacy/Kconfig | 8 - drivers/net/wireless/b43legacy/Makefile | 2 +- drivers/net/wireless/b43legacy/b43legacy.h | 3 - drivers/net/wireless/b43legacy/leds.c | 7 +- drivers/net/wireless/b43legacy/main.c | 17 +- drivers/net/wireless/b43legacy/rfkill.c | 115 +---- drivers/net/wireless/b43legacy/rfkill.h | 50 +-- drivers/net/wireless/iwlwifi/Kconfig | 4 - drivers/net/wireless/iwlwifi/Makefile | 1 - drivers/net/wireless/iwlwifi/iwl-3945.h | 5 - drivers/net/wireless/iwlwifi/iwl-agn.c | 42 +-- drivers/net/wireless/iwlwifi/iwl-core.c | 138 ------ drivers/net/wireless/iwlwifi/iwl-core.h | 16 +- drivers/net/wireless/iwlwifi/iwl-debugfs.c | 2 - drivers/net/wireless/iwlwifi/iwl-dev.h | 5 - drivers/net/wireless/iwlwifi/iwl-rfkill.c | 131 ------ drivers/net/wireless/iwlwifi/iwl-rfkill.h | 48 -- drivers/net/wireless/iwlwifi/iwl3945-base.c | 41 +-- drivers/net/wireless/libertas/if_spi.c | 92 ++-- drivers/net/wireless/rndis_wlan.c | 292 ++++++------ drivers/platform/x86/acer-wmi.c | 3 - drivers/platform/x86/eeepc-laptop.c | 8 +- drivers/platform/x86/hp-wmi.c | 4 - drivers/platform/x86/sony-laptop.c | 4 +- drivers/platform/x86/thinkpad_acpi.c | 31 +- include/linux/rfkill.h | 35 +- include/linux/skbuff.h | 4 - include/linux/spi/libertas_spi.h | 3 - include/net/mac80211.h | 3 + net/core/skbuff.c | 1 - net/mac80211/agg-tx.c | 6 +- net/mac80211/cfg.c | 4 +- net/mac80211/ieee80211_i.h | 5 + net/mac80211/main.c | 61 +--- net/mac80211/mlme.c | 57 ++- net/mac80211/rc80211_minstrel.c | 2 +- net/mac80211/rx.c | 27 +- net/mac80211/tx.c | 19 +- net/mac80211/util.c | 46 ++ net/mac80211/wme.c | 2 +- net/rfkill/Kconfig | 2 +- net/rfkill/core.c | 93 ++--- net/wireless/core.c | 19 +- net/wireless/reg.c | 7 +- 69 files changed, 1275 insertions(+), 1482 deletions(-) create mode 100644 drivers/net/wireless/ath/ath5k/rfkill.c delete mode 100644 drivers/net/wireless/iwlwifi/iwl-rfkill.c delete mode 100644 drivers/net/wireless/iwlwifi/iwl-rfkill.h $ git revert -m 1 bc8c4c9333ff8346031db85f395ecc73925230c3 Finished one revert. [master 9c68a92] Revert "Merge branch 'oqo-wmi-EXPECT-REFRESH' into test" 4 files changed, 0 insertions(+), 961 deletions(-) delete mode 100644 drivers/platform/x86/oqo-wmi.c Merging mtd/master $ git merge mtd/master Auto-merging Documentation/kernel-parameters.txt Auto-merging MAINTAINERS Removing drivers/mtd/maps/pmcmsp-ramroot.c Auto-merging drivers/mtd/nand/davinci_nand.c Auto-merging drivers/mtd/onenand/omap2.c Removing include/mtd/jffs2-user.h Merge made by recursive. Documentation/ABI/testing/sysfs-class-mtd | 125 ++++ Documentation/kernel-parameters.txt | 10 + MAINTAINERS | 1 - arch/arm/mach-davinci/include/mach/nand.h | 8 +- arch/arm/plat-s3c/include/plat/nand.h | 31 +- drivers/mtd/chips/cfi_cmdset_0001.c | 26 +- drivers/mtd/chips/jedec_probe.c | 13 + drivers/mtd/devices/m25p80.c | 4 + drivers/mtd/maps/Kconfig | 13 +- drivers/mtd/maps/Makefile | 1 - drivers/mtd/maps/bfin-async-flash.c | 5 + drivers/mtd/maps/integrator-flash.c | 226 ++++++-- drivers/mtd/maps/physmap.c | 40 -- drivers/mtd/maps/physmap_of.c | 199 +++++-- drivers/mtd/maps/pmcmsp-ramroot.c | 104 ---- drivers/mtd/maps/pxa2xx-flash.c | 22 - drivers/mtd/maps/rbtx4939-flash.c | 23 - drivers/mtd/maps/sa1100-flash.c | 23 - drivers/mtd/maps/uclinux.c | 16 +- drivers/mtd/mtd_blkdevs.c | 2 +- drivers/mtd/mtdchar.c | 303 +++++++--- drivers/mtd/mtdcore.c | 47 ++- drivers/mtd/mtdpart.c | 20 +- drivers/mtd/nand/Kconfig | 24 +- drivers/mtd/nand/Makefile | 1 + drivers/mtd/nand/atmel_nand.c | 11 +- drivers/mtd/nand/bf5xx_nand.c | 17 +- drivers/mtd/nand/davinci_nand.c | 342 ++++++++++-- drivers/mtd/nand/mxc_nand.c | 66 ++- drivers/mtd/nand/nand_base.c | 3 +- drivers/mtd/nand/nand_ecc.c | 4 +- drivers/mtd/nand/omap2.c | 776 +++++++++++++++++++++++++ drivers/mtd/nand/orion_nand.c | 23 + drivers/mtd/nand/plat_nand.c | 19 +- drivers/mtd/nand/s3c2410.c | 268 ++++++--- drivers/mtd/nand/txx9ndfmc.c | 16 +- drivers/mtd/onenand/omap2.c | 4 +- drivers/mtd/onenand/onenand_base.c | 872 ++++++++++++++++++++++++++--- drivers/mtd/onenand/onenand_bbt.c | 14 +- drivers/mtd/onenand/onenand_sim.c | 81 +++- fs/compat_ioctl.c | 52 -- include/linux/mtd/nand.h | 16 + include/linux/mtd/onenand.h | 24 + include/linux/mtd/onenand_regs.h | 20 +- include/linux/mtd/partitions.h | 1 - include/mtd/Kbuild | 1 - include/mtd/jffs2-user.h | 34 -- include/mtd/mtd-abi.h | 15 + 48 files changed, 3141 insertions(+), 825 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-class-mtd delete mode 100644 drivers/mtd/maps/pmcmsp-ramroot.c create mode 100644 drivers/mtd/nand/omap2.c delete mode 100644 include/mtd/jffs2-user.h Merging crypto/master $ git merge crypto/master Auto-merging drivers/char/hw_random/Kconfig Merge made by recursive. arch/x86/crypto/Makefile | 2 + arch/x86/crypto/aesni-intel_glue.c | 267 ++++++++++++- arch/x86/crypto/fpu.c | 166 +++++++ crypto/Kconfig | 10 + crypto/algboss.c | 18 +- crypto/api.c | 14 +- crypto/cryptd.c | 14 +- crypto/internal.h | 3 - crypto/pcompress.c | 1 + crypto/tcrypt.c | 183 +++++---- crypto/testmgr.c | 470 ++++++++++++++++----- crypto/testmgr.h | 645 ++++++++++++++++++++++++++++- crypto/zlib.c | 24 +- drivers/char/hw_random/Kconfig | 2 +- drivers/char/hw_random/omap-rng.c | 2 +- drivers/char/hw_random/timeriomem-rng.c | 26 +- drivers/char/hw_random/via-rng.c | 15 +- drivers/crypto/Kconfig | 2 +- drivers/crypto/hifn_795x.c | 8 +- drivers/crypto/padlock-aes.c | 13 + drivers/crypto/talitos.c | 713 ++++++++++++++++++++++--------- 21 files changed, 2141 insertions(+), 457 deletions(-) create mode 100644 arch/x86/crypto/fpu.c Merging sound/for-next $ git merge sound/for-next Merge made by recursive. sound/core/jack.c | 2 +- sound/pci/hda/patch_sigmatel.c | 3 + sound/ppc/snd_ps3.c | 655 +++++++++++++++++------------------- sound/soc/s3c24xx/neo1973_wm8753.c | 16 +- 4 files changed, 318 insertions(+), 358 deletions(-) Merging cpufreq/next $ git merge cpufreq/next Auto-merging arch/x86/kernel/cpu/cpufreq/powernow-k8.c Merge made by recursive. Documentation/cpu-freq/cpu-drivers.txt | 2 +- Documentation/cpu-freq/governors.txt | 26 ++++++----- Documentation/cpu-freq/user-guide.txt | 1 - arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 29 +++++++++--- drivers/cpufreq/cpufreq_conservative.c | 61 ++++++++----------------- drivers/cpufreq/cpufreq_ondemand.c | 68 +++++++++++------------------ 6 files changed, 82 insertions(+), 105 deletions(-) Merging quilt/rr $ git merge quilt/rr Recorded preimage for 'arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c' Removing arch/um/sys-x86_64/um_module.c Auto-merging arch/x86/kernel/Makefile Auto-merging arch/x86/kernel/acpi/cstate.c Auto-merging arch/x86/kernel/asm-offsets_32.c Auto-merging arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c Auto-merging arch/x86/kernel/cpu/cpufreq/powernow-k8.c Auto-merging arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c Auto-merging arch/x86/kernel/cpu/mcheck/mce_64.c Removing arch/x86/kernel/module_32.c Auto-merging arch/x86/kernel/tlb_uv.c Auto-merging arch/x86/lguest/boot.c Auto-merging drivers/acpi/processor_core.c Auto-merging drivers/net/virtio_net.c Auto-merging fs/eventfd.c Auto-merging kernel/sched.c Auto-merging virt/kvm/kvm_main.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c'. [master 21e7974] Merge branch 'quilt/rr' $ git diff -M --stat --summary HEAD^.. Documentation/lguest/Makefile | 3 +- Documentation/lguest/lguest.c | 1008 ++++++++-------------- Documentation/lguest/lguest.txt | 1 - arch/alpha/mm/extable.c | 21 + arch/frv/include/asm/gdb-stub.h | 1 - arch/ia64/mm/extable.c | 26 + arch/mn10300/include/asm/gdb-stub.h | 1 - arch/sparc/include/asm/uaccess_32.h | 3 + arch/sparc/mm/extable.c | 29 + arch/um/include/asm/pgtable.h | 7 +- arch/um/sys-i386/Makefile | 2 +- arch/um/sys-x86_64/Makefile | 4 +- arch/um/sys-x86_64/um_module.c | 21 - arch/x86/include/asm/lguest.h | 7 +- arch/x86/include/asm/lguest_hcall.h | 15 +- arch/x86/include/asm/pgtable_32_types.h | 4 + arch/x86/kernel/Makefile | 2 +- arch/x86/kernel/acpi/cstate.c | 36 +- arch/x86/kernel/asm-offsets_32.c | 1 + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 156 ++-- arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 60 +- arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 93 ++- arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | 1 + arch/x86/kernel/{module_64.c => module.c} | 84 ++- arch/x86/kernel/module_32.c | 152 ---- arch/x86/lguest/Kconfig | 1 - arch/x86/lguest/boot.c | 158 +++- arch/x86/lguest/i386_head.S | 60 ++- drivers/acpi/processor_throttling.c | 82 +- drivers/block/virtio_blk.c | 10 +- drivers/char/hw_random/virtio-rng.c | 30 +- drivers/char/virtio_console.c | 26 +- drivers/firmware/dcdbas.c | 49 +- drivers/lguest/Kconfig | 2 +- drivers/lguest/core.c | 30 +- drivers/lguest/hypercalls.c | 14 + drivers/lguest/interrupts_and_traps.c | 57 +- drivers/lguest/lg.h | 24 +- drivers/lguest/lguest_device.c | 41 +- drivers/lguest/lguest_user.c | 108 ++- drivers/lguest/page_tables.c | 390 +++++++-- drivers/lguest/segments.c | 2 +- drivers/net/virtio_net.c | 45 +- drivers/s390/kvm/kvm_virtio.c | 43 +- drivers/video/aty/aty128fb.c | 2 +- drivers/video/cyber2000fb.c | 9 +- drivers/video/uvesafb.c | 10 +- drivers/virtio/virtio.c | 29 +- drivers/virtio/virtio_balloon.c | 27 +- drivers/virtio/virtio_pci.c | 307 ++++++- drivers/virtio/virtio_ring.c | 102 ++- include/linux/compiler.h | 5 + include/linux/cpu.h | 5 - include/linux/lguest.h | 4 + include/linux/lguest_launcher.h | 3 +- include/linux/module.h | 1 + include/linux/moduleparam.h | 40 +- include/linux/virtio.h | 15 +- include/linux/virtio_config.h | 49 +- include/linux/virtio_pci.h | 10 +- include/linux/virtio_ring.h | 8 +- init/main.c | 1 - kernel/cpu.c | 11 +- kernel/module.c | 1 + kernel/params.c | 46 +- kernel/sched.c | 1 + lib/extable.c | 21 +- net/9p/trans_virtio.c | 6 +- scripts/mod/file2alias.c | 2 +- 69 files changed, 2166 insertions(+), 1459 deletions(-) delete mode 100644 arch/um/sys-x86_64/um_module.c rename arch/x86/kernel/{module_64.c => module.c} (74%) delete mode 100644 arch/x86/kernel/module_32.c Merging cifs/master $ git merge cifs/master Auto-merging fs/cifs/cifsfs.c Merge made by recursive. fs/cifs/CHANGES | 11 +++ fs/cifs/README | 16 ++++- fs/cifs/cifs_spnego.c | 6 +- fs/cifs/cifsacl.c | 178 +++++++++++++++++++++++++----------------------- fs/cifs/cifsfs.c | 2 +- fs/cifs/cifsfs.h | 4 +- fs/cifs/cifsproto.h | 10 ++-- fs/cifs/cifssmb.c | 7 +- fs/cifs/connect.c | 34 ++++------ fs/cifs/file.c | 2 +- fs/cifs/inode.c | 19 ++--- fs/cifs/netmisc.c | 24 +++---- fs/cifs/readdir.c | 44 +++++-------- 13 files changed, 180 insertions(+), 177 deletions(-) Merging mmc/next $ git merge mmc/next Auto-merging MAINTAINERS Auto-merging drivers/mmc/host/Kconfig Auto-merging include/linux/pci_ids.h Merge made by recursive. MAINTAINERS | 9 + drivers/misc/Kconfig | 1 + drivers/misc/Makefile | 1 + drivers/misc/cb710/Kconfig | 21 ++ drivers/misc/cb710/Makefile | 8 + drivers/misc/cb710/core.c | 357 +++++++++++++++++++ drivers/misc/cb710/debug.c | 119 +++++++ drivers/misc/cb710/sgbuf2.c | 150 ++++++++ drivers/mmc/core/core.c | 107 ++++--- drivers/mmc/host/Kconfig | 13 + drivers/mmc/host/Makefile | 1 + drivers/mmc/host/cb710-mmc.c | 804 ++++++++++++++++++++++++++++++++++++++++++ drivers/mmc/host/cb710-mmc.h | 104 ++++++ drivers/mmc/host/mmc_spi.c | 12 + drivers/mmc/host/mxcmmc.c | 2 - drivers/mmc/host/omap.c | 3 +- drivers/mmc/host/pxamci.c | 46 +++- drivers/mmc/host/sdhci.c | 53 ++-- drivers/mmc/host/sdhci.h | 2 +- include/linux/cb710.h | 234 ++++++++++++ include/linux/pci_ids.h | 1 + 21 files changed, 1968 insertions(+), 80 deletions(-) create mode 100644 drivers/misc/cb710/Kconfig create mode 100644 drivers/misc/cb710/Makefile create mode 100644 drivers/misc/cb710/core.c create mode 100644 drivers/misc/cb710/debug.c create mode 100644 drivers/misc/cb710/sgbuf2.c create mode 100644 drivers/mmc/host/cb710-mmc.c create mode 100644 drivers/mmc/host/cb710-mmc.h create mode 100644 include/linux/cb710.h Merging input/next $ git merge input/next Auto-merging drivers/input/joydev.c Auto-merging drivers/input/touchscreen/tsc2007.c Merge made by recursive. Documentation/input/input.txt | 2 +- Documentation/input/rotary-encoder.txt | 9 +- arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h | 42 + drivers/char/keyboard.c | 2 - drivers/input/evdev.c | 9 +- drivers/input/gameport/fm801-gp.c | 1 + drivers/input/gameport/gameport.c | 25 +- drivers/input/joydev.c | 14 +- drivers/input/keyboard/Kconfig | 21 + drivers/input/keyboard/Makefile | 2 + drivers/input/keyboard/ep93xx_keypad.c | 470 +++++++++++ drivers/input/keyboard/gpio_keys.c | 3 +- drivers/input/keyboard/lm8323.c | 878 +++++++++++++++++++++ drivers/input/misc/Kconfig | 19 + drivers/input/misc/Makefile | 2 + drivers/input/misc/ati_remote2.c | 16 +- drivers/input/misc/dm355evm_keys.c | 329 ++++++++ drivers/input/misc/rotary_encoder.c | 61 +- drivers/input/misc/twl4030-pwrbutton.c | 145 ++++ drivers/input/misc/uinput.c | 94 ++- drivers/input/mouse/alps.c | 18 +- drivers/input/mouse/appletouch.c | 2 +- drivers/input/mouse/lifebook.c | 25 +- drivers/input/mouse/psmouse-base.c | 4 +- drivers/input/mousedev.c | 9 +- drivers/input/serio/i8042.c | 17 +- drivers/input/serio/serio.c | 58 +- drivers/input/tablet/gtco.c | 1 + drivers/input/tablet/wacom.h | 5 +- drivers/input/tablet/wacom_sys.c | 13 + drivers/input/tablet/wacom_wac.c | 171 +++- drivers/input/tablet/wacom_wac.h | 3 + drivers/input/touchscreen/Kconfig | 24 + drivers/input/touchscreen/Makefile | 2 + drivers/input/touchscreen/ads7846.c | 11 +- drivers/input/touchscreen/atmel-wm97xx.c | 446 +++++++++++ drivers/input/touchscreen/eeti_ts.c | 286 +++++++ drivers/input/touchscreen/tsc2007.c | 2 +- drivers/input/touchscreen/wm97xx-core.c | 2 +- drivers/mfd/ucb1400_core.c | 20 + include/linux/gameport.h | 3 +- include/linux/i2c/lm8323.h | 46 ++ include/linux/rotary_encoder.h | 2 + include/linux/serio.h | 9 +- include/linux/spi/ads7846.h | 1 + include/linux/ucb1400.h | 23 +- 46 files changed, 3132 insertions(+), 215 deletions(-) create mode 100644 arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h create mode 100644 drivers/input/keyboard/ep93xx_keypad.c create mode 100644 drivers/input/keyboard/lm8323.c create mode 100644 drivers/input/misc/dm355evm_keys.c create mode 100644 drivers/input/misc/twl4030-pwrbutton.c create mode 100644 drivers/input/touchscreen/atmel-wm97xx.c create mode 100644 drivers/input/touchscreen/eeti_ts.c create mode 100644 include/linux/i2c/lm8323.h Merging bkl-removal/bkl-removal $ git merge bkl-removal/bkl-removal Already up-to-date. Merging lsm/for-next $ git merge lsm/for-next Already up-to-date. Merging block/for-next $ git merge block/for-next Resolved 'drivers/ide/ide-atapi.c' using previous resolution. Resolved 'drivers/ide/ide-cd.c' using previous resolution. Resolved 'drivers/ide/ide-floppy.c' using previous resolution. Resolved 'drivers/ide/ide-tape.c' using previous resolution. Resolved 'drivers/message/fusion/mptsas.c' using previous resolution. Auto-merging block/blk-core.c Auto-merging block/bsg.c Auto-merging drivers/block/Kconfig Auto-merging drivers/block/virtio_blk.c Auto-merging drivers/ide/ide-atapi.c CONFLICT (content): Merge conflict in drivers/ide/ide-atapi.c Auto-merging drivers/ide/ide-cd.c CONFLICT (content): Merge conflict in drivers/ide/ide-cd.c Auto-merging drivers/ide/ide-disk.c Auto-merging drivers/ide/ide-dma.c Auto-merging drivers/ide/ide-floppy.c CONFLICT (content): Merge conflict in drivers/ide/ide-floppy.c Auto-merging drivers/ide/ide-io.c Auto-merging drivers/ide/ide-tape.c CONFLICT (content): Merge conflict in drivers/ide/ide-tape.c Auto-merging drivers/ide/ide-taskfile.c Auto-merging drivers/ide/pdc202xx_old.c Auto-merging drivers/ide/tx4939ide.c Auto-merging drivers/md/bitmap.c Auto-merging drivers/md/md.c Auto-merging drivers/md/raid5.c Auto-merging drivers/message/fusion/mptsas.c CONFLICT (content): Merge conflict in drivers/message/fusion/mptsas.c Auto-merging drivers/mtd/mtd_blkdevs.c Auto-merging drivers/s390/block/dasd.c Auto-merging drivers/s390/block/dasd_eckd.c Auto-merging drivers/s390/block/dasd_fba.c Auto-merging drivers/s390/block/dcssblk.c Auto-merging drivers/scsi/lpfc/lpfc_scsi.c Auto-merging drivers/scsi/mpt2sas/mpt2sas_transport.c Auto-merging drivers/scsi/osd/osd_initiator.c Auto-merging drivers/scsi/scsi_lib.c Auto-merging drivers/scsi/sd.c Auto-merging drivers/scsi/st.c Auto-merging fs/block_dev.c Auto-merging fs/buffer.c Auto-merging fs/exofs/osd.c Auto-merging fs/ext3/super.c Auto-merging fs/ext4/super.c Auto-merging fs/gfs2/ops_fstype.c Auto-merging fs/gfs2/rgrp.c Auto-merging fs/nilfs2/the_nilfs.c Auto-merging fs/ntfs/super.c Auto-merging fs/ocfs2/super.c Auto-merging fs/partitions/check.c Auto-merging fs/udf/super.c Auto-merging include/linux/blkdev.h Auto-merging include/linux/fs.h Auto-merging include/linux/genhd.h Auto-merging include/linux/ide.h Removing include/linux/mg_disk.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master ea35c1d] Merge commit 'block/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-block | 59 ++ .../ABI/testing/sysfs-bus-pci-devices-cciss | 33 + Documentation/block/biodoc.txt | 2 +- arch/arm/plat-omap/mailbox.c | 63 +- arch/powerpc/sysdev/axonram.c | 2 +- arch/um/drivers/ubd_kern.c | 36 +- block/Kconfig | 11 +- block/as-iosched.c | 24 +- block/blk-barrier.c | 27 +- block/blk-core.c | 748 ++++++++++------- block/blk-exec.c | 1 - block/blk-integrity.c | 2 +- block/blk-ioc.c | 12 +- block/blk-map.c | 25 +- block/blk-merge.c | 71 +- block/blk-settings.c | 269 +++++- block/blk-sysfs.c | 59 +- block/blk-tag.c | 17 +- block/blk-timeout.c | 22 +- block/blk.h | 51 +- block/bsg.c | 8 +- block/cfq-iosched.c | 38 +- block/compat_ioctl.c | 4 +- block/deadline-iosched.c | 2 +- block/elevator.c | 185 +---- block/genhd.c | 11 + block/ioctl.c | 12 +- block/scsi_ioctl.c | 13 +- drivers/ata/libata-scsi.c | 2 +- drivers/block/DAC960.c | 10 +- drivers/block/Kconfig | 2 +- drivers/block/amiflop.c | 54 +- drivers/block/ataflop.c | 66 +- drivers/block/brd.c | 7 +- drivers/block/cciss.c | 927 ++++++++++++-------- drivers/block/cciss.h | 34 +- drivers/block/cciss_cmd.h | 2 + drivers/block/cciss_scsi.c | 109 ++- drivers/block/cpqarray.c | 20 +- drivers/block/floppy.c | 85 ++- drivers/block/hd.c | 106 ++-- drivers/block/loop.c | 37 +- drivers/block/mg_disk.c | 537 +++++++----- drivers/block/nbd.c | 23 +- drivers/block/paride/pcd.c | 29 +- drivers/block/paride/pd.c | 22 +- drivers/block/paride/pf.c | 47 +- drivers/block/pktcdvd.c | 8 +- drivers/block/ps3disk.c | 24 +- drivers/block/sunvdc.c | 14 +- drivers/block/swim.c | 48 +- drivers/block/swim3.c | 107 ++-- drivers/block/sx8.c | 17 +- drivers/block/ub.c | 54 +- drivers/block/viodasd.c | 12 +- drivers/block/virtio_blk.c | 110 ++- drivers/block/xd.c | 41 +- drivers/block/xen-blkfront.c | 34 +- drivers/block/xsysace.c | 46 +- drivers/block/z2ram.c | 19 +- drivers/cdrom/cdrom.c | 4 +- drivers/cdrom/gdrom.c | 36 +- drivers/cdrom/viocd.c | 33 +- drivers/char/raw.c | 2 +- drivers/ide/ide-atapi.c | 21 +- drivers/ide/ide-cd.c | 63 +- drivers/ide/ide-disk.c | 10 +- drivers/ide/ide-dma.c | 2 +- drivers/ide/ide-floppy.c | 10 +- drivers/ide/ide-io.c | 43 +- drivers/ide/ide-lib.c | 2 +- drivers/ide/ide-tape.c | 11 +- drivers/ide/ide-taskfile.c | 2 +- drivers/ide/pdc202xx_old.c | 2 +- drivers/ide/tc86c001.c | 2 +- drivers/ide/tx4939ide.c | 2 +- drivers/md/bitmap.c | 4 +- drivers/md/dm-exception-store.c | 2 +- drivers/md/dm-log.c | 3 +- drivers/md/dm-snap-persistent.c | 2 +- drivers/md/dm-table.c | 38 +- drivers/md/linear.c | 2 +- drivers/md/md.c | 2 +- drivers/md/multipath.c | 4 +- drivers/md/raid0.c | 2 +- drivers/md/raid1.c | 4 +- drivers/md/raid10.c | 8 +- drivers/md/raid5.c | 4 +- drivers/memstick/core/mspro_block.c | 19 +- drivers/message/fusion/mptsas.c | 22 +- drivers/message/i2o/i2o_block.c | 43 +- drivers/mmc/card/block.c | 12 +- drivers/mmc/card/queue.c | 11 +- drivers/mtd/mtd_blkdevs.c | 43 +- drivers/s390/block/dasd.c | 37 +- drivers/s390/block/dasd_diag.c | 5 +- drivers/s390/block/dasd_eckd.c | 6 +- drivers/s390/block/dasd_fba.c | 7 +- drivers/s390/block/dcssblk.c | 2 +- drivers/s390/block/xpram.c | 2 +- drivers/s390/char/tape_34xx.c | 2 +- drivers/s390/char/tape_3590.c | 2 +- drivers/s390/char/tape_block.c | 26 +- drivers/sbus/char/jsflash.c | 26 +- drivers/scsi/eata.c | 24 +- drivers/scsi/libsas/sas_expander.c | 16 +- drivers/scsi/libsas/sas_host_smp.c | 49 +- drivers/scsi/lpfc/lpfc_scsi.c | 22 +- drivers/scsi/mpt2sas/mpt2sas_transport.c | 23 +- drivers/scsi/osd/osd_initiator.c | 72 +- drivers/scsi/scsi_lib.c | 87 +-- drivers/scsi/scsi_tgt_lib.c | 2 +- drivers/scsi/scsi_transport_sas.c | 4 +- drivers/scsi/sd.c | 26 +- drivers/scsi/sd_dif.c | 2 +- drivers/scsi/sg.c | 17 +- drivers/scsi/sr.c | 17 +- drivers/scsi/st.c | 6 +- drivers/scsi/u14-34f.c | 22 +- drivers/usb/storage/scsiglue.c | 4 +- fs/bio.c | 26 +- fs/block_dev.c | 6 +- fs/buffer.c | 6 +- fs/coda/file.c | 9 +- fs/direct-io.c | 2 +- fs/exofs/osd.c | 4 +- fs/ext3/super.c | 4 +- fs/ext4/super.c | 2 +- fs/gfs2/ops_fstype.c | 4 +- fs/gfs2/rgrp.c | 2 +- fs/nilfs2/the_nilfs.c | 2 +- fs/ntfs/super.c | 6 +- fs/ocfs2/cluster/heartbeat.c | 2 +- fs/ocfs2/super.c | 2 +- fs/partitions/check.c | 10 + fs/partitions/ibm.c | 2 +- fs/partitions/msdos.c | 4 +- fs/pipe.c | 14 + fs/read_write.c | 7 +- fs/splice.c | 338 +++++++- fs/udf/super.c | 2 +- fs/xfs/linux-2.6/xfs_buf.c | 2 +- include/linux/bio.h | 10 +- include/linux/blkdev.h | 240 ++++-- include/linux/device-mapper.h | 2 +- include/linux/elevator.h | 4 +- include/linux/fs.h | 2 + include/linux/genhd.h | 1 + include/linux/iocontext.h | 6 +- include/linux/loop.h | 3 +- include/linux/mg_disk.h | 206 ----- include/linux/pipe_fs_i.h | 1 + include/linux/splice.h | 3 +- include/linux/virtio_blk.h | 12 + include/scsi/scsi_cmnd.h | 2 +- kernel/trace/blktrace.c | 16 +- mm/bounce.c | 4 +- 157 files changed, 3670 insertions(+), 2736 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-pci-devices-cciss delete mode 100644 include/linux/mg_disk.h Merging quilt/device-mapper $ git merge quilt/device-mapper Auto-merging drivers/md/dm-log.c Auto-merging drivers/md/dm-snap-persistent.c Auto-merging drivers/md/dm-table.c Auto-merging include/linux/device-mapper.h Merge made by recursive. Documentation/device-mapper/dm-queue-length.txt | 39 +++ Documentation/device-mapper/dm-service-time.txt | 91 ++++++ drivers/md/Kconfig | 19 ++ drivers/md/Makefile | 2 + drivers/md/dm-crypt.c | 8 + drivers/md/dm-delay.c | 6 +- drivers/md/dm-exception-store.h | 2 +- drivers/md/dm-io.c | 14 +- drivers/md/dm-ioctl.c | 14 +- drivers/md/dm-linear.c | 4 +- drivers/md/dm-log.c | 2 +- drivers/md/dm-mpath.c | 120 +++++---- drivers/md/dm-path-selector.h | 8 +- drivers/md/dm-queue-length.c | 263 ++++++++++++++++++ drivers/md/dm-region-hash.c | 2 +- drivers/md/dm-round-robin.c | 2 +- drivers/md/dm-service-time.c | 339 +++++++++++++++++++++++ drivers/md/dm-snap-persistent.c | 2 +- drivers/md/dm-snap.c | 11 + drivers/md/dm-stripe.c | 15 +- drivers/md/dm-sysfs.c | 9 + drivers/md/dm-table.c | 134 ++++++++-- drivers/md/dm.c | 232 +++++++++------- drivers/md/dm.h | 3 +- include/linux/device-mapper.h | 11 + include/linux/dm-ioctl.h | 14 +- 26 files changed, 1183 insertions(+), 183 deletions(-) create mode 100644 Documentation/device-mapper/dm-queue-length.txt create mode 100644 Documentation/device-mapper/dm-service-time.txt create mode 100644 drivers/md/dm-queue-length.c create mode 100644 drivers/md/dm-service-time.c Merging embedded/master $ git merge embedded/master Already up-to-date. Merging firmware/master $ git merge firmware/master Merge made by recursive. drivers/base/firmware_class.c | 129 ++++++++++++++++++++++++++++++++-------- 1 files changed, 103 insertions(+), 26 deletions(-) Merging pcmcia/master $ git merge pcmcia/master Already up-to-date. Merging battery/master $ git merge battery/master Merge made by recursive. drivers/power/Kconfig | 8 + drivers/power/Makefile | 3 +- drivers/power/da9030_battery.c | 19 ++- drivers/power/ds2760_battery.c | 42 ++++- drivers/power/max17040_battery.c | 309 ++++++++++++++++++++++++++++++++++++++ drivers/w1/slaves/w1_ds2760.c | 30 ++++ drivers/w1/slaves/w1_ds2760.h | 7 + include/linux/max17040_battery.h | 19 +++ 8 files changed, 420 insertions(+), 17 deletions(-) create mode 100644 drivers/power/max17040_battery.c create mode 100644 include/linux/max17040_battery.h Merging leds/for-mm $ git merge leds/for-mm Already up-to-date. Merging backlight/for-mm $ git merge backlight/for-mm Already up-to-date. Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Auto-merging arch/x86/kernel/kgdb.c Merge made by recursive. arch/x86/kernel/kgdb.c | 9 +++++++-- include/linux/kgdb.h | 48 ++++++++++++++++++++++++++++++++++++++++++------ kernel/kgdb.c | 6 +++--- 3 files changed, 52 insertions(+), 11 deletions(-) Merging slab/for-next $ git merge slab/for-next Merge made by recursive. mm/slub.c | 70 ++++++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 51 insertions(+), 19 deletions(-) Merging uclinux/for-next $ git merge uclinux/for-next Already up-to-date. Merging md/for-next $ git merge md/for-next Resolved 'drivers/md/md.c' using previous resolution. Resolved 'drivers/md/raid5.c' using previous resolution. Auto-merging drivers/md/md.c CONFLICT (content): Merge conflict in drivers/md/md.c Auto-merging drivers/md/raid5.c CONFLICT (content): Merge conflict in drivers/md/raid5.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master e7c3a1c] Merge commit 'md/for-next' $ git diff -M --stat --summary HEAD^.. drivers/md/faulty.c | 15 +- drivers/md/linear.c | 162 ++++++------------- drivers/md/linear.h | 10 +- drivers/md/md.c | 156 +++++++----------- drivers/md/md.h | 13 +-- drivers/md/multipath.c | 20 ++-- drivers/md/multipath.h | 6 - drivers/md/raid0.c | 395 ++++++++++++++++++++++++--------------------- drivers/md/raid0.h | 10 +- drivers/md/raid1.c | 46 +++--- drivers/md/raid1.h | 6 - drivers/md/raid10.c | 62 ++++---- drivers/md/raid10.h | 6 - drivers/md/raid5.c | 213 +++++++++++++------------ drivers/md/raid5.h | 8 +- include/linux/raid/md_p.h | 2 +- 16 files changed, 507 insertions(+), 623 deletions(-) Merging mfd/for-next $ git merge mfd/for-next Merge made by recursive. drivers/mfd/Kconfig | 23 +- drivers/mfd/Makefile | 5 +- drivers/mfd/ab3100-core.c | 991 ++++++++++++++++++++++++++++++++++++++++++ drivers/mfd/ezx-pcap.c | 505 +++++++++++++++++++++ drivers/mfd/htc-pasic3.c | 4 +- drivers/mfd/pcf50633-core.c | 2 +- drivers/mfd/pcf50633-gpio.c | 3 + drivers/mfd/t7l66xb.c | 5 + drivers/mfd/tc6387xb.c | 5 + drivers/mfd/tc6393xb.c | 5 + drivers/mfd/twl4030-core.c | 2 +- drivers/mfd/twl4030-irq.c | 2 +- drivers/mfd/wm8350-regmap.c | 4 +- drivers/mfd/wm8400-core.c | 2 +- drivers/mmc/host/tmio_mmc.c | 24 +- include/linux/mfd/ab3100.h | 103 +++++ include/linux/mfd/ezx-pcap.h | 256 +++++++++++ include/linux/mfd/tmio.h | 7 + 18 files changed, 1925 insertions(+), 23 deletions(-) create mode 100644 drivers/mfd/ab3100-core.c create mode 100644 drivers/mfd/ezx-pcap.c create mode 100644 include/linux/mfd/ab3100.h create mode 100644 include/linux/mfd/ezx-pcap.h Merging hdlc/hdlc-next $ git merge hdlc/hdlc-next Already up-to-date. Merging drm/drm-next $ git merge drm/drm-next Already up-to-date. Merging voltage/for-next $ git merge voltage/for-next Merge made by recursive. drivers/regulator/Kconfig | 26 ++ drivers/regulator/Makefile | 3 + drivers/regulator/da903x.c | 2 +- drivers/regulator/fixed.c | 18 +- drivers/regulator/lp3971.c | 562 ++++++++++++++++++++++++++ drivers/regulator/max1586.c | 282 +++++++++++++ drivers/regulator/pcf50633-regulator.c | 2 +- drivers/regulator/userspace-consumer.c | 200 +++++++++ drivers/regulator/virtual.c | 1 + drivers/regulator/wm8350-regulator.c | 1 + drivers/regulator/wm8400-regulator.c | 8 +- include/linux/regulator/lp3971.h | 51 +++ include/linux/regulator/max1586.h | 63 +++ include/linux/regulator/userspace-consumer.h | 25 ++ 14 files changed, 1236 insertions(+), 8 deletions(-) create mode 100644 drivers/regulator/lp3971.c create mode 100644 drivers/regulator/max1586.c create mode 100644 drivers/regulator/userspace-consumer.c create mode 100644 include/linux/regulator/lp3971.h create mode 100644 include/linux/regulator/max1586.h create mode 100644 include/linux/regulator/userspace-consumer.h Merging security-testing/next $ git merge security-testing/next Auto-merging Documentation/kernel-parameters.txt Auto-merging fs/compat.c Auto-merging fs/namei.c Auto-merging fs/nfsd/vfs.c Auto-merging include/linux/magic.h Auto-merging include/linux/mm.h Auto-merging include/linux/sched.h Auto-merging ipc/shm.c Auto-merging kernel/module.c Auto-merging kernel/sysctl.c Auto-merging security/selinux/hooks.c Merge made by recursive. Documentation/Smack.txt | 20 ++- Documentation/kernel-parameters.txt | 6 + Documentation/sysctl/kernel.txt | 11 + fs/compat.c | 6 +- fs/exec.c | 10 +- fs/hugetlbfs/inode.c | 2 + fs/namei.c | 6 +- fs/nfsd/vfs.c | 14 ++ fs/proc/base.c | 6 + include/linux/ima.h | 11 +- include/linux/init_task.h | 4 +- include/linux/lsm_audit.h | 111 ++++++++++ include/linux/magic.h | 1 + include/linux/mm.h | 2 - include/linux/sched.h | 5 +- include/linux/security.h | 2 + ipc/shm.c | 3 +- kernel/cred.c | 4 +- kernel/exit.c | 1 + kernel/module.c | 7 +- kernel/ptrace.c | 9 +- kernel/signal.c | 11 +- kernel/sysctl.c | 14 +- mm/Kconfig | 19 ++ mm/mmap.c | 3 + mm/nommu.c | 3 + mm/shmem.c | 2 +- security/Kconfig | 22 +-- security/Makefile | 3 + security/commoncap.c | 32 +++ security/inode.c | 2 +- security/integrity/ima/ima_audit.c | 32 +--- security/integrity/ima/ima_crypto.c | 4 +- security/integrity/ima/ima_fs.c | 8 +- security/integrity/ima/ima_iint.c | 2 +- security/integrity/ima/ima_init.c | 4 +- security/integrity/ima/ima_main.c | 86 ++++---- security/integrity/ima/ima_policy.c | 48 +++-- security/lsm_audit.c | 386 +++++++++++++++++++++++++++++++++ security/root_plug.c | 12 - security/security.c | 3 - security/selinux/avc.c | 2 +- security/selinux/hooks.c | 24 +-- security/selinux/include/security.h | 7 +- security/selinux/nlmsgtab.c | 2 + security/selinux/selinuxfs.c | 8 +- security/selinux/ss/services.c | 30 +--- security/smack/smack.h | 108 +++++++++- security/smack/smack_access.c | 141 +++++++++++-- security/smack/smack_lsm.c | 405 +++++++++++++++++++++++++--------- security/smack/smackfs.c | 68 ++++++- security/tomoyo/common.c | 119 +++++++---- security/tomoyo/common.h | 134 +++++++++++- security/tomoyo/domain.c | 240 +++++++++++++++++---- security/tomoyo/file.c | 156 +++++++++++--- security/tomoyo/realpath.c | 23 ++- security/tomoyo/tomoyo.c | 4 + security/tomoyo/tomoyo.h | 13 +- 58 files changed, 1945 insertions(+), 476 deletions(-) create mode 100644 include/linux/lsm_audit.h create mode 100644 security/lsm_audit.c Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging quilt/ttydev $ git merge quilt/ttydev Auto-merging MAINTAINERS Auto-merging drivers/char/Kconfig Auto-merging drivers/char/mxser.c Auto-merging drivers/usb/serial/ftdi_sio.c Auto-merging drivers/usb/serial/option.c Auto-merging include/linux/pci_ids.h Merge made by recursive. MAINTAINERS | 6 +- arch/x86/include/asm/termios.h | 1 + drivers/bluetooth/hci_ldisc.c | 5 +- drivers/char/Kconfig | 13 + drivers/char/Makefile | 1 + drivers/char/bfin_jtag_comm.c | 365 +++++++ drivers/char/cyclades.c | 290 +++--- drivers/char/epca.c | 17 +- drivers/char/ip2/i2lib.c | 4 +- drivers/char/ip2/ip2main.c | 4 +- drivers/char/isicom.c | 19 +- drivers/char/istallion.c | 8 +- drivers/char/mxser.c | 12 +- drivers/char/n_hdlc.c | 4 +- drivers/char/n_tty.c | 29 +- drivers/char/pcmcia/synclink_cs.c | 11 +- drivers/char/pty.c | 11 +- drivers/char/rocket.c | 19 +- drivers/char/selection.c | 2 +- drivers/char/stallion.c | 6 +- drivers/char/synclink.c | 9 +- drivers/char/synclink_gt.c | 86 ++- drivers/char/synclinkmp.c | 9 +- drivers/char/tty_audit.c | 10 +- drivers/char/tty_io.c | 122 +-- drivers/char/tty_ioctl.c | 88 ++- drivers/char/tty_ldisc.c | 549 +++++++---- drivers/char/tty_port.c | 38 +- drivers/net/slip.c | 96 +-- drivers/parport/parport_pc.c | 1802 +++++++++++++++++---------------- drivers/serial/8250.c | 7 + drivers/serial/8250_pci.c | 3 + drivers/serial/Kconfig | 7 + drivers/serial/Makefile | 1 + drivers/serial/bfin_5xx.c | 77 ++- drivers/serial/bfin_sport_uart.c | 58 +- drivers/serial/icom.c | 20 +- drivers/serial/jsm/jsm.h | 1 + drivers/serial/jsm/jsm_tty.c | 14 +- drivers/serial/timbuart.c | 523 ++++++++++ drivers/serial/timbuart.h | 58 ++ drivers/usb/class/cdc-acm.c | 442 +++++---- drivers/usb/class/cdc-acm.h | 5 +- drivers/usb/serial/belkin_sa.c | 6 +- drivers/usb/serial/ch341.c | 46 +- drivers/usb/serial/console.c | 6 +- drivers/usb/serial/cp210x.c | 253 +++--- drivers/usb/serial/cyberjack.c | 6 +- drivers/usb/serial/cypress_m8.c | 81 +-- drivers/usb/serial/digi_acceleport.c | 75 +- drivers/usb/serial/empeg.c | 6 +- drivers/usb/serial/ftdi_sio.c | 149 ++-- drivers/usb/serial/garmin_gps.c | 3 +- drivers/usb/serial/generic.c | 3 +- drivers/usb/serial/io_edgeport.c | 10 +- drivers/usb/serial/io_ti.c | 3 +- drivers/usb/serial/ipaq.c | 6 +- drivers/usb/serial/ipw.c | 18 +- drivers/usb/serial/ir-usb.c | 6 +- drivers/usb/serial/iuu_phoenix.c | 102 ++- drivers/usb/serial/keyspan.c | 13 +- drivers/usb/serial/keyspan.h | 8 +- drivers/usb/serial/keyspan_pda.c | 48 +- drivers/usb/serial/kl5kusb105.c | 6 +- drivers/usb/serial/kobil_sct.c | 9 +- drivers/usb/serial/mct_u232.c | 37 +- drivers/usb/serial/mos7720.c | 3 +- drivers/usb/serial/mos7840.c | 48 +- drivers/usb/serial/navman.c | 3 +- drivers/usb/serial/omninet.c | 6 +- drivers/usb/serial/opticon.c | 3 +- drivers/usb/serial/option.c | 68 +- drivers/usb/serial/oti6858.c | 57 +- drivers/usb/serial/pl2303.c | 79 +- drivers/usb/serial/sierra.c | 351 +++++--- drivers/usb/serial/spcp8x5.c | 85 +- drivers/usb/serial/symbolserial.c | 3 +- drivers/usb/serial/ti_usb_3410_5052.c | 6 +- drivers/usb/serial/usb-serial.c | 144 ++- drivers/usb/serial/visor.c | 6 +- drivers/usb/serial/whiteheat.c | 33 +- fs/devpts/inode.c | 4 +- include/linux/cyclades.h | 37 +- include/linux/pci_ids.h | 2 + include/linux/serial.h | 116 ++- include/linux/serial_core.h | 6 +- include/linux/tty.h | 18 +- include/linux/tty_driver.h | 6 +- include/linux/usb/serial.h | 10 +- 89 files changed, 4129 insertions(+), 2717 deletions(-) create mode 100644 drivers/char/bfin_jtag_comm.c create mode 100644 drivers/serial/timbuart.c create mode 100644 drivers/serial/timbuart.h Merging agp/agp-next $ git merge agp/agp-next Already up-to-date. Merging uwb/for-upstream $ git merge uwb/for-upstream Merge made by recursive. drivers/uwb/hwa-rc.c | 2 +- drivers/uwb/wlp/txrx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Merging watchdog/master $ git merge watchdog/master Resolved 'drivers/watchdog/Makefile' using previous resolution. Auto-merging drivers/mfd/twl4030-core.c Auto-merging drivers/watchdog/Kconfig Auto-merging drivers/watchdog/Makefile CONFLICT (content): Merge conflict in drivers/watchdog/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 12897a2] Merge commit 'watchdog/master' $ git diff -M --stat --summary HEAD^.. drivers/mfd/twl4030-core.c | 12 + drivers/watchdog/Kconfig | 35 ++ drivers/watchdog/Makefile | 4 + drivers/watchdog/alim7101_wdt.c | 15 +- drivers/watchdog/ar7_wdt.c | 3 +- drivers/watchdog/at91rm9200_wdt.c | 3 +- drivers/watchdog/at91sam9_wdt.c | 3 +- drivers/watchdog/bfin_wdt.c | 14 +- drivers/watchdog/coh901327_wdt.c | 537 ++++++++++++++++++++++++++++++++ drivers/watchdog/cpwd.c | 6 +- drivers/watchdog/davinci_wdt.c | 6 +- drivers/watchdog/iTCO_vendor_support.c | 88 +++++- drivers/watchdog/iTCO_wdt.c | 36 ++- drivers/watchdog/indydog.c | 4 +- drivers/watchdog/it8712f_wdt.c | 3 +- drivers/watchdog/ks8695_wdt.c | 4 +- drivers/watchdog/machzwd.c | 9 +- drivers/watchdog/mpcore_wdt.c | 7 +- drivers/watchdog/mtx-1_wdt.c | 6 +- drivers/watchdog/pnx4008_wdt.c | 6 +- drivers/watchdog/pnx833x_wdt.c | 282 +++++++++++++++++ drivers/watchdog/rdc321x_wdt.c | 4 +- drivers/watchdog/rm9k_wdt.c | 6 +- drivers/watchdog/s3c2410_wdt.c | 32 +- drivers/watchdog/sb_wdog.c | 9 +- drivers/watchdog/sbc60xxwdt.c | 5 +- drivers/watchdog/sbc8360.c | 4 +- drivers/watchdog/sbc_epx_c3.c | 12 +- drivers/watchdog/scx200_wdt.c | 7 +- drivers/watchdog/shwdt.c | 4 +- drivers/watchdog/softdog.c | 7 +- drivers/watchdog/stmp3xxx_wdt.c | 291 +++++++++++++++++ drivers/watchdog/twl4030_wdt.c | 272 ++++++++++++++++ drivers/watchdog/w83697hf_wdt.c | 3 +- drivers/watchdog/wdrtas.c | 7 +- 35 files changed, 1640 insertions(+), 106 deletions(-) create mode 100644 drivers/watchdog/coh901327_wdt.c create mode 100644 drivers/watchdog/pnx833x_wdt.c create mode 100644 drivers/watchdog/stmp3xxx_wdt.c create mode 100644 drivers/watchdog/twl4030_wdt.c Merging bdev/master $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master $ git merge dwmw2-iommu/master Resolved 'drivers/pci/intel-iommu.c' using previous resolution. Resolved 'drivers/pci/intr_remapping.c' using previous resolution. Auto-merging Documentation/kernel-parameters.txt Auto-merging arch/ia64/kernel/pci-dma.c Auto-merging arch/x86/kernel/pci-swiotlb.c Auto-merging drivers/pci/intel-iommu.c CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c Auto-merging drivers/pci/intr_remapping.c CONFLICT (content): Merge conflict in drivers/pci/intr_remapping.c Auto-merging include/linux/dmar.h Auto-merging include/linux/pci.h Auto-merging include/linux/pci_regs.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 9529fa2] Merge commit 'dwmw2-iommu/master' $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 1 + arch/ia64/include/asm/iommu.h | 5 + arch/ia64/kernel/pci-dma.c | 2 + arch/ia64/kernel/pci-swiotlb.c | 2 +- arch/x86/include/asm/iommu.h | 1 + arch/x86/kernel/pci-dma.c | 6 + arch/x86/kernel/pci-swiotlb.c | 3 +- drivers/pci/dmar.c | 235 +++++++++++++++---- drivers/pci/intel-iommu.c | 449 +++++++++++++++++++++++------------ drivers/pci/intr_remapping.c | 8 +- drivers/pci/iov.c | 155 ++++++++++++- drivers/pci/pci.h | 39 +++ include/linux/dma_remapping.h | 9 + include/linux/dmar.h | 9 + include/linux/intel-iommu.h | 35 ++- include/linux/pci.h | 2 + include/linux/pci_regs.h | 10 + 17 files changed, 754 insertions(+), 217 deletions(-) Merging cputime/cputime $ git merge cputime/cputime Merge made by recursive. fs/proc/uptime.c | 34 ++++++++++++++++++++++++---------- 1 files changed, 24 insertions(+), 10 deletions(-) Merging osd/linux-next $ git merge osd/linux-next Auto-merging drivers/scsi/osd/osd_initiator.c Auto-merging fs/exofs/osd.c Merge made by recursive. Merging jc_docs/docs-next $ git merge jc_docs/docs-next Merge made by recursive. Documentation/SubmittingPatches | 76 ++++++++++--- Documentation/development-process/5.Posting | 31 +++++- Documentation/filesystems/debugfs.txt | 158 +++++++++++++++++++++++++++ 3 files changed, 246 insertions(+), 19 deletions(-) create mode 100644 Documentation/filesystems/debugfs.txt Merging nommu/master $ git merge nommu/master Already up-to-date. Merging trivial/for-next $ git merge trivial/for-next Auto-merging .gitignore Auto-merging Documentation/DMA-API.txt Auto-merging Documentation/SubmittingPatches Auto-merging Documentation/filesystems/vfat.txt Auto-merging Documentation/kernel-parameters.txt Auto-merging Documentation/networking/can.txt Auto-merging Documentation/sound/alsa/ALSA-Configuration.txt Auto-merging Documentation/sysctl/vm.txt Auto-merging Documentation/trace/ftrace.txt Auto-merging MAINTAINERS Auto-merging arch/s390/kernel/head.S Auto-merging arch/x86/include/asm/page_64_types.h Auto-merging drivers/ata/libata-eh.c Auto-merging drivers/base/bus.c Auto-merging drivers/block/Kconfig Auto-merging drivers/char/Kconfig Auto-merging drivers/crypto/Kconfig Auto-merging drivers/ide/ide-atapi.c Auto-merging drivers/input/misc/Kconfig Auto-merging drivers/isdn/mISDN/dsp_core.c Auto-merging drivers/mtd/nand/Kconfig Auto-merging drivers/net/Kconfig Auto-merging drivers/net/b44.h Auto-merging drivers/net/e100.c Auto-merging drivers/net/e1000e/e1000.h Auto-merging drivers/net/igbvf/igbvf.h Auto-merging drivers/net/mlx4/en_netdev.c Auto-merging drivers/net/qlge/qlge_main.c Auto-merging drivers/net/qlge/qlge_mpi.c Auto-merging drivers/net/usb/usbnet.c Auto-merging drivers/net/wireless/Kconfig Auto-merging drivers/net/wireless/iwlwifi/Kconfig Auto-merging drivers/net/wireless/rndis_wlan.c Auto-merging drivers/net/wireless/rt2x00/Kconfig Auto-merging drivers/net/wireless/rt2x00/rt2x00lib.h Auto-merging drivers/net/wireless/wavelan_cs.c Auto-merging drivers/s390/scsi/zfcp_fc.c Auto-merging drivers/scsi/lpfc/lpfc_scsi.c Auto-merging drivers/serial/Kconfig Auto-merging drivers/usb/serial/io_ti.c Auto-merging drivers/watchdog/Kconfig Auto-merging fs/bio.c Auto-merging fs/btrfs/extent-tree.c Auto-merging fs/compat.c Auto-merging fs/compat_ioctl.c Auto-merging fs/ext2/ext2.h Auto-merging fs/inode.c Auto-merging kernel/rtmutex.c Auto-merging net/ipv6/addrconf.c Merge made by recursive. .gitignore | 2 +- Documentation/CodingStyle | 4 ++-- Documentation/DMA-API.txt | 4 ++-- Documentation/RCU/rculist_nulls.txt | 2 +- Documentation/SM501.txt | 2 +- Documentation/block/deadline-iosched.txt | 2 +- Documentation/braille-console.txt | 2 +- Documentation/dell_rbu.txt | 4 ++-- Documentation/driver-model/devres.txt | 2 +- Documentation/edac.txt | 8 ++++---- Documentation/fb/sh7760fb.txt | 2 +- .../filesystems/autofs4-mount-control.txt | 2 +- Documentation/filesystems/caching/netfs-api.txt | 2 +- Documentation/filesystems/ext4.txt | 6 +++--- Documentation/filesystems/fiemap.txt | 2 +- Documentation/filesystems/nfs-rdma.txt | 2 +- Documentation/filesystems/proc.txt | 4 ++-- Documentation/filesystems/sysfs-pci.txt | 2 +- Documentation/filesystems/vfat.txt | 8 ++++---- Documentation/gpio.txt | 2 +- Documentation/kdump/kdump.txt | 4 ++-- Documentation/kernel-parameters.txt | 4 ++-- Documentation/kobject.txt | 2 +- Documentation/laptops/acer-wmi.txt | 2 +- Documentation/laptops/sony-laptop.txt | 2 +- Documentation/laptops/thinkpad-acpi.txt | 2 +- Documentation/local_ops.txt | 2 +- Documentation/memory-hotplug.txt | 8 ++++---- Documentation/mn10300/ABI.txt | 2 +- Documentation/mtd/nand_ecc.txt | 12 ++++++------ Documentation/networking/bonding.txt | 6 +++--- Documentation/networking/can.txt | 2 +- Documentation/networking/dm9000.txt | 2 +- Documentation/networking/l2tp.txt | 2 +- Documentation/networking/netdevices.txt | 2 +- Documentation/networking/phonet.txt | 2 +- Documentation/networking/regulatory.txt | 2 +- Documentation/power/regulator/consumer.txt | 2 +- Documentation/power/regulator/overview.txt | 2 +- Documentation/power/s2ram.txt | 2 +- Documentation/power/userland-swsusp.txt | 2 +- Documentation/powerpc/booting-without-of.txt | 4 ++-- Documentation/powerpc/dts-bindings/fsl/board.txt | 2 +- .../powerpc/dts-bindings/fsl/cpm_qe/cpm.txt | 2 +- .../powerpc/dts-bindings/fsl/cpm_qe/gpio.txt | 2 +- Documentation/powerpc/dts-bindings/fsl/msi-pic.txt | 2 +- Documentation/powerpc/dts-bindings/fsl/pmc.txt | 4 ++-- Documentation/powerpc/qe_firmware.txt | 2 +- Documentation/rbtree.txt | 10 +++++----- Documentation/s390/Debugging390.txt | 4 ++-- Documentation/scheduler/sched-nice-design.txt | 2 +- Documentation/scsi/aic79xx.txt | 2 +- Documentation/scsi/ncr53c8xx.txt | 4 ++-- Documentation/scsi/sym53c8xx_2.txt | 2 +- Documentation/sound/alsa/ALSA-Configuration.txt | 2 +- Documentation/sound/alsa/HD-Audio.txt | 2 +- Documentation/sound/alsa/hda_codec.txt | 2 +- Documentation/sysctl/vm.txt | 4 ++-- Documentation/timers/hpet.txt | 2 +- Documentation/timers/timer_stats.txt | 2 +- Documentation/trace/ftrace.txt | 2 +- Documentation/trace/kmemtrace.txt | 2 +- Documentation/usb/WUSB-Design-overview.txt | 8 ++++---- Documentation/usb/anchors.txt | 4 ++-- Documentation/usb/callbacks.txt | 2 +- Documentation/video4linux/cx18.txt | 2 +- MAINTAINERS | 2 +- arch/arm/mach-sa1100/jornada720_ssp.c | 4 ++-- arch/blackfin/Kconfig | 2 +- arch/powerpc/mm/slb.c | 2 +- arch/s390/kernel/head.S | 2 +- drivers/ata/libata-acpi.c | 4 ++-- drivers/ata/libata-eh.c | 2 +- drivers/base/bus.c | 2 +- drivers/block/Kconfig | 2 +- drivers/char/Kconfig | 2 +- drivers/char/amiserial.c | 2 +- drivers/connector/Kconfig | 2 +- drivers/crypto/Kconfig | 6 +++--- drivers/dca/dca-core.c | 2 +- drivers/edac/e752x_edac.c | 2 +- drivers/ide/Kconfig | 2 +- drivers/ide/ide-atapi.c | 2 +- drivers/input/misc/Kconfig | 2 +- drivers/isdn/divert/isdn_divert.c | 2 +- drivers/isdn/mISDN/dsp_core.c | 2 +- drivers/media/dvb/dvb-usb/Kconfig | 2 +- drivers/media/video/hdpvr/hdpvr-video.c | 2 +- drivers/message/fusion/lsi/mpi_history.txt | 6 +++--- drivers/mtd/Kconfig | 3 ++- drivers/mtd/devices/Kconfig | 2 +- drivers/mtd/nand/Kconfig | 4 ++-- drivers/net/Kconfig | 4 ++-- drivers/net/appletalk/ltpc.c | 2 +- drivers/net/b44.h | 2 +- drivers/net/e100.c | 2 +- drivers/net/e1000e/e1000.h | 2 +- drivers/net/ehea/ehea.h | 2 +- drivers/net/igbvf/igbvf.h | 2 +- drivers/net/ipg.h | 2 +- drivers/net/mlx4/en_netdev.c | 2 +- drivers/net/niu.h | 4 ++-- drivers/net/qlge/qlge_main.c | 2 +- drivers/net/qlge/qlge_mpi.c | 6 +++--- drivers/net/skfp/h/smt.h | 2 +- drivers/net/tokenring/3c359.c | 2 +- drivers/net/tokenring/lanstreamer.c | 2 +- drivers/net/tokenring/olympic.c | 2 +- drivers/net/ucc_geth_ethtool.c | 2 +- drivers/net/usb/usbnet.c | 2 +- drivers/net/wireless/Kconfig | 2 +- drivers/net/wireless/hostap/Kconfig | 8 ++++---- drivers/net/wireless/iwlwifi/Kconfig | 4 ++-- drivers/net/wireless/rndis_wlan.c | 2 +- drivers/net/wireless/rt2x00/Kconfig | 14 +++++++------- drivers/net/wireless/rt2x00/rt2x00lib.h | 2 +- drivers/net/wireless/wavelan_cs.c | 2 +- drivers/pci/hotplug/sgi_hotplug.c | 4 ++-- drivers/s390/net/Kconfig | 14 +++++++------- drivers/s390/scsi/zfcp_fc.c | 2 +- drivers/scsi/dpt/osd_util.h | 2 +- drivers/scsi/lpfc/lpfc_scsi.c | 4 ++-- drivers/scsi/megaraid.h | 2 +- drivers/scsi/megaraid/mbox_defs.h | 2 +- drivers/serial/Kconfig | 2 +- drivers/staging/go7007/go7007.txt | 4 ++-- drivers/staging/panel/lcd-panel-cgram.txt | 2 +- drivers/staging/rt2860/common/mlme.c | 2 +- drivers/staging/rt2870/common/mlme.c | 2 +- drivers/staging/rt3070/common/mlme.c | 2 +- drivers/staging/wlan-ng/hfa384x_usb.c | 2 +- drivers/usb/serial/io_ti.c | 2 +- drivers/w1/Kconfig | 2 +- drivers/w1/masters/Kconfig | 6 +++--- drivers/watchdog/Kconfig | 2 +- drivers/watchdog/iop_wdt.c | 2 +- fs/bio.c | 4 ++-- fs/btrfs/extent-tree.c | 2 +- fs/compat.c | 2 +- fs/compat_ioctl.c | 2 +- fs/ext2/ext2.h | 2 +- fs/inode.c | 2 +- include/linux/ultrasound.h | 2 +- kernel/power/poweroff.c | 2 +- kernel/rtmutex.c | 2 +- net/ipv6/Kconfig | 2 +- net/ipv6/addrconf.c | 2 +- net/netfilter/Kconfig | 4 ++-- net/netfilter/nf_conntrack_acct.c | 2 +- sound/oss/msnd.c | 2 +- sound/pci/aw2/aw2-saa7146.c | 2 +- sound/pci/sis7019.h | 4 ++-- sound/pci/vx222/vx222_ops.c | 2 +- sound/usb/usbmixer.c | 2 +- 154 files changed, 227 insertions(+), 226 deletions(-) Merging audit/for-next $ git merge audit/for-next Already up-to-date. Merging omap/for-next $ git merge omap/for-next Already up-to-date. Merging quilt/aoe $ git merge quilt/aoe Already up-to-date. Merging suspend/linux-next $ git merge suspend/linux-next Removing arch/alpha/include/asm/suspend.h Removing arch/arm/include/asm/suspend.h Removing arch/ia64/include/asm/suspend.h Removing arch/m68k/include/asm/suspend.h Removing arch/mips/include/asm/suspend.h Removing arch/s390/include/asm/suspend.h Removing arch/um/include/asm/suspend.h Removing arch/x86/power/cpu_32.c Auto-merging drivers/xen/manage.c Merge made by recursive. Documentation/power/devices.txt | 34 +-- arch/alpha/include/asm/suspend.h | 6 - arch/arm/include/asm/suspend.h | 4 - arch/ia64/include/asm/suspend.h | 1 - arch/m68k/include/asm/suspend.h | 6 - arch/mips/include/asm/suspend.h | 6 - arch/s390/include/asm/suspend.h | 5 - arch/um/include/asm/suspend.h | 4 - arch/x86/kernel/acpi/sleep.c | 2 +- arch/x86/kernel/apm_32.c | 14 +- arch/x86/power/Makefile | 2 +- arch/x86/power/{cpu_64.c => cpu.c} | 165 ++++++++--- arch/x86/power/cpu_32.c | 148 ---------- drivers/base/platform.c | 36 +-- drivers/base/power/main.c | 94 +++---- drivers/base/sys.c | 16 + drivers/xen/manage.c | 16 +- include/linux/device.h | 5 - include/linux/pm.h | 11 +- include/linux/suspend.h | 18 +- kernel/kexec.c | 14 +- kernel/power/Kconfig | 4 + kernel/power/Makefile | 5 +- kernel/power/{disk.c => hibernate.c} | 34 ++-- kernel/power/hibernate_nvs.c | 135 +++++++++ kernel/power/main.c | 521 ---------------------------------- kernel/power/power.h | 25 ++- kernel/power/snapshot.c | 80 +++++- kernel/power/suspend.c | 300 +++++++++++++++++++ kernel/power/suspend_test.c | 187 ++++++++++++ kernel/power/swsusp.c | 198 ------------- mm/vmscan.c | 4 +- 32 files changed, 978 insertions(+), 1122 deletions(-) delete mode 100644 arch/alpha/include/asm/suspend.h delete mode 100644 arch/arm/include/asm/suspend.h delete mode 100644 arch/ia64/include/asm/suspend.h delete mode 100644 arch/m68k/include/asm/suspend.h delete mode 100644 arch/mips/include/asm/suspend.h delete mode 100644 arch/s390/include/asm/suspend.h delete mode 100644 arch/um/include/asm/suspend.h rename arch/x86/power/{cpu_64.c => cpu.c} (62%) delete mode 100644 arch/x86/power/cpu_32.c rename kernel/power/{disk.c => hibernate.c} (96%) create mode 100644 kernel/power/hibernate_nvs.c create mode 100644 kernel/power/suspend.c create mode 100644 kernel/power/suspend_test.c Merging bluetooth/master $ git merge bluetooth/master Auto-merging include/net/bluetooth/bluetooth.h Merge made by recursive. drivers/bluetooth/hci_vhci.c | 90 ++++++---------------------- include/net/bluetooth/bluetooth.h | 6 -- include/net/bluetooth/hci_core.h | 2 + include/net/bluetooth/l2cap.h | 71 ++++++++++++++++------- net/bluetooth/hci_core.c | 41 +++++++++++++- net/bluetooth/l2cap.c | 117 +++++++++++++++++++++---------------- net/bluetooth/rfcomm/core.c | 12 ++-- 7 files changed, 184 insertions(+), 155 deletions(-) Merging edac-amd/for-next $ git merge edac-amd/for-next Auto-merging MAINTAINERS Removing arch/x86/lib/msr-on-cpu.c Merge made by recursive. MAINTAINERS | 10 + arch/x86/include/asm/msr.h | 23 + arch/x86/lib/Makefile | 2 +- arch/x86/lib/msr-on-cpu.c | 97 - arch/x86/lib/msr.c | 183 ++ drivers/edac/Kconfig | 26 +- drivers/edac/Makefile | 7 + drivers/edac/amd64_edac.c | 3354 +++++++++++++++++++++++++++++++++++ drivers/edac/amd64_edac.h | 644 +++++++ drivers/edac/amd64_edac_dbg.c | 255 +++ drivers/edac/amd64_edac_err_types.c | 161 ++ drivers/edac/amd64_edac_inj.c | 185 ++ drivers/edac/edac_core.h | 9 +- 13 files changed, 4853 insertions(+), 103 deletions(-) delete mode 100644 arch/x86/lib/msr-on-cpu.c create mode 100644 arch/x86/lib/msr.c create mode 100644 drivers/edac/amd64_edac.c create mode 100644 drivers/edac/amd64_edac.h create mode 100644 drivers/edac/amd64_edac_dbg.c create mode 100644 drivers/edac/amd64_edac_err_types.c create mode 100644 drivers/edac/amd64_edac_inj.c Merging fsnotify/for-next $ git merge fsnotify/for-next Auto-merging MAINTAINERS Auto-merging fs/inode.c Auto-merging include/linux/dcache.h Auto-merging include/linux/fs.h Auto-merging init/Kconfig Merge made by recursive. MAINTAINERS | 8 +- fs/inode.c | 10 + fs/notify/Kconfig | 13 + fs/notify/Makefile | 2 + fs/notify/dnotify/Kconfig | 1 + fs/notify/dnotify/dnotify.c | 470 +++++++++++++++----- fs/notify/fsnotify.c | 184 ++++++++ fs/notify/fsnotify.h | 34 ++ fs/notify/group.c | 254 ++++++++++ fs/notify/inode_mark.c | 425 +++++++++++++++++ fs/notify/inotify/Kconfig | 20 +- fs/notify/inotify/Makefile | 2 +- fs/notify/inotify/inotify.c | 20 + fs/notify/inotify/inotify.h | 21 + fs/notify/inotify/inotify_fsnotify.c | 137 ++++++ fs/notify/inotify/inotify_user.c | 837 ++++++++++++++++------------------ fs/notify/notification.c | 411 +++++++++++++++++ include/linux/dcache.h | 4 +- include/linux/dnotify.h | 29 +- include/linux/fs.h | 6 +- include/linux/fsnotify.h | 203 +++++---- include/linux/fsnotify_backend.h | 387 ++++++++++++++++ init/Kconfig | 3 +- 23 files changed, 2819 insertions(+), 662 deletions(-) create mode 100644 fs/notify/fsnotify.c create mode 100644 fs/notify/fsnotify.h create mode 100644 fs/notify/group.c create mode 100644 fs/notify/inode_mark.c create mode 100644 fs/notify/inotify/inotify.h create mode 100644 fs/notify/inotify/inotify_fsnotify.c create mode 100644 fs/notify/notification.c create mode 100644 include/linux/fsnotify_backend.h Merging irda/for-next $ git merge irda/for-next Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 1 + drivers/net/irda/Kconfig | 45 +++ drivers/net/irda/Makefile | 1 + drivers/net/irda/bfin_sir.c | 820 +++++++++++++++++++++++++++++++++++++++++ drivers/net/irda/bfin_sir.h | 148 ++++++++ drivers/net/irda/smsc-ircc2.c | 2 +- 6 files changed, 1016 insertions(+), 1 deletions(-) create mode 100644 drivers/net/irda/bfin_sir.c create mode 100644 drivers/net/irda/bfin_sir.h Merging tip/auto-latest $ git merge tip/auto-latest Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. Resolved 'arch/x86/include/asm/mce.h' using previous resolution. Resolved 'block/blk-sysfs.c' using previous resolution. Resolved 'net/core/drop_monitor.c' using previous resolution. Resolved 'net/core/net-traces.c' using previous resolution. Auto-merging Documentation/feature-removal-schedule.txt CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt Auto-merging Documentation/kernel-parameters.txt Auto-merging MAINTAINERS Auto-merging arch/x86/include/asm/mce.h CONFLICT (content): Merge conflict in arch/x86/include/asm/mce.h Auto-merging arch/x86/kernel/Makefile Auto-merging arch/x86/kernel/apic/x2apic_uv_x.c Removing arch/x86/kernel/cpu/mcheck/mce_32.c Auto-merging block/blk-core.c Auto-merging block/blk-sysfs.c CONFLICT (content): Merge conflict in block/blk-sysfs.c Auto-merging block/compat_ioctl.c Auto-merging drivers/md/dm.c Auto-merging drivers/scsi/sg.c Auto-merging include/asm-generic/vmlinux.lds.h Auto-merging include/linux/fs.h Auto-merging include/linux/init_task.h Auto-merging include/linux/mm.h Auto-merging include/linux/module.h Auto-merging include/linux/sched.h Auto-merging include/linux/skbuff.h Auto-merging include/net/inet_sock.h Removing include/trace/irq.h Removing include/trace/irq_event_types.h Removing include/trace/kmemtrace.h Removing include/trace/lockdep.h Removing include/trace/lockdep_event_types.h Removing include/trace/sched.h Removing include/trace/skb.h Removing include/trace/trace_event_types.h Removing include/trace/trace_events.h Removing include/trace/workqueue.h Auto-merging init/Kconfig Auto-merging init/main.c Auto-merging kernel/exit.c Auto-merging kernel/hrtimer.c Auto-merging kernel/module.c Auto-merging kernel/ptrace.c Auto-merging kernel/sched.c Auto-merging kernel/signal.c Auto-merging kernel/sysctl.c Auto-merging kernel/trace/blktrace.c Removing kernel/trace/events.c Removing kernel/trace/trace_events_stage_1.h Removing kernel/trace/trace_events_stage_2.h Removing kernel/trace/trace_events_stage_3.h Auto-merging mm/slub.c Auto-merging net/core/drop_monitor.c CONFLICT (content): Merge conflict in net/core/drop_monitor.c Auto-merging net/core/net-traces.c CONFLICT (content): Merge conflict in net/core/net-traces.c Auto-merging net/core/skbuff.c Auto-merging net/core/sock.c Auto-merging net/ipv4/inet_timewait_sock.c Auto-merging scripts/kernel-doc Auto-merging scripts/recordmcount.pl Auto-merging security/integrity/ima/ima_fs.c Auto-merging security/smack/smackfs.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 7ed1ada] Merge commit 'tip/auto-latest' $ git diff -M --stat --summary HEAD^.. Documentation/Changes | 15 + Documentation/DocBook/Makefile | 3 +- Documentation/DocBook/tracepoint.tmpl | 89 ++ Documentation/RCU/trace.txt | 102 ++- Documentation/feature-removal-schedule.txt | 10 + Documentation/kernel-parameters.txt | 36 +- Documentation/kmemcheck.txt | 129 +++ Documentation/trace/events.txt | 90 ++ Documentation/trace/power.txt | 17 + Documentation/x86/x86_64/boot-options.txt | 2 + Documentation/x86/x86_64/machinecheck | 4 +- MAINTAINERS | 8 + arch/x86/Kconfig | 51 +- arch/x86/Kconfig.cpu | 1 - arch/x86/Kconfig.debug | 10 + arch/x86/Makefile | 5 + arch/x86/ia32/ia32entry.S | 1 + arch/x86/include/asm/dma-mapping.h | 8 + arch/x86/include/asm/ds.h | 82 +- arch/x86/include/asm/entry_arch.h | 6 +- arch/x86/include/asm/hardirq.h | 2 +- arch/x86/include/asm/irq_vectors.h | 4 +- arch/x86/include/asm/kmemcheck.h | 42 + arch/x86/include/asm/mce.h | 51 +- arch/x86/include/asm/msr-index.h | 7 + arch/x86/include/asm/page_types.h | 8 + arch/x86/include/asm/pgtable.h | 5 + arch/x86/include/asm/pgtable_types.h | 9 +- arch/x86/include/asm/processor.h | 35 +- arch/x86/include/asm/ptrace.h | 9 +- arch/x86/include/asm/string_32.h | 8 + arch/x86/include/asm/string_64.h | 8 + arch/x86/include/asm/thread_info.h | 4 +- arch/x86/include/asm/tlbflush.h | 8 +- arch/x86/include/asm/unistd_32.h | 1 + arch/x86/include/asm/unistd_64.h | 2 + arch/x86/include/asm/xor.h | 5 + arch/x86/kernel/Makefile | 1 + arch/x86/kernel/apic/apic.c | 4 +- arch/x86/kernel/apic/nmi.c | 2 +- arch/x86/kernel/apic/x2apic_uv_x.c | 2 +- arch/x86/kernel/cpu/intel.c | 23 + arch/x86/kernel/cpu/mcheck/Makefile | 9 +- arch/x86/kernel/cpu/mcheck/k7.c | 42 +- arch/x86/kernel/cpu/mcheck/mce-inject.c | 127 ++ arch/x86/kernel/cpu/mcheck/{mce_64.c => mce.c} | 644 +++++++---- arch/x86/kernel/cpu/mcheck/mce.h | 26 +- arch/x86/kernel/cpu/mcheck/mce_32.c | 76 -- arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 203 ++-- arch/x86/kernel/cpu/mcheck/mce_intel.c | 74 ++ arch/x86/kernel/cpu/mcheck/mce_intel_64.c | 60 +- arch/x86/kernel/cpu/mcheck/non-fatal.c | 57 +- arch/x86/kernel/cpu/mcheck/p4.c | 86 +-- arch/x86/kernel/cpu/mcheck/p5.c | 48 +- arch/x86/kernel/cpu/mcheck/p6.c | 26 +- arch/x86/kernel/cpu/mcheck/therm_throt.c | 73 +- arch/x86/kernel/cpu/mcheck/threshold.c | 2 +- arch/x86/kernel/cpu/mcheck/winchip.c | 17 +- arch/x86/kernel/ds.c | 921 +++++++++++----- arch/x86/kernel/ds_selftest.c | 408 +++++++ arch/x86/kernel/ds_selftest.h | 15 + arch/x86/kernel/entry_64.S | 23 +- arch/x86/kernel/irq.c | 4 +- arch/x86/kernel/irqinit.c | 11 +- arch/x86/kernel/process.c | 7 +- arch/x86/kernel/process_32.c | 3 +- arch/x86/kernel/process_64.c | 3 +- arch/x86/kernel/ptrace.c | 284 +++-- arch/x86/kernel/setup.c | 1 + arch/x86/kernel/signal.c | 4 +- arch/x86/kernel/stacktrace.c | 9 +- arch/x86/kernel/syscall_table_32.S | 1 + arch/x86/kernel/traps.c | 11 +- arch/x86/kernel/vmlinux.lds.S | 2 + arch/x86/mm/Makefile | 2 + arch/x86/mm/fault.c | 18 +- arch/x86/mm/init.c | 15 +- arch/x86/mm/init_32.c | 30 +- arch/x86/mm/init_64.c | 37 +- arch/x86/mm/kmemcheck/Makefile | 1 + arch/x86/mm/kmemcheck/error.c | 228 ++++ arch/x86/mm/kmemcheck/error.h | 15 + arch/x86/mm/kmemcheck/kmemcheck.c | 637 +++++++++++ arch/x86/mm/kmemcheck/opcode.c | 106 ++ arch/x86/mm/kmemcheck/opcode.h | 9 + arch/x86/mm/kmemcheck/pte.c | 22 + arch/x86/mm/kmemcheck/pte.h | 10 + arch/x86/mm/kmemcheck/selftest.c | 69 ++ arch/x86/mm/kmemcheck/selftest.h | 6 + arch/x86/mm/kmemcheck/shadow.c | 162 +++ arch/x86/mm/kmemcheck/shadow.h | 16 + arch/x86/mm/kmmio.c | 104 +- arch/x86/mm/mmio-mod.c | 2 + arch/x86/mm/pageattr.c | 2 +- arch/x86/mm/pgtable.c | 12 +- arch/x86/oprofile/nmi_int.c | 38 +- block/blk-core.c | 5 +- block/blk-sysfs.c | 7 +- block/compat_ioctl.c | 2 +- crypto/xor.c | 7 +- drivers/ieee1394/csr1212.c | 2 + drivers/ieee1394/nodemgr.c | 5 + drivers/md/dm.c | 3 +- drivers/misc/c2port/core.c | 2 + drivers/scsi/sg.c | 1 + include/asm-generic/vmlinux.lds.h | 2 +- include/linux/blktrace_api.h | 32 +- include/linux/c2port.h | 3 + include/linux/clockchips.h | 9 + include/linux/compat.h | 2 + include/linux/fs.h | 5 +- include/linux/ftrace.h | 17 +- include/linux/ftrace_event.h | 172 +++ include/linux/gfp.h | 14 +- include/linux/hrtimer.h | 7 +- include/linux/init_task.h | 1 + include/linux/interrupt.h | 14 + include/linux/kmemcheck.h | 157 +++ include/linux/kmemtrace.h | 25 + include/linux/mm.h | 7 +- include/linux/mm_types.h | 8 + include/linux/mmiotrace.h | 2 + include/linux/module.h | 8 + include/linux/poison.h | 16 +- include/linux/ptrace.h | 10 - include/linux/rculist.h | 30 +- include/linux/rcutree.h | 9 +- include/linux/ring_buffer.h | 56 +- include/linux/sched.h | 38 +- include/linux/signal.h | 2 + include/linux/skbuff.h | 7 + include/linux/slab.h | 7 + include/linux/slab_def.h | 83 ++- include/linux/slub_def.h | 2 +- include/linux/stacktrace.h | 3 + include/linux/timer.h | 3 + include/linux/timex.h | 42 +- include/linux/trace_seq.h | 90 ++ include/linux/tracepoint.h | 8 +- include/net/inet_sock.h | 14 +- include/net/inet_timewait_sock.h | 5 +- include/net/sock.h | 2 + include/trace/block.h | 4 +- include/trace/define_trace.h | 75 ++ include/trace/events/irq.h | 145 +++ include/trace/events/kmem.h | 231 ++++ include/trace/events/lockdep.h | 96 ++ .../trace/{sched_event_types.h => events/sched.h} | 29 +- include/trace/events/skb.h | 40 + include/trace/events/workqueue.h | 100 ++ include/trace/ftrace.h | 587 ++++++++++ include/trace/irq.h | 9 - include/trace/irq_event_types.h | 55 - include/trace/kmemtrace.h | 63 - include/trace/lockdep.h | 9 - include/trace/lockdep_event_types.h | 44 - include/trace/sched.h | 9 - include/trace/skb.h | 11 - include/trace/trace_event_types.h | 5 - include/trace/trace_events.h | 5 - include/trace/workqueue.h | 25 - init/Kconfig | 2 +- init/do_mounts.c | 3 +- init/main.c | 6 +- ipc/sem.c | 4 +- kernel/Makefile | 1 + kernel/compat.c | 11 + kernel/exit.c | 6 +- kernel/fork.c | 33 +- kernel/hrtimer.c | 58 +- kernel/irq/handle.c | 5 +- kernel/irq/manage.c | 4 +- kernel/kthread.c | 5 +- kernel/lockdep.c | 16 +- kernel/module.c | 26 +- kernel/ptrace.c | 10 - kernel/rcupreempt.c | 8 +- kernel/rcutree.c | 25 +- kernel/rcutree_trace.c | 64 +- kernel/sched.c | 66 +- kernel/signal.c | 71 +- kernel/softirq.c | 18 +- kernel/sysctl.c | 19 + kernel/time/clockevents.c | 14 + kernel/time/tick-broadcast.c | 2 +- kernel/time/tick-sched.c | 19 +- kernel/timer.c | 52 +- kernel/trace/Kconfig | 143 ++- kernel/trace/Makefile | 15 +- kernel/trace/blktrace.c | 194 +++- kernel/trace/events.c | 14 - kernel/trace/ftrace.c | 801 ++++++++++++-- kernel/trace/kmemtrace.c | 10 +- kernel/trace/ring_buffer.c | 773 ++++++++----- kernel/trace/ring_buffer_benchmark.c | 416 +++++++ kernel/trace/trace.c | 383 ++++--- kernel/trace/trace.h | 243 ++--- kernel/trace/trace_boot.c | 5 +- kernel/trace/trace_branch.c | 8 +- kernel/trace/trace_event_profile.c | 24 +- kernel/trace/trace_event_types.h | 12 +- kernel/trace/trace_events.c | 837 ++++++++++++--- kernel/trace/trace_events_filter.c | 1204 ++++++++++++++++---- kernel/trace/trace_events_stage_1.h | 39 - kernel/trace/trace_events_stage_2.h | 176 --- kernel/trace/trace_events_stage_3.h | 281 ----- kernel/trace/trace_export.c | 110 ++- kernel/trace/trace_functions_graph.c | 31 +- kernel/trace/trace_hw_branches.c | 203 ++-- kernel/trace/trace_mmiotrace.c | 6 +- kernel/trace/trace_output.c | 197 +++- kernel/trace/trace_output.h | 30 +- kernel/trace/trace_power.c | 8 +- kernel/trace/trace_printk.c | 6 +- kernel/trace/trace_sched_switch.c | 12 +- kernel/trace/trace_sched_wakeup.c | 8 +- kernel/trace/trace_selftest.c | 58 + kernel/trace/trace_stack.c | 15 +- kernel/trace/trace_stat.c | 208 +++-- kernel/trace/trace_stat.h | 2 +- kernel/trace/trace_sysprof.c | 9 +- kernel/trace/trace_workqueue.c | 25 +- kernel/workqueue.c | 11 +- lib/Kconfig.debug | 6 +- lib/Kconfig.kmemcheck | 91 ++ mm/Makefile | 1 + mm/kmemcheck.c | 122 ++ mm/mlock.c | 51 +- mm/page_alloc.c | 18 + mm/slab.c | 110 +-- mm/slob.c | 2 +- mm/slub.c | 39 +- mm/util.c | 11 +- net/core/drop_monitor.c | 2 +- net/core/net-traces.c | 7 +- net/core/skbuff.c | 10 +- net/core/sock.c | 2 + net/ipv4/inet_timewait_sock.c | 3 + samples/Kconfig | 6 + samples/Makefile | 2 +- samples/trace_events/Makefile | 6 + samples/trace_events/trace-events-sample.c | 52 + samples/trace_events/trace-events-sample.h | 129 +++ scripts/kernel-doc | 22 + scripts/recordmcount.pl | 6 +- security/integrity/ima/ima_fs.c | 4 +- security/smack/smackfs.c | 8 +- 247 files changed, 12204 insertions(+), 3786 deletions(-) create mode 100644 Documentation/DocBook/tracepoint.tmpl create mode 100644 Documentation/kmemcheck.txt create mode 100644 Documentation/trace/events.txt create mode 100644 Documentation/trace/power.txt create mode 100644 arch/x86/include/asm/kmemcheck.h create mode 100644 arch/x86/kernel/cpu/mcheck/mce-inject.c rename arch/x86/kernel/cpu/mcheck/{mce_64.c => mce.c} (68%) delete mode 100644 arch/x86/kernel/cpu/mcheck/mce_32.c create mode 100644 arch/x86/kernel/cpu/mcheck/mce_intel.c create mode 100644 arch/x86/kernel/ds_selftest.c create mode 100644 arch/x86/kernel/ds_selftest.h create mode 100644 arch/x86/mm/kmemcheck/Makefile create mode 100644 arch/x86/mm/kmemcheck/error.c create mode 100644 arch/x86/mm/kmemcheck/error.h create mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c create mode 100644 arch/x86/mm/kmemcheck/opcode.c create mode 100644 arch/x86/mm/kmemcheck/opcode.h create mode 100644 arch/x86/mm/kmemcheck/pte.c create mode 100644 arch/x86/mm/kmemcheck/pte.h create mode 100644 arch/x86/mm/kmemcheck/selftest.c create mode 100644 arch/x86/mm/kmemcheck/selftest.h create mode 100644 arch/x86/mm/kmemcheck/shadow.c create mode 100644 arch/x86/mm/kmemcheck/shadow.h create mode 100644 include/linux/ftrace_event.h create mode 100644 include/linux/kmemcheck.h create mode 100644 include/linux/kmemtrace.h create mode 100644 include/linux/trace_seq.h create mode 100644 include/trace/define_trace.h create mode 100644 include/trace/events/irq.h create mode 100644 include/trace/events/kmem.h create mode 100644 include/trace/events/lockdep.h rename include/trace/{sched_event_types.h => events/sched.h} (91%) create mode 100644 include/trace/events/skb.h create mode 100644 include/trace/events/workqueue.h create mode 100644 include/trace/ftrace.h delete mode 100644 include/trace/irq.h delete mode 100644 include/trace/irq_event_types.h delete mode 100644 include/trace/kmemtrace.h delete mode 100644 include/trace/lockdep.h delete mode 100644 include/trace/lockdep_event_types.h delete mode 100644 include/trace/sched.h delete mode 100644 include/trace/skb.h delete mode 100644 include/trace/trace_event_types.h delete mode 100644 include/trace/trace_events.h delete mode 100644 include/trace/workqueue.h delete mode 100644 kernel/trace/events.c create mode 100644 kernel/trace/ring_buffer_benchmark.c delete mode 100644 kernel/trace/trace_events_stage_1.h delete mode 100644 kernel/trace/trace_events_stage_2.h delete mode 100644 kernel/trace/trace_events_stage_3.h create mode 100644 lib/Kconfig.kmemcheck create mode 100644 mm/kmemcheck.c create mode 100644 samples/trace_events/Makefile create mode 100644 samples/trace_events/trace-events-sample.c create mode 100644 samples/trace_events/trace-events-sample.h Merging kmemleak/kmemleak $ git merge kmemleak/kmemleak Resolved 'include/linux/slab.h' using previous resolution. Resolved 'mm/slab.c' using previous resolution. Resolved 'mm/slob.c' using previous resolution. Resolved 'mm/slub.c' using previous resolution. Auto-merging Documentation/kernel-parameters.txt Auto-merging MAINTAINERS CONFLICT (delete/modify): arch/x86/kernel/vmlinux_32.lds.S deleted in HEAD and modified in kmemleak/kmemleak. Version kmemleak/kmemleak of arch/x86/kernel/vmlinux_32.lds.S left in tree. CONFLICT (delete/modify): arch/x86/kernel/vmlinux_64.lds.S deleted in HEAD and modified in kmemleak/kmemleak. Version kmemleak/kmemleak of arch/x86/kernel/vmlinux_64.lds.S left in tree. Auto-merging fs/block_dev.c Auto-merging include/linux/slab.h CONFLICT (content): Merge conflict in include/linux/slab.h Auto-merging init/main.c Auto-merging kernel/module.c Auto-merging lib/Kconfig.debug Auto-merging mm/Makefile Auto-merging mm/page_alloc.c Auto-merging mm/slab.c CONFLICT (content): Merge conflict in mm/slab.c Auto-merging mm/slob.c CONFLICT (content): Merge conflict in mm/slob.c Auto-merging mm/slub.c CONFLICT (content): Merge conflict in mm/slub.c Automatic merge failed; fix conflicts and then commit the result. $ git rm -f arch/x86/kernel/vmlinux_32.lds.S arch/x86/kernel/vmlinux_64.lds.S arch/x86/kernel/vmlinux_32.lds.S: needs merge arch/x86/kernel/vmlinux_64.lds.S: needs merge include/linux/slab.h: needs merge mm/slab.c: needs merge mm/slob.c: needs merge mm/slub.c: needs merge rm 'arch/x86/kernel/vmlinux_32.lds.S' rm 'arch/x86/kernel/vmlinux_64.lds.S' $ git commit -v -a [master 032164f] Merge commit 'kmemleak/kmemleak' $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 4 + Documentation/kmemleak.txt | 142 ++++ MAINTAINERS | 6 + arch/arm/kernel/vmlinux.lds.S | 2 + drivers/char/vt.c | 7 + fs/block_dev.c | 6 + include/linux/kmemleak.h | 96 +++ include/linux/percpu.h | 5 + include/linux/slab.h | 4 +- init/main.c | 4 +- kernel/module.c | 56 ++ lib/Kconfig.debug | 32 + mm/Makefile | 2 + mm/kmemleak-test.c | 111 +++ mm/kmemleak.c | 1498 +++++++++++++++++++++++++++++++++++ mm/page_alloc.c | 11 + mm/slab.c | 32 +- mm/slob.c | 7 + mm/slub.c | 5 +- mm/vmalloc.c | 30 +- 20 files changed, 2052 insertions(+), 8 deletions(-) create mode 100644 Documentation/kmemleak.txt create mode 100644 include/linux/kmemleak.h create mode 100644 mm/kmemleak-test.c create mode 100644 mm/kmemleak.c Merging asm-generic/next $ git merge asm-generic/next Resolved 'arch/arm/include/asm/page.h' using previous resolution. Auto-merging arch/arm/include/asm/atomic.h Auto-merging arch/arm/include/asm/page.h CONFLICT (content): Merge conflict in arch/arm/include/asm/page.h Auto-merging arch/ia64/include/asm/types.h Auto-merging arch/microblaze/include/asm/page.h Auto-merging arch/mips/include/asm/page.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 2e07f5b] Merge commit 'asm-generic/next' $ git diff -M --stat --summary HEAD^.. arch/alpha/include/asm/atomic.h | 2 +- arch/alpha/include/asm/bitsperlong.h | 8 + arch/alpha/include/asm/page.h | 2 +- arch/alpha/include/asm/signal.h | 2 +- arch/alpha/include/asm/types.h | 3 - arch/arm/include/asm/atomic.h | 2 +- arch/arm/include/asm/bitsperlong.h | 1 + arch/arm/include/asm/mman.h | 2 +- arch/arm/include/asm/page.h | 2 +- arch/arm/include/asm/signal.h | 2 +- arch/avr32/include/asm/atomic.h | 2 +- arch/avr32/include/asm/bitsperlong.h | 1 + arch/avr32/include/asm/mman.h | 2 +- arch/avr32/include/asm/signal.h | 2 +- arch/avr32/include/asm/termios.h | 2 +- arch/blackfin/include/asm/atomic.h | 2 +- arch/blackfin/include/asm/bitsperlong.h | 1 + arch/blackfin/include/asm/page.h | 2 +- arch/blackfin/include/asm/signal.h | 2 +- arch/cris/include/asm/atomic.h | 2 +- arch/cris/include/asm/bitsperlong.h | 1 + arch/cris/include/asm/mman.h | 2 +- arch/cris/include/asm/page.h | 2 +- arch/cris/include/asm/signal.h | 2 +- arch/frv/include/asm/atomic.h | 2 +- arch/frv/include/asm/bitsperlong.h | 1 + arch/frv/include/asm/mman.h | 2 +- arch/frv/include/asm/page.h | 2 +- arch/frv/include/asm/pci.h | 13 +- arch/frv/include/asm/termios.h | 2 +- arch/h8300/include/asm/atomic.h | 2 +- arch/h8300/include/asm/bitsperlong.h | 1 + arch/h8300/include/asm/mman.h | 2 +- arch/h8300/include/asm/page.h | 2 +- arch/h8300/include/asm/signal.h | 2 +- arch/ia64/include/asm/atomic.h | 2 +- arch/ia64/include/asm/bitsperlong.h | 8 + arch/ia64/include/asm/mman.h | 2 +- arch/ia64/include/asm/signal.h | 2 +- arch/ia64/include/asm/types.h | 7 - arch/m32r/include/asm/atomic.h | 2 +- arch/m32r/include/asm/bitsperlong.h | 1 + arch/m32r/include/asm/mman.h | 2 +- arch/m32r/include/asm/page.h | 2 +- arch/m32r/include/asm/pci.h | 2 - arch/m32r/include/asm/signal.h | 2 +- arch/m68k/include/asm/atomic_mm.h | 2 +- arch/m68k/include/asm/atomic_no.h | 2 +- arch/m68k/include/asm/bitsperlong.h | 1 + arch/m68k/include/asm/mman.h | 2 +- arch/m68k/include/asm/page_mm.h | 2 +- arch/m68k/include/asm/page_no.h | 2 +- arch/m68k/include/asm/signal.h | 2 +- arch/microblaze/include/asm/atomic.h | 2 +- arch/microblaze/include/asm/bitsperlong.h | 1 + arch/microblaze/include/asm/page.h | 2 +- arch/microblaze/include/asm/signal.h | 2 +- arch/microblaze/include/asm/termios.h | 2 +- arch/mips/include/asm/atomic.h | 2 +- arch/mips/include/asm/bitsperlong.h | 8 + arch/mips/include/asm/page.h | 2 +- arch/mips/include/asm/signal.h | 2 +- arch/mips/include/asm/types.h | 3 - arch/mn10300/include/asm/atomic.h | 2 +- arch/mn10300/include/asm/bitsperlong.h | 1 + arch/mn10300/include/asm/mman.h | 2 +- arch/mn10300/include/asm/signal.h | 2 +- arch/parisc/include/asm/atomic.h | 2 +- arch/parisc/include/asm/bitsperlong.h | 20 + arch/parisc/include/asm/page.h | 2 +- arch/parisc/include/asm/types.h | 8 - arch/parisc/include/asm/uaccess.h | 2 +- arch/powerpc/include/asm/atomic.h | 2 +- arch/powerpc/include/asm/bitsperlong.h | 12 + arch/powerpc/include/asm/mman.h | 2 +- arch/powerpc/include/asm/page_32.h | 2 +- arch/powerpc/include/asm/page_64.h | 2 +- arch/powerpc/include/asm/signal.h | 2 +- arch/powerpc/include/asm/termios.h | 2 +- arch/powerpc/include/asm/types.h | 9 - arch/s390/include/asm/atomic.h | 2 +- arch/s390/include/asm/bitsperlong.h | 13 + arch/s390/include/asm/mman.h | 2 +- arch/s390/include/asm/page.h | 2 +- arch/s390/include/asm/signal.h | 2 +- arch/s390/include/asm/termios.h | 2 +- arch/s390/include/asm/types.h | 6 - arch/sh/include/asm/atomic.h | 2 +- arch/sh/include/asm/bitsperlong.h | 1 + arch/sh/include/asm/mman.h | 2 +- arch/sh/include/asm/page.h | 2 +- arch/sh/include/asm/signal.h | 2 +- arch/sparc/include/asm/atomic_32.h | 2 +- arch/sparc/include/asm/atomic_64.h | 2 +- arch/sparc/include/asm/bitsperlong.h | 13 + arch/sparc/include/asm/mman.h | 2 +- arch/sparc/include/asm/page_32.h | 2 +- arch/sparc/include/asm/page_64.h | 2 +- arch/sparc/include/asm/signal.h | 2 +- arch/sparc/include/asm/types.h | 4 - arch/sparc/include/asm/uaccess_64.h | 2 +- arch/um/include/asm/page.h | 2 +- arch/x86/include/asm/atomic_32.h | 2 +- arch/x86/include/asm/atomic_64.h | 2 +- arch/x86/include/asm/bitsperlong.h | 13 + arch/x86/include/asm/mman.h | 2 +- arch/x86/include/asm/page.h | 2 +- arch/x86/include/asm/signal.h | 2 +- arch/x86/include/asm/types.h | 6 - arch/xtensa/include/asm/atomic.h | 2 +- arch/xtensa/include/asm/bitsperlong.h | 1 + arch/xtensa/include/asm/page.h | 2 +- include/asm-generic/Kbuild | 22 + include/asm-generic/Kbuild.asm | 1 + include/asm-generic/atomic-long.h | 258 +++++++++ include/asm-generic/atomic.h | 321 ++++------- include/asm-generic/auxvec.h | 8 + include/asm-generic/bitops.h | 24 +- include/asm-generic/bitops/atomic.h | 1 + include/asm-generic/bitsperlong.h | 32 ++ include/asm-generic/bugs.h | 10 + include/asm-generic/cache.h | 12 + include/asm-generic/cacheflush.h | 30 + include/asm-generic/checksum.h | 79 +++ include/asm-generic/current.h | 9 + include/asm-generic/delay.h | 9 + include/asm-generic/dma-mapping-linear.h | 336 +++++++++++ include/asm-generic/dma.h | 15 + include/asm-generic/fb.h | 12 + include/asm-generic/getorder.h | 24 + include/asm-generic/hardirq.h | 34 ++ include/asm-generic/hw_irq.h | 9 + include/asm-generic/int-l64.h | 2 + include/asm-generic/int-ll64.h | 2 + include/asm-generic/io.h | 300 ++++++++++ include/asm-generic/ioctls.h | 110 ++++ include/asm-generic/ipcbuf.h | 34 ++ include/asm-generic/irq.h | 18 + include/asm-generic/irqflags.h | 72 +++ include/asm-generic/kmap_types.h | 29 + include/asm-generic/linkage.h | 8 + include/asm-generic/mman-common.h | 41 ++ include/asm-generic/mman.h | 51 +-- include/asm-generic/mmu.h | 15 + include/asm-generic/mmu_context.h | 45 ++ include/asm-generic/module.h | 22 + include/asm-generic/msgbuf.h | 47 ++ include/asm-generic/mutex.h | 9 + include/asm-generic/page.h | 109 +++- include/asm-generic/param.h | 24 + include/asm-generic/parport.h | 23 + include/asm-generic/pci.h | 8 + include/asm-generic/pgalloc.h | 12 + include/asm-generic/posix_types.h | 165 ++++++ include/asm-generic/rtc.h | 2 +- include/asm-generic/scatterlist.h | 43 ++ include/asm-generic/segment.h | 9 + include/asm-generic/sembuf.h | 38 ++ include/asm-generic/serial.h | 13 + include/asm-generic/setup.h | 6 + include/asm-generic/shmbuf.h | 59 ++ include/asm-generic/shmparam.h | 6 + include/asm-generic/signal-defs.h | 28 + include/asm-generic/signal.h | 137 ++++- include/asm-generic/socket.h | 63 +++ include/asm-generic/sockios.h | 13 + include/asm-generic/spinlock.h | 11 + include/asm-generic/stat.h | 72 +++ include/asm-generic/string.h | 10 + include/asm-generic/swab.h | 18 + include/asm-generic/syscalls.h | 60 ++ include/asm-generic/system.h | 161 ++++++ include/asm-generic/termbits.h | 198 +++++++ include/asm-generic/termios-base.h | 77 +++ include/asm-generic/termios.h | 105 +++- include/asm-generic/timex.h | 22 + include/asm-generic/tlbflush.h | 18 + include/asm-generic/types.h | 42 ++ include/asm-generic/uaccess-unaligned.h | 26 + include/asm-generic/uaccess.h | 333 +++++++++++- include/asm-generic/ucontext.h | 12 + include/asm-generic/unaligned.h | 30 + include/asm-generic/unistd.h | 854 +++++++++++++++++++++++++++++ include/asm-generic/user.h | 8 + include/asm-generic/vga.h | 24 + lib/Makefile | 2 + lib/checksum.c | 193 +++++++ scripts/checksyscalls.sh | 92 +++- 188 files changed, 5050 insertions(+), 459 deletions(-) create mode 100644 arch/alpha/include/asm/bitsperlong.h create mode 100644 arch/arm/include/asm/bitsperlong.h create mode 100644 arch/avr32/include/asm/bitsperlong.h create mode 100644 arch/blackfin/include/asm/bitsperlong.h create mode 100644 arch/cris/include/asm/bitsperlong.h create mode 100644 arch/frv/include/asm/bitsperlong.h create mode 100644 arch/h8300/include/asm/bitsperlong.h create mode 100644 arch/ia64/include/asm/bitsperlong.h create mode 100644 arch/m32r/include/asm/bitsperlong.h create mode 100644 arch/m68k/include/asm/bitsperlong.h create mode 100644 arch/microblaze/include/asm/bitsperlong.h create mode 100644 arch/mips/include/asm/bitsperlong.h create mode 100644 arch/mn10300/include/asm/bitsperlong.h create mode 100644 arch/parisc/include/asm/bitsperlong.h create mode 100644 arch/powerpc/include/asm/bitsperlong.h create mode 100644 arch/s390/include/asm/bitsperlong.h create mode 100644 arch/sh/include/asm/bitsperlong.h create mode 100644 arch/sparc/include/asm/bitsperlong.h create mode 100644 arch/x86/include/asm/bitsperlong.h create mode 100644 arch/xtensa/include/asm/bitsperlong.h create mode 100644 include/asm-generic/atomic-long.h create mode 100644 include/asm-generic/auxvec.h create mode 100644 include/asm-generic/bitsperlong.h create mode 100644 include/asm-generic/bugs.h create mode 100644 include/asm-generic/cache.h create mode 100644 include/asm-generic/cacheflush.h create mode 100644 include/asm-generic/checksum.h create mode 100644 include/asm-generic/current.h create mode 100644 include/asm-generic/delay.h create mode 100644 include/asm-generic/dma-mapping-linear.h create mode 100644 include/asm-generic/dma.h create mode 100644 include/asm-generic/fb.h create mode 100644 include/asm-generic/getorder.h create mode 100644 include/asm-generic/hardirq.h create mode 100644 include/asm-generic/hw_irq.h create mode 100644 include/asm-generic/io.h create mode 100644 include/asm-generic/ioctls.h create mode 100644 include/asm-generic/ipcbuf.h create mode 100644 include/asm-generic/irq.h create mode 100644 include/asm-generic/irqflags.h create mode 100644 include/asm-generic/kmap_types.h create mode 100644 include/asm-generic/linkage.h create mode 100644 include/asm-generic/mman-common.h create mode 100644 include/asm-generic/mmu.h create mode 100644 include/asm-generic/mmu_context.h create mode 100644 include/asm-generic/module.h create mode 100644 include/asm-generic/msgbuf.h create mode 100644 include/asm-generic/mutex.h create mode 100644 include/asm-generic/param.h create mode 100644 include/asm-generic/parport.h create mode 100644 include/asm-generic/pgalloc.h create mode 100644 include/asm-generic/posix_types.h create mode 100644 include/asm-generic/scatterlist.h create mode 100644 include/asm-generic/segment.h create mode 100644 include/asm-generic/sembuf.h create mode 100644 include/asm-generic/serial.h create mode 100644 include/asm-generic/setup.h create mode 100644 include/asm-generic/shmbuf.h create mode 100644 include/asm-generic/shmparam.h create mode 100644 include/asm-generic/signal-defs.h create mode 100644 include/asm-generic/socket.h create mode 100644 include/asm-generic/sockios.h create mode 100644 include/asm-generic/spinlock.h create mode 100644 include/asm-generic/stat.h create mode 100644 include/asm-generic/string.h create mode 100644 include/asm-generic/swab.h create mode 100644 include/asm-generic/syscalls.h create mode 100644 include/asm-generic/system.h create mode 100644 include/asm-generic/termbits.h create mode 100644 include/asm-generic/termios-base.h create mode 100644 include/asm-generic/timex.h create mode 100644 include/asm-generic/tlbflush.h create mode 100644 include/asm-generic/types.h create mode 100644 include/asm-generic/uaccess-unaligned.h create mode 100644 include/asm-generic/ucontext.h create mode 100644 include/asm-generic/unaligned.h create mode 100644 include/asm-generic/unistd.h create mode 100644 include/asm-generic/user.h create mode 100644 include/asm-generic/vga.h create mode 100644 lib/checksum.c Merging quilt/driver-core $ git merge quilt/driver-core Resolved 'arch/x86/kernel/microcode_core.c' using previous resolution. Resolved 'drivers/base/firmware_class.c' using previous resolution. Resolved 'drivers/scsi/ibmvscsi/ibmvscsi.c' using previous resolution. Resolved 'init/main.c' using previous resolution. Renaming drivers/firewire/fw-sbp2.c => drivers/firewire/sbp2.c Auto-merging drivers/firewire/sbp2.c Renaming drivers/net/wireless/ath5k/Kconfig => drivers/net/wireless/ath/ath5k/Kconfig Auto-merging drivers/net/wireless/ath/ath5k/Kconfig Auto-merging Documentation/trace/ftrace.txt Auto-merging arch/um/drivers/ubd_kern.c Auto-merging arch/x86/kernel/microcode_core.c CONFLICT (content): Merge conflict in arch/x86/kernel/microcode_core.c Auto-merging block/bsg.c Auto-merging block/genhd.c Auto-merging drivers/base/firmware_class.c CONFLICT (content): Merge conflict in drivers/base/firmware_class.c Auto-merging drivers/base/platform.c Auto-merging drivers/base/sys.c Auto-merging drivers/block/pktcdvd.c Auto-merging drivers/block/ps3disk.c Auto-merging drivers/block/xen-blkfront.c Auto-merging drivers/char/raw.c Auto-merging drivers/gpu/drm/drm_sysfs.c Auto-merging drivers/ide/ide-pm.c Auto-merging drivers/ide/ide-probe.c Auto-merging drivers/ide/ide_platform.c Auto-merging drivers/infiniband/hw/ehca/ehca_main.c Auto-merging drivers/md/dm-ioctl.c Auto-merging drivers/media/common/tuners/tuner-xc2028.c Auto-merging drivers/media/dvb/dvb-usb/dvb-usb.h Auto-merging drivers/net/3c509.c Auto-merging drivers/net/Kconfig Auto-merging drivers/net/ibmveth.c Auto-merging drivers/net/sb1250-mac.c Auto-merging drivers/net/tun.c Auto-merging drivers/net/usb/hso.c Auto-merging drivers/net/wimax/i2400m/i2400m.h Auto-merging drivers/net/wireless/ipw2x00/ipw2200.c Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c Auto-merging drivers/net/wireless/libertas/if_spi.c Auto-merging drivers/net/wireless/libertas/if_usb.c Auto-merging drivers/regulator/wm8400-regulator.c Auto-merging drivers/s390/char/tape_34xx.c Auto-merging drivers/s390/char/tape_3590.c Auto-merging drivers/scsi/ibmvscsi/ibmvscsi.c CONFLICT (content): Merge conflict in drivers/scsi/ibmvscsi/ibmvscsi.c Auto-merging drivers/scsi/lpfc/lpfc_debugfs.c Auto-merging include/linux/device.h Auto-merging include/linux/genhd.h Auto-merging include/linux/sched.h Auto-merging include/linux/tracepoint.h Auto-merging init/Kconfig Auto-merging init/do_mounts.c Auto-merging init/main.c CONFLICT (content): Merge conflict in init/main.c Auto-merging kernel/trace/Kconfig Auto-merging kernel/trace/trace.c Auto-merging mm/shmem.c Auto-merging samples/Kconfig Removing samples/firmware_class/firmware_sample_driver.c Removing samples/firmware_class/firmware_sample_firmware_class.c Auto-merging sound/soc/codecs/wm8400.c Auto-merging sound/soc/codecs/wm8753.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 5492140] Merge branch 'quilt/driver-core' $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/debugobjects.tmpl | 2 +- Documentation/cdrom/packet-writing.txt | 2 +- Documentation/driver-model/device.txt | 32 ++ Documentation/fault-injection/fault-injection.txt | 70 ++-- Documentation/firmware_class/README | 3 +- Documentation/kprobes.txt | 6 +- Documentation/trace/ftrace.txt | 233 ++++++++----- Documentation/trace/mmiotrace.txt | 26 +- arch/mips/sni/eisa.c | 2 +- arch/um/drivers/net_kern.c | 4 +- arch/um/drivers/ubd_kern.c | 4 +- arch/x86/kernel/cpuid.c | 6 + arch/x86/kernel/microcode_core.c | 1 + arch/x86/kernel/msr.c | 6 + block/bsg.c | 6 + block/genhd.c | 10 + drivers/base/Kconfig | 25 ++ drivers/base/Makefile | 1 + drivers/base/base.h | 6 + drivers/base/core.c | 60 +++- drivers/base/dd.c | 6 +- drivers/base/devtmpfs.c | 367 ++++++++++++++++++++ drivers/base/firmware_class.c | 27 +- drivers/base/init.c | 1 + drivers/base/platform.c | 7 +- drivers/base/sys.c | 8 +- drivers/block/aoe/aoechr.c | 7 + drivers/block/pktcdvd.c | 9 +- drivers/block/ps3disk.c | 18 +- drivers/block/ps3vram.c | 46 ++-- drivers/block/xen-blkfront.c | 14 +- drivers/char/hvcs.c | 6 +- drivers/char/hw_random/core.c | 1 + drivers/char/ipmi/ipmi_si_intf.c | 4 +- drivers/char/misc.c | 15 +- drivers/char/raw.c | 6 + drivers/eisa/pci_eisa.c | 2 +- drivers/eisa/virtual_root.c | 2 +- drivers/firewire/sbp2.c | 6 +- drivers/gpu/drm/drm_debugfs.c | 12 +- drivers/gpu/drm/drm_drv.c | 2 +- drivers/gpu/drm/drm_stub.c | 2 +- drivers/gpu/drm/drm_sysfs.c | 7 + drivers/hid/usbhid/hiddev.c | 7 +- drivers/ide/ide-pm.c | 6 +- drivers/ide/ide-probe.c | 4 +- drivers/ide/ide_platform.c | 2 +- drivers/ieee1394/eth1394.c | 16 +- drivers/ieee1394/sbp2.c | 8 +- drivers/infiniband/core/sysfs.c | 2 +- drivers/infiniband/hw/ehca/ehca_main.c | 8 +- drivers/input/input.c | 6 + drivers/input/xen-kbdfront.c | 8 +- drivers/md/dm-ioctl.c | 1 + drivers/media/common/tuners/tuner-xc2028.c | 2 +- drivers/media/dvb/dvb-core/dvbdev.c | 10 + drivers/media/dvb/dvb-usb/dvb-usb.h | 2 +- drivers/media/video/dabusb.c | 6 + drivers/net/Kconfig | 4 +- drivers/net/tun.c | 1 + drivers/net/wimax/i2400m/i2400m.h | 2 +- drivers/net/wireless/ath/ath5k/Kconfig | 6 +- drivers/net/wireless/libertas/README | 12 +- drivers/net/wireless/libertas/if_spi.c | 8 +- drivers/net/wireless/libertas/if_spi.h | 3 + drivers/net/wireless/libertas/if_usb.c | 8 +- drivers/net/xen-netfront.c | 10 +- drivers/parisc/eisa.c | 2 +- drivers/parisc/sba_iommu.c | 6 +- drivers/parport/parport_gsc.c | 4 +- drivers/pcmcia/ds.c | 20 +- drivers/s390/char/con3215.c | 16 +- drivers/s390/char/raw3270.c | 16 +- drivers/s390/char/tape_34xx.c | 2 +- drivers/s390/char/tape_3590.c | 2 +- drivers/s390/char/tape_core.c | 22 +- drivers/s390/char/vmlogrdr.c | 12 +- drivers/s390/char/vmur.c | 16 +- drivers/s390/net/claw.c | 52 ++-- drivers/s390/net/lcs.c | 20 +- drivers/s390/net/lcs.h | 4 +- drivers/s390/net/netiucv.c | 47 ++-- drivers/scsi/aha1740.c | 2 +- drivers/scsi/ibmvscsi/ibmvscsi.c | 6 +- drivers/scsi/ibmvscsi/ibmvstgt.c | 2 +- drivers/scsi/libsrp.c | 2 +- drivers/scsi/lpfc/lpfc_debugfs.c | 4 +- drivers/serial/of_serial.c | 4 +- drivers/thermal/thermal_sys.c | 4 +- drivers/usb/atm/ueagle-atm.c | 9 +- drivers/usb/class/usblp.c | 6 + drivers/usb/core/file.c | 13 +- drivers/usb/core/usb.c | 11 + drivers/usb/gadget/at91_udc.c | 6 +- drivers/usb/misc/iowarrior.c | 6 + drivers/usb/misc/legousbtower.c | 6 + drivers/video/xen-fbfront.c | 8 +- fs/debugfs/file.c | 65 ++++- fs/debugfs/inode.c | 11 + fs/sysfs/symlink.c | 5 +- include/linux/device.h | 15 + include/linux/eisa.h | 4 +- include/linux/firmware.h | 1 - include/linux/genhd.h | 2 +- include/linux/kernel.h | 2 +- include/linux/miscdevice.h | 1 + include/linux/platform_device.h | 4 +- include/linux/sched.h | 2 +- include/linux/shmem_fs.h | 3 + include/linux/tracepoint.h | 4 +- include/linux/usb.h | 3 + init/Kconfig | 6 +- init/do_mounts.c | 2 +- init/main.c | 2 + kernel/trace/Kconfig | 10 +- kernel/trace/trace.c | 24 +- kernel/user.c | 67 ++-- lib/kobject.c | 7 +- mm/shmem.c | 9 +- samples/Kconfig | 3 +- samples/firmware_class/firmware_sample_driver.c | 121 ------- .../firmware_sample_firmware_class.c | 204 ----------- scripts/tracing/draw_functrace.py | 8 +- sound/sound_core.c | 7 + 124 files changed, 1313 insertions(+), 831 deletions(-) create mode 100644 drivers/base/devtmpfs.c delete mode 100644 samples/firmware_class/firmware_sample_driver.c delete mode 100644 samples/firmware_class/firmware_sample_firmware_class.c Merging quilt/usb $ git merge quilt/usb Resolved 'drivers/usb/class/cdc-acm.c' using previous resolution. Resolved 'drivers/usb/serial/cp210x.c' using previous resolution. Resolved 'drivers/usb/serial/ftdi_sio.c' using previous resolution. Resolved 'drivers/usb/serial/kobil_sct.c' using previous resolution. Resolved 'drivers/usb/serial/sierra.c' using previous resolution. Auto-merging MAINTAINERS Auto-merging drivers/usb/Kconfig Auto-merging drivers/usb/class/cdc-acm.c CONFLICT (content): Merge conflict in drivers/usb/class/cdc-acm.c Auto-merging drivers/usb/class/cdc-acm.h Auto-merging drivers/usb/serial/belkin_sa.c Auto-merging drivers/usb/serial/cp210x.c CONFLICT (content): Merge conflict in drivers/usb/serial/cp210x.c Auto-merging drivers/usb/serial/cyberjack.c Auto-merging drivers/usb/serial/cypress_m8.c Auto-merging drivers/usb/serial/digi_acceleport.c Auto-merging drivers/usb/serial/empeg.c Auto-merging drivers/usb/serial/ftdi_sio.c CONFLICT (content): Merge conflict in drivers/usb/serial/ftdi_sio.c Auto-merging drivers/usb/serial/garmin_gps.c Auto-merging drivers/usb/serial/generic.c Auto-merging drivers/usb/serial/io_edgeport.c Auto-merging drivers/usb/serial/io_ti.c Auto-merging drivers/usb/serial/ipaq.c Auto-merging drivers/usb/serial/iuu_phoenix.c Auto-merging drivers/usb/serial/keyspan.c Auto-merging drivers/usb/serial/keyspan.h Auto-merging drivers/usb/serial/keyspan_pda.c Auto-merging drivers/usb/serial/kl5kusb105.c Auto-merging drivers/usb/serial/kobil_sct.c CONFLICT (content): Merge conflict in drivers/usb/serial/kobil_sct.c Auto-merging drivers/usb/serial/mct_u232.c Auto-merging drivers/usb/serial/mos7720.c Auto-merging drivers/usb/serial/mos7840.c Auto-merging drivers/usb/serial/omninet.c Auto-merging drivers/usb/serial/opticon.c Auto-merging drivers/usb/serial/option.c Auto-merging drivers/usb/serial/oti6858.c Auto-merging drivers/usb/serial/pl2303.c Auto-merging drivers/usb/serial/sierra.c CONFLICT (content): Merge conflict in drivers/usb/serial/sierra.c Auto-merging drivers/usb/serial/spcp8x5.c Auto-merging drivers/usb/serial/symbolserial.c Auto-merging drivers/usb/serial/ti_usb_3410_5052.c Auto-merging drivers/usb/serial/usb-serial.c Auto-merging drivers/usb/serial/visor.c Auto-merging drivers/usb/serial/whiteheat.c Auto-merging fs/befs/linuxvfs.c Auto-merging fs/fat/dir.c Auto-merging fs/fat/namei_vfat.c Auto-merging include/linux/pci.h Auto-merging include/linux/pci_ids.h Auto-merging include/linux/usb/serial.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 6c30a2e] Merge branch 'quilt/usb' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 6 + .../arm/plat-s3c/include/plat/regs-usb-hsotg-phy.h | 50 + arch/arm/plat-s3c/include/plat/regs-usb-hsotg.h | 377 +++ drivers/pci/pci.c | 5 + drivers/staging/uc2322/aten2011.c | 4 +- drivers/usb/Kconfig | 1 + drivers/usb/Makefile | 1 + drivers/usb/class/cdc-acm.c | 66 +- drivers/usb/class/cdc-acm.h | 2 + drivers/usb/core/Kconfig | 16 +- drivers/usb/core/Makefile | 4 +- drivers/usb/core/config.c | 192 ++- drivers/usb/core/driver.c | 56 +- drivers/usb/core/endpoint.c | 160 +- drivers/usb/core/hcd-pci.c | 244 +- drivers/usb/core/hcd.c | 220 ++- drivers/usb/core/hcd.h | 55 +- drivers/usb/core/hub.c | 134 +- drivers/usb/core/hub.h | 3 + drivers/usb/core/message.c | 194 +- drivers/usb/core/sysfs.c | 12 +- drivers/usb/core/urb.c | 12 + drivers/usb/core/usb.c | 76 +- drivers/usb/core/usb.h | 13 +- drivers/usb/gadget/Kconfig | 53 +- drivers/usb/gadget/Makefile | 8 + drivers/usb/gadget/at91_udc.c | 4 +- drivers/usb/gadget/atmel_usba_udc.c | 20 +- drivers/usb/gadget/audio.c | 302 ++ drivers/usb/gadget/ci13xxx_udc.c | 6 +- drivers/usb/gadget/f_audio.c | 707 ++++ drivers/usb/gadget/f_rndis.c | 4 +- drivers/usb/gadget/file_storage.c | 93 +- drivers/usb/gadget/fsl_mx3_udc.c | 95 + .../usb/gadget/{fsl_usb2_udc.c => fsl_udc_core.c} | 69 +- drivers/usb/gadget/fsl_usb2_udc.h | 18 + drivers/usb/gadget/gadget_chips.h | 8 + drivers/usb/gadget/goku_udc.c | 6 +- drivers/usb/gadget/imx_udc.c | 14 +- drivers/usb/gadget/inode.c | 14 +- drivers/usb/gadget/langwell_udc.c | 3373 ++++++++++++++++++++ drivers/usb/gadget/langwell_udc.h | 228 ++ drivers/usb/gadget/pxa27x_udc.c | 71 +- drivers/usb/gadget/pxa27x_udc.h | 2 + drivers/usb/gadget/s3c-hsotg.c | 3269 +++++++++++++++++++ drivers/usb/gadget/u_audio.c | 319 ++ drivers/usb/gadget/u_audio.h | 56 + drivers/usb/gadget/u_serial.c | 1 + drivers/usb/host/Kconfig | 20 + drivers/usb/host/Makefile | 2 + drivers/usb/host/ehci-au1xxx.c | 1 + drivers/usb/host/ehci-fsl.c | 1 + drivers/usb/host/ehci-hcd.c | 47 +- drivers/usb/host/ehci-hub.c | 4 +- drivers/usb/host/ehci-ixp4xx.c | 1 + drivers/usb/host/ehci-orion.c | 3 +- drivers/usb/host/ehci-pci.c | 27 +- drivers/usb/host/ehci-ppc-of.c | 1 + drivers/usb/host/ehci-ps3.c | 1 + drivers/usb/host/ehci-q.c | 19 +- drivers/usb/host/ehci-sched.c | 8 +- drivers/usb/host/ehci.h | 1 + drivers/usb/host/fhci-dbg.c | 2 +- drivers/usb/host/hwa-hc.c | 21 - drivers/usb/host/ohci-dbg.c | 31 +- drivers/usb/host/ohci-hcd.c | 38 +- drivers/usb/host/ohci-pci.c | 24 +- drivers/usb/host/pci-quirks.c | 123 + drivers/usb/host/r8a66597-hcd.c | 62 +- drivers/usb/host/r8a66597.h | 38 +- drivers/usb/host/uhci-hcd.c | 23 +- drivers/usb/host/uhci-q.c | 2 +- drivers/usb/host/xhci-dbg.c | 485 +++ drivers/usb/host/xhci-ext-caps.h | 145 + drivers/usb/host/xhci-hcd.c | 1274 ++++++++ drivers/usb/host/xhci-hub.c | 308 ++ drivers/usb/host/xhci-mem.c | 769 +++++ drivers/usb/host/xhci-pci.c | 166 + drivers/usb/host/xhci-ring.c | 1648 ++++++++++ drivers/usb/host/xhci.h | 1157 +++++++ drivers/usb/misc/usbtest.c | 39 +- drivers/usb/mon/mon_text.c | 2 +- drivers/usb/musb/Kconfig | 2 + drivers/usb/musb/blackfin.c | 11 +- drivers/usb/musb/cppi_dma.c | 34 +- drivers/usb/musb/cppi_dma.h | 6 +- drivers/usb/musb/davinci.c | 54 +- drivers/usb/musb/musb_core.c | 228 +- drivers/usb/musb/musb_core.h | 22 +- drivers/usb/musb/musb_gadget.c | 45 +- drivers/usb/musb/musb_gadget_ep0.c | 45 +- drivers/usb/musb/musb_host.c | 273 +- drivers/usb/musb/musb_host.h | 1 + drivers/usb/musb/musb_virthub.c | 35 +- drivers/usb/musb/omap2430.c | 71 +- drivers/usb/musb/tusb6010.c | 70 +- drivers/usb/otg/Kconfig | 14 + drivers/usb/otg/Makefile | 1 + drivers/usb/otg/langwell_otg.c | 1915 +++++++++++ drivers/usb/otg/nop-usb-xceiv.c | 25 +- drivers/usb/otg/twl4030-usb.c | 28 +- drivers/usb/serial/aircable.c | 5 +- drivers/usb/serial/belkin_sa.c | 7 +- drivers/usb/serial/bus.c | 27 +- drivers/usb/serial/cp210x.c | 6 +- drivers/usb/serial/cyberjack.c | 20 +- drivers/usb/serial/cypress_m8.c | 11 +- drivers/usb/serial/digi_acceleport.c | 20 +- drivers/usb/serial/empeg.c | 8 - drivers/usb/serial/ftdi_sio.c | 178 +- drivers/usb/serial/ftdi_sio.h | 10 +- drivers/usb/serial/garmin_gps.c | 214 +- drivers/usb/serial/generic.c | 186 +- drivers/usb/serial/io_edgeport.c | 29 +- drivers/usb/serial/io_tables.h | 12 +- drivers/usb/serial/io_ti.c | 22 +- drivers/usb/serial/ipaq.c | 7 - drivers/usb/serial/iuu_phoenix.c | 6 +- drivers/usb/serial/keyspan.c | 13 +- drivers/usb/serial/keyspan.h | 12 +- drivers/usb/serial/keyspan_pda.c | 4 +- drivers/usb/serial/kl5kusb105.c | 39 +- drivers/usb/serial/kobil_sct.c | 12 +- drivers/usb/serial/mct_u232.c | 13 +- drivers/usb/serial/mos7720.c | 9 +- drivers/usb/serial/mos7840.c | 358 ++- drivers/usb/serial/omninet.c | 19 +- drivers/usb/serial/opticon.c | 14 +- drivers/usb/serial/option.c | 36 +- drivers/usb/serial/oti6858.c | 7 +- drivers/usb/serial/pl2303.c | 10 +- drivers/usb/serial/sierra.c | 459 ++-- drivers/usb/serial/spcp8x5.c | 5 +- drivers/usb/serial/symbolserial.c | 14 +- drivers/usb/serial/ti_usb_3410_5052.c | 10 +- drivers/usb/serial/usb-serial.c | 53 +- drivers/usb/serial/usb_debug.c | 41 + drivers/usb/serial/visor.c | 13 +- drivers/usb/serial/whiteheat.c | 6 +- drivers/usb/storage/initializers.c | 14 +- drivers/usb/storage/option_ms.c | 124 +- drivers/usb/storage/sierra_ms.c | 2 +- drivers/usb/storage/unusual_devs.h | 2 +- fs/befs/linuxvfs.c | 20 +- fs/fat/dir.c | 29 +- fs/fat/namei_vfat.c | 4 +- fs/isofs/joliet.c | 36 +- fs/ncpfs/ncplib_kernel.c | 8 +- fs/nls/nls_base.c | 166 +- fs/nls/nls_utf8.c | 13 +- include/linux/nls.h | 35 +- include/linux/pci.h | 8 + include/linux/pci_ids.h | 1 + include/linux/usb.h | 34 +- include/linux/usb/audio.h | 265 ++- include/linux/usb/ch9.h | 17 + include/linux/usb/composite.h | 3 + include/linux/usb/langwell_otg.h | 177 + include/linux/usb/langwell_udc.h | 310 ++ include/linux/usb/otg.h | 4 +- include/linux/usb/r8a66597.h | 44 + include/linux/usb/serial.h | 32 +- 162 files changed, 21070 insertions(+), 2209 deletions(-) create mode 100644 arch/arm/plat-s3c/include/plat/regs-usb-hsotg-phy.h create mode 100644 arch/arm/plat-s3c/include/plat/regs-usb-hsotg.h create mode 100644 drivers/usb/gadget/audio.c create mode 100644 drivers/usb/gadget/f_audio.c create mode 100644 drivers/usb/gadget/fsl_mx3_udc.c rename drivers/usb/gadget/{fsl_usb2_udc.c => fsl_udc_core.c} (99%) create mode 100644 drivers/usb/gadget/langwell_udc.c create mode 100644 drivers/usb/gadget/langwell_udc.h create mode 100644 drivers/usb/gadget/s3c-hsotg.c create mode 100644 drivers/usb/gadget/u_audio.c create mode 100644 drivers/usb/gadget/u_audio.h create mode 100644 drivers/usb/host/xhci-dbg.c create mode 100644 drivers/usb/host/xhci-ext-caps.h create mode 100644 drivers/usb/host/xhci-hcd.c create mode 100644 drivers/usb/host/xhci-hub.c create mode 100644 drivers/usb/host/xhci-mem.c create mode 100644 drivers/usb/host/xhci-pci.c create mode 100644 drivers/usb/host/xhci-ring.c create mode 100644 drivers/usb/host/xhci.h create mode 100644 drivers/usb/otg/langwell_otg.c create mode 100644 include/linux/usb/langwell_otg.h create mode 100644 include/linux/usb/langwell_udc.h create mode 100644 include/linux/usb/r8a66597.h Merging quilt/staging $ git merge quilt/staging Resolved 'drivers/staging/rt2860/common/mlme.c' using previous resolution. Resolved 'drivers/staging/rt2870/common/mlme.c' using previous resolution. Resolved 'drivers/staging/rt3070/common/mlme.c' using previous resolution. Auto-merging MAINTAINERS Auto-merging drivers/staging/agnx/pci.c Removing drivers/staging/comedi/comedi_rt.h Removing drivers/staging/comedi/drivers/comedi_rt_timer.c Removing drivers/staging/comedi/interrupt.h Removing drivers/staging/comedi/rt.c Removing drivers/staging/comedi/rt_pend_tq.c Removing drivers/staging/comedi/rt_pend_tq.h Auto-merging drivers/staging/rt2860/common/mlme.c CONFLICT (content): Merge conflict in drivers/staging/rt2860/common/mlme.c Removing drivers/staging/rt2860/common/netif_block.c Removing drivers/staging/rt2860/common/netif_block.h Removing drivers/staging/rt2860/leap.h Removing drivers/staging/rt2860/rt_ate.c Removing drivers/staging/rt2860/rt_ate.h Removing drivers/staging/rt2860/sta/dls.c Auto-merging drivers/staging/rt2870/common/mlme.c CONFLICT (content): Merge conflict in drivers/staging/rt2870/common/mlme.c Removing drivers/staging/rt2870/common/netif_block.c Removing drivers/staging/rt2870/leap.h Removing drivers/staging/rt2870/netif_block.h Removing drivers/staging/rt2870/rt_ate.c Removing drivers/staging/rt2870/rt_ate.h Removing drivers/staging/rt2870/sta/dls.c Removing drivers/staging/rt2870/sta_ioctl.c.patch Removing drivers/staging/rt2870/tmp60 Removing drivers/staging/rt2870/tmp61 Auto-merging drivers/staging/rt3070/common/mlme.c CONFLICT (content): Merge conflict in drivers/staging/rt3070/common/mlme.c Removing drivers/staging/rt3070/common/netif_block.c Removing drivers/staging/rt3070/leap.h Removing drivers/staging/rt3070/netif_block.h Removing drivers/staging/rt3070/rt_ate.c Removing drivers/staging/rt3070/rt_ate.h Removing drivers/staging/rt3070/sta/dls.c Removing drivers/staging/serqt_usb/Makefile Removing drivers/staging/serqt_usb/serqt_usb.c Removing drivers/staging/winbond/wbhal.c Auto-merging drivers/staging/wlan-ng/hfa384x_usb.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 9b7fb6d] Merge branch 'quilt/staging' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 1 + drivers/staging/Kconfig | 14 +- drivers/staging/Makefile | 8 +- drivers/staging/agnx/debug.h | 9 +- drivers/staging/agnx/pci.c | 57 +- drivers/staging/agnx/phy.c | 4 +- drivers/staging/agnx/phy.h | 2 +- drivers/staging/agnx/sta.c | 2 +- drivers/staging/agnx/sta.h | 2 +- drivers/staging/altpciechdma/altpciechdma.c | 34 +- drivers/staging/android/Kconfig | 10 +- drivers/staging/android/Makefile | 1 + drivers/staging/android/binder.c | 436 +- drivers/staging/android/logger.c | 12 +- drivers/staging/android/lowmemorykiller.c | 101 +- drivers/staging/android/ram_console.c | 9 +- drivers/staging/android/timed_gpio.c | 98 +- drivers/staging/android/timed_gpio.h | 4 +- drivers/staging/android/timed_output.c | 121 + drivers/staging/android/timed_output.h | 37 + drivers/staging/asus_oled/asus_oled.c | 2 +- drivers/staging/b3dfg/b3dfg.c | 3 +- drivers/staging/comedi/Kconfig | 11 +- drivers/staging/comedi/Makefile | 5 - drivers/staging/comedi/comedi.h | 1 - drivers/staging/comedi/comedi_fops.c | 504 +- drivers/staging/comedi/comedi_ksyms.c | 7 - drivers/staging/comedi/comedi_rt.h | 149 - drivers/staging/comedi/comedidev.h | 16 +- drivers/staging/comedi/drivers.c | 19 +- drivers/staging/comedi/drivers/8253.h | 50 +- drivers/staging/comedi/drivers/8255.c | 23 +- drivers/staging/comedi/drivers/8255.h | 14 +- drivers/staging/comedi/drivers/Makefile | 5 +- drivers/staging/comedi/drivers/acl7225b.c | 22 +- .../comedi/drivers/addi-data/APCI1710_82x54.c | 372 +- .../comedi/drivers/addi-data/APCI1710_82x54.h | 32 +- .../comedi/drivers/addi-data/APCI1710_Chrono.c | 402 +- .../comedi/drivers/addi-data/APCI1710_Chrono.h | 36 +- .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 309 +- .../comedi/drivers/addi-data/APCI1710_Dig_io.h | 8 +- .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 1012 +- .../comedi/drivers/addi-data/APCI1710_INCCPT.h | 188 +- .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 204 +- .../comedi/drivers/addi-data/APCI1710_Inp_cpt.h | 8 +- .../comedi/drivers/addi-data/APCI1710_Pwm.c | 1314 ++-- .../comedi/drivers/addi-data/APCI1710_Pwm.h | 70 +- .../comedi/drivers/addi-data/APCI1710_Ssi.c | 230 +- .../comedi/drivers/addi-data/APCI1710_Ssi.h | 6 +- .../comedi/drivers/addi-data/APCI1710_Tor.c | 432 +- .../comedi/drivers/addi-data/APCI1710_Tor.h | 8 +- .../comedi/drivers/addi-data/APCI1710_Ttl.c | 198 +- .../comedi/drivers/addi-data/APCI1710_Ttl.h | 8 +- .../comedi/drivers/addi-data/addi_amcc_S5920.c | 119 +- .../comedi/drivers/addi-data/addi_amcc_S5920.h | 6 +- .../comedi/drivers/addi-data/addi_amcc_s5933.h | 12 +- .../staging/comedi/drivers/addi-data/addi_common.c | 191 +- .../staging/comedi/drivers/addi-data/addi_common.h | 356 +- .../staging/comedi/drivers/addi-data/addi_eeprom.c | 438 +- .../comedi/drivers/addi-data/amcc_s5933_58.h | 43 +- .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 169 +- .../comedi/drivers/addi-data/hwdrv_APCI1710.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci035.c | 214 +- .../comedi/drivers/addi-data/hwdrv_apci035.h | 34 +- .../comedi/drivers/addi-data/hwdrv_apci1032.c | 106 +- .../comedi/drivers/addi-data/hwdrv_apci1032.h | 29 +- .../comedi/drivers/addi-data/hwdrv_apci1500.c | 532 +- .../comedi/drivers/addi-data/hwdrv_apci1500.h | 4 +- .../comedi/drivers/addi-data/hwdrv_apci1516.c | 174 +- .../comedi/drivers/addi-data/hwdrv_apci1516.h | 29 +- .../comedi/drivers/addi-data/hwdrv_apci1564.c | 507 +- .../comedi/drivers/addi-data/hwdrv_apci1564.h | 52 +- .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 134 +- .../comedi/drivers/addi-data/hwdrv_apci2016.c | 136 +- .../comedi/drivers/addi-data/hwdrv_apci2016.h | 26 +- .../comedi/drivers/addi-data/hwdrv_apci2032.c | 176 +- .../comedi/drivers/addi-data/hwdrv_apci2032.h | 32 +- .../comedi/drivers/addi-data/hwdrv_apci2200.c | 174 +- .../comedi/drivers/addi-data/hwdrv_apci2200.h | 26 +- .../comedi/drivers/addi-data/hwdrv_apci3120.c | 1055 +- .../comedi/drivers/addi-data/hwdrv_apci3120.h | 142 +- .../comedi/drivers/addi-data/hwdrv_apci3200.c | 1701 ++-- .../comedi/drivers/addi-data/hwdrv_apci3200.h | 176 +- .../comedi/drivers/addi-data/hwdrv_apci3501.c | 225 +- .../comedi/drivers/addi-data/hwdrv_apci3501.h | 44 +- .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 274 +- drivers/staging/comedi/drivers/addi_apci_035.c | 2 +- drivers/staging/comedi/drivers/adl_pci6208.c | 177 +- drivers/staging/comedi/drivers/adl_pci7296.c | 22 +- drivers/staging/comedi/drivers/adl_pci7432.c | 32 +- drivers/staging/comedi/drivers/adl_pci8164.c | 325 +- drivers/staging/comedi/drivers/adl_pci9111.c | 135 +- drivers/staging/comedi/drivers/adl_pci9118.c | 648 +- drivers/staging/comedi/drivers/adq12b.c | 82 +- drivers/staging/comedi/drivers/adv_pci1710.c | 348 +- drivers/staging/comedi/drivers/adv_pci1723.c | 122 +- drivers/staging/comedi/drivers/adv_pci_dio.c | 112 +- drivers/staging/comedi/drivers/aio_aio12_8.c | 46 +- drivers/staging/comedi/drivers/aio_iiro_16.c | 44 +- drivers/staging/comedi/drivers/am9513.h | 16 +- drivers/staging/comedi/drivers/amcc_s5933.h | 10 +- drivers/staging/comedi/drivers/amplc_dio200.c | 226 +- drivers/staging/comedi/drivers/amplc_pc236.c | 138 +- drivers/staging/comedi/drivers/amplc_pc263.c | 82 +- drivers/staging/comedi/drivers/amplc_pci224.c | 131 +- drivers/staging/comedi/drivers/amplc_pci230.c | 306 +- drivers/staging/comedi/drivers/c6xdigio.c | 140 +- drivers/staging/comedi/drivers/cb_das16_cs.c | 160 +- drivers/staging/comedi/drivers/cb_pcidas.c | 842 +- drivers/staging/comedi/drivers/cb_pcidas64.c | 1755 ++-- drivers/staging/comedi/drivers/cb_pcidda.c | 323 +- drivers/staging/comedi/drivers/cb_pcidio.c | 75 +- drivers/staging/comedi/drivers/cb_pcimdas.c | 187 +- drivers/staging/comedi/drivers/cb_pcimdda.c | 71 +- drivers/staging/comedi/drivers/comedi_bond.c | 2 +- drivers/staging/comedi/drivers/comedi_fc.c | 2 +- drivers/staging/comedi/drivers/comedi_parport.c | 9 +- drivers/staging/comedi/drivers/comedi_rt_timer.c | 728 -- drivers/staging/comedi/drivers/comedi_test.c | 3 +- drivers/staging/comedi/drivers/contec_pci_dio.c | 46 +- drivers/staging/comedi/drivers/daqboard2000.c | 230 +- drivers/staging/comedi/drivers/das08.c | 542 +- drivers/staging/comedi/drivers/das08.h | 24 +- drivers/staging/comedi/drivers/das08_cs.c | 65 +- drivers/staging/comedi/drivers/das16.c | 816 +- drivers/staging/comedi/drivers/das16m1.c | 152 +- drivers/staging/comedi/drivers/das1800.c | 689 +- drivers/staging/comedi/drivers/das6402.c | 47 +- drivers/staging/comedi/drivers/das800.c | 213 +- drivers/staging/comedi/drivers/dmm32at.c | 128 +- drivers/staging/comedi/drivers/dt2801.c | 214 +- drivers/staging/comedi/drivers/dt2811.c | 92 +- drivers/staging/comedi/drivers/dt2814.c | 48 +- drivers/staging/comedi/drivers/dt2815.c | 36 +- drivers/staging/comedi/drivers/dt2817.c | 27 +- drivers/staging/comedi/drivers/dt282x.c | 391 +- drivers/staging/comedi/drivers/dt3000.c | 220 +- drivers/staging/comedi/drivers/fl512.c | 42 +- drivers/staging/comedi/drivers/gsc_hpdi.c | 234 +- drivers/staging/comedi/drivers/icp_multi.c | 15 +- drivers/staging/comedi/drivers/icp_multi.h | 12 +- drivers/staging/comedi/drivers/ii_pci20kc.c | 83 +- drivers/staging/comedi/drivers/jr3_pci.c | 211 +- drivers/staging/comedi/drivers/jr3_pci.h | 8 +- drivers/staging/comedi/drivers/ke_counter.c | 47 +- drivers/staging/comedi/drivers/me4000.c | 9 +- drivers/staging/comedi/drivers/me_daq.c | 1 + drivers/staging/comedi/drivers/mite.c | 28 +- drivers/staging/comedi/drivers/mite.h | 2 +- drivers/staging/comedi/drivers/mpc624.c | 218 +- drivers/staging/comedi/drivers/mpc8260cpm.c | 32 +- drivers/staging/comedi/drivers/multiq3.c | 43 +- drivers/staging/comedi/drivers/ni_6527.c | 73 +- drivers/staging/comedi/drivers/ni_65xx.c | 251 +- drivers/staging/comedi/drivers/ni_660x.c | 232 +- drivers/staging/comedi/drivers/ni_670x.c | 84 +- drivers/staging/comedi/drivers/ni_at_a2150.c | 275 +- drivers/staging/comedi/drivers/ni_at_ao.c | 90 +- drivers/staging/comedi/drivers/ni_atmio.c | 327 +- drivers/staging/comedi/drivers/ni_atmio16d.c | 117 +- drivers/staging/comedi/drivers/ni_daq_700.c | 113 +- drivers/staging/comedi/drivers/ni_daq_dio24.c | 110 +- drivers/staging/comedi/drivers/ni_labpc.c | 693 +- drivers/staging/comedi/drivers/ni_labpc.h | 50 +- drivers/staging/comedi/drivers/ni_labpc_cs.c | 105 +- drivers/staging/comedi/drivers/ni_mio_common.c | 970 +- drivers/staging/comedi/drivers/ni_mio_cs.c | 256 +- drivers/staging/comedi/drivers/ni_pcidio.c | 188 +- drivers/staging/comedi/drivers/ni_pcimio.c | 139 +- drivers/staging/comedi/drivers/ni_stc.h | 148 +- drivers/staging/comedi/drivers/ni_tio.c | 18 +- drivers/staging/comedi/drivers/ni_tio.h | 18 +- drivers/staging/comedi/drivers/ni_tio_internal.h | 14 +- drivers/staging/comedi/drivers/ni_tiocmd.c | 40 +- drivers/staging/comedi/drivers/pcl711.c | 68 +- drivers/staging/comedi/drivers/pcl724.c | 54 +- drivers/staging/comedi/drivers/pcl725.c | 24 +- drivers/staging/comedi/drivers/pcl726.c | 72 +- drivers/staging/comedi/drivers/pcl730.c | 34 +- drivers/staging/comedi/drivers/pcl812.c | 320 +- drivers/staging/comedi/drivers/pcl816.c | 417 +- drivers/staging/comedi/drivers/pcl818.c | 578 +- drivers/staging/comedi/drivers/pcm3724.c | 67 +- drivers/staging/comedi/drivers/pcm3730.c | 28 +- drivers/staging/comedi/drivers/pcm_common.c | 111 + drivers/staging/comedi/drivers/pcm_common.h | 8 + drivers/staging/comedi/drivers/pcmad.c | 42 +- drivers/staging/comedi/drivers/pcmda12.c | 45 +- drivers/staging/comedi/drivers/pcmmio.c | 268 +- drivers/staging/comedi/drivers/pcmuio.c | 241 +- drivers/staging/comedi/drivers/plx9080.h | 8 +- drivers/staging/comedi/drivers/poc.c | 104 +- drivers/staging/comedi/drivers/quatech_daqp_cs.c | 79 +- drivers/staging/comedi/drivers/rtd520.c | 78 +- drivers/staging/comedi/drivers/rti800.c | 77 +- drivers/staging/comedi/drivers/rti802.c | 24 +- drivers/staging/comedi/drivers/s526.c | 386 +- drivers/staging/comedi/drivers/s626.c | 282 +- drivers/staging/comedi/drivers/s626.h | 2 +- drivers/staging/comedi/drivers/serial2002.c | 100 +- drivers/staging/comedi/drivers/skel.c | 90 +- drivers/staging/comedi/drivers/ssv_dnp.c | 49 +- drivers/staging/comedi/drivers/unioxx5.c | 86 +- drivers/staging/comedi/drivers/usbdux.c | 181 +- drivers/staging/comedi/drivers/usbduxfast.c | 213 +- drivers/staging/comedi/drivers/vmk80xx.c | 1399 +++ drivers/staging/comedi/interrupt.h | 51 - drivers/staging/comedi/kcomedilib/data.c | 5 +- .../staging/comedi/kcomedilib/kcomedilib_main.c | 33 +- drivers/staging/comedi/kcomedilib/ksyms.c | 49 +- drivers/staging/comedi/range.c | 9 +- drivers/staging/comedi/rt.c | 411 - drivers/staging/comedi/rt_pend_tq.c | 113 - drivers/staging/comedi/rt_pend_tq.h | 10 - drivers/staging/cpc-usb/Kconfig | 4 + drivers/staging/cpc-usb/Makefile | 3 + drivers/staging/{serqt_usb => cpc-usb}/TODO | 5 +- drivers/staging/cpc-usb/cpc-usb_drv.c | 1185 ++ drivers/staging/cpc-usb/cpc.h | 440 + drivers/staging/cpc-usb/cpc_int.h | 83 + drivers/staging/cpc-usb/cpcusb.h | 86 + drivers/staging/cpc-usb/sja2m16c.h | 41 + drivers/staging/cpc-usb/sja2m16c_2.c | 452 + drivers/staging/echo/echo.c | 2 +- drivers/staging/epl/EplSdoUdpu.c | 3 +- drivers/staging/epl/ShbIpc-LinuxKernel.c | 8 +- drivers/staging/frontier/alphatrack.c | 1 - drivers/staging/frontier/tranzport.c | 1 - drivers/staging/go7007/wis-sony-tuner.c | 2 +- drivers/staging/heci/heci.h | 1 - drivers/staging/heci/heci_data_structures.h | 1 - drivers/staging/heci/heci_init.c | 14 +- drivers/staging/heci/heci_interface.c | 17 +- drivers/staging/heci/heci_interface.h | 2 +- drivers/staging/heci/heci_main.c | 50 +- drivers/staging/heci/interrupt.c | 28 +- drivers/staging/heci/io_heci.c | 47 +- drivers/staging/meilhaus/me0600_ext_irq.c | 5 - drivers/staging/meilhaus/me0900_di.c | 1 - drivers/staging/meilhaus/me1400_device.c | 1 - drivers/staging/meilhaus/me1400_ext_irq.c | 5 - drivers/staging/meilhaus/me4600_ai.c | 4 - drivers/staging/meilhaus/me4600_ai.h | 1 - drivers/staging/meilhaus/me4600_ao.c | 6 +- drivers/staging/meilhaus/me4600_ext_irq.c | 5 - drivers/staging/meilhaus/me6000_ao.c | 4 - drivers/staging/meilhaus/me6000_ao.h | 1 - drivers/staging/meilhaus/me8100_di.c | 5 - drivers/staging/meilhaus/me8200_di.c | 9 - drivers/staging/meilhaus/me8200_do.c | 5 - drivers/staging/meilhaus/memain.c | 184 +- drivers/staging/meilhaus/memain.h | 194 - drivers/staging/octeon/Kconfig | 12 + drivers/staging/octeon/Makefile | 30 + drivers/staging/octeon/cvmx-address.h | 274 + drivers/staging/octeon/cvmx-asxx-defs.h | 475 + drivers/staging/octeon/cvmx-cmd-queue.c | 306 + drivers/staging/octeon/cvmx-cmd-queue.h | 617 + drivers/staging/octeon/cvmx-config.h | 169 + drivers/staging/octeon/cvmx-dbg-defs.h | 72 + drivers/staging/octeon/cvmx-fau.h | 597 + drivers/staging/octeon/cvmx-fpa-defs.h | 403 + drivers/staging/octeon/cvmx-fpa.c | 183 + drivers/staging/octeon/cvmx-fpa.h | 299 + drivers/staging/octeon/cvmx-gmxx-defs.h | 2529 ++++ drivers/staging/octeon/cvmx-helper-board.c | 706 ++ drivers/staging/octeon/cvmx-helper-board.h | 180 + drivers/staging/octeon/cvmx-helper-fpa.c | 243 + drivers/staging/octeon/cvmx-helper-fpa.h | 64 + drivers/staging/octeon/cvmx-helper-loop.c | 85 + drivers/staging/octeon/cvmx-helper-loop.h | 59 + drivers/staging/octeon/cvmx-helper-npi.c | 113 + drivers/staging/octeon/cvmx-helper-npi.h | 60 + drivers/staging/octeon/cvmx-helper-rgmii.c | 525 + drivers/staging/octeon/cvmx-helper-rgmii.h | 110 + drivers/staging/octeon/cvmx-helper-sgmii.c | 550 + drivers/staging/octeon/cvmx-helper-sgmii.h | 104 + drivers/staging/octeon/cvmx-helper-spi.c | 195 + drivers/staging/octeon/cvmx-helper-spi.h | 84 + drivers/staging/octeon/cvmx-helper-util.c | 433 + drivers/staging/octeon/cvmx-helper-util.h | 215 + drivers/staging/octeon/cvmx-helper-xaui.c | 348 + drivers/staging/octeon/cvmx-helper-xaui.h | 103 + drivers/staging/octeon/cvmx-helper.c | 1058 ++ drivers/staging/octeon/cvmx-helper.h | 227 + drivers/staging/octeon/cvmx-interrupt-decodes.c | 371 + drivers/staging/octeon/cvmx-interrupt-rsl.c | 140 + drivers/staging/octeon/cvmx-ipd.h | 338 + drivers/staging/octeon/cvmx-mdio.h | 506 + drivers/staging/octeon/cvmx-packet.h | 65 + drivers/staging/octeon/cvmx-pcsx-defs.h | 370 + drivers/staging/octeon/cvmx-pcsxx-defs.h | 316 + drivers/staging/octeon/cvmx-pip-defs.h | 1267 ++ drivers/staging/octeon/cvmx-pip.h | 524 + drivers/staging/octeon/cvmx-pko-defs.h | 1133 ++ drivers/staging/octeon/cvmx-pko.c | 506 + drivers/staging/octeon/cvmx-pko.h | 610 + drivers/staging/octeon/cvmx-pow.h | 1982 ++++ drivers/staging/octeon/cvmx-scratch.h | 139 + drivers/staging/octeon/cvmx-smix-defs.h | 178 + drivers/staging/octeon/cvmx-spi.c | 667 ++ drivers/staging/octeon/cvmx-spi.h | 269 + drivers/staging/octeon/cvmx-spxx-defs.h | 347 + drivers/staging/octeon/cvmx-srxx-defs.h | 126 + drivers/staging/octeon/cvmx-stxx-defs.h | 292 + drivers/staging/octeon/cvmx-wqe.h | 397 + drivers/staging/octeon/ethernet-common.c | 328 + drivers/staging/octeon/ethernet-common.h | 29 + drivers/staging/octeon/ethernet-defines.h | 134 + drivers/staging/octeon/ethernet-mdio.c | 231 + drivers/staging/octeon/ethernet-mdio.h | 46 + drivers/staging/octeon/ethernet-mem.c | 198 + drivers/staging/octeon/ethernet-mem.h | 29 + drivers/staging/octeon/ethernet-proc.c | 256 + drivers/staging/octeon/ethernet-proc.h | 29 + drivers/staging/octeon/ethernet-rgmii.c | 397 + drivers/staging/octeon/ethernet-rx.c | 505 + drivers/staging/octeon/ethernet-rx.h | 33 + drivers/staging/octeon/ethernet-sgmii.c | 129 + drivers/staging/octeon/ethernet-spi.c | 323 + drivers/staging/octeon/ethernet-tx.c | 634 + drivers/staging/octeon/ethernet-tx.h | 32 + drivers/staging/octeon/ethernet-util.h | 81 + drivers/staging/octeon/ethernet-xaui.c | 127 + drivers/staging/octeon/ethernet.c | 507 + drivers/staging/octeon/octeon-ethernet.h | 127 + drivers/staging/otus/80211core/ccmd.c | 2982 +++--- drivers/staging/otus/80211core/coid.c | 2 +- drivers/staging/p9auth/p9auth.c | 24 +- drivers/staging/pata_rdc/Kconfig | 6 + drivers/staging/pata_rdc/Makefile | 2 + drivers/staging/pata_rdc/pata_rdc.c | 955 ++ drivers/staging/pata_rdc/pata_rdc.h | 144 + drivers/staging/pohmelfs/crypto.c | 3 +- drivers/staging/pohmelfs/dir.c | 9 +- drivers/staging/pohmelfs/inode.c | 15 +- drivers/staging/pohmelfs/net.c | 7 +- drivers/staging/pohmelfs/netfs.h | 65 +- drivers/staging/pohmelfs/trans.c | 7 +- drivers/staging/rspiusb/rspiusb.c | 559 +- drivers/staging/rspiusb/rspiusb.h | 28 +- drivers/staging/rt2860/2860_main_dev.c | 41 +- drivers/staging/rt2860/Makefile | 5 +- drivers/staging/rt2860/ap.h | 40 +- drivers/staging/rt2860/chlist.h | 56 +- drivers/staging/rt2860/common/2860_rtmp_init.c | 25 - drivers/staging/rt2860/common/action.c | 444 +- drivers/staging/rt2860/common/action.h | 7 - drivers/staging/rt2860/common/ba_action.c | 179 +- drivers/staging/rt2860/common/cmm_data.c | 647 +- drivers/staging/rt2860/common/cmm_data_2860.c | 105 +- drivers/staging/rt2860/common/cmm_info.c | 273 +- drivers/staging/rt2860/common/cmm_sanity.c | 401 +- drivers/staging/rt2860/common/cmm_sync.c | 113 +- drivers/staging/rt2860/common/cmm_wpa.c | 28 +- drivers/staging/rt2860/common/dfs.c | 21 - drivers/staging/rt2860/common/eeprom.c | 1268 ++- drivers/staging/rt2860/common/md5.c | 12 - drivers/staging/rt2860/common/mlme.c | 1890 ++-- drivers/staging/rt2860/common/netif_block.c | 144 - drivers/staging/rt2860/common/netif_block.h | 58 - drivers/staging/rt2860/common/rtmp_init.c | 1253 ++- drivers/staging/rt2860/common/rtmp_tkip.c | 21 - drivers/staging/rt2860/common/rtmp_wep.c | 2 - drivers/staging/rt2860/common/spectrum.c | 57 +- drivers/staging/rt2860/leap.h | 215 - drivers/staging/rt2860/mlme.h | 309 - drivers/staging/rt2860/oid.h | 173 +- drivers/staging/rt2860/rt28xx.h | 1218 +-- drivers/staging/rt2860/rt_ate.c | 6009 ---------- drivers/staging/rt2860/rt_ate.h | 347 - drivers/staging/rt2860/rt_config.h | 33 +- drivers/staging/rt2860/rt_linux.c | 45 +- drivers/staging/rt2860/rt_linux.h | 188 +- drivers/staging/rt2860/rt_main_dev.c | 717 +- drivers/staging/rt2860/rt_profile.c | 161 +- drivers/staging/rt2860/rtmp.h | 1831 ++-- drivers/staging/rt2860/rtmp_def.h | 210 +- drivers/staging/rt2860/spectrum.h | 30 - drivers/staging/rt2860/sta/assoc.c | 586 +- drivers/staging/rt2860/sta/auth.c | 14 - drivers/staging/rt2860/sta/auth_rsp.c | 19 - drivers/staging/rt2860/sta/connect.c | 602 +- drivers/staging/rt2860/sta/dls.c | 2197 ---- drivers/staging/rt2860/sta/rtmp_data.c | 336 +- drivers/staging/rt2860/sta/sanity.c | 2 - drivers/staging/rt2860/sta/sync.c | 290 +- drivers/staging/rt2860/sta/wpa.c | 12 +- drivers/staging/rt2860/sta_ioctl.c | 1236 +-- drivers/staging/rt2860/wpa.h | 31 +- drivers/staging/rt2870/2870_main_dev.c | 264 +- drivers/staging/rt2870/Makefile | 4 - drivers/staging/rt2870/aironet.h | 211 +- drivers/staging/rt2870/ap.h | 563 +- drivers/staging/rt2870/chlist.h | 1297 +-- drivers/staging/rt2870/common/2870_rtmp_init.c | 123 +- drivers/staging/rt2870/common/action.c | 1047 +-- drivers/staging/rt2870/common/action.h | 69 +- drivers/staging/rt2870/common/ba_action.c | 1799 +--- drivers/staging/rt2870/common/cmm_data.c | 2732 +----- drivers/staging/rt2870/common/cmm_data_2870.c | 73 +- drivers/staging/rt2870/common/cmm_info.c | 3713 +------ drivers/staging/rt2870/common/cmm_sanity.c | 1664 +--- drivers/staging/rt2870/common/cmm_sync.c | 712 +-- drivers/staging/rt2870/common/cmm_wpa.c | 1655 +--- drivers/staging/rt2870/common/dfs.c | 454 +- drivers/staging/rt2870/common/eeprom.c | 255 +- drivers/staging/rt2870/common/md5.c | 1428 +--- drivers/staging/rt2870/common/mlme.c | 8610 +-------------- drivers/staging/rt2870/common/netif_block.c | 144 - drivers/staging/rt2870/common/rtmp_init.c | 4133 +------- drivers/staging/rt2870/common/rtmp_tkip.c | 1614 +--- drivers/staging/rt2870/common/rtmp_wep.c | 509 +- drivers/staging/rt2870/common/rtusb_bulk.c | 775 +-- drivers/staging/rt2870/common/rtusb_data.c | 13 - drivers/staging/rt2870/common/rtusb_io.c | 211 +- drivers/staging/rt2870/common/spectrum.c | 1877 +--- drivers/staging/rt2870/dfs.h | 101 +- drivers/staging/rt2870/leap.h | 215 - drivers/staging/rt2870/link_list.h | 135 +- drivers/staging/rt2870/md5.h | 108 +- drivers/staging/rt2870/mlme.h | 1472 +--- drivers/staging/rt2870/netif_block.h | 58 - drivers/staging/rt2870/oid.h | 1092 +-- drivers/staging/rt2870/rt2870.h | 252 +- drivers/staging/rt2870/rt28xx.h | 2690 +----- drivers/staging/rt2870/rt_ate.c | 6452 ---------- drivers/staging/rt2870/rt_ate.h | 315 - drivers/staging/rt2870/rt_config.h | 105 +- drivers/staging/rt2870/rt_linux.c | 1096 +-- drivers/staging/rt2870/rt_linux.h | 907 +-- drivers/staging/rt2870/rt_main_dev.c | 1866 +--- drivers/staging/rt2870/rt_profile.c | 2021 +---- drivers/staging/rt2870/rtmp.h | 7587 +------------ drivers/staging/rt2870/rtmp_ckipmic.h | 114 +- drivers/staging/rt2870/rtmp_def.h | 1623 +--- drivers/staging/rt2870/rtmp_type.h | 95 +- drivers/staging/rt2870/spectrum.h | 323 +- drivers/staging/rt2870/spectrum_def.h | 96 +- drivers/staging/rt2870/sta/aironet.c | 1313 +-- drivers/staging/rt2870/sta/assoc.c | 2040 +---- drivers/staging/rt2870/sta/auth.c | 475 +- drivers/staging/rt2870/sta/auth_rsp.c | 167 +- drivers/staging/rt2870/sta/connect.c | 2823 +----- drivers/staging/rt2870/sta/dls.c | 2210 ---- drivers/staging/rt2870/sta/rtmp_data.c | 2620 +---- drivers/staging/rt2870/sta/sanity.c | 421 +- drivers/staging/rt2870/sta/sync.c | 1754 +--- drivers/staging/rt2870/sta/wpa.c | 2108 +---- drivers/staging/rt2870/sta_ioctl.c | 7069 +----------- drivers/staging/rt2870/sta_ioctl.c.patch | 18 - drivers/staging/rt2870/tmp60 | 7037 ----------- drivers/staging/rt2870/tmp61 | 7037 ----------- drivers/staging/rt2870/wpa.h | 358 +- drivers/staging/rt3070/2870_main_dev.c | 1628 +--- drivers/staging/rt3070/Makefile | 4 - drivers/staging/rt3070/action.h | 69 +- drivers/staging/rt3070/aironet.h | 211 +- drivers/staging/rt3070/ap.h | 558 +- drivers/staging/rt3070/chlist.h | 1254 +-- drivers/staging/rt3070/common/2870_rtmp_init.c | 1763 +--- drivers/staging/rt3070/common/action.c | 1039 +-- drivers/staging/rt3070/common/ba_action.c | 1811 +--- drivers/staging/rt3070/common/cmm_data.c | 2828 +----- drivers/staging/rt3070/common/cmm_data_2870.c | 981 +-- drivers/staging/rt3070/common/cmm_info.c | 3396 +------ drivers/staging/rt3070/common/cmm_sanity.c | 1670 +--- drivers/staging/rt3070/common/cmm_sync.c | 712 +-- drivers/staging/rt3070/common/cmm_wpa.c | 1607 +--- drivers/staging/rt3070/common/dfs.c | 442 +- drivers/staging/rt3070/common/eeprom.c | 1499 +--- drivers/staging/rt3070/common/md5.c | 1428 +--- drivers/staging/rt3070/common/mlme.c | 9137 +-------------- drivers/staging/rt3070/common/netif_block.c | 136 - drivers/staging/rt3070/common/rtmp_init.c | 4198 +------- drivers/staging/rt3070/common/rtmp_tkip.c | 1614 +--- drivers/staging/rt3070/common/rtmp_wep.c | 509 +- drivers/staging/rt3070/common/rtusb_bulk.c | 1383 +--- drivers/staging/rt3070/common/rtusb_data.c | 219 +- drivers/staging/rt3070/common/rtusb_io.c | 1909 +--- drivers/staging/rt3070/common/spectrum.c | 1877 +--- drivers/staging/rt3070/dfs.h | 101 +- drivers/staging/rt3070/leap.h | 215 - drivers/staging/rt3070/link_list.h | 135 +- drivers/staging/rt3070/md5.h | 108 +- drivers/staging/rt3070/mlme.h | 1469 +--- drivers/staging/rt3070/netif_block.h | 58 - drivers/staging/rt3070/oid.h | 1143 +-- drivers/staging/rt3070/rt2870.h | 757 +-- drivers/staging/rt3070/rt28xx.h | 2726 +----- drivers/staging/rt3070/rt_ate.c | 6506 ---------- drivers/staging/rt3070/rt_ate.h | 294 - drivers/staging/rt3070/rt_config.h | 122 +- drivers/staging/rt3070/rt_linux.c | 1064 +-- drivers/staging/rt3070/rt_linux.h | 888 +-- drivers/staging/rt3070/rt_main_dev.c | 1802 +--- drivers/staging/rt3070/rt_profile.c | 2042 +---- drivers/staging/rt3070/rtmp.h | 7729 +------------ drivers/staging/rt3070/rtmp_ckipmic.h | 114 +- drivers/staging/rt3070/rtmp_def.h | 1560 +--- drivers/staging/rt3070/rtmp_type.h | 96 +- drivers/staging/rt3070/spectrum.h | 323 +- drivers/staging/rt3070/spectrum_def.h | 96 +- drivers/staging/rt3070/sta/aironet.c | 1313 +-- drivers/staging/rt3070/sta/assoc.c | 2061 +---- drivers/staging/rt3070/sta/auth.c | 476 +- drivers/staging/rt3070/sta/auth_rsp.c | 168 +- drivers/staging/rt3070/sta/connect.c | 2857 +----- drivers/staging/rt3070/sta/dls.c | 2170 ---- drivers/staging/rt3070/sta/rtmp_data.c | 2638 +----- drivers/staging/rt3070/sta/sanity.c | 421 +- drivers/staging/rt3070/sta/sync.c | 1756 +--- drivers/staging/rt3070/sta/wpa.c | 2100 +---- drivers/staging/rt3070/sta_ioctl.c | 7204 +----------- drivers/staging/rt3070/wpa.h | 357 +- drivers/staging/rtl8187se/Kconfig | 2 +- .../staging/rtl8187se/ieee80211/ieee80211_module.c | 1 - drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 2 +- drivers/staging/rtl8187se/r8180_core.c | 25 +- drivers/staging/rtl8187se/r8180_dm.c | 6 +- drivers/staging/rtl8187se/r8180_pm.c | 6 +- drivers/staging/rtl8192su/Kconfig | 6 + drivers/staging/rtl8192su/Makefile | 66 + drivers/staging/rtl8192su/authors | 1 + drivers/staging/rtl8192su/dot11d.h | 102 + drivers/staging/rtl8192su/ieee80211.h | 2901 +++++ drivers/staging/rtl8192su/ieee80211/EndianFree.h | 199 + drivers/staging/rtl8192su/ieee80211/Makefile | 31 + drivers/staging/rtl8192su/ieee80211/aes.c | 469 + drivers/staging/rtl8192su/ieee80211/api.c | 246 + drivers/staging/rtl8192su/ieee80211/arc4.c | 103 + drivers/staging/rtl8192su/ieee80211/autoload.c | 40 + drivers/staging/rtl8192su/ieee80211/cipher.c | 299 + drivers/staging/rtl8192su/ieee80211/compress.c | 64 + .../staging/rtl8192su/ieee80211/crypto_compat.h | 90 + drivers/staging/rtl8192su/ieee80211/digest.c | 108 + drivers/staging/rtl8192su/ieee80211/dot11d.c | 239 + drivers/staging/rtl8192su/ieee80211/dot11d.h | 102 + drivers/staging/rtl8192su/ieee80211/ieee80211.h | 2901 +++++ .../staging/rtl8192su/ieee80211/ieee80211_crypt.c | 273 + .../staging/rtl8192su/ieee80211/ieee80211_crypt.h | 93 + .../rtl8192su/ieee80211/ieee80211_crypt_ccmp.c | 534 + .../rtl8192su/ieee80211/ieee80211_crypt_tkip.c | 1034 ++ .../rtl8192su/ieee80211/ieee80211_crypt_wep.c | 397 + .../staging/rtl8192su/ieee80211/ieee80211_module.c | 394 + drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 2832 +++++ .../rtl8192su/ieee80211/ieee80211_softmac.c | 3580 ++++++ .../rtl8192su/ieee80211/ieee80211_softmac_wx.c | 711 ++ drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 947 ++ drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 1032 ++ drivers/staging/rtl8192su/ieee80211/internal.h | 115 + drivers/staging/rtl8192su/ieee80211/kmap_types.h | 20 + drivers/staging/rtl8192su/ieee80211/michael_mic.c | 194 + drivers/staging/rtl8192su/ieee80211/proc.c | 116 + drivers/staging/rtl8192su/ieee80211/readme | 162 + drivers/staging/rtl8192su/ieee80211/rtl819x_BA.h | 69 + .../staging/rtl8192su/ieee80211/rtl819x_BAProc.c | 781 ++ drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h | 517 + .../staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 2037 ++++ drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h | 749 ++ drivers/staging/rtl8192su/ieee80211/rtl819x_TS.h | 56 + .../staging/rtl8192su/ieee80211/rtl819x_TSProc.c | 667 ++ drivers/staging/rtl8192su/ieee80211/rtl_crypto.h | 399 + drivers/staging/rtl8192su/ieee80211/scatterwalk.c | 126 + drivers/staging/rtl8192su/ieee80211/scatterwalk.h | 51 + drivers/staging/rtl8192su/ieee80211_crypt.h | 86 + drivers/staging/rtl8192su/r8180_93cx6.c | 146 + drivers/staging/rtl8192su/r8180_93cx6.h | 45 + drivers/staging/rtl8192su/r8190_rtl8256.c | 312 + drivers/staging/rtl8192su/r8190_rtl8256.h | 27 + drivers/staging/rtl8192su/r8192SU_HWImg.c | 4902 ++++++++ drivers/staging/rtl8192su/r8192SU_HWImg.h | 44 + drivers/staging/rtl8192su/r8192S_Efuse.c | 2442 ++++ drivers/staging/rtl8192su/r8192S_Efuse.h | 101 + drivers/staging/rtl8192su/r8192S_FwImgDTM.h | 3797 ++++++ drivers/staging/rtl8192su/r8192S_firmware.c | 1023 ++ drivers/staging/rtl8192su/r8192S_firmware.h | 212 + drivers/staging/rtl8192su/r8192S_hw.h | 1677 +++ drivers/staging/rtl8192su/r8192S_phy.c | 5028 ++++++++ drivers/staging/rtl8192su/r8192S_phy.h | 138 + drivers/staging/rtl8192su/r8192S_phyreg.h | 1033 ++ drivers/staging/rtl8192su/r8192S_rtl6052.c | 946 ++ drivers/staging/rtl8192su/r8192S_rtl6052.h | 134 + drivers/staging/rtl8192su/r8192S_rtl8225.c | 292 + drivers/staging/rtl8192su/r8192S_rtl8225.h | 30 + drivers/staging/rtl8192su/r8192U.h | 2112 ++++ drivers/staging/rtl8192su/r8192U_core.c |12460 ++++++++++++++++++++ drivers/staging/rtl8192su/r8192U_dm.c | 4521 +++++++ drivers/staging/rtl8192su/r8192U_dm.h | 309 + drivers/staging/rtl8192su/r8192U_hw.h | 746 ++ drivers/staging/rtl8192su/r8192U_pm.c | 77 + drivers/staging/rtl8192su/r8192U_pm.h | 27 + drivers/staging/rtl8192su/r8192U_wx.c | 1350 +++ drivers/staging/rtl8192su/r8192U_wx.h | 23 + drivers/staging/rtl8192su/r819xU_HTGen.h | 22 + drivers/staging/rtl8192su/r819xU_HTType.h | 392 + drivers/staging/rtl8192su/r819xU_cmdpkt.c | 826 ++ drivers/staging/rtl8192su/r819xU_cmdpkt.h | 219 + drivers/staging/rtl8192su/r819xU_firmware.c | 707 ++ drivers/staging/rtl8192su/r819xU_firmware.h | 106 + drivers/staging/rtl8192su/r819xU_firmware_img.c | 3447 ++++++ drivers/staging/rtl8192su/r819xU_firmware_img.h | 35 + drivers/staging/rtl8192su/r819xU_phy.c | 1826 +++ drivers/staging/rtl8192su/r819xU_phy.h | 94 + drivers/staging/rtl8192su/r819xU_phyreg.h | 871 ++ drivers/staging/serqt_usb/Makefile | 1 - drivers/staging/serqt_usb/serqt_usb.c | 2656 ----- drivers/staging/{serqt_usb => serqt_usb2}/Kconfig | 4 +- drivers/staging/serqt_usb2/Makefile | 1 + drivers/staging/serqt_usb2/serqt_usb2.c | 1664 +++ drivers/staging/slicoss/slicoss.c | 3 +- drivers/staging/stlc45xx/stlc45xx.c | 11 +- drivers/staging/sxg/sxg.c | 40 +- drivers/staging/sxg/sxg_ethtool.c | 2 +- drivers/staging/udlfb/Kconfig | 8 + drivers/staging/udlfb/Makefile | 1 + drivers/staging/udlfb/udlfb.c | 753 ++ drivers/staging/udlfb/udlfb.h | 198 + drivers/staging/vt6655/80211hdr.h | 357 + drivers/staging/vt6655/80211mgr.c | 1050 ++ drivers/staging/vt6655/80211mgr.h | 832 ++ drivers/staging/vt6655/IEEE11h.c | 324 + drivers/staging/vt6655/IEEE11h.h | 68 + drivers/staging/vt6655/Kconfig | 6 + drivers/staging/vt6655/Makefile | 38 + drivers/staging/vt6655/Makefile.arm | 181 + drivers/staging/vt6655/Makefile.x86 | 209 + drivers/staging/vt6655/aes_ccmp.c | 410 + drivers/staging/vt6655/aes_ccmp.h | 48 + drivers/staging/vt6655/baseband.c | 2990 +++++ drivers/staging/vt6655/baseband.h | 198 + drivers/staging/vt6655/bssdb.c | 1786 +++ drivers/staging/vt6655/bssdb.h | 380 + drivers/staging/vt6655/card.c | 3126 +++++ drivers/staging/vt6655/card.h | 273 + drivers/staging/vt6655/country.h | 192 + drivers/staging/vt6655/datarate.c | 455 + drivers/staging/vt6655/datarate.h | 95 + drivers/staging/vt6655/desc.h | 697 ++ drivers/staging/vt6655/device.h | 1063 ++ drivers/staging/vt6655/device_cfg.h | 142 + drivers/staging/vt6655/device_main.c | 4074 +++++++ drivers/staging/vt6655/dpc.c | 1668 +++ drivers/staging/vt6655/dpc.h | 75 + drivers/staging/vt6655/hostap.c | 914 ++ drivers/staging/vt6655/hostap.h | 94 + drivers/staging/vt6655/iocmd.h | 481 + drivers/staging/vt6655/ioctl.c | 775 ++ drivers/staging/vt6655/ioctl.h | 74 + drivers/staging/vt6655/iowpa.h | 159 + drivers/staging/vt6655/iwctl.c | 2397 ++++ drivers/staging/vt6655/iwctl.h | 332 + drivers/staging/vt6655/kcompat.h | 84 + drivers/staging/vt6655/key.c | 836 ++ drivers/staging/vt6655/key.h | 202 + drivers/staging/vt6655/mac.c | 1752 +++ drivers/staging/vt6655/mac.h | 1166 ++ drivers/staging/vt6655/mib.c | 616 + drivers/staging/vt6655/mib.h | 399 + drivers/staging/vt6655/michael.c | 188 + drivers/staging/vt6655/michael.h | 62 + drivers/staging/vt6655/power.c | 441 + drivers/staging/vt6655/power.h | 85 + drivers/staging/vt6655/rc4.c | 86 + drivers/staging/vt6655/rc4.h | 51 + drivers/staging/vt6655/rf.c | 1283 ++ drivers/staging/vt6655/rf.h | 118 + drivers/staging/vt6655/rxtx.c | 3269 +++++ drivers/staging/vt6655/rxtx.h | 132 + drivers/staging/vt6655/srom.c | 437 + drivers/staging/vt6655/srom.h | 179 + drivers/staging/vt6655/tbit.h | 78 + drivers/staging/vt6655/tcrc.c | 207 + drivers/staging/vt6655/tcrc.h | 71 + drivers/staging/vt6655/test | 9 + drivers/staging/vt6655/tether.c | 123 + drivers/staging/vt6655/tether.h | 256 + drivers/staging/vt6655/tkip.c | 284 + drivers/staging/vt6655/tkip.h | 76 + drivers/staging/vt6655/tmacro.h | 152 + drivers/staging/vt6655/tpci.h | 117 + drivers/staging/vt6655/ttype.h | 386 + drivers/staging/vt6655/umem.h | 75 + drivers/staging/vt6655/upc.h | 171 + drivers/staging/vt6655/vntconfiguration.dat | 1 + drivers/staging/vt6655/vntwifi.c | 832 ++ drivers/staging/vt6655/vntwifi.h | 330 + drivers/staging/vt6655/wcmd.c | 1178 ++ drivers/staging/vt6655/wcmd.h | 151 + drivers/staging/vt6655/wctl.c | 261 + drivers/staging/vt6655/wctl.h | 127 + drivers/staging/vt6655/wmgr.c | 5088 ++++++++ drivers/staging/vt6655/wmgr.h | 521 + drivers/staging/vt6655/wpa.c | 339 + drivers/staging/vt6655/wpa.h | 98 + drivers/staging/vt6655/wpa2.c | 373 + drivers/staging/vt6655/wpa2.h | 100 + drivers/staging/vt6655/wpactl.c | 1017 ++ drivers/staging/vt6655/wpactl.h | 89 + drivers/staging/vt6655/wroute.c | 211 + drivers/staging/vt6655/wroute.h | 65 + drivers/staging/winbond/Makefile | 1 - drivers/staging/winbond/mds.c | 2 +- drivers/staging/winbond/mto.c | 2 +- drivers/staging/winbond/phy_calibration.c | 19 + drivers/staging/winbond/wbhal.c | 568 - drivers/staging/winbond/wbhal_f.h | 21 - drivers/staging/winbond/wbhal_s.h | 1 - drivers/staging/winbond/wbusb.c | 785 +- drivers/staging/wlan-ng/README | 1 - drivers/staging/wlan-ng/hfa384x.h | 286 +- drivers/staging/wlan-ng/hfa384x_usb.c | 323 +- drivers/staging/wlan-ng/p80211conv.c | 21 +- drivers/staging/wlan-ng/p80211conv.h | 4 +- drivers/staging/wlan-ng/p80211hdr.h | 3 - drivers/staging/wlan-ng/p80211meta.h | 1 - drivers/staging/wlan-ng/p80211metadef.h | 48 + drivers/staging/wlan-ng/p80211mgmt.h | 42 +- drivers/staging/wlan-ng/p80211msg.h | 1 - drivers/staging/wlan-ng/p80211netdev.c | 99 +- drivers/staging/wlan-ng/p80211netdev.h | 47 +- drivers/staging/wlan-ng/p80211req.c | 20 +- drivers/staging/wlan-ng/p80211req.h | 2 +- drivers/staging/wlan-ng/p80211types.h | 7 +- drivers/staging/wlan-ng/p80211wep.c | 198 +- drivers/staging/wlan-ng/p80211wext.c | 147 +- drivers/staging/wlan-ng/prism2fw.c | 1406 +++ drivers/staging/wlan-ng/prism2mgmt.c | 117 +- drivers/staging/wlan-ng/prism2mgmt.h | 48 +- drivers/staging/wlan-ng/prism2mib.c | 159 +- drivers/staging/wlan-ng/prism2sta.c | 268 +- drivers/staging/wlan-ng/prism2usb.c | 14 +- 732 files changed, 191521 insertions(+), 240492 deletions(-) create mode 100644 drivers/staging/android/timed_output.c create mode 100644 drivers/staging/android/timed_output.h delete mode 100644 drivers/staging/comedi/comedi_rt.h delete mode 100644 drivers/staging/comedi/drivers/comedi_rt_timer.c create mode 100644 drivers/staging/comedi/drivers/pcm_common.c create mode 100644 drivers/staging/comedi/drivers/pcm_common.h create mode 100644 drivers/staging/comedi/drivers/vmk80xx.c delete mode 100644 drivers/staging/comedi/interrupt.h delete mode 100644 drivers/staging/comedi/rt.c delete mode 100644 drivers/staging/comedi/rt_pend_tq.c delete mode 100644 drivers/staging/comedi/rt_pend_tq.h create mode 100644 drivers/staging/cpc-usb/Kconfig create mode 100644 drivers/staging/cpc-usb/Makefile rename drivers/staging/{serqt_usb => cpc-usb}/TODO (63%) create mode 100644 drivers/staging/cpc-usb/cpc-usb_drv.c create mode 100644 drivers/staging/cpc-usb/cpc.h create mode 100644 drivers/staging/cpc-usb/cpc_int.h create mode 100644 drivers/staging/cpc-usb/cpcusb.h create mode 100644 drivers/staging/cpc-usb/sja2m16c.h create mode 100644 drivers/staging/cpc-usb/sja2m16c_2.c create mode 100644 drivers/staging/octeon/Kconfig create mode 100644 drivers/staging/octeon/Makefile create mode 100644 drivers/staging/octeon/cvmx-address.h create mode 100644 drivers/staging/octeon/cvmx-asxx-defs.h create mode 100644 drivers/staging/octeon/cvmx-cmd-queue.c create mode 100644 drivers/staging/octeon/cvmx-cmd-queue.h create mode 100644 drivers/staging/octeon/cvmx-config.h create mode 100644 drivers/staging/octeon/cvmx-dbg-defs.h create mode 100644 drivers/staging/octeon/cvmx-fau.h create mode 100644 drivers/staging/octeon/cvmx-fpa-defs.h create mode 100644 drivers/staging/octeon/cvmx-fpa.c create mode 100644 drivers/staging/octeon/cvmx-fpa.h create mode 100644 drivers/staging/octeon/cvmx-gmxx-defs.h create mode 100644 drivers/staging/octeon/cvmx-helper-board.c create mode 100644 drivers/staging/octeon/cvmx-helper-board.h create mode 100644 drivers/staging/octeon/cvmx-helper-fpa.c create mode 100644 drivers/staging/octeon/cvmx-helper-fpa.h create mode 100644 drivers/staging/octeon/cvmx-helper-loop.c create mode 100644 drivers/staging/octeon/cvmx-helper-loop.h create mode 100644 drivers/staging/octeon/cvmx-helper-npi.c create mode 100644 drivers/staging/octeon/cvmx-helper-npi.h create mode 100644 drivers/staging/octeon/cvmx-helper-rgmii.c create mode 100644 drivers/staging/octeon/cvmx-helper-rgmii.h create mode 100644 drivers/staging/octeon/cvmx-helper-sgmii.c create mode 100644 drivers/staging/octeon/cvmx-helper-sgmii.h create mode 100644 drivers/staging/octeon/cvmx-helper-spi.c create mode 100644 drivers/staging/octeon/cvmx-helper-spi.h create mode 100644 drivers/staging/octeon/cvmx-helper-util.c create mode 100644 drivers/staging/octeon/cvmx-helper-util.h create mode 100644 drivers/staging/octeon/cvmx-helper-xaui.c create mode 100644 drivers/staging/octeon/cvmx-helper-xaui.h create mode 100644 drivers/staging/octeon/cvmx-helper.c create mode 100644 drivers/staging/octeon/cvmx-helper.h create mode 100644 drivers/staging/octeon/cvmx-interrupt-decodes.c create mode 100644 drivers/staging/octeon/cvmx-interrupt-rsl.c create mode 100644 drivers/staging/octeon/cvmx-ipd.h create mode 100644 drivers/staging/octeon/cvmx-mdio.h create mode 100644 drivers/staging/octeon/cvmx-packet.h create mode 100644 drivers/staging/octeon/cvmx-pcsx-defs.h create mode 100644 drivers/staging/octeon/cvmx-pcsxx-defs.h create mode 100644 drivers/staging/octeon/cvmx-pip-defs.h create mode 100644 drivers/staging/octeon/cvmx-pip.h create mode 100644 drivers/staging/octeon/cvmx-pko-defs.h create mode 100644 drivers/staging/octeon/cvmx-pko.c create mode 100644 drivers/staging/octeon/cvmx-pko.h create mode 100644 drivers/staging/octeon/cvmx-pow.h create mode 100644 drivers/staging/octeon/cvmx-scratch.h create mode 100644 drivers/staging/octeon/cvmx-smix-defs.h create mode 100644 drivers/staging/octeon/cvmx-spi.c create mode 100644 drivers/staging/octeon/cvmx-spi.h create mode 100644 drivers/staging/octeon/cvmx-spxx-defs.h create mode 100644 drivers/staging/octeon/cvmx-srxx-defs.h create mode 100644 drivers/staging/octeon/cvmx-stxx-defs.h create mode 100644 drivers/staging/octeon/cvmx-wqe.h create mode 100644 drivers/staging/octeon/ethernet-common.c create mode 100644 drivers/staging/octeon/ethernet-common.h create mode 100644 drivers/staging/octeon/ethernet-defines.h create mode 100644 drivers/staging/octeon/ethernet-mdio.c create mode 100644 drivers/staging/octeon/ethernet-mdio.h create mode 100644 drivers/staging/octeon/ethernet-mem.c create mode 100644 drivers/staging/octeon/ethernet-mem.h create mode 100644 drivers/staging/octeon/ethernet-proc.c create mode 100644 drivers/staging/octeon/ethernet-proc.h create mode 100644 drivers/staging/octeon/ethernet-rgmii.c create mode 100644 drivers/staging/octeon/ethernet-rx.c create mode 100644 drivers/staging/octeon/ethernet-rx.h create mode 100644 drivers/staging/octeon/ethernet-sgmii.c create mode 100644 drivers/staging/octeon/ethernet-spi.c create mode 100644 drivers/staging/octeon/ethernet-tx.c create mode 100644 drivers/staging/octeon/ethernet-tx.h create mode 100644 drivers/staging/octeon/ethernet-util.h create mode 100644 drivers/staging/octeon/ethernet-xaui.c create mode 100644 drivers/staging/octeon/ethernet.c create mode 100644 drivers/staging/octeon/octeon-ethernet.h create mode 100644 drivers/staging/pata_rdc/Kconfig create mode 100644 drivers/staging/pata_rdc/Makefile create mode 100644 drivers/staging/pata_rdc/pata_rdc.c create mode 100644 drivers/staging/pata_rdc/pata_rdc.h delete mode 100644 drivers/staging/rt2860/common/netif_block.c delete mode 100644 drivers/staging/rt2860/common/netif_block.h delete mode 100644 drivers/staging/rt2860/leap.h delete mode 100644 drivers/staging/rt2860/rt_ate.c delete mode 100644 drivers/staging/rt2860/rt_ate.h delete mode 100644 drivers/staging/rt2860/sta/dls.c delete mode 100644 drivers/staging/rt2870/common/netif_block.c delete mode 100644 drivers/staging/rt2870/leap.h delete mode 100644 drivers/staging/rt2870/netif_block.h delete mode 100644 drivers/staging/rt2870/rt_ate.c delete mode 100644 drivers/staging/rt2870/rt_ate.h delete mode 100644 drivers/staging/rt2870/sta/dls.c delete mode 100644 drivers/staging/rt2870/sta_ioctl.c.patch delete mode 100644 drivers/staging/rt2870/tmp60 delete mode 100644 drivers/staging/rt2870/tmp61 delete mode 100644 drivers/staging/rt3070/common/netif_block.c delete mode 100644 drivers/staging/rt3070/leap.h delete mode 100644 drivers/staging/rt3070/netif_block.h delete mode 100644 drivers/staging/rt3070/rt_ate.c delete mode 100644 drivers/staging/rt3070/rt_ate.h delete mode 100644 drivers/staging/rt3070/sta/dls.c create mode 100644 drivers/staging/rtl8192su/Kconfig create mode 100644 drivers/staging/rtl8192su/Makefile create mode 100644 drivers/staging/rtl8192su/authors create mode 100644 drivers/staging/rtl8192su/dot11d.h create mode 100644 drivers/staging/rtl8192su/ieee80211.h create mode 100644 drivers/staging/rtl8192su/ieee80211/EndianFree.h create mode 100644 drivers/staging/rtl8192su/ieee80211/Makefile create mode 100644 drivers/staging/rtl8192su/ieee80211/aes.c create mode 100644 drivers/staging/rtl8192su/ieee80211/api.c create mode 100644 drivers/staging/rtl8192su/ieee80211/arc4.c create mode 100644 drivers/staging/rtl8192su/ieee80211/autoload.c create mode 100644 drivers/staging/rtl8192su/ieee80211/cipher.c create mode 100644 drivers/staging/rtl8192su/ieee80211/compress.c create mode 100644 drivers/staging/rtl8192su/ieee80211/crypto_compat.h create mode 100644 drivers/staging/rtl8192su/ieee80211/digest.c create mode 100644 drivers/staging/rtl8192su/ieee80211/dot11d.c create mode 100644 drivers/staging/rtl8192su/ieee80211/dot11d.h create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211.h create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt.c create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt.h create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_ccmp.c create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_wep.c create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_module.c create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c create mode 100644 drivers/staging/rtl8192su/ieee80211/internal.h create mode 100644 drivers/staging/rtl8192su/ieee80211/kmap_types.h create mode 100644 drivers/staging/rtl8192su/ieee80211/michael_mic.c create mode 100644 drivers/staging/rtl8192su/ieee80211/proc.c create mode 100644 drivers/staging/rtl8192su/ieee80211/readme create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_BA.h create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_TS.h create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_TSProc.c create mode 100644 drivers/staging/rtl8192su/ieee80211/rtl_crypto.h create mode 100644 drivers/staging/rtl8192su/ieee80211/scatterwalk.c create mode 100644 drivers/staging/rtl8192su/ieee80211/scatterwalk.h create mode 100644 drivers/staging/rtl8192su/ieee80211_crypt.h create mode 100644 drivers/staging/rtl8192su/r8180_93cx6.c create mode 100644 drivers/staging/rtl8192su/r8180_93cx6.h create mode 100644 drivers/staging/rtl8192su/r8190_rtl8256.c create mode 100644 drivers/staging/rtl8192su/r8190_rtl8256.h create mode 100644 drivers/staging/rtl8192su/r8192SU_HWImg.c create mode 100644 drivers/staging/rtl8192su/r8192SU_HWImg.h create mode 100644 drivers/staging/rtl8192su/r8192S_Efuse.c create mode 100644 drivers/staging/rtl8192su/r8192S_Efuse.h create mode 100644 drivers/staging/rtl8192su/r8192S_FwImgDTM.h create mode 100644 drivers/staging/rtl8192su/r8192S_firmware.c create mode 100644 drivers/staging/rtl8192su/r8192S_firmware.h create mode 100644 drivers/staging/rtl8192su/r8192S_hw.h create mode 100644 drivers/staging/rtl8192su/r8192S_phy.c create mode 100644 drivers/staging/rtl8192su/r8192S_phy.h create mode 100644 drivers/staging/rtl8192su/r8192S_phyreg.h create mode 100644 drivers/staging/rtl8192su/r8192S_rtl6052.c create mode 100644 drivers/staging/rtl8192su/r8192S_rtl6052.h create mode 100644 drivers/staging/rtl8192su/r8192S_rtl8225.c create mode 100644 drivers/staging/rtl8192su/r8192S_rtl8225.h create mode 100644 drivers/staging/rtl8192su/r8192U.h create mode 100644 drivers/staging/rtl8192su/r8192U_core.c create mode 100644 drivers/staging/rtl8192su/r8192U_dm.c create mode 100644 drivers/staging/rtl8192su/r8192U_dm.h create mode 100644 drivers/staging/rtl8192su/r8192U_hw.h create mode 100644 drivers/staging/rtl8192su/r8192U_pm.c create mode 100644 drivers/staging/rtl8192su/r8192U_pm.h create mode 100644 drivers/staging/rtl8192su/r8192U_wx.c create mode 100644 drivers/staging/rtl8192su/r8192U_wx.h create mode 100644 drivers/staging/rtl8192su/r819xU_HTGen.h create mode 100644 drivers/staging/rtl8192su/r819xU_HTType.h create mode 100644 drivers/staging/rtl8192su/r819xU_cmdpkt.c create mode 100644 drivers/staging/rtl8192su/r819xU_cmdpkt.h create mode 100644 drivers/staging/rtl8192su/r819xU_firmware.c create mode 100644 drivers/staging/rtl8192su/r819xU_firmware.h create mode 100644 drivers/staging/rtl8192su/r819xU_firmware_img.c create mode 100644 drivers/staging/rtl8192su/r819xU_firmware_img.h create mode 100644 drivers/staging/rtl8192su/r819xU_phy.c create mode 100644 drivers/staging/rtl8192su/r819xU_phy.h create mode 100644 drivers/staging/rtl8192su/r819xU_phyreg.h delete mode 100644 drivers/staging/serqt_usb/Makefile delete mode 100644 drivers/staging/serqt_usb/serqt_usb.c rename drivers/staging/{serqt_usb => serqt_usb2}/Kconfig (76%) create mode 100644 drivers/staging/serqt_usb2/Makefile create mode 100644 drivers/staging/serqt_usb2/serqt_usb2.c create mode 100644 drivers/staging/udlfb/Kconfig create mode 100644 drivers/staging/udlfb/Makefile create mode 100644 drivers/staging/udlfb/udlfb.c create mode 100644 drivers/staging/udlfb/udlfb.h create mode 100644 drivers/staging/vt6655/80211hdr.h create mode 100644 drivers/staging/vt6655/80211mgr.c create mode 100644 drivers/staging/vt6655/80211mgr.h create mode 100644 drivers/staging/vt6655/IEEE11h.c create mode 100644 drivers/staging/vt6655/IEEE11h.h create mode 100644 drivers/staging/vt6655/Kconfig create mode 100644 drivers/staging/vt6655/Makefile create mode 100644 drivers/staging/vt6655/Makefile.arm create mode 100644 drivers/staging/vt6655/Makefile.x86 create mode 100644 drivers/staging/vt6655/aes_ccmp.c create mode 100644 drivers/staging/vt6655/aes_ccmp.h create mode 100644 drivers/staging/vt6655/baseband.c create mode 100644 drivers/staging/vt6655/baseband.h create mode 100644 drivers/staging/vt6655/bssdb.c create mode 100644 drivers/staging/vt6655/bssdb.h create mode 100644 drivers/staging/vt6655/card.c create mode 100644 drivers/staging/vt6655/card.h create mode 100644 drivers/staging/vt6655/country.h create mode 100644 drivers/staging/vt6655/datarate.c create mode 100644 drivers/staging/vt6655/datarate.h create mode 100644 drivers/staging/vt6655/desc.h create mode 100644 drivers/staging/vt6655/device.h create mode 100644 drivers/staging/vt6655/device_cfg.h create mode 100644 drivers/staging/vt6655/device_main.c create mode 100644 drivers/staging/vt6655/dpc.c create mode 100644 drivers/staging/vt6655/dpc.h create mode 100644 drivers/staging/vt6655/hostap.c create mode 100644 drivers/staging/vt6655/hostap.h create mode 100644 drivers/staging/vt6655/iocmd.h create mode 100644 drivers/staging/vt6655/ioctl.c create mode 100644 drivers/staging/vt6655/ioctl.h create mode 100644 drivers/staging/vt6655/iowpa.h create mode 100644 drivers/staging/vt6655/iwctl.c create mode 100644 drivers/staging/vt6655/iwctl.h create mode 100644 drivers/staging/vt6655/kcompat.h create mode 100644 drivers/staging/vt6655/key.c create mode 100644 drivers/staging/vt6655/key.h create mode 100644 drivers/staging/vt6655/mac.c create mode 100644 drivers/staging/vt6655/mac.h create mode 100644 drivers/staging/vt6655/mib.c create mode 100644 drivers/staging/vt6655/mib.h create mode 100644 drivers/staging/vt6655/michael.c create mode 100644 drivers/staging/vt6655/michael.h create mode 100644 drivers/staging/vt6655/power.c create mode 100644 drivers/staging/vt6655/power.h create mode 100644 drivers/staging/vt6655/rc4.c create mode 100644 drivers/staging/vt6655/rc4.h create mode 100644 drivers/staging/vt6655/rf.c create mode 100644 drivers/staging/vt6655/rf.h create mode 100644 drivers/staging/vt6655/rxtx.c create mode 100644 drivers/staging/vt6655/rxtx.h create mode 100644 drivers/staging/vt6655/srom.c create mode 100644 drivers/staging/vt6655/srom.h create mode 100644 drivers/staging/vt6655/tbit.h create mode 100644 drivers/staging/vt6655/tcrc.c create mode 100644 drivers/staging/vt6655/tcrc.h create mode 100644 drivers/staging/vt6655/test create mode 100644 drivers/staging/vt6655/tether.c create mode 100644 drivers/staging/vt6655/tether.h create mode 100644 drivers/staging/vt6655/tkip.c create mode 100644 drivers/staging/vt6655/tkip.h create mode 100644 drivers/staging/vt6655/tmacro.h create mode 100644 drivers/staging/vt6655/tpci.h create mode 100644 drivers/staging/vt6655/ttype.h create mode 100644 drivers/staging/vt6655/umem.h create mode 100644 drivers/staging/vt6655/upc.h create mode 100644 drivers/staging/vt6655/vntconfiguration.dat create mode 100644 drivers/staging/vt6655/vntwifi.c create mode 100644 drivers/staging/vt6655/vntwifi.h create mode 100644 drivers/staging/vt6655/wcmd.c create mode 100644 drivers/staging/vt6655/wcmd.h create mode 100644 drivers/staging/vt6655/wctl.c create mode 100644 drivers/staging/vt6655/wctl.h create mode 100644 drivers/staging/vt6655/wmgr.c create mode 100644 drivers/staging/vt6655/wmgr.h create mode 100644 drivers/staging/vt6655/wpa.c create mode 100644 drivers/staging/vt6655/wpa.h create mode 100644 drivers/staging/vt6655/wpa2.c create mode 100644 drivers/staging/vt6655/wpa2.h create mode 100644 drivers/staging/vt6655/wpactl.c create mode 100644 drivers/staging/vt6655/wpactl.h create mode 100644 drivers/staging/vt6655/wroute.c create mode 100644 drivers/staging/vt6655/wroute.h delete mode 100644 drivers/staging/winbond/wbhal.c create mode 100644 drivers/staging/wlan-ng/prism2fw.c Merging scsi-post-merge/master $ git clone -s -l -n -q . ../rebase-tmp $ cd ../rebase-tmp $ git reset --hard add2b5e0d596c4ce1aa10f845d9ba49eb5e2f605 HEAD is now at add2b5e [SCSI] zfcp: Update FC pass-through support $ git rebase --onto 9b7fb6d39bfc5ab3a6926da24ea99b51f6a7a760 797e9cc3f6ade8ea692154bd79f9ea603e8da62e First, rewinding head to replay your work on top of it... Applying: [SCSI] FC Pass Thru support error: patch failed: include/Kbuild:8 error: include/Kbuild: patch does not apply Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging include/Kbuild CONFLICT (content): Merge conflict in include/Kbuild Failed to merge in the changes. Patch failed at 0001 [SCSI] FC Pass Thru support When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". $ cd ../next $ git pull ../rebase-tmp From ../rebase-tmp * branch HEAD -> FETCH_HEAD Updating 9b7fb6d..e74d1c5 Fast forward Documentation/scsi/scsi_fc_transport.txt | 14 +- Documentation/scsi/scsi_mid_low_api.txt | 5 + drivers/s390/scsi/zfcp_aux.c | 10 +- drivers/s390/scsi/zfcp_def.h | 18 +- drivers/s390/scsi/zfcp_erp.c | 2 +- drivers/s390/scsi/zfcp_ext.h | 6 +- drivers/s390/scsi/zfcp_fc.c | 185 +++++++++- drivers/s390/scsi/zfcp_fsf.c | 3 +- drivers/s390/scsi/zfcp_scsi.c | 15 + drivers/scsi/scsi_transport_fc.c | 614 +++++++++++++++++++++++++++++- include/Kbuild | 1 + include/scsi/Kbuild | 4 + include/scsi/scsi_bsg_fc.h | 322 ++++++++++++++++ include/scsi/scsi_host.h | 9 + include/scsi/scsi_transport_fc.h | 52 +++- 15 files changed, 1234 insertions(+), 26 deletions(-) create mode 100644 include/scsi/Kbuild create mode 100644 include/scsi/scsi_bsg_fc.h $ git am -3 ../patches/0001-rr-fix-up-for-sparc32-extable.patch Applying: rr: fix up for sparc32 extable