$ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 2588465 Merge branch 'bkl-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip Merging origin/master $ git merge origin/master Updating 2588465..d71cb81 Fast forward Documentation/ABI/stable/sysfs-driver-qla2xxx | 8 + Documentation/ABI/testing/procfs-diskstats | 2 +- Documentation/ABI/testing/sysfs-block | 2 +- Documentation/DMA-mapping.txt | 6 +- Documentation/DocBook/device-drivers.tmpl | 13 + Documentation/DocBook/dvb/dvbapi.xml | 13 + .../DocBook/dvb/{isdbt.xml => dvbproperty.xml} | 4 + Documentation/DocBook/dvb/frontend.h.xml | 415 ++ Documentation/DocBook/dvb/frontend.xml | 185 +- Documentation/DocBook/genericirq.tmpl | 4 +- Documentation/DocBook/kernel-hacking.tmpl | 2 +- Documentation/DocBook/media-entities.tmpl | 3 +- Documentation/DocBook/mtdnand.tmpl | 2 +- Documentation/DocBook/v4l/controls.xml | 20 +- Documentation/DocBook/v4l/pixfmt.xml | 5 + Documentation/DocBook/v4l/videodev2.h.xml | 9 +- Documentation/DocBook/v4l/vidioc-g-fbuf.xml | 17 + Documentation/DocBook/writing-an-alsa-driver.tmpl | 2 +- Documentation/dvb/README.dvb-usb | 2 +- Documentation/edac.txt | 7 +- Documentation/feature-removal-schedule.txt | 7 + Documentation/filesystems/00-INDEX | 2 + Documentation/filesystems/exofs.txt | 23 +- Documentation/filesystems/ext4.txt | 10 +- Documentation/filesystems/proc.txt | 4 +- Documentation/gpio.txt | 4 +- Documentation/hwmon/adt7473 | 2 + Documentation/hwmon/adt7475 | 204 +- Documentation/hwmon/f71882fg | 10 + Documentation/hwmon/it87 | 1 - Documentation/hwmon/mc13783-adc | 50 + Documentation/hwmon/sysfs-interface | 11 +- Documentation/hwmon/w83627hf | 29 +- Documentation/lguest/lguest.c | 2 +- Documentation/{ => misc-devices}/c2port.txt | 0 Documentation/{ => misc-devices}/ics932s401 | 0 Documentation/oops-tracing.txt | 2 + Documentation/power/regulator/consumer.txt | 2 +- Documentation/scsi/ChangeLog.megaraid_sas | 64 +- Documentation/sound/alsa/HD-Audio-Models.txt | 1 + Documentation/sound/alsa/HD-Audio.txt | 6 +- Documentation/spi/spi-summary | 2 +- Documentation/sysctl/kernel.txt | 6 +- Documentation/sysctl/vm.txt | 2 +- Documentation/timers/hpet.txt | 2 +- Documentation/video4linux/CARDLIST.cx23885 | 2 + Documentation/video4linux/CARDLIST.cx88 | 1 + Documentation/video4linux/CARDLIST.em28xx | 3 +- Documentation/video4linux/CARDLIST.saa7134 | 2 + Documentation/video4linux/gspca.txt | 21 +- Documentation/video4linux/si4713.txt | 2 +- Documentation/video4linux/zr364xx.txt | 1 + Documentation/vm/page-types.c | 2 +- Documentation/vm/slub.txt | 2 +- MAINTAINERS | 44 +- arch/alpha/mm/numa.c | 2 +- arch/arm/common/scoop.c | 2 +- arch/arm/configs/da830_omapl137_defconfig | 1254 ----- ...50_omapl138_defconfig => da8xx_omapl_defconfig} | 257 +- arch/arm/configs/davinci_all_defconfig | 126 +- arch/arm/mach-at91/at91sam9g45_devices.c | 51 + arch/arm/mach-at91/at91sam9rl_devices.c | 10 +- arch/arm/mach-at91/board-sam9m10g45ek.c | 12 + arch/arm/mach-at91/board-sam9rlek.c | 12 +- arch/arm/mach-at91/include/mach/board.h | 7 +- arch/arm/mach-bcmring/include/csp/reg.h | 2 +- .../mach-bcmring/include/mach/csp/dmacHw_priv.h | 2 +- arch/arm/mach-bcmring/include/mach/csp/mm_addr.h | 2 +- arch/arm/mach-bcmring/include/mach/dma.h | 2 +- arch/arm/mach-davinci/Kconfig | 59 + arch/arm/mach-davinci/Makefile | 5 + arch/arm/mach-davinci/board-da830-evm.c | 466 ++- arch/arm/mach-davinci/board-da850-evm.c | 437 ++- arch/arm/mach-davinci/board-dm355-evm.c | 16 +- arch/arm/mach-davinci/board-dm355-leopard.c | 13 +- arch/arm/mach-davinci/board-dm365-evm.c | 57 +- arch/arm/mach-davinci/board-dm644x-evm.c | 15 +- arch/arm/mach-davinci/board-dm646x-evm.c | 86 +- arch/arm/mach-davinci/board-neuros-osd2.c | 323 ++ arch/arm/mach-davinci/board-sffsdr.c | 20 +- arch/arm/mach-davinci/clock.c | 231 +- arch/arm/mach-davinci/clock.h | 17 +- arch/arm/mach-davinci/common.c | 4 +- arch/arm/mach-davinci/cp_intc.c | 3 - arch/arm/mach-davinci/cpufreq.c | 226 + arch/arm/mach-davinci/cpuidle.c | 197 + arch/arm/mach-davinci/da830.c | 75 +- arch/arm/mach-davinci/da850.c | 298 ++- arch/arm/mach-davinci/devices-da8xx.c | 106 +- arch/arm/mach-davinci/devices.c | 6 +- arch/arm/mach-davinci/dm355.c | 2 - arch/arm/mach-davinci/dm365.c | 107 +- arch/arm/mach-davinci/dm644x.c | 7 +- arch/arm/mach-davinci/dm646x.c | 11 +- arch/arm/mach-davinci/dma.c | 105 +- arch/arm/mach-davinci/gpio.c | 9 - arch/arm/mach-davinci/include/mach/asp.h | 3 + arch/arm/mach-davinci/include/mach/common.h | 6 - arch/arm/mach-davinci/include/mach/cpufreq.h | 26 + arch/arm/mach-davinci/include/mach/cpuidle.h | 17 + arch/arm/mach-davinci/include/mach/da8xx.h | 26 +- arch/arm/mach-davinci/include/mach/dm365.h | 10 + arch/arm/mach-davinci/include/mach/dm644x.h | 1 - arch/arm/mach-davinci/include/mach/irqs.h | 1 + arch/arm/mach-davinci/include/mach/keyscan.h | 41 + arch/arm/mach-davinci/include/mach/mux.h | 20 +- arch/arm/mach-davinci/include/mach/system.h | 3 - arch/arm/mach-davinci/include/mach/usb.h | 59 + arch/arm/mach-davinci/mux.c | 1 - arch/arm/mach-davinci/psc.c | 3 - arch/arm/mach-davinci/serial.c | 6 - arch/arm/mach-davinci/sram.c | 3 - arch/arm/mach-davinci/time.c | 6 - arch/arm/mach-davinci/usb.c | 84 +- arch/arm/mach-lh7a40x/include/mach/hardware.h | 2 +- arch/arm/mach-orion5x/pci.c | 2 +- arch/arm/mach-pxa/include/mach/palmld.h | 2 +- arch/arm/mach-pxa/include/mach/palmt5.h | 2 +- arch/arm/mach-pxa/include/mach/palmtc.h | 2 +- arch/arm/mach-pxa/include/mach/palmte2.h | 2 +- arch/arm/mach-pxa/include/mach/palmtx.h | 2 +- arch/arm/mach-pxa/include/mach/palmz72.h | 2 +- arch/arm/mach-s3c2400/Kconfig | 6 - arch/arm/mach-s3c2410/Kconfig | 2 - arch/arm/mach-s3c2412/Kconfig | 4 - arch/arm/mach-s3c2440/Kconfig | 3 - arch/arm/mach-s3c2442/Kconfig | 4 - arch/arm/mach-s3c2443/Kconfig | 2 - arch/arm/mach-s3c6400/Kconfig | 2 - arch/arm/mach-s3c6400/setup-sdhci.c | 2 +- arch/arm/mach-s3c6410/Kconfig | 2 - arch/arm/mach-s3c6410/setup-sdhci.c | 2 +- arch/arm/mach-s5pc100/Kconfig | 2 - arch/arm/mach-sa1100/dma.c | 2 +- arch/arm/mach-u300/include/mach/u300-regs.h | 2 +- arch/arm/plat-mxc/include/mach/iomux-mx3.h | 2 +- arch/arm/plat-mxc/include/mach/iomux-mxc91231.h | 2 +- arch/arm/plat-mxc/pwm.c | 2 +- arch/arm/plat-omap/dma.c | 2 +- arch/arm/plat-omap/include/plat/omap16xx.h | 2 +- arch/arm/plat-s3c/Kconfig | 2 - arch/arm/plat-s3c/pwm.c | 2 +- arch/arm/plat-s3c24xx/Kconfig | 2 - arch/arm/plat-s3c24xx/adc.c | 2 +- arch/arm/plat-s3c24xx/dma.c | 6 +- arch/arm/plat-s3c24xx/include/plat/map.h | 2 +- arch/arm/plat-s3c24xx/irq.c | 2 + arch/arm/plat-s3c64xx/Kconfig | 2 - arch/arm/plat-s5pc1xx/Kconfig | 2 - arch/avr32/boards/hammerhead/Kconfig | 2 +- arch/blackfin/kernel/traps.c | 2 +- .../mach-bf518/include/mach/defBF51x_base.h | 4 +- .../mach-bf527/include/mach/defBF52x_base.h | 4 +- arch/blackfin/mach-bf537/include/mach/defBF534.h | 4 +- arch/blackfin/mach-bf548/include/mach/defBF544.h | 4 +- arch/blackfin/mach-bf548/include/mach/defBF547.h | 4 +- arch/blackfin/mach-bf548/include/mach/defBF548.h | 4 +- arch/blackfin/mach-bf548/include/mach/defBF549.h | 4 +- arch/cris/arch-v10/mm/fault.c | 3 +- arch/cris/arch-v10/mm/tlb.c | 22 - arch/cris/mm/fault.c | 2 +- arch/ia64/hp/common/sba_iommu.c | 2 +- arch/ia64/ia32/ia32_entry.S | 2 +- arch/ia64/include/asm/perfmon_default_smpl.h | 2 +- arch/ia64/include/asm/sn/shubio.h | 2 +- arch/ia64/include/asm/unistd.h | 2 +- arch/ia64/kernel/esi.c | 2 +- arch/ia64/kernel/perfmon.c | 2 +- arch/ia64/sn/kernel/io_acpi_init.c | 2 +- arch/m68k/ifpsp060/src/fpsp.S | 28 +- arch/m68k/ifpsp060/src/pfpsp.S | 26 +- arch/m68k/include/asm/bootinfo.h | 2 +- arch/m68k/include/asm/processor.h | 2 + arch/m68k/include/asm/ptrace.h | 2 +- arch/m68k/include/asm/thread_info_no.h | 4 +- arch/m68knommu/Kconfig | 7 + arch/m68knommu/kernel/setup.c | 92 +- arch/m68knommu/kernel/vmlinux.lds.S | 47 +- arch/m68knommu/platform/523x/gpio.c | 5 +- arch/m68knommu/platform/527x/gpio.c | 6 +- arch/m68knommu/platform/528x/gpio.c | 2 +- arch/m68knommu/platform/coldfire/clk.c | 7 +- arch/m68knommu/platform/coldfire/head.S | 10 + arch/microblaze/lib/memcpy.c | 2 +- arch/microblaze/lib/memmove.c | 2 +- arch/microblaze/lib/memset.c | 2 +- arch/mips/include/asm/mach-pnx833x/gpio.h | 2 +- arch/mips/include/asm/sgi/ioc.h | 2 +- arch/mips/include/asm/sibyte/sb1250_mac.h | 2 +- arch/mips/include/asm/sn/sn0/hubio.h | 2 +- arch/mips/kernel/smtc.c | 2 +- arch/mips/math-emu/dp_sub.c | 2 +- arch/mips/txx9/generic/smsc_fdc37m81x.c | 2 +- arch/parisc/kernel/perf.c | 2 +- arch/powerpc/include/asm/reg_fsl_emb.h | 2 +- arch/powerpc/kernel/kgdb.c | 2 +- arch/powerpc/kernel/tau_6xx.c | 2 +- arch/powerpc/kernel/vdso.c | 2 +- arch/powerpc/oprofile/op_model_cell.c | 6 +- arch/powerpc/platforms/52xx/mpc52xx_pci.c | 2 +- arch/powerpc/platforms/powermac/pci.c | 2 +- arch/powerpc/sysdev/dart_iommu.c | 2 +- arch/s390/Kconfig | 15 - arch/s390/defconfig | 1 - arch/s390/include/asm/atomic.h | 8 +- arch/s390/include/asm/ccwdev.h | 4 + arch/s390/include/asm/mmu_context.h | 4 +- arch/s390/include/asm/pgalloc.h | 3 +- arch/s390/include/asm/pgtable.h | 4 +- arch/s390/include/asm/setup.h | 17 +- arch/s390/include/asm/smp.h | 54 +- arch/s390/include/asm/sockios.h | 21 +- arch/s390/include/asm/termbits.h | 206 +- arch/s390/include/asm/todclk.h | 23 - arch/s390/include/asm/uaccess.h | 2 + arch/s390/kernel/Makefile | 1 + arch/s390/kernel/compat_linux.c | 6 - arch/s390/kernel/compat_linux.h | 4 - arch/s390/kernel/head64.S | 3 + arch/s390/kernel/setup.c | 36 +- arch/s390/kernel/time.c | 4 +- arch/s390/kernel/vdso.c | 9 +- arch/s390/kvm/Kconfig | 1 - arch/s390/lib/uaccess_mvcos.c | 4 - arch/s390/lib/uaccess_pt.c | 147 +- arch/s390/math-emu/math.c | 4 +- arch/s390/mm/cmm.c | 61 +- arch/s390/mm/fault.c | 378 +- arch/s390/mm/pgtable.c | 2 +- arch/s390/mm/vmem.c | 11 +- arch/sh/Kconfig | 29 +- arch/sh/Makefile | 4 + arch/sh/boards/Makefile | 1 - arch/sh/boards/mach-ap325rxa/Makefile | 2 + arch/sh/boards/mach-ap325rxa/sdram.S | 69 + .../{board-ap325rxa.c => mach-ap325rxa/setup.c} | 97 +- arch/sh/boards/mach-ecovec24/Makefile | 2 +- arch/sh/boards/mach-ecovec24/sdram.S | 52 + arch/sh/boards/mach-ecovec24/setup.c | 197 +- arch/sh/boards/mach-highlander/setup.c | 2 +- arch/sh/boards/mach-kfr2r09/Makefile | 2 +- arch/sh/boards/mach-kfr2r09/sdram.S | 80 + arch/sh/boards/mach-kfr2r09/setup.c | 238 +- arch/sh/boards/mach-migor/Makefile | 2 +- arch/sh/boards/mach-migor/sdram.S | 69 + arch/sh/boards/mach-migor/setup.c | 65 +- arch/sh/boards/mach-r2d/irq.c | 2 +- arch/sh/boards/mach-se/7722/irq.c | 32 +- arch/sh/boards/mach-se/7722/setup.c | 17 +- arch/sh/boards/mach-se/7724/Makefile | 2 +- arch/sh/boards/mach-se/7724/sdram.S | 52 + arch/sh/boards/mach-se/7724/setup.c | 96 +- arch/sh/boot/compressed/misc.c | 2 +- arch/sh/boot/romimage/Makefile | 12 +- arch/sh/boot/romimage/head.S | 38 + arch/sh/drivers/dma/dma-sysfs.c | 2 - arch/sh/drivers/pci/Kconfig | 19 - arch/sh/include/asm/addrspace.h | 9 +- arch/sh/include/asm/atomic.h | 9 +- arch/sh/include/asm/bitops.h | 4 +- arch/sh/include/asm/bugs.h | 4 + arch/sh/include/asm/dma-mapping.h | 233 +- arch/sh/include/asm/dwarf.h | 28 + arch/sh/include/asm/fixmap.h | 12 +- arch/sh/include/asm/fpu.h | 26 +- arch/sh/include/asm/ftrace.h | 17 + arch/sh/include/asm/gpio.h | 82 +- arch/sh/include/asm/hardirq.h | 13 +- arch/sh/include/asm/io.h | 16 +- arch/sh/include/asm/irqflags.h | 31 +- arch/sh/include/asm/irqflags_32.h | 99 - arch/sh/include/asm/irqflags_64.h | 85 - arch/sh/include/asm/mmu.h | 13 +- arch/sh/include/asm/pci.h | 30 +- arch/sh/include/asm/perf_event.h | 31 +- arch/sh/include/asm/pgtable.h | 26 +- arch/sh/include/asm/pgtable_32.h | 2 +- arch/sh/include/asm/processor_32.h | 3 +- arch/sh/include/asm/scatterlist.h | 2 +- arch/sh/include/asm/suspend.h | 65 + arch/sh/include/asm/system.h | 4 - arch/sh/include/asm/system_32.h | 29 + arch/sh/include/asm/system_64.h | 26 + arch/sh/include/asm/thread_info.h | 30 +- arch/sh/include/asm/topology.h | 8 + arch/sh/include/asm/ubc.h | 11 - arch/sh/include/asm/watchdog.h | 59 +- arch/sh/include/cpu-sh4/cpu/watchdog.h | 13 + arch/sh/include/mach-common/mach/titan.h | 2 +- .../mach-ecovec24/mach/partner-jet-setup.txt | 3 +- arch/sh/include/mach-se/mach/se7722.h | 11 +- arch/sh/kernel/Makefile | 10 +- arch/sh/kernel/asm-offsets.c | 23 + arch/sh/kernel/cpu/Makefile | 1 - arch/sh/kernel/cpu/init.c | 28 +- arch/sh/kernel/cpu/sh2a/fpu.c | 27 +- arch/sh/kernel/cpu/sh3/entry.S | 33 - arch/sh/kernel/cpu/sh4/Makefile | 8 +- arch/sh/kernel/cpu/sh4/fpu.c | 28 +- arch/sh/kernel/cpu/sh4/perf_event.c | 253 + arch/sh/kernel/cpu/sh4a/Makefile | 1 + arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 2 +- arch/sh/kernel/cpu/sh4a/perf_event.c | 269 ++ arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 264 +- arch/sh/kernel/cpu/sh4a/setup-shx3.c | 45 +- arch/sh/kernel/cpu/sh4a/smp-shx3.c | 37 +- arch/sh/kernel/cpu/sh5/entry.S | 2 +- arch/sh/kernel/cpu/shmobile/cpuidle.c | 42 +- arch/sh/kernel/cpu/shmobile/pm.c | 117 +- arch/sh/kernel/cpu/shmobile/pm_runtime.c | 17 +- arch/sh/kernel/cpu/shmobile/sleep.S | 344 +- arch/sh/kernel/cpu/ubc.S | 59 - arch/sh/kernel/dma-nommu.c | 82 + arch/sh/kernel/dwarf.c | 222 +- arch/sh/kernel/entry-common.S | 2 +- arch/sh/kernel/ftrace.c | 146 +- arch/sh/kernel/head_32.S | 2 +- arch/sh/kernel/idle.c | 78 +- arch/sh/kernel/io_generic.c | 4 +- arch/sh/kernel/irq.c | 14 + arch/sh/kernel/irq_32.c | 57 + arch/sh/kernel/irq_64.c | 51 + arch/sh/kernel/machine_kexec.c | 6 - arch/sh/kernel/machvec.c | 4 + arch/sh/kernel/module.c | 9 +- arch/sh/kernel/perf_callchain.c | 98 + arch/sh/kernel/perf_event.c | 312 ++ arch/sh/kernel/process_32.c | 42 +- arch/sh/kernel/process_64.c | 2 + arch/sh/kernel/return_address.c | 54 + arch/sh/kernel/setup.c | 4 + arch/sh/kernel/sh_ksyms_32.c | 67 +- arch/sh/kernel/sh_ksyms_64.c | 10 - arch/sh/kernel/signal_32.c | 24 +- arch/sh/kernel/signal_64.c | 13 +- arch/sh/kernel/smp.c | 4 +- arch/sh/kernel/topology.c | 26 + arch/sh/kernel/traps.c | 8 +- arch/sh/kernel/traps_32.c | 82 +- arch/sh/lib/Makefile | 7 +- arch/sh/lib/memset-sh4.S | 107 + arch/sh/math-emu/math.c | 6 +- arch/sh/mm/Kconfig | 19 +- arch/sh/mm/Makefile | 3 +- arch/sh/mm/cache-sh4.c | 501 +-- arch/sh/mm/cache-sh5.c | 2 +- arch/sh/mm/cache-sh7705.c | 2 +- arch/sh/mm/cache.c | 18 +- arch/sh/mm/consistent.c | 28 +- arch/sh/mm/init.c | 19 + arch/sh/mm/kmap.c | 4 +- arch/sh/mm/numa.c | 2 +- arch/sh/mm/pmb-fixed.c | 45 - arch/sh/mm/pmb.c | 268 +- arch/sh/oprofile/Makefile | 4 - arch/sh/oprofile/common.c | 38 +- arch/sh/oprofile/op_impl.h | 2 +- arch/sh/oprofile/op_model_sh7750.c | 255 - arch/x86/include/asm/desc_defs.h | 4 +- arch/x86/include/asm/mmzone_32.h | 2 +- arch/x86/include/asm/sigcontext.h | 4 +- arch/x86/include/asm/uv/uv_bau.h | 2 +- arch/x86/kernel/acpi/boot.c | 2 +- arch/x86/kernel/amd_iommu.c | 4 +- arch/x86/kernel/cpu/cpufreq/longhaul.c | 2 +- arch/x86/kernel/cpu/perf_event.c | 2 +- arch/x86/kernel/kprobes.c | 4 +- arch/x86/kernel/smpboot.c | 4 +- arch/x86/mm/kmmio.c | 4 +- arch/x86/xen/enlighten.c | 27 +- arch/x86/xen/mmu.c | 2 +- arch/x86/xen/smp.c | 1 + arch/x86/xen/suspend.c | 17 +- arch/x86/xen/time.c | 7 +- arch/x86/xen/xen-asm_64.S | 4 +- arch/x86/xen/xen-ops.h | 2 + block/blk-iopoll.c | 2 +- drivers/Kconfig | 2 - drivers/acpi/acpi_memhotplug.c | 4 +- drivers/acpi/acpica/Makefile | 2 +- drivers/acpi/acpica/acmacros.h | 3 + drivers/acpi/acpica/acnamesp.h | 16 +- drivers/acpi/acpica/acutils.h | 7 + drivers/acpi/acpica/dsinit.c | 2 +- drivers/acpi/acpica/dsmthdat.c | 4 +- drivers/acpi/acpica/dsobject.c | 8 +- drivers/acpi/acpica/dswload.c | 50 +- drivers/acpi/acpica/evgpeblk.c | 8 +- drivers/acpi/acpica/evregion.c | 81 +- drivers/acpi/acpica/exconfig.c | 4 +- drivers/acpi/acpica/exconvrt.c | 3 +- drivers/acpi/acpica/exfield.c | 3 +- drivers/acpi/acpica/exoparg1.c | 38 +- drivers/acpi/acpica/exoparg6.c | 7 +- drivers/acpi/acpica/nsdump.c | 4 +- drivers/acpi/acpica/nsdumpdv.c | 3 +- drivers/acpi/acpica/nseval.c | 50 +- drivers/acpi/acpica/nsinit.c | 8 +- drivers/acpi/acpica/nspredef.c | 49 +- drivers/acpi/acpica/nsrepair.c | 114 +- drivers/acpi/acpica/nsrepair2.c | 540 +++ drivers/acpi/acpica/nswalk.c | 200 +- drivers/acpi/acpica/nsxfeval.c | 32 +- drivers/acpi/acpica/psloop.c | 32 +- drivers/acpi/acpica/psparse.c | 8 +- drivers/acpi/acpica/psxface.c | 4 +- drivers/acpi/acpica/utmisc.c | 42 + drivers/acpi/acpica/utobject.c | 29 + drivers/acpi/container.c | 4 +- drivers/acpi/dock.c | 8 +- drivers/acpi/ec.c | 2 +- drivers/acpi/glue.c | 2 +- drivers/acpi/pci_slot.c | 8 +- drivers/acpi/processor_core.c | 4 +- drivers/acpi/scan.c | 2 +- drivers/acpi/video_detect.c | 16 +- drivers/ata/ata_piix.c | 2 +- drivers/ata/libata-scsi.c | 7 +- drivers/ata/libata-sff.c | 6 +- drivers/ata/pata_cs5535.c | 2 +- drivers/ata/sata_fsl.c | 6 +- drivers/ata/sata_nv.c | 2 +- drivers/atm/iphase.c | 2 +- drivers/base/dd.c | 2 +- drivers/block/ataflop.c | 3 - drivers/block/cciss_cmd.h | 2 +- drivers/bluetooth/btmrvl_sdio.c | 2 +- drivers/bluetooth/hci_ldisc.c | 2 +- drivers/cdrom/gdrom.c | 10 +- drivers/char/keyboard.c | 213 +- drivers/char/mem.c | 2 +- drivers/char/mspec.c | 2 +- drivers/char/n_r3964.c | 2 +- drivers/char/nvram.c | 1 + drivers/char/rio/route.h | 2 +- drivers/char/tty_ioctl.c | 2 +- drivers/cpuidle/governor.c | 4 +- drivers/crypto/hifn_795x.c | 2 +- drivers/dma/at_hdmac.c | 2 +- drivers/firewire/core-topology.c | 2 +- drivers/firmware/dmi_scan.c | 15 +- drivers/gpu/drm/drm_crtc.c | 4 +- drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/intel_fb.c | 2 +- drivers/gpu/drm/i915/intel_lvds.c | 2 +- drivers/gpu/drm/i915/intel_sdvo.c | 2 +- drivers/gpu/drm/radeon/atombios.h | 16 +- drivers/gpu/drm/radeon/r600.c | 4 +- drivers/gpu/drm/radeon/radeon_fb.c | 2 +- drivers/gpu/drm/radeon/radeon_state.c | 2 +- drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- drivers/gpu/drm/radeon/rv770.c | 4 +- drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +- drivers/hid/hid-core.c | 9 +- drivers/hid/hid-cypress.c | 2 + drivers/hid/hid-ids.h | 7 + drivers/hid/hid-lg.c | 33 + drivers/hid/usbhid/hid-core.c | 12 +- drivers/hid/usbhid/hid-pidff.c | 5 +- drivers/hid/usbhid/hid-quirks.c | 4 +- drivers/hid/usbhid/hiddev.c | 5 - drivers/hid/usbhid/usbkbd.c | 2 +- drivers/hwmon/Kconfig | 35 +- drivers/hwmon/Makefile | 2 + drivers/hwmon/adm1021.c | 76 +- drivers/hwmon/adm1025.c | 73 +- drivers/hwmon/adm1026.c | 47 +- drivers/hwmon/adm1029.c | 59 +- drivers/hwmon/adm1031.c | 26 +- drivers/hwmon/adm9240.c | 61 +- drivers/hwmon/ads7828.c | 22 +- drivers/hwmon/adt7462.c | 25 +- drivers/hwmon/adt7470.c | 25 +- drivers/hwmon/adt7473.c | 28 +- drivers/hwmon/adt7475.c | 538 ++- drivers/hwmon/asb100.c | 55 +- drivers/hwmon/dme1737.c | 32 +- drivers/hwmon/ds1621.c | 22 +- drivers/hwmon/f71882fg.c | 350 +- drivers/hwmon/f75375s.c | 32 +- drivers/hwmon/fschmd.c | 53 +- drivers/hwmon/gl518sm.c | 29 +- drivers/hwmon/gl520sm.c | 12 +- drivers/hwmon/it87.c | 47 +- drivers/hwmon/lm63.c | 54 +- drivers/hwmon/lm73.c | 205 + drivers/hwmon/lm75.c | 56 +- drivers/hwmon/lm77.c | 80 +- drivers/hwmon/lm78.c | 60 +- drivers/hwmon/lm83.c | 81 +- drivers/hwmon/lm85.c | 157 +- drivers/hwmon/lm87.c | 41 +- drivers/hwmon/lm90.c | 228 +- drivers/hwmon/lm92.c | 31 +- drivers/hwmon/lm93.c | 34 +- drivers/hwmon/lm95241.c | 48 +- drivers/hwmon/max1619.c | 64 +- drivers/hwmon/max6650.c | 20 +- drivers/hwmon/mc13783-adc.c | 236 + drivers/hwmon/s3c-hwmon.c | 4 +- drivers/hwmon/smsc47m192.c | 28 +- drivers/hwmon/thmc50.c | 37 +- drivers/hwmon/tmp401.c | 55 +- drivers/hwmon/tmp421.c | 45 +- drivers/hwmon/w83627hf.c | 96 +- drivers/hwmon/w83781d.c | 131 +- drivers/hwmon/w83791d.c | 60 +- drivers/hwmon/w83792d.c | 61 +- drivers/hwmon/w83793.c | 53 +- drivers/hwmon/w83l785ts.c | 70 +- drivers/hwmon/w83l786ng.c | 58 +- drivers/i2c/busses/i2c-designware.c | 488 ++- drivers/i2c/busses/i2c-omap.c | 64 +- drivers/i2c/busses/i2c-pnx.c | 3 +- drivers/i2c/busses/i2c-scmi.c | 2 +- drivers/ide/Kconfig | 43 +- drivers/ide/alim15x3.c | 12 +- drivers/ide/au1xxx-ide.c | 7 +- drivers/ide/cmd64x.c | 17 - drivers/ide/cs5535.c | 1 + drivers/ide/cy82c693.c | 27 - drivers/ide/hpt366.c | 65 - drivers/ide/ide-tape.c | 21 +- drivers/ide/ide_platform.c | 8 +- drivers/ide/pdc202xx_old.c | 15 - drivers/ide/sis5513.c | 9 - drivers/ide/sl82c105.c | 24 +- drivers/ide/slc90e66.c | 3 +- drivers/ide/tx4938ide.c | 2 +- drivers/ieee1394/dv1394.c | 2 +- drivers/infiniband/hw/cxgb3/cxio_hal.c | 2 +- drivers/infiniband/hw/ipath/ipath_iba6110.c | 2 +- drivers/infiniband/hw/ipath/ipath_sd7220.c | 4 +- drivers/infiniband/hw/mlx4/qp.c | 2 +- drivers/infiniband/ulp/iser/iscsi_iser.c | 1 + drivers/infiniband/ulp/iser/iser_verbs.c | 2 +- drivers/input/Kconfig | 29 +- drivers/input/Makefile | 1 + drivers/input/ff-core.c | 3 +- drivers/input/input-polldev.c | 137 +- drivers/input/input.c | 37 +- drivers/input/joystick/xpad.c | 3 + drivers/input/keyboard/Kconfig | 10 + drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/atkbd.c | 26 +- drivers/input/keyboard/davinci_keyscan.c | 337 ++ drivers/input/keyboard/gpio_keys.c | 134 +- drivers/input/keyboard/lkkbd.c | 496 +- drivers/input/keyboard/matrix_keypad.c | 17 +- drivers/input/keyboard/sh_keysc.c | 2 +- drivers/input/misc/Kconfig | 2 + drivers/input/misc/ati_remote.c | 2 +- drivers/input/misc/dm355evm_keys.c | 150 +- drivers/input/misc/powermate.c | 2 +- drivers/input/misc/wistron_btns.c | 256 +- drivers/input/mouse/alps.c | 100 +- drivers/input/mouse/elantech.c | 1 + drivers/input/mouse/hgpk.c | 13 - drivers/input/mouse/lifebook.c | 55 +- drivers/input/mouse/lifebook.h | 4 + drivers/input/mouse/logips2pp.c | 4 +- drivers/input/mouse/psmouse-base.c | 41 +- drivers/input/mouse/sentelic.c | 1 + drivers/input/mouse/synaptics.c | 31 +- drivers/input/mouse/synaptics.h | 1 + drivers/input/mouse/synaptics_i2c.c | 6 +- drivers/input/mouse/touchkit_ps2.c | 3 +- drivers/input/mouse/trackpoint.c | 13 +- drivers/input/mouse/vsxxxaa.c | 374 +- drivers/input/serio/Kconfig | 8 + drivers/input/serio/Makefile | 1 + drivers/input/serio/altera_ps2.c | 200 + drivers/input/serio/hp_sdc.c | 2 +- drivers/input/serio/hp_sdc_mlc.c | 2 +- drivers/input/serio/i8042-x86ia64io.h | 143 +- drivers/input/sparse-keymap.c | 250 + drivers/input/touchscreen/Kconfig | 37 +- drivers/input/touchscreen/Makefile | 4 +- drivers/input/touchscreen/ads7846.c | 25 +- drivers/input/touchscreen/atmel-wm97xx.c | 2 +- drivers/input/touchscreen/atmel_tsadcc.c | 47 +- drivers/input/touchscreen/dynapro.c | 206 + drivers/input/touchscreen/mainstone-wm97xx.c | 4 +- drivers/input/touchscreen/s3c2410_ts.c | 457 ++ drivers/input/touchscreen/ucb1400_ts.c | 11 +- drivers/input/touchscreen/usbtouchscreen.c | 104 +- drivers/input/touchscreen/zylonite-wm97xx.c | 2 +- drivers/isdn/act2000/Kconfig | 4 - drivers/isdn/capi/Kconfig | 4 - drivers/isdn/capi/capidrv.c | 2 +- drivers/isdn/hardware/eicon/di.c | 2 +- drivers/isdn/hardware/eicon/maintidi.c | 4 +- drivers/isdn/hardware/mISDN/hfcsusb.c | 2 +- drivers/isdn/hardware/mISDN/hfcsusb.h | 2 +- drivers/isdn/hardware/mISDN/mISDNisar.c | 2 +- drivers/isdn/hisax/hfc_usb.c | 2 +- drivers/isdn/hysdn/Kconfig | 4 - drivers/isdn/i4l/isdn_net.c | 2 +- drivers/isdn/i4l/isdn_ppp.c | 6 +- drivers/isdn/i4l/isdn_ttyfax.c | 2 +- drivers/isdn/icn/Kconfig | 4 - drivers/isdn/mISDN/dsp_core.c | 2 +- drivers/isdn/mISDN/tei.c | 2 +- drivers/isdn/pcbit/Kconfig | 4 - drivers/isdn/sc/Kconfig | 4 - drivers/macintosh/therm_windtunnel.c | 2 +- drivers/md/dm-crypt.c | 2 +- drivers/md/dm-mpath.c | 8 +- drivers/media/common/Makefile | 2 +- drivers/media/common/ir-functions.c | 71 +- drivers/media/common/ir-keymaps.c | 167 + drivers/media/common/ir-keytable.c | 429 ++ drivers/media/common/saa7146_i2c.c | 2 +- drivers/media/common/saa7146_video.c | 16 +- drivers/media/common/tuners/Kconfig | 7 + drivers/media/common/tuners/Makefile | 1 + drivers/media/common/tuners/max2165.c | 442 ++ drivers/media/common/tuners/max2165.h | 48 + drivers/media/common/tuners/max2165_priv.h | 60 + drivers/media/common/tuners/mxl5005s.c | 5 +- drivers/media/common/tuners/mxl5005s.h | 4 + drivers/media/common/tuners/mxl5007t.c | 2 +- drivers/media/common/tuners/tda18271-common.c | 16 +- drivers/media/common/tuners/tda18271-fe.c | 114 +- drivers/media/common/tuners/tda18271-maps.c | 1 + drivers/media/common/tuners/tda18271-priv.h | 47 +- drivers/media/common/tuners/tda18271.h | 12 +- drivers/media/common/tuners/tda8290.c | 1 + drivers/media/common/tuners/tda9887.c | 2 +- drivers/media/common/tuners/xc5000.c | 97 +- drivers/media/common/tuners/xc5000.h | 6 + drivers/media/dvb/bt8xx/dvb-bt8xx.c | 2 +- drivers/media/dvb/dm1105/dm1105.c | 12 +- drivers/media/dvb/dvb-core/dvb_demux.c | 39 + drivers/media/dvb/dvb-core/dvb_demux.h | 5 + drivers/media/dvb/dvb-core/dvb_frontend.c | 179 +- drivers/media/dvb/dvb-core/dvb_frontend.h | 2 +- drivers/media/dvb/dvb-core/dvb_net.c | 2 +- drivers/media/dvb/dvb-core/dvbdev.h | 28 + drivers/media/dvb/dvb-usb/Kconfig | 8 + drivers/media/dvb/dvb-usb/Makefile | 3 + drivers/media/dvb/dvb-usb/af9015.c | 33 +- drivers/media/dvb/dvb-usb/af9015.h | 215 +- drivers/media/dvb/dvb-usb/anysee.c | 2 +- drivers/media/dvb/dvb-usb/cxusb.c | 117 + drivers/media/dvb/dvb-usb/dib0700_devices.c | 182 +- drivers/media/dvb/dvb-usb/dibusb-mb.c | 2 +- drivers/media/dvb/dvb-usb/dvb-usb-dvb.c | 1 + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 11 + drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 2 +- drivers/media/dvb/dvb-usb/dvb-usb.h | 3 + drivers/media/dvb/dvb-usb/ec168.c | 440 ++ drivers/media/dvb/dvb-usb/ec168.h | 73 + drivers/media/dvb/dvb-usb/friio-fe.c | 59 +- drivers/media/dvb/dvb-usb/usb-urb.c | 4 +- drivers/media/dvb/firewire/Kconfig | 7 +- drivers/media/dvb/firewire/Makefile | 1 + drivers/media/dvb/firewire/firedtv-1394.c | 41 +- drivers/media/dvb/firewire/firedtv-avc.c | 54 +- drivers/media/dvb/firewire/firedtv-dvb.c | 15 +- drivers/media/dvb/firewire/firedtv-fw.c | 376 ++ drivers/media/dvb/firewire/firedtv-rc.c | 2 + drivers/media/dvb/firewire/firedtv.h | 19 +- drivers/media/dvb/frontends/Kconfig | 21 + drivers/media/dvb/frontends/Makefile | 3 + drivers/media/dvb/frontends/atbm8830.c | 495 ++ drivers/media/dvb/frontends/atbm8830.h | 76 + drivers/media/dvb/frontends/atbm8830_priv.h | 75 + drivers/media/dvb/frontends/au8522_decoder.c | 24 +- drivers/media/dvb/frontends/au8522_priv.h | 2 + drivers/media/dvb/frontends/cx24110.c | 4 +- drivers/media/dvb/frontends/cx24113.c | 2 +- drivers/media/dvb/frontends/dib3000mb.c | 2 +- drivers/media/dvb/frontends/dib7000p.c | 33 +- drivers/media/dvb/frontends/dib7000p.h | 13 + drivers/media/dvb/frontends/dib8000.c | 23 +- drivers/media/dvb/frontends/dib8000.h | 14 + drivers/media/dvb/frontends/drx397xD.c | 2 +- drivers/media/dvb/frontends/ds3000.c | 1367 ++++++ drivers/media/dvb/frontends/ds3000.h | 45 + drivers/media/dvb/frontends/ec100.c | 335 ++ drivers/media/dvb/frontends/ec100.h | 46 + drivers/media/dvb/frontends/ec100_priv.h | 39 + drivers/media/dvb/frontends/lgdt330x.c | 4 +- drivers/media/dvb/frontends/s5h1409.c | 149 +- drivers/media/dvb/frontends/s5h1409.h | 7 + drivers/media/dvb/frontends/stb0899_drv.c | 2 +- drivers/media/dvb/frontends/stb6100_proc.h | 138 + drivers/media/dvb/frontends/stv0900.h | 3 + drivers/media/dvb/frontends/stv0900_core.c | 1560 +++---- drivers/media/dvb/frontends/stv0900_init.h | 257 +- drivers/media/dvb/frontends/stv0900_priv.h | 81 +- drivers/media/dvb/frontends/stv0900_reg.h | 5000 ++++++++++---------- drivers/media/dvb/frontends/stv0900_sw.c | 3171 +++++-------- drivers/media/dvb/frontends/stv090x.c | 242 +- drivers/media/dvb/frontends/stv090x_priv.h | 3 +- drivers/media/dvb/frontends/stv090x_reg.h | 70 +- drivers/media/dvb/frontends/stv6110.c | 13 +- drivers/media/dvb/frontends/stv6110.h | 1 + drivers/media/dvb/frontends/stv6110x.c | 6 +- drivers/media/dvb/pt1/pt1.c | 1 - drivers/media/dvb/pt1/va1j5jf8007s.c | 57 +- drivers/media/dvb/pt1/va1j5jf8007t.c | 49 +- drivers/media/dvb/siano/sms-cards.c | 4 +- drivers/media/dvb/siano/sms-cards.h | 2 +- drivers/media/dvb/siano/smscoreapi.c | 2 +- drivers/media/dvb/siano/smssdio.c | 2 +- drivers/media/dvb/ttpci/av7110.c | 4 +- drivers/media/dvb/ttpci/budget-av.c | 2 +- drivers/media/dvb/ttpci/budget-ci.c | 18 +- drivers/media/dvb/ttpci/budget-patch.c | 2 +- drivers/media/dvb/ttusb-dec/ttusb_dec.c | 2 +- drivers/media/radio/Kconfig | 15 +- drivers/media/radio/Makefile | 1 + drivers/media/radio/radio-mr800.c | 360 +- drivers/media/radio/tef6862.c | 232 + drivers/media/video/Kconfig | 33 +- drivers/media/video/Makefile | 2 + drivers/media/video/adv7180.c | 323 ++- drivers/media/video/au0828/au0828-video.c | 2 +- drivers/media/video/bt819.c | 2 +- drivers/media/video/bt8xx/bttv-input.c | 15 +- drivers/media/video/cx18/cx18-av-core.c | 14 +- drivers/media/video/cx18/cx18-av-core.h | 2 +- drivers/media/video/cx18/cx18-cards.h | 3 + drivers/media/video/cx18/cx18-driver.c | 64 +- drivers/media/video/cx18/cx18-driver.h | 62 +- drivers/media/video/cx18/cx18-dvb.c | 9 +- drivers/media/video/cx18/cx18-fileops.c | 132 +- drivers/media/video/cx18/cx18-i2c.c | 25 +- drivers/media/video/cx18/cx18-ioctl.c | 3 +- drivers/media/video/cx18/cx18-mailbox.c | 62 +- drivers/media/video/cx18/cx18-mailbox.h | 8 +- drivers/media/video/cx18/cx18-queue.c | 346 ++- drivers/media/video/cx18/cx18-queue.h | 41 +- drivers/media/video/cx18/cx18-scb.h | 4 +- drivers/media/video/cx18/cx18-streams.c | 92 +- drivers/media/video/cx18/cx18-streams.h | 10 +- drivers/media/video/cx18/cx18-vbi.c | 35 +- drivers/media/video/cx18/cx18-vbi.h | 2 +- drivers/media/video/cx18/cx18-version.h | 2 +- drivers/media/video/cx18/cx23418.h | 2 +- drivers/media/video/cx231xx/cx231xx-avcore.c | 8 +- drivers/media/video/cx231xx/cx231xx-input.c | 11 +- drivers/media/video/cx231xx/cx231xx-video.c | 2 +- drivers/media/video/cx23885/Kconfig | 2 + drivers/media/video/cx23885/Makefile | 3 +- drivers/media/video/cx23885/cx23885-417.c | 10 +- drivers/media/video/cx23885/cx23885-cards.c | 155 +- drivers/media/video/cx23885/cx23885-core.c | 119 +- drivers/media/video/cx23885/cx23885-dvb.c | 160 +- drivers/media/video/cx23885/cx23885-f300.c | 177 + drivers/media/video/cx23885/cx23885-f300.h | 2 + drivers/media/video/cx23885/cx23885-input.c | 427 ++ drivers/media/video/cx23885/cx23885-input.h | 30 + drivers/media/video/cx23885/cx23885-ioctl.c | 208 + drivers/media/video/cx23885/cx23885-ioctl.h | 39 + drivers/media/video/cx23885/cx23885-ir.c | 101 + drivers/media/video/cx23885/cx23885-ir.h | 31 + drivers/media/video/cx23885/cx23885-reg.h | 5 +- drivers/media/video/cx23885/cx23885-video.c | 44 +- drivers/media/video/cx23885/cx23885.h | 31 +- drivers/media/video/cx23885/cx23888-ir.c | 1239 +++++ drivers/media/video/cx23885/cx23888-ir.h | 28 + drivers/media/video/cx25840/cx25840-audio.c | 463 ++- drivers/media/video/cx25840/cx25840-core.c | 324 +- drivers/media/video/cx25840/cx25840-core.h | 22 +- drivers/media/video/cx25840/cx25840-firmware.c | 10 +- drivers/media/video/cx88/Kconfig | 2 + drivers/media/video/cx88/cx88-cards.c | 19 +- drivers/media/video/cx88/cx88-core.c | 2 +- drivers/media/video/cx88/cx88-dvb.c | 58 +- drivers/media/video/cx88/cx88-input.c | 47 +- drivers/media/video/cx88/cx88-video.c | 2 +- drivers/media/video/cx88/cx88.h | 1 + drivers/media/video/davinci/dm355_ccdc.c | 6 +- drivers/media/video/davinci/dm644x_ccdc.c | 4 +- drivers/media/video/davinci/vpfe_capture.c | 47 +- drivers/media/video/davinci/vpss.c | 2 +- drivers/media/video/em28xx/em28xx-audio.c | 4 +- drivers/media/video/em28xx/em28xx-cards.c | 50 +- drivers/media/video/em28xx/em28xx-core.c | 22 +- drivers/media/video/em28xx/em28xx-dvb.c | 24 +- drivers/media/video/em28xx/em28xx-input.c | 27 +- drivers/media/video/em28xx/em28xx-reg.h | 1 + drivers/media/video/em28xx/em28xx-video.c | 8 +- drivers/media/video/em28xx/em28xx.h | 7 +- drivers/media/video/gspca/Kconfig | 23 +- drivers/media/video/gspca/Makefile | 4 + drivers/media/video/gspca/conex.c | 12 +- drivers/media/video/gspca/etoms.c | 10 +- drivers/media/video/gspca/finepix.c | 23 +- drivers/media/video/gspca/gl860/gl860-mi1320.c | 55 +- drivers/media/video/gspca/gl860/gl860-mi2020.c | 69 +- drivers/media/video/gspca/gl860/gl860-ov2640.c | 140 +- drivers/media/video/gspca/gl860/gl860-ov9655.c | 43 +- drivers/media/video/gspca/gl860/gl860.c | 61 +- drivers/media/video/gspca/gl860/gl860.h | 7 +- drivers/media/video/gspca/gspca.c | 137 +- drivers/media/video/gspca/gspca.h | 15 +- drivers/media/video/gspca/jeilinj.c | 34 +- drivers/media/video/gspca/m5602/m5602_core.c | 25 +- drivers/media/video/gspca/mars.c | 11 +- drivers/media/video/gspca/mr97310a.c | 602 ++- drivers/media/video/gspca/ov519.c | 1495 +++++- drivers/media/video/gspca/ov534.c | 1537 ++++++- drivers/media/video/gspca/pac207.c | 13 +- drivers/media/video/gspca/pac7302.c | 1272 +++++ drivers/media/video/gspca/pac7311.c | 716 +-- drivers/media/video/gspca/pac_common.h | 91 +- drivers/media/video/gspca/sn9c20x.c | 11 +- drivers/media/video/gspca/sonixb.c | 23 +- drivers/media/video/gspca/sonixj.c | 660 ++-- drivers/media/video/gspca/spca500.c | 13 +- drivers/media/video/gspca/spca501.c | 20 +- drivers/media/video/gspca/spca505.c | 10 +- drivers/media/video/gspca/spca506.c | 12 +- drivers/media/video/gspca/spca508.c | 10 +- drivers/media/video/gspca/spca561.c | 14 +- drivers/media/video/gspca/sq905.c | 75 +- drivers/media/video/gspca/sq905c.c | 31 +- drivers/media/video/gspca/stk014.c | 11 +- drivers/media/video/gspca/stv0680.c | 364 ++ drivers/media/video/gspca/stv06xx/stv06xx.c | 11 +- drivers/media/video/gspca/sunplus.c | 13 +- drivers/media/video/gspca/t613.c | 7 +- drivers/media/video/gspca/tv8532.c | 7 +- drivers/media/video/gspca/vc032x.c | 23 +- drivers/media/video/gspca/w996Xcf.c | 609 +++ drivers/media/video/gspca/zc3xx.c | 1472 +++---- drivers/media/video/hdpvr/hdpvr-video.c | 8 +- drivers/media/video/hexium_gemini.c | 2 +- drivers/media/video/hexium_orion.c | 2 +- drivers/media/video/ir-kbd-i2c.c | 19 +- drivers/media/video/ivtv/ivtv-cards.c | 16 +- drivers/media/video/ivtv/ivtv-cards.h | 51 +- drivers/media/video/ivtv/ivtv-driver.c | 27 +- drivers/media/video/ivtv/ivtv-driver.h | 6 + drivers/media/video/ivtv/ivtv-i2c.c | 153 +- drivers/media/video/ivtv/ivtv-i2c.h | 1 + drivers/media/video/mxb.c | 2 +- drivers/media/video/ov772x.c | 2 +- drivers/media/video/ov9640.c | 801 ++++ drivers/media/video/ov9640.h | 209 + drivers/media/video/pms.c | 1425 +++--- drivers/media/video/pvrusb2/pvrusb2-debugifc.c | 17 +- drivers/media/video/pvrusb2/pvrusb2-devattr.c | 13 +- drivers/media/video/pvrusb2/pvrusb2-devattr.h | 1 + drivers/media/video/pvrusb2/pvrusb2-encoder.c | 5 +- drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 3 +- drivers/media/video/pvrusb2/pvrusb2-hdw.c | 63 +- drivers/media/video/pvrusb2/pvrusb2-hdw.h | 2 +- drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 1 + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 15 +- drivers/media/video/pwc/pwc-if.c | 23 +- drivers/media/video/rj54n1cb0c.c | 1219 +++++ drivers/media/video/s2255drv.c | 4 +- drivers/media/video/saa7110.c | 2 +- drivers/media/video/saa7134/saa7134-cards.c | 55 + drivers/media/video/saa7134/saa7134-core.c | 6 +- drivers/media/video/saa7134/saa7134-dvb.c | 66 +- drivers/media/video/saa7134/saa7134-input.c | 55 +- drivers/media/video/saa7134/saa7134-video.c | 2 +- drivers/media/video/saa7134/saa7134.h | 3 +- drivers/media/video/saa7164/saa7164-core.c | 4 +- drivers/media/video/saa7164/saa7164-dvb.c | 1 + drivers/media/video/saa717x.c | 4 +- drivers/media/video/sh_mobile_ceu_camera.c | 83 +- drivers/media/video/tuner-core.c | 20 +- drivers/media/video/tvaudio.c | 2 +- drivers/media/video/tvp514x.c | 2 +- drivers/media/video/usbvideo/konicawc.c | 2 +- drivers/media/video/usbvideo/quickcam_messenger.c | 2 +- drivers/media/video/usbvision/usbvision-video.c | 2 +- drivers/media/video/uvc/uvc_ctrl.c | 36 +- drivers/media/video/uvc/uvc_driver.c | 428 +- drivers/media/video/uvc/uvc_v4l2.c | 60 +- drivers/media/video/uvc/uvc_video.c | 26 +- drivers/media/video/uvc/uvcvideo.h | 23 +- drivers/media/video/v4l2-common.c | 9 + drivers/media/video/videobuf-core.c | 12 +- drivers/media/video/videobuf-dma-contig.c | 2 +- drivers/media/video/videobuf-dma-sg.c | 6 +- drivers/media/video/videobuf-dvb.c | 11 +- drivers/media/video/videobuf-vmalloc.c | 4 +- drivers/media/video/vpx3220.c | 2 +- drivers/media/video/zoran/zoran.h | 2 +- drivers/media/video/zoran/zoran_driver.c | 2 +- drivers/media/video/zr364xx.c | 1 + drivers/message/fusion/mptbase.h | 4 +- drivers/message/fusion/mptctl.c | 5 +- drivers/message/fusion/mptscsih.c | 95 +- drivers/message/fusion/mptscsih.h | 3 +- drivers/message/i2o/i2o_block.c | 2 +- drivers/message/i2o/iop.c | 4 +- drivers/mfd/Kconfig | 8 + drivers/mfd/Makefile | 1 + drivers/mfd/sh_mobile_sdhi.c | 156 + drivers/mfd/ucb1400_core.c | 7 + drivers/misc/sgi-gru/grufile.c | 2 +- drivers/mmc/card/sdio_uart.c | 40 +- drivers/mmc/host/Kconfig | 2 +- drivers/mmc/host/s3cmci.c | 2 +- drivers/mtd/chips/Kconfig | 3 - drivers/mtd/devices/Kconfig | 3 - drivers/mtd/devices/slram.c | 2 +- drivers/mtd/lpddr/Kconfig | 3 - drivers/mtd/maps/Kconfig | 8 +- drivers/mtd/nand/Kconfig | 2 - drivers/mtd/nand/diskonchip.c | 2 +- drivers/mtd/nand/nand_ecc.c | 2 +- drivers/mtd/nand/s3c2410.c | 2 +- drivers/mtd/onenand/Kconfig | 4 - drivers/mtd/ubi/Kconfig | 2 - drivers/mtd/ubi/kapi.c | 40 + drivers/mtd/ubi/upd.c | 20 +- drivers/net/82596.c | 2 +- drivers/net/amd8111e.c | 7 +- drivers/net/appletalk/cops.c | 2 +- drivers/net/ariadne.h | 2 +- drivers/net/atl1c/atl1c_main.c | 2 +- drivers/net/benet/be_cmds.h | 2 +- drivers/net/benet/be_main.c | 2 +- drivers/net/bnx2x_reg.h | 2 +- drivers/net/bonding/bond_alb.c | 2 +- drivers/net/cxgb3/sge.c | 2 +- drivers/net/ehea/ehea_ethtool.c | 4 +- drivers/net/hamradio/baycom_ser_fdx.c | 2 +- drivers/net/irda/smsc-ircc2.c | 2 +- drivers/net/iseries_veth.c | 2 +- drivers/net/lasi_82596.c | 2 +- drivers/net/lib82596.c | 2 +- drivers/net/mlx4/en_rx.c | 2 +- drivers/net/mlx4/en_tx.c | 2 +- drivers/net/mlx4/mlx4_en.h | 2 +- drivers/net/ps3_gelic_net.c | 2 +- drivers/net/ps3_gelic_wireless.h | 2 +- drivers/net/qla3xxx.c | 2 +- drivers/net/s2io.c | 2 +- drivers/net/sis900.c | 4 +- drivers/net/skfp/h/smc.h | 8 +- drivers/net/skfp/skfddi.c | 2 +- drivers/net/sky2.c | 2 +- drivers/net/smsc911x.c | 2 +- drivers/net/smsc911x.h | 2 +- drivers/net/spider_net.c | 2 +- drivers/net/stmmac/gmac.c | 2 +- drivers/net/stmmac/gmac.h | 4 +- drivers/net/tokenring/ibmtr.c | 2 +- drivers/net/tokenring/smctr.c | 2 +- drivers/net/ucc_geth.c | 2 +- drivers/net/ucc_geth.h | 20 +- drivers/net/usb/smsc95xx.c | 2 +- drivers/net/wan/hdlc_fr.c | 2 +- drivers/net/wan/lmc/lmc_main.c | 2 +- drivers/net/wimax/i2400m/rx.c | 2 +- drivers/net/wireless/ath/ath5k/base.h | 4 +- drivers/net/wireless/ath/ath5k/eeprom.c | 2 +- drivers/net/wireless/ath/ath5k/phy.c | 6 +- drivers/net/wireless/ath/ath9k/rc.c | 2 +- drivers/net/wireless/b43/main.c | 2 +- drivers/net/wireless/b43legacy/main.c | 2 +- drivers/net/wireless/ipw2x00/ipw2100.c | 6 +- drivers/net/wireless/ipw2x00/ipw2200.c | 8 +- drivers/net/wireless/ipw2x00/libipw_module.c | 2 +- drivers/net/wireless/iwmc3200wifi/hal.c | 2 +- drivers/net/wireless/iwmc3200wifi/rx.c | 2 +- drivers/net/wireless/libertas/if_sdio.c | 2 +- drivers/net/wireless/orinoco/hermes_dld.c | 4 +- drivers/net/wireless/prism54/isl_ioctl.c | 4 +- drivers/net/wireless/rt2x00/rt2400pci.h | 2 +- drivers/net/wireless/rt2x00/rt2500pci.h | 2 +- drivers/net/wireless/rt2x00/rt2500usb.h | 2 +- drivers/net/wireless/rt2x00/rt61pci.h | 2 +- drivers/net/wireless/rt2x00/rt73usb.h | 2 +- drivers/net/wireless/zd1211rw/zd_mac.c | 2 +- drivers/parisc/ccio-dma.c | 2 +- drivers/pci/hotplug/acpi_pcihp.c | 2 +- drivers/pci/hotplug/acpiphp_glue.c | 22 +- drivers/pci/hotplug/acpiphp_ibm.c | 2 +- drivers/platform/Kconfig | 2 - drivers/platform/x86/intel_menlow.c | 2 +- drivers/platform/x86/sony-laptop.c | 2 +- drivers/platform/x86/thinkpad_acpi.c | 4 +- drivers/pnp/pnpbios/rsparser.c | 8 +- drivers/ps3/ps3-sys-manager.c | 2 +- drivers/rtc/rtc-ds1302.c | 2 +- drivers/rtc/rtc-ds1511.c | 4 +- drivers/rtc/rtc-stk17ta8.c | 2 +- drivers/rtc/rtc-v3020.c | 2 +- drivers/s390/block/dasd.c | 237 +- drivers/s390/block/dasd_3990_erp.c | 47 +- drivers/s390/block/dasd_alias.c | 77 +- drivers/s390/block/dasd_diag.c | 20 +- drivers/s390/block/dasd_eckd.c | 170 +- drivers/s390/block/dasd_eckd.h | 4 +- drivers/s390/block/dasd_eer.c | 5 - drivers/s390/block/dasd_fba.c | 11 +- drivers/s390/block/dasd_int.h | 13 + drivers/s390/block/dasd_ioctl.c | 4 +- drivers/s390/block/dasd_proc.c | 2 +- drivers/s390/char/con3215.c | 1 - drivers/s390/char/con3270.c | 1 - drivers/s390/char/fs3270.c | 12 +- drivers/s390/char/monreader.c | 8 +- drivers/s390/char/monwriter.c | 7 +- drivers/s390/char/sclp_cmd.c | 1 + drivers/s390/char/tape.h | 9 +- drivers/s390/char/tape_34xx.c | 8 +- drivers/s390/char/tape_3590.c | 2 +- drivers/s390/char/tape_block.c | 17 +- drivers/s390/char/tape_char.c | 54 +- drivers/s390/char/tape_core.c | 65 +- drivers/s390/char/tape_proc.c | 2 +- drivers/s390/char/tty3270.c | 20 + drivers/s390/char/vmlogrdr.c | 8 +- drivers/s390/char/vmur.c | 3 - drivers/s390/char/vmwatchdog.c | 29 +- drivers/s390/cio/Makefile | 2 +- drivers/s390/cio/ccwreq.c | 328 ++ drivers/s390/cio/chp.c | 2 +- drivers/s390/cio/cio.h | 8 +- drivers/s390/cio/cmf.c | 2 +- drivers/s390/cio/css.c | 57 +- drivers/s390/cio/css.h | 3 + drivers/s390/cio/device.c | 1006 ++--- drivers/s390/cio/device.h | 25 +- drivers/s390/cio/device_fsm.c | 411 +-- drivers/s390/cio/device_id.c | 375 +- drivers/s390/cio/device_ops.c | 144 +- drivers/s390/cio/device_pgid.c | 963 ++-- drivers/s390/cio/device_status.c | 3 - drivers/s390/cio/io_sch.h | 73 +- drivers/s390/crypto/ap_bus.c | 31 +- drivers/s390/crypto/ap_bus.h | 18 +- drivers/s390/crypto/zcrypt_api.c | 11 +- drivers/s390/crypto/zcrypt_api.h | 2 + drivers/s390/crypto/zcrypt_cex2a.c | 75 +- drivers/s390/crypto/zcrypt_pcica.c | 2 + drivers/s390/crypto/zcrypt_pcicc.c | 2 + drivers/s390/crypto/zcrypt_pcixcc.c | 38 +- drivers/s390/net/qeth_core_mpc.h | 2 +- drivers/s390/scsi/zfcp_aux.c | 388 +- drivers/s390/scsi/zfcp_ccw.c | 179 +- drivers/s390/scsi/zfcp_cfdc.c | 26 +- drivers/s390/scsi/zfcp_dbf.c | 134 +- drivers/s390/scsi/zfcp_dbf.h | 10 +- drivers/s390/scsi/zfcp_def.h | 323 +-- drivers/s390/scsi/zfcp_erp.c | 138 +- drivers/s390/scsi/zfcp_ext.h | 38 +- drivers/s390/scsi/zfcp_fc.c | 677 ++-- drivers/s390/scsi/zfcp_fc.h | 260 + drivers/s390/scsi/zfcp_fsf.c | 369 +- drivers/s390/scsi/zfcp_fsf.h | 53 +- drivers/s390/scsi/zfcp_scsi.c | 156 +- drivers/s390/scsi/zfcp_sysfs.c | 250 +- drivers/sbus/char/envctrl.c | 4 +- drivers/scsi/3w-9xxx.c | 8 +- drivers/scsi/3w-sas.c | 1924 ++++++++ drivers/scsi/3w-sas.h | 396 ++ drivers/scsi/3w-xxxx.c | 8 +- drivers/scsi/53c700.c | 9 +- drivers/scsi/Kconfig | 29 +- drivers/scsi/Makefile | 3 + drivers/scsi/aacraid/aacraid.h | 6 +- drivers/scsi/aacraid/comminit.c | 2 +- drivers/scsi/aacraid/linit.c | 6 +- drivers/scsi/advansys.c | 2 +- drivers/scsi/aic7xxx/aic79xx.seq | 4 +- drivers/scsi/aic7xxx/aic79xx_core.c | 2 +- drivers/scsi/aic7xxx/aic79xx_osm.c | 2 +- drivers/scsi/aic7xxx/aic7xxx.seq | 2 +- drivers/scsi/aic7xxx/aic7xxx_core.c | 2 +- drivers/scsi/aic7xxx/aic7xxx_osm.c | 2 +- drivers/scsi/aic94xx/aic94xx_reg_def.h | 2 +- drivers/scsi/arcmsr/arcmsr_hba.c | 5 +- drivers/scsi/be2iscsi/be.h | 24 +- drivers/scsi/be2iscsi/be_cmds.c | 263 +- drivers/scsi/be2iscsi/be_cmds.h | 37 +- drivers/scsi/be2iscsi/be_iscsi.c | 23 +- drivers/scsi/be2iscsi/be_main.c | 1019 +++- drivers/scsi/be2iscsi/be_main.h | 49 +- drivers/scsi/be2iscsi/be_mgmt.c | 69 +- drivers/scsi/be2iscsi/be_mgmt.h | 8 +- drivers/scsi/bfa/bfa_cb_ioim_macros.h | 10 +- drivers/scsi/bfa/bfa_cee.c | 2 +- drivers/scsi/bfa/bfa_csdebug.c | 4 +- drivers/scsi/bfa/bfa_fcpim.c | 4 +- drivers/scsi/bfa/bfa_fcpim_priv.h | 4 +- drivers/scsi/bfa/bfa_fcport.c | 59 +- drivers/scsi/bfa/bfa_fcs_lport.c | 11 +- drivers/scsi/bfa/bfa_fcxp.c | 8 +- drivers/scsi/bfa/bfa_intr.c | 2 +- drivers/scsi/bfa/bfa_intr_priv.h | 18 +- drivers/scsi/bfa/bfa_ioc.c | 10 +- drivers/scsi/bfa/bfa_ioc.h | 12 +- drivers/scsi/bfa/bfa_iocfc.c | 8 +- drivers/scsi/bfa/bfa_iocfc.h | 8 +- drivers/scsi/bfa/bfa_ioim.c | 4 +- drivers/scsi/bfa/bfa_itnim.c | 6 +- drivers/scsi/bfa/bfa_log.c | 4 +- drivers/scsi/bfa/bfa_port_priv.h | 4 +- drivers/scsi/bfa/bfa_rport.c | 6 +- drivers/scsi/bfa/bfa_tskim.c | 9 +- drivers/scsi/bfa/bfa_uf.c | 2 +- drivers/scsi/bfa/bfad.c | 6 +- drivers/scsi/bfa/bfad_fwimg.c | 8 +- drivers/scsi/bfa/bfad_im.c | 2 +- drivers/scsi/bfa/bfad_im_compat.h | 2 +- drivers/scsi/bfa/bfad_intr.c | 3 +- drivers/scsi/bfa/fabric.c | 18 +- drivers/scsi/bfa/fcbuild.c | 190 +- drivers/scsi/bfa/fcbuild.h | 6 +- drivers/scsi/bfa/fcpim.c | 7 +- drivers/scsi/bfa/fcs.h | 2 +- drivers/scsi/bfa/fdmi.c | 8 +- drivers/scsi/bfa/include/aen/bfa_aen.h | 2 +- drivers/scsi/bfa/include/bfa.h | 10 +- drivers/scsi/bfa/include/bfa_svc.h | 8 +- drivers/scsi/bfa/include/bfi/bfi.h | 12 +- drivers/scsi/bfa/include/bfi/bfi_ioc.h | 2 +- drivers/scsi/bfa/include/bfi/bfi_lps.h | 4 +- drivers/scsi/bfa/include/bfi/bfi_rport.h | 8 +- drivers/scsi/bfa/include/cs/bfa_checksum.h | 6 +- drivers/scsi/bfa/include/cs/bfa_sm.h | 6 +- drivers/scsi/bfa/include/cs/bfa_trc.h | 2 +- drivers/scsi/bfa/include/defs/bfa_defs_pport.h | 2 +- drivers/scsi/bfa/include/defs/bfa_defs_tsensor.h | 2 +- drivers/scsi/bfa/include/fcs/bfa_fcs_fabric.h | 2 +- drivers/scsi/bfa/include/fcs/bfa_fcs_lport.h | 17 +- drivers/scsi/bfa/include/protocol/ct.h | 14 +- drivers/scsi/bfa/include/protocol/fc.h | 22 +- drivers/scsi/bfa/loop.c | 233 +- drivers/scsi/bfa/lport_api.c | 15 +- drivers/scsi/bfa/ns.c | 5 +- drivers/scsi/bfa/plog.c | 2 +- drivers/scsi/bfa/rport_ftrs.c | 28 +- drivers/scsi/bfa/vfapi.c | 2 +- drivers/scsi/bfa/vport.c | 20 +- drivers/scsi/bnx2i/bnx2i.h | 1 - drivers/scsi/bnx2i/bnx2i_iscsi.c | 12 +- drivers/scsi/constants.c | 1 + drivers/scsi/cxgb3i/cxgb3i_iscsi.c | 2 +- drivers/scsi/dc395x.c | 2 +- drivers/scsi/device_handler/scsi_dh.c | 28 +- drivers/scsi/device_handler/scsi_dh_alua.c | 139 +- drivers/scsi/device_handler/scsi_dh_emc.c | 7 +- drivers/scsi/device_handler/scsi_dh_hp_sw.c | 94 +- drivers/scsi/device_handler/scsi_dh_rdac.c | 115 +- drivers/scsi/dmx3191d.c | 2 +- drivers/scsi/fcoe/fcoe.c | 1376 ++++-- drivers/scsi/fcoe/fcoe.h | 82 +- drivers/scsi/fcoe/libfcoe.c | 433 +- drivers/scsi/fnic/fnic.h | 25 +- drivers/scsi/fnic/fnic_fcs.c | 499 +- drivers/scsi/fnic/fnic_isr.c | 18 +- drivers/scsi/fnic/fnic_main.c | 104 +- drivers/scsi/fnic/fnic_res.c | 5 +- drivers/scsi/fnic/fnic_res.h | 54 +- drivers/scsi/fnic/fnic_scsi.c | 96 +- drivers/scsi/fnic/vnic_scsi.h | 1 + drivers/scsi/hosts.c | 13 +- drivers/scsi/hptiop.c | 7 +- drivers/scsi/ibmvscsi/ibmvfc.c | 335 ++- drivers/scsi/ibmvscsi/ibmvfc.h | 12 +- drivers/scsi/ibmvscsi/ibmvscsi.c | 7 +- drivers/scsi/ipr.c | 7 +- drivers/scsi/iscsi_tcp.c | 2 +- drivers/scsi/libfc/Makefile | 4 +- drivers/scsi/libfc/fc_disc.c | 85 +- drivers/scsi/libfc/fc_elsct.c | 79 +- drivers/scsi/libfc/fc_exch.c | 932 +++-- drivers/scsi/libfc/fc_fcp.c | 1044 +++-- drivers/scsi/libfc/fc_frame.c | 13 +- drivers/scsi/libfc/fc_libfc.c | 134 + drivers/scsi/libfc/fc_libfc.h | 112 + drivers/scsi/libfc/fc_lport.c | 855 +++- drivers/scsi/libfc/fc_npiv.c | 161 + drivers/scsi/libfc/fc_rport.c | 409 ++- drivers/scsi/libiscsi.c | 389 ++- drivers/scsi/libiscsi_tcp.c | 2 +- drivers/scsi/libsas/sas_scsi_host.c | 6 +- drivers/scsi/lpfc/lpfc.h | 17 +- drivers/scsi/lpfc/lpfc_attr.c | 266 +- drivers/scsi/lpfc/lpfc_bsg.c | 5 +- drivers/scsi/lpfc/lpfc_crtn.h | 14 +- drivers/scsi/lpfc/lpfc_ct.c | 53 +- drivers/scsi/lpfc/lpfc_debugfs.c | 10 +- drivers/scsi/lpfc/lpfc_disc.h | 4 +- drivers/scsi/lpfc/lpfc_els.c | 80 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 129 +- drivers/scsi/lpfc/lpfc_hw.h | 34 +- drivers/scsi/lpfc/lpfc_hw4.h | 131 +- drivers/scsi/lpfc/lpfc_init.c | 577 ++- drivers/scsi/lpfc/lpfc_mbox.c | 35 +- drivers/scsi/lpfc/lpfc_nportdisc.c | 7 + drivers/scsi/lpfc/lpfc_scsi.c | 394 +- drivers/scsi/lpfc/lpfc_sli.c | 1250 ++++-- drivers/scsi/lpfc/lpfc_sli.h | 27 +- drivers/scsi/lpfc/lpfc_sli4.h | 34 +- drivers/scsi/lpfc/lpfc_version.h | 3 +- drivers/scsi/lpfc/lpfc_vport.c | 4 +- drivers/scsi/megaraid.h | 2 +- drivers/scsi/megaraid/mbox_defs.h | 2 +- drivers/scsi/megaraid/megaraid_mbox.c | 9 +- drivers/scsi/megaraid/megaraid_sas.c | 738 +++- drivers/scsi/megaraid/megaraid_sas.h | 149 +- drivers/scsi/mpt2sas/mpi/mpi2.h | 5 +- drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 274 ++- drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 18 +- drivers/scsi/mpt2sas/mpi/mpi2_raid.h | 14 +- drivers/scsi/mpt2sas/mpi/mpi2_tool.h | 16 +- drivers/scsi/mpt2sas/mpt2sas_base.c | 152 +- drivers/scsi/mpt2sas/mpt2sas_base.h | 37 +- drivers/scsi/mpt2sas/mpt2sas_ctl.c | 197 +- drivers/scsi/mpt2sas/mpt2sas_ctl.h | 4 +- drivers/scsi/mpt2sas/mpt2sas_scsih.c | 821 +++- drivers/scsi/mpt2sas/mpt2sas_transport.c | 86 +- drivers/scsi/ncr53c8xx.c | 2 +- drivers/scsi/nsp32.c | 2 +- drivers/scsi/osd/osd_initiator.c | 121 +- drivers/scsi/osd/osd_uld.c | 260 +- drivers/scsi/pm8001/Makefile | 12 + drivers/scsi/pm8001/pm8001_chips.h | 89 + drivers/scsi/pm8001/pm8001_ctl.c | 573 +++ drivers/scsi/pm8001/pm8001_ctl.h | 67 + drivers/scsi/pm8001/pm8001_defs.h | 112 + drivers/scsi/pm8001/pm8001_hwi.c | 4458 +++++++++++++++++ drivers/scsi/pm8001/pm8001_hwi.h | 1030 ++++ drivers/scsi/pm8001/pm8001_init.c | 891 ++++ drivers/scsi/pm8001/pm8001_sas.c | 1103 +++++ drivers/scsi/pm8001/pm8001_sas.h | 481 ++ drivers/scsi/pmcraid.c | 13 +- drivers/scsi/pmcraid.h | 6 +- drivers/scsi/qla2xxx/qla_attr.c | 3 +- drivers/scsi/qla2xxx/qla_dbg.c | 78 +- drivers/scsi/qla2xxx/qla_def.h | 9 +- drivers/scsi/qla2xxx/qla_gbl.h | 3 +- drivers/scsi/qla2xxx/qla_init.c | 12 +- drivers/scsi/qla2xxx/qla_isr.c | 144 +- drivers/scsi/qla2xxx/qla_mbx.c | 50 +- drivers/scsi/qla2xxx/qla_mid.c | 2 - drivers/scsi/qla2xxx/qla_os.c | 67 +- drivers/scsi/qla2xxx/qla_version.h | 2 +- drivers/scsi/qlogicpti.h | 2 +- drivers/scsi/scsi.c | 10 +- drivers/scsi/scsi_debug.c | 351 ++- drivers/scsi/scsi_devinfo.c | 13 +- drivers/scsi/scsi_error.c | 65 +- drivers/scsi/scsi_ioctl.c | 3 + drivers/scsi/scsi_lib.c | 11 +- drivers/scsi/scsi_lib_dma.c | 4 +- drivers/scsi/scsi_netlink.c | 2 +- drivers/scsi/scsi_scan.c | 3 + drivers/scsi/scsi_sysfs.c | 44 +- drivers/scsi/scsi_transport_fc.c | 99 +- drivers/scsi/scsi_transport_iscsi.c | 13 +- drivers/scsi/scsi_transport_sas.c | 6 +- drivers/scsi/st.c | 3 +- drivers/scsi/stex.c | 282 +- drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 +- drivers/scsi/sym53c8xx_2/sym_hipd.h | 2 +- drivers/scsi/vmw_pvscsi.c | 1407 ++++++ drivers/scsi/vmw_pvscsi.h | 397 ++ drivers/scsi/wd7000.c | 2 +- drivers/serial/8250_pnp.c | 4 +- drivers/serial/Kconfig | 2 +- drivers/serial/mcf.c | 2 +- drivers/serial/pmac_zilog.h | 2 +- drivers/serial/sh-sci.c | 59 +- drivers/serial/sh-sci.h | 2 +- drivers/serial/ucc_uart.c | 2 +- drivers/sh/Makefile | 1 + drivers/sh/intc.c | 123 +- drivers/sh/maple/maple.c | 4 +- arch/sh/kernel/gpio.c => drivers/sh/pfc.c | 43 +- drivers/spi/spidev.c | 2 +- drivers/staging/go7007/Makefile | 4 +- drivers/staging/go7007/go7007-driver.c | 30 +- drivers/staging/go7007/go7007-priv.h | 8 + drivers/staging/go7007/go7007-usb.c | 6 +- drivers/staging/go7007/go7007-v4l2.c | 109 +- drivers/staging/go7007/s2250-board.c | 558 ++-- drivers/staging/go7007/s2250-loader.c | 12 +- drivers/staging/otus/80211core/pub_zfi.h | 2 +- drivers/staging/otus/zdcompat.h | 2 +- drivers/staging/rtl8187se/r8180.h | 2 +- drivers/staging/rtl8192su/r8192S_phyreg.h | 2 +- drivers/staging/wavelan/wavelan_cs.c | 2 +- drivers/telephony/ixj.c | 4 +- drivers/usb/atm/ueagle-atm.c | 2 +- drivers/usb/class/usbtmc.c | 2 +- drivers/usb/core/message.c | 2 +- drivers/usb/gadget/f_acm.c | 2 +- drivers/usb/gadget/pxa27x_udc.c | 2 +- drivers/usb/host/ehci-hcd.c | 2 +- drivers/usb/host/fhci-sched.c | 2 +- drivers/usb/wusbcore/crypto.c | 2 +- drivers/usb/wusbcore/wa-xfer.c | 4 +- drivers/uwb/i1480/dfu/usb.c | 2 +- drivers/uwb/neh.c | 2 +- drivers/uwb/wlp/txrx.c | 2 +- drivers/video/Kconfig | 1 + drivers/video/atmel_lcdfb.c | 2 +- drivers/video/aty/atyfb_base.c | 4 +- drivers/video/backlight/atmel-pwm-bl.c | 2 +- drivers/video/backlight/tosa_lcd.c | 2 +- drivers/video/broadsheetfb.c | 2 +- drivers/video/console/sticore.c | 2 +- drivers/video/fb_defio.c | 6 +- drivers/video/gbefb.c | 2 +- drivers/video/hecubafb.c | 2 +- drivers/video/metronomefb.c | 2 +- drivers/video/omap/lcd_ams_delta.c | 4 +- drivers/video/omap/lcd_mipid.c | 4 +- drivers/video/sgivwfb.c | 4 +- drivers/video/sh_mobile_lcdcfb.c | 32 +- drivers/video/stifb.c | 4 +- drivers/video/tdfxfb.c | 2 +- drivers/video/via/dvi.c | 4 +- drivers/video/vt8623fb.c | 2 +- drivers/video/xen-fbfront.c | 2 +- drivers/watchdog/coh901327_wdt.c | 2 +- drivers/watchdog/machzwd.c | 2 +- drivers/watchdog/sb_wdog.c | 4 +- drivers/watchdog/wdrtas.c | 6 +- drivers/xen/balloon.c | 38 +- drivers/xen/events.c | 3 + drivers/xen/manage.c | 37 +- drivers/xen/xenbus/xenbus_probe.c | 48 +- fs/binfmt_elf.c | 2 +- fs/bio.c | 2 +- fs/btrfs/extent_map.c | 2 +- fs/cifs/README | 2 +- fs/cifs/cifsglob.h | 2 +- fs/cifs/cifspdu.h | 2 +- fs/cifs/inode.c | 4 +- fs/cifs/smbdes.c | 2 +- fs/compat_ioctl.c | 2 +- fs/debugfs/inode.c | 6 +- fs/dlm/config.c | 24 +- fs/dlm/debug_fs.c | 2 +- fs/dlm/dir.c | 7 +- fs/dlm/dlm_internal.h | 1 - fs/dlm/lock.c | 6 +- fs/dlm/lockspace.c | 15 +- fs/dlm/lowcomms.c | 6 +- fs/dlm/member.c | 8 +- fs/dlm/memory.c | 6 +- fs/dlm/netlink.c | 2 +- fs/dlm/plock.c | 8 +- fs/dlm/rcom.c | 2 +- fs/dlm/requestqueue.c | 2 +- fs/dlm/user.c | 12 +- fs/exofs/Kbuild | 2 +- fs/exofs/common.h | 81 +- fs/exofs/exofs.h | 97 +- fs/exofs/inode.c | 409 +- fs/exofs/ios.c | 421 ++ fs/exofs/osd.c | 125 - fs/exofs/pnfs.h | 51 + fs/exofs/super.c | 353 ++- fs/ext3/inode.c | 2 +- fs/ext4/Kconfig | 10 + fs/ext4/balloc.c | 46 +- fs/ext4/block_validity.c | 3 +- fs/ext4/ext4.h | 23 +- fs/ext4/ext4_jbd2.c | 82 +- fs/ext4/ext4_jbd2.h | 44 +- fs/ext4/extents.c | 44 +- fs/ext4/fsync.c | 54 +- fs/ext4/inode.c | 201 +- fs/ext4/ioctl.c | 29 +- fs/ext4/mballoc.c | 103 +- fs/ext4/migrate.c | 27 +- fs/ext4/move_extent.c | 282 +- fs/ext4/namei.c | 38 +- fs/ext4/resize.c | 2 +- fs/ext4/super.c | 118 +- fs/ext4/xattr.c | 15 +- fs/jbd2/commit.c | 4 + fs/jbd2/journal.c | 12 + fs/jffs2/compr.c | 2 +- fs/jffs2/readinode.c | 2 +- fs/jffs2/xattr.c | 2 +- fs/jfs/jfs_dmap.c | 4 +- fs/ncpfs/ioctl.c | 2 +- fs/notify/inotify/inotify_user.c | 4 - fs/ntfs/compress.c | 2 +- fs/ntfs/file.c | 4 +- fs/ntfs/logfile.c | 2 +- fs/ocfs2/alloc.c | 2 +- fs/ocfs2/blockcheck.c | 2 +- fs/ocfs2/dlm/dlmmaster.c | 2 +- fs/ocfs2/dlmglue.c | 2 +- fs/ocfs2/journal.c | 2 +- fs/ocfs2/refcounttree.c | 2 +- fs/omfs/bitmap.c | 2 +- fs/qnx4/bitmap.c | 2 +- fs/qnx4/dir.c | 6 +- fs/qnx4/inode.c | 26 +- fs/qnx4/namei.c | 6 +- fs/reiserfs/fix_node.c | 2 +- fs/ubifs/debug.c | 2 +- fs/ubifs/file.c | 13 +- fs/ubifs/recovery.c | 2 +- fs/ubifs/super.c | 20 +- fs/xfs/quota/xfs_dquot.h | 2 +- include/acpi/acpixf.h | 5 +- include/asm-generic/memory_model.h | 2 +- include/asm-generic/unistd.h | 2 +- include/linux/cciss_ioctl.h | 2 +- include/linux/chio.h | 2 +- include/linux/dm-log-userspace.h | 2 +- include/linux/fb.h | 1 + include/linux/hid.h | 1 + include/linux/ide.h | 4 +- include/linux/in6.h | 2 +- include/linux/input-polldev.h | 22 +- include/linux/input.h | 13 +- include/linux/input/matrix_keypad.h | 3 + .../include/asm => include/linux/input}/sh_keysc.h | 6 +- include/linux/input/sparse-keymap.h | 62 + include/linux/irq.h | 2 +- include/linux/libata.h | 2 +- include/linux/mfd/ezx-pcap.h | 4 +- include/linux/mfd/sh_mobile_sdhi.h | 8 + include/linux/mtd/ubi.h | 2 + include/linux/pci_ids.h | 2 + include/linux/pktcdvd.h | 2 +- include/linux/serial_reg.h | 8 +- include/linux/serio.h | 1 + include/linux/sh_intc.h | 7 +- include/linux/sh_pfc.h | 96 + include/linux/spi/spi_bitbang.h | 2 +- include/linux/sysctl.h | 10 +- include/linux/ucb1400.h | 4 + include/linux/usb/wusb.h | 2 +- include/linux/videodev2.h | 9 +- include/linux/workqueue.h | 38 +- include/media/cx25840.h | 1 + include/media/davinci/vpfe_capture.h | 2 + include/media/ir-common.h | 43 +- include/media/v4l2-chip-ident.h | 23 + include/media/v4l2-subdev.h | 103 +- include/media/videobuf-core.h | 4 +- include/media/videobuf-dma-contig.h | 2 +- include/media/videobuf-dma-sg.h | 2 +- include/media/videobuf-dvb.h | 4 +- include/media/videobuf-vmalloc.h | 4 +- include/net/sctp/structs.h | 2 +- include/net/tcp.h | 2 +- include/net/wimax.h | 2 +- include/scsi/Kbuild | 1 + include/scsi/fc/Kbuild | 4 + include/scsi/fc/fc_els.h | 6 +- include/scsi/fc/fc_fcoe.h | 12 + include/scsi/fc/fc_fcp.h | 8 + include/scsi/fc/fc_fip.h | 12 +- include/scsi/fc/fc_fs.h | 2 + include/scsi/fc/fc_gs.h | 2 + include/scsi/fc/fc_ns.h | 35 +- include/scsi/fc_encode.h | 68 +- include/scsi/fc_frame.h | 22 +- include/scsi/iscsi_if.h | 3 + include/scsi/iscsi_proto.h | 2 + include/scsi/libfc.h | 1158 +++--- include/scsi/libfcoe.h | 93 +- include/scsi/libiscsi.h | 4 +- include/scsi/libsas.h | 3 +- include/scsi/osd_initiator.h | 81 +- include/scsi/osd_protocol.h | 1 + include/scsi/osd_sense.h | 3 + include/scsi/scsi.h | 4 + include/scsi/scsi_device.h | 12 +- include/scsi/scsi_dh.h | 6 +- include/scsi/scsi_host.h | 24 +- include/scsi/scsi_transport_fc.h | 1 + include/sound/ac97_codec.h | 2 +- include/sound/wm8993.h | 2 +- include/trace/events/ext4.h | 54 +- include/video/sgivw.h | 11 +- ipc/msg.c | 2 +- kernel/irq/spurious.c | 2 +- kernel/perf_event.c | 4 +- kernel/time/clocksource.c | 2 +- kernel/workqueue.c | 131 +- lib/Kconfig.debug | 10 +- lib/decompress_bunzip2.c | 2 +- lib/dma-debug.c | 2 +- lib/idr.c | 4 +- lib/swiotlb.c | 2 +- mm/filemap.c | 2 +- mm/kmemleak.c | 4 +- mm/memcontrol.c | 6 +- mm/memory-failure.c | 2 +- mm/truncate.c | 2 +- net/bluetooth/bnep/core.c | 4 +- net/ipv4/netfilter/ipt_ECN.c | 2 +- net/irda/irlap.c | 14 +- net/irda/irlap_event.c | 2 +- net/irda/irlmp.c | 4 +- net/mac80211/mesh_pathtbl.c | 4 +- net/netlabel/netlabel_domainhash.c | 2 +- net/sched/act_api.c | 2 +- net/sctp/sm_sideeffect.c | 2 +- net/sctp/sm_statefuns.c | 2 +- net/sunrpc/xprtrdma/svc_rdma_sendto.c | 2 +- net/wimax/op-reset.c | 2 +- samples/Kconfig | 3 - scripts/kconfig/mconf.c | 2 +- security/selinux/netlabel.c | 2 +- security/selinux/ss/services.c | 2 +- sound/Kconfig | 4 - sound/isa/cs423x/cs4236.c | 2 +- sound/isa/opti9xx/miro.c | 2 +- sound/isa/opti9xx/opti92x-ad1848.c | 114 +- sound/oss/Kconfig | 2 - sound/oss/dmasound/dmasound_paula.c | 2 +- sound/pci/ca0106/ca0106_proc.c | 2 +- sound/pci/cs46xx/imgs/cwcdma.asp | 9 +- sound/pci/emu10k1/emu10k1x.c | 2 +- sound/pci/hda/hda_intel.c | 5 + sound/pci/hda/patch_analog.c | 17 +- sound/pci/hda/patch_cirrus.c | 2 +- sound/pci/hda/patch_cmedia.c | 2 +- sound/pci/hda/patch_realtek.c | 129 +- sound/pci/ice1712/aureon.c | 31 +- sound/pci/ice1712/juli.c | 2 +- sound/pci/rme9652/hdspm.c | 4 +- sound/soc/codecs/uda134x.c | 4 +- sound/soc/codecs/wm8903.c | 6 +- sound/soc/codecs/wm8993.c | 4 +- sound/soc/imx/mx1_mx2-pcm.c | 6 +- sound/soc/s3c24xx/s3c24xx_simtec.c | 2 +- sound/soc/s6000/s6000-pcm.c | 2 +- sound/sound_core.c | 2 +- sound/synth/emux/soundfont.c | 2 +- sound/usb/usx2y/us122l.c | 28 +- sound/usb/usx2y/us122l.h | 2 + 1541 files changed, 76185 insertions(+), 31505 deletions(-) create mode 100644 Documentation/ABI/stable/sysfs-driver-qla2xxx rename Documentation/DocBook/dvb/{isdbt.xml => dvbproperty.xml} (99%) create mode 100644 Documentation/DocBook/dvb/frontend.h.xml create mode 100644 Documentation/hwmon/mc13783-adc rename Documentation/{ => misc-devices}/c2port.txt (100%) rename Documentation/{ => misc-devices}/ics932s401 (100%) delete mode 100644 arch/arm/configs/da830_omapl137_defconfig rename arch/arm/configs/{da850_omapl138_defconfig => da8xx_omapl_defconfig} (85%) create mode 100644 arch/arm/mach-davinci/board-neuros-osd2.c create mode 100644 arch/arm/mach-davinci/cpufreq.c create mode 100644 arch/arm/mach-davinci/cpuidle.c create mode 100644 arch/arm/mach-davinci/include/mach/cpufreq.h create mode 100644 arch/arm/mach-davinci/include/mach/cpuidle.h create mode 100644 arch/arm/mach-davinci/include/mach/keyscan.h create mode 100644 arch/arm/mach-davinci/include/mach/usb.h delete mode 100644 arch/s390/include/asm/todclk.h create mode 100644 arch/sh/boards/mach-ap325rxa/Makefile create mode 100644 arch/sh/boards/mach-ap325rxa/sdram.S rename arch/sh/boards/{board-ap325rxa.c => mach-ap325rxa/setup.c} (87%) create mode 100644 arch/sh/boards/mach-ecovec24/sdram.S create mode 100644 arch/sh/boards/mach-kfr2r09/sdram.S create mode 100644 arch/sh/boards/mach-migor/sdram.S create mode 100644 arch/sh/boards/mach-se/7724/sdram.S delete mode 100644 arch/sh/drivers/pci/Kconfig delete mode 100644 arch/sh/include/asm/irqflags_32.h delete mode 100644 arch/sh/include/asm/irqflags_64.h create mode 100644 arch/sh/kernel/cpu/sh4/perf_event.c create mode 100644 arch/sh/kernel/cpu/sh4a/perf_event.c delete mode 100644 arch/sh/kernel/cpu/ubc.S create mode 100644 arch/sh/kernel/dma-nommu.c create mode 100644 arch/sh/kernel/irq_32.c create mode 100644 arch/sh/kernel/irq_64.c create mode 100644 arch/sh/kernel/perf_callchain.c create mode 100644 arch/sh/kernel/perf_event.c create mode 100644 arch/sh/kernel/return_address.c create mode 100644 arch/sh/lib/memset-sh4.S delete mode 100644 arch/sh/mm/pmb-fixed.c delete mode 100644 arch/sh/oprofile/op_model_sh7750.c create mode 100644 drivers/acpi/acpica/nsrepair2.c create mode 100644 drivers/hwmon/lm73.c create mode 100644 drivers/hwmon/mc13783-adc.c create mode 100644 drivers/input/keyboard/davinci_keyscan.c create mode 100644 drivers/input/serio/altera_ps2.c create mode 100644 drivers/input/sparse-keymap.c create mode 100644 drivers/input/touchscreen/dynapro.c create mode 100644 drivers/input/touchscreen/s3c2410_ts.c create mode 100644 drivers/media/common/ir-keytable.c create mode 100644 drivers/media/common/tuners/max2165.c create mode 100644 drivers/media/common/tuners/max2165.h create mode 100644 drivers/media/common/tuners/max2165_priv.h create mode 100644 drivers/media/dvb/dvb-usb/ec168.c create mode 100644 drivers/media/dvb/dvb-usb/ec168.h create mode 100644 drivers/media/dvb/firewire/firedtv-fw.c create mode 100644 drivers/media/dvb/frontends/atbm8830.c create mode 100644 drivers/media/dvb/frontends/atbm8830.h create mode 100644 drivers/media/dvb/frontends/atbm8830_priv.h create mode 100644 drivers/media/dvb/frontends/ds3000.c create mode 100644 drivers/media/dvb/frontends/ds3000.h create mode 100644 drivers/media/dvb/frontends/ec100.c create mode 100644 drivers/media/dvb/frontends/ec100.h create mode 100644 drivers/media/dvb/frontends/ec100_priv.h create mode 100644 drivers/media/dvb/frontends/stb6100_proc.h create mode 100644 drivers/media/radio/tef6862.c create mode 100644 drivers/media/video/cx23885/cx23885-f300.c create mode 100644 drivers/media/video/cx23885/cx23885-f300.h create mode 100644 drivers/media/video/cx23885/cx23885-input.c create mode 100644 drivers/media/video/cx23885/cx23885-input.h create mode 100644 drivers/media/video/cx23885/cx23885-ioctl.c create mode 100644 drivers/media/video/cx23885/cx23885-ioctl.h create mode 100644 drivers/media/video/cx23885/cx23885-ir.c create mode 100644 drivers/media/video/cx23885/cx23885-ir.h create mode 100644 drivers/media/video/cx23885/cx23888-ir.c create mode 100644 drivers/media/video/cx23885/cx23888-ir.h create mode 100644 drivers/media/video/gspca/pac7302.c create mode 100644 drivers/media/video/gspca/stv0680.c create mode 100644 drivers/media/video/gspca/w996Xcf.c create mode 100644 drivers/media/video/ov9640.c create mode 100644 drivers/media/video/ov9640.h create mode 100644 drivers/media/video/rj54n1cb0c.c create mode 100644 drivers/mfd/sh_mobile_sdhi.c create mode 100644 drivers/s390/cio/ccwreq.c create mode 100644 drivers/s390/scsi/zfcp_fc.h create mode 100644 drivers/scsi/3w-sas.c create mode 100644 drivers/scsi/3w-sas.h create mode 100644 drivers/scsi/libfc/fc_libfc.c create mode 100644 drivers/scsi/libfc/fc_libfc.h create mode 100644 drivers/scsi/libfc/fc_npiv.c mode change 100644 => 100755 drivers/scsi/lpfc/lpfc_hbadisc.c create mode 100644 drivers/scsi/pm8001/Makefile create mode 100644 drivers/scsi/pm8001/pm8001_chips.h create mode 100644 drivers/scsi/pm8001/pm8001_ctl.c create mode 100644 drivers/scsi/pm8001/pm8001_ctl.h create mode 100644 drivers/scsi/pm8001/pm8001_defs.h create mode 100644 drivers/scsi/pm8001/pm8001_hwi.c create mode 100644 drivers/scsi/pm8001/pm8001_hwi.h create mode 100644 drivers/scsi/pm8001/pm8001_init.c create mode 100644 drivers/scsi/pm8001/pm8001_sas.c create mode 100644 drivers/scsi/pm8001/pm8001_sas.h create mode 100644 drivers/scsi/vmw_pvscsi.c create mode 100644 drivers/scsi/vmw_pvscsi.h rename arch/sh/kernel/gpio.c => drivers/sh/pfc.c (94%) create mode 100644 fs/exofs/ios.c delete mode 100644 fs/exofs/osd.c create mode 100644 fs/exofs/pnfs.h rename {arch/sh/include/asm => include/linux/input}/sh_keysc.h (75%) create mode 100644 include/linux/input/sparse-keymap.h create mode 100644 include/linux/mfd/sh_mobile_sdhi.h create mode 100644 include/linux/sh_pfc.h create mode 100644 include/scsi/fc/Kbuild 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 Resolved 'include/net/tcp.h' using previous resolution. Auto-merging drivers/net/atl1c/atl1c_main.c Auto-merging drivers/net/wireless/orinoco/hermes_dld.c Auto-merging include/net/tcp.h CONFLICT (content): Merge conflict in include/net/tcp.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master cadf300] Merge remote branch 'net-current/master' $ git diff -M --stat --summary HEAD^.. Documentation/isdn/README.gigaset | 116 +++++++-- drivers/atm/he.c | 4 +- drivers/isdn/gigaset/common.c | 2 +- drivers/net/atl1c/atl1c.h | 17 +- drivers/net/atl1c/atl1c_main.c | 94 ++++---- drivers/net/b44.c | 3 +- drivers/net/e1000e/defines.h | 2 +- drivers/net/e1000e/es2lan.c | 97 +++++--- drivers/net/e1000e/hw.h | 7 + drivers/net/e1000e/ich8lan.c | 8 +- drivers/net/e1000e/netdev.c | 2 +- drivers/net/fec_mpc52xx.c | 121 +++++----- drivers/net/gianfar.c | 1 + drivers/net/ixgbe/ixgbe_82599.c | 1 + drivers/net/ixgbe/ixgbe_ethtool.c | 1 + drivers/net/ixgbe/ixgbe_main.c | 22 +-- drivers/net/ixgbe/ixgbe_type.h | 1 + drivers/net/mv643xx_eth.c | 3 + drivers/net/myri10ge/myri10ge.c | 4 +- drivers/net/netxen/netxen_nic_init.c | 14 +- drivers/net/netxen/netxen_nic_main.c | 49 +++- drivers/net/wireless/ath/ath5k/led.c | 2 + drivers/net/wireless/ath/ath9k/xmit.c | 2 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 2 +- drivers/net/wireless/mwl8k.c | 327 ++++++++++++------------- drivers/net/wireless/orinoco/hermes_dld.c | 2 +- drivers/net/wireless/rtl818x/rtl8187.h | 5 + drivers/net/wireless/rtl818x/rtl8187_dev.c | 12 +- drivers/net/wireless/rtl818x/rtl8187_rfkill.c | 4 +- drivers/net/wireless/wl12xx/wl1251_main.c | 36 ++-- include/linux/gigaset_dev.h | 22 ++- include/linux/if_ether.h | 2 - include/net/inet6_hashtables.h | 2 +- include/net/inet_hashtables.h | 8 +- include/net/inet_timewait_sock.h | 3 + include/net/tcp.h | 22 -- net/atm/br2684.c | 11 +- net/atm/lec.c | 10 +- net/dccp/ipv4.c | 2 +- net/dccp/ipv6.c | 4 +- net/ipv4/inet_hashtables.c | 24 ++- net/ipv4/inet_timewait_sock.c | 61 ++++-- net/ipv4/tcp.c | 5 - net/ipv4/tcp_input.c | 35 +++- net/ipv4/tcp_ipv4.c | 2 +- net/ipv4/tcp_timer.c | 29 +++ net/ipv6/inet6_hashtables.c | 8 +- net/ipv6/tcp_ipv6.c | 4 +- net/mac80211/ieee80211_i.h | 1 + net/mac80211/mlme.c | 10 +- net/mac80211/scan.c | 20 ++- net/mac80211/util.c | 2 +- net/rfkill/core.c | 4 +- 53 files changed, 758 insertions(+), 494 deletions(-) Merging sound-current/for-linus $ git merge sound-current/for-linus Already up-to-date. Merging pci-current/for-linus $ git merge pci-current/for-linus Already up-to-date. Merging wireless-current/master $ git merge wireless-current/master Auto-merging drivers/net/wireless/ath/ath5k/eeprom.c Auto-merging drivers/net/wireless/b43/main.c Merge made by recursive. drivers/net/wireless/ath/ath5k/eeprom.c | 3 +- drivers/net/wireless/b43/main.c | 5 ++- drivers/net/wireless/rtl818x/rtl8187.h | 1 + drivers/net/wireless/rtl818x/rtl8187_leds.c | 68 +++++++++++++++++-------- drivers/net/wireless/rtl818x/rtl8187_leds.h | 2 + net/mac80211/cfg.c | 3 +- net/mac80211/mesh.c | 2 +- net/mac80211/mesh.h | 5 +- net/mac80211/mesh_hwmp.c | 2 +- net/mac80211/rx.c | 1 - net/wireless/reg.c | 75 +++++++++------------------ net/wireless/wext-compat.c | 1 + 12 files changed, 88 insertions(+), 80 deletions(-) Merging kbuild-current/for-linus $ git merge kbuild-current/for-linus Already up-to-date. Merging quilt/driver-core.current $ git merge quilt/driver-core.current Already up-to-date. Merging quilt/tty.current $ git merge quilt/tty.current Already up-to-date. Merging quilt/usb.current $ git merge quilt/usb.current Already up-to-date. Merging quilt/staging.current $ git merge quilt/staging.current Already up-to-date. 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 ide-curent/master $ git merge ide-curent/master Already up-to-date. Merging dwmw2/master $ git merge dwmw2/master Already up-to-date. Merging arm/devel $ git merge arm/devel Already up-to-date. Merging davinci/davinci-next $ git merge davinci/davinci-next Already up-to-date. Merging msm/for-next $ git merge msm/for-next Merge made by recursive. arch/arm/mach-msm/Kconfig | 30 ++++++++ arch/arm/mach-msm/Makefile | 1 + arch/arm/mach-msm/board-dream.c | 93 ++++++++++++++++++++++++++ arch/arm/mach-msm/board-dream.h | 5 ++ arch/arm/mach-msm/include/mach/debug-macro.S | 24 +++++-- arch/arm/mach-msm/include/mach/msm_iomap.h | 12 +++ arch/arm/mach-msm/include/mach/uncompress.h | 7 ++ arch/arm/mach-msm/io.c | 3 + 8 files changed, 168 insertions(+), 7 deletions(-) create mode 100644 arch/arm/mach-msm/board-dream.c create mode 100644 arch/arm/mach-msm/board-dream.h Merging omap/for-next $ git merge omap/for-next Auto-merging Documentation/kernel-parameters.txt Auto-merging arch/arm/plat-omap/dma.c Merge made by recursive. Documentation/kernel-parameters.txt | 5 + arch/arm/configs/htcherald_defconfig | 9 +- arch/arm/configs/omap3_touchbook_defconfig | 2431 ++++++++++++++++++++++++++ arch/arm/configs/omap_zoom2_defconfig | 3 +- arch/arm/configs/omap_zoom3_defconfig | 3 +- arch/arm/mach-omap1/Makefile | 7 + arch/arm/mach-omap1/board-fsample.c | 60 +- arch/arm/mach-omap1/board-h2.c | 59 +- arch/arm/mach-omap1/board-h3.c | 66 +- arch/arm/mach-omap1/board-htcherald.c | 64 + arch/arm/mach-omap1/board-innovator.c | 12 + arch/arm/mach-omap1/board-osk.c | 10 + arch/arm/mach-omap1/board-perseus2.c | 58 +- arch/arm/mach-omap1/board-voiceblue.c | 10 + arch/arm/mach-omap1/clock.c | 4 +- arch/arm/mach-omap1/i2c.c | 39 + arch/arm/mach-omap1/include/mach/lcd_dma.h | 78 + arch/arm/mach-omap1/include/mach/lcdc.h | 57 + arch/arm/mach-omap1/lcd_dma.c | 448 +++++ arch/arm/mach-omap1/mux.c | 8 +- arch/arm/mach-omap2/Kconfig | 30 + arch/arm/mach-omap2/Makefile | 9 +- arch/arm/mach-omap2/board-3430sdp.c | 15 +- arch/arm/mach-omap2/board-3630sdp.c | 14 +- arch/arm/mach-omap2/board-am3517evm.c | 11 + arch/arm/mach-omap2/board-apollon.c | 10 + arch/arm/mach-omap2/board-cm-t35.c | 14 +- arch/arm/mach-omap2/board-igep0020.c | 11 +- arch/arm/mach-omap2/board-ldp.c | 10 + arch/arm/mach-omap2/board-omap3beagle.c | 21 +- arch/arm/mach-omap2/board-omap3evm.c | 21 +- arch/arm/mach-omap2/board-omap3pandora.c | 41 +- arch/arm/mach-omap2/board-omap3touchbook.c | 572 ++++++ arch/arm/mach-omap2/board-overo.c | 14 +- arch/arm/mach-omap2/board-rx51-peripherals.c | 9 +- arch/arm/mach-omap2/board-rx51.c | 16 +- arch/arm/mach-omap2/board-zoom-peripherals.c | 14 +- arch/arm/mach-omap2/board-zoom2.c | 10 + arch/arm/mach-omap2/board-zoom3.c | 10 + arch/arm/mach-omap2/devices.c | 62 +- arch/arm/mach-omap2/gpmc-smc91x.c | 8 +- arch/arm/mach-omap2/i2c.c | 56 + arch/arm/mach-omap2/id.c | 4 +- arch/arm/mach-omap2/io.c | 1 + arch/arm/mach-omap2/mux.c | 1061 ++++++++---- arch/arm/mach-omap2/mux.h | 163 ++ arch/arm/mach-omap2/mux34xx.c | 2099 ++++++++++++++++++++++ arch/arm/mach-omap2/mux34xx.h | 398 +++++ arch/arm/mach-omap2/serial.c | 28 + arch/arm/mach-omap2/usb-ehci.c | 166 ++- arch/arm/plat-omap/debug-devices.c | 10 + arch/arm/plat-omap/devices.c | 68 +- arch/arm/plat-omap/dma.c | 410 +----- arch/arm/plat-omap/i2c.c | 44 +- arch/arm/plat-omap/include/plat/common.h | 14 +- arch/arm/plat-omap/include/plat/dma.h | 60 +- arch/arm/plat-omap/include/plat/gpmc.h | 2 +- arch/arm/plat-omap/include/plat/i2c.h | 39 + arch/arm/plat-omap/include/plat/mux.h | 232 +--- arch/arm/plat-omap/mux.c | 8 +- arch/arm/plat-omap/usb.c | 8 +- drivers/net/smc91x.h | 15 - drivers/video/omap/lcdc.c | 33 +- 63 files changed, 7892 insertions(+), 1380 deletions(-) create mode 100644 arch/arm/configs/omap3_touchbook_defconfig create mode 100644 arch/arm/mach-omap1/i2c.c create mode 100644 arch/arm/mach-omap1/include/mach/lcd_dma.h create mode 100644 arch/arm/mach-omap1/include/mach/lcdc.h create mode 100644 arch/arm/mach-omap1/lcd_dma.c create mode 100644 arch/arm/mach-omap2/board-omap3touchbook.c create mode 100644 arch/arm/mach-omap2/i2c.c create mode 100644 arch/arm/mach-omap2/mux.h create mode 100644 arch/arm/mach-omap2/mux34xx.c create mode 100644 arch/arm/mach-omap2/mux34xx.h create mode 100644 arch/arm/plat-omap/include/plat/i2c.h Merging pxa/for-next $ git merge pxa/for-next Already up-to-date. Merging samsung/next-samsung $ git merge samsung/next-samsung Auto-merging arch/arm/plat-s3c64xx/Kconfig Merge made by recursive. arch/arm/mach-s3c2412/clock.c | 52 ++- arch/arm/mach-s3c2440/clock.c | 6 +- arch/arm/mach-s3c2442/clock.c | 6 +- arch/arm/mach-s3c2443/clock.c | 88 +++-- arch/arm/plat-s3c/clock.c | 31 +- arch/arm/plat-s3c/pwm-clock.c | 94 ++-- arch/arm/plat-s3c24xx/clock-dclk.c | 22 +- arch/arm/plat-s3c24xx/s3c244x-clock.c | 4 +- arch/arm/plat-s3c64xx/Kconfig | 1 + arch/arm/plat-s3c64xx/include/plat/regs-clock.h | 71 +--- arch/arm/plat-s3c64xx/s3c6400-clock.c | 510 ++++++-------------- arch/arm/plat-s5pc1xx/clock.c | 8 +- arch/arm/plat-s5pc1xx/s5pc100-clock.c | 126 ++--- arch/arm/plat-samsung/Kconfig | 5 + arch/arm/plat-samsung/Makefile | 1 + arch/arm/plat-samsung/clock-clksrc.c | 184 +++++++ arch/arm/plat-samsung/include/plat/clock-clksrc.h | 83 ++++ .../include/plat/clock.h | 29 +- 18 files changed, 686 insertions(+), 635 deletions(-) create mode 100644 arch/arm/plat-samsung/clock-clksrc.c create mode 100644 arch/arm/plat-samsung/include/plat/clock-clksrc.h rename arch/arm/{plat-s3c => plat-samsung}/include/plat/clock.h (78%) Merging avr32/avr32-arch $ git merge avr32/avr32-arch Resolved 'arch/avr32/mach-at32ap/include/mach/cpu.h' using previous resolution. Auto-merging arch/avr32/mach-at32ap/include/mach/cpu.h CONFLICT (content): Merge conflict in arch/avr32/mach-at32ap/include/mach/cpu.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 9f6607e] Merge remote branch 'avr32/avr32-arch' $ git diff -M --stat --summary HEAD^.. arch/avr32/boards/atngw100/mrmt.c | 1 + arch/avr32/boards/atngw100/setup.c | 5 -- arch/avr32/kernel/vmlinux.lds.S | 64 ++++----------------------- arch/avr32/mach-at32ap/at32ap700x.c | 35 ++++++++------- arch/avr32/mach-at32ap/include/mach/board.h | 1 + 5 files changed, 30 insertions(+), 76 deletions(-) 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-v10/kernel/irq.c | 2 +- arch/cris/arch-v32/kernel/irq.c | 2 +- arch/cris/arch-v32/kernel/pinmux.c | 4 ++-- arch/cris/arch-v32/mach-a3/pinmux.c | 2 +- arch/cris/arch-v32/mach-fs/pinmux.c | 4 ++-- arch/cris/kernel/irq.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) Merging ia64/test $ git merge ia64/test Already up-to-date. Merging m68k/for-next $ git merge m68k/for-next Already up-to-date. Merging m68knommu/for-next $ git merge m68knommu/for-next Recorded preimage for 'arch/m68k/include/asm/ptrace.h' Auto-merging arch/m68k/include/asm/ptrace.h CONFLICT (content): Merge conflict in arch/m68k/include/asm/ptrace.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/m68k/include/asm/ptrace.h'. [master 6efaa90] Merge remote branch 'm68knommu/for-next' $ git diff -M --stat --summary HEAD^.. Merging microblaze/next $ git merge microblaze/next Merge made by recursive. arch/microblaze/Kconfig | 19 + arch/microblaze/Kconfig.debug | 3 + arch/microblaze/Makefile | 2 + arch/microblaze/boot/Makefile | 15 +- arch/microblaze/include/asm/cache.h | 16 - arch/microblaze/include/asm/cacheflush.h | 123 +++--- arch/microblaze/include/asm/cpuinfo.h | 5 +- arch/microblaze/include/asm/device.h | 12 + arch/microblaze/include/asm/ftrace.h | 25 + arch/microblaze/include/asm/futex.h | 127 +++++- arch/microblaze/include/asm/irqflags.h | 112 ++--- arch/microblaze/include/asm/page.h | 3 +- arch/microblaze/include/asm/pgalloc.h | 9 +- arch/microblaze/include/asm/pvr.h | 30 +- arch/microblaze/include/asm/setup.h | 2 + arch/microblaze/include/asm/system.h | 2 + arch/microblaze/include/asm/uaccess.h | 12 +- arch/microblaze/kernel/Makefile | 14 +- arch/microblaze/kernel/cpu/Makefile | 4 + arch/microblaze/kernel/cpu/cache.c | 663 +++++++++++++++++------- arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c | 15 +- arch/microblaze/kernel/cpu/cpuinfo-static.c | 17 +- arch/microblaze/kernel/cpu/cpuinfo.c | 7 +- arch/microblaze/kernel/cpu/mb.c | 8 +- arch/microblaze/kernel/cpu/pvr.c | 2 +- arch/microblaze/kernel/entry-nommu.S | 2 - arch/microblaze/kernel/entry.S | 8 +- arch/microblaze/kernel/ftrace.c | 237 +++++++++ arch/microblaze/kernel/heartbeat.c | 15 +- arch/microblaze/kernel/intc.c | 10 +- arch/microblaze/kernel/mcount.S | 170 ++++++ arch/microblaze/kernel/microblaze_ksyms.c | 5 + arch/microblaze/kernel/process.c | 1 + arch/microblaze/kernel/reset.c | 140 +++++ arch/microblaze/kernel/setup.c | 40 +-- arch/microblaze/kernel/signal.c | 34 ++- arch/microblaze/kernel/stacktrace.c | 65 +++ arch/microblaze/kernel/syscall_table.S | 2 +- arch/microblaze/kernel/timer.c | 28 + arch/microblaze/kernel/vmlinux.lds.S | 6 +- arch/microblaze/lib/uaccess.c | 7 + arch/microblaze/mm/init.c | 1 + arch/microblaze/mm/pgtable.c | 10 - arch/microblaze/oprofile/Makefile | 13 + arch/microblaze/oprofile/microblaze_oprofile.c | 22 + arch/microblaze/platform/Kconfig.platform | 21 +- arch/microblaze/platform/generic/Kconfig.auto | 29 +- arch/microblaze/platform/generic/system.dts | 38 ++- arch/microblaze/platform/platform.c | 2 + arch/mips/Kconfig | 4 + arch/mips/Makefile | 2 + arch/mips/include/asm/ftrace.h | 34 ++- arch/mips/kernel/Makefile | 7 + arch/mips/kernel/ftrace.c | 112 ++++ arch/mips/kernel/mcount.S | 115 ++++ arch/mips/kernel/mips_ksyms.c | 5 + scripts/recordmcount.pl | 55 ++ 57 files changed, 2015 insertions(+), 472 deletions(-) create mode 100644 arch/microblaze/kernel/ftrace.c create mode 100644 arch/microblaze/kernel/mcount.S create mode 100644 arch/microblaze/kernel/reset.c create mode 100644 arch/microblaze/kernel/stacktrace.c create mode 100644 arch/microblaze/oprofile/Makefile create mode 100644 arch/microblaze/oprofile/microblaze_oprofile.c create mode 100644 arch/mips/kernel/ftrace.c create mode 100644 arch/mips/kernel/mcount.S Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Recorded preimage for 'scripts/recordmcount.pl' Resolved 'arch/mips/Kconfig' using previous resolution. Resolved 'arch/mips/Makefile' using previous resolution. Resolved 'arch/mips/include/asm/ftrace.h' using previous resolution. Resolved 'arch/mips/kernel/ftrace.c' using previous resolution. Resolved 'arch/mips/kernel/mcount.S' using previous resolution. Resolved 'drivers/pcmcia/Makefile' using previous resolution. Auto-merging arch/mips/Kconfig CONFLICT (content): Merge conflict in arch/mips/Kconfig Auto-merging arch/mips/Makefile CONFLICT (content): Merge conflict in arch/mips/Makefile Removing arch/mips/alchemy/common/puts.c Removing arch/mips/alchemy/devboards/db1x00/irqmap.c Removing arch/mips/alchemy/devboards/pb1200/irqmap.c Removing arch/mips/alchemy/mtx-1/irqmap.c Removing arch/mips/alchemy/xxs1500/irqmap.c Removing arch/mips/basler/excite/Kconfig Removing arch/mips/basler/excite/Makefile Removing arch/mips/basler/excite/excite_device.c Removing arch/mips/basler/excite/excite_iodev.c Removing arch/mips/basler/excite/excite_iodev.h Removing arch/mips/basler/excite/excite_irq.c Removing arch/mips/basler/excite/excite_procfs.c Removing arch/mips/basler/excite/excite_prom.c Removing arch/mips/basler/excite/excite_setup.c Removing arch/mips/boot/addinitrd.c Removing arch/mips/configs/excite_defconfig Auto-merging arch/mips/include/asm/ftrace.h CONFLICT (content): Merge conflict in arch/mips/include/asm/ftrace.h Removing arch/mips/include/asm/mach-excite/cpu-feature-overrides.h Removing arch/mips/include/asm/mach-excite/excite.h Removing arch/mips/include/asm/mach-excite/excite_fpga.h Removing arch/mips/include/asm/mach-excite/excite_nandflash.h Removing arch/mips/include/asm/mach-excite/rm9k_eth.h Removing arch/mips/include/asm/mach-excite/rm9k_wdt.h Removing arch/mips/include/asm/mach-excite/rm9k_xicap.h Removing arch/mips/include/asm/mach-pb1x00/pb1100.h Removing arch/mips/include/asm/mach-pb1x00/pb1500.h Auto-merging arch/mips/kernel/Makefile Auto-merging arch/mips/kernel/ftrace.c CONFLICT (add/add): Merge conflict in arch/mips/kernel/ftrace.c Auto-merging arch/mips/kernel/mcount.S CONFLICT (add/add): Merge conflict in arch/mips/kernel/mcount.S Auto-merging arch/mips/kernel/smtc.c Removing arch/mips/pci/fixup-excite.c Removing arch/mips/pci/pci-excite.c Auto-merging drivers/ide/au1xxx-ide.c Auto-merging drivers/mtd/maps/Kconfig Removing drivers/mtd/maps/alchemy-flash.c Auto-merging drivers/mtd/nand/Kconfig Removing drivers/mtd/nand/excite_nandflash.c Auto-merging drivers/net/Kconfig Auto-merging drivers/net/au1000_eth.c Auto-merging drivers/net/irda/au1k_ir.c Auto-merging drivers/pcmcia/Kconfig Auto-merging drivers/pcmcia/Makefile CONFLICT (content): Merge conflict in drivers/pcmcia/Makefile Removing drivers/pcmcia/au1000_db1x00.c Removing drivers/pcmcia/au1000_xxs1500.c Removing drivers/watchdog/rm9k_wdt.c Auto-merging scripts/recordmcount.pl CONFLICT (content): Merge conflict in scripts/recordmcount.pl Auto-merging sound/soc/au1x/dbdma2.c Removing sound/soc/au1x/sample-ac97.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'scripts/recordmcount.pl'. [master 19db6a8] Merge remote branch 'mips/mips-for-linux-next' $ git diff -M --stat --summary HEAD^.. arch/mips/Kconfig | 115 +- arch/mips/Kconfig.debug | 59 +- arch/mips/Makefile | 55 +- arch/mips/alchemy/Kconfig | 28 +- arch/mips/alchemy/common/Makefile | 6 +- arch/mips/alchemy/common/dbdma.c | 74 +- arch/mips/alchemy/common/dma.c | 36 +- arch/mips/alchemy/common/gpiolib-au1000.c | 10 +- arch/mips/alchemy/common/irq.c | 436 +++--- arch/mips/alchemy/common/platform.c | 152 ++- arch/mips/alchemy/common/puts.c | 68 - arch/mips/alchemy/common/reset.c | 3 - arch/mips/alchemy/common/setup.c | 3 +- arch/mips/alchemy/common/time.c | 35 +- arch/mips/alchemy/devboards/Makefile | 6 +- arch/mips/alchemy/devboards/bcsr.c | 148 ++ arch/mips/alchemy/devboards/db1200/Makefile | 1 + arch/mips/alchemy/devboards/db1200/platform.c | 561 ++++++ arch/mips/alchemy/devboards/db1200/setup.c | 137 ++ arch/mips/alchemy/devboards/db1x00/Makefile | 2 +- arch/mips/alchemy/devboards/db1x00/board_setup.c | 144 ++- arch/mips/alchemy/devboards/db1x00/irqmap.c | 90 - arch/mips/alchemy/devboards/db1x00/platform.c | 118 ++ arch/mips/alchemy/devboards/pb1000/board_setup.c | 30 +- arch/mips/alchemy/devboards/pb1100/Makefile | 3 +- arch/mips/alchemy/devboards/pb1100/board_setup.c | 32 +- arch/mips/alchemy/devboards/pb1100/platform.c | 50 + arch/mips/alchemy/devboards/pb1200/Makefile | 2 +- arch/mips/alchemy/devboards/pb1200/board_setup.c | 84 +- arch/mips/alchemy/devboards/pb1200/irqmap.c | 134 -- arch/mips/alchemy/devboards/pb1200/platform.c | 63 +- arch/mips/alchemy/devboards/pb1500/Makefile | 3 +- arch/mips/alchemy/devboards/pb1500/board_setup.c | 40 +- arch/mips/alchemy/devboards/pb1500/platform.c | 49 + arch/mips/alchemy/devboards/pb1550/Makefile | 3 +- arch/mips/alchemy/devboards/pb1550/board_setup.c | 45 +- arch/mips/alchemy/devboards/pb1550/platform.c | 69 + arch/mips/alchemy/devboards/platform.c | 193 ++ arch/mips/alchemy/devboards/platform.h | 21 + arch/mips/alchemy/devboards/prom.c | 5 + arch/mips/alchemy/mtx-1/Makefile | 2 +- arch/mips/alchemy/mtx-1/board_setup.c | 24 + arch/mips/alchemy/mtx-1/init.c | 6 + arch/mips/alchemy/mtx-1/irqmap.c | 56 - arch/mips/alchemy/xxs1500/Makefile | 4 +- arch/mips/alchemy/xxs1500/board_setup.c | 37 +- arch/mips/alchemy/xxs1500/init.c | 6 + arch/mips/alchemy/xxs1500/irqmap.c | 52 - arch/mips/alchemy/xxs1500/platform.c | 63 + arch/mips/ar7/platform.c | 2 +- arch/mips/basler/excite/Kconfig | 9 - arch/mips/basler/excite/Makefile | 8 - arch/mips/basler/excite/excite_device.c | 403 ----- arch/mips/basler/excite/excite_iodev.c | 178 -- arch/mips/basler/excite/excite_iodev.h | 10 - arch/mips/basler/excite/excite_irq.c | 122 -- arch/mips/basler/excite/excite_procfs.c | 92 - arch/mips/basler/excite/excite_prom.c | 144 -- arch/mips/basler/excite/excite_setup.c | 302 ---- arch/mips/bcm47xx/prom.c | 10 +- arch/mips/boot/Makefile | 8 +- arch/mips/boot/addinitrd.c | 131 -- arch/mips/boot/compressed/Makefile | 100 ++ arch/mips/boot/compressed/dbg.c | 37 + arch/mips/boot/compressed/decompress.c | 126 ++ arch/mips/boot/compressed/dummy.c | 4 + arch/mips/boot/compressed/head.S | 56 + arch/mips/boot/compressed/ld.script | 150 ++ arch/mips/boot/compressed/uart-16550.c | 43 + arch/mips/cavium-octeon/Makefile | 2 +- arch/mips/cavium-octeon/cpu.c | 52 + arch/mips/cavium-octeon/octeon-platform.c | 88 + arch/mips/configs/ar7_defconfig | 4 +- arch/mips/configs/bcm47xx_defconfig | 3 +- arch/mips/configs/bcm63xx_defconfig | 3 +- arch/mips/configs/bigsur_defconfig | 3 +- arch/mips/configs/capcella_defconfig | 3 +- arch/mips/configs/cavium-octeon_defconfig | 4 +- arch/mips/configs/cobalt_defconfig | 3 +- arch/mips/configs/db1000_defconfig | 3 +- arch/mips/configs/db1100_defconfig | 3 +- arch/mips/configs/db1200_defconfig | 1484 +++++++++------- arch/mips/configs/db1500_defconfig | 3 +- arch/mips/configs/db1550_defconfig | 3 +- arch/mips/configs/decstation_defconfig | 3 +- arch/mips/configs/e55_defconfig | 3 +- arch/mips/configs/excite_defconfig | 1335 -------------- arch/mips/configs/fuloong2e_defconfig | 96 +- arch/mips/configs/ip22_defconfig | 3 +- arch/mips/configs/ip27_defconfig | 3 +- arch/mips/configs/ip28_defconfig | 3 +- arch/mips/configs/ip32_defconfig | 3 +- arch/mips/configs/jazz_defconfig | 3 +- arch/mips/configs/jmr3927_defconfig | 3 +- arch/mips/configs/lasat_defconfig | 3 +- arch/mips/configs/lemote2f_defconfig | 1835 ++++++++++++++++++++ arch/mips/configs/malta_defconfig | 3 +- arch/mips/configs/markeins_defconfig | 3 +- arch/mips/configs/mipssim_defconfig | 3 +- arch/mips/configs/mpc30x_defconfig | 3 +- arch/mips/configs/msp71xx_defconfig | 3 +- arch/mips/configs/mtx1_defconfig | 3 +- arch/mips/configs/pb1100_defconfig | 3 +- arch/mips/configs/pb1500_defconfig | 3 +- arch/mips/configs/pb1550_defconfig | 3 +- arch/mips/configs/pnx8335-stb225_defconfig | 3 +- arch/mips/configs/pnx8550-jbs_defconfig | 3 +- arch/mips/configs/pnx8550-stb810_defconfig | 3 +- arch/mips/configs/powertv_defconfig | 1550 +++++++++++++++++ arch/mips/configs/rb532_defconfig | 3 +- arch/mips/configs/rbtx49xx_defconfig | 4 +- arch/mips/configs/rm200_defconfig | 3 +- arch/mips/configs/sb1250-swarm_defconfig | 3 +- arch/mips/configs/tb0219_defconfig | 3 +- arch/mips/configs/tb0226_defconfig | 3 +- arch/mips/configs/tb0287_defconfig | 3 +- arch/mips/configs/workpad_defconfig | 3 +- arch/mips/configs/wrppmc_defconfig | 3 +- arch/mips/configs/yosemite_defconfig | 3 +- arch/mips/fw/arc/cmdline.c | 5 - arch/mips/include/asm/bootinfo.h | 8 +- arch/mips/include/asm/cop2.h | 23 + arch/mips/include/asm/fpu.h | 8 - arch/mips/include/asm/fpu_emulator.h | 24 +- arch/mips/include/asm/ftrace.h | 57 + arch/mips/include/asm/irq.h | 29 +- arch/mips/include/asm/mach-au1x00/au1000.h | 884 +++++------ arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 23 +- arch/mips/include/asm/mach-au1x00/au1xxx_eth.h | 18 + arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 164 +- arch/mips/include/asm/mach-au1x00/gpio.h | 2 +- arch/mips/include/asm/mach-db1x00/bcsr.h | 238 +++ arch/mips/include/asm/mach-db1x00/db1200.h | 156 +-- arch/mips/include/asm/mach-db1x00/db1x00.h | 100 -- .../asm/mach-excite/cpu-feature-overrides.h | 48 - arch/mips/include/asm/mach-excite/excite.h | 154 -- arch/mips/include/asm/mach-excite/excite_fpga.h | 80 - .../include/asm/mach-excite/excite_nandflash.h | 7 - arch/mips/include/asm/mach-excite/rm9k_eth.h | 23 - arch/mips/include/asm/mach-excite/rm9k_wdt.h | 12 - arch/mips/include/asm/mach-excite/rm9k_xicap.h | 16 - .../mips/include/asm/mach-loongson/cs5536/cs5536.h | 305 ++++ .../asm/mach-loongson/cs5536/cs5536_mfgpt.h | 35 + .../include/asm/mach-loongson/cs5536/cs5536_pci.h | 153 ++ .../include/asm/mach-loongson/cs5536/cs5536_vsm.h | 31 + .../mips/include/asm/mach-loongson/dma-coherence.h | 4 + arch/mips/include/asm/mach-loongson/loongson.h | 278 +++- arch/mips/include/asm/mach-loongson/machine.h | 9 +- arch/mips/include/asm/mach-loongson/mem.h | 27 +- arch/mips/include/asm/mach-loongson/pci.h | 34 +- arch/mips/include/asm/mach-pb1x00/pb1100.h | 85 - arch/mips/include/asm/mach-pb1x00/pb1200.h | 122 +-- arch/mips/include/asm/mach-pb1x00/pb1500.h | 49 - arch/mips/include/asm/mach-pb1x00/pb1550.h | 96 - arch/mips/include/asm/mach-powertv/asic.h | 107 ++ arch/mips/include/asm/mach-powertv/asic_regs.h | 155 ++ arch/mips/include/asm/mach-powertv/dma-coherence.h | 119 ++ arch/mips/include/asm/mach-powertv/interrupts.h | 254 +++ arch/mips/include/asm/mach-powertv/ioremap.h | 90 + arch/mips/include/asm/mach-powertv/irq.h | 25 + arch/mips/include/asm/mach-powertv/powertv-clock.h | 29 + .../asm/{mach-excite => mach-powertv}/war.h | 19 +- arch/mips/include/asm/mips-boards/bonito64.h | 5 - arch/mips/include/asm/mmu_context.h | 29 +- arch/mips/include/asm/octeon/cvmx-agl-defs.h | 1194 +++++++++++++ arch/mips/include/asm/octeon/cvmx-mixx-defs.h | 248 +++ arch/mips/include/asm/octeon/cvmx-smix-defs.h | 178 ++ arch/mips/include/asm/octeon/octeon.h | 1 + arch/mips/include/asm/pgtable.h | 13 + arch/mips/include/asm/sgialib.h | 3 +- arch/mips/include/asm/stackframe.h | 40 +- arch/mips/kernel/Makefile | 1 + arch/mips/kernel/cpufreq/Kconfig | 27 + arch/mips/kernel/csrc-powertv.c | 180 ++ arch/mips/kernel/ftrace.c | 169 ++- arch/mips/kernel/irq.c | 30 + arch/mips/kernel/mcount.S | 90 +- arch/mips/kernel/setup.c | 44 +- arch/mips/kernel/signal.c | 46 + arch/mips/kernel/signal32.c | 24 + arch/mips/kernel/smp.c | 3 +- arch/mips/kernel/smtc.c | 21 +- arch/mips/kernel/traps.c | 136 +- arch/mips/kernel/unaligned.c | 25 +- arch/mips/kernel/vmlinux.lds.S | 1 + arch/mips/lasat/picvue_proc.c | 106 +- arch/mips/lasat/prom.c | 4 +- arch/mips/loongson/Kconfig | 102 +- arch/mips/loongson/Makefile | 6 + arch/mips/loongson/common/Makefile | 15 +- arch/mips/loongson/common/bonito-irq.c | 13 +- arch/mips/loongson/common/cmdline.c | 4 +- arch/mips/loongson/common/cs5536/Makefile | 13 + arch/mips/loongson/common/cs5536/cs5536_acc.c | 140 ++ arch/mips/loongson/common/cs5536/cs5536_ehci.c | 158 ++ arch/mips/loongson/common/cs5536/cs5536_ide.c | 179 ++ arch/mips/loongson/common/cs5536/cs5536_isa.c | 316 ++++ arch/mips/loongson/common/cs5536/cs5536_mfgpt.c | 217 +++ arch/mips/loongson/common/cs5536/cs5536_ohci.c | 147 ++ arch/mips/loongson/common/cs5536/cs5536_pci.c | 87 + arch/mips/loongson/common/early_printk.c | 17 +- arch/mips/loongson/common/init.c | 21 +- arch/mips/loongson/common/irq.c | 12 +- arch/mips/loongson/common/machtype.c | 25 +- arch/mips/loongson/common/mem.c | 91 +- arch/mips/loongson/common/pci.c | 20 +- arch/mips/loongson/common/pm.c | 161 ++ arch/mips/loongson/common/reset.c | 2 +- arch/mips/loongson/common/serial.c | 72 + arch/mips/loongson/common/time.c | 3 + arch/mips/loongson/common/uart_base.c | 36 + arch/mips/loongson/fuloong-2e/irq.c | 4 +- arch/mips/loongson/fuloong-2e/reset.c | 4 +- arch/mips/loongson/lemote-2f/Makefile | 11 + arch/mips/loongson/lemote-2f/ec_kb3310b.c | 130 ++ arch/mips/loongson/lemote-2f/ec_kb3310b.h | 188 ++ arch/mips/loongson/lemote-2f/irq.c | 134 ++ arch/mips/loongson/lemote-2f/pm.c | 149 ++ arch/mips/loongson/lemote-2f/reset.c | 159 ++ arch/mips/math-emu/cp1emu.c | 102 +- arch/mips/math-emu/dsemul.c | 4 +- arch/mips/mipssim/sim_setup.c | 1 - arch/mips/mm/cerr-sb1.c | 7 +- arch/mips/mm/init.c | 2 + arch/mips/mm/tlbex.c | 28 +- arch/mips/mm/uasm.c | 16 +- arch/mips/mm/uasm.h | 7 + arch/mips/mti-malta/malta-memory.c | 2 +- arch/mips/nxp/pnx833x/common/interrupts.c | 4 +- arch/mips/oprofile/op_model_loongson2.c | 5 +- arch/mips/pci/Makefile | 4 +- arch/mips/pci/fixup-excite.c | 36 - arch/mips/pci/fixup-fuloong2e.c | 5 +- arch/mips/pci/fixup-lemote2f.c | 160 ++ arch/mips/pci/ops-bonito64.c | 7 - arch/mips/pci/ops-loongson2.c | 208 +++ arch/mips/pci/pci-excite.c | 149 -- arch/mips/powertv/Kconfig | 21 + arch/mips/powertv/Makefile | 28 + arch/mips/powertv/asic/Kconfig | 28 + arch/mips/powertv/asic/Makefile | 23 + arch/mips/powertv/asic/asic-calliope.c | 98 ++ arch/mips/powertv/asic/asic-cronus.c | 98 ++ arch/mips/powertv/asic/asic-zeus.c | 98 ++ arch/mips/powertv/asic/asic_devices.c | 787 +++++++++ arch/mips/powertv/asic/asic_int.c | 125 ++ arch/mips/powertv/asic/irq_asic.c | 116 ++ arch/mips/powertv/asic/prealloc-calliope.c | 620 +++++++ arch/mips/powertv/asic/prealloc-cronus.c | 608 +++++++ arch/mips/powertv/asic/prealloc-cronuslite.c | 290 +++ arch/mips/powertv/asic/prealloc-zeus.c | 459 +++++ arch/mips/powertv/cmdline.c | 52 + arch/mips/powertv/init.c | 128 ++ arch/mips/powertv/init.h | 28 + arch/mips/powertv/memory.c | 186 ++ arch/mips/powertv/pci/Makefile | 21 + arch/mips/powertv/pci/fixup-powertv.c | 36 + arch/mips/powertv/pci/powertv-pci.h | 31 + arch/mips/powertv/powertv-clock.h | 26 + arch/mips/powertv/powertv_setup.c | 351 ++++ arch/mips/powertv/reset.c | 65 + arch/mips/powertv/reset.h | 26 + .../mips/{mipssim/sim_cmdline.c => powertv/time.c} | 21 +- arch/mips/rb532/prom.c | 2 +- arch/mips/sgi-ip22/ip22-eisa.c | 4 +- arch/mips/sgi-ip22/ip22-int.c | 3 +- arch/mips/sgi-ip22/ip22-setup.c | 2 +- arch/mips/sgi-ip22/ip22-time.c | 3 +- arch/mips/sgi-ip32/ip32-setup.c | 2 +- arch/mips/sibyte/common/cfe.c | 4 +- arch/mips/sni/a20r.c | 2 +- arch/mips/sni/pcimt.c | 2 +- arch/mips/sni/pcit.c | 2 +- arch/mips/sni/rm200.c | 2 +- arch/mips/sni/setup.c | 2 +- arch/mips/txx9/generic/setup.c | 4 +- drivers/ide/au1xxx-ide.c | 21 +- drivers/mmc/host/au1xmmc.c | 8 +- drivers/mtd/maps/Kconfig | 6 - drivers/mtd/maps/Makefile | 1 - drivers/mtd/maps/alchemy-flash.c | 166 -- drivers/mtd/nand/Kconfig | 8 - drivers/mtd/nand/Makefile | 1 - drivers/mtd/nand/au1550nd.c | 4 +- drivers/mtd/nand/excite_nandflash.c | 248 --- drivers/net/Kconfig | 2 + drivers/net/Makefile | 2 + drivers/net/au1000_eth.c | 449 +++--- drivers/net/au1000_eth.h | 9 + drivers/net/irda/au1k_ir.c | 14 +- drivers/net/octeon/Kconfig | 10 + drivers/net/octeon/Makefile | 2 + drivers/net/octeon/octeon_mgmt.c | 1176 +++++++++++++ drivers/net/phy/Kconfig | 11 + drivers/net/phy/Makefile | 1 + drivers/net/phy/mdio-octeon.c | 180 ++ drivers/pcmcia/Kconfig | 21 + drivers/pcmcia/Makefile | 12 +- drivers/pcmcia/au1000_db1x00.c | 305 ---- drivers/pcmcia/au1000_generic.h | 12 +- drivers/pcmcia/au1000_pb1x00.c | 119 +-- drivers/pcmcia/au1000_xxs1500.c | 188 -- drivers/pcmcia/db1xxx_ss.c | 630 +++++++ drivers/pcmcia/xxs1500_ss.c | 357 ++++ drivers/serial/8250.c | 15 +- drivers/spi/au1550_spi.c | 6 +- drivers/staging/octeon/Kconfig | 3 +- drivers/staging/octeon/ethernet-mdio.c | 204 +-- drivers/staging/octeon/ethernet-mdio.h | 2 +- drivers/staging/octeon/ethernet-proc.c | 112 -- drivers/staging/octeon/ethernet-rgmii.c | 52 +- drivers/staging/octeon/ethernet-sgmii.c | 2 +- drivers/staging/octeon/ethernet-xaui.c | 2 +- drivers/staging/octeon/ethernet.c | 23 +- drivers/staging/octeon/octeon-ethernet.h | 6 +- drivers/watchdog/Kconfig | 10 - drivers/watchdog/Makefile | 1 - drivers/watchdog/rm9k_wdt.c | 419 ----- scripts/Makefile.build | 1 + scripts/recordmcount.pl | 8 +- sound/oss/au1550_ac97.c | 16 +- sound/soc/au1x/Kconfig | 10 +- sound/soc/au1x/Makefile | 4 +- sound/soc/au1x/db1200.c | 141 ++ sound/soc/au1x/dbdma2.c | 14 +- sound/soc/au1x/sample-ac97.c | 144 -- 326 files changed, 22742 insertions(+), 8795 deletions(-) delete mode 100644 arch/mips/alchemy/common/puts.c create mode 100644 arch/mips/alchemy/devboards/bcsr.c create mode 100644 arch/mips/alchemy/devboards/db1200/Makefile create mode 100644 arch/mips/alchemy/devboards/db1200/platform.c create mode 100644 arch/mips/alchemy/devboards/db1200/setup.c delete mode 100644 arch/mips/alchemy/devboards/db1x00/irqmap.c create mode 100644 arch/mips/alchemy/devboards/db1x00/platform.c create mode 100644 arch/mips/alchemy/devboards/pb1100/platform.c delete mode 100644 arch/mips/alchemy/devboards/pb1200/irqmap.c create mode 100644 arch/mips/alchemy/devboards/pb1500/platform.c create mode 100644 arch/mips/alchemy/devboards/pb1550/platform.c create mode 100644 arch/mips/alchemy/devboards/platform.c create mode 100644 arch/mips/alchemy/devboards/platform.h delete mode 100644 arch/mips/alchemy/mtx-1/irqmap.c delete mode 100644 arch/mips/alchemy/xxs1500/irqmap.c create mode 100644 arch/mips/alchemy/xxs1500/platform.c delete mode 100644 arch/mips/basler/excite/Kconfig delete mode 100644 arch/mips/basler/excite/Makefile delete mode 100644 arch/mips/basler/excite/excite_device.c delete mode 100644 arch/mips/basler/excite/excite_iodev.c delete mode 100644 arch/mips/basler/excite/excite_iodev.h delete mode 100644 arch/mips/basler/excite/excite_irq.c delete mode 100644 arch/mips/basler/excite/excite_procfs.c delete mode 100644 arch/mips/basler/excite/excite_prom.c delete mode 100644 arch/mips/basler/excite/excite_setup.c delete mode 100644 arch/mips/boot/addinitrd.c create mode 100644 arch/mips/boot/compressed/Makefile create mode 100644 arch/mips/boot/compressed/dbg.c create mode 100644 arch/mips/boot/compressed/decompress.c create mode 100644 arch/mips/boot/compressed/dummy.c create mode 100644 arch/mips/boot/compressed/head.S create mode 100644 arch/mips/boot/compressed/ld.script create mode 100644 arch/mips/boot/compressed/uart-16550.c create mode 100644 arch/mips/cavium-octeon/cpu.c delete mode 100644 arch/mips/configs/excite_defconfig create mode 100644 arch/mips/configs/lemote2f_defconfig create mode 100644 arch/mips/configs/powertv_defconfig create mode 100644 arch/mips/include/asm/cop2.h create mode 100644 arch/mips/include/asm/mach-au1x00/au1xxx_eth.h create mode 100644 arch/mips/include/asm/mach-db1x00/bcsr.h delete mode 100644 arch/mips/include/asm/mach-excite/cpu-feature-overrides.h delete mode 100644 arch/mips/include/asm/mach-excite/excite.h delete mode 100644 arch/mips/include/asm/mach-excite/excite_fpga.h delete mode 100644 arch/mips/include/asm/mach-excite/excite_nandflash.h delete mode 100644 arch/mips/include/asm/mach-excite/rm9k_eth.h delete mode 100644 arch/mips/include/asm/mach-excite/rm9k_wdt.h delete mode 100644 arch/mips/include/asm/mach-excite/rm9k_xicap.h create mode 100644 arch/mips/include/asm/mach-loongson/cs5536/cs5536.h create mode 100644 arch/mips/include/asm/mach-loongson/cs5536/cs5536_mfgpt.h create mode 100644 arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h create mode 100644 arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1100.h delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1500.h create mode 100644 arch/mips/include/asm/mach-powertv/asic.h create mode 100644 arch/mips/include/asm/mach-powertv/asic_regs.h create mode 100644 arch/mips/include/asm/mach-powertv/dma-coherence.h create mode 100644 arch/mips/include/asm/mach-powertv/interrupts.h create mode 100644 arch/mips/include/asm/mach-powertv/ioremap.h create mode 100644 arch/mips/include/asm/mach-powertv/irq.h create mode 100644 arch/mips/include/asm/mach-powertv/powertv-clock.h rename arch/mips/include/asm/{mach-excite => mach-powertv}/war.h (56%) create mode 100644 arch/mips/include/asm/octeon/cvmx-agl-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-mixx-defs.h create mode 100644 arch/mips/include/asm/octeon/cvmx-smix-defs.h create mode 100644 arch/mips/kernel/cpufreq/Kconfig create mode 100644 arch/mips/kernel/csrc-powertv.c create mode 100644 arch/mips/loongson/common/cs5536/Makefile create mode 100644 arch/mips/loongson/common/cs5536/cs5536_acc.c create mode 100644 arch/mips/loongson/common/cs5536/cs5536_ehci.c create mode 100644 arch/mips/loongson/common/cs5536/cs5536_ide.c create mode 100644 arch/mips/loongson/common/cs5536/cs5536_isa.c create mode 100644 arch/mips/loongson/common/cs5536/cs5536_mfgpt.c create mode 100644 arch/mips/loongson/common/cs5536/cs5536_ohci.c create mode 100644 arch/mips/loongson/common/cs5536/cs5536_pci.c create mode 100644 arch/mips/loongson/common/pm.c create mode 100644 arch/mips/loongson/common/serial.c create mode 100644 arch/mips/loongson/common/uart_base.c create mode 100644 arch/mips/loongson/lemote-2f/Makefile create mode 100644 arch/mips/loongson/lemote-2f/ec_kb3310b.c create mode 100644 arch/mips/loongson/lemote-2f/ec_kb3310b.h create mode 100644 arch/mips/loongson/lemote-2f/irq.c create mode 100644 arch/mips/loongson/lemote-2f/pm.c create mode 100644 arch/mips/loongson/lemote-2f/reset.c delete mode 100644 arch/mips/pci/fixup-excite.c create mode 100644 arch/mips/pci/fixup-lemote2f.c create mode 100644 arch/mips/pci/ops-loongson2.c delete mode 100644 arch/mips/pci/pci-excite.c create mode 100644 arch/mips/powertv/Kconfig create mode 100644 arch/mips/powertv/Makefile create mode 100644 arch/mips/powertv/asic/Kconfig create mode 100644 arch/mips/powertv/asic/Makefile create mode 100644 arch/mips/powertv/asic/asic-calliope.c create mode 100644 arch/mips/powertv/asic/asic-cronus.c create mode 100644 arch/mips/powertv/asic/asic-zeus.c create mode 100644 arch/mips/powertv/asic/asic_devices.c create mode 100644 arch/mips/powertv/asic/asic_int.c create mode 100644 arch/mips/powertv/asic/irq_asic.c create mode 100644 arch/mips/powertv/asic/prealloc-calliope.c create mode 100644 arch/mips/powertv/asic/prealloc-cronus.c create mode 100644 arch/mips/powertv/asic/prealloc-cronuslite.c create mode 100644 arch/mips/powertv/asic/prealloc-zeus.c create mode 100644 arch/mips/powertv/cmdline.c create mode 100644 arch/mips/powertv/init.c create mode 100644 arch/mips/powertv/init.h create mode 100644 arch/mips/powertv/memory.c create mode 100644 arch/mips/powertv/pci/Makefile create mode 100644 arch/mips/powertv/pci/fixup-powertv.c create mode 100644 arch/mips/powertv/pci/powertv-pci.h create mode 100644 arch/mips/powertv/powertv-clock.h create mode 100644 arch/mips/powertv/powertv_setup.c create mode 100644 arch/mips/powertv/reset.c create mode 100644 arch/mips/powertv/reset.h rename arch/mips/{mipssim/sim_cmdline.c => powertv/time.c} (60%) delete mode 100644 drivers/mtd/maps/alchemy-flash.c delete mode 100644 drivers/mtd/nand/excite_nandflash.c create mode 100644 drivers/net/octeon/Kconfig create mode 100644 drivers/net/octeon/Makefile create mode 100644 drivers/net/octeon/octeon_mgmt.c create mode 100644 drivers/net/phy/mdio-octeon.c delete mode 100644 drivers/pcmcia/au1000_db1x00.c delete mode 100644 drivers/pcmcia/au1000_xxs1500.c create mode 100644 drivers/pcmcia/db1xxx_ss.c create mode 100644 drivers/pcmcia/xxs1500_ss.c delete mode 100644 drivers/watchdog/rm9k_wdt.c create mode 100644 sound/soc/au1x/db1200.c delete mode 100644 sound/soc/au1x/sample-ac97.c Merging parisc/next $ git merge parisc/next Auto-merging arch/parisc/kernel/unwind.c Merge made by recursive. arch/parisc/include/asm/ftrace.h | 14 ++++++++++ arch/parisc/kernel/asm-offsets.c | 3 -- arch/parisc/kernel/signal.c | 1 - arch/parisc/kernel/smp.c | 9 ++++-- arch/parisc/kernel/unwind.c | 51 +++++++++++++++++++++++++++---------- 5 files changed, 57 insertions(+), 21 deletions(-) Merging powerpc/next $ git merge powerpc/next Auto-merging MAINTAINERS Auto-merging arch/powerpc/kernel/time.c Removing drivers/net/ehea/ehea_hcall.h Auto-merging drivers/watchdog/Kconfig Auto-merging drivers/watchdog/Makefile Removing drivers/watchdog/mpc5200_wdt.c Auto-merging include/linux/pci_ids.h Merge made by recursive. Documentation/ABI/testing/sysfs-devices-system-cpu | 15 + Documentation/cpu-hotplug.txt | 6 + Documentation/powerpc/dts-bindings/fsl/board.txt | 4 + Documentation/powerpc/dts-bindings/fsl/mpc5200.txt | 17 +- MAINTAINERS | 15 + arch/powerpc/Kconfig | 49 +- arch/powerpc/boot/dts/canyonlands.dts | 2 + arch/powerpc/boot/dts/eiger.dts | 6 + arch/powerpc/boot/dts/gef_ppc9a.dts | 6 + arch/powerpc/boot/dts/gef_sbc310.dts | 6 + arch/powerpc/boot/dts/gef_sbc610.dts | 6 + arch/powerpc/boot/dts/glacier.dts | 6 + arch/powerpc/boot/dts/haleakala.dts | 2 + arch/powerpc/boot/dts/katmai.dts | 36 +- arch/powerpc/boot/dts/kilauea.dts | 4 + arch/powerpc/boot/dts/kmeter1.dts | 7 + arch/powerpc/boot/dts/makalu.dts | 4 + arch/powerpc/boot/dts/mpc832x_mds.dts | 9 + arch/powerpc/boot/dts/mpc832x_rdb.dts | 9 + arch/powerpc/boot/dts/mpc836x_mds.dts | 9 + arch/powerpc/boot/dts/mpc836x_rdk.dts | 9 + arch/powerpc/boot/dts/mpc8568mds.dts | 119 ++- arch/powerpc/boot/dts/mpc8569mds.dts | 111 +- arch/powerpc/boot/dts/mpc8610_hpcd.dts | 26 + arch/powerpc/boot/dts/p1020rdb.dts | 477 +++++++ arch/powerpc/boot/dts/p2020rdb_camp_core0.dts | 363 +++++ arch/powerpc/boot/dts/p2020rdb_camp_core1.dts | 184 +++ arch/powerpc/boot/dts/p4080ds.dts | 554 ++++++++ arch/powerpc/boot/dts/redwood.dts | 1 + arch/powerpc/boot/dts/yosemite.dts | 14 +- arch/powerpc/configs/86xx/gef_ppc9a_defconfig | 2 +- arch/powerpc/configs/86xx/gef_sbc310_defconfig | 2 +- arch/powerpc/configs/86xx/gef_sbc610_defconfig | 4 +- arch/powerpc/include/asm/cpm.h | 82 ++ arch/powerpc/include/asm/cpm1.h | 45 - arch/powerpc/include/asm/cpm2.h | 47 - arch/powerpc/include/asm/exception-64s.h | 2 + arch/powerpc/include/asm/hugetlb.h | 27 +- arch/powerpc/include/asm/hvcall.h | 13 + arch/powerpc/include/asm/hw_irq.h | 5 - arch/powerpc/include/asm/immap_cpm2.h | 2 +- arch/powerpc/include/asm/immap_qe.h | 8 +- arch/powerpc/include/asm/irq.h | 13 +- arch/powerpc/include/asm/kvm.h | 18 + arch/powerpc/include/asm/kvm_asm.h | 40 + arch/powerpc/include/asm/kvm_book3s.h | 139 ++ arch/powerpc/include/asm/kvm_book3s_64_asm.h | 58 + arch/powerpc/include/asm/kvm_host.h | 79 +- arch/powerpc/include/asm/kvm_ppc.h | 1 + arch/powerpc/include/asm/lppaca.h | 9 +- arch/powerpc/include/asm/machdep.h | 5 + arch/powerpc/include/asm/macio.h | 6 + arch/powerpc/include/asm/mediabay.h | 27 +- arch/powerpc/include/asm/mmu-hash64.h | 50 +- arch/powerpc/include/asm/mmu_context.h | 2 + arch/powerpc/include/asm/mpc52xx.h | 47 + arch/powerpc/include/asm/nvram.h | 1 - arch/powerpc/include/asm/pSeries_reconfig.h | 1 + arch/powerpc/include/asm/paca.h | 9 + arch/powerpc/include/asm/page.h | 14 + arch/powerpc/include/asm/page_64.h | 2 +- arch/powerpc/include/asm/pgalloc-32.h | 10 +- arch/powerpc/include/asm/pgalloc-64.h | 63 +- arch/powerpc/include/asm/pgalloc.h | 30 +- arch/powerpc/include/asm/pgtable-ppc64.h | 14 +- arch/powerpc/include/asm/pgtable.h | 3 + arch/powerpc/include/asm/pte-8xx.h | 14 +- arch/powerpc/include/asm/pte-hash64-64k.h | 37 - arch/powerpc/include/asm/qe.h | 43 +- arch/powerpc/include/asm/systbl.h | 2 +- arch/powerpc/kernel/Makefile | 3 +- arch/powerpc/kernel/asm-offsets.c | 21 +- arch/powerpc/kernel/crash.c | 2 +- arch/powerpc/kernel/dma-swiotlb.c | 1 - arch/powerpc/kernel/exceptions-64s.S | 8 + arch/powerpc/kernel/head_64.S | 7 + arch/powerpc/kernel/head_8xx.S | 313 +++-- arch/powerpc/kernel/head_fsl_booke.S | 22 - arch/powerpc/kernel/io.c | 4 +- arch/powerpc/kernel/irq.c | 137 ++- arch/powerpc/kernel/lparcfg.c | 4 +- arch/powerpc/kernel/misc_32.S | 18 - arch/powerpc/kernel/nvram_64.c | 56 +- arch/powerpc/kernel/perf_callchain.c | 20 +- arch/powerpc/kernel/ppc_ksyms.c | 3 - .../kernel/{proc_ppc64.c => proc_powerpc.c} | 102 +- arch/powerpc/kernel/rtas_flash.c | 10 +- arch/powerpc/{platforms/pseries => kernel}/rtasd.c | 48 +- arch/powerpc/kernel/setup_64.c | 5 - arch/powerpc/kernel/smp.c | 3 + arch/powerpc/kernel/sysfs.c | 19 + arch/powerpc/kernel/time.c | 1 + arch/powerpc/kernel/traps.c | 22 - arch/powerpc/kernel/vector.S | 2 +- arch/powerpc/kvm/Kconfig | 17 + arch/powerpc/kvm/Makefile | 27 +- arch/powerpc/kvm/book3s.c | 974 +++++++++++++ arch/powerpc/kvm/book3s_32_mmu.c | 372 +++++ arch/powerpc/kvm/book3s_64_emulate.c | 345 +++++ arch/powerpc/kvm/book3s_64_exports.c | 24 + arch/powerpc/kvm/book3s_64_interrupts.S | 392 ++++++ arch/powerpc/kvm/book3s_64_mmu.c | 478 +++++++ arch/powerpc/kvm/book3s_64_mmu_host.c | 408 ++++++ arch/powerpc/kvm/book3s_64_rmhandlers.S | 131 ++ arch/powerpc/kvm/book3s_64_slb.S | 262 ++++ arch/powerpc/kvm/booke.c | 5 + arch/powerpc/kvm/emulate.c | 66 +- arch/powerpc/kvm/powerpc.c | 28 +- arch/powerpc/kvm/timing.c | 1 + arch/powerpc/kvm/trace.h | 6 +- arch/powerpc/lib/copy_32.S | 24 - arch/powerpc/mm/Makefile | 5 +- arch/powerpc/mm/fault.c | 8 +- arch/powerpc/mm/fsl_booke_mmu.c | 132 +- arch/powerpc/mm/gup.c | 149 +-- arch/powerpc/mm/hash_utils_64.c | 46 +- arch/powerpc/mm/hugetlbpage-hash64.c | 139 ++ arch/powerpc/mm/hugetlbpage.c | 792 ++++------- arch/powerpc/mm/init_64.c | 76 +- arch/powerpc/mm/mem.c | 17 +- arch/powerpc/mm/mmu_context_hash64.c | 26 +- arch/powerpc/mm/mmu_decl.h | 11 - arch/powerpc/mm/pgtable.c | 25 +- arch/powerpc/mm/subpage-prot.c | 15 +- arch/powerpc/mm/tlb_hash64.c | 8 +- arch/powerpc/platforms/512x/mpc5121_ads_cpld.c | 4 +- arch/powerpc/platforms/52xx/Kconfig | 5 + arch/powerpc/platforms/52xx/Makefile | 1 + arch/powerpc/platforms/52xx/media5200.c | 6 +- arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 432 ++++++- arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 560 ++++++++ arch/powerpc/platforms/52xx/mpc52xx_pic.c | 10 +- arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 3 +- arch/powerpc/platforms/83xx/mpc832x_rdb.c | 2 +- arch/powerpc/platforms/83xx/suspend.c | 1 + arch/powerpc/platforms/85xx/Kconfig | 23 +- arch/powerpc/platforms/85xx/Makefile | 1 + arch/powerpc/platforms/85xx/corenet_ds.c | 125 ++ arch/powerpc/platforms/85xx/corenet_ds.h | 19 + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 + arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 34 +- arch/powerpc/platforms/85xx/p4080_ds.c | 74 + arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 6 +- arch/powerpc/platforms/86xx/Kconfig | 3 + arch/powerpc/platforms/86xx/gef_pic.c | 6 +- arch/powerpc/platforms/86xx/gef_ppc9a.c | 5 + arch/powerpc/platforms/86xx/gef_sbc310.c | 5 + arch/powerpc/platforms/86xx/gef_sbc610.c | 5 + arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 48 +- arch/powerpc/platforms/8xx/m8xx_setup.c | 2 +- arch/powerpc/platforms/Kconfig | 9 +- arch/powerpc/platforms/Kconfig.cputype | 17 +- arch/powerpc/platforms/Makefile | 2 +- arch/powerpc/platforms/cell/axon_msi.c | 2 +- arch/powerpc/platforms/cell/beat_interrupt.c | 8 +- arch/powerpc/platforms/cell/interrupt.c | 6 +- arch/powerpc/platforms/cell/spider-pic.c | 8 +- arch/powerpc/platforms/cell/spufs/file.c | 2 +- arch/powerpc/platforms/chrp/Kconfig | 2 + arch/powerpc/platforms/chrp/setup.c | 50 - arch/powerpc/platforms/iseries/htab.c | 8 +- arch/powerpc/platforms/iseries/irq.c | 4 +- arch/powerpc/platforms/powermac/pic.c | 12 +- arch/powerpc/platforms/ps3/interrupt.c | 2 +- arch/powerpc/platforms/ps3/mm.c | 2 +- arch/powerpc/platforms/pseries/Kconfig | 3 +- arch/powerpc/platforms/pseries/Makefile | 4 +- arch/powerpc/platforms/pseries/cmm.c | 29 +- arch/powerpc/platforms/pseries/dlpar.c | 558 ++++++++ arch/powerpc/platforms/pseries/eeh_driver.c | 18 +- arch/powerpc/platforms/pseries/hotplug-cpu.c | 182 +++- arch/powerpc/platforms/pseries/offline_states.h | 18 + arch/powerpc/platforms/pseries/plpar_wrappers.h | 22 + arch/powerpc/platforms/pseries/reconfig.c | 8 +- arch/powerpc/platforms/pseries/scanlog.c | 4 +- arch/powerpc/platforms/pseries/smp.c | 19 + arch/powerpc/platforms/pseries/xics.c | 70 +- arch/powerpc/sysdev/Makefile | 1 + arch/powerpc/sysdev/cpm1.c | 4 +- arch/powerpc/sysdev/cpm2_pic.c | 14 +- arch/powerpc/sysdev/cpm_common.c | 5 +- arch/powerpc/sysdev/fsl_msi.c | 4 +- arch/powerpc/sysdev/fsl_pci.c | 18 +- arch/powerpc/sysdev/fsl_pmc.c | 88 ++ arch/powerpc/sysdev/fsl_soc.c | 2 +- arch/powerpc/sysdev/i8259.c | 8 +- arch/powerpc/sysdev/ipic.c | 8 +- arch/powerpc/sysdev/mpc8xx_pic.c | 6 +- arch/powerpc/sysdev/mpic.c | 26 +- arch/powerpc/sysdev/mpic_pasemi_msi.c | 2 +- arch/powerpc/sysdev/mpic_u3msi.c | 2 +- arch/powerpc/sysdev/mv64x60_pic.c | 2 +- arch/powerpc/sysdev/qe_lib/qe.c | 61 +- arch/powerpc/sysdev/qe_lib/qe_ic.c | 8 +- arch/powerpc/sysdev/tsi108_pci.c | 6 +- arch/powerpc/sysdev/uic.c | 10 +- arch/powerpc/sysdev/xilinx_intc.c | 8 +- arch/powerpc/xmon/xmon.c | 3 +- drivers/ata/Kconfig | 10 + drivers/ata/Makefile | 1 + drivers/ata/pata_macio.c | 1427 ++++++++++++++++++++ drivers/base/cpu.c | 34 + drivers/block/swim3.c | 39 +- drivers/char/agp/uninorth-agp.c | 77 +- drivers/char/hvc_console.c | 1 + drivers/ide/pmac.c | 92 +- drivers/macintosh/macio_asic.c | 52 + drivers/macintosh/mediabay.c | 328 ++--- drivers/macintosh/nvram.c | 11 +- drivers/macintosh/therm_adt746x.c | 15 +- drivers/macintosh/via-pmu.c | 160 ++- drivers/macintosh/windfarm_smu_controls.c | 2 + drivers/mmc/host/of_mmc_spi.c | 2 + drivers/net/ehea/ehea_hcall.h | 51 - drivers/net/ehea/ehea_phyp.h | 1 - drivers/of/platform.c | 305 ++++- drivers/spi/Kconfig | 11 +- drivers/spi/Makefile | 1 + drivers/spi/mpc52xx_psc_spi.c | 25 +- drivers/spi/mpc52xx_spi.c | 520 +++++++ drivers/spi/spi_mpc8xxx.c | 618 ++++++++-- drivers/spi/xilinx_spi.c | 3 +- drivers/usb/gadget/fsl_qe_udc.h | 15 - drivers/video/offb.c | 15 +- drivers/watchdog/Kconfig | 4 +- drivers/watchdog/Makefile | 1 - drivers/watchdog/mpc5200_wdt.c | 293 ---- fs/proc/proc_devtree.c | 41 +- include/linux/cpu.h | 15 + include/linux/fsl_devices.h | 11 +- include/linux/kvm.h | 1 + include/linux/pci_ids.h | 14 + include/linux/spi/mpc52xx_spi.h | 10 + virt/kvm/kvm_main.c | 5 +- 234 files changed, 13126 insertions(+), 2713 deletions(-) create mode 100644 arch/powerpc/boot/dts/p1020rdb.dts create mode 100644 arch/powerpc/boot/dts/p2020rdb_camp_core0.dts create mode 100644 arch/powerpc/boot/dts/p2020rdb_camp_core1.dts create mode 100644 arch/powerpc/boot/dts/p4080ds.dts create mode 100644 arch/powerpc/include/asm/kvm_book3s.h create mode 100644 arch/powerpc/include/asm/kvm_book3s_64_asm.h rename arch/powerpc/kernel/{proc_ppc64.c => proc_powerpc.c} (87%) rename arch/powerpc/{platforms/pseries => kernel}/rtasd.c (95%) create mode 100644 arch/powerpc/kvm/book3s.c create mode 100644 arch/powerpc/kvm/book3s_32_mmu.c create mode 100644 arch/powerpc/kvm/book3s_64_emulate.c create mode 100644 arch/powerpc/kvm/book3s_64_exports.c create mode 100644 arch/powerpc/kvm/book3s_64_interrupts.S create mode 100644 arch/powerpc/kvm/book3s_64_mmu.c create mode 100644 arch/powerpc/kvm/book3s_64_mmu_host.c create mode 100644 arch/powerpc/kvm/book3s_64_rmhandlers.S create mode 100644 arch/powerpc/kvm/book3s_64_slb.S create mode 100644 arch/powerpc/mm/hugetlbpage-hash64.c create mode 100644 arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c create mode 100644 arch/powerpc/platforms/85xx/corenet_ds.c create mode 100644 arch/powerpc/platforms/85xx/corenet_ds.h create mode 100644 arch/powerpc/platforms/85xx/p4080_ds.c create mode 100644 arch/powerpc/platforms/pseries/dlpar.c create mode 100644 arch/powerpc/platforms/pseries/offline_states.h create mode 100644 arch/powerpc/sysdev/fsl_pmc.c create mode 100644 drivers/ata/pata_macio.c delete mode 100644 drivers/net/ehea/ehea_hcall.h create mode 100644 drivers/spi/mpc52xx_spi.c delete mode 100644 drivers/watchdog/mpc5200_wdt.c create mode 100644 include/linux/spi/mpc52xx_spi.h Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging 52xx-and-virtex/next $ git merge 52xx-and-virtex/next Already up-to-date. Merging galak/next $ git merge galak/next Already up-to-date. Merging s390/features $ git merge s390/features Already up-to-date. Merging sh/master $ git merge sh/master Already up-to-date. Merging sparc/master $ git merge sparc/master Already up-to-date. Merging xtensa/master $ git merge xtensa/master Auto-merging arch/xtensa/Kconfig Merge made by recursive. Merging ceph/for-next $ git merge ceph/for-next Auto-merging MAINTAINERS Auto-merging fs/Kconfig Merge made by recursive. Documentation/filesystems/ceph.txt | 139 ++ Documentation/ioctl/ioctl-number.txt | 1 + MAINTAINERS | 9 + fs/Kconfig | 1 + fs/Makefile | 1 + fs/ceph/Kconfig | 26 + fs/ceph/Makefile | 37 + fs/ceph/README | 20 + fs/ceph/addr.c | 1115 +++++++++++++ fs/ceph/auth.c | 225 +++ fs/ceph/auth.h | 77 + fs/ceph/auth_none.c | 120 ++ fs/ceph/auth_none.h | 28 + fs/ceph/buffer.c | 61 + fs/ceph/buffer.h | 37 + fs/ceph/caps.c | 2863 ++++++++++++++++++++++++++++++++ fs/ceph/ceph_debug.h | 37 + fs/ceph/ceph_frag.c | 21 + fs/ceph/ceph_frag.h | 109 ++ fs/ceph/ceph_fs.c | 74 + fs/ceph/ceph_fs.h | 648 ++++++++ fs/ceph/ceph_hash.c | 118 ++ fs/ceph/ceph_hash.h | 13 + fs/ceph/ceph_strings.c | 176 ++ fs/ceph/crush/crush.c | 151 ++ fs/ceph/crush/crush.h | 180 ++ fs/ceph/crush/hash.c | 149 ++ fs/ceph/crush/hash.h | 17 + fs/ceph/crush/mapper.c | 596 +++++++ fs/ceph/crush/mapper.h | 20 + fs/ceph/debugfs.c | 450 +++++ fs/ceph/decode.h | 159 ++ fs/ceph/dir.c | 1222 ++++++++++++++ fs/ceph/export.c | 223 +++ fs/ceph/file.c | 904 +++++++++++ fs/ceph/inode.c | 1627 +++++++++++++++++++ fs/ceph/ioctl.c | 160 ++ fs/ceph/ioctl.h | 40 + fs/ceph/mds_client.c | 2975 ++++++++++++++++++++++++++++++++++ fs/ceph/mds_client.h | 332 ++++ fs/ceph/mdsmap.c | 170 ++ fs/ceph/mdsmap.h | 54 + fs/ceph/messenger.c | 2092 ++++++++++++++++++++++++ fs/ceph/messenger.h | 256 +++ fs/ceph/mon_client.c | 751 +++++++++ fs/ceph/mon_client.h | 115 ++ fs/ceph/msgpool.c | 181 ++ fs/ceph/msgpool.h | 27 + fs/ceph/msgr.h | 167 ++ fs/ceph/osd_client.c | 1363 ++++++++++++++++ fs/ceph/osd_client.h | 155 ++ fs/ceph/osdmap.c | 916 +++++++++++ fs/ceph/osdmap.h | 124 ++ fs/ceph/rados.h | 370 +++++ fs/ceph/snap.c | 887 ++++++++++ fs/ceph/super.c | 984 +++++++++++ fs/ceph/super.h | 895 ++++++++++ fs/ceph/types.h | 29 + fs/ceph/xattr.c | 844 ++++++++++ 59 files changed, 25541 insertions(+), 0 deletions(-) create mode 100644 Documentation/filesystems/ceph.txt create mode 100644 fs/ceph/Kconfig create mode 100644 fs/ceph/Makefile create mode 100644 fs/ceph/README create mode 100644 fs/ceph/addr.c create mode 100644 fs/ceph/auth.c create mode 100644 fs/ceph/auth.h create mode 100644 fs/ceph/auth_none.c create mode 100644 fs/ceph/auth_none.h create mode 100644 fs/ceph/buffer.c create mode 100644 fs/ceph/buffer.h create mode 100644 fs/ceph/caps.c create mode 100644 fs/ceph/ceph_debug.h create mode 100644 fs/ceph/ceph_frag.c create mode 100644 fs/ceph/ceph_frag.h create mode 100644 fs/ceph/ceph_fs.c create mode 100644 fs/ceph/ceph_fs.h create mode 100644 fs/ceph/ceph_hash.c create mode 100644 fs/ceph/ceph_hash.h create mode 100644 fs/ceph/ceph_strings.c create mode 100644 fs/ceph/crush/crush.c create mode 100644 fs/ceph/crush/crush.h create mode 100644 fs/ceph/crush/hash.c create mode 100644 fs/ceph/crush/hash.h create mode 100644 fs/ceph/crush/mapper.c create mode 100644 fs/ceph/crush/mapper.h create mode 100644 fs/ceph/debugfs.c create mode 100644 fs/ceph/decode.h create mode 100644 fs/ceph/dir.c create mode 100644 fs/ceph/export.c create mode 100644 fs/ceph/file.c create mode 100644 fs/ceph/inode.c create mode 100644 fs/ceph/ioctl.c create mode 100644 fs/ceph/ioctl.h create mode 100644 fs/ceph/mds_client.c create mode 100644 fs/ceph/mds_client.h create mode 100644 fs/ceph/mdsmap.c create mode 100644 fs/ceph/mdsmap.h create mode 100644 fs/ceph/messenger.c create mode 100644 fs/ceph/messenger.h create mode 100644 fs/ceph/mon_client.c create mode 100644 fs/ceph/mon_client.h create mode 100644 fs/ceph/msgpool.c create mode 100644 fs/ceph/msgpool.h create mode 100644 fs/ceph/msgr.h create mode 100644 fs/ceph/osd_client.c create mode 100644 fs/ceph/osd_client.h create mode 100644 fs/ceph/osdmap.c create mode 100644 fs/ceph/osdmap.h create mode 100644 fs/ceph/rados.h create mode 100644 fs/ceph/snap.c create mode 100644 fs/ceph/super.c create mode 100644 fs/ceph/super.h create mode 100644 fs/ceph/types.h create mode 100644 fs/ceph/xattr.c Merging cifs/master $ git merge cifs/master Merge made by recursive. fs/cifs/CHANGES | 4 +++- fs/cifs/cifsfs.c | 3 ++- fs/cifs/connect.c | 13 +++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) Merging configfs/linux-next $ git merge configfs/linux-next Already up-to-date. Merging ecryptfs/next $ git merge ecryptfs/next Merge made by recursive. fs/ecryptfs/file.c | 14 +++--- fs/ecryptfs/inode.c | 118 +++++++++++++++++++++++++++++++++++---------------- 2 files changed, 88 insertions(+), 44 deletions(-) Merging ext3/for_next $ git merge ext3/for_next Auto-merging arch/mips/loongson/common/mem.c Auto-merging fs/ext4/super.c Auto-merging fs/jbd2/commit.c Merge made by recursive. Documentation/filesystems/ext3.txt | 4 +- Documentation/filesystems/vfs.txt | 2 +- arch/alpha/include/asm/fcntl.h | 19 +- arch/blackfin/include/asm/fcntl.h | 2 - arch/mips/include/asm/fcntl.h | 17 +- arch/mips/kernel/kspd.c | 1 + arch/mips/loongson/common/mem.c | 2 +- arch/mips/mm/cache.c | 2 +- arch/parisc/include/asm/fcntl.h | 5 +- arch/sparc/include/asm/fcntl.h | 19 +- arch/x86/mm/pat.c | 3 +- drivers/char/mem.c | 6 +- drivers/usb/gadget/file_storage.c | 2 +- fs/afs/write.c | 8 - fs/btrfs/file.c | 4 +- fs/cifs/dir.c | 3 +- fs/cifs/file.c | 6 +- fs/ext2/dir.c | 4 +- fs/ext2/ext2.h | 2 +- fs/ext2/inode.c | 6 +- fs/ext2/super.c | 184 ++++++++----- fs/ext2/xip.c | 5 +- fs/ext3/inode.c | 18 +- fs/ext3/resize.c | 2 +- fs/ext3/super.c | 468 +++++++++++++++++-------------- fs/ext3/xattr.c | 7 +- fs/ext4/super.c | 30 ++- fs/isofs/compress.c | 533 +++++++++++++++++++----------------- fs/isofs/rock.c | 3 +- fs/jbd2/commit.c | 2 +- fs/namei.c | 9 + fs/nfs/file.c | 4 +- fs/nfs/write.c | 2 +- fs/ocfs2/file.c | 2 +- fs/ocfs2/quota.h | 4 - fs/ocfs2/quota_local.c | 2 +- fs/quota/Kconfig | 8 +- fs/quota/dquot.c | 2 + fs/quota/quota_v1.c | 2 +- fs/quota/quota_v2.c | 167 +++++++++--- fs/quota/quotaio_v2.h | 19 +- fs/sync.c | 13 +- fs/xfs/linux-2.6/xfs_lrw.c | 2 +- include/asm-generic/fcntl.h | 25 ++- include/linux/ext2_fs.h | 16 +- include/linux/ext3_fs.h | 2 + include/linux/fs.h | 2 - include/linux/quota.h | 6 +- mm/filemap.c | 49 +--- sound/core/rawmidi.c | 2 +- 50 files changed, 1000 insertions(+), 707 deletions(-) Merging ext4/next $ git merge ext4/next Already up-to-date. Merging fatfs/master $ git merge fatfs/master Merge made by recursive. fs/fat/fat.h | 3 ++- fs/fat/fatent.c | 25 +++++++++++++++---------- fs/fat/inode.c | 8 +++++++- 3 files changed, 24 insertions(+), 12 deletions(-) Merging fuse/for-next $ git merge fuse/for-next Already up-to-date. Merging gfs2/master $ git merge gfs2/master Already up-to-date. Merging jfs/next $ git merge jfs/next Already up-to-date. Merging logfs/master $ git merge logfs/master Auto-merging Documentation/filesystems/00-INDEX Auto-merging MAINTAINERS Auto-merging fs/Kconfig Auto-merging fs/Makefile Auto-merging lib/Kconfig Auto-merging lib/Makefile Merge made by recursive. Documentation/filesystems/00-INDEX | 2 + Documentation/filesystems/logfs.txt | 241 ++++ MAINTAINERS | 7 + fs/Kconfig | 1 + fs/Makefile | 1 + fs/logfs/Kconfig | 17 + fs/logfs/Makefile | 13 + fs/logfs/compr.c | 95 ++ fs/logfs/dev_bdev.c | 263 ++++ fs/logfs/dev_mtd.c | 253 ++++ fs/logfs/dir.c | 827 +++++++++++++ fs/logfs/file.c | 263 ++++ fs/logfs/gc.c | 730 ++++++++++++ fs/logfs/inode.c | 417 +++++++ fs/logfs/journal.c | 879 ++++++++++++++ fs/logfs/logfs.h | 722 +++++++++++ fs/logfs/logfs_abi.h | 627 ++++++++++ fs/logfs/readwrite.c | 2246 +++++++++++++++++++++++++++++++++++ fs/logfs/segment.c | 924 ++++++++++++++ fs/logfs/super.c | 634 ++++++++++ include/linux/btree-128.h | 109 ++ include/linux/btree-type.h | 147 +++ include/linux/btree.h | 243 ++++ lib/Kconfig | 3 + lib/Makefile | 1 + lib/btree.c | 797 +++++++++++++ 26 files changed, 10462 insertions(+), 0 deletions(-) create mode 100644 Documentation/filesystems/logfs.txt create mode 100644 fs/logfs/Kconfig create mode 100644 fs/logfs/Makefile create mode 100644 fs/logfs/compr.c create mode 100644 fs/logfs/dev_bdev.c create mode 100644 fs/logfs/dev_mtd.c create mode 100644 fs/logfs/dir.c create mode 100644 fs/logfs/file.c create mode 100644 fs/logfs/gc.c create mode 100644 fs/logfs/inode.c create mode 100644 fs/logfs/journal.c create mode 100644 fs/logfs/logfs.h create mode 100644 fs/logfs/logfs_abi.h create mode 100644 fs/logfs/readwrite.c create mode 100644 fs/logfs/segment.c create mode 100644 fs/logfs/super.c create mode 100644 include/linux/btree-128.h create mode 100644 include/linux/btree-type.h create mode 100644 include/linux/btree.h create mode 100644 lib/btree.c Merging nfs/linux-next $ git merge nfs/linux-next Auto-merging fs/nfs/write.c Auto-merging net/sunrpc/auth.c Auto-merging net/sunrpc/xprtsock.c Merge made by recursive. fs/nfs/callback.c | 13 +- fs/nfs/callback.h | 16 ++- fs/nfs/callback_proc.c | 64 ++++++- fs/nfs/callback_xdr.c | 34 +++- fs/nfs/client.c | 14 +- fs/nfs/delegation.c | 77 +++++-- fs/nfs/delegation.h | 7 +- fs/nfs/dir.c | 67 +++---- fs/nfs/dns_resolve.c | 4 +- fs/nfs/internal.h | 54 +++--- fs/nfs/nfs4_fs.h | 12 +- fs/nfs/nfs4proc.c | 458 +++++++++++++++++++++++++--------------- fs/nfs/nfs4state.c | 225 ++++++++++++++------ fs/nfs/nfs4xdr.c | 135 ++++++++++-- fs/nfs/read.c | 12 +- fs/nfs/super.c | 104 +++++++-- fs/nfs/unlink.c | 2 +- fs/nfs/write.c | 8 +- include/linux/nfs4.h | 3 + include/linux/nfs_fs_sb.h | 1 + include/linux/nfs_xdr.h | 13 +- include/linux/sunrpc/sched.h | 2 + net/sunrpc/addr.c | 10 +- net/sunrpc/auth.c | 39 ++-- net/sunrpc/auth_gss/auth_gss.c | 6 +- net/sunrpc/clnt.c | 54 ++++- net/sunrpc/rpcb_clnt.c | 104 +++++++-- net/sunrpc/sunrpc_syms.c | 3 + net/sunrpc/xprt.c | 4 + net/sunrpc/xprtsock.c | 2 +- 30 files changed, 1078 insertions(+), 469 deletions(-) Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Auto-merging Documentation/filesystems/00-INDEX Auto-merging Documentation/kernel-parameters.txt Auto-merging arch/parisc/kernel/sys_parisc32.c Auto-merging arch/s390/kernel/compat_linux.c Auto-merging arch/s390/kernel/compat_linux.h Auto-merging arch/sparc/kernel/sys_sparc32.c Auto-merging include/linux/nfs_xdr.h Auto-merging net/ipv4/ipconfig.c Auto-merging net/sunrpc/svc_xprt.c Auto-merging net/sunrpc/svcauth_unix.c Merge made by recursive. Documentation/filesystems/00-INDEX | 12 +- Documentation/filesystems/nfs/00-INDEX | 16 ++ Documentation/filesystems/{ => nfs}/Exporting | 0 .../filesystems/{ => nfs}/knfsd-stats.txt | 0 Documentation/filesystems/{ => nfs}/nfs-rdma.txt | 0 Documentation/filesystems/{ => nfs}/nfs.txt | 0 .../filesystems/{ => nfs}/nfs41-server.txt | 9 +- Documentation/filesystems/{ => nfs}/nfsroot.txt | 0 Documentation/filesystems/{ => nfs}/rpc-cache.txt | 0 Documentation/filesystems/porting | 2 +- Documentation/kernel-parameters.txt | 6 +- arch/parisc/kernel/sys_parisc32.c | 6 - fs/cifs/export.c | 2 +- fs/compat.c | 2 - fs/exportfs/expfs.c | 2 +- fs/isofs/export.c | 2 +- fs/lockd/svc4proc.c | 4 - fs/lockd/svcproc.c | 4 - fs/nfs/Kconfig | 2 +- fs/nfsctl.c | 2 - fs/nfsd/auth.c | 12 +- {include/linux => fs}/nfsd/cache.h | 5 +- fs/nfsd/export.c | 52 +++--- fs/nfsd/lockd.c | 10 +- fs/nfsd/nfs2acl.c | 27 ++- fs/nfsd/nfs3acl.c | 15 +- fs/nfsd/nfs3proc.c | 20 +-- fs/nfsd/nfs3xdr.c | 15 +-- fs/nfsd/nfs4acl.c | 12 +- fs/nfsd/nfs4callback.c | 19 +-- fs/nfsd/nfs4idmap.c | 17 +-- fs/nfsd/nfs4proc.c | 19 +-- fs/nfsd/nfs4recover.c | 16 +-- fs/nfsd/nfs4state.c | 84 +++----- fs/nfsd/nfs4xdr.c | 26 +-- fs/nfsd/nfscache.c | 14 +-- fs/nfsd/nfsctl.c | 30 +--- {include/linux => fs}/nfsd/nfsd.h | 98 +--------- fs/nfsd/nfsfh.c | 102 ++++++---- fs/nfsd/nfsfh.h | 208 ++++++++++++++++++++ fs/nfsd/nfsproc.c | 22 +-- fs/nfsd/nfssvc.c | 22 +-- fs/nfsd/nfsxdr.c | 12 +- {include/linux => fs}/nfsd/state.h | 14 +- fs/nfsd/stats.c | 11 +- fs/nfsd/vfs.c | 134 +++++++------ fs/nfsd/vfs.h | 101 ++++++++++ {include/linux => fs}/nfsd/xdr.h | 10 +- {include/linux => fs}/nfsd/xdr3.h | 4 +- {include/linux => fs}/nfsd/xdr4.h | 5 +- include/linux/exportfs.h | 2 +- include/linux/nfs_xdr.h | 1 + include/linux/nfsacl.h | 1 + include/linux/nfsd/export.h | 18 ++- include/linux/nfsd/nfsfh.h | 206 +------------------- include/linux/nfsd/syscall.h | 8 +- include/linux/sunrpc/debug.h | 3 - include/linux/sunrpc/rpc_rdma.h | 2 + include/linux/sunrpc/svc.h | 7 - net/ipv4/Kconfig | 6 +- net/ipv4/ipconfig.c | 2 +- net/sunrpc/svc_xprt.c | 31 +-- net/sunrpc/svcauth_unix.c | 53 +++--- 63 files changed, 687 insertions(+), 860 deletions(-) create mode 100644 Documentation/filesystems/nfs/00-INDEX rename Documentation/filesystems/{ => nfs}/Exporting (100%) rename Documentation/filesystems/{ => nfs}/knfsd-stats.txt (100%) rename Documentation/filesystems/{ => nfs}/nfs-rdma.txt (100%) rename Documentation/filesystems/{ => nfs}/nfs.txt (100%) rename Documentation/filesystems/{ => nfs}/nfs41-server.txt (96%) rename Documentation/filesystems/{ => nfs}/nfsroot.txt (100%) rename Documentation/filesystems/{ => nfs}/rpc-cache.txt (100%) rename {include/linux => fs}/nfsd/cache.h (95%) rename {include/linux => fs}/nfsd/nfsd.h (79%) create mode 100644 fs/nfsd/nfsfh.h rename {include/linux => fs}/nfsd/state.h (98%) create mode 100644 fs/nfsd/vfs.h rename {include/linux => fs}/nfsd/xdr.h (96%) rename {include/linux => fs}/nfsd/xdr3.h (99%) rename {include/linux => fs}/nfsd/xdr4.h (99%) Merging nilfs2/for-next $ git merge nilfs2/for-next Merge made by recursive. Documentation/filesystems/nilfs2.txt | 7 +- fs/nilfs2/alloc.c | 108 ++++++++-- fs/nilfs2/alloc.h | 21 ++ fs/nilfs2/bmap.c | 8 - fs/nilfs2/btnode.c | 76 +++---- fs/nilfs2/btnode.h | 6 +- fs/nilfs2/btree.c | 106 ++++------- fs/nilfs2/btree.h | 22 -- fs/nilfs2/cpfile.c | 26 +++ fs/nilfs2/cpfile.h | 3 + fs/nilfs2/dat.c | 47 +++++ fs/nilfs2/dat.h | 3 + fs/nilfs2/dir.c | 24 +-- fs/nilfs2/gcdat.c | 3 + fs/nilfs2/gcinode.c | 6 +- fs/nilfs2/ifile.c | 35 ++++ fs/nilfs2/ifile.h | 2 + fs/nilfs2/inode.c | 7 +- fs/nilfs2/mdt.c | 56 ++++-- fs/nilfs2/mdt.h | 25 +-- fs/nilfs2/namei.c | 83 +++++--- fs/nilfs2/recovery.c | 34 ++-- fs/nilfs2/segbuf.c | 185 ++++++++++++----- fs/nilfs2/segbuf.h | 54 ++---- fs/nilfs2/segment.c | 369 ++++++++++++++++------------------ fs/nilfs2/segment.h | 2 + fs/nilfs2/sufile.c | 203 ++++++++++--------- fs/nilfs2/sufile.h | 14 +- fs/nilfs2/super.c | 88 +++------ fs/nilfs2/the_nilfs.c | 157 ++++++++------- fs/nilfs2/the_nilfs.h | 10 + include/linux/nilfs2_fs.h | 24 +++ 32 files changed, 1026 insertions(+), 788 deletions(-) Merging ocfs2/linux-next $ git merge ocfs2/linux-next Auto-merging fs/ocfs2/alloc.c Auto-merging fs/ocfs2/refcounttree.c Merge made by recursive. fs/ocfs2/Kconfig | 10 +--- fs/ocfs2/Makefile | 7 +-- fs/ocfs2/acl.h | 22 ------ fs/ocfs2/alloc.c | 10 ++-- fs/ocfs2/alloc.h | 5 ++ fs/ocfs2/cluster/nodemanager.c | 51 ++++++++++++++ fs/ocfs2/cluster/nodemanager.h | 7 ++ fs/ocfs2/cluster/quorum.c | 16 ++++- fs/ocfs2/dlm/dlmrecovery.c | 18 +++--- fs/ocfs2/ocfs2.h | 8 ++- fs/ocfs2/refcounttree.c | 150 +++++++++++++++++++++++++++++++--------- fs/ocfs2/super.c | 95 +++++++++++++------------- fs/ocfs2/xattr.c | 4 - fs/ocfs2/xattr.h | 2 - 14 files changed, 264 insertions(+), 141 deletions(-) Merging squashfs/master $ git merge squashfs/master Already up-to-date. Merging udf/for_next $ git merge udf/for_next Merge made by recursive. fs/udf/balloc.c | 2 +- fs/udf/file.c | 1 + fs/udf/inode.c | 24 ++++++++++++------------ fs/udf/namei.c | 38 ++++++++++++++++++++++++++++---------- fs/udf/super.c | 32 ++++++++++++++++++++++++-------- 5 files changed, 66 insertions(+), 31 deletions(-) Merging v9fs/for-next $ git merge v9fs/for-next Resolved 'fs/9p/cache.c' using previous resolution. Auto-merging fs/9p/cache.c CONFLICT (add/add): Merge conflict in fs/9p/cache.c Auto-merging fs/9p/vfs_inode.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master ac51feb] Merge remote branch 'v9fs/for-next' $ git diff -M --stat --summary HEAD^.. Merging ubifs/linux-next $ git merge ubifs/linux-next Already up-to-date. Merging xfs/master $ git merge xfs/master Auto-merging fs/xfs/linux-2.6/xfs_aops.c Auto-merging fs/xfs/linux-2.6/xfs_lrw.c Merge made by recursive. fs/xfs/linux-2.6/xfs_aops.c | 114 ++++++++++++++---------------------------- fs/xfs/linux-2.6/xfs_buf.c | 14 +++--- fs/xfs/linux-2.6/xfs_buf.h | 9 +--- fs/xfs/linux-2.6/xfs_file.c | 4 +- fs/xfs/linux-2.6/xfs_iops.c | 6 +- fs/xfs/linux-2.6/xfs_lrw.c | 5 -- fs/xfs/linux-2.6/xfs_super.c | 71 +++++++++++++++++--------- fs/xfs/linux-2.6/xfs_sync.c | 15 ++---- fs/xfs/linux-2.6/xfs_sync.h | 1 - fs/xfs/linux-2.6/xfs_vnode.h | 1 - fs/xfs/support/debug.h | 18 ------- fs/xfs/xfs_attr.c | 16 ++++-- fs/xfs/xfs_attr.h | 1 - fs/xfs/xfs_attr_leaf.c | 2 +- fs/xfs/xfs_bmap_btree.c | 3 +- fs/xfs/xfs_filestream.h | 8 ++-- fs/xfs/xfs_fsops.c | 25 +++++---- fs/xfs/xfs_ialloc.c | 2 +- fs/xfs/xfs_iget.c | 5 ++- fs/xfs/xfs_iomap.c | 9 +++- fs/xfs/xfs_log_recover.c | 40 ++++++--------- fs/xfs/xfs_mount.c | 18 +++--- fs/xfs/xfs_mount.h | 27 ++++++++-- fs/xfs/xfs_rw.c | 30 ++++++++++-- fs/xfs/xfs_rw.h | 29 +---------- fs/xfs/xfs_trans.c | 7 ++- fs/xfs/xfs_trans.h | 2 +- fs/xfs/xfs_trans_buf.c | 13 ++--- fs/xfs/xfs_vnodeops.c | 79 ++++++++++------------------- fs/xfs/xfs_vnodeops.h | 1 - 30 files changed, 254 insertions(+), 321 deletions(-) Merging reiserfs-bkl/reiserfs/kill-bkl $ git merge reiserfs-bkl/reiserfs/kill-bkl Already uptodate! Merge made by recursive. Merging vfs/for-next $ git merge vfs/for-next Already up-to-date. Merging pci/linux-next $ git merge pci/linux-next Resolved 'arch/x86/kernel/amd_iommu_init.c' using previous resolution. Resolved 'drivers/pci/dmar.c' using previous resolution. Resolved 'drivers/pci/hotplug/acpiphp_glue.c' using previous resolution. Auto-merging arch/x86/kernel/amd_iommu_init.c CONFLICT (content): Merge conflict in arch/x86/kernel/amd_iommu_init.c Auto-merging arch/x86/xen/enlighten.c Auto-merging drivers/char/hvc_xen.c Auto-merging drivers/pci/dmar.c CONFLICT (content): Merge conflict in drivers/pci/dmar.c Auto-merging drivers/pci/hotplug/acpi_pcihp.c Auto-merging drivers/pci/hotplug/acpiphp_glue.c CONFLICT (content): Merge conflict in drivers/pci/hotplug/acpiphp_glue.c Auto-merging drivers/pci/intel-iommu.c Auto-merging drivers/pci/intr_remapping.c Auto-merging drivers/pci/pcie/aspm.c Auto-merging drivers/pcmcia/cardbus.c Auto-merging drivers/video/xen-fbfront.c Auto-merging drivers/xen/balloon.c Auto-merging drivers/xen/cpu_hotplug.c Auto-merging drivers/xen/xenbus/xenbus_probe.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 14e53a3] Merge remote branch 'pci/linux-next' $ git diff -M --stat --summary HEAD^.. arch/ia64/include/asm/xen/hypervisor.h | 28 +--- arch/ia64/pci/pci.c | 33 ++- arch/sparc/include/asm/pci_64.h | 2 - arch/sparc/kernel/pci.c | 7 + arch/x86/include/asm/pci_x86.h | 20 ++- arch/x86/include/asm/xen/hypervisor.h | 27 --- arch/x86/kernel/amd_iommu_init.c | 2 + arch/x86/pci/Makefile | 5 + arch/x86/pci/acpi.c | 74 ++++++-- arch/x86/pci/amd_bus.c | 120 +---------- arch/x86/pci/bus_numa.c | 101 +++++++++ arch/x86/pci/bus_numa.h | 27 +++ arch/x86/pci/common.c | 20 +- arch/x86/pci/early.c | 7 - arch/x86/pci/i386.c | 42 +++- arch/x86/pci/intel_bus.c | 90 ++++++++ arch/x86/pci/mmconfig-shared.c | 356 ++++++++++++++++---------------- arch/x86/pci/mmconfig_32.c | 16 +- arch/x86/pci/mmconfig_64.c | 88 ++------ arch/x86/xen/enlighten.c | 6 + drivers/acpi/Makefile | 1 + drivers/acpi/hest.c | 135 ++++++++++++ drivers/block/xen-blkfront.c | 1 + drivers/char/hvc_xen.c | 2 + drivers/input/xen-kbdfront.c | 3 + drivers/net/xen-netfront.c | 1 + drivers/pci/Kconfig | 15 +- drivers/pci/Makefile | 2 + drivers/pci/dmar.c | 7 +- drivers/pci/hotplug/Makefile | 12 +- drivers/pci/hotplug/acpi_pcihp.c | 5 +- drivers/pci/hotplug/acpiphp.h | 6 - drivers/pci/hotplug/acpiphp_glue.c | 248 ++--------------------- drivers/pci/hotplug/ibmphp_hpc.c | 3 +- drivers/pci/hotplug/pci_hotplug_core.c | 22 +- drivers/pci/hotplug/pciehp.h | 1 - drivers/pci/hotplug/pciehp_acpi.c | 3 +- drivers/pci/hotplug/pciehp_core.c | 119 ++++------- drivers/pci/hotplug/pciehp_ctrl.c | 57 +----- drivers/pci/hotplug/pciehp_hpc.c | 155 +++++--------- drivers/pci/hotplug/pcihp_slot.c | 4 +- drivers/pci/intel-iommu.c | 10 +- drivers/pci/intr_remapping.c | 4 +- drivers/pci/ioapic.c | 127 ++++++++++++ drivers/pci/iov.c | 2 +- drivers/pci/pci-acpi.c | 4 +- drivers/pci/pci-sysfs.c | 25 +++ drivers/pci/pci.c | 154 ++++++++++----- drivers/pci/pci.h | 2 + drivers/pci/pcie/aer/aer_inject.c | 58 ++++-- drivers/pci/pcie/aer/aerdrv.c | 4 +- drivers/pci/pcie/aer/aerdrv_core.c | 70 +++---- drivers/pci/pcie/aer/ecrc.c | 4 +- drivers/pci/pcie/aspm.c | 41 ++-- drivers/pci/pcie/portdrv.h | 21 +-- drivers/pci/pcie/portdrv_bus.c | 7 +- drivers/pci/pcie/portdrv_core.c | 239 ++++++++-------------- drivers/pci/pcie/portdrv_pci.c | 14 +- drivers/pci/probe.c | 83 +++++--- drivers/pci/quirks.c | 40 ++++- drivers/pci/search.c | 38 ++-- drivers/pci/setup-bus.c | 112 +++++------ drivers/pci/setup-res.c | 68 +++--- drivers/pcmcia/cardbus.c | 23 ++- drivers/pnp/quirks.c | 13 +- drivers/pnp/resource.c | 10 +- drivers/pnp/support.c | 43 +---- drivers/pnp/system.c | 14 +- drivers/video/xen-fbfront.c | 3 + drivers/xen/balloon.c | 2 + drivers/xen/cpu_hotplug.c | 1 + drivers/xen/evtchn.c | 2 + drivers/xen/grant-table.c | 1 + drivers/xen/sys-hypervisor.c | 1 + drivers/xen/xenbus/xenbus_probe.c | 2 + drivers/xen/xenfs/super.c | 2 + include/acpi/acpi_hest.h | 12 + include/linux/pci.h | 42 ++++- include/linux/pci_regs.h | 18 ++ include/linux/pcieport_if.h | 16 +-- include/xen/xen.h | 32 +++ kernel/resource.c | 26 ++- lib/vsprintf.c | 87 +++++++-- 83 files changed, 1786 insertions(+), 1564 deletions(-) create mode 100644 arch/x86/pci/bus_numa.c create mode 100644 arch/x86/pci/bus_numa.h create mode 100644 arch/x86/pci/intel_bus.c create mode 100644 drivers/acpi/hest.c create mode 100644 drivers/pci/ioapic.c create mode 100644 include/acpi/acpi_hest.h create mode 100644 include/xen/xen.h Merging hid/for-next $ git merge hid/for-next Already up-to-date. Merging quilt/i2c $ git merge quilt/i2c Merge made by recursive. Documentation/i2c/writing-clients | 2 +- drivers/hwmon/adm1021.c | 11 ++-- drivers/hwmon/adm1025.c | 12 ++--- drivers/hwmon/adm1026.c | 11 ++--- drivers/hwmon/adm1029.c | 14 ++---- drivers/hwmon/adm1031.c | 9 ++-- drivers/hwmon/adm9240.c | 9 ++-- drivers/hwmon/ads7828.c | 13 ++--- drivers/hwmon/adt7462.c | 11 ++--- drivers/hwmon/adt7470.c | 11 ++--- drivers/hwmon/adt7473.c | 11 ++--- drivers/hwmon/adt7475.c | 6 +- drivers/hwmon/asb100.c | 11 ++--- drivers/hwmon/atxp1.c | 11 ++--- drivers/hwmon/dme1737.c | 10 +--- drivers/hwmon/ds1621.c | 9 ++-- drivers/hwmon/f75375s.c | 9 ++-- drivers/hwmon/fschmd.c | 9 ++-- drivers/hwmon/gl518sm.c | 11 ++--- drivers/hwmon/gl520sm.c | 13 ++---- drivers/hwmon/lm63.c | 15 ++---- drivers/hwmon/lm73.c | 9 +-- drivers/hwmon/lm75.c | 14 ++---- drivers/hwmon/lm77.c | 12 ++--- drivers/hwmon/lm78.c | 9 ++-- drivers/hwmon/lm80.c | 13 ++---- drivers/hwmon/lm83.c | 12 ++--- drivers/hwmon/lm85.c | 16 +++--- drivers/hwmon/lm87.c | 12 ++--- drivers/hwmon/lm90.c | 14 ++---- drivers/hwmon/lm92.c | 9 +-- drivers/hwmon/lm93.c | 8 +-- drivers/hwmon/lm95241.c | 9 +-- drivers/hwmon/max1619.c | 14 ++---- drivers/hwmon/max6650.c | 10 ++-- drivers/hwmon/pcf8591.c | 5 +- drivers/hwmon/smsc47m192.c | 11 ++--- drivers/hwmon/thmc50.c | 8 ++-- drivers/hwmon/tmp401.c | 9 ++-- drivers/hwmon/tmp421.c | 7 +-- drivers/hwmon/w83781d.c | 10 ++-- drivers/hwmon/w83791d.c | 9 ++-- drivers/hwmon/w83792d.c | 9 ++-- drivers/hwmon/w83793.c | 9 ++-- drivers/hwmon/w83l785ts.c | 14 ++---- drivers/hwmon/w83l786ng.c | 10 ++-- drivers/i2c/busses/i2c-scmi.c | 33 ++++++++++--- drivers/i2c/i2c-core.c | 17 +++---- drivers/misc/eeprom/eeprom.c | 8 +-- drivers/misc/ics932s401.c | 11 ++--- include/linux/i2c.h | 92 +----------------------------------- 51 files changed, 222 insertions(+), 419 deletions(-) Merging bjdooks-i2c/next-i2c $ git merge bjdooks-i2c/next-i2c Already up-to-date. Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Merge made by recursive. Documentation/hwmon/k10temp | 60 +++++++ drivers/hwmon/Kconfig | 20 +++ drivers/hwmon/Makefile | 2 + drivers/hwmon/k10temp.c | 197 ++++++++++++++++++++++++ drivers/hwmon/smsc47m1.c | 153 +++++++++++++++--- drivers/hwmon/via-cputemp.c | 356 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 762 insertions(+), 26 deletions(-) create mode 100644 Documentation/hwmon/k10temp create mode 100644 drivers/hwmon/k10temp.c create mode 100644 drivers/hwmon/via-cputemp.c Merging quilt/kernel-doc $ git merge quilt/kernel-doc Already up-to-date. Merging v4l-dvb/master $ git merge v4l-dvb/master Merge made by recursive. Documentation/DocBook/media-entities.tmpl | 18 + Documentation/DocBook/media-indices.tmpl | 4 + Documentation/DocBook/v4l/common.xml | 35 + Documentation/DocBook/v4l/compat.xml | 16 +- Documentation/DocBook/v4l/v4l2.xml | 26 +- Documentation/DocBook/v4l/videodev2.h.xml | 116 ++- .../DocBook/v4l/vidioc-enum-dv-presets.xml | 238 +++ Documentation/DocBook/v4l/vidioc-enuminput.xml | 36 +- Documentation/DocBook/v4l/vidioc-enumoutput.xml | 36 +- Documentation/DocBook/v4l/vidioc-g-dv-preset.xml | 111 ++ Documentation/DocBook/v4l/vidioc-g-dv-timings.xml | 224 +++ .../DocBook/v4l/vidioc-query-dv-preset.xml | 85 ++ Documentation/video4linux/gspca.txt | 34 +- Documentation/video4linux/v4l2-framework.txt | 16 +- drivers/media/common/ir-keymaps.c | 219 ++- drivers/media/common/ir-keytable.c | 3 + drivers/media/common/saa7146_fops.c | 60 +- drivers/media/common/tuners/tuner-xc2028.c | 20 +- drivers/media/common/tuners/tuner-xc2028.h | 2 + drivers/media/dvb/dvb-usb/dib0700.h | 26 +- drivers/media/dvb/dvb-usb/dib0700_core.c | 101 ++- drivers/media/dvb/dvb-usb/dib0700_devices.c | 725 +++++++--- drivers/media/dvb/dvb-usb/dibusb-common.c | 15 +- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 3 + drivers/media/dvb/dvb-usb/friio-fe.c | 10 +- drivers/media/dvb/dvb-usb/gp8psk-fe.c | 4 +- drivers/media/dvb/frontends/Kconfig | 9 + drivers/media/dvb/frontends/Makefile | 1 + drivers/media/dvb/frontends/dib0070.c | 674 +++++---- drivers/media/dvb/frontends/dib0070.h | 4 +- drivers/media/dvb/frontends/dib0090.c | 1522 +++++++++++++++++++ drivers/media/dvb/frontends/dib0090.h | 114 ++ drivers/media/dvb/frontends/dib8000.c | 95 +- drivers/media/dvb/frontends/dib8000.h | 32 +- drivers/media/dvb/frontends/dibx000_common.c | 15 +- drivers/media/dvb/frontends/dibx000_common.h | 71 +- drivers/media/dvb/siano/smsusb.c | 10 + drivers/media/radio/radio-aimslab.c | 4 + drivers/media/radio/radio-aztech.c | 4 + drivers/media/radio/radio-gemtek-pci.c | 4 + drivers/media/radio/radio-maestro.c | 4 + drivers/media/radio/radio-maxiradio.c | 4 + drivers/media/radio/radio-mr800.c | 4 + drivers/media/radio/radio-rtrack2.c | 4 + drivers/media/radio/radio-sf16fmi.c | 4 + drivers/media/radio/radio-sf16fmr2.c | 4 + drivers/media/radio/radio-tea5764.c | 8 +- drivers/media/radio/radio-terratec.c | 4 + drivers/media/radio/radio-trust.c | 4 + drivers/media/radio/radio-typhoon.c | 4 + drivers/media/radio/radio-zoltrix.c | 4 + drivers/media/video/arv.c | 5 +- drivers/media/video/au0828/au0828-video.c | 36 +- drivers/media/video/au0828/au0828.h | 1 - drivers/media/video/bt8xx/bttv-driver.c | 41 +- drivers/media/video/c-qcam.c | 4 +- drivers/media/video/cafe_ccic.c | 1 - drivers/media/video/cpia.c | 221 ++-- drivers/media/video/cpia2/cpia2_v4l.c | 7 +- drivers/media/video/cx18/cx18-fileops.c | 4 +- drivers/media/video/cx18/cx18-streams.c | 20 +- drivers/media/video/cx231xx/cx231xx-cards.c | 5 +- drivers/media/video/cx231xx/cx231xx-core.c | 26 - drivers/media/video/cx231xx/cx231xx-video.c | 58 +- drivers/media/video/cx231xx/cx231xx.h | 2 - drivers/media/video/cx23885/cx23885-417.c | 29 +- drivers/media/video/cx23885/cx23885-core.c | 11 - drivers/media/video/cx23885/cx23885-video.c | 57 +- drivers/media/video/cx23885/cx23885.h | 3 - drivers/media/video/cx88/cx88-blackbird.c | 26 +- drivers/media/video/cx88/cx88-mpeg.c | 15 - drivers/media/video/cx88/cx88-video.c | 68 +- drivers/media/video/cx88/cx88.h | 2 - drivers/media/video/davinci/vpfe_capture.c | 3 +- drivers/media/video/davinci/vpif_display.c | 1 - drivers/media/video/em28xx/em28xx-cards.c | 7 +- drivers/media/video/em28xx/em28xx-core.c | 30 +- drivers/media/video/em28xx/em28xx-input.c | 58 +- drivers/media/video/em28xx/em28xx-video.c | 59 +- drivers/media/video/em28xx/em28xx.h | 5 +- drivers/media/video/et61x251/et61x251_core.c | 45 +- drivers/media/video/gspca/gl860/gl860.c | 4 +- drivers/media/video/gspca/gspca.c | 61 +- drivers/media/video/gspca/gspca.h | 10 + drivers/media/video/gspca/pac7302.c | 21 +- drivers/media/video/gspca/sn9c20x.c | 5 +- drivers/media/video/gspca/stk014.c | 106 +- drivers/media/video/gspca/sunplus.c | 237 ++-- drivers/media/video/gspca/zc3xx.c | 37 +- drivers/media/video/hdpvr/hdpvr-core.c | 10 +- drivers/media/video/hdpvr/hdpvr-video.c | 2 +- drivers/media/video/ir-kbd-i2c.c | 3 +- drivers/media/video/ivtv/ivtv-fileops.c | 4 +- drivers/media/video/ivtv/ivtv-streams.c | 19 +- drivers/media/video/meye.c | 1 - drivers/media/video/omap24xxcam.c | 10 +- drivers/media/video/ov511.c | 7 +- drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 21 +- drivers/media/video/pwc/pwc-if.c | 3 +- drivers/media/video/s2255drv.c | 55 +- drivers/media/video/saa5246a.c | 1 - drivers/media/video/saa7134/saa7134-cards.c | 22 + drivers/media/video/saa7134/saa7134-core.c | 19 +- drivers/media/video/saa7134/saa7134-empress.c | 20 +- drivers/media/video/saa7134/saa7134-input.c | 62 + drivers/media/video/saa7134/saa7134-video.c | 39 +- drivers/media/video/se401.c | 4 +- drivers/media/video/sn9c102/sn9c102_core.c | 47 +- drivers/media/video/soc_camera.c | 4 +- drivers/media/video/stk-webcam.c | 9 +- drivers/media/video/stradis.c | 4 +- drivers/media/video/stv680.c | 5 +- drivers/media/video/usbvideo/usbvideo.c | 4 +- drivers/media/video/usbvideo/vicam.c | 5 +- drivers/media/video/usbvision/usbvision-i2c.c | 4 +- drivers/media/video/usbvision/usbvision-video.c | 34 +- drivers/media/video/uvc/uvc_driver.c | 1 - drivers/media/video/v4l2-compat-ioctl32.c | 6 + drivers/media/video/v4l2-dev.c | 22 +- drivers/media/video/v4l2-ioctl.c | 147 ++ drivers/media/video/vino.c | 1 - drivers/media/video/vivi.c | 22 +- drivers/media/video/w9968cf.c | 34 +- drivers/media/video/zc0301/zc0301_core.c | 44 +- drivers/media/video/zoran/zoran_driver.c | 1 - drivers/media/video/zr364xx.c | 5 +- drivers/staging/cx25821/cx25821-audups11.c | 33 +- drivers/staging/cx25821/cx25821-video.c | 6 +- drivers/staging/cx25821/cx25821-video0.c | 33 +- drivers/staging/cx25821/cx25821-video1.c | 33 +- drivers/staging/cx25821/cx25821-video2.c | 34 +- drivers/staging/cx25821/cx25821-video3.c | 34 +- drivers/staging/cx25821/cx25821-video4.c | 34 +- drivers/staging/cx25821/cx25821-video5.c | 34 +- drivers/staging/cx25821/cx25821-video6.c | 34 +- drivers/staging/cx25821/cx25821-video7.c | 34 +- drivers/staging/cx25821/cx25821-videoioctl.c | 32 +- drivers/staging/cx25821/cx25821-vidups10.c | 33 +- drivers/staging/cx25821/cx25821-vidups9.c | 33 +- drivers/staging/go7007/go7007-v4l2.c | 5 +- drivers/staging/tm6000/Kconfig | 32 + drivers/staging/tm6000/Makefile | 15 + drivers/staging/tm6000/README | 11 + drivers/staging/tm6000/hack.c | 252 ++++ drivers/staging/tm6000/hack.h | 45 + drivers/staging/tm6000/tm6000-alsa.c | 413 ++++++ drivers/staging/tm6000/tm6000-cards.c | 662 +++++++++ drivers/staging/tm6000/tm6000-core.c | 511 +++++++ drivers/staging/tm6000/tm6000-dvb.c | 322 ++++ drivers/staging/tm6000/tm6000-i2c.c | 245 +++ drivers/staging/tm6000/tm6000-regs.h | 86 ++ drivers/staging/tm6000/tm6000-stds.c | 873 +++++++++++ drivers/staging/tm6000/tm6000-usb-isoc.h | 53 + drivers/staging/tm6000/tm6000-video.c | 1550 ++++++++++++++++++++ drivers/staging/tm6000/tm6000.h | 278 ++++ include/linux/videodev2.h | 117 ++- include/media/ir-common.h | 12 +- include/media/saa7146_vv.h | 4 - include/media/v4l2-dev.h | 23 +- include/media/v4l2-ioctl.h | 15 + include/media/v4l2-subdev.h | 21 + 161 files changed, 10725 insertions(+), 2049 deletions(-) create mode 100644 Documentation/DocBook/v4l/vidioc-enum-dv-presets.xml create mode 100644 Documentation/DocBook/v4l/vidioc-g-dv-preset.xml create mode 100644 Documentation/DocBook/v4l/vidioc-g-dv-timings.xml create mode 100644 Documentation/DocBook/v4l/vidioc-query-dv-preset.xml create mode 100644 drivers/media/dvb/frontends/dib0090.c create mode 100644 drivers/media/dvb/frontends/dib0090.h create mode 100644 drivers/staging/tm6000/Kconfig create mode 100644 drivers/staging/tm6000/Makefile create mode 100644 drivers/staging/tm6000/README create mode 100644 drivers/staging/tm6000/hack.c create mode 100644 drivers/staging/tm6000/hack.h create mode 100644 drivers/staging/tm6000/tm6000-alsa.c create mode 100644 drivers/staging/tm6000/tm6000-cards.c create mode 100644 drivers/staging/tm6000/tm6000-core.c create mode 100644 drivers/staging/tm6000/tm6000-dvb.c create mode 100644 drivers/staging/tm6000/tm6000-i2c.c create mode 100644 drivers/staging/tm6000/tm6000-regs.h create mode 100644 drivers/staging/tm6000/tm6000-stds.c create mode 100644 drivers/staging/tm6000/tm6000-usb-isoc.h create mode 100644 drivers/staging/tm6000/tm6000-video.c create mode 100644 drivers/staging/tm6000/tm6000.h Merging kbuild/for-next $ git merge kbuild/for-next Auto-merging MAINTAINERS Auto-merging arch/arm/Makefile Auto-merging arch/powerpc/platforms/chrp/setup.c Auto-merging arch/sh/Makefile Removing arch/sh/include/asm/.gitignore Merge made by recursive. .gitignore | 7 +- Documentation/dontdiff | 1 + Documentation/kbuild/kbuild.txt | 14 + Documentation/kbuild/kconfig.txt | 8 +- Kbuild | 4 +- MAINTAINERS | 6 + Makefile | 96 ++----- arch/alpha/boot/bootp.c | 2 +- arch/alpha/boot/bootpz.c | 2 +- arch/alpha/boot/main.c | 2 +- arch/alpha/include/asm/asm-offsets.h | 1 + arch/arm/Makefile | 14 +- arch/arm/include/asm/asm-offsets.h | 1 + arch/arm/include/asm/mach-types.h | 1 + arch/arm/tools/Makefile | 2 +- arch/arm/tools/gen-mach-types | 2 +- arch/avr32/include/asm/asm-offsets.h | 1 + arch/blackfin/include/asm/asm-offsets.h | 1 + arch/cris/arch-v32/kernel/head.S | 1 - arch/cris/include/asm/asm-offsets.h | 1 + arch/cris/kernel/asm-offsets.c | 1 - arch/cris/kernel/vmlinux.lds.S | 1 - arch/frv/include/asm/asm-offsets.h | 1 + arch/frv/kernel/setup.c | 2 +- arch/h8300/include/asm/asm-offsets.h | 1 + arch/ia64/Makefile | 2 +- arch/ia64/include/asm/asm-offsets.h | 1 + arch/ia64/include/asm/irq.h | 2 +- arch/ia64/kernel/Makefile | 7 +- arch/ia64/kvm/asm-offsets.c | 1 - arch/m68k/include/asm/asm-offsets.h | 1 + arch/m68k/kernel/head.S | 2 +- arch/microblaze/include/asm/asm-offsets.h | 1 + arch/mips/include/asm/asm-offsets.h | 1 + arch/mn10300/include/asm/asm-offsets.h | 1 + arch/parisc/include/asm/asm-offsets.h | 1 + arch/powerpc/include/asm/asm-offsets.h | 1 + arch/powerpc/platforms/52xx/efika.c | 2 +- arch/powerpc/platforms/amigaone/setup.c | 2 +- arch/powerpc/platforms/cell/spufs/Makefile | 6 +- arch/powerpc/platforms/chrp/setup.c | 2 +- arch/powerpc/platforms/powermac/bootx_init.c | 2 +- arch/s390/include/asm/asm-offsets.h | 1 + arch/score/include/asm/asm-offsets.h | 1 + arch/sh/Makefile | 10 +- arch/sh/drivers/pci/fixups-rts7751r2d.c | 2 +- arch/sh/include/asm/.gitignore | 1 - arch/sh/include/asm/asm-offsets.h | 1 + arch/sh/include/asm/machvec.h | 2 +- arch/sh/tools/Makefile | 4 +- arch/sh/tools/gen-mach-types | 2 +- arch/sparc/include/asm/asm-offsets.h | 1 + arch/um/Makefile | 2 +- arch/um/include/asm/asm-offsets.h | 1 + arch/x86/boot/header.S | 2 +- arch/x86/boot/version.c | 4 +- arch/x86/include/asm/asm-offsets.h | 1 + arch/xtensa/include/asm/asm-offsets.h | 1 + drivers/accessibility/braille/braille_console.c | 1 - drivers/hid/hid-lg.h | 2 - drivers/platform/x86/compal-laptop.c | 1 - drivers/staging/iio/ring_sw.h | 1 - drivers/staging/panel/panel.c | 2 +- include/linux/Kbuild | 1 + include/linux/mmdebug.h | 2 - include/linux/mmzone.h | 2 +- include/linux/page-flags.h | 2 +- include/linux/vermagic.h | 2 +- init/Makefile | 8 +- init/version.c | 4 +- kernel/bounds.c | 2 +- kernel/kexec.c | 2 +- kernel/trace/trace.c | 2 +- scripts/Kbuild.include | 6 + scripts/Makefile.lib | 2 +- scripts/Makefile.modbuiltin | 55 ++++ scripts/basic/fixdep.c | 10 +- scripts/genksyms/keywords.c_shipped | 191 +++++++------ scripts/genksyms/keywords.gperf | 2 + scripts/headers.sh | 2 - scripts/kconfig/Makefile | 1 + scripts/kconfig/confdata.c | 24 ++- scripts/mkcompile_h | 2 +- scripts/package/Makefile | 20 ++- scripts/package/buildtar | 6 +- scripts/tags.sh | 8 +- scripts/unifdef.c | 343 ++++++++++++++--------- 87 files changed, 551 insertions(+), 399 deletions(-) create mode 100644 arch/alpha/include/asm/asm-offsets.h create mode 100644 arch/arm/include/asm/asm-offsets.h create mode 100644 arch/arm/include/asm/mach-types.h create mode 100644 arch/avr32/include/asm/asm-offsets.h create mode 100644 arch/blackfin/include/asm/asm-offsets.h create mode 100644 arch/cris/include/asm/asm-offsets.h create mode 100644 arch/frv/include/asm/asm-offsets.h create mode 100644 arch/h8300/include/asm/asm-offsets.h create mode 100644 arch/ia64/include/asm/asm-offsets.h create mode 100644 arch/m68k/include/asm/asm-offsets.h create mode 100644 arch/microblaze/include/asm/asm-offsets.h create mode 100644 arch/mips/include/asm/asm-offsets.h create mode 100644 arch/mn10300/include/asm/asm-offsets.h create mode 100644 arch/parisc/include/asm/asm-offsets.h create mode 100644 arch/powerpc/include/asm/asm-offsets.h create mode 100644 arch/s390/include/asm/asm-offsets.h create mode 100644 arch/score/include/asm/asm-offsets.h delete mode 100644 arch/sh/include/asm/.gitignore create mode 100644 arch/sh/include/asm/asm-offsets.h create mode 100644 arch/sparc/include/asm/asm-offsets.h create mode 100644 arch/um/include/asm/asm-offsets.h create mode 100644 arch/x86/include/asm/asm-offsets.h create mode 100644 arch/xtensa/include/asm/asm-offsets.h create mode 100644 scripts/Makefile.modbuiltin $ git am -3 ../patches/0001-net-fix-for-utsrelease.h-moving-to-generated.patch Applying: net: fix for utsrelease.h moving to generated $ git reset HEAD^ Unstaged changes after reset: M drivers/net/wireless/iwlwifi/iwl-core.h $ git add . $ git commit -v -a --amend [master 82824cc] Merge remote branch 'kbuild/for-next' Merging kconfig/for-next $ git merge kconfig/for-next Auto-merging Documentation/dontdiff Removing scripts/binoffset.c Merge made by recursive. Documentation/dontdiff | 1 - scripts/.gitignore | 1 - scripts/binoffset.c | 163 ---------------------------------------------- scripts/extract-ikconfig | 127 ++++++++++++----------------------- 4 files changed, 44 insertions(+), 248 deletions(-) delete mode 100644 scripts/binoffset.c Merging ide/master $ git merge ide/master Already up-to-date. Merging libata/NEXT $ git merge libata/NEXT Already up-to-date. Merging infiniband/for-next $ git merge infiniband/for-next Auto-merging drivers/infiniband/hw/cxgb3/cxio_hal.c Auto-merging drivers/infiniband/hw/mlx4/qp.c Auto-merging drivers/infiniband/hw/nes/nes_nic.c Merge made by recursive. Documentation/infiniband/ipoib.txt | 10 +- drivers/infiniband/core/addr.c | 275 ++++------ drivers/infiniband/core/cma.c | 133 +++-- drivers/infiniband/core/sa_query.c | 6 + drivers/infiniband/core/ucma.c | 57 ++- drivers/infiniband/core/uverbs_cmd.c | 2 +- drivers/infiniband/hw/amso1100/c2_qp.c | 14 +- drivers/infiniband/hw/cxgb3/cxio_hal.c | 1 - drivers/infiniband/hw/cxgb3/iwch_qp.c | 32 +- drivers/infiniband/hw/ehca/ehca_classes.h | 1 + drivers/infiniband/hw/ehca/ehca_eq.c | 9 +- drivers/infiniband/hw/ehca/ehca_main.c | 2 +- drivers/infiniband/hw/ehca/ehca_reqs.c | 67 +-- drivers/infiniband/hw/ipath/ipath_driver.c | 10 +- drivers/infiniband/hw/mlx4/main.c | 2 +- drivers/infiniband/hw/mlx4/qp.c | 25 +- drivers/infiniband/hw/nes/Kconfig | 9 +- drivers/infiniband/hw/nes/nes.c | 5 +- drivers/infiniband/hw/nes/nes.h | 2 +- drivers/infiniband/hw/nes/nes_cm.c | 201 +++++-- drivers/infiniband/hw/nes/nes_cm.h | 7 +- drivers/infiniband/hw/nes/nes_context.h | 2 +- drivers/infiniband/hw/nes/nes_hw.c | 40 +- drivers/infiniband/hw/nes/nes_hw.h | 29 +- drivers/infiniband/hw/nes/nes_nic.c | 2 +- drivers/infiniband/hw/nes/nes_user.h | 3 +- drivers/infiniband/hw/nes/nes_utils.c | 2 +- drivers/infiniband/hw/nes/nes_verbs.c | 817 ++++++++++++++-------------- drivers/infiniband/hw/nes/nes_verbs.h | 23 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 1 + drivers/infiniband/ulp/iser/iser_memory.c | 122 ++--- drivers/net/mlx4/fw.c | 3 +- include/linux/mlx4/device.h | 1 + include/rdma/ib_addr.h | 36 +- include/rdma/ib_sa.h | 6 + include/rdma/ib_user_sa.h | 16 + include/rdma/ib_verbs.h | 5 + include/rdma/rdma_user_cm.h | 6 +- net/rds/ib.c | 4 +- net/rds/iw.c | 4 +- 40 files changed, 1084 insertions(+), 908 deletions(-) Merging acpi/test $ git merge acpi/test Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. Auto-merging Documentation/feature-removal-schedule.txt CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt Auto-merging arch/x86/kernel/reboot.c Auto-merging drivers/misc/Kconfig Auto-merging drivers/platform/x86/thinkpad_acpi.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 37b06a2] Merge remote branch 'acpi/test' $ git diff -M --stat --summary HEAD^.. Documentation/feature-removal-schedule.txt | 20 + Documentation/laptops/thinkpad-acpi.txt | 51 +- Documentation/thermal/sysfs-api.txt | 1 + arch/x86/kernel/reboot.c | 2 +- drivers/acpi/fan.c | 1 + drivers/acpi/osl.c | 2 +- drivers/acpi/processor_core.c | 6 +- drivers/acpi/processor_perflib.c | 50 +- drivers/acpi/thermal.c | 7 + drivers/misc/Kconfig | 13 - drivers/platform/x86/Kconfig | 2 + drivers/platform/x86/asus-laptop.c | 21 +- drivers/platform/x86/asus_acpi.c | 19 +- drivers/platform/x86/dell-laptop.c | 86 ++- drivers/platform/x86/dell-wmi.c | 129 +++- drivers/platform/x86/eeepc-laptop.c | 1415 +++++++++++++++------------ drivers/platform/x86/hp-wmi.c | 139 ++-- drivers/platform/x86/thinkpad_acpi.c | 161 ++-- drivers/platform/x86/wmi.c | 175 ++++- drivers/thermal/thermal_sys.c | 17 +- include/acpi/processor.h | 5 +- include/linux/acpi.h | 2 +- 22 files changed, 1443 insertions(+), 881 deletions(-) Merging ieee1394/for-next $ git merge ieee1394/for-next Resolved 'drivers/media/dvb/firewire/firedtv-1394.c' using previous resolution. Resolved 'drivers/media/dvb/firewire/firedtv-avc.c' using previous resolution. Resolved 'drivers/media/dvb/firewire/firedtv-fw.c' using previous resolution. Resolved 'drivers/media/dvb/firewire/firedtv.h' using previous resolution. Auto-merging drivers/media/dvb/firewire/firedtv-1394.c CONFLICT (content): Merge conflict in drivers/media/dvb/firewire/firedtv-1394.c Auto-merging drivers/media/dvb/firewire/firedtv-avc.c CONFLICT (content): Merge conflict in drivers/media/dvb/firewire/firedtv-avc.c Auto-merging drivers/media/dvb/firewire/firedtv-dvb.c Auto-merging drivers/media/dvb/firewire/firedtv-fw.c CONFLICT (add/add): Merge conflict in drivers/media/dvb/firewire/firedtv-fw.c Auto-merging drivers/media/dvb/firewire/firedtv.h CONFLICT (content): Merge conflict in drivers/media/dvb/firewire/firedtv.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 5b72e06] Merge remote branch 'ieee1394/for-next' $ git diff -M --stat --summary HEAD^.. drivers/media/dvb/firewire/firedtv-1394.c | 9 +- drivers/media/dvb/firewire/firedtv-avc.c | 514 ++++++++++++++++------------- drivers/media/dvb/firewire/firedtv-dvb.c | 1 - drivers/media/dvb/firewire/firedtv-fw.c | 2 +- drivers/media/dvb/firewire/firedtv.h | 6 +- 5 files changed, 286 insertions(+), 246 deletions(-) Merging ubi/linux-next $ git merge ubi/linux-next Merge made by recursive. Merging kvm/linux-next $ git merge kvm/linux-next Merge made by recursive. arch/x86/kvm/paging_tmpl.h | 18 ------------------ 1 files changed, 0 insertions(+), 18 deletions(-) Merging dlm/next $ git merge dlm/next Already up-to-date. Merging scsi/master $ git merge scsi/master Merge made by recursive. drivers/message/fusion/mptbase.c | 6 +- drivers/misc/enclosure.c | 1 + drivers/scsi/Kconfig | 10 + drivers/scsi/Makefile | 1 + drivers/scsi/be2iscsi/be_cmds.c | 12 +- drivers/scsi/bnx2i/bnx2i.h | 1 + drivers/scsi/bnx2i/bnx2i_hwi.c | 51 +- drivers/scsi/bnx2i/bnx2i_init.c | 16 +- drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 - drivers/scsi/cxgb3i/cxgb3i_offload.c | 24 +- drivers/scsi/cxgb3i/cxgb3i_pdu.c | 4 +- drivers/scsi/device_handler/scsi_dh_rdac.c | 2 + drivers/scsi/fcoe/fcoe.c | 25 +- drivers/scsi/hpsa.c | 3531 ++++++++++++++++++++++++++++ drivers/scsi/hpsa.h | 273 +++ drivers/scsi/hpsa_cmd.h | 326 +++ drivers/scsi/ipr.c | 1 + drivers/scsi/lpfc/lpfc_init.c | 16 +- drivers/scsi/megaraid/megaraid_sas.c | 14 +- drivers/scsi/mpt2sas/mpt2sas_base.c | 5 + drivers/scsi/mvsas/mv_init.c | 1 + drivers/scsi/osd/osd_initiator.c | 88 +- drivers/scsi/pm8001/pm8001_ctl.h | 10 - drivers/scsi/pm8001/pm8001_hwi.c | 151 +- drivers/scsi/pm8001/pm8001_hwi.h | 3 +- drivers/scsi/pm8001/pm8001_init.c | 19 +- drivers/scsi/pm8001/pm8001_sas.c | 57 +- drivers/scsi/pm8001/pm8001_sas.h | 32 +- drivers/scsi/pmcraid.c | 34 +- drivers/scsi/pmcraid.h | 5 +- drivers/scsi/qla2xxx/qla_def.h | 5 +- drivers/scsi/qla2xxx/qla_gbl.h | 2 - drivers/scsi/qla2xxx/qla_init.c | 12 +- drivers/scsi/qla2xxx/qla_isr.c | 103 +- drivers/scsi/qla2xxx/qla_mid.c | 4 + drivers/scsi/qla2xxx/qla_os.c | 75 +- drivers/scsi/qla2xxx/qla_version.h | 2 +- drivers/scsi/scsi_lib.c | 1 + drivers/scsi/scsi_transport_fc.c | 17 +- drivers/scsi/sd.c | 107 + drivers/scsi/sd.h | 2 + drivers/scsi/st.c | 23 +- drivers/scsi/st.h | 1 + include/linux/enclosure.h | 2 + include/scsi/osd_initiator.h | 5 +- 45 files changed, 4757 insertions(+), 325 deletions(-) create mode 100644 drivers/scsi/hpsa.c create mode 100644 drivers/scsi/hpsa.h create mode 100644 drivers/scsi/hpsa_cmd.h Merging async_tx/next $ git merge async_tx/next Auto-merging drivers/dma/Kconfig Merge made by recursive. arch/arm/mach-u300/include/mach/coh901318.h | 281 ++++++ drivers/dma/Kconfig | 7 + drivers/dma/Makefile | 1 + drivers/dma/coh901318.c | 1325 +++++++++++++++++++++++++++ drivers/dma/coh901318_lli.c | 318 +++++++ drivers/dma/coh901318_lli.h | 124 +++ 6 files changed, 2056 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-u300/include/mach/coh901318.h create mode 100644 drivers/dma/coh901318.c create mode 100644 drivers/dma/coh901318_lli.c create mode 100644 drivers/dma/coh901318_lli.h Merging net/master $ git merge net/master Already up-to-date. Merging wireless/master $ git merge wireless/master Already up-to-date. Merging mtd/master $ git merge mtd/master Resolved 'drivers/mtd/devices/m25p80.c' using previous resolution. Resolved 'drivers/mtd/maps/pcmciamtd.c' using previous resolution. Resolved 'drivers/mtd/nand/pxa3xx_nand.c' using previous resolution. Resolved 'kernel/printk.c' using previous resolution. Auto-merging arch/arm/mach-bcmring/arch.c Auto-merging arch/arm/mach-nomadik/board-nhk8815.c Auto-merging arch/arm/plat-s3c/include/plat/nand.h Auto-merging drivers/mtd/devices/m25p80.c CONFLICT (content): Merge conflict in drivers/mtd/devices/m25p80.c Auto-merging drivers/mtd/maps/Kconfig Auto-merging drivers/mtd/maps/Makefile Removing drivers/mtd/maps/ipaq-flash.c Auto-merging drivers/mtd/maps/pcmciamtd.c CONFLICT (content): Merge conflict in drivers/mtd/maps/pcmciamtd.c Auto-merging drivers/mtd/maps/sa1100-flash.c Auto-merging drivers/mtd/mtd_blkdevs.c Auto-merging drivers/mtd/nand/Kconfig Auto-merging drivers/mtd/nand/Makefile CONFLICT (delete/modify): drivers/mtd/nand/excite_nandflash.c deleted in HEAD and modified in mtd/master. Version mtd/master of drivers/mtd/nand/excite_nandflash.c left in tree. Auto-merging drivers/mtd/nand/nand_ecc.c Auto-merging drivers/mtd/nand/pxa3xx_nand.c CONFLICT (content): Merge conflict in drivers/mtd/nand/pxa3xx_nand.c Auto-merging drivers/mtd/nand/s3c2410.c Auto-merging drivers/mtd/onenand/omap2.c Auto-merging fs/jffs2/readinode.c Auto-merging kernel/panic.c Auto-merging kernel/printk.c CONFLICT (content): Merge conflict in kernel/printk.c Automatic merge failed; fix conflicts and then commit the result. $ git rm -f drivers/mtd/nand/excite_nandflash.c drivers/mtd/devices/m25p80.c: needs merge drivers/mtd/maps/pcmciamtd.c: needs merge drivers/mtd/nand/excite_nandflash.c: needs merge drivers/mtd/nand/pxa3xx_nand.c: needs merge kernel/printk.c: needs merge rm 'drivers/mtd/nand/excite_nandflash.c' $ git commit -v -a [master 1d29511] Merge remote branch 'mtd/master' $ git diff -M --stat --summary HEAD^.. arch/arm/mach-bcmring/arch.c | 10 + arch/arm/mach-bcmring/include/mach/reg_nand.h | 66 ++ arch/arm/mach-bcmring/include/mach/reg_umi.h | 237 ++++++++ arch/arm/mach-davinci/include/mach/nand.h | 4 + arch/arm/mach-nomadik/board-nhk8815.c | 11 +- arch/arm/plat-mxc/include/mach/mxc_nand.h | 3 +- arch/arm/plat-s3c/include/plat/nand.h | 2 + drivers/mtd/chips/cfi_cmdset_0001.c | 35 +- drivers/mtd/chips/cfi_cmdset_0002.c | 17 +- drivers/mtd/chips/cfi_util.c | 7 + drivers/mtd/chips/jedec_probe.c | 8 +- drivers/mtd/devices/m25p80.c | 334 ++++++----- drivers/mtd/devices/mtd_dataflash.c | 19 +- drivers/mtd/maps/Kconfig | 6 - drivers/mtd/maps/Makefile | 2 +- drivers/mtd/maps/ipaq-flash.c | 460 --------------- drivers/mtd/maps/ixp4xx.c | 6 +- drivers/mtd/maps/physmap.c | 21 +- drivers/mtd/maps/sa1100-flash.c | 2 +- drivers/mtd/maps/vmu-flash.c | 9 +- drivers/mtd/mtd_blkdevs.c | 5 +- drivers/mtd/mtdcore.c | 2 +- drivers/mtd/mtdoops.c | 389 +++++++------ drivers/mtd/nand/Kconfig | 16 + drivers/mtd/nand/Makefile | 1 + drivers/mtd/nand/alauda.c | 11 +- drivers/mtd/nand/atmel_nand.c | 5 +- drivers/mtd/nand/bcm_umi_bch.c | 213 +++++++ drivers/mtd/nand/bcm_umi_nand.c | 581 ++++++++++++++++++ drivers/mtd/nand/davinci_nand.c | 4 +- drivers/mtd/nand/fsl_elbc_nand.c | 86 ++-- drivers/mtd/nand/fsl_upm.c | 2 +- drivers/mtd/nand/mxc_nand.c | 783 ++++++++++--------------- drivers/mtd/nand/nand_base.c | 141 ++++- drivers/mtd/nand/nand_bcm_umi.c | 149 +++++ drivers/mtd/nand/nand_bcm_umi.h | 358 +++++++++++ drivers/mtd/nand/nand_ecc.c | 25 +- drivers/mtd/nand/nandsim.c | 7 +- drivers/mtd/nand/plat_nand.c | 50 ++- drivers/mtd/nand/s3c2410.c | 2 +- drivers/mtd/nand/txx9ndfmc.c | 3 +- drivers/mtd/onenand/omap2.c | 22 +- drivers/mtd/onenand/onenand_base.c | 745 +++++++++++++++++++----- drivers/mtd/tests/Makefile | 1 + drivers/mtd/tests/mtd_nandecctest.c | 87 +++ drivers/mtd/tests/mtd_oobtest.c | 18 +- drivers/mtd/tests/mtd_pagetest.c | 1 + fs/jffs2/readinode.c | 2 +- fs/jffs2/summary.c | 2 +- include/linux/kmsg_dump.h | 60 ++ include/linux/mtd/bbm.h | 35 +- include/linux/mtd/cfi.h | 9 +- include/linux/mtd/flashchip.h | 9 + include/linux/mtd/nand.h | 97 +--- include/linux/mtd/nand_ecc.h | 10 +- include/linux/mtd/onenand.h | 23 +- include/linux/mtd/onenand_regs.h | 2 + kernel/panic.c | 3 + kernel/printk.c | 119 ++++ 59 files changed, 3603 insertions(+), 1734 deletions(-) create mode 100644 arch/arm/mach-bcmring/include/mach/reg_nand.h create mode 100644 arch/arm/mach-bcmring/include/mach/reg_umi.h delete mode 100644 drivers/mtd/maps/ipaq-flash.c create mode 100644 drivers/mtd/nand/bcm_umi_bch.c create mode 100644 drivers/mtd/nand/bcm_umi_nand.c create mode 100644 drivers/mtd/nand/nand_bcm_umi.c create mode 100644 drivers/mtd/nand/nand_bcm_umi.h create mode 100644 drivers/mtd/tests/mtd_nandecctest.c create mode 100644 include/linux/kmsg_dump.h Merging crypto/master $ git merge crypto/master Already up-to-date. Merging sound/for-next $ git merge sound/for-next Auto-merging sound/isa/opti9xx/opti92x-ad1848.c Merge made by recursive. sound/isa/opti9xx/opti92x-ad1848.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) Merging cpufreq/next $ git merge cpufreq/next Resolved 'include/acpi/processor.h' using previous resolution. Auto-merging Documentation/ABI/testing/sysfs-devices-system-cpu Auto-merging drivers/acpi/processor_perflib.c Auto-merging include/acpi/processor.h CONFLICT (content): Merge conflict in include/acpi/processor.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 92942ee] Merge remote branch 'cpufreq/next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-devices-system-cpu | 18 +++ Documentation/cpu-freq/cpu-drivers.txt | 6 +- Documentation/cpu-freq/user-guide.txt | 11 ++ arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 17 ++-- arch/x86/kernel/cpu/cpufreq/powernow-k6.c | 2 +- arch/x86/kernel/cpu/cpufreq/powernow-k7.c | 19 ++-- arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 32 +++-- arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 2 +- arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | 6 +- arch/x86/kernel/cpu/cpufreq/speedstep-lib.h | 24 ++-- arch/x86/kernel/cpu/cpufreq/speedstep-smi.c | 2 +- drivers/acpi/processor_perflib.c | 13 ++ drivers/cpufreq/cpufreq.c | 34 +++++- drivers/cpufreq/cpufreq_conservative.c | 129 +++++++++++++++++--- include/acpi/processor.h | 6 + include/linux/cpufreq.h | 1 + 16 files changed, 248 insertions(+), 74 deletions(-) Merging quilt/rr $ git merge quilt/rr Auto-merging Documentation/cpu-hotplug.txt Auto-merging MAINTAINERS Auto-merging arch/powerpc/kernel/ppc_ksyms.c Auto-merging arch/sparc/kernel/pci.c Auto-merging drivers/scsi/fcoe/fcoe.c Auto-merging include/linux/Kbuild Auto-merging scripts/Makefile.lib Merge made by recursive. Documentation/cpu-hotplug.txt | 49 +-- Documentation/lguest/lguest.c | 1 - MAINTAINERS | 9 + arch/arm/kernel/armksyms.c | 20 - arch/arm/kernel/vmlinux.lds.S | 13 +- arch/blackfin/Kconfig | 4 + arch/blackfin/include/asm/module.h | 2 - arch/blackfin/kernel/vmlinux.lds.S | 2 - arch/h8300/Kconfig | 4 + arch/h8300/include/asm/module.h | 2 - arch/h8300/kernel/vmlinux.lds.S | 1 - arch/powerpc/include/asm/module.h | 5 + arch/powerpc/kernel/vmlinux.lds.S | 3 + arch/sparc/kernel/pci.c | 1 - arch/sparc/kernel/sparc_ksyms_64.c | 12 - arch/x86/kernel/x8664_ksyms_64.c | 4 +- arch/x86/kvm/Kconfig | 1 + drivers/Makefile | 1 + drivers/idle/i7300_idle.c | 15 +- drivers/net/tun.c | 101 +++- drivers/scsi/fcoe/fcoe.c | 2 +- drivers/vhost/Kconfig | 11 + drivers/vhost/Makefile | 2 + drivers/vhost/net.c | 648 ++++++++++++++++++++++++ drivers/vhost/vhost.c | 968 ++++++++++++++++++++++++++++++++++++ drivers/vhost/vhost.h | 159 ++++++ drivers/virtio/virtio_balloon.c | 94 ++++- include/asm-generic/vmlinux.lds.h | 8 +- include/linux/Kbuild | 1 + include/linux/gfp.h | 2 +- include/linux/if_tun.h | 14 + include/linux/kernel.h | 32 +- include/linux/kmemcheck.h | 2 +- include/linux/miscdevice.h | 1 + include/linux/module.h | 6 +- include/linux/sched.h | 2 +- include/linux/vhost.h | 130 +++++ include/linux/virtio_balloon.h | 15 + include/linux/virtio_config.h | 5 +- kernel/module.c | 28 +- kernel/perf_event.c | 4 +- kernel/time/timer_list.c | 4 +- mm/mmu_context.c | 3 + mm/slab.c | 2 +- scripts/Makefile.lib | 5 + scripts/mod/Makefile | 2 +- scripts/mod/mk_elfconfig.c | 9 - scripts/mod/modpost.c | 173 +------ scripts/mod/modpost.h | 3 - 49 files changed, 2269 insertions(+), 316 deletions(-) create mode 100644 drivers/vhost/Kconfig create mode 100644 drivers/vhost/Makefile create mode 100644 drivers/vhost/net.c create mode 100644 drivers/vhost/vhost.c create mode 100644 drivers/vhost/vhost.h create mode 100644 include/linux/vhost.h $ git am -3 ../patches/0001-modpost-autoconf.h-has-moved-to-include-generated.patch Applying: modpost: autoconf.h has moved to include/generated $ git reset HEAD^ Unstaged changes after reset: M scripts/mod/modpost.c $ git add . $ git commit -v -a --amend [master d4948d8] Merge branch 'quilt/rr' $ git am -3 ../patches/0001-rr-cpufreq-fix-up-for-api-name-change.patch Applying: rr: cpufreq: fix up for api name change $ git reset HEAD^ Unstaged changes after reset: M arch/x86/kernel/cpu/cpufreq/powernow-k8.c $ git add . $ git commit -v -a --amend [master 0eb761f] Merge branch 'quilt/rr' Merging mmc/next $ git merge mmc/next Already up-to-date. Merging tmio-mmc/linux-next $ git merge tmio-mmc/linux-next Auto-merging drivers/mfd/Makefile Auto-merging drivers/mmc/core/core.c Auto-merging drivers/mmc/core/core.h Merge made by recursive. drivers/mfd/Makefile | 6 +- drivers/mfd/asic3.c | 43 +++++++++++++++---- drivers/mfd/t7l66xb.c | 31 +++++++++++-- drivers/mfd/tc6387xb.c | 97 ++++++++++++++++++++++++++++++++++-------- drivers/mfd/tc6393xb.c | 56 +++++++++++++++++++++---- drivers/mfd/tmio_core.c | 62 +++++++++++++++++++++++++++ drivers/mmc/core/core.c | 4 +- drivers/mmc/core/core.h | 10 ++++ drivers/mmc/host/tmio_mmc.c | 78 +++++++++++++++-------------------- drivers/mmc/host/tmio_mmc.h | 46 +++------------------ include/linux/mfd/tmio.h | 40 ++++++++++++++++++ 11 files changed, 342 insertions(+), 131 deletions(-) create mode 100644 drivers/mfd/tmio_core.c Merging input/next $ git merge input/next 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 Merge made by recursive. block/cfq-iosched.c | 84 +++++++++++++++++++++++++++++++++--------- drivers/block/drbd/drbd_nl.c | 3 +- drivers/block/xd.c | 30 +++++++++----- 3 files changed, 86 insertions(+), 31 deletions(-) Merging quilt/device-mapper $ git merge quilt/device-mapper Merge made by recursive. Documentation/device-mapper/snapshot.txt | 60 ++- drivers/md/dm-crypt.c | 207 ++++-- drivers/md/dm-exception-store.c | 33 +- drivers/md/dm-exception-store.h | 62 ++- drivers/md/dm-io.c | 120 ++- drivers/md/dm-ioctl.c | 123 +++- drivers/md/dm-kcopyd.c | 5 +- drivers/md/dm-log.c | 77 ++- drivers/md/dm-mpath.c | 95 ++- drivers/md/dm-raid1.c | 219 ++++-- drivers/md/dm-region-hash.c | 31 +- drivers/md/dm-snap-persistent.c | 195 ++++- drivers/md/dm-snap-transient.c | 24 +- drivers/md/dm-snap.c | 1279 ++++++++++++++++++++++++------ drivers/md/dm-sysfs.c | 10 +- drivers/md/dm-table.c | 3 + drivers/md/dm-uevent.c | 9 +- drivers/md/dm.c | 643 +++++++++------- drivers/md/dm.h | 13 + include/linux/device-mapper.h | 8 +- include/linux/dm-dirty-log.h | 6 +- include/linux/dm-ioctl.h | 13 +- include/linux/dm-region-hash.h | 3 +- 23 files changed, 2349 insertions(+), 889 deletions(-) Merging embedded/master $ git merge embedded/master Already up-to-date. Merging firmware/master $ git merge firmware/master Already up-to-date. Merging pcmcia/master $ git merge pcmcia/master Auto-merging drivers/net/pcmcia/axnet_cs.c Auto-merging drivers/net/pcmcia/fmvj18x_cs.c Auto-merging drivers/net/pcmcia/pcnet_cs.c Auto-merging drivers/net/pcmcia/smc91c92_cs.c Auto-merging drivers/net/pcmcia/xirc2ps_cs.c Auto-merging drivers/pcmcia/Kconfig Auto-merging drivers/pcmcia/cardbus.c Merge made by recursive. drivers/isdn/hardware/avm/avm_cs.c | 3 +- drivers/isdn/hisax/avma1_cs.c | 3 +- drivers/isdn/hisax/elsa_cs.c | 2 +- drivers/isdn/hisax/sedlbauer_cs.c | 2 +- drivers/isdn/hisax/teles_cs.c | 2 +- drivers/net/pcmcia/axnet_cs.c | 2 +- drivers/net/pcmcia/fmvj18x_cs.c | 2 +- drivers/net/pcmcia/pcnet_cs.c | 2 +- drivers/net/pcmcia/smc91c92_cs.c | 2 +- drivers/net/pcmcia/xirc2ps_cs.c | 2 +- drivers/pcmcia/Kconfig | 6 +- drivers/pcmcia/cardbus.c | 23 ++-- drivers/pcmcia/cistpl.c | 181 ++++++++++++-------- drivers/pcmcia/cs.c | 12 +- drivers/pcmcia/ds.c | 66 ++++---- drivers/pcmcia/pcmcia_ioctl.c | 45 +++--- drivers/pcmcia/pcmcia_resource.c | 37 +++-- drivers/pcmcia/rsrc_mgr.c | 14 +- drivers/pcmcia/rsrc_nonstatic.c | 325 ++++++++++++++++++----------------- drivers/pcmcia/socket_sysfs.c | 6 +- drivers/pcmcia/yenta_socket.c | 147 +++++++++++------ include/pcmcia/cs.h | 4 +- include/pcmcia/ds.h | 6 +- include/pcmcia/mem_op.h | 2 +- include/pcmcia/ss.h | 12 +- sound/pcmcia/pdaudiocf/pdaudiocf.c | 3 +- 26 files changed, 504 insertions(+), 407 deletions(-) Merging battery/master $ git merge battery/master Auto-merging arch/arm/mach-s3c2442/mach-gta02.c Auto-merging drivers/mfd/wm831x-core.c Auto-merging drivers/power/Kconfig Auto-merging drivers/power/Makefile Merge made by recursive. arch/arm/mach-s3c2442/mach-gta02.c | 3 + drivers/mfd/wm831x-core.c | 9 ++ drivers/power/Kconfig | 7 + drivers/power/Makefile | 1 + drivers/power/pcf50633-charger.c | 228 +++++++++++++++++++++++------------ drivers/power/power_supply_sysfs.c | 5 +- drivers/power/wm831x_backup.c | 233 ++++++++++++++++++++++++++++++++++++ drivers/power/wm831x_power.c | 144 +---------------------- include/linux/mfd/pcf50633/core.h | 7 +- include/linux/mfd/pcf50633/mbc.h | 1 + 10 files changed, 420 insertions(+), 218 deletions(-) create mode 100644 drivers/power/wm831x_backup.c Merging leds/for-mm $ git merge leds/for-mm Merge made by recursive. drivers/leds/Kconfig | 27 ++ drivers/leds/Makefile | 3 + drivers/leds/leds-adp5520.c | 230 ++++++++++++++++++ drivers/leds/leds-alix2.c | 115 +++++++--- drivers/leds/leds-lt3593.c | 217 +++++++++++++++++ drivers/leds/leds-ss4200.c | 556 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 1117 insertions(+), 31 deletions(-) create mode 100644 drivers/leds/leds-adp5520.c create mode 100644 drivers/leds/leds-lt3593.c create mode 100644 drivers/leds/leds-ss4200.c Merging backlight/for-mm $ git merge backlight/for-mm Resolved 'drivers/platform/x86/thinkpad_acpi.c' using previous resolution. Auto-merging drivers/platform/x86/thinkpad_acpi.c CONFLICT (content): Merge conflict in drivers/platform/x86/thinkpad_acpi.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 3db68a3] Merge remote branch 'backlight/for-mm' $ git diff -M --stat --summary HEAD^.. Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Merge made by recursive. arch/x86/kernel/kgdb.c | 14 +++++++++----- drivers/misc/kgdbts.c | 16 +++++++++++----- kernel/kgdb.c | 33 +++++++++++++++++++++++++-------- 3 files changed, 45 insertions(+), 18 deletions(-) Merging slab/for-next $ git merge slab/for-next Auto-merging mm/slab.c Merge made by recursive. Documentation/ABI/testing/sysfs-kernel-slab | 109 +++++++++++++------------ mm/slab.c | 118 ++++++++++++++++----------- mm/slub.c | 20 ++++- 3 files changed, 145 insertions(+), 102 deletions(-) Merging uclinux/for-next $ git merge uclinux/for-next Already up-to-date. Merging md/for-next $ git merge md/for-next Auto-merging drivers/md/md.c Auto-merging fs/compat_ioctl.c Merge made by recursive. Documentation/md.txt | 29 +++ drivers/md/Kconfig | 9 +- drivers/md/bitmap.c | 450 +++++++++++++++++++++++++++++++++++++++++------ drivers/md/bitmap.h | 19 +-- drivers/md/faulty.c | 1 + drivers/md/linear.c | 3 +- drivers/md/md.c | 347 ++++++++++++++++++++++++++++-------- drivers/md/md.h | 51 ++++-- drivers/md/multipath.c | 3 +- drivers/md/raid0.c | 3 +- drivers/md/raid1.c | 219 +++++++++++++++-------- drivers/md/raid1.h | 5 + drivers/md/raid10.c | 116 +++++++++++-- drivers/md/raid5.c | 60 +++++-- drivers/md/raid6algos.c | 20 +-- fs/compat_ioctl.c | 22 --- include/linux/raid/pq.h | 19 ++ 17 files changed, 1064 insertions(+), 312 deletions(-) Merging mfd/for-next $ git merge mfd/for-next Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c Auto-merging drivers/mfd/Makefile Auto-merging drivers/mfd/asic3.c Auto-merging drivers/mfd/wm831x-core.c Auto-merging drivers/power/pcf50633-charger.c Auto-merging include/linux/mfd/pcf50633/core.h Merge made by recursive. arch/arm/mach-omap2/board-rx51-peripherals.c | 118 +++-- drivers/gpio/adp5520-gpio.c | 36 +- drivers/gpio/wm831x-gpio.c | 17 +- drivers/input/keyboard/Kconfig | 10 + drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/adp5520-keys.c | 220 ++++++++ drivers/input/misc/pcf50633-input.c | 7 +- drivers/mfd/88pm8607.c | 302 ++++++++++ drivers/mfd/Kconfig | 37 ++- drivers/mfd/Makefile | 4 + drivers/mfd/ab3100-core.c | 3 - drivers/mfd/ab4500-core.c | 208 +++++++ drivers/mfd/adp5520.c | 379 +++++++++++++ drivers/mfd/asic3.c | 2 +- drivers/mfd/ezx-pcap.c | 1 - drivers/mfd/mc13783-core.c | 757 +++++++++++++++++--------- drivers/mfd/pcf50633-adc.c | 5 +- drivers/mfd/pcf50633-core.c | 76 ++-- drivers/mfd/tps65010.c | 30 +- drivers/mfd/twl4030-core.c | 24 +- drivers/mfd/twl4030-irq.c | 134 +++++- drivers/mfd/twl4030-power.c | 70 ++- drivers/mfd/wm831x-core.c | 223 ++++++-- drivers/mfd/wm831x-irq.c | 209 +++---- drivers/mfd/wm8350-core.c | 771 +------------------------- drivers/mfd/wm8350-irq.c | 529 ++++++++++++++++++ drivers/mfd/wm8350-regmap.c | 8 - drivers/power/pcf50633-charger.c | 3 +- drivers/power/wm8350_power.c | 63 +-- drivers/regulator/pcf50633-regulator.c | 5 +- drivers/regulator/wm8350-regulator.c | 10 +- drivers/rtc/rtc-pcf50633.c | 5 +- drivers/rtc/rtc-wm8350.c | 25 +- drivers/video/backlight/adp5520_bl.c | 123 +++-- include/linux/i2c/tps65010.h | 19 + include/linux/i2c/twl4030.h | 56 ++- include/linux/mfd/88pm8607.h | 217 ++++++++ include/linux/mfd/ab4500.h | 262 +++++++++ include/linux/mfd/adp5520.h | 299 ++++++++++ include/linux/mfd/ezx-pcap.h | 3 - include/linux/mfd/mc13783-private.h | 208 +------- include/linux/mfd/mc13783.h | 120 ++++- include/linux/mfd/pcf50633/core.h | 10 +- include/linux/mfd/wm831x/core.h | 43 ++- include/linux/mfd/wm831x/pdata.h | 1 + include/linux/mfd/wm8350/core.h | 14 +- include/linux/mfd/wm8350/gpio.h | 18 + sound/soc/codecs/wm8350.c | 25 +- 48 files changed, 4020 insertions(+), 1690 deletions(-) create mode 100644 drivers/input/keyboard/adp5520-keys.c create mode 100644 drivers/mfd/88pm8607.c create mode 100644 drivers/mfd/ab4500-core.c create mode 100644 drivers/mfd/adp5520.c create mode 100644 drivers/mfd/wm8350-irq.c create mode 100644 include/linux/mfd/88pm8607.h create mode 100644 include/linux/mfd/ab4500.h create mode 100644 include/linux/mfd/adp5520.h Merging hdlc/hdlc-next $ git merge hdlc/hdlc-next Already up-to-date. Merging drm/drm-next $ git merge drm/drm-next Auto-merging drivers/gpu/drm/drm_crtc.c Auto-merging drivers/gpu/drm/i915/i915_gem.c Auto-merging drivers/gpu/drm/i915/intel_fb.c Auto-merging drivers/gpu/drm/i915/intel_lvds.c Auto-merging drivers/gpu/drm/i915/intel_sdvo.c Auto-merging drivers/gpu/drm/radeon/r600.c Auto-merging drivers/gpu/drm/radeon/radeon_fb.c Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c Auto-merging drivers/gpu/drm/radeon/rv770.c Auto-merging drivers/gpu/drm/ttm/ttm_bo_util.c Merge made by recursive. drivers/gpu/drm/drm_crtc.c | 176 +++- drivers/gpu/drm/drm_crtc_helper.c | 2 +- drivers/gpu/drm/drm_drv.c | 42 +- drivers/gpu/drm/drm_edid.c | 328 ++++-- drivers/gpu/drm/drm_fb_helper.c | 23 +- drivers/gpu/drm/drm_fops.c | 112 ++- drivers/gpu/drm/drm_irq.c | 130 ++- drivers/gpu/drm/drm_mm.c | 2 +- drivers/gpu/drm/drm_modes.c | 28 +- drivers/gpu/drm/drm_stub.c | 15 + drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/dvo_ch7017.c | 9 +- drivers/gpu/drm/i915/dvo_ch7xxx.c | 16 +- drivers/gpu/drm/i915/dvo_ivch.c | 37 +- drivers/gpu/drm/i915/dvo_sil164.c | 20 +- drivers/gpu/drm/i915/dvo_tfp410.c | 34 +- drivers/gpu/drm/i915/i915_debugfs.c | 113 ++- drivers/gpu/drm/i915/i915_dma.c | 32 +- drivers/gpu/drm/i915/i915_drv.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 40 +- drivers/gpu/drm/i915/i915_gem.c | 109 ++- drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +- drivers/gpu/drm/i915/i915_irq.c | 116 ++- drivers/gpu/drm/i915/i915_opregion.c | 90 ++- drivers/gpu/drm/i915/i915_reg.h | 17 +- drivers/gpu/drm/i915/i915_suspend.c | 8 +- drivers/gpu/drm/i915/intel_bios.c | 135 ++- drivers/gpu/drm/i915/intel_bios.h | 17 + drivers/gpu/drm/i915/intel_crt.c | 32 +- drivers/gpu/drm/i915/intel_display.c | 618 ++++++++--- drivers/gpu/drm/i915/intel_dp.c | 64 +- drivers/gpu/drm/i915/intel_dp_i2c.c | 8 +- drivers/gpu/drm/i915/intel_drv.h | 41 + drivers/gpu/drm/i915/intel_fb.c | 7 +- drivers/gpu/drm/i915/intel_hdmi.c | 51 +- drivers/gpu/drm/i915/intel_lvds.c | 114 ++- drivers/gpu/drm/i915/intel_overlay.c | 1416 +++++++++++++++++++++++ drivers/gpu/drm/i915/intel_sdvo.c | 14 +- drivers/gpu/drm/i915/intel_tv.c | 58 +- drivers/gpu/drm/radeon/atombios_crtc.c | 45 +- drivers/gpu/drm/radeon/r100.c | 118 ++- drivers/gpu/drm/radeon/r100_track.h | 10 +- drivers/gpu/drm/radeon/r300.c | 28 +- drivers/gpu/drm/radeon/r420.c | 19 +- drivers/gpu/drm/radeon/r520.c | 6 +- drivers/gpu/drm/radeon/r600.c | 658 ++++++++++- drivers/gpu/drm/radeon/r600_blit_kms.c | 34 +- drivers/gpu/drm/radeon/r600d.h | 160 +++- drivers/gpu/drm/radeon/radeon.h | 148 ++- drivers/gpu/drm/radeon/radeon_asic.h | 14 + drivers/gpu/drm/radeon/radeon_atombios.c | 57 +- drivers/gpu/drm/radeon/radeon_benchmark.c | 36 +- drivers/gpu/drm/radeon/radeon_clocks.c | 8 + drivers/gpu/drm/radeon/radeon_combios.c | 392 ++++++- drivers/gpu/drm/radeon/radeon_connectors.c | 59 +- drivers/gpu/drm/radeon/radeon_cp.c | 45 +- drivers/gpu/drm/radeon/radeon_cs.c | 13 +- drivers/gpu/drm/radeon/radeon_device.c | 38 +- drivers/gpu/drm/radeon/radeon_display.c | 29 +- drivers/gpu/drm/radeon/radeon_drv.h | 1 - drivers/gpu/drm/radeon/radeon_encoders.c | 91 +- drivers/gpu/drm/radeon/radeon_fb.c | 72 +- drivers/gpu/drm/radeon/radeon_fence.c | 42 +- drivers/gpu/drm/radeon/radeon_gart.c | 42 +- drivers/gpu/drm/radeon/radeon_gem.c | 102 +- drivers/gpu/drm/radeon/radeon_i2c.c | 109 ++- drivers/gpu/drm/radeon/radeon_irq_kms.c | 40 +- drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 93 +- drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 125 ++- drivers/gpu/drm/radeon/radeon_mode.h | 76 +- drivers/gpu/drm/radeon/radeon_object.c | 538 ++++------ drivers/gpu/drm/radeon/radeon_object.h | 157 +++- drivers/gpu/drm/radeon/radeon_pm.c | 6 +- drivers/gpu/drm/radeon/radeon_reg.h | 40 +- drivers/gpu/drm/radeon/radeon_ring.c | 67 +- drivers/gpu/drm/radeon/radeon_test.c | 55 +- drivers/gpu/drm/radeon/radeon_ttm.c | 36 +- drivers/gpu/drm/radeon/rs400.c | 13 +- drivers/gpu/drm/radeon/rs600.c | 98 +- drivers/gpu/drm/radeon/rs690.c | 31 +- drivers/gpu/drm/radeon/rv515.c | 13 +- drivers/gpu/drm/radeon/rv770.c | 59 +- drivers/gpu/drm/ttm/Makefile | 3 +- drivers/gpu/drm/ttm/ttm_bo_util.c | 1 + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 117 ++ drivers/gpu/drm/ttm/ttm_lock.c | 311 +++++ drivers/gpu/drm/ttm/ttm_memory.c | 12 +- drivers/gpu/drm/ttm/ttm_object.c | 452 ++++++++ drivers/gpu/drm/ttm/ttm_tt.c | 1 + include/drm/drm.h | 65 +- include/drm/drmP.h | 87 +- include/drm/drm_crtc.h | 47 +- include/drm/drm_edid.h | 8 + include/drm/drm_mode.h | 80 ++- include/drm/drm_os_linux.h | 2 +- include/drm/i915_drm.h | 78 ++- include/drm/mga_drm.h | 2 +- include/drm/radeon_drm.h | 2 +- include/drm/ttm/ttm_bo_driver.h | 9 + include/drm/ttm/ttm_execbuf_util.h | 107 ++ include/drm/ttm/ttm_lock.h | 247 ++++ include/drm/ttm/ttm_memory.h | 1 + include/drm/ttm/ttm_object.h | 267 +++++ include/drm/via_drm.h | 2 +- 104 files changed, 8046 insertions(+), 1756 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_overlay.c create mode 100644 drivers/gpu/drm/ttm/ttm_execbuf_util.c create mode 100644 drivers/gpu/drm/ttm/ttm_lock.c create mode 100644 drivers/gpu/drm/ttm/ttm_object.c create mode 100644 include/drm/ttm/ttm_execbuf_util.h create mode 100644 include/drm/ttm/ttm_lock.h create mode 100644 include/drm/ttm/ttm_object.h Merging voltage/for-next $ git merge voltage/for-next Resolved 'drivers/mfd/Kconfig' using previous resolution. Resolved 'drivers/mfd/Makefile' using previous resolution. Auto-merging drivers/mfd/Kconfig CONFLICT (content): Merge conflict in drivers/mfd/Kconfig Auto-merging drivers/mfd/Makefile CONFLICT (content): Merge conflict in drivers/mfd/Makefile Removing drivers/regulator/mc13783.c Auto-merging include/linux/mfd/wm831x/pdata.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master b7047b8] Merge remote branch 'voltage/for-next' $ git diff -M --stat --summary HEAD^.. drivers/mfd/Makefile | 2 +- drivers/regulator/88pm8607.c | 685 +++++++++++++++++++++++++++++++++ drivers/regulator/Kconfig | 13 + drivers/regulator/Makefile | 4 +- drivers/regulator/ab3100.c | 33 +-- drivers/regulator/core.c | 244 +++++++----- drivers/regulator/da903x.c | 2 +- drivers/regulator/lp3971.c | 4 +- drivers/regulator/max8660.c | 510 ++++++++++++++++++++++++ drivers/regulator/mc13783-regulator.c | 245 ++++++++++++ drivers/regulator/mc13783.c | 410 -------------------- drivers/regulator/twl4030-regulator.c | 51 ++- drivers/regulator/wm831x-dcdc.c | 207 +++++++++- include/linux/mfd/wm831x/pdata.h | 17 + include/linux/regulator/consumer.h | 2 + include/linux/regulator/machine.h | 6 +- include/linux/regulator/max8660.h | 57 +++ 17 files changed, 1920 insertions(+), 572 deletions(-) create mode 100644 drivers/regulator/88pm8607.c create mode 100644 drivers/regulator/max8660.c create mode 100644 drivers/regulator/mc13783-regulator.c delete mode 100644 drivers/regulator/mc13783.c create mode 100644 include/linux/regulator/max8660.h Merging security-testing/next $ git merge security-testing/next Auto-merging security/selinux/ss/services.c Merge made by recursive. security/security.c | 30 ++++++++++---------- security/selinux/ss/mls.c | 4 +- security/selinux/ss/services.c | 4 +- security/tomoyo/common.c | 61 ++++++++++++---------------------------- security/tomoyo/common.h | 12 +++++-- security/tomoyo/file.c | 47 +++++++++++++++++++++++-------- security/tomoyo/realpath.c | 3 +- security/tomoyo/tomoyo.c | 61 ++++++++++++++++++++++++++++++++++++++++ security/tomoyo/tomoyo.h | 12 ++++++- 9 files changed, 153 insertions(+), 81 deletions(-) Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging agp/agp-next $ git merge agp/agp-next Merge made by recursive. drivers/char/agp/amd64-agp.c | 2 ++ drivers/char/agp/backend.c | 13 +++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) Merging uwb/for-upstream $ git merge uwb/for-upstream Already up-to-date. Merging watchdog/master $ git merge watchdog/master Merge made by recursive. Merging bdev/master $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master $ git merge dwmw2-iommu/master Auto-merging drivers/pci/dmar.c Auto-merging drivers/pci/intel-iommu.c Auto-merging drivers/pci/intr_remapping.c Merge made by recursive. drivers/pci/dmar.c | 110 ++++++++++++++++++++++++++++++++++++------ drivers/pci/intel-iommu.c | 78 ++++++++++++++++------------- drivers/pci/intr_remapping.c | 3 +- include/linux/intel-iommu.h | 1 + 4 files changed, 141 insertions(+), 51 deletions(-) Merging cputime/cputime $ git merge cputime/cputime Already up-to-date. Merging osd/linux-next $ git merge osd/linux-next Merge made by recursive. Merging jc_docs/docs-next $ git merge jc_docs/docs-next Merge made by recursive. Documentation/video4linux/videobuf | 341 ++++++++++++++++++++++++++++++++++++ 1 files changed, 341 insertions(+), 0 deletions(-) create mode 100644 Documentation/video4linux/videobuf Merging nommu/master $ git merge nommu/master Already up-to-date. Merging trivial/for-next $ git merge trivial/for-next Already up-to-date. Merging audit/for-next $ git merge audit/for-next Already up-to-date. Merging quilt/aoe $ git merge quilt/aoe Auto-merging drivers/block/aoe/aoecmd.c Merge made by recursive. drivers/block/aoe/aoecmd.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) Merging suspend/linux-next $ git merge suspend/linux-next Already up-to-date. Merging bluetooth/master $ git merge bluetooth/master Already up-to-date. Merging fsnotify/for-next $ git merge fsnotify/for-next Resolved 'arch/x86/ia32/ia32entry.S' using previous resolution. Resolved 'arch/x86/include/asm/unistd_32.h' using previous resolution. Resolved 'arch/x86/include/asm/unistd_64.h' using previous resolution. Resolved 'arch/x86/kernel/syscall_table_32.S' using previous resolution. Resolved 'fs/afs/write.c' using previous resolution. Resolved 'fs/cifs/dir.c' using previous resolution. Resolved 'fs/ubifs/file.c' using previous resolution. Resolved 'include/asm-generic/fcntl.h' using previous resolution. Resolved 'net/compat.c' using previous resolution. Resolved 'net/socket.c' using previous resolution. Auto-merging arch/alpha/include/asm/fcntl.h Auto-merging arch/microblaze/kernel/syscall_table.S Auto-merging arch/mips/kernel/scall64-n32.S Auto-merging arch/mips/kernel/scall64-o32.S Auto-merging arch/mips/loongson/common/mem.c Auto-merging arch/parisc/include/asm/fcntl.h Auto-merging arch/sparc/kernel/systbls_64.S Auto-merging arch/x86/ia32/ia32entry.S CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S Auto-merging arch/x86/ia32/sys_ia32.c Auto-merging arch/x86/include/asm/sys_ia32.h Auto-merging arch/x86/include/asm/unistd_32.h CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h Auto-merging arch/x86/include/asm/unistd_64.h CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h Auto-merging arch/x86/kernel/syscall_table_32.S CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S Auto-merging arch/x86/mm/pat.c Auto-merging drivers/char/mem.c Auto-merging fs/afs/write.c CONFLICT (content): Merge conflict in fs/afs/write.c Auto-merging fs/cifs/dir.c CONFLICT (content): Merge conflict in fs/cifs/dir.c Auto-merging fs/compat.c Auto-merging fs/exec.c Auto-merging fs/inode.c Auto-merging fs/namespace.c Auto-merging fs/nfs/write.c Auto-merging fs/nfsd/vfs.c Auto-merging fs/notify/inotify/inotify_user.c Auto-merging fs/ocfs2/file.c Auto-merging fs/open.c Auto-merging fs/read_write.c Auto-merging fs/sync.c Auto-merging fs/ubifs/file.c CONFLICT (content): Merge conflict in fs/ubifs/file.c Auto-merging fs/xfs/linux-2.6/xfs_lrw.c Auto-merging include/asm-generic/fcntl.h CONFLICT (content): Merge conflict in include/asm-generic/fcntl.h Auto-merging include/linux/Kbuild Auto-merging include/linux/fs.h Auto-merging include/linux/net.h Auto-merging include/linux/skbuff.h Auto-merging include/linux/socket.h Auto-merging include/linux/syscalls.h Auto-merging include/net/compat.h Auto-merging include/net/sock.h Auto-merging init/Kconfig Auto-merging kernel/Makefile Auto-merging kernel/sys_ni.c Auto-merging net/bluetooth/af_bluetooth.c Auto-merging net/bluetooth/rfcomm/sock.c Auto-merging net/can/bcm.c Auto-merging net/can/raw.c Auto-merging net/compat.c CONFLICT (content): Merge conflict in net/compat.c Auto-merging net/core/sock.c Auto-merging net/ieee802154/dgram.c Auto-merging net/ieee802154/raw.c Auto-merging net/ipv4/raw.c Auto-merging net/ipv4/udp.c Auto-merging net/ipv6/raw.c Auto-merging net/ipv6/udp.c Auto-merging net/key/af_key.c Auto-merging net/packet/af_packet.c Auto-merging net/sctp/socket.c Auto-merging net/socket.c CONFLICT (content): Merge conflict in net/socket.c Auto-merging sound/core/rawmidi.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master a448c9a] Merge remote branch 'fsnotify/for-next' $ git diff -M --stat --summary HEAD^.. arch/x86/ia32/ia32entry.S | 2 + arch/x86/ia32/sys_ia32.c | 9 + arch/x86/include/asm/sys_ia32.h | 3 + arch/x86/include/asm/unistd_32.h | 4 +- arch/x86/include/asm/unistd_64.h | 4 + arch/x86/kernel/syscall_table_32.S | 2 + fs/compat.c | 5 +- fs/exec.c | 4 +- fs/inode.c | 2 +- fs/namespace.c | 5 + fs/nfsd/vfs.c | 4 +- fs/notify/Kconfig | 1 + fs/notify/Makefile | 4 +- fs/notify/dnotify/dnotify.c | 198 ++++++------ fs/notify/fanotify/Kconfig | 12 + fs/notify/fanotify/Makefile | 1 + fs/notify/fanotify/fanotify.c | 184 +++++++++++ fs/notify/fanotify/fanotify_user.c | 578 ++++++++++++++++++++++++++++++++++ fs/notify/fsnotify.c | 104 +++++-- fs/notify/fsnotify.h | 31 ++- fs/notify/group.c | 142 ++++----- fs/notify/inode_mark.c | 272 +++------------- fs/notify/inotify/inotify.h | 7 +- fs/notify/inotify/inotify_fsnotify.c | 112 +++++-- fs/notify/inotify/inotify_user.c | 301 +++++++++++------- fs/notify/mark.c | 293 +++++++++++++++++ fs/notify/notification.c | 173 ++++++----- fs/notify/vfsmount_mark.c | 171 ++++++++++ fs/open.c | 9 +- fs/read_write.c | 8 +- include/asm-generic/fcntl.h | 8 + include/linux/Kbuild | 1 + include/linux/fanotify.h | 77 +++++ include/linux/fs.h | 5 +- include/linux/fsnotify.h | 84 +++-- include/linux/fsnotify_backend.h | 120 +++++--- include/linux/mount.h | 6 +- include/linux/syscalls.h | 5 + init/Kconfig | 10 +- kernel/Makefile | 5 +- kernel/audit.c | 1 - kernel/audit.h | 26 +- kernel/audit_tree.c | 222 +++++++------ kernel/audit_watch.c | 295 ++++++++++-------- kernel/auditfilter.c | 39 +-- kernel/auditsc.c | 9 +- kernel/sys_ni.c | 4 + 47 files changed, 2538 insertions(+), 1024 deletions(-) create mode 100644 fs/notify/fanotify/Kconfig create mode 100644 fs/notify/fanotify/Makefile create mode 100644 fs/notify/fanotify/fanotify.c create mode 100644 fs/notify/fanotify/fanotify_user.c create mode 100644 fs/notify/mark.c create mode 100644 fs/notify/vfsmount_mark.c create mode 100644 include/linux/fanotify.h Merging irda/for-next $ git merge irda/for-next Resolved 'drivers/net/irda/irda-usb.c' using previous resolution. Auto-merging drivers/net/irda/irda-usb.c CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 32d0e6f] Merge remote branch 'irda/for-next' $ git diff -M --stat --summary HEAD^.. drivers/net/irda/irda-usb.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) Merging hwlat/for-linus $ git merge hwlat/for-linus Resolved 'drivers/misc/Makefile' using previous resolution. Auto-merging MAINTAINERS Auto-merging drivers/misc/Kconfig Auto-merging drivers/misc/Makefile CONFLICT (content): Merge conflict in drivers/misc/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master fcb17d7] Merge remote branch 'hwlat/for-linus' $ git diff -M --stat --summary HEAD^.. Documentation/hwlat_detector.txt | 64 ++ MAINTAINERS | 9 + drivers/misc/Kconfig | 29 + drivers/misc/Makefile | 1 + drivers/misc/hwlat_detector.c | 1208 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 1311 insertions(+), 0 deletions(-) create mode 100644 Documentation/hwlat_detector.txt create mode 100644 drivers/misc/hwlat_detector.c Merging drbd/for-jens $ git merge drbd/for-jens Merge made by recursive. Merging catalin/for-next $ git merge catalin/for-next Auto-merging kernel/module.c Auto-merging lib/Kconfig.debug Auto-merging mm/kmemleak.c Auto-merging mm/slab.c Merge made by recursive. include/linux/kmemleak.h | 6 +- kernel/module.c | 13 ++- lib/Kconfig.debug | 1 + mm/kmemleak.c | 188 +++++++++++++++++++++++++--------------------- mm/slab.c | 10 ++- 5 files changed, 118 insertions(+), 100 deletions(-) Merging alacrity/linux-next $ git merge alacrity/linux-next Resolved 'include/linux/Kbuild' using previous resolution. Resolved 'lib/Kconfig' using previous resolution. Auto-merging MAINTAINERS Auto-merging arch/x86/Kconfig Auto-merging drivers/Makefile Auto-merging drivers/net/Kconfig Auto-merging drivers/net/Makefile Auto-merging include/linux/Kbuild CONFLICT (content): Merge conflict in include/linux/Kbuild Auto-merging lib/Kconfig CONFLICT (content): Merge conflict in lib/Kconfig Auto-merging lib/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 4f9644f] Merge remote branch 'alacrity/linux-next' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 25 + arch/x86/Kconfig | 2 + drivers/Makefile | 1 + drivers/net/Kconfig | 14 + drivers/net/Makefile | 1 + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ drivers/vbus/Kconfig | 25 + drivers/vbus/Makefile | 6 + drivers/vbus/bus-proxy.c | 247 +++++++ drivers/vbus/pci-bridge.c | 1015 ++++++++++++++++++++++++++++ include/linux/Kbuild | 4 + include/linux/ioq.h | 414 ++++++++++++ include/linux/shm_signal.h | 189 ++++++ include/linux/vbus_driver.h | 83 +++ include/linux/vbus_pci.h | 145 ++++ include/linux/venet.h | 133 ++++ lib/Kconfig | 21 + lib/Makefile | 2 + lib/ioq.c | 304 +++++++++ lib/shm_signal.c | 196 ++++++ 20 files changed, 4387 insertions(+), 0 deletions(-) create mode 100644 drivers/net/vbus-enet.c create mode 100644 drivers/vbus/Kconfig create mode 100644 drivers/vbus/Makefile create mode 100644 drivers/vbus/bus-proxy.c create mode 100644 drivers/vbus/pci-bridge.c create mode 100644 include/linux/ioq.h create mode 100644 include/linux/shm_signal.h create mode 100644 include/linux/vbus_driver.h create mode 100644 include/linux/vbus_pci.h create mode 100644 include/linux/venet.h create mode 100644 lib/ioq.c create mode 100644 lib/shm_signal.c Merging i7core_edac/linux_next $ git merge i7core_edac/linux_next Auto-merging Documentation/edac.txt Auto-merging arch/x86/include/asm/pci_x86.h Auto-merging arch/x86/kernel/cpu/mcheck/mce.c Auto-merging include/linux/pci.h Auto-merging include/linux/pci_ids.h Merge made by recursive. Documentation/edac.txt | 153 +++ arch/x86/include/asm/pci_x86.h | 2 + arch/x86/kernel/cpu/mcheck/mce.c | 10 + arch/x86/pci/legacy.c | 42 +- drivers/edac/Kconfig | 13 + drivers/edac/Makefile | 2 + drivers/edac/edac_core.h | 23 +- drivers/edac/edac_mc_sysfs.c | 175 +++- drivers/edac/edac_mce.c | 61 ++ drivers/edac/i7core_edac.c | 1977 ++++++++++++++++++++++++++++++++++++++ include/linux/edac_mce.h | 31 + include/linux/pci.h | 1 + include/linux/pci_ids.h | 19 + 13 files changed, 2465 insertions(+), 44 deletions(-) create mode 100644 drivers/edac/edac_mce.c create mode 100644 drivers/edac/i7core_edac.c create mode 100644 include/linux/edac_mce.h Merging devicetree/next-devicetree $ git merge devicetree/next-devicetree Already up-to-date. Merging spi/next-spi $ git merge spi/next-spi Auto-merging MAINTAINERS Auto-merging drivers/spi/Kconfig Auto-merging drivers/spi/au1550_spi.c Auto-merging drivers/spi/spi_mpc8xxx.c Auto-merging drivers/spi/spidev.c Removing include/linux/spi/mpc52xx_spi.h Merge made by recursive. MAINTAINERS | 1 + drivers/spi/Kconfig | 20 ++- drivers/spi/Makefile | 2 + drivers/spi/au1550_spi.c | 10 +- drivers/spi/mpc52xx_spi.c | 86 ++++++++-- drivers/spi/spi_imx.c | 17 ++- drivers/spi/spi_mpc8xxx.c | 2 +- drivers/spi/spidev.c | 6 +- drivers/spi/xilinx_spi.c | 355 +++++++++++++++++++-------------------- drivers/spi/xilinx_spi.h | 32 ++++ drivers/spi/xilinx_spi_of.c | 134 +++++++++++++++ drivers/spi/xilinx_spi_pltfm.c | 102 +++++++++++ include/linux/spi/mpc52xx_spi.h | 10 - include/linux/spi/xilinx_spi.h | 20 +++ 14 files changed, 577 insertions(+), 220 deletions(-) create mode 100644 drivers/spi/xilinx_spi.h create mode 100644 drivers/spi/xilinx_spi_of.c create mode 100644 drivers/spi/xilinx_spi_pltfm.c delete mode 100644 include/linux/spi/mpc52xx_spi.h create mode 100644 include/linux/spi/xilinx_spi.h Merging limits/writable_limits $ git merge limits/writable_limits Resolved 'arch/x86/ia32/ia32entry.S' using previous resolution. Resolved 'arch/x86/include/asm/unistd_32.h' using previous resolution. Resolved 'arch/x86/include/asm/unistd_64.h' using previous resolution. Resolved 'arch/x86/kernel/syscall_table_32.S' using previous resolution. Auto-merging arch/ia64/kernel/perfmon.c Auto-merging arch/x86/ia32/ia32entry.S CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S Auto-merging arch/x86/include/asm/unistd_32.h CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h Auto-merging arch/x86/include/asm/unistd_64.h CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h Auto-merging arch/x86/kernel/syscall_table_32.S CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S Auto-merging fs/exec.c Auto-merging include/asm-generic/unistd.h Auto-merging include/linux/Kbuild Auto-merging include/linux/sched.h Auto-merging include/linux/syscalls.h Auto-merging kernel/perf_event.c Auto-merging mm/filemap.c Auto-merging security/security.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master b271e52] Merge remote branch 'limits/writable_limits' $ git diff -M --stat --summary HEAD^.. arch/ia64/kernel/perfmon.c | 2 +- arch/ia64/kernel/sys_ia64.c | 2 +- arch/ia64/mm/init.c | 2 +- arch/powerpc/mm/mmap_64.c | 4 +- arch/powerpc/platforms/cell/spufs/coredump.c | 2 +- arch/s390/mm/mmap.c | 4 +- arch/sparc/kernel/sys_sparc_64.c | 6 +- arch/x86/ia32/ia32_aout.c | 2 +- arch/x86/ia32/ia32entry.S | 2 + arch/x86/include/asm/unistd_32.h | 4 +- arch/x86/include/asm/unistd_64.h | 4 + arch/x86/kernel/syscall_table_32.S | 2 + arch/x86/mm/mmap.c | 4 +- drivers/infiniband/core/umem.c | 2 +- drivers/infiniband/hw/ipath/ipath_user_pages.c | 3 +- fs/attr.c | 2 +- fs/binfmt_aout.c | 2 +- fs/binfmt_flat.c | 2 +- fs/exec.c | 8 +- fs/fcntl.c | 2 +- fs/file.c | 2 +- fs/proc/array.c | 4 +- fs/proc/base.c | 101 ++++++++++++++-- fs/select.c | 2 +- include/asm-generic/unistd.h | 6 +- include/linux/Kbuild | 2 +- include/linux/posix-timers.h | 2 +- include/linux/resource.h | 10 ++- include/linux/sched.h | 22 ++++ include/linux/security.h | 9 +- include/linux/syscalls.h | 4 + ipc/mqueue.c | 2 +- ipc/shm.c | 3 +- kernel/compat.c | 91 +++++++++++--- kernel/fork.c | 10 +- kernel/perf_event.c | 2 +- kernel/posix-cpu-timers.c | 52 ++++---- kernel/sched.c | 4 +- kernel/sched_rt.c | 5 +- kernel/signal.c | 2 +- kernel/sys.c | 161 +++++++++++++++++++---- mm/filemap.c | 2 +- mm/mlock.c | 12 +- mm/mmap.c | 13 +- mm/mremap.c | 2 +- security/capability.c | 3 +- security/security.c | 5 +- security/selinux/hooks.c | 10 +- 48 files changed, 451 insertions(+), 153 deletions(-) Merging omap_dss2/for-next $ git merge omap_dss2/for-next Resolved 'arch/arm/mach-omap2/io.c' using previous resolution. Auto-merging MAINTAINERS Auto-merging arch/arm/configs/omap_3430sdp_defconfig Auto-merging arch/arm/mach-omap2/board-3430sdp.c Auto-merging arch/arm/mach-omap2/clock34xx.c Auto-merging arch/arm/mach-omap2/io.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/io.c Removing arch/arm/plat-omap/include/plat/omapfb.h Auto-merging drivers/video/Kconfig Auto-merging drivers/video/omap/lcd_ams_delta.c Auto-merging drivers/video/omap/lcd_mipid.c Auto-merging drivers/video/omap/lcdc.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 757a270] Merge remote branch 'omap_dss2/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/arm/OMAP/DSS | 317 ++ MAINTAINERS | 17 + arch/arm/configs/omap_3430sdp_defconfig | 29 +- arch/arm/mach-omap1/board-nokia770.c | 1 + arch/arm/mach-omap2/board-3430sdp.c | 167 +- arch/arm/mach-omap2/clock24xx.c | 8 +- arch/arm/mach-omap2/clock34xx.c | 14 +- arch/arm/mach-omap2/io.c | 4 +- arch/arm/mach-omap2/sdrc.c | 16 + arch/arm/plat-omap/fb.c | 41 +- arch/arm/plat-omap/include/plat/display.h | 575 +++ arch/arm/plat-omap/include/plat/omapfb.h | 398 --- arch/arm/plat-omap/include/plat/sdrc.h | 9 +- arch/arm/plat-omap/include/plat/vram.h | 62 + arch/arm/plat-omap/include/plat/vrfb.h | 50 + arch/arm/plat-omap/sram.c | 8 + drivers/video/Kconfig | 1 + drivers/video/Makefile | 1 + drivers/video/omap/Kconfig | 5 +- drivers/video/omap/blizzard.c | 2 +- drivers/video/omap/dispc.c | 21 +- drivers/video/omap/hwa742.c | 2 +- drivers/video/omap/lcd_2430sdp.c | 3 +- drivers/video/omap/lcd_ams_delta.c | 3 +- drivers/video/omap/lcd_apollon.c | 3 +- drivers/video/omap/lcd_h3.c | 2 +- drivers/video/omap/lcd_h4.c | 2 +- drivers/video/omap/lcd_inn1510.c | 2 +- drivers/video/omap/lcd_inn1610.c | 2 +- drivers/video/omap/lcd_ldp.c | 3 +- drivers/video/omap/lcd_mipid.c | 3 +- drivers/video/omap/lcd_omap2evm.c | 3 +- drivers/video/omap/lcd_omap3beagle.c | 4 +- drivers/video/omap/lcd_omap3evm.c | 3 +- drivers/video/omap/lcd_osk.c | 2 +- drivers/video/omap/lcd_overo.c | 3 +- drivers/video/omap/lcd_palmte.c | 2 +- drivers/video/omap/lcd_palmtt.c | 2 +- drivers/video/omap/lcd_palmz71.c | 2 +- drivers/video/omap/lcdc.c | 3 +- drivers/video/omap/omapfb.h | 227 ++ drivers/video/omap/omapfb_main.c | 2 +- drivers/video/omap/rfbi.c | 3 +- drivers/video/omap/sossi.c | 2 +- drivers/video/omap2/Kconfig | 9 + drivers/video/omap2/Makefile | 6 + drivers/video/omap2/displays/Kconfig | 28 + drivers/video/omap2/displays/Makefile | 5 + drivers/video/omap2/displays/panel-generic.c | 104 + .../omap2/displays/panel-samsung-lte430wq-f0c.c | 113 + .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 153 + drivers/video/omap2/displays/panel-taal.c | 1003 ++++++ drivers/video/omap2/dss/Kconfig | 89 + drivers/video/omap2/dss/Makefile | 6 + drivers/video/omap2/dss/core.c | 919 +++++ drivers/video/omap2/dss/dispc.c | 3091 ++++++++++++++++ drivers/video/omap2/dss/display.c | 671 ++++ drivers/video/omap2/dss/dpi.c | 399 +++ drivers/video/omap2/dss/dsi.c | 3710 ++++++++++++++++++++ drivers/video/omap2/dss/dss.c | 596 ++++ drivers/video/omap2/dss/dss.h | 370 ++ drivers/video/omap2/dss/manager.c | 1487 ++++++++ drivers/video/omap2/dss/overlay.c | 680 ++++ drivers/video/omap2/dss/rfbi.c | 1309 +++++++ drivers/video/omap2/dss/sdi.c | 277 ++ drivers/video/omap2/dss/venc.c | 797 +++++ drivers/video/omap2/omapfb/Kconfig | 37 + drivers/video/omap2/omapfb/Makefile | 2 + drivers/video/omap2/omapfb/omapfb-ioctl.c | 755 ++++ drivers/video/omap2/omapfb/omapfb-main.c | 2261 ++++++++++++ drivers/video/omap2/omapfb/omapfb-sysfs.c | 507 +++ drivers/video/omap2/omapfb/omapfb.h | 146 + drivers/video/omap2/vram.c | 655 ++++ drivers/video/omap2/vrfb.c | 315 ++ include/linux/omapfb.h | 251 ++ 75 files changed, 22318 insertions(+), 462 deletions(-) create mode 100644 Documentation/arm/OMAP/DSS create mode 100644 arch/arm/plat-omap/include/plat/display.h delete mode 100644 arch/arm/plat-omap/include/plat/omapfb.h create mode 100644 arch/arm/plat-omap/include/plat/vram.h create mode 100644 arch/arm/plat-omap/include/plat/vrfb.h create mode 100644 drivers/video/omap/omapfb.h create mode 100644 drivers/video/omap2/Kconfig create mode 100644 drivers/video/omap2/Makefile create mode 100644 drivers/video/omap2/displays/Kconfig create mode 100644 drivers/video/omap2/displays/Makefile create mode 100644 drivers/video/omap2/displays/panel-generic.c create mode 100644 drivers/video/omap2/displays/panel-samsung-lte430wq-f0c.c create mode 100644 drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c create mode 100644 drivers/video/omap2/displays/panel-taal.c create mode 100644 drivers/video/omap2/dss/Kconfig create mode 100644 drivers/video/omap2/dss/Makefile create mode 100644 drivers/video/omap2/dss/core.c create mode 100644 drivers/video/omap2/dss/dispc.c create mode 100644 drivers/video/omap2/dss/display.c create mode 100644 drivers/video/omap2/dss/dpi.c create mode 100644 drivers/video/omap2/dss/dsi.c create mode 100644 drivers/video/omap2/dss/dss.c create mode 100644 drivers/video/omap2/dss/dss.h create mode 100644 drivers/video/omap2/dss/manager.c create mode 100644 drivers/video/omap2/dss/overlay.c create mode 100644 drivers/video/omap2/dss/rfbi.c create mode 100644 drivers/video/omap2/dss/sdi.c create mode 100644 drivers/video/omap2/dss/venc.c create mode 100644 drivers/video/omap2/omapfb/Kconfig create mode 100644 drivers/video/omap2/omapfb/Makefile create mode 100644 drivers/video/omap2/omapfb/omapfb-ioctl.c create mode 100644 drivers/video/omap2/omapfb/omapfb-main.c create mode 100644 drivers/video/omap2/omapfb/omapfb-sysfs.c create mode 100644 drivers/video/omap2/omapfb/omapfb.h create mode 100644 drivers/video/omap2/vram.c create mode 100644 drivers/video/omap2/vrfb.c create mode 100644 include/linux/omapfb.h Merging tip/auto-latest $ git merge tip/auto-latest Auto-merging arch/x86/Kconfig Auto-merging arch/x86/kernel/amd_iommu_init.c Auto-merging arch/x86/kernel/cpu/mcheck/mce.c Auto-merging arch/x86/kernel/reboot.c Auto-merging include/linux/sched.h Auto-merging kernel/perf_event.c Auto-merging kernel/sched.c Auto-merging kernel/sched_rt.c Auto-merging kernel/time/timer_list.c Auto-merging kernel/trace/trace.c Merge made by recursive. Documentation/lockstat.txt | 12 ++ arch/Kconfig | 5 +- arch/x86/Kconfig | 5 + arch/x86/Kconfig.debug | 4 +- arch/x86/include/asm/amd_iommu_proto.h | 4 +- arch/x86/include/asm/syscalls.h | 32 ++--- arch/x86/include/asm/system.h | 1 + arch/x86/kernel/amd_iommu.c | 46 ++++++- arch/x86/kernel/amd_iommu_init.c | 9 ++ arch/x86/kernel/apic/apic_noop.c | 2 +- arch/x86/kernel/apic/es7000_32.c | 12 +- arch/x86/kernel/cpu/mcheck/mce-inject.c | 22 ++-- arch/x86/kernel/cpu/mcheck/mce.c | 5 +- arch/x86/kernel/cpu/perf_event.c | 31 +++-- arch/x86/kernel/dumpstack_64.c | 33 +++++- arch/x86/kernel/entry_32.S | 61 +++++++-- arch/x86/kernel/entry_64.S | 6 +- arch/x86/kernel/hw_breakpoint.c | 5 +- arch/x86/kernel/ioport.c | 28 +---- arch/x86/kernel/microcode_amd.c | 40 +++--- arch/x86/kernel/microcode_core.c | 26 ++-- arch/x86/kernel/microcode_intel.c | 47 +++---- arch/x86/kernel/process.c | 56 ++++++++ arch/x86/kernel/process_32.c | 54 +-------- arch/x86/kernel/process_64.c | 44 +------ arch/x86/kernel/ptrace.c | 68 +++++----- arch/x86/kernel/reboot.c | 8 + arch/x86/kernel/setup_percpu.c | 13 +- arch/x86/kernel/signal.c | 12 +-- arch/x86/kernel/tsc.c | 8 +- arch/x86/kernel/vm86_32.c | 11 +- arch/x86/kvm/i8254.c | 12 +- arch/x86/lib/Makefile | 4 +- arch/x86/mm/kmmio.c | 42 +++--- arch/x86/mm/mmio-mod.c | 71 +++++----- arch/x86/tools/test_get_len.c | 2 +- include/linux/clocksource.h | 1 - include/linux/cpumask.h | 2 + include/linux/ftrace_event.h | 1 + include/linux/hrtimer.h | 56 ++------- include/linux/hw_breakpoint.h | 40 +++---- include/linux/perf_event.h | 41 +++--- include/linux/poison.h | 16 ++- include/linux/sched.h | 23 ++- include/linux/trace_seq.h | 7 +- include/trace/events/timer.h | 8 +- kernel/cpu.c | 18 ++- kernel/cpuset.c | 18 ++- kernel/futex.c | 10 +- kernel/futex_compat.c | 6 +- kernel/hrtimer.c | 121 +++++++++++------ kernel/hw_breakpoint.c | 146 +++++++++++++-------- kernel/lockdep.c | 16 ++- kernel/perf_event.c | 75 ++++++----- kernel/sched.c | 218 ++++++++++++++++--------------- kernel/sched_debug.c | 13 ++- kernel/sched_fair.c | 155 +++++++++++++---------- kernel/sched_features.h | 5 - kernel/sched_idletask.c | 2 +- kernel/sched_rt.c | 2 +- kernel/sysctl.c | 33 +++-- kernel/time/timer_list.c | 5 +- kernel/trace/trace.c | 57 +++++++-- kernel/trace/trace.h | 2 + kernel/trace/trace_functions_graph.c | 165 ++++++++++++++++++----- kernel/trace/trace_kprobe.c | 41 +++++-- kernel/trace/trace_ksym.c | 5 +- kernel/trace/trace_output.c | 75 +++++++++-- samples/hw_breakpoint/data_breakpoint.c | 7 +- tools/perf/Documentation/perf-kmem.txt | 13 +- tools/perf/Documentation/perf-probe.txt | 21 +++- tools/perf/builtin-buildid-list.c | 2 +- tools/perf/builtin-kmem.c | 123 ++++++++---------- tools/perf/builtin-probe.c | 80 +++++++++--- tools/perf/builtin-report.c | 39 +++--- tools/perf/builtin-sched.c | 212 ++++++++++++++---------------- tools/perf/builtin-timechart.c | 56 +++------ tools/perf/builtin-trace.c | 48 ++----- tools/perf/util/data_map.c | 4 +- tools/perf/util/data_map.h | 2 +- tools/perf/util/event.c | 67 ++++++++++ tools/perf/util/event.h | 17 +++- tools/perf/util/header.c | 9 +- tools/perf/util/parse-events.c | 17 +-- tools/perf/util/parse-options.c | 3 + tools/perf/util/probe-event.c | 133 +++++++++++++++++-- tools/perf/util/probe-event.h | 1 + tools/perf/util/probe-finder.c | 2 +- tools/perf/util/symbol.c | 5 +- tools/perf/util/trace-event-parse.c | 4 +- tools/perf/util/trace-event-perl.c | 67 ++++++++-- tools/perf/util/trace-event-perl.h | 4 + tools/perf/util/trace-event-read.c | 3 +- 93 files changed, 1891 insertions(+), 1272 deletions(-) Merging edac-amd/for-next $ git merge edac-amd/for-next Auto-merging drivers/edac/edac_core.h Merge made by recursive. drivers/edac/amd64_edac.c | 1251 +++++++++++++++++++------------------------ drivers/edac/amd64_edac.h | 62 ++- drivers/edac/edac_core.h | 1 + drivers/edac/edac_mc.c | 24 + drivers/edac/edac_mce_amd.c | 2 +- 5 files changed, 621 insertions(+), 719 deletions(-) Merging oprofile/for-next $ git merge oprofile/for-next Already up-to-date. Merging percpu/for-next $ git merge percpu/for-next Resolved 'arch/x86/kvm/svm.c' using previous resolution. Resolved 'mm/slab.c' using previous resolution. Auto-merging arch/blackfin/mach-common/entry.S Auto-merging arch/ia64/mm/init.c Auto-merging arch/powerpc/kernel/perf_callchain.c Auto-merging arch/powerpc/kernel/smp.c Auto-merging arch/powerpc/platforms/cell/interrupt.c Auto-merging arch/x86/include/asm/system.h Auto-merging arch/x86/kernel/cpu/common.c Auto-merging arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c Auto-merging arch/x86/kernel/cpu/intel_cacheinfo.c Auto-merging arch/x86/kernel/head_32.S Auto-merging arch/x86/kernel/vmlinux.lds.S Auto-merging arch/x86/kvm/svm.c CONFLICT (content): Merge conflict in arch/x86/kvm/svm.c Auto-merging arch/x86/xen/smp.c Auto-merging arch/x86/xen/time.c Auto-merging crypto/cryptd.c Auto-merging drivers/base/cpu.c Auto-merging drivers/cpufreq/cpufreq.c Auto-merging drivers/net/loopback.c Auto-merging drivers/net/veth.c Auto-merging drivers/s390/net/netiucv.c Auto-merging fs/ext4/mballoc.c Auto-merging fs/xfs/xfs_mount.c Auto-merging include/net/neighbour.h Auto-merging kernel/lockdep.c Auto-merging kernel/module.c Auto-merging kernel/sched.c Auto-merging kernel/trace/trace.c Auto-merging kernel/trace/trace.h Auto-merging kernel/trace/trace_functions_graph.c Removing mm/allocpercpu.c Auto-merging mm/slab.c CONFLICT (content): Merge conflict in mm/slab.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 590a150] Merge remote branch 'percpu/for-next' $ git diff -M --stat --summary HEAD^.. arch/blackfin/mach-common/entry.S | 4 +- arch/cris/arch-v10/kernel/entry.S | 2 +- arch/cris/arch-v32/mm/mmu.S | 2 +- arch/ia64/Kconfig | 3 - arch/ia64/include/asm/meminit.h | 2 +- arch/ia64/include/asm/percpu.h | 4 +- arch/ia64/include/asm/pgtable.h | 3 +- arch/ia64/include/asm/processor.h | 6 +- arch/ia64/kernel/acpi.c | 33 +- arch/ia64/kernel/head.S | 4 +- arch/ia64/kernel/ia64_ksyms.c | 4 +- arch/ia64/kernel/mca_asm.S | 2 +- arch/ia64/kernel/relocate_kernel.S | 2 +- arch/ia64/kernel/setup.c | 27 +-- arch/ia64/kernel/vmlinux.lds.S | 11 +- arch/ia64/mm/contig.c | 99 +++++-- arch/ia64/mm/discontig.c | 129 +++++++- arch/ia64/mm/init.c | 4 +- arch/ia64/sn/kernel/sn2/sn2_smp.c | 8 +- arch/ia64/xen/irq_xen.c | 131 ++++---- arch/ia64/xen/time.c | 22 +- arch/microblaze/include/asm/entry.h | 2 +- arch/mn10300/kernel/kprobes.c | 61 ++-- arch/parisc/lib/fixup.S | 8 +- arch/powerpc/include/asm/smp.h | 2 +- arch/powerpc/kernel/perf_callchain.c | 4 +- arch/powerpc/kernel/setup-common.c | 4 +- arch/powerpc/kernel/smp.c | 2 +- arch/powerpc/platforms/cell/interrupt.c | 14 +- arch/powerpc/platforms/pseries/dtl.c | 4 +- arch/sparc/kernel/nmi.c | 8 +- arch/sparc/kernel/rtrap_64.S | 8 +- arch/x86/include/asm/percpu.h | 141 +++++++-- arch/x86/include/asm/system.h | 8 +- arch/x86/kernel/apic/nmi.c | 8 +- arch/x86/kernel/cpu/common.c | 8 +- arch/x86/kernel/cpu/cpu_debug.c | 30 +- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 28 +- arch/x86/kernel/cpu/intel_cacheinfo.c | 54 ++-- arch/x86/kernel/ds.c | 4 +- arch/x86/kernel/head_32.S | 6 +- arch/x86/kernel/vmlinux.lds.S | 4 +- arch/x86/kvm/svm.c | 63 ++-- arch/x86/xen/smp.c | 41 ++-- arch/x86/xen/time.c | 24 +- arch/x86/xen/xen-asm_32.S | 4 +- crypto/cryptd.c | 2 +- drivers/base/cpu.c | 2 +- drivers/cpufreq/cpufreq.c | 16 +- drivers/cpufreq/freq_table.c | 12 +- drivers/crypto/padlock-aes.c | 12 +- drivers/dma/dmaengine.c | 36 +-- drivers/infiniband/hw/ehca/ehca_irq.c | 3 +- drivers/lguest/x86/core.c | 6 +- drivers/net/chelsio/sge.c | 5 +- drivers/net/loopback.c | 2 +- drivers/net/veth.c | 7 +- drivers/oprofile/cpu_buffer.c | 19 +- drivers/oprofile/cpu_buffer.h | 4 +- drivers/oprofile/oprofile_stats.c | 4 +- drivers/s390/net/netiucv.c | 8 +- fs/ext4/mballoc.c | 2 +- fs/nfs/iostat.h | 24 +-- fs/xfs/xfs_mount.c | 12 +- include/asm-generic/percpu.h | 23 +- include/linux/compiler.h | 4 +- include/linux/percpu-defs.h | 41 ++- include/linux/percpu.h | 470 +++++++++++++++++++++++++--- include/linux/vmstat.h | 10 +- include/net/neighbour.h | 7 +- include/net/netfilter/nf_conntrack.h | 4 +- include/net/snmp.h | 50 +-- kernel/lockdep.c | 11 +- kernel/module.c | 150 --------- kernel/rcutorture.c | 8 +- kernel/sched.c | 8 +- kernel/softirq.c | 4 +- kernel/softlockup.c | 54 ++-- kernel/time/timer_stats.c | 11 +- kernel/trace/trace.c | 12 +- kernel/trace/trace.h | 2 +- kernel/trace/trace_functions_graph.c | 4 +- kernel/trace/trace_hw_branches.c | 51 ++-- mm/Makefile | 4 - mm/allocpercpu.c | 177 ----------- mm/percpu.c | 42 ++- mm/slab.c | 18 +- mm/vmalloc.c | 4 +- mm/vmstat.c | 7 +- 89 files changed, 1330 insertions(+), 1064 deletions(-) delete mode 100644 mm/allocpercpu.c Merging workqueues/for-next $ git merge workqueues/for-next Already up-to-date. Merging sfi/sfi-test $ git merge sfi/sfi-test Already up-to-date. Merging asm-generic/next $ git merge asm-generic/next Auto-merging include/asm-generic/unistd.h Merge made by recursive. include/asm-generic/unistd.h | 4 ++-- lib/checksum.c | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) Merging hwpoison/hwpoison $ git merge hwpoison/hwpoison Resolved 'MAINTAINERS' using previous resolution. Auto-merging Documentation/vm/page-types.c Auto-merging MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS Auto-merging include/linux/page-flags.h Auto-merging mm/memcontrol.c Auto-merging mm/memory-failure.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master a779ee4] Merge remote branch 'hwpoison/hwpoison' $ git diff -M --stat --summary HEAD^.. .../ABI/testing/sysfs-memory-page-offline | 44 ++ Documentation/vm/hwpoison.txt | 52 ++- Documentation/vm/page-types.c | 15 +- MAINTAINERS | 9 + drivers/base/memory.c | 61 +++ fs/proc/page.c | 45 +-- include/asm-generic/mman-common.h | 1 + include/linux/kernel-page-flags.h | 46 ++ include/linux/memcontrol.h | 13 + include/linux/mm.h | 8 +- include/linux/page-flags.h | 4 +- mm/Kconfig | 3 +- mm/hwpoison-inject.c | 113 ++++- mm/internal.h | 12 + mm/madvise.c | 21 +- mm/memcontrol.c | 16 +- mm/memory-failure.c | 558 ++++++++++++++++++-- mm/memory.c | 4 + mm/page_alloc.c | 21 + 19 files changed, 921 insertions(+), 125 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-memory-page-offline create mode 100644 include/linux/kernel-page-flags.h Merging sysctl/master $ git merge sysctl/master Already up-to-date. Merging quilt/driver-core $ git merge quilt/driver-core Auto-merging drivers/serial/ucc_uart.c Auto-merging drivers/usb/atm/ueagle-atm.c Auto-merging fs/debugfs/inode.c Auto-merging fs/namei.c Merge made by recursive. drivers/base/core.c | 14 +- drivers/base/devtmpfs.c | 100 ++++---- drivers/base/firmware_class.c | 14 +- drivers/base/platform.c | 29 ++- drivers/firmware/dell_rbu.c | 9 +- drivers/misc/hpilo.h | 13 +- drivers/serial/ucc_uart.c | 8 +- drivers/staging/comedi/drivers/usbdux.c | 5 +- drivers/staging/comedi/drivers/usbduxfast.c | 5 +- drivers/usb/atm/ueagle-atm.c | 7 +- fs/debugfs/inode.c | 55 +++-- fs/namei.c | 22 -- fs/sysfs/dir.c | 388 +++++++++------------------ fs/sysfs/file.c | 41 +--- fs/sysfs/inode.c | 176 ++++++++----- fs/sysfs/symlink.c | 11 +- fs/sysfs/sysfs.h | 9 +- include/linux/device.h | 2 +- include/linux/firmware.h | 5 +- include/linux/namei.h | 1 - include/linux/platform_device.h | 20 +- 21 files changed, 428 insertions(+), 506 deletions(-) Merging quilt/tty $ git merge quilt/tty Resolved 'drivers/mmc/card/sdio_uart.c' using previous resolution. Removing Documentation/serial/hayes-esp.txt Removing drivers/char/esp.c Auto-merging drivers/char/pty.c Auto-merging drivers/mmc/card/sdio_uart.c CONFLICT (content): Merge conflict in drivers/mmc/card/sdio_uart.c Auto-merging drivers/serial/8250.c Auto-merging include/linux/Kbuild Removing include/linux/hayesesp.h Auto-merging kernel/exit.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master a06f136] Merge branch 'quilt/tty' $ git diff -M --stat --summary HEAD^.. Documentation/serial/hayes-esp.txt | 154 -- Documentation/serial/tty.txt | 9 +- arch/xtensa/platforms/iss/console.c | 2 +- drivers/char/Kconfig | 13 - drivers/char/Makefile | 1 - drivers/char/bfin_jtag_comm.c | 2 +- drivers/char/epca.c | 2 +- drivers/char/esp.c | 2533 ---------------------------------- drivers/char/isicom.c | 115 +-- drivers/char/istallion.c | 185 +-- drivers/char/moxa.c | 289 ++--- drivers/char/mxser.c | 248 ++-- drivers/char/pcmcia/ipwireless/tty.c | 2 +- drivers/char/pty.c | 2 +- drivers/char/riscom8.c | 89 +- drivers/char/stallion.c | 129 +-- drivers/char/tty_io.c | 151 ++- drivers/char/tty_ldisc.c | 23 +- drivers/char/tty_port.c | 97 ++- drivers/mmc/card/sdio_uart.c | 395 +++--- drivers/serial/8250.c | 24 +- drivers/serial/jsm/jsm.h | 8 - drivers/serial/jsm/jsm_driver.c | 48 +- drivers/serial/jsm/jsm_neo.c | 8 - drivers/serial/jsm/jsm_tty.c | 6 +- drivers/serial/pxa.c | 13 +- drivers/serial/serial_core.c | 33 +- drivers/usb/serial/opticon.c | 7 +- drivers/usb/serial/usb-serial.c | 83 +- fs/devpts/inode.c | 16 +- include/linux/Kbuild | 1 - include/linux/hayesesp.h | 114 -- include/linux/isicom.h | 1 + include/linux/tty.h | 25 +- include/linux/usb/serial.h | 3 - kernel/exit.c | 2 +- 36 files changed, 950 insertions(+), 3883 deletions(-) delete mode 100644 Documentation/serial/hayes-esp.txt delete mode 100644 drivers/char/esp.c delete mode 100644 include/linux/hayesesp.h Merging quilt/usb $ git merge quilt/usb Resolved 'arch/arm/plat-mxc/Makefile' using previous resolution. Auto-merging Documentation/kernel-parameters.txt Auto-merging MAINTAINERS Auto-merging arch/arm/plat-mxc/Makefile CONFLICT (content): Merge conflict in arch/arm/plat-mxc/Makefile Auto-merging drivers/hid/usbhid/hid-core.c Auto-merging drivers/net/wimax/i2400m/usb.c Auto-merging drivers/usb/class/usbtmc.c Auto-merging drivers/usb/core/message.c Auto-merging drivers/usb/gadget/f_acm.c Auto-merging drivers/usb/gadget/file_storage.c Auto-merging drivers/usb/host/ehci-hcd.c Auto-merging drivers/usb/musb/omap2430.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master f5dc365] Merge branch 'quilt/usb' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-bus-usb | 13 + .../ABI/testing/sysfs-class-uwb_rc-wusbhc | 13 + Documentation/kernel-parameters.txt | 2 + Documentation/powerpc/dts-bindings/xilinx.txt | 11 + Documentation/usb/power-management.txt | 69 +- MAINTAINERS | 4 +- arch/arm/plat-mxc/Makefile | 1 + arch/arm/plat-mxc/ehci.c | 92 + arch/arm/plat-mxc/include/mach/mxc_ehci.h | 37 + drivers/bluetooth/btusb.c | 2 +- drivers/hid/usbhid/hid-core.c | 8 +- drivers/net/wimax/i2400m/usb.c | 7 +- drivers/usb/Kconfig | 2 + drivers/usb/Makefile | 2 + drivers/usb/class/cdc-acm.c | 58 +- drivers/usb/class/usbtmc.c | 54 +- drivers/usb/core/driver.c | 135 +- drivers/usb/core/file.c | 1 + drivers/usb/core/generic.c | 2 +- drivers/usb/core/hcd.c | 82 +- drivers/usb/core/hcd.h | 19 +- drivers/usb/core/hub.c | 142 +- drivers/usb/core/message.c | 82 +- drivers/usb/core/sysfs.c | 61 +- drivers/usb/core/urb.c | 22 +- drivers/usb/core/usb.c | 69 +- drivers/usb/core/usb.h | 1 + drivers/usb/gadget/Kconfig | 60 + drivers/usb/gadget/Makefile | 4 + drivers/usb/gadget/at91_udc.c | 6 +- drivers/usb/gadget/audio.c | 115 - drivers/usb/gadget/composite.c | 59 +- drivers/usb/gadget/ether.c | 16 +- drivers/usb/gadget/f_acm.c | 28 + drivers/usb/gadget/f_audio.c | 76 +- drivers/usb/gadget/f_mass_storage.c | 3091 ++++++++++++++++++++ drivers/usb/gadget/f_rndis.c | 35 +- drivers/usb/gadget/file_storage.c | 879 +----- drivers/usb/gadget/mass_storage.c | 240 ++ drivers/usb/gadget/multi.c | 358 +++ drivers/usb/gadget/storage_common.c | 778 +++++ drivers/usb/gadget/u_ether.h | 2 +- drivers/usb/host/Kconfig | 22 +- drivers/usb/host/ehci-hcd.c | 19 +- drivers/usb/host/ehci-hub.c | 2 +- drivers/usb/host/ehci-mxc.c | 296 ++ drivers/usb/host/ehci-omap.c | 756 +++++ drivers/usb/host/ehci-q.c | 32 +- drivers/usb/host/ehci-sched.c | 36 +- drivers/usb/host/ehci-xilinx-of.c | 300 ++ drivers/usb/host/isp1362.h | 4 +- drivers/usb/host/ohci-at91.c | 10 +- drivers/usb/host/ohci-pnx4008.c | 8 +- drivers/usb/host/r8a66597-hcd.c | 4 - drivers/usb/host/whci/debug.c | 20 +- drivers/usb/host/whci/hcd.c | 1 + drivers/usb/host/whci/qset.c | 350 ++- drivers/usb/host/whci/whcd.h | 9 + drivers/usb/host/whci/whci-hc.h | 14 +- drivers/usb/host/xhci-hcd.c | 139 +- drivers/usb/host/xhci-mem.c | 255 ++- drivers/usb/host/xhci-pci.c | 2 + drivers/usb/host/xhci-ring.c | 343 ++- drivers/usb/host/xhci.h | 37 +- drivers/usb/misc/usbtest.c | 7 +- drivers/usb/mon/mon_bin.c | 51 +- drivers/usb/mon/mon_text.c | 23 +- drivers/usb/musb/Kconfig | 5 +- drivers/usb/musb/blackfin.c | 16 +- drivers/usb/musb/blackfin.h | 37 + drivers/usb/musb/musb_core.c | 10 +- drivers/usb/musb/musb_core.h | 8 + drivers/usb/musb/musb_dma.h | 11 + drivers/usb/musb/musb_gadget.c | 196 +- drivers/usb/musb/musb_gadget.h | 4 +- drivers/usb/musb/musb_gadget_ep0.c | 70 +- drivers/usb/musb/musb_host.c | 10 +- drivers/usb/musb/musb_regs.h | 4 +- drivers/usb/musb/musbhsdma.c | 12 +- drivers/usb/musb/omap2430.c | 2 +- drivers/usb/otg/Kconfig | 9 + drivers/usb/otg/Makefile | 1 + drivers/usb/otg/twl4030-usb.c | 4 +- drivers/usb/otg/ulpi.c | 136 + drivers/usb/serial/ark3116.c | 975 +++++-- drivers/usb/serial/ftdi_sio.c | 32 +- drivers/usb/serial/ftdi_sio.h | 14 + drivers/usb/serial/mos7840.c | 24 +- drivers/usb/serial/option.c | 39 +- drivers/usb/serial/sierra.c | 91 +- drivers/usb/storage/scsiglue.c | 3 +- drivers/usb/storage/transport.c | 17 +- drivers/usb/storage/unusual_devs.h | 7 + drivers/usb/storage/usb.c | 43 +- drivers/usb/storage/usb.h | 1 + drivers/usb/usb-skeleton.c | 4 +- drivers/usb/wusbcore/devconnect.c | 7 +- drivers/usb/wusbcore/security.c | 6 +- drivers/usb/wusbcore/wusbhc.c | 32 + drivers/usb/wusbcore/wusbhc.h | 1 + include/linux/usb.h | 33 +- include/linux/usb/composite.h | 1 + include/linux/usb/otg.h | 68 +- include/linux/usb/ulpi.h | 7 + include/linux/usb_usual.h | 4 +- scripts/mod/file2alias.c | 93 +- 106 files changed, 9634 insertions(+), 1881 deletions(-) create mode 100644 arch/arm/plat-mxc/ehci.c create mode 100644 arch/arm/plat-mxc/include/mach/mxc_ehci.h create mode 100644 drivers/usb/gadget/f_mass_storage.c create mode 100644 drivers/usb/gadget/mass_storage.c create mode 100644 drivers/usb/gadget/multi.c create mode 100644 drivers/usb/gadget/storage_common.c create mode 100644 drivers/usb/host/ehci-mxc.c create mode 100644 drivers/usb/host/ehci-omap.c create mode 100644 drivers/usb/host/ehci-xilinx-of.c create mode 100644 drivers/usb/otg/ulpi.c create mode 100644 include/linux/usb/ulpi.h $ git revert aeca69507e6dd514605310960ec76af636791f2f Finished one revert. [master c9ebc12] Revert "USB: prepare for changover to Runtime PM framework" 5 files changed, 113 insertions(+), 74 deletions(-) Merging quilt/staging $ git merge quilt/staging Auto-merging drivers/staging/Kconfig CONFLICT (content): Merge conflict in drivers/staging/Kconfig Auto-merging drivers/staging/Makefile CONFLICT (content): Merge conflict in drivers/staging/Makefile Removing drivers/staging/android/Kconfig Removing drivers/staging/android/Makefile Removing drivers/staging/android/TODO Removing drivers/staging/android/binder.c Removing drivers/staging/android/binder.h Removing drivers/staging/android/logger.c Removing drivers/staging/android/logger.h Removing drivers/staging/android/lowmemorykiller.c Removing drivers/staging/android/ram_console.c Removing drivers/staging/android/timed_gpio.c Removing drivers/staging/android/timed_gpio.h Removing drivers/staging/android/timed_output.c Removing drivers/staging/android/timed_output.h Auto-merging drivers/staging/comedi/drivers/cb_das16_cs.c Auto-merging drivers/staging/comedi/drivers/ni_labpc_cs.c CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_labpc_cs.c Auto-merging drivers/staging/comedi/drivers/ni_mio_cs.c CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_mio_cs.c Auto-merging drivers/staging/comedi/drivers/quatech_daqp_cs.c Removing drivers/staging/dream/Kconfig Removing drivers/staging/dream/Makefile Removing drivers/staging/dream/camera/Kconfig Removing drivers/staging/dream/camera/Makefile Removing drivers/staging/dream/camera/msm_camera.c Removing drivers/staging/dream/camera/msm_io7x.c Removing drivers/staging/dream/camera/msm_io8x.c Removing drivers/staging/dream/camera/msm_v4l2.c Removing drivers/staging/dream/camera/msm_vfe7x.c Removing drivers/staging/dream/camera/msm_vfe7x.h Removing drivers/staging/dream/camera/msm_vfe8x.c Removing drivers/staging/dream/camera/msm_vfe8x.h Removing drivers/staging/dream/camera/msm_vfe8x_proc.c Removing drivers/staging/dream/camera/msm_vfe8x_proc.h Removing drivers/staging/dream/camera/mt9d112.c Removing drivers/staging/dream/camera/mt9d112.h Removing drivers/staging/dream/camera/mt9d112_reg.c Removing drivers/staging/dream/camera/mt9p012.h Removing drivers/staging/dream/camera/mt9p012_fox.c Removing drivers/staging/dream/camera/mt9p012_reg.c Removing drivers/staging/dream/camera/mt9t013.c Removing drivers/staging/dream/camera/mt9t013.h Removing drivers/staging/dream/camera/mt9t013_reg.c Removing drivers/staging/dream/camera/s5k3e2fx.c Removing drivers/staging/dream/camera/s5k3e2fx.h Removing drivers/staging/dream/gpio_axis.c Removing drivers/staging/dream/gpio_event.c Removing drivers/staging/dream/gpio_input.c Removing drivers/staging/dream/gpio_matrix.c Removing drivers/staging/dream/gpio_output.c Removing drivers/staging/dream/qdsp5/Makefile Removing drivers/staging/dream/qdsp5/adsp.c Removing drivers/staging/dream/qdsp5/adsp.h Removing drivers/staging/dream/qdsp5/adsp_6210.c Removing drivers/staging/dream/qdsp5/adsp_6220.c Removing drivers/staging/dream/qdsp5/adsp_6225.c Removing drivers/staging/dream/qdsp5/adsp_driver.c Removing drivers/staging/dream/qdsp5/adsp_info.c Removing drivers/staging/dream/qdsp5/adsp_jpeg_patch_event.c Removing drivers/staging/dream/qdsp5/adsp_jpeg_verify_cmd.c Removing drivers/staging/dream/qdsp5/adsp_lpm_verify_cmd.c Removing drivers/staging/dream/qdsp5/adsp_vfe_patch_event.c Removing drivers/staging/dream/qdsp5/adsp_vfe_verify_cmd.c Removing drivers/staging/dream/qdsp5/adsp_video_verify_cmd.c Removing drivers/staging/dream/qdsp5/adsp_videoenc_verify_cmd.c Removing drivers/staging/dream/qdsp5/audio_aac.c Removing drivers/staging/dream/qdsp5/audio_amrnb.c Removing drivers/staging/dream/qdsp5/audio_evrc.c Removing drivers/staging/dream/qdsp5/audio_in.c Removing drivers/staging/dream/qdsp5/audio_mp3.c Removing drivers/staging/dream/qdsp5/audio_out.c Removing drivers/staging/dream/qdsp5/audio_qcelp.c Removing drivers/staging/dream/qdsp5/audmgr.c Removing drivers/staging/dream/qdsp5/audmgr.h Removing drivers/staging/dream/qdsp5/audmgr_new.h Removing drivers/staging/dream/qdsp5/audpp.c Removing drivers/staging/dream/qdsp5/evlog.h Removing drivers/staging/dream/qdsp5/snd.c Removing drivers/staging/dream/smd/Kconfig Removing drivers/staging/dream/smd/Makefile Removing drivers/staging/dream/smd/rpc_server_dog_keepalive.c Removing drivers/staging/dream/smd/rpc_server_time_remote.c Removing drivers/staging/dream/smd/smd.c Removing drivers/staging/dream/smd/smd_private.h Removing drivers/staging/dream/smd/smd_qmi.c Removing drivers/staging/dream/smd/smd_rpcrouter.c Removing drivers/staging/dream/smd/smd_rpcrouter.h Removing drivers/staging/dream/smd/smd_rpcrouter_device.c Removing drivers/staging/dream/smd/smd_rpcrouter_servers.c Removing drivers/staging/dream/smd/smd_tty.c Removing drivers/staging/dream/synaptics_i2c_rmi.c Removing drivers/staging/dream/synaptics_i2c_rmi.h Removing drivers/staging/iio/light/tsl2561.c Auto-merging drivers/staging/iio/ring_sw.h Auto-merging drivers/staging/octeon/ethernet-rgmii.c Auto-merging drivers/staging/otus/80211core/pub_zfi.h Removing drivers/staging/rt2860/2860_main_dev.c Removing drivers/staging/rt2860/aironet.h Removing drivers/staging/rt2860/common/2860_rtmp_init.c Removing drivers/staging/rt2860/common/cmm_data_2860.c Removing drivers/staging/rt2860/common/md5.c Removing drivers/staging/rt2860/common/rtmp_tkip.c Removing drivers/staging/rt2860/common/rtmp_wep.c Removing drivers/staging/rt2860/config.mk Removing drivers/staging/rt2860/md5.h Removing drivers/staging/rt2860/rt2860.h Removing drivers/staging/rt2860/rt28xx.h Removing drivers/staging/rt2860/rt_profile.c Removing drivers/staging/rt2860/sta/aironet.c Removing drivers/staging/rt2870/2870_main_dev.c Removing drivers/staging/rt2870/common/2870_rtmp_init.c Removing drivers/staging/rt2870/common/cmm_data_2870.c Removing drivers/staging/rt2870/rt2870.h Removing drivers/staging/rt3090/Kconfig Removing drivers/staging/rt3090/Makefile Removing drivers/staging/rt3090/action.h Removing drivers/staging/rt3090/ap.h Removing drivers/staging/rt3090/ap_apcli.h Removing drivers/staging/rt3090/ap_autoChSel.h Removing drivers/staging/rt3090/ap_autoChSel_cmm.h Removing drivers/staging/rt3090/ap_cfg.h Removing drivers/staging/rt3090/ap_ids.h Removing drivers/staging/rt3090/ap_mbss.h Removing drivers/staging/rt3090/ap_uapsd.h Removing drivers/staging/rt3090/ap_wds.h Removing drivers/staging/rt3090/chips/rt3370.c Removing drivers/staging/rt3090/chips/rt3390.c Removing drivers/staging/rt3090/chips/rt33xx.c Removing drivers/staging/rt3090/chlist.h Removing drivers/staging/rt3090/common/action.c Removing drivers/staging/rt3090/common/ba_action.c Removing drivers/staging/rt3090/common/cmm_asic.c Removing drivers/staging/rt3090/common/cmm_data.c Removing drivers/staging/rt3090/common/cmm_data_pci.c Removing drivers/staging/rt3090/common/cmm_info.c Removing drivers/staging/rt3090/common/cmm_mac_pci.c Removing drivers/staging/rt3090/common/cmm_profile.c Removing drivers/staging/rt3090/common/cmm_sanity.c Removing drivers/staging/rt3090/common/cmm_sync.c Removing drivers/staging/rt3090/common/cmm_tkip.c Removing drivers/staging/rt3090/common/cmm_wpa.c Removing drivers/staging/rt3090/common/crypt_aes.c Removing drivers/staging/rt3090/common/crypt_biginteger.c Removing drivers/staging/rt3090/common/crypt_dh.c Removing drivers/staging/rt3090/common/crypt_hmac.c Removing drivers/staging/rt3090/common/crypt_md5.c Removing drivers/staging/rt3090/common/crypt_sha2.c Removing drivers/staging/rt3090/common/dfs.c Removing drivers/staging/rt3090/common/ee_efuse.c Removing drivers/staging/rt3090/common/ee_prom.c Removing drivers/staging/rt3090/common/eeprom.c Removing drivers/staging/rt3090/common/igmp_snoop.c Removing drivers/staging/rt3090/common/mlme.c Removing drivers/staging/rt3090/common/mlme_ex.c Removing drivers/staging/rt3090/common/netif_block.c Removing drivers/staging/rt3090/common/rt_channel.c Removing drivers/staging/rt3090/common/rtmp_init.c Removing drivers/staging/rt3090/common/rtmp_mcu.c Removing drivers/staging/rt3090/common/spectrum.c Removing drivers/staging/rt3090/config.mk Removing drivers/staging/rt3090/crypt_sha2.h Removing drivers/staging/rt3090/dfs.h Removing drivers/staging/rt3090/igmp_snoop.h Removing drivers/staging/rt3090/ipv6.h Removing drivers/stagiResolved 'drivers/staging/Kconfig' using previous resolution. Resolved 'drivers/staging/Makefile' using previous resolution. Resolved 'drivers/staging/comedi/drivers/ni_labpc_cs.c' using previous resolution. Resolved 'drivers/staging/comedi/drivers/ni_mio_cs.c' using previous resolution. Resolved 'drivers/staging/vt6655/Kconfig' using previous resolution. Resolved 'drivers/staging/vt6656/Kconfig' using previous resolution. ng/rt3090/link_list.h Removing drivers/staging/rt3090/mlme.h Removing drivers/staging/rt3090/mlme_ex.h Removing drivers/staging/rt3090/mlme_ex_def.h Removing drivers/staging/rt3090/oid.h Removing drivers/staging/rt3090/pci_main_dev.c Removing drivers/staging/rt3090/rt3390.h Removing drivers/staging/rt3090/rt_ate.c Removing drivers/staging/rt3090/rt_ate.h Removing drivers/staging/rt3090/rt_config.h Removing drivers/staging/rt3090/rt_linux.c Removing drivers/staging/rt3090/rt_linux.h Removing drivers/staging/rt3090/rt_main_dev.c Removing drivers/staging/rt3090/rt_pci_rbus.c Removing drivers/staging/rt3090/rt_profile.c Removing drivers/staging/rt3090/rtmp.h Removing drivers/staging/rt3090/rtmp_chip.h Removing drivers/staging/rt3090/rtmp_def.h Removing drivers/staging/rt3090/rtmp_dot11.h Removing drivers/staging/rt3090/rtmp_mac.h Removing drivers/staging/rt3090/rtmp_type.h Removing drivers/staging/rt3090/spectrum.h Removing drivers/staging/rt3090/spectrum_def.h Removing drivers/staging/rt3090/sta/assoc.c Removing drivers/staging/rt3090/sta/auth.c Removing drivers/staging/rt3090/sta/auth_rsp.c Removing drivers/staging/rt3090/sta/connect.c Removing drivers/staging/rt3090/sta/dls.c Removing drivers/staging/rt3090/sta/rtmp_ckipmic.c Removing drivers/staging/rt3090/sta/rtmp_data.c Removing drivers/staging/rt3090/sta/sanity.c Removing drivers/staging/rt3090/sta/sync.c Removing drivers/staging/rt3090/sta/wpa.c Removing drivers/staging/rt3090/sta_ioctl.c Removing drivers/staging/rt3090/wpa.h Auto-merging drivers/staging/rtl8187se/Kconfig Auto-merging drivers/staging/rtl8187se/r8180.h Auto-merging drivers/staging/rtl8192su/r8192S_phyreg.h Auto-merging drivers/staging/vt6655/Kconfig CONFLICT (content): Merge conflict in drivers/staging/vt6655/Kconfig Removing drivers/staging/vt6655/kcompat.h Auto-merging drivers/staging/vt6656/Kconfig CONFLICT (content): Merge conflict in drivers/staging/vt6656/Kconfig Removing drivers/staging/vt6656/kcompat.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 19ddcd1] Merge branch 'quilt/staging' $ git diff -M --stat --summary HEAD^.. drivers/staging/Kconfig | 18 +- drivers/staging/Makefile | 11 +- drivers/staging/altpciechdma/altpciechdma.c | 6 +- drivers/staging/android/Kconfig | 96 - drivers/staging/android/Makefile | 6 - drivers/staging/android/TODO | 10 - drivers/staging/android/binder.c | 3767 ------- drivers/staging/android/binder.h | 330 - drivers/staging/android/logger.c | 607 -- drivers/staging/android/logger.h | 48 - drivers/staging/android/lowmemorykiller.c | 173 - drivers/staging/android/ram_console.c | 410 - drivers/staging/android/timed_gpio.c | 166 - drivers/staging/android/timed_gpio.h | 33 - drivers/staging/android/timed_output.c | 121 - drivers/staging/android/timed_output.h | 37 - drivers/staging/b3dfg/b3dfg.c | 12 - drivers/staging/batman-adv/CHANGELOG | 37 + drivers/staging/batman-adv/Kconfig | 25 + drivers/staging/batman-adv/Makefile | 22 + drivers/staging/batman-adv/README | 125 + drivers/staging/batman-adv/TODO | 51 + drivers/staging/batman-adv/aggregation.c | 232 + drivers/staging/batman-adv/aggregation.h | 37 + drivers/staging/batman-adv/bitarray.c | 177 + drivers/staging/batman-adv/bitarray.h | 45 + drivers/staging/batman-adv/compat.h | 75 + drivers/staging/batman-adv/device.c | 337 + drivers/staging/batman-adv/device.h | 36 + drivers/staging/batman-adv/hard-interface.c | 451 + drivers/staging/batman-adv/hard-interface.h | 36 + drivers/staging/batman-adv/hash.c | 313 + drivers/staging/batman-adv/hash.h | 99 + drivers/staging/batman-adv/log.c | 179 + drivers/staging/batman-adv/log.h | 32 + drivers/staging/batman-adv/main.c | 286 + drivers/staging/batman-adv/main.h | 151 + drivers/staging/batman-adv/packet.h | 96 + drivers/staging/batman-adv/proc.c | 950 ++ drivers/staging/batman-adv/proc.h | 49 + drivers/staging/batman-adv/ring_buffer.c | 52 + drivers/staging/batman-adv/ring_buffer.h | 23 + drivers/staging/batman-adv/routing.c | 1010 ++ drivers/staging/batman-adv/routing.h | 34 + drivers/staging/batman-adv/send.c | 473 + drivers/staging/batman-adv/send.h | 36 + drivers/staging/batman-adv/soft-interface.c | 349 + drivers/staging/batman-adv/soft-interface.h | 33 + drivers/staging/batman-adv/translation-table.c | 454 + drivers/staging/batman-adv/translation-table.h | 42 + drivers/staging/batman-adv/types.h | 124 + drivers/staging/batman-adv/vis.c | 564 ++ drivers/staging/batman-adv/vis.h | 63 + drivers/staging/comedi/comedi.h | 8 - drivers/staging/comedi/comedi_compat32.c | 149 +- drivers/staging/comedi/comedi_compat32.h | 16 +- drivers/staging/comedi/comedi_fops.c | 15 - drivers/staging/comedi/comedidev.h | 60 +- drivers/staging/comedi/drivers.c | 2 +- drivers/staging/comedi/drivers/8253.h | 3 +- drivers/staging/comedi/drivers/8255.c | 23 +- drivers/staging/comedi/drivers/acl7225b.c | 9 +- .../comedi/drivers/addi-data/APCI1710_Chrono.c | 3 +- .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 6 +- .../comedi/drivers/addi-data/APCI1710_Tor.c | 2 +- .../staging/comedi/drivers/addi-data/addi_common.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1032.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1500.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1516.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1564.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci2016.c | 4 +- .../comedi/drivers/addi-data/hwdrv_apci2200.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3120.c | 7 +- .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3501.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 2 +- drivers/staging/comedi/drivers/adl_pci6208.c | 53 +- drivers/staging/comedi/drivers/adl_pci7296.c | 19 +- drivers/staging/comedi/drivers/adl_pci7432.c | 32 +- drivers/staging/comedi/drivers/adl_pci8164.c | 37 +- drivers/staging/comedi/drivers/adl_pci9118.c | 2 +- drivers/staging/comedi/drivers/adv_pci1710.c | 4 +- drivers/staging/comedi/drivers/amplc_pc263.c | 18 +- drivers/staging/comedi/drivers/cb_das16_cs.c | 6 +- drivers/staging/comedi/drivers/cb_pcidda.c | 2 +- drivers/staging/comedi/drivers/cb_pcidio.c | 4 +- drivers/staging/comedi/drivers/comedi_fc.c | 5 +- drivers/staging/comedi/drivers/dmm32at.c | 2 +- drivers/staging/comedi/drivers/dt2814.c | 2 +- drivers/staging/comedi/drivers/dt282x.c | 4 +- drivers/staging/comedi/drivers/gsc_hpdi.c | 126 +- drivers/staging/comedi/drivers/icp_multi.c | 345 +- drivers/staging/comedi/drivers/ii_pci20kc.c | 83 +- drivers/staging/comedi/drivers/ke_counter.c | 21 +- drivers/staging/comedi/drivers/me4000.c | 2 +- drivers/staging/comedi/drivers/mite.c | 231 +- drivers/staging/comedi/drivers/mite.h | 7 - drivers/staging/comedi/drivers/multiq3.c | 25 +- drivers/staging/comedi/drivers/ni_6527.c | 33 +- drivers/staging/comedi/drivers/ni_at_ao.c | 6 +- drivers/staging/comedi/drivers/ni_atmio16d.c | 90 +- drivers/staging/comedi/drivers/ni_labpc.h | 52 +- drivers/staging/comedi/drivers/ni_labpc_cs.c | 13 +- drivers/staging/comedi/drivers/ni_mio_common.c | 2 +- drivers/staging/comedi/drivers/ni_mio_cs.c | 12 +- drivers/staging/comedi/drivers/ni_pcidio.c | 2 +- drivers/staging/comedi/drivers/pcl711.c | 1 + drivers/staging/comedi/drivers/pcl726.c | 41 +- drivers/staging/comedi/drivers/pcl812.c | 6 +- drivers/staging/comedi/drivers/pcl816.c | 10 +- drivers/staging/comedi/drivers/pcl818.c | 16 +- drivers/staging/comedi/drivers/pcm_common.c | 4 +- drivers/staging/comedi/drivers/pcmmio.c | 231 +- drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +- drivers/staging/comedi/drivers/rtd520.c | 2 +- drivers/staging/comedi/drivers/s626.c | 2 +- drivers/staging/comedi/drivers/s626.h | 8 - drivers/staging/comedi/drivers/serial2002.c | 13 +- drivers/staging/comedi/drivers/skel.c | 2 +- drivers/staging/comedi/drivers/usbdux.c | 21 +- drivers/staging/comedi/drivers/vmk80xx.c | 24 +- drivers/staging/cx25821/cx25821-core.c | 4 +- drivers/staging/dream/Kconfig | 12 - drivers/staging/dream/Makefile | 4 - drivers/staging/dream/camera/Kconfig | 46 - drivers/staging/dream/camera/Makefile | 7 - drivers/staging/dream/camera/msm_camera.c | 2181 ---- drivers/staging/dream/camera/msm_io7x.c | 291 - drivers/staging/dream/camera/msm_io8x.c | 320 - drivers/staging/dream/camera/msm_v4l2.c | 797 -- drivers/staging/dream/camera/msm_vfe7x.c | 701 -- drivers/staging/dream/camera/msm_vfe7x.h | 255 - drivers/staging/dream/camera/msm_vfe8x.c | 756 -- drivers/staging/dream/camera/msm_vfe8x.h | 895 -- drivers/staging/dream/camera/msm_vfe8x_proc.c | 4003 -------- drivers/staging/dream/camera/msm_vfe8x_proc.h | 1549 --- drivers/staging/dream/camera/mt9d112.c | 761 -- drivers/staging/dream/camera/mt9d112.h | 36 - drivers/staging/dream/camera/mt9d112_reg.c | 307 - drivers/staging/dream/camera/mt9p012.h | 51 - drivers/staging/dream/camera/mt9p012_fox.c | 1305 --- drivers/staging/dream/camera/mt9p012_reg.c | 573 -- drivers/staging/dream/camera/mt9t013.c | 1496 --- drivers/staging/dream/camera/mt9t013.h | 48 - drivers/staging/dream/camera/mt9t013_reg.c | 266 - drivers/staging/dream/camera/s5k3e2fx.c | 1310 --- drivers/staging/dream/camera/s5k3e2fx.h | 9 - drivers/staging/dream/gpio_axis.c | 180 - drivers/staging/dream/gpio_event.c | 224 - drivers/staging/dream/gpio_input.c | 343 - drivers/staging/dream/gpio_matrix.c | 406 - drivers/staging/dream/gpio_output.c | 84 - drivers/staging/dream/qdsp5/Makefile | 17 - drivers/staging/dream/qdsp5/adsp.c | 1163 --- drivers/staging/dream/qdsp5/adsp.h | 369 - drivers/staging/dream/qdsp5/adsp_6210.c | 283 - drivers/staging/dream/qdsp5/adsp_6220.c | 284 - drivers/staging/dream/qdsp5/adsp_6225.c | 328 - drivers/staging/dream/qdsp5/adsp_driver.c | 641 -- drivers/staging/dream/qdsp5/adsp_info.c | 121 - .../staging/dream/qdsp5/adsp_jpeg_patch_event.c | 31 - drivers/staging/dream/qdsp5/adsp_jpeg_verify_cmd.c | 182 - drivers/staging/dream/qdsp5/adsp_lpm_verify_cmd.c | 65 - drivers/staging/dream/qdsp5/adsp_vfe_patch_event.c | 54 - drivers/staging/dream/qdsp5/adsp_vfe_verify_cmd.c | 239 - .../staging/dream/qdsp5/adsp_video_verify_cmd.c | 163 - .../staging/dream/qdsp5/adsp_videoenc_verify_cmd.c | 235 - drivers/staging/dream/qdsp5/audio_aac.c | 1052 -- drivers/staging/dream/qdsp5/audio_amrnb.c | 873 -- drivers/staging/dream/qdsp5/audio_evrc.c | 845 -- drivers/staging/dream/qdsp5/audio_in.c | 967 -- drivers/staging/dream/qdsp5/audio_mp3.c | 971 -- drivers/staging/dream/qdsp5/audio_out.c | 851 -- drivers/staging/dream/qdsp5/audio_qcelp.c | 856 -- drivers/staging/dream/qdsp5/audmgr.c | 313 - drivers/staging/dream/qdsp5/audmgr.h | 215 - drivers/staging/dream/qdsp5/audmgr_new.h | 213 - drivers/staging/dream/qdsp5/audpp.c | 429 - drivers/staging/dream/qdsp5/evlog.h | 133 - drivers/staging/dream/qdsp5/snd.c | 279 - drivers/staging/dream/smd/Kconfig | 26 - drivers/staging/dream/smd/Makefile | 6 - .../staging/dream/smd/rpc_server_dog_keepalive.c | 68 - drivers/staging/dream/smd/rpc_server_time_remote.c | 77 - drivers/staging/dream/smd/smd.c | 1330 --- drivers/staging/dream/smd/smd_private.h | 171 - drivers/staging/dream/smd/smd_qmi.c | 860 -- drivers/staging/dream/smd/smd_rpcrouter.c | 1274 --- drivers/staging/dream/smd/smd_rpcrouter.h | 195 - drivers/staging/dream/smd/smd_rpcrouter_device.c | 376 - drivers/staging/dream/smd/smd_rpcrouter_servers.c | 229 - drivers/staging/dream/smd/smd_tty.c | 213 - drivers/staging/dream/synaptics_i2c_rmi.c | 658 -- drivers/staging/dream/synaptics_i2c_rmi.h | 53 - drivers/staging/dst/crypto.c | 64 +- drivers/staging/dst/dcore.c | 26 +- drivers/staging/dst/export.c | 33 +- drivers/staging/dst/state.c | 75 +- drivers/staging/dst/thread_pool.c | 39 +- drivers/staging/dst/trans.c | 18 +- drivers/staging/et131x/et1310_address_map.h | 866 +-- drivers/staging/et131x/et1310_eeprom.c | 436 +- drivers/staging/et131x/et1310_eeprom.h | 42 +- drivers/staging/et131x/et1310_mac.c | 318 +- drivers/staging/et131x/et1310_phy.c | 1167 +-- drivers/staging/et131x/et1310_phy.h | 35 +- drivers/staging/et131x/et1310_rx.c | 565 +- drivers/staging/et131x/et1310_rx.h | 52 +- drivers/staging/et131x/et1310_tx.c | 622 +- drivers/staging/et131x/et1310_tx.h | 218 +- drivers/staging/et131x/et131x_adapter.h | 18 +- drivers/staging/et131x/et131x_defs.h | 1 - drivers/staging/et131x/et131x_initpci.c | 596 +- drivers/staging/et131x/et131x_initpci.h | 2 +- drivers/staging/et131x/et131x_isr.c | 33 +- drivers/staging/et131x/et131x_netdev.c | 31 +- drivers/staging/hv/hv_api.h | 4 +- drivers/staging/iio/Documentation/device.txt | 4 +- drivers/staging/iio/Documentation/overview.txt | 9 +- drivers/staging/iio/Kconfig | 10 +- drivers/staging/iio/accel/Kconfig | 2 + drivers/staging/iio/accel/accel.h | 6 +- drivers/staging/iio/accel/sca3000.h | 4 +- drivers/staging/iio/accel/sca3000_core.c | 2 +- drivers/staging/iio/adc/Kconfig | 10 + drivers/staging/iio/adc/Makefile | 2 +- drivers/staging/iio/adc/max1363.h | 6 +- drivers/staging/iio/chrdev.h | 4 +- drivers/staging/iio/iio.h | 36 +- drivers/staging/iio/light/Kconfig | 18 +- drivers/staging/iio/light/Makefile | 2 +- drivers/staging/iio/light/tsl2561.c | 272 - drivers/staging/iio/light/tsl2563.c | 773 ++ drivers/staging/iio/light/tsl2563.h | 9 + drivers/staging/iio/ring_generic.h | 73 +- drivers/staging/iio/ring_sw.h | 68 +- drivers/staging/iio/sysfs.h | 114 +- drivers/staging/iio/trigger.h | 35 +- drivers/staging/iio/trigger/Kconfig | 6 +- drivers/staging/iio/trigger_consumer.h | 8 +- drivers/staging/line6/capture.c | 98 +- drivers/staging/line6/control.c | 493 +- drivers/staging/line6/driver.c | 103 +- drivers/staging/line6/midi.c | 16 +- drivers/staging/line6/pcm.c | 3 +- drivers/staging/line6/playback.c | 101 +- drivers/staging/line6/pod.c | 60 +- drivers/staging/line6/toneport.c | 119 +- drivers/staging/line6/variax.c | 31 +- drivers/staging/octeon/cvmx-pow.h | 2 +- drivers/staging/octeon/ethernet-rgmii.c | 4 +- drivers/staging/octeon/ethernet-tx.c | 2 +- drivers/staging/otus/80211core/ccmd.c | 4 +- drivers/staging/otus/80211core/cmm.c | 4 +- drivers/staging/otus/80211core/cmmsta.c | 4 +- drivers/staging/otus/80211core/ctxrx.c | 2 +- drivers/staging/otus/80211core/pub_zfi.h | 2 +- drivers/staging/otus/apdbg.c | 667 +- drivers/staging/otus/athr_common.h | 10 +- drivers/staging/otus/oal_dt.h | 10 +- drivers/staging/otus/oal_marc.h | 84 +- drivers/staging/otus/usbdrv.c | 35 +- drivers/staging/otus/usbdrv.h | 140 +- drivers/staging/otus/wrap_buf.c | 20 +- drivers/staging/otus/wrap_dbg.c | 61 +- drivers/staging/otus/wrap_ev.c | 350 +- drivers/staging/otus/wrap_mem.c | 90 +- drivers/staging/otus/wrap_mis.c | 61 +- drivers/staging/otus/wrap_pkt.c | 210 +- drivers/staging/otus/wrap_sec.c | 123 +- drivers/staging/otus/wrap_usb.c | 213 +- drivers/staging/otus/zdusb.h | 4 +- drivers/staging/p9auth/p9auth.c | 3 +- drivers/staging/phison/phison.c | 4 +- drivers/staging/poch/README | 124 +- drivers/staging/poch/poch.c | 198 +- drivers/staging/poch/poch.h | 16 +- drivers/staging/quatech_usb2/quatech_usb2.c | 2 +- drivers/staging/ramzswap/Kconfig | 21 + drivers/staging/ramzswap/Makefile | 3 + drivers/staging/ramzswap/TODO | 6 + drivers/staging/ramzswap/ramzswap.txt | 51 + drivers/staging/ramzswap/ramzswap_drv.c | 1435 +++ drivers/staging/ramzswap/ramzswap_drv.h | 171 + drivers/staging/ramzswap/ramzswap_ioctl.h | 49 + drivers/staging/ramzswap/xvmalloc.c | 507 + drivers/staging/ramzswap/xvmalloc.h | 30 + drivers/staging/ramzswap/xvmalloc_int.h | 86 + drivers/staging/rar/rar_driver.c | 4 +- drivers/staging/rt2860/2860_main_dev.c | 1319 --- drivers/staging/rt2860/Kconfig | 7 +- drivers/staging/rt2860/Makefile | 31 +- drivers/staging/rt2860/TODO | 1 - drivers/staging/rt2860/aironet.h | 210 - drivers/staging/rt2860/ap.h | 46 +- drivers/staging/{rt3090 => rt2860/chip}/mac_pci.h | 301 +- drivers/staging/rt2860/chip/mac_usb.h | 347 + .../{rt3090/netif_block.h => rt2860/chip/rt2860.h} | 42 +- .../{rt3090/rt33xx.h => rt2860/chip/rt2870.h} | 30 +- .../{rt3090/rt3370.h => rt2860/chip/rt3070.h} | 27 +- drivers/staging/{rt3090 => rt2860/chip}/rt3090.h | 21 +- drivers/staging/{rt3090 => rt2860/chip}/rt30xx.h | 9 +- drivers/staging/rt2860/chip/rtmp_mac.h | 1307 +++ drivers/staging/{rt3090 => rt2860/chip}/rtmp_phy.h | 191 +- drivers/staging/rt2860/chips/rt3070.c | 169 + drivers/staging/{rt3090 => rt2860}/chips/rt3090.c | 72 +- drivers/staging/{rt3090 => rt2860}/chips/rt30xx.c | 429 +- drivers/staging/rt2860/chlist.h | 1250 +--- drivers/staging/rt2860/common/2860_rtmp_init.c | 897 -- drivers/staging/rt2860/common/action.c | 658 +- drivers/staging/rt2860/common/action.h | 31 +- drivers/staging/rt2860/common/ba_action.c | 1813 ++-- .../staging/{rt3090 => rt2860}/common/cmm_aes.c | 1319 +-- drivers/staging/rt2860/common/cmm_asic.c | 2565 +++++ .../staging/{rt3090 => rt2860}/common/cmm_cfg.c | 239 +- drivers/staging/rt2860/common/cmm_data.c | 2881 +++---- drivers/staging/rt2860/common/cmm_data_2860.c | 1199 --- drivers/staging/rt2860/common/cmm_data_pci.c | 1096 ++ drivers/staging/rt2860/common/cmm_data_usb.c | 951 ++ drivers/staging/rt2860/common/cmm_info.c | 3503 ++------ drivers/staging/rt2860/common/cmm_mac_pci.c | 1661 ++++ drivers/staging/rt2860/common/cmm_mac_usb.c | 1165 +++ drivers/staging/rt2860/common/cmm_sanity.c | 1635 ++-- drivers/staging/rt2860/common/cmm_sync.c | 789 +- drivers/staging/rt2860/common/cmm_tkip.c | 833 ++ .../staging/{rt3090 => rt2860}/common/cmm_wep.c | 225 +- drivers/staging/rt2860/common/cmm_wpa.c | 3120 +++++- drivers/staging/rt2860/common/crypt_hmac.c | 187 + drivers/staging/rt2860/common/crypt_md5.c | 339 + drivers/staging/rt2860/common/crypt_sha2.c | 269 + drivers/staging/rt2860/common/dfs.c | 372 +- drivers/staging/rt2860/common/ee_efuse.c | 344 + drivers/staging/rt2860/common/ee_prom.c | 197 + drivers/staging/rt2860/common/eeprom.c | 1482 +--- drivers/staging/rt2860/common/firmware.h | 2 +- drivers/staging/rt2860/common/firmware_3070.h | 517 + drivers/staging/rt2860/common/md5.c | 1415 --- drivers/staging/rt2860/common/mlme.c |10404 +++++++------------- drivers/staging/rt2860/common/rt_channel.c | 1705 ++++ drivers/staging/{rt3090 => rt2860}/common/rt_rf.c | 103 +- drivers/staging/rt2860/common/rtmp_init.c | 4299 ++++----- drivers/staging/rt2860/common/rtmp_mcu.c | 291 + .../staging/{rt3090 => rt2860}/common/rtmp_timer.c | 163 +- drivers/staging/rt2860/common/rtmp_tkip.c | 1586 --- drivers/staging/rt2860/common/rtmp_wep.c | 497 - drivers/staging/rt2860/common/spectrum.c | 1975 +++-- drivers/staging/rt2860/config.mk | 241 - drivers/staging/{rt3090 => rt2860}/crypt_hmac.h | 46 +- drivers/staging/{rt3090 => rt2860}/crypt_md5.h | 51 +- .../{rt3090/vr_ikans.h => rt2860/crypt_sha2.h} | 68 +- drivers/staging/rt2860/dfs.h | 51 +- drivers/staging/{rt3090 => rt2860}/eeprom.h | 61 +- .../staging/{rt3090 => rt2860/iface}/rtmp_pci.h | 56 +- drivers/staging/rt2860/iface/rtmp_usb.h | 182 + drivers/staging/rt2860/md5.h | 107 - drivers/staging/rt2860/mlme.h | 1874 ++-- drivers/staging/rt2860/oid.h | 1240 ++-- drivers/staging/rt2860/pci_main_dev.c | 1190 +++ drivers/staging/rt2860/rt2860.h | 333 - drivers/staging/rt2860/rt28xx.h | 1688 ---- drivers/staging/rt2860/rt_config.h | 29 +- drivers/staging/rt2860/rt_linux.c | 1371 ++- drivers/staging/rt2860/rt_linux.h | 1017 +- drivers/staging/rt2860/rt_main_dev.c | 1006 +-- drivers/staging/rt2860/rt_pci_rbus.c | 840 ++ drivers/staging/rt2860/rt_profile.c | 1862 ---- drivers/staging/rt2860/rt_usb.c | 799 ++ drivers/staging/rt2860/rtmp.h | 9536 +++++++----------- drivers/staging/rt2860/rtmp_chip.h | 258 + drivers/staging/rt2860/rtmp_ckipmic.h | 45 +- drivers/staging/rt2860/rtmp_def.h | 1109 +-- drivers/staging/rt2860/rtmp_dot11.h | 100 + drivers/staging/{rt3090 => rt2860}/rtmp_iface.h | 64 +- drivers/staging/{rt3090 => rt2860}/rtmp_mcu.h | 18 +- drivers/staging/{rt3090 => rt2860}/rtmp_os.h | 55 +- drivers/staging/{rt3090 => rt2860}/rtmp_timer.h | 107 +- drivers/staging/rt2860/rtmp_type.h | 85 +- drivers/staging/rt2860/rtusb_io.h | 185 + drivers/staging/rt2860/spectrum.h | 223 +- drivers/staging/rt2860/spectrum_def.h | 189 +- drivers/staging/rt2860/sta/aironet.c | 1312 --- drivers/staging/rt2860/sta/assoc.c | 2082 ++--- drivers/staging/rt2860/sta/auth.c | 635 +- drivers/staging/rt2860/sta/auth_rsp.c | 134 +- drivers/staging/rt2860/sta/connect.c | 3220 +++--- drivers/staging/rt2860/sta/rtmp_data.c | 3024 +++--- drivers/staging/rt2860/sta/sanity.c | 535 +- drivers/staging/rt2860/sta/sync.c | 2712 +++--- drivers/staging/rt2860/sta/wpa.c | 2158 +---- drivers/staging/rt2860/sta_ioctl.c | 4866 ++++------ drivers/staging/rt2860/usb_main_dev.c | 887 ++ drivers/staging/rt2860/wpa.h | 454 +- drivers/staging/rt2870/2870_main_dev.c | 1530 --- drivers/staging/rt2870/Kconfig | 2 + drivers/staging/rt2870/Makefile | 32 +- drivers/staging/rt2870/chips/rt3070.c | 1 + drivers/staging/rt2870/chips/rt30xx.c | 1 + drivers/staging/rt2870/common/2870_rtmp_init.c | 1730 ---- drivers/staging/rt2870/common/acction.c | 1 + drivers/staging/rt2870/common/cmm_aes.c | 1 + drivers/staging/rt2870/common/cmm_asic.c | 1 + drivers/staging/rt2870/common/cmm_cfg.c | 1 + drivers/staging/rt2870/common/cmm_data_2870.c | 936 -- drivers/staging/rt2870/common/cmm_data_usb.c | 1 + drivers/staging/rt2870/common/cmm_mac_usb.c | 1 + drivers/staging/rt2870/common/cmm_profile.c | 1 + drivers/staging/rt2870/common/cmm_tkip.c | 1 + drivers/staging/rt2870/common/cmm_wep.c | 1 + drivers/staging/rt2870/common/crypt_hmac.c | 1 + drivers/staging/rt2870/common/crypt_md5.c | 1 + drivers/staging/rt2870/common/crypt_sha2.c | 1 + drivers/staging/rt2870/common/ee_efuse.c | 1 + drivers/staging/rt2870/common/rt_channel.c | 1 + drivers/staging/rt2870/common/rt_rf.c | 1 + drivers/staging/rt2870/common/rtmp_mcu.c | 1 + drivers/staging/rt2870/common/rtmp_timer.c | 1 + drivers/staging/rt2870/common/rtusb_bulk.c | 1067 +- drivers/staging/rt2870/common/rtusb_data.c | 220 +- drivers/staging/rt2870/common/rtusb_io.c | 2672 +++--- drivers/staging/rt2870/rt2870.h | 583 -- drivers/staging/rt2870/rt_usb.c | 1 + drivers/staging/rt2870/usb_main_dev.c | 1 + drivers/staging/rt3070/firmware.h | 2 +- drivers/staging/rt3070/md4.h | 12 +- drivers/staging/rt3090/Kconfig | 5 - drivers/staging/rt3090/Makefile | 80 - drivers/staging/rt3090/action.h | 66 - drivers/staging/rt3090/ap.h | 512 - drivers/staging/rt3090/ap_apcli.h | 276 - drivers/staging/rt3090/ap_autoChSel.h | 79 - drivers/staging/rt3090/ap_autoChSel_cmm.h | 66 - drivers/staging/rt3090/ap_cfg.h | 118 - drivers/staging/rt3090/ap_ids.h | 82 - drivers/staging/rt3090/ap_mbss.h | 72 - drivers/staging/rt3090/ap_uapsd.h | 636 -- drivers/staging/rt3090/ap_wds.h | 212 - drivers/staging/rt3090/chips/rt3370.c | 121 - drivers/staging/rt3090/chips/rt3390.c | 122 - drivers/staging/rt3090/chips/rt33xx.c | 536 - drivers/staging/rt3090/chlist.h | 130 - drivers/staging/rt3090/common/action.c | 1057 -- drivers/staging/rt3090/common/ba_action.c | 1779 ---- drivers/staging/rt3090/common/cmm_asic.c | 2753 ------ drivers/staging/rt3090/common/cmm_data.c | 2763 ------ drivers/staging/rt3090/common/cmm_data_pci.c | 1576 --- drivers/staging/rt3090/common/cmm_info.c | 3718 ------- drivers/staging/rt3090/common/cmm_mac_pci.c | 1757 ---- drivers/staging/rt3090/common/cmm_profile.c | 2321 ----- drivers/staging/rt3090/common/cmm_sanity.c | 1718 ---- drivers/staging/rt3090/common/cmm_sync.c | 734 -- drivers/staging/rt3090/common/cmm_tkip.c | 966 -- drivers/staging/rt3090/common/cmm_wpa.c | 3149 ------ drivers/staging/rt3090/common/crypt_aes.c | 1007 -- drivers/staging/rt3090/common/crypt_biginteger.c | 1119 --- drivers/staging/rt3090/common/crypt_dh.c | 234 - drivers/staging/rt3090/common/crypt_hmac.c | 279 - drivers/staging/rt3090/common/crypt_md5.c | 353 - drivers/staging/rt3090/common/crypt_sha2.c | 536 - drivers/staging/rt3090/common/dfs.c | 481 - drivers/staging/rt3090/common/ee_efuse.c | 1548 --- drivers/staging/rt3090/common/ee_prom.c | 308 - drivers/staging/rt3090/common/eeprom.c | 98 - drivers/staging/rt3090/common/igmp_snoop.c | 1365 --- drivers/staging/rt3090/common/mlme.c | 6550 ------------ drivers/staging/rt3090/common/mlme_ex.c | 215 - drivers/staging/rt3090/common/netif_block.c | 147 - drivers/staging/rt3090/common/rt_channel.c | 1287 --- drivers/staging/rt3090/common/rtmp_init.c | 3882 -------- drivers/staging/rt3090/common/rtmp_mcu.c | 560 -- drivers/staging/rt3090/common/spectrum.c | 2221 ----- drivers/staging/rt3090/config.mk | 187 - drivers/staging/rt3090/crypt_sha2.h | 107 - drivers/staging/rt3090/dfs.h | 137 - drivers/staging/rt3090/firmware.h | 2 +- drivers/staging/rt3090/igmp_snoop.h | 152 - drivers/staging/rt3090/ipv6.h | 215 - drivers/staging/rt3090/link_list.h | 133 - drivers/staging/rt3090/mlme.h | 1360 --- drivers/staging/rt3090/mlme_ex.h | 83 - drivers/staging/rt3090/mlme_ex_def.h | 53 - drivers/staging/rt3090/oid.h | 1144 --- drivers/staging/rt3090/pci_main_dev.c | 1195 --- drivers/staging/rt3090/rt3390.h | 77 - drivers/staging/rt3090/rt_ate.c | 6089 ------------ drivers/staging/rt3090/rt_ate.h | 314 - drivers/staging/rt3090/rt_config.h | 126 - drivers/staging/rt3090/rt_linux.c | 1624 --- drivers/staging/rt3090/rt_linux.h | 1034 -- drivers/staging/rt3090/rt_main_dev.c | 897 -- drivers/staging/rt3090/rt_pci_rbus.c | 989 -- drivers/staging/rt3090/rt_profile.c | 101 - drivers/staging/rt3090/rtmp.h | 6873 ------------- drivers/staging/rt3090/rtmp_chip.h | 355 - drivers/staging/rt3090/rtmp_def.h | 1650 ---- drivers/staging/rt3090/rtmp_dot11.h | 146 - drivers/staging/rt3090/rtmp_mac.h | 2304 ----- drivers/staging/rt3090/rtmp_type.h | 147 - drivers/staging/rt3090/spectrum.h | 234 - drivers/staging/rt3090/spectrum_def.h | 257 - drivers/staging/rt3090/sta/assoc.c | 1673 ---- drivers/staging/rt3090/sta/auth.c | 491 - drivers/staging/rt3090/sta/auth_rsp.c | 151 - drivers/staging/rt3090/sta/connect.c | 2759 ------ drivers/staging/rt3090/sta/dls.c | 2207 ----- drivers/staging/rt3090/sta/rtmp_ckipmic.c | 579 -- drivers/staging/rt3090/sta/rtmp_data.c | 2661 ----- drivers/staging/rt3090/sta/sanity.c | 382 - drivers/staging/rt3090/sta/sync.c | 1840 ---- drivers/staging/rt3090/sta/wpa.c | 396 - drivers/staging/rt3090/sta_ioctl.c | 7557 -------------- drivers/staging/rt3090/wpa.h | 447 - drivers/staging/rtl8187se/Kconfig | 3 +- drivers/staging/rtl8187se/Makefile | 4 +- drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 1 - .../rtl8187se/ieee80211/ieee80211_softmac.c | 6 +- drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 1 - drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 1 - drivers/staging/rtl8187se/r8180.h | 20 +- drivers/staging/rtl8187se/r8180_core.c | 258 +- drivers/staging/rtl8187se/r8180_dm.c | 13 +- drivers/staging/rtl8187se/r8180_rtl8225z2.c | 101 +- drivers/staging/rtl8187se/r8180_wx.c | 2 +- drivers/staging/rtl8187se/r8185b_init.c | 33 +- .../staging/rtl8192e/ieee80211/ieee80211_module.c | 2 +- .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 4 +- drivers/staging/rtl8192e/r8190_rtl8256.c | 2 +- drivers/staging/rtl8192e/r8192E_core.c | 6 +- drivers/staging/rtl8192e/r8192E_dm.c | 20 +- drivers/staging/rtl8192e/r8192E_wx.c | 2 +- drivers/staging/rtl8192e/r819xE_cmdpkt.c | 2 +- drivers/staging/rtl8192e/r819xE_phyreg.h | 2 +- drivers/staging/rtl8192su/Kconfig | 2 +- .../staging/rtl8192su/ieee80211/ieee80211_module.c | 2 +- drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 1 - .../rtl8192su/ieee80211/ieee80211_softmac.c | 4 +- drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 1 - drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 1 - drivers/staging/rtl8192su/ieee80211/readme | 2 +- drivers/staging/rtl8192su/r8192S_phy.c | 4 +- drivers/staging/rtl8192su/r8192S_phyreg.h | 2 +- drivers/staging/rtl8192su/r8192S_rtl6052.c | 4 +- drivers/staging/rtl8192su/r8192U_dm.c | 10 +- drivers/staging/rtl8192su/r8192U_wx.c | 2 +- drivers/staging/rtl8192su/r819xU_cmdpkt.c | 2 +- drivers/staging/rtl8192u/Kconfig | 6 + drivers/staging/rtl8192u/Makefile | 33 + drivers/staging/rtl8192u/authors | 1 + drivers/staging/rtl8192u/changes | 5 + drivers/staging/rtl8192u/copying | 340 + drivers/staging/rtl8192u/dot11d.h | 102 + drivers/staging/rtl8192u/ieee80211.h | 2638 +++++ drivers/staging/rtl8192u/ieee80211/EndianFree.h | 194 + drivers/staging/rtl8192u/ieee80211/Makefile | 139 + drivers/staging/rtl8192u/ieee80211/aes.c | 469 + drivers/staging/rtl8192u/ieee80211/api.c | 246 + drivers/staging/rtl8192u/ieee80211/arc4.c | 103 + drivers/staging/rtl8192u/ieee80211/autoload.c | 40 + drivers/staging/rtl8192u/ieee80211/cipher.c | 299 + drivers/staging/rtl8192u/ieee80211/compress.c | 64 + drivers/staging/rtl8192u/ieee80211/crypto_compat.h | 60 + drivers/staging/rtl8192u/ieee80211/digest.c | 108 + drivers/staging/rtl8192u/ieee80211/dot11d.c | 223 + drivers/staging/rtl8192u/ieee80211/dot11d.h | 102 + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 2639 +++++ .../staging/rtl8192u/ieee80211/ieee80211_crypt.c | 244 + .../staging/rtl8192u/ieee80211/ieee80211_crypt.h | 86 + .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 480 + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 780 ++ .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 297 + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 324 + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2668 +++++ .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 3287 +++++++ .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 615 ++ drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 912 ++ drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 878 ++ drivers/staging/rtl8192u/ieee80211/internal.h | 99 + drivers/staging/rtl8192u/ieee80211/kmap_types.h | 20 + drivers/staging/rtl8192u/ieee80211/michael_mic.c | 194 + drivers/staging/rtl8192u/ieee80211/proc.c | 116 + drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h | 69 + .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 737 ++ drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h | 481 + .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 1462 +++ drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 583 ++ drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 56 + .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 628 ++ drivers/staging/rtl8192u/ieee80211/rtl_crypto.h | 399 + drivers/staging/rtl8192u/ieee80211/scatterwalk.c | 126 + drivers/staging/rtl8192u/ieee80211/scatterwalk.h | 51 + drivers/staging/rtl8192u/ieee80211_crypt.h | 86 + drivers/staging/rtl8192u/r8180_93cx6.c | 146 + drivers/staging/rtl8192u/r8180_93cx6.h | 40 + drivers/staging/rtl8192u/r8180_pm.c | 48 + drivers/staging/rtl8192u/r8180_pm.h | 28 + drivers/staging/rtl8192u/r8190_rtl8256.c | 312 + drivers/staging/rtl8192u/r8190_rtl8256.h | 27 + drivers/staging/rtl8192u/r8192U.h | 1263 +++ drivers/staging/rtl8192u/r8192U_core.c | 6085 ++++++++++++ drivers/staging/rtl8192u/r8192U_dm.c | 3890 ++++++++ drivers/staging/rtl8192u/r8192U_dm.h | 254 + drivers/staging/rtl8192u/r8192U_hw.h | 411 + drivers/staging/rtl8192u/r8192U_wx.c | 1228 +++ drivers/staging/rtl8192u/r8192U_wx.h | 23 + drivers/staging/rtl8192u/r819xU_HTGen.h | 13 + drivers/staging/rtl8192u/r819xU_HTType.h | 391 + drivers/staging/rtl8192u/r819xU_cmdpkt.c | 791 ++ drivers/staging/rtl8192u/r819xU_cmdpkt.h | 207 + drivers/staging/rtl8192u/r819xU_firmware.c | 434 + drivers/staging/rtl8192u/r819xU_firmware.h | 27 + drivers/staging/rtl8192u/r819xU_firmware_img.c | 3447 +++++++ drivers/staging/rtl8192u/r819xU_firmware_img.h | 35 + drivers/staging/rtl8192u/r819xU_phy.c | 1777 ++++ drivers/staging/rtl8192u/r819xU_phy.h | 90 + drivers/staging/rtl8192u/r819xU_phyreg.h | 871 ++ drivers/staging/samsung-laptop/Kconfig | 10 + drivers/staging/samsung-laptop/Makefile | 1 + drivers/staging/samsung-laptop/TODO | 5 + drivers/staging/samsung-laptop/samsung-laptop.c | 542 + drivers/staging/sep/sep_driver.c | 6 +- drivers/staging/serqt_usb2/serqt_usb2.c | 2 +- drivers/staging/slicoss/slicoss.c | 1 - drivers/staging/usbip/vhci_hcd.c | 2 +- drivers/staging/vme/TODO | 2 +- drivers/staging/vme/bridges/vme_ca91cx42.c | 82 +- drivers/staging/vme/bridges/vme_tsi148.c | 161 +- drivers/staging/vme/devices/vme_user.c | 3 +- drivers/staging/vme/vme.c | 101 +- drivers/staging/vme/vme.h | 8 +- drivers/staging/vme/vme_api.txt | 8 +- drivers/staging/vme/vme_bridge.h | 9 +- drivers/staging/vt6655/Kconfig | 2 +- drivers/staging/vt6655/device.h | 2 - drivers/staging/vt6655/device_main.c | 2 +- drivers/staging/vt6655/ioctl.c | 4 +- drivers/staging/vt6655/kcompat.h | 39 - drivers/staging/vt6655/mib.h | 4 +- drivers/staging/vt6655/rxtx.h | 17 - drivers/staging/vt6655/wcmd.c | 1 - drivers/staging/vt6655/wpa.c | 4 +- drivers/staging/vt6655/wroute.c | 2 +- drivers/staging/vt6656/Kconfig | 2 +- drivers/staging/vt6656/baseband.c | 3 +- drivers/staging/vt6656/channel.c | 2 +- drivers/staging/vt6656/device.h | 4 +- drivers/staging/vt6656/firmware.c | 2 +- drivers/staging/vt6656/hostap.c | 1 - drivers/staging/vt6656/ioctl.c | 4 +- drivers/staging/vt6656/iwctl.c | 2 +- drivers/staging/vt6656/kcompat.h | 39 - drivers/staging/vt6656/main_usb.c | 10 +- drivers/staging/vt6656/mib.h | 4 +- drivers/staging/vt6656/rxtx.c | 2 +- drivers/staging/vt6656/wcmd.c | 3 +- drivers/staging/vt6656/wpa.c | 4 +- drivers/staging/wlags49_h2/Kconfig | 9 + drivers/staging/wlags49_h2/Makefile | 81 + drivers/staging/wlags49_h2/README.ubuntu | 180 + drivers/staging/wlags49_h2/README.wlags49 | 641 ++ drivers/staging/wlags49_h2/TODO | 33 + drivers/staging/wlags49_h2/WARNING.txt | 3 + drivers/staging/wlags49_h2/ap_h2.c | 3337 +++++++ drivers/staging/wlags49_h2/ap_h25.c | 4094 ++++++++ drivers/staging/wlags49_h2/debug.h | 212 + drivers/staging/wlags49_h2/dhf.c | 390 + drivers/staging/wlags49_h2/dhf.h | 226 + drivers/staging/wlags49_h2/dhfcfg.h | 158 + drivers/staging/wlags49_h2/hcf.c | 4881 +++++++++ drivers/staging/wlags49_h2/hcf.h | 405 + drivers/staging/wlags49_h2/hcfcfg.h | 2344 +++++ drivers/staging/wlags49_h2/hcfdef.h | 809 ++ drivers/staging/wlags49_h2/man/wlags49.4 | 734 ++ drivers/staging/wlags49_h2/mdd.h | 1156 +++ drivers/staging/wlags49_h2/mmd.c | 251 + drivers/staging/wlags49_h2/mmd.h | 78 + drivers/staging/wlags49_h2/sta_h2.c | 4480 +++++++++ drivers/staging/wlags49_h2/sta_h25.c | 5255 ++++++++++ drivers/staging/wlags49_h2/wl_cs.c | 702 ++ drivers/staging/wlags49_h2/wl_cs.h | 95 + drivers/staging/wlags49_h2/wl_enc.c | 231 + drivers/staging/wlags49_h2/wl_enc.h | 118 + drivers/staging/wlags49_h2/wl_if.h | 234 + drivers/staging/wlags49_h2/wl_internal.h | 1056 ++ drivers/staging/wlags49_h2/wl_main.c | 3866 ++++++++ drivers/staging/wlags49_h2/wl_main.h | 138 + drivers/staging/wlags49_h2/wl_netdev.c | 2070 ++++ drivers/staging/wlags49_h2/wl_netdev.h | 154 + drivers/staging/wlags49_h2/wl_pci.c | 1581 +++ drivers/staging/wlags49_h2/wl_pci.h | 109 + drivers/staging/wlags49_h2/wl_priv.c | 2078 ++++ drivers/staging/wlags49_h2/wl_priv.h | 121 + drivers/staging/wlags49_h2/wl_profile.c | 1111 +++ drivers/staging/wlags49_h2/wl_profile.h | 87 + drivers/staging/wlags49_h2/wl_sysfs.c | 135 + drivers/staging/wlags49_h2/wl_sysfs.h | 7 + drivers/staging/wlags49_h2/wl_util.c | 1587 +++ drivers/staging/wlags49_h2/wl_util.h | 105 + drivers/staging/wlags49_h2/wl_version.h | 179 + drivers/staging/wlags49_h2/wl_wext.c | 4130 ++++++++ drivers/staging/wlags49_h2/wl_wext.h | 96 + drivers/staging/wlags49_h25/Kconfig | 9 + drivers/staging/wlags49_h25/Makefile | 81 + drivers/staging/wlags49_h25/README.txt | 30 + drivers/staging/wlags49_h25/TODO | 33 + drivers/staging/wlags49_h25/ap_h25.c | 2 + drivers/staging/wlags49_h25/debug.h | 2 + drivers/staging/wlags49_h25/dhf.c | 2 + drivers/staging/wlags49_h25/dhf.h | 2 + drivers/staging/wlags49_h25/dhfcfg.h | 2 + drivers/staging/wlags49_h25/hcf.c | 2 + drivers/staging/wlags49_h25/hcf.h | 2 + drivers/staging/wlags49_h25/hcfcfg.h | 2 + drivers/staging/wlags49_h25/hcfdef.h | 2 + drivers/staging/wlags49_h25/mdd.h | 2 + drivers/staging/wlags49_h25/mmd.c | 2 + drivers/staging/wlags49_h25/mmd.h | 2 + drivers/staging/wlags49_h25/sta_h25.c | 2 + drivers/staging/wlags49_h25/wl_cs.c | 2 + drivers/staging/wlags49_h25/wl_cs.h | 2 + drivers/staging/wlags49_h25/wl_enc.c | 2 + drivers/staging/wlags49_h25/wl_enc.h | 2 + drivers/staging/wlags49_h25/wl_if.h | 2 + drivers/staging/wlags49_h25/wl_internal.h | 2 + drivers/staging/wlags49_h25/wl_main.c | 2 + drivers/staging/wlags49_h25/wl_main.h | 2 + drivers/staging/wlags49_h25/wl_netdev.c | 2 + drivers/staging/wlags49_h25/wl_netdev.h | 2 + drivers/staging/wlags49_h25/wl_priv.c | 2 + drivers/staging/wlags49_h25/wl_priv.h | 2 + drivers/staging/wlags49_h25/wl_profile.c | 2 + drivers/staging/wlags49_h25/wl_profile.h | 2 + drivers/staging/wlags49_h25/wl_sysfs.c | 2 + drivers/staging/wlags49_h25/wl_sysfs.h | 2 + drivers/staging/wlags49_h25/wl_util.c | 2 + drivers/staging/wlags49_h25/wl_util.h | 2 + drivers/staging/wlags49_h25/wl_version.h | 2 + drivers/staging/wlags49_h25/wl_wext.c | 2 + drivers/staging/wlags49_h25/wl_wext.h | 2 + 737 files changed, 164093 insertions(+), 211389 deletions(-) delete mode 100644 drivers/staging/android/Kconfig delete mode 100644 drivers/staging/android/Makefile delete mode 100644 drivers/staging/android/TODO delete mode 100644 drivers/staging/android/binder.c delete mode 100644 drivers/staging/android/binder.h delete mode 100644 drivers/staging/android/logger.c delete mode 100644 drivers/staging/android/logger.h delete mode 100644 drivers/staging/android/lowmemorykiller.c delete mode 100644 drivers/staging/android/ram_console.c delete mode 100644 drivers/staging/android/timed_gpio.c delete mode 100644 drivers/staging/android/timed_gpio.h delete mode 100644 drivers/staging/android/timed_output.c delete mode 100644 drivers/staging/android/timed_output.h create mode 100644 drivers/staging/batman-adv/CHANGELOG create mode 100644 drivers/staging/batman-adv/Kconfig create mode 100644 drivers/staging/batman-adv/Makefile create mode 100644 drivers/staging/batman-adv/README create mode 100644 drivers/staging/batman-adv/TODO create mode 100644 drivers/staging/batman-adv/aggregation.c create mode 100644 drivers/staging/batman-adv/aggregation.h create mode 100644 drivers/staging/batman-adv/bitarray.c create mode 100644 drivers/staging/batman-adv/bitarray.h create mode 100644 drivers/staging/batman-adv/compat.h create mode 100644 drivers/staging/batman-adv/device.c create mode 100644 drivers/staging/batman-adv/device.h create mode 100644 drivers/staging/batman-adv/hard-interface.c create mode 100644 drivers/staging/batman-adv/hard-interface.h create mode 100644 drivers/staging/batman-adv/hash.c create mode 100644 drivers/staging/batman-adv/hash.h create mode 100644 drivers/staging/batman-adv/log.c create mode 100644 drivers/staging/batman-adv/log.h create mode 100644 drivers/staging/batman-adv/main.c create mode 100644 drivers/staging/batman-adv/main.h create mode 100644 drivers/staging/batman-adv/packet.h create mode 100644 drivers/staging/batman-adv/proc.c create mode 100644 drivers/staging/batman-adv/proc.h create mode 100644 drivers/staging/batman-adv/ring_buffer.c create mode 100644 drivers/staging/batman-adv/ring_buffer.h create mode 100644 drivers/staging/batman-adv/routing.c create mode 100644 drivers/staging/batman-adv/routing.h create mode 100644 drivers/staging/batman-adv/send.c create mode 100644 drivers/staging/batman-adv/send.h create mode 100644 drivers/staging/batman-adv/soft-interface.c create mode 100644 drivers/staging/batman-adv/soft-interface.h create mode 100644 drivers/staging/batman-adv/translation-table.c create mode 100644 drivers/staging/batman-adv/translation-table.h create mode 100644 drivers/staging/batman-adv/types.h create mode 100644 drivers/staging/batman-adv/vis.c create mode 100644 drivers/staging/batman-adv/vis.h delete mode 100644 drivers/staging/dream/Kconfig delete mode 100644 drivers/staging/dream/Makefile delete mode 100644 drivers/staging/dream/camera/Kconfig delete mode 100644 drivers/staging/dream/camera/Makefile delete mode 100644 drivers/staging/dream/camera/msm_camera.c delete mode 100644 drivers/staging/dream/camera/msm_io7x.c delete mode 100644 drivers/staging/dream/camera/msm_io8x.c delete mode 100644 drivers/staging/dream/camera/msm_v4l2.c delete mode 100644 drivers/staging/dream/camera/msm_vfe7x.c delete mode 100644 drivers/staging/dream/camera/msm_vfe7x.h delete mode 100644 drivers/staging/dream/camera/msm_vfe8x.c delete mode 100644 drivers/staging/dream/camera/msm_vfe8x.h delete mode 100644 drivers/staging/dream/camera/msm_vfe8x_proc.c delete mode 100644 drivers/staging/dream/camera/msm_vfe8x_proc.h delete mode 100644 drivers/staging/dream/camera/mt9d112.c delete mode 100644 drivers/staging/dream/camera/mt9d112.h delete mode 100644 drivers/staging/dream/camera/mt9d112_reg.c delete mode 100644 drivers/staging/dream/camera/mt9p012.h delete mode 100644 drivers/staging/dream/camera/mt9p012_fox.c delete mode 100644 drivers/staging/dream/camera/mt9p012_reg.c delete mode 100644 drivers/staging/dream/camera/mt9t013.c delete mode 100644 drivers/staging/dream/camera/mt9t013.h delete mode 100644 drivers/staging/dream/camera/mt9t013_reg.c delete mode 100644 drivers/staging/dream/camera/s5k3e2fx.c delete mode 100644 drivers/staging/dream/camera/s5k3e2fx.h delete mode 100644 drivers/staging/dream/gpio_axis.c delete mode 100644 drivers/staging/dream/gpio_event.c delete mode 100644 drivers/staging/dream/gpio_input.c delete mode 100644 drivers/staging/dream/gpio_matrix.c delete mode 100644 drivers/staging/dream/gpio_output.c delete mode 100644 drivers/staging/dream/qdsp5/Makefile delete mode 100644 drivers/staging/dream/qdsp5/adsp.c delete mode 100644 drivers/staging/dream/qdsp5/adsp.h delete mode 100644 drivers/staging/dream/qdsp5/adsp_6210.c delete mode 100644 drivers/staging/dream/qdsp5/adsp_6220.c delete mode 100644 drivers/staging/dream/qdsp5/adsp_6225.c delete mode 100644 drivers/staging/dream/qdsp5/adsp_driver.c delete mode 100644 drivers/staging/dream/qdsp5/adsp_info.c delete mode 100644 drivers/staging/dream/qdsp5/adsp_jpeg_patch_event.c delete mode 100644 drivers/staging/dream/qdsp5/adsp_jpeg_verify_cmd.c delete mode 100644 drivers/staging/dream/qdsp5/adsp_lpm_verify_cmd.c delete mode 100644 drivers/staging/dream/qdsp5/adsp_vfe_patch_event.c delete mode 100644 drivers/staging/dream/qdsp5/adsp_vfe_verify_cmd.c delete mode 100644 drivers/staging/dream/qdsp5/adsp_video_verify_cmd.c delete mode 100644 drivers/staging/dream/qdsp5/adsp_videoenc_verify_cmd.c delete mode 100644 drivers/staging/dream/qdsp5/audio_aac.c delete mode 100644 drivers/staging/dream/qdsp5/audio_amrnb.c delete mode 100644 drivers/staging/dream/qdsp5/audio_evrc.c delete mode 100644 drivers/staging/dream/qdsp5/audio_in.c delete mode 100644 drivers/staging/dream/qdsp5/audio_mp3.c delete mode 100644 drivers/staging/dream/qdsp5/audio_out.c delete mode 100644 drivers/staging/dream/qdsp5/audio_qcelp.c delete mode 100644 drivers/staging/dream/qdsp5/audmgr.c delete mode 100644 drivers/staging/dream/qdsp5/audmgr.h delete mode 100644 drivers/staging/dream/qdsp5/audmgr_new.h delete mode 100644 drivers/staging/dream/qdsp5/audpp.c delete mode 100644 drivers/staging/dream/qdsp5/evlog.h delete mode 100644 drivers/staging/dream/qdsp5/snd.c delete mode 100644 drivers/staging/dream/smd/Kconfig delete mode 100644 drivers/staging/dream/smd/Makefile delete mode 100644 drivers/staging/dream/smd/rpc_server_dog_keepalive.c delete mode 100644 drivers/staging/dream/smd/rpc_server_time_remote.c delete mode 100644 drivers/staging/dream/smd/smd.c delete mode 100644 drivers/staging/dream/smd/smd_private.h delete mode 100644 drivers/staging/dream/smd/smd_qmi.c delete mode 100644 drivers/staging/dream/smd/smd_rpcrouter.c delete mode 100644 drivers/staging/dream/smd/smd_rpcrouter.h delete mode 100644 drivers/staging/dream/smd/smd_rpcrouter_device.c delete mode 100644 drivers/staging/dream/smd/smd_rpcrouter_servers.c delete mode 100644 drivers/staging/dream/smd/smd_tty.c delete mode 100644 drivers/staging/dream/synaptics_i2c_rmi.c delete mode 100644 drivers/staging/dream/synaptics_i2c_rmi.h delete mode 100644 drivers/staging/iio/light/tsl2561.c create mode 100644 drivers/staging/iio/light/tsl2563.c create mode 100644 drivers/staging/iio/light/tsl2563.h create mode 100644 drivers/staging/ramzswap/Kconfig create mode 100644 drivers/staging/ramzswap/Makefile create mode 100644 drivers/staging/ramzswap/TODO create mode 100644 drivers/staging/ramzswap/ramzswap.txt create mode 100644 drivers/staging/ramzswap/ramzswap_drv.c create mode 100644 drivers/staging/ramzswap/ramzswap_drv.h create mode 100644 drivers/staging/ramzswap/ramzswap_ioctl.h create mode 100644 drivers/staging/ramzswap/xvmalloc.c create mode 100644 drivers/staging/ramzswap/xvmalloc.h create mode 100644 drivers/staging/ramzswap/xvmalloc_int.h delete mode 100644 drivers/staging/rt2860/2860_main_dev.c delete mode 100644 drivers/staging/rt2860/aironet.h rename drivers/staging/{rt3090 => rt2860/chip}/mac_pci.h (62%) create mode 100644 drivers/staging/rt2860/chip/mac_usb.h rename drivers/staging/{rt3090/netif_block.h => rt2860/chip/rt2860.h} (67%) rename drivers/staging/{rt3090/rt33xx.h => rt2860/chip/rt2870.h} (77%) rename drivers/staging/{rt3090/rt3370.h => rt2860/chip/rt3070.h} (87%) rename drivers/staging/{rt3090 => rt2860/chip}/rt3090.h (83%) rename drivers/staging/{rt3090 => rt2860/chip}/rt30xx.h (93%) create mode 100644 drivers/staging/rt2860/chip/rtmp_mac.h rename drivers/staging/{rt3090 => rt2860/chip}/rtmp_phy.h (78%) create mode 100644 drivers/staging/rt2860/chips/rt3070.c rename drivers/staging/{rt3090 => rt2860}/chips/rt3090.c (65%) rename drivers/staging/{rt3090 => rt2860}/chips/rt30xx.c (54%) delete mode 100644 drivers/staging/rt2860/common/2860_rtmp_init.c rename drivers/staging/{rt3090 => rt2860}/common/cmm_aes.c (51%) create mode 100644 drivers/staging/rt2860/common/cmm_asic.c rename drivers/staging/{rt3090 => rt2860}/common/cmm_cfg.c (56%) delete mode 100644 drivers/staging/rt2860/common/cmm_data_2860.c create mode 100644 drivers/staging/rt2860/common/cmm_data_pci.c create mode 100644 drivers/staging/rt2860/common/cmm_data_usb.c create mode 100644 drivers/staging/rt2860/common/cmm_mac_pci.c create mode 100644 drivers/staging/rt2860/common/cmm_mac_usb.c create mode 100644 drivers/staging/rt2860/common/cmm_tkip.c rename drivers/staging/{rt3090 => rt2860}/common/cmm_wep.c (75%) create mode 100644 drivers/staging/rt2860/common/crypt_hmac.c create mode 100644 drivers/staging/rt2860/common/crypt_md5.c create mode 100644 drivers/staging/rt2860/common/crypt_sha2.c create mode 100644 drivers/staging/rt2860/common/ee_efuse.c create mode 100644 drivers/staging/rt2860/common/ee_prom.c create mode 100644 drivers/staging/rt2860/common/firmware_3070.h delete mode 100644 drivers/staging/rt2860/common/md5.c create mode 100644 drivers/staging/rt2860/common/rt_channel.c rename drivers/staging/{rt3090 => rt2860}/common/rt_rf.c (69%) create mode 100644 drivers/staging/rt2860/common/rtmp_mcu.c rename drivers/staging/{rt3090 => rt2860}/common/rtmp_timer.c (69%) delete mode 100644 drivers/staging/rt2860/common/rtmp_tkip.c delete mode 100644 drivers/staging/rt2860/common/rtmp_wep.c delete mode 100644 drivers/staging/rt2860/config.mk rename drivers/staging/{rt3090 => rt2860}/crypt_hmac.h (71%) rename drivers/staging/{rt3090 => rt2860}/crypt_md5.h (67%) rename drivers/staging/{rt3090/vr_ikans.h => rt2860/crypt_sha2.h} (54%) rename drivers/staging/{rt3090 => rt2860}/eeprom.h (68%) rename drivers/staging/{rt3090 => rt2860/iface}/rtmp_pci.h (62%) create mode 100644 drivers/staging/rt2860/iface/rtmp_usb.h delete mode 100644 drivers/staging/rt2860/md5.h create mode 100644 drivers/staging/rt2860/pci_main_dev.c delete mode 100644 drivers/staging/rt2860/rt2860.h delete mode 100644 drivers/staging/rt2860/rt28xx.h create mode 100644 drivers/staging/rt2860/rt_pci_rbus.c delete mode 100644 drivers/staging/rt2860/rt_profile.c create mode 100644 drivers/staging/rt2860/rt_usb.c create mode 100644 drivers/staging/rt2860/rtmp_chip.h create mode 100644 drivers/staging/rt2860/rtmp_dot11.h rename drivers/staging/{rt3090 => rt2860}/rtmp_iface.h (70%) rename drivers/staging/{rt3090 => rt2860}/rtmp_mcu.h (86%) rename drivers/staging/{rt3090 => rt2860}/rtmp_os.h (77%) rename drivers/staging/{rt3090 => rt2860}/rtmp_timer.h (65%) create mode 100644 drivers/staging/rt2860/rtusb_io.h delete mode 100644 drivers/staging/rt2860/sta/aironet.c create mode 100644 drivers/staging/rt2860/usb_main_dev.c delete mode 100644 drivers/staging/rt2870/2870_main_dev.c create mode 100644 drivers/staging/rt2870/chips/rt3070.c create mode 100644 drivers/staging/rt2870/chips/rt30xx.c delete mode 100644 drivers/staging/rt2870/common/2870_rtmp_init.c create mode 100644 drivers/staging/rt2870/common/acction.c create mode 100644 drivers/staging/rt2870/common/cmm_aes.c create mode 100644 drivers/staging/rt2870/common/cmm_asic.c create mode 100644 drivers/staging/rt2870/common/cmm_cfg.c delete mode 100644 drivers/staging/rt2870/common/cmm_data_2870.c create mode 100644 drivers/staging/rt2870/common/cmm_data_usb.c create mode 100644 drivers/staging/rt2870/common/cmm_mac_usb.c create mode 100644 drivers/staging/rt2870/common/cmm_profile.c create mode 100644 drivers/staging/rt2870/common/cmm_tkip.c create mode 100644 drivers/staging/rt2870/common/cmm_wep.c create mode 100644 drivers/staging/rt2870/common/crypt_hmac.c create mode 100644 drivers/staging/rt2870/common/crypt_md5.c create mode 100644 drivers/staging/rt2870/common/crypt_sha2.c create mode 100644 drivers/staging/rt2870/common/ee_efuse.c create mode 100644 drivers/staging/rt2870/common/rt_channel.c create mode 100644 drivers/staging/rt2870/common/rt_rf.c create mode 100644 drivers/staging/rt2870/common/rtmp_mcu.c create mode 100644 drivers/staging/rt2870/common/rtmp_timer.c delete mode 100644 drivers/staging/rt2870/rt2870.h create mode 100644 drivers/staging/rt2870/rt_usb.c create mode 100644 drivers/staging/rt2870/usb_main_dev.c delete mode 100644 drivers/staging/rt3090/Kconfig delete mode 100644 drivers/staging/rt3090/Makefile delete mode 100644 drivers/staging/rt3090/action.h delete mode 100644 drivers/staging/rt3090/ap.h delete mode 100644 drivers/staging/rt3090/ap_apcli.h delete mode 100644 drivers/staging/rt3090/ap_autoChSel.h delete mode 100644 drivers/staging/rt3090/ap_autoChSel_cmm.h delete mode 100644 drivers/staging/rt3090/ap_cfg.h delete mode 100644 drivers/staging/rt3090/ap_ids.h delete mode 100644 drivers/staging/rt3090/ap_mbss.h delete mode 100644 drivers/staging/rt3090/ap_uapsd.h delete mode 100644 drivers/staging/rt3090/ap_wds.h delete mode 100644 drivers/staging/rt3090/chips/rt3370.c delete mode 100644 drivers/staging/rt3090/chips/rt3390.c delete mode 100644 drivers/staging/rt3090/chips/rt33xx.c delete mode 100644 drivers/staging/rt3090/chlist.h delete mode 100644 drivers/staging/rt3090/common/action.c delete mode 100644 drivers/staging/rt3090/common/ba_action.c delete mode 100644 drivers/staging/rt3090/common/cmm_asic.c delete mode 100644 drivers/staging/rt3090/common/cmm_data.c delete mode 100644 drivers/staging/rt3090/common/cmm_data_pci.c delete mode 100644 drivers/staging/rt3090/common/cmm_info.c delete mode 100644 drivers/staging/rt3090/common/cmm_mac_pci.c delete mode 100644 drivers/staging/rt3090/common/cmm_profile.c delete mode 100644 drivers/staging/rt3090/common/cmm_sanity.c delete mode 100644 drivers/staging/rt3090/common/cmm_sync.c delete mode 100644 drivers/staging/rt3090/common/cmm_tkip.c delete mode 100644 drivers/staging/rt3090/common/cmm_wpa.c delete mode 100644 drivers/staging/rt3090/common/crypt_aes.c delete mode 100644 drivers/staging/rt3090/common/crypt_biginteger.c delete mode 100644 drivers/staging/rt3090/common/crypt_dh.c delete mode 100644 drivers/staging/rt3090/common/crypt_hmac.c delete mode 100644 drivers/staging/rt3090/common/crypt_md5.c delete mode 100644 drivers/staging/rt3090/common/crypt_sha2.c delete mode 100644 drivers/staging/rt3090/common/dfs.c delete mode 100644 drivers/staging/rt3090/common/ee_efuse.c delete mode 100644 drivers/staging/rt3090/common/ee_prom.c delete mode 100644 drivers/staging/rt3090/common/eeprom.c delete mode 100644 drivers/staging/rt3090/common/igmp_snoop.c delete mode 100644 drivers/staging/rt3090/common/mlme.c delete mode 100644 drivers/staging/rt3090/common/mlme_ex.c delete mode 100644 drivers/staging/rt3090/common/netif_block.c delete mode 100644 drivers/staging/rt3090/common/rt_channel.c delete mode 100644 drivers/staging/rt3090/common/rtmp_init.c delete mode 100644 drivers/staging/rt3090/common/rtmp_mcu.c delete mode 100644 drivers/staging/rt3090/common/spectrum.c delete mode 100644 drivers/staging/rt3090/config.mk delete mode 100644 drivers/staging/rt3090/crypt_sha2.h delete mode 100644 drivers/staging/rt3090/dfs.h delete mode 100644 drivers/staging/rt3090/igmp_snoop.h delete mode 100644 drivers/staging/rt3090/ipv6.h delete mode 100644 drivers/staging/rt3090/link_list.h delete mode 100644 drivers/staging/rt3090/mlme.h delete mode 100644 drivers/staging/rt3090/mlme_ex.h delete mode 100644 drivers/staging/rt3090/mlme_ex_def.h delete mode 100644 drivers/staging/rt3090/oid.h delete mode 100644 drivers/staging/rt3090/pci_main_dev.c delete mode 100644 drivers/staging/rt3090/rt3390.h delete mode 100644 drivers/staging/rt3090/rt_ate.c delete mode 100644 drivers/staging/rt3090/rt_ate.h delete mode 100644 drivers/staging/rt3090/rt_config.h delete mode 100644 drivers/staging/rt3090/rt_linux.c delete mode 100644 drivers/staging/rt3090/rt_linux.h delete mode 100644 drivers/staging/rt3090/rt_main_dev.c delete mode 100644 drivers/staging/rt3090/rt_pci_rbus.c delete mode 100644 drivers/staging/rt3090/rt_profile.c delete mode 100644 drivers/staging/rt3090/rtmp.h delete mode 100644 drivers/staging/rt3090/rtmp_chip.h delete mode 100644 drivers/staging/rt3090/rtmp_def.h delete mode 100644 drivers/staging/rt3090/rtmp_dot11.h delete mode 100644 drivers/staging/rt3090/rtmp_mac.h delete mode 100644 drivers/staging/rt3090/rtmp_type.h delete mode 100644 drivers/staging/rt3090/spectrum.h delete mode 100644 drivers/staging/rt3090/spectrum_def.h delete mode 100644 drivers/staging/rt3090/sta/assoc.c delete mode 100644 drivers/staging/rt3090/sta/auth.c delete mode 100644 drivers/staging/rt3090/sta/auth_rsp.c delete mode 100644 drivers/staging/rt3090/sta/connect.c delete mode 100644 drivers/staging/rt3090/sta/dls.c delete mode 100644 drivers/staging/rt3090/sta/rtmp_ckipmic.c delete mode 100644 drivers/staging/rt3090/sta/rtmp_data.c delete mode 100644 drivers/staging/rt3090/sta/sanity.c delete mode 100644 drivers/staging/rt3090/sta/sync.c delete mode 100644 drivers/staging/rt3090/sta/wpa.c delete mode 100644 drivers/staging/rt3090/sta_ioctl.c delete mode 100644 drivers/staging/rt3090/wpa.h create mode 100644 drivers/staging/rtl8192u/Kconfig create mode 100644 drivers/staging/rtl8192u/Makefile create mode 100644 drivers/staging/rtl8192u/authors create mode 100644 drivers/staging/rtl8192u/changes create mode 100644 drivers/staging/rtl8192u/copying create mode 100644 drivers/staging/rtl8192u/dot11d.h create mode 100644 drivers/staging/rtl8192u/ieee80211.h create mode 100644 drivers/staging/rtl8192u/ieee80211/EndianFree.h create mode 100644 drivers/staging/rtl8192u/ieee80211/Makefile create mode 100644 drivers/staging/rtl8192u/ieee80211/aes.c create mode 100644 drivers/staging/rtl8192u/ieee80211/api.c create mode 100644 drivers/staging/rtl8192u/ieee80211/arc4.c create mode 100644 drivers/staging/rtl8192u/ieee80211/autoload.c create mode 100644 drivers/staging/rtl8192u/ieee80211/cipher.c create mode 100644 drivers/staging/rtl8192u/ieee80211/compress.c create mode 100644 drivers/staging/rtl8192u/ieee80211/crypto_compat.h create mode 100644 drivers/staging/rtl8192u/ieee80211/digest.c create mode 100644 drivers/staging/rtl8192u/ieee80211/dot11d.c create mode 100644 drivers/staging/rtl8192u/ieee80211/dot11d.h create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211.h create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.h create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211_module.c create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c create mode 100644 drivers/staging/rtl8192u/ieee80211/internal.h create mode 100644 drivers/staging/rtl8192u/ieee80211/kmap_types.h create mode 100644 drivers/staging/rtl8192u/ieee80211/michael_mic.c create mode 100644 drivers/staging/rtl8192u/ieee80211/proc.c create mode 100644 drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h create mode 100644 drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c create mode 100644 drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h create mode 100644 drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c create mode 100644 drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h create mode 100644 drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h create mode 100644 drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c create mode 100644 drivers/staging/rtl8192u/ieee80211/rtl_crypto.h create mode 100644 drivers/staging/rtl8192u/ieee80211/scatterwalk.c create mode 100644 drivers/staging/rtl8192u/ieee80211/scatterwalk.h create mode 100644 drivers/staging/rtl8192u/ieee80211_crypt.h create mode 100644 drivers/staging/rtl8192u/r8180_93cx6.c create mode 100644 drivers/staging/rtl8192u/r8180_93cx6.h create mode 100644 drivers/staging/rtl8192u/r8180_pm.c create mode 100644 drivers/staging/rtl8192u/r8180_pm.h create mode 100644 drivers/staging/rtl8192u/r8190_rtl8256.c create mode 100644 drivers/staging/rtl8192u/r8190_rtl8256.h create mode 100644 drivers/staging/rtl8192u/r8192U.h create mode 100644 drivers/staging/rtl8192u/r8192U_core.c create mode 100644 drivers/staging/rtl8192u/r8192U_dm.c create mode 100644 drivers/staging/rtl8192u/r8192U_dm.h create mode 100644 drivers/staging/rtl8192u/r8192U_hw.h create mode 100644 drivers/staging/rtl8192u/r8192U_wx.c create mode 100644 drivers/staging/rtl8192u/r8192U_wx.h create mode 100644 drivers/staging/rtl8192u/r819xU_HTGen.h create mode 100644 drivers/staging/rtl8192u/r819xU_HTType.h create mode 100644 drivers/staging/rtl8192u/r819xU_cmdpkt.c create mode 100644 drivers/staging/rtl8192u/r819xU_cmdpkt.h create mode 100644 drivers/staging/rtl8192u/r819xU_firmware.c create mode 100644 drivers/staging/rtl8192u/r819xU_firmware.h create mode 100644 drivers/staging/rtl8192u/r819xU_firmware_img.c create mode 100644 drivers/staging/rtl8192u/r819xU_firmware_img.h create mode 100644 drivers/staging/rtl8192u/r819xU_phy.c create mode 100644 drivers/staging/rtl8192u/r819xU_phy.h create mode 100644 drivers/staging/rtl8192u/r819xU_phyreg.h create mode 100644 drivers/staging/samsung-laptop/Kconfig create mode 100644 drivers/staging/samsung-laptop/Makefile create mode 100644 drivers/staging/samsung-laptop/TODO create mode 100644 drivers/staging/samsung-laptop/samsung-laptop.c delete mode 100644 drivers/staging/vt6655/kcompat.h delete mode 100644 drivers/staging/vt6656/kcompat.h create mode 100644 drivers/staging/wlags49_h2/Kconfig create mode 100644 drivers/staging/wlags49_h2/Makefile create mode 100644 drivers/staging/wlags49_h2/README.ubuntu create mode 100644 drivers/staging/wlags49_h2/README.wlags49 create mode 100644 drivers/staging/wlags49_h2/TODO create mode 100644 drivers/staging/wlags49_h2/WARNING.txt create mode 100644 drivers/staging/wlags49_h2/ap_h2.c create mode 100644 drivers/staging/wlags49_h2/ap_h25.c create mode 100644 drivers/staging/wlags49_h2/debug.h create mode 100644 drivers/staging/wlags49_h2/dhf.c create mode 100644 drivers/staging/wlags49_h2/dhf.h create mode 100644 drivers/staging/wlags49_h2/dhfcfg.h create mode 100644 drivers/staging/wlags49_h2/hcf.c create mode 100644 drivers/staging/wlags49_h2/hcf.h create mode 100644 drivers/staging/wlags49_h2/hcfcfg.h create mode 100644 drivers/staging/wlags49_h2/hcfdef.h create mode 100644 drivers/staging/wlags49_h2/man/wlags49.4 create mode 100644 drivers/staging/wlags49_h2/mdd.h create mode 100644 drivers/staging/wlags49_h2/mmd.c create mode 100644 drivers/staging/wlags49_h2/mmd.h create mode 100644 drivers/staging/wlags49_h2/sta_h2.c create mode 100644 drivers/staging/wlags49_h2/sta_h25.c create mode 100644 drivers/staging/wlags49_h2/wl_cs.c create mode 100644 drivers/staging/wlags49_h2/wl_cs.h create mode 100644 drivers/staging/wlags49_h2/wl_enc.c create mode 100644 drivers/staging/wlags49_h2/wl_enc.h create mode 100644 drivers/staging/wlags49_h2/wl_if.h create mode 100644 drivers/staging/wlags49_h2/wl_internal.h create mode 100644 drivers/staging/wlags49_h2/wl_main.c create mode 100644 drivers/staging/wlags49_h2/wl_main.h create mode 100644 drivers/staging/wlags49_h2/wl_netdev.c create mode 100644 drivers/staging/wlags49_h2/wl_netdev.h create mode 100644 drivers/staging/wlags49_h2/wl_pci.c create mode 100644 drivers/staging/wlags49_h2/wl_pci.h create mode 100644 drivers/staging/wlags49_h2/wl_priv.c create mode 100644 drivers/staging/wlags49_h2/wl_priv.h create mode 100644 drivers/staging/wlags49_h2/wl_profile.c create mode 100644 drivers/staging/wlags49_h2/wl_profile.h create mode 100644 drivers/staging/wlags49_h2/wl_sysfs.c create mode 100644 drivers/staging/wlags49_h2/wl_sysfs.h create mode 100644 drivers/staging/wlags49_h2/wl_util.c create mode 100644 drivers/staging/wlags49_h2/wl_util.h create mode 100644 drivers/staging/wlags49_h2/wl_version.h create mode 100644 drivers/staging/wlags49_h2/wl_wext.c create mode 100644 drivers/staging/wlags49_h2/wl_wext.h create mode 100644 drivers/staging/wlags49_h25/Kconfig create mode 100644 drivers/staging/wlags49_h25/Makefile create mode 100644 drivers/staging/wlags49_h25/README.txt create mode 100644 drivers/staging/wlags49_h25/TODO create mode 100644 drivers/staging/wlags49_h25/ap_h25.c create mode 100644 drivers/staging/wlags49_h25/debug.h create mode 100644 drivers/staging/wlags49_h25/dhf.c create mode 100644 drivers/staging/wlags49_h25/dhf.h create mode 100644 drivers/staging/wlags49_h25/dhfcfg.h create mode 100644 drivers/staging/wlags49_h25/hcf.c create mode 100644 drivers/staging/wlags49_h25/hcf.h create mode 100644 drivers/staging/wlags49_h25/hcfcfg.h create mode 100644 drivers/staging/wlags49_h25/hcfdef.h create mode 100644 drivers/staging/wlags49_h25/mdd.h create mode 100644 drivers/staging/wlags49_h25/mmd.c create mode 100644 drivers/staging/wlags49_h25/mmd.h create mode 100644 drivers/staging/wlags49_h25/sta_h25.c create mode 100644 drivers/staging/wlags49_h25/wl_cs.c create mode 100644 drivers/staging/wlags49_h25/wl_cs.h create mode 100644 drivers/staging/wlags49_h25/wl_enc.c create mode 100644 drivers/staging/wlags49_h25/wl_enc.h create mode 100644 drivers/staging/wlags49_h25/wl_if.h create mode 100644 drivers/staging/wlags49_h25/wl_internal.h create mode 100644 drivers/staging/wlags49_h25/wl_main.c create mode 100644 drivers/staging/wlags49_h25/wl_main.h create mode 100644 drivers/staging/wlags49_h25/wl_netdev.c create mode 100644 drivers/staging/wlags49_h25/wl_netdev.h create mode 100644 drivers/staging/wlags49_h25/wl_priv.c create mode 100644 drivers/staging/wlags49_h25/wl_priv.h create mode 100644 drivers/staging/wlags49_h25/wl_profile.c create mode 100644 drivers/staging/wlags49_h25/wl_profile.h create mode 100644 drivers/staging/wlags49_h25/wl_sysfs.c create mode 100644 drivers/staging/wlags49_h25/wl_sysfs.h create mode 100644 drivers/staging/wlags49_h25/wl_util.c create mode 100644 drivers/staging/wlags49_h25/wl_util.h create mode 100644 drivers/staging/wlags49_h25/wl_version.h create mode 100644 drivers/staging/wlags49_h25/wl_wext.c create mode 100644 drivers/staging/wlags49_h25/wl_wext.h Merging scsi-post-merge/master $ git merge scsi-post-merge/master Already up-to-date.