$ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 12ba8d1 fix braino in fs: do not assign default i_ino in new_inode Merging origin/master $ git merge origin/master Updating 12ba8d1..2301b65 Fast-forward Documentation/ABI/testing/sysfs-block-zram | 99 + Documentation/DocBook/media-entities.tmpl | 6 + Documentation/DocBook/v4l/compat.xml | 24 +- Documentation/DocBook/v4l/controls.xml | 12 +- Documentation/DocBook/v4l/dev-rds.xml | 68 +- Documentation/DocBook/v4l/dev-teletext.xml | 29 +- Documentation/DocBook/v4l/pixfmt-packed-rgb.xml | 2 +- Documentation/DocBook/v4l/pixfmt-srggb10.xml | 90 + Documentation/DocBook/v4l/pixfmt-srggb8.xml | 67 + Documentation/DocBook/v4l/pixfmt-y10.xml | 79 + Documentation/DocBook/v4l/pixfmt.xml | 32 +- Documentation/DocBook/v4l/v4l2.xml | 10 +- Documentation/DocBook/v4l/videodev2.h.xml | 106 +- Documentation/DocBook/v4l/vidioc-g-dv-preset.xml | 3 +- Documentation/DocBook/v4l/vidioc-g-dv-timings.xml | 3 +- .../DocBook/v4l/vidioc-query-dv-preset.xml | 2 +- Documentation/DocBook/v4l/vidioc-querycap.xml | 7 +- Documentation/DocBook/v4l/vidioc-queryctrl.xml | 18 +- .../DocBook/v4l/vidioc-s-hw-freq-seek.xml | 10 +- Documentation/accounting/getdelays.c | 38 +- Documentation/cgroups/cgroups.txt | 14 +- Documentation/coccinelle.txt | 50 +- Documentation/devices.txt | 9 +- Documentation/dvb/get_dvb_firmware | 46 +- Documentation/dvb/lmedm04.txt | 58 + Documentation/fb/viafb.txt | 48 + Documentation/feature-removal-schedule.txt | 57 +- Documentation/filesystems/00-INDEX | 2 - Documentation/filesystems/9p.txt | 4 +- Documentation/filesystems/ext4.txt | 14 + Documentation/filesystems/proc.txt | 17 +- Documentation/hwmon/it87 | 28 +- Documentation/hwmon/lm85 | 60 +- Documentation/hwmon/lm90 | 42 +- Documentation/hwmon/pcf8591 | 18 +- Documentation/hwmon/sysfs-interface | 15 + Documentation/ioctl/ioctl-number.txt | 3 +- Documentation/kbuild/kconfig-language.txt | 3 +- Documentation/kbuild/makefiles.txt | 7 + Documentation/kbuild/modules.txt | 733 +- Documentation/kernel-parameters.txt | 5 + Documentation/networking/phy.txt | 18 - Documentation/sysctl/vm.txt | 12 +- Documentation/video4linux/CARDLIST.cx88 | 1 + Documentation/video4linux/CARDLIST.em28xx | 3 +- Documentation/video4linux/CARDLIST.saa7134 | 2 +- Documentation/video4linux/bttv/MAKEDEV | 1 - Documentation/video4linux/gspca.txt | 2 + Documentation/video4linux/v4l2-framework.txt | 35 +- Kbuild | 6 +- Kconfig | 11 + MAINTAINERS | 26 +- Makefile | 33 +- README | 1 + arch/alpha/Kconfig | 4 - arch/alpha/kernel/pci_iommu.c | 4 +- arch/alpha/kernel/ptrace.c | 7 +- arch/arm/Kconfig | 7 - arch/arm/kernel/ptrace.c | 28 +- arch/arm/mach-imx/include/mach/dma-v1.h | 8 +- arch/arm/mach-mx3/mach-pcm037.c | 2 - arch/arm/mach-mx3/mx31moboard-marxbot.c | 1 - arch/arm/mach-mx3/mx31moboard-smartbot.c | 1 - arch/arm/mach-omap2/Makefile | 4 + arch/arm/mach-omap2/board-4430sdp.c | 7 +- arch/arm/mach-omap2/board-omap4panda.c | 15 +- arch/arm/mach-omap2/dsp.c | 85 + arch/arm/mach-pxa/em-x270.c | 1 - arch/arm/mach-pxa/ezx.c | 2 - arch/arm/mach-pxa/mioa701.c | 1 - arch/arm/mach-pxa/pcm990-baseboard.c | 2 - arch/arm/mach-s3c64xx/Kconfig | 1 + arch/arm/mach-shmobile/board-ap4evb.c | 19 + arch/arm/mach-tegra/timer.c | 1 - arch/arm/mach-ux500/devices-db8500.c | 13 +- arch/arm/mm/highmem.c | 3 +- arch/arm/plat-mxc/include/mach/dma.h | 67 + arch/arm/plat-mxc/include/mach/sdma.h | 17 + arch/arm/plat-nomadik/include/plat/ste_dma40.h | 135 +- arch/arm/plat-omap/common.c | 2 + arch/arm/plat-omap/devices.c | 70 + arch/arm/plat-omap/include/plat/dsp.h | 31 + arch/arm/plat-pxa/include/plat/sdhci.h | 32 + arch/avr32/Kconfig | 7 - arch/avr32/kernel/ptrace.c | 11 +- arch/blackfin/Kconfig | 7 - arch/blackfin/kernel/ptrace.c | 16 +- arch/cris/Kconfig | 7 - arch/cris/arch-v10/kernel/ptrace.c | 20 +- arch/cris/arch-v32/kernel/ptrace.c | 16 +- arch/frv/Kconfig | 6 - arch/frv/kernel/ptrace.c | 32 +- arch/frv/mm/highmem.c | 3 +- arch/h8300/Kconfig | 7 - arch/h8300/kernel/ptrace.c | 33 +- arch/ia64/Kconfig | 7 - arch/ia64/include/asm/cputime.h | 6 +- arch/ia64/kernel/ptrace.c | 3 +- arch/m32r/Kconfig | 7 - arch/m32r/kernel/ptrace.c | 11 +- arch/m68k/Kconfig | 6 - arch/m68k/kernel/ptrace.c | 51 +- arch/m68knommu/Kconfig | 7 - arch/m68knommu/kernel/ptrace.c | 57 +- arch/microblaze/Kconfig | 5 - arch/microblaze/kernel/ptrace.c | 5 +- arch/mips/Kconfig | 2 - arch/mips/include/asm/pci/bridge.h | 2 +- arch/mips/kernel/ptrace.c | 25 +- arch/mips/mm/highmem.c | 3 +- arch/mn10300/Kconfig | 286 +- arch/mn10300/Makefile | 6 + arch/mn10300/boot/compressed/head.S | 69 +- arch/mn10300/configs/asb2303_defconfig | 2 + arch/mn10300/configs/asb2364_defconfig | 98 + arch/mn10300/include/asm/atomic.h | 350 + arch/mn10300/include/asm/bitops.h | 14 +- arch/mn10300/include/asm/cache.h | 14 +- arch/mn10300/include/asm/cacheflush.h | 164 +- arch/mn10300/include/asm/cpu-regs.h | 91 +- arch/mn10300/include/asm/dmactl-regs.h | 87 +- arch/mn10300/include/asm/elf.h | 12 +- arch/mn10300/include/asm/exceptions.h | 8 +- arch/mn10300/include/asm/fpu.h | 157 +- arch/mn10300/include/asm/frame.inc | 20 +- arch/mn10300/include/asm/gdb-stub.h | 2 +- arch/mn10300/include/asm/hardirq.h | 3 +- arch/mn10300/include/asm/highmem.h | 8 +- arch/mn10300/include/asm/intctl-regs.h | 37 +- arch/mn10300/include/asm/io.h | 13 + arch/mn10300/include/asm/irq.h | 12 +- arch/mn10300/include/asm/irq_regs.h | 6 +- arch/mn10300/include/asm/irqflags.h | 111 +- arch/mn10300/include/asm/mmu_context.h | 73 +- arch/mn10300/include/asm/pgalloc.h | 1 - arch/mn10300/include/asm/pgtable.h | 88 +- arch/mn10300/include/asm/processor.h | 66 +- arch/mn10300/include/asm/ptrace.h | 13 +- arch/mn10300/include/asm/reset-regs.h | 2 +- arch/mn10300/include/asm/rtc.h | 11 - arch/mn10300/include/asm/rwlock.h | 125 + arch/mn10300/include/asm/serial-regs.h | 51 +- arch/mn10300/include/asm/serial.h | 8 +- arch/mn10300/include/asm/smp.h | 91 +- arch/mn10300/include/asm/smsc911x.h | 1 + arch/mn10300/include/asm/spinlock.h | 179 +- arch/mn10300/include/asm/spinlock_types.h | 20 + arch/mn10300/include/asm/system.h | 73 +- arch/mn10300/include/asm/thread_info.h | 18 +- arch/mn10300/include/asm/timer-regs.h | 191 +- arch/mn10300/include/asm/timex.h | 20 +- arch/mn10300/include/asm/tlbflush.h | 174 +- arch/mn10300/include/asm/uaccess.h | 6 +- arch/mn10300/kernel/Makefile | 15 +- arch/mn10300/kernel/asm-offsets.c | 11 +- arch/mn10300/kernel/cevt-mn10300.c | 131 + arch/mn10300/kernel/csrc-mn10300.c | 35 + arch/mn10300/kernel/entry.S | 146 +- arch/mn10300/kernel/fpu-low.S | 265 +- arch/mn10300/kernel/fpu-nofpu-low.S | 39 + arch/mn10300/kernel/fpu-nofpu.c | 30 + arch/mn10300/kernel/fpu.c | 141 +- arch/mn10300/kernel/gdb-io-serial-low.S | 5 +- arch/mn10300/kernel/gdb-io-serial.c | 37 +- arch/mn10300/kernel/gdb-io-ttysm.c | 24 +- arch/mn10300/kernel/gdb-stub.c | 17 +- arch/mn10300/kernel/head.S | 202 +- arch/mn10300/kernel/internal.h | 25 + arch/mn10300/kernel/irq.c | 276 +- arch/mn10300/kernel/kprobes.c | 4 + arch/mn10300/kernel/mn10300-serial-low.S | 6 +- arch/mn10300/kernel/mn10300-serial.c | 210 +- arch/mn10300/kernel/mn10300-watchdog-low.S | 9 +- arch/mn10300/kernel/mn10300-watchdog.c | 100 +- arch/mn10300/kernel/process.c | 61 +- arch/mn10300/kernel/profile.c | 2 +- arch/mn10300/kernel/ptrace.c | 20 +- arch/mn10300/kernel/rtc.c | 41 +- arch/mn10300/kernel/setup.c | 79 +- arch/mn10300/kernel/signal.c | 20 +- arch/mn10300/kernel/smp-low.S | 97 + arch/mn10300/kernel/smp.c | 1152 + arch/mn10300/kernel/switch_to.S | 7 +- arch/mn10300/kernel/time.c | 112 +- arch/mn10300/kernel/traps.c | 42 +- arch/mn10300/lib/bitops.c | 4 +- arch/mn10300/lib/delay.c | 8 +- arch/mn10300/lib/do_csum.S | 49 +- arch/mn10300/mm/Kconfig.cache | 101 + arch/mn10300/mm/Makefile | 14 +- arch/mn10300/mm/cache-flush-by-reg.S | 308 + arch/mn10300/mm/cache-flush-by-tag.S | 251 + arch/mn10300/mm/cache-flush-icache.c | 155 + arch/mn10300/mm/cache-flush-mn10300.S | 192 - arch/mn10300/mm/cache-inv-by-reg.S | 356 + arch/mn10300/mm/cache-inv-by-tag.S | 348 + arch/mn10300/mm/cache-inv-icache.c | 129 + arch/mn10300/mm/cache-mn10300.S | 289 - arch/mn10300/mm/cache-smp-flush.c | 156 + arch/mn10300/mm/cache-smp-inv.c | 153 + arch/mn10300/mm/cache-smp.c | 105 + arch/mn10300/mm/cache-smp.h | 69 + arch/mn10300/mm/cache.c | 95 +- arch/mn10300/mm/fault.c | 17 +- arch/mn10300/mm/init.c | 26 +- arch/mn10300/mm/misalignment.c | 3 +- arch/mn10300/mm/mmu-context.c | 41 +- arch/mn10300/mm/pgtable.c | 2 +- arch/mn10300/mm/tlb-mn10300.S | 59 +- arch/mn10300/mm/tlb-smp.c | 214 + arch/mn10300/proc-mn103e010/include/proc/cache.h | 9 + arch/mn10300/proc-mn103e010/include/proc/clock.h | 2 - .../proc-mn103e010/include/proc/dmactl-regs.h | 102 + .../proc-mn103e010/include/proc/intctl-regs.h | 29 + arch/mn10300/proc-mn103e010/include/proc/proc.h | 2 +- arch/mn10300/proc-mn103e010/proc-init.c | 37 + arch/mn10300/proc-mn2ws0050/Makefile | 5 + arch/mn10300/proc-mn2ws0050/include/proc/cache.h | 48 + arch/mn10300/proc-mn2ws0050/include/proc/clock.h | 20 + .../proc-mn2ws0050/include/proc/dmactl-regs.h | 103 + .../proc-mn2ws0050/include/proc/intctl-regs.h | 29 + arch/mn10300/proc-mn2ws0050/include/proc/irq.h | 49 + .../proc-mn2ws0050/include/proc/nand-regs.h | 120 + arch/mn10300/proc-mn2ws0050/include/proc/proc.h | 18 + .../mn10300/proc-mn2ws0050/include/proc/smp-regs.h | 51 + arch/mn10300/proc-mn2ws0050/proc-init.c | 134 + arch/mn10300/unit-asb2303/include/unit/clock.h | 25 +- arch/mn10300/unit-asb2303/include/unit/serial.h | 5 + arch/mn10300/unit-asb2303/include/unit/timex.h | 109 +- arch/mn10300/unit-asb2303/unit-init.c | 10 +- arch/mn10300/unit-asb2305/include/unit/clock.h | 25 +- arch/mn10300/unit-asb2305/include/unit/serial.h | 5 + arch/mn10300/unit-asb2305/include/unit/timex.h | 109 +- arch/mn10300/unit-asb2305/pci-asb2305.c | 16 +- arch/mn10300/unit-asb2305/pci.c | 2 +- arch/mn10300/unit-asb2305/unit-init.c | 6 +- arch/mn10300/unit-asb2364/Makefile | 12 + arch/mn10300/unit-asb2364/include/unit/clock.h | 29 + arch/mn10300/unit-asb2364/include/unit/fpga-regs.h | 52 + arch/mn10300/unit-asb2364/include/unit/irq.h | 35 + arch/mn10300/unit-asb2364/include/unit/leds.h | 54 + arch/mn10300/unit-asb2364/include/unit/serial.h | 151 + arch/mn10300/unit-asb2364/include/unit/smsc911x.h | 171 + arch/mn10300/unit-asb2364/include/unit/timex.h | 159 + arch/mn10300/unit-asb2364/irq-fpga.c | 96 + arch/mn10300/unit-asb2364/leds.c | 98 + arch/mn10300/unit-asb2364/smsc911x.c | 58 + arch/mn10300/unit-asb2364/unit-init.c | 88 + arch/parisc/Kconfig | 11 +- arch/parisc/include/asm/cache.h | 2 - arch/parisc/include/asm/cacheflush.h | 8 +- arch/parisc/include/asm/irq.h | 2 +- arch/parisc/include/asm/unistd.h | 3 +- arch/parisc/kernel/irq.c | 41 +- arch/parisc/kernel/pdc_cons.c | 141 +- arch/parisc/kernel/ptrace.c | 13 +- arch/parisc/kernel/syscall_table.S | 1 + arch/parisc/kernel/unaligned.c | 3 - arch/parisc/kernel/unwind.c | 5 +- arch/parisc/math-emu/Makefile | 2 +- arch/powerpc/Kconfig | 6 - arch/powerpc/include/asm/cputime.h | 12 +- arch/powerpc/include/asm/fsldma.h | 137 - arch/powerpc/kernel/ptrace.c | 66 +- arch/powerpc/mm/highmem.c | 4 +- arch/powerpc/sysdev/fsl_rio.c | 76 +- arch/s390/Kconfig | 7 - arch/s390/include/asm/cputime.h | 10 +- arch/s390/kernel/ptrace.c | 3 +- arch/score/Kconfig | 5 - arch/score/kernel/ptrace.c | 7 +- arch/sh/Kconfig | 21 +- arch/sh/boards/mach-ap325rxa/setup.c | 1 - arch/sh/boards/mach-cayman/irq.c | 16 +- arch/sh/boards/mach-dreamcast/irq.c | 17 +- arch/sh/boards/mach-ecovec24/setup.c | 4 - arch/sh/boards/mach-kfr2r09/setup.c | 1 - arch/sh/boards/mach-landisk/irq.c | 15 +- arch/sh/boards/mach-microdev/irq.c | 30 +- arch/sh/boards/mach-migor/setup.c | 2 - arch/sh/boards/mach-se/7206/irq.c | 20 +- arch/sh/boards/mach-se/7343/irq.c | 15 +- arch/sh/boards/mach-se/7722/irq.c | 15 +- arch/sh/boards/mach-se/7724/irq.c | 13 +- arch/sh/boards/mach-se/7724/setup.c | 1 - arch/sh/boards/mach-systemh/irq.c | 57 +- arch/sh/boards/mach-x3proto/gpio.c | 7 +- arch/sh/cchips/hd6446x/hd64461.c | 19 +- arch/sh/include/asm/pgtable.h | 2 + arch/sh/include/asm/pgtable_32.h | 2 - arch/sh/include/asm/pgtable_64.h | 9 +- arch/sh/include/asm/processor.h | 1 + arch/sh/kernel/cpu/init.c | 2 + arch/sh/kernel/cpu/irq/imask.c | 14 +- arch/sh/kernel/cpu/irq/intc-sh5.c | 49 +- arch/sh/kernel/cpu/irq/ipr.c | 29 +- arch/sh/kernel/cpu/sh4/perf_event.c | 2 +- arch/sh/kernel/cpu/sh4a/perf_event.c | 2 +- arch/sh/kernel/irq.c | 37 +- arch/sh/kernel/irq_64.c | 16 +- arch/sh/kernel/ptrace_32.c | 45 +- arch/sh/kernel/ptrace_64.c | 25 +- arch/sh/kernel/setup.c | 4 + arch/sh/mm/Makefile | 2 +- arch/sh/mm/gup.c | 273 + arch/sh/oprofile/Makefile | 2 + arch/sh/oprofile/backtrace.c | 2 +- arch/sh/oprofile/common.c | 35 +- arch/sparc/Kconfig | 6 - arch/sparc/include/asm/io_32.h | 31 + arch/sparc/include/asm/io_64.h | 31 + arch/sparc/include/asm/pci_64.h | 2 +- arch/sparc/kernel/ptrace_32.c | 57 +- arch/sparc/kernel/ptrace_64.c | 15 +- arch/sparc/mm/highmem.c | 4 +- arch/tile/Kconfig | 5 +- arch/tile/kernel/ptrace.c | 13 +- arch/tile/kernel/setup.c | 2 - arch/tile/mm/highmem.c | 3 +- arch/um/Kconfig.common | 2 - arch/um/kernel/ptrace.c | 23 +- arch/um/sys-i386/ptrace.c | 4 +- arch/um/sys-x86_64/ptrace.c | 11 +- arch/x86/Kbuild | 1 + arch/x86/Kconfig | 4 +- arch/x86/include/asm/irq.h | 2 - arch/x86/include/asm/msr-index.h | 1 + arch/x86/include/asm/perf_event.h | 19 +- arch/x86/include/asm/smp.h | 9 +- arch/x86/kernel/Makefile | 12 - arch/x86/kernel/cpu/perf_event.c | 21 +- arch/x86/kernel/cpu/perf_event_intel_ds.c | 216 +- arch/x86/kernel/dumpstack_32.c | 6 +- arch/x86/kernel/dumpstack_64.c | 8 +- arch/x86/kernel/irq_32.c | 12 +- arch/x86/kernel/ptrace.c | 17 +- arch/x86/kernel/reboot.c | 2 +- arch/x86/kernel/setup.c | 2 + arch/x86/kernel/smp.c | 15 +- arch/x86/kernel/smpboot.c | 1 - arch/x86/mm/highmem_32.c | 3 +- arch/x86/mm/init_64.c | 1 - arch/x86/mm/iomap_32.c | 3 +- arch/x86/oprofile/nmi_int.c | 6 + arch/x86/oprofile/op_model_amd.c | 146 +- arch/x86/pci/i386.c | 17 +- arch/x86/pci/irq.c | 11 +- arch/x86/pci/mmconfig-shared.c | 4 +- arch/x86/platform/Makefile | 8 + arch/x86/platform/efi/Makefile | 1 + arch/x86/{kernel => platform/efi}/efi.c | 0 arch/x86/{kernel => platform/efi}/efi_32.c | 0 arch/x86/{kernel => platform/efi}/efi_64.c | 0 arch/x86/{kernel => platform/efi}/efi_stub_32.S | 0 arch/x86/{kernel => platform/efi}/efi_stub_64.S | 0 arch/x86/platform/mrst/Makefile | 1 + arch/x86/{kernel => platform/mrst}/mrst.c | 0 arch/x86/platform/olpc/Makefile | 3 + arch/x86/{kernel => platform/olpc}/olpc-xo1.c | 0 arch/x86/{kernel => platform/olpc}/olpc.c | 0 arch/x86/{kernel => platform/olpc}/olpc_ofw.c | 0 arch/x86/platform/scx200/Makefile | 2 + arch/x86/{kernel => platform/scx200}/scx200_32.c | 0 arch/x86/platform/sfi/Makefile | 1 + arch/x86/{kernel => platform/sfi}/sfi.c | 0 arch/x86/platform/uv/Makefile | 1 + arch/x86/{kernel => platform/uv}/bios_uv.c | 0 arch/x86/{kernel => platform/uv}/tlb_uv.c | 0 arch/x86/{kernel => platform/uv}/uv_irq.c | 0 arch/x86/{kernel => platform/uv}/uv_sysfs.c | 0 arch/x86/{kernel => platform/uv}/uv_time.c | 0 arch/x86/platform/visws/Makefile | 1 + arch/x86/{kernel => platform/visws}/visws_quirks.c | 0 arch/x86/xen/enlighten.c | 3 +- arch/x86/xen/smp.c | 6 +- arch/xtensa/Kconfig | 5 - arch/xtensa/kernel/ptrace.c | 14 +- crypto/async_tx/Kconfig | 13 - drivers/atm/eni.c | 7 +- drivers/block/aoe/aoeblk.c | 4 +- drivers/block/aoe/aoedev.c | 4 +- drivers/block/cciss.c | 37 +- drivers/block/drbd/drbd_main.c | 2 +- drivers/block/loop.c | 2 +- drivers/block/z2ram.c | 6 +- drivers/cdrom/gdrom.c | 76 +- drivers/char/agp/parisc-agp.c | 4 + drivers/char/applicom.c | 1 + drivers/char/hvc_console.c | 1 - drivers/char/ip2/Makefile | 2 +- drivers/char/ipmi/Makefile | 2 +- drivers/char/ipmi/ipmi_devintf.c | 4 +- drivers/char/ipmi/ipmi_msghandler.c | 4 +- drivers/char/ipmi/ipmi_si_intf.c | 14 +- drivers/char/mmtimer.c | 60 +- drivers/char/mwave/Makefile | 4 +- drivers/char/mxser.c | 4 + drivers/char/pcmcia/ipwireless/Makefile | 2 +- drivers/char/ppdev.c | 1 + drivers/char/ramoops.c | 30 +- drivers/char/rio/Makefile | 2 +- drivers/char/rocket.c | 5 +- drivers/char/synclink_gt.c | 142 +- drivers/char/vt_ioctl.c | 11 +- drivers/connector/cn_queue.c | 75 +- drivers/connector/connector.c | 9 +- drivers/dma/Kconfig | 31 +- drivers/dma/Makefile | 3 + drivers/dma/amba-pl08x.c | 2167 ++ drivers/dma/coh901318.c | 2 +- drivers/dma/dmaengine.c | 8 +- drivers/dma/fsldma.c | 328 +- drivers/dma/imx-dma.c | 424 + drivers/dma/imx-sdma.c | 1392 + drivers/dma/intel_mid_dma.c | 476 +- drivers/dma/intel_mid_dma_regs.h | 53 +- drivers/dma/pch_dma.c | 1 + drivers/dma/ste_dma40.c | 1023 +- drivers/dma/ste_dma40_ll.c | 180 +- drivers/dma/ste_dma40_ll.h | 86 +- drivers/dma/timb_dma.c | 2 +- drivers/firmware/dmi_scan.c | 32 +- drivers/gpio/74x164.c | 182 + drivers/gpio/Kconfig | 40 + drivers/gpio/Makefile | 4 + drivers/gpio/adp5588-gpio.c | 277 +- drivers/gpio/basic_mmio_gpio.c | 297 + drivers/gpio/langwell_gpio.c | 89 +- drivers/gpio/pch_gpio.c | 312 + drivers/gpio/stmpe-gpio.c | 13 +- drivers/gpio/timbgpio.c | 21 +- drivers/gpio/vx855_gpio.c | 332 + drivers/gpio/wm8994-gpio.c | 1 + drivers/gpu/drm/radeon/evergreen_blit_kms.c | 2 + drivers/gpu/drm/radeon/r100.c | 3 + drivers/gpu/drm/radeon/r100_track.h | 1 + drivers/gpu/drm/radeon/r200.c | 2 + drivers/gpu/drm/radeon/r600_cs.c | 14 +- drivers/gpu/drm/radeon/radeon_reg.h | 1 + drivers/hwmon/Kconfig | 100 +- drivers/hwmon/Makefile | 2 +- drivers/hwmon/adt7475.c | 2 +- drivers/hwmon/asc7621.c | 4 +- drivers/hwmon/it87.c | 210 +- drivers/hwmon/k8temp.c | 51 +- drivers/hwmon/lm75.c | 51 +- drivers/hwmon/lm85.c | 36 +- drivers/hwmon/lm90.c | 1014 +- drivers/hwmon/pcf8591.c | 38 +- drivers/hwmon/s3c-hwmon.c | 8 +- drivers/hwmon/tmp421.c | 4 +- drivers/hwmon/w83795.c | 2121 ++ drivers/i2c/busses/Kconfig | 4 +- drivers/i2c/busses/i2c-i801.c | 10 +- drivers/i2c/busses/scx200_acb.c | 3 +- drivers/input/keyboard/jornada680_kbd.c | 28 +- drivers/input/misc/max8925_onkey.c | 72 +- drivers/input/touchscreen/hp680_ts_input.c | 16 +- drivers/isdn/hardware/mISDN/mISDNinfineon.c | 2 +- drivers/isdn/hisax/l3_1tr6.c | 6 +- drivers/leds/leds-88pm860x.c | 119 +- drivers/macintosh/Kconfig | 26 + drivers/macintosh/Makefile | 2 + drivers/{hwmon => macintosh}/ams/Makefile | 0 drivers/{hwmon => macintosh}/ams/ams-core.c | 0 drivers/{hwmon => macintosh}/ams/ams-i2c.c | 0 drivers/{hwmon => macintosh}/ams/ams-input.c | 0 drivers/{hwmon => macintosh}/ams/ams-pmu.c | 0 drivers/{hwmon => macintosh}/ams/ams.h | 0 drivers/media/IR/Kconfig | 39 +- drivers/media/IR/Makefile | 2 + drivers/media/IR/ene_ir.c | 1046 +- drivers/media/IR/ene_ir.h | 275 +- drivers/media/IR/imon.c | 690 +- drivers/media/IR/ir-core-priv.h | 22 +- drivers/media/IR/ir-jvc-decoder.c | 5 +- drivers/media/IR/ir-keytable.c | 7 +- drivers/media/IR/ir-lirc-codec.c | 135 +- drivers/media/IR/ir-nec-decoder.c | 5 +- drivers/media/IR/ir-raw-event.c | 81 +- drivers/media/IR/ir-rc5-decoder.c | 5 +- drivers/media/IR/ir-rc5-sz-decoder.c | 154 + drivers/media/IR/ir-rc6-decoder.c | 5 +- drivers/media/IR/ir-sony-decoder.c | 5 +- drivers/media/IR/ir-sysfs.c | 37 +- drivers/media/IR/keymaps/Makefile | 16 +- drivers/media/IR/keymaps/rc-alink-dtu-m.c | 68 + drivers/media/IR/keymaps/rc-anysee.c | 93 + drivers/media/IR/keymaps/rc-asus-pc39.c | 80 +- drivers/media/IR/keymaps/rc-avermedia-rm-ks.c | 79 + drivers/media/IR/keymaps/rc-azurewave-ad-tu700.c | 102 + drivers/media/IR/keymaps/rc-digitalnow-tinytwin.c | 98 + drivers/media/IR/keymaps/rc-digittrade.c | 82 + drivers/media/IR/keymaps/rc-leadtek-y04g0051.c | 99 + drivers/media/IR/keymaps/rc-lme2510.c | 68 + drivers/media/IR/keymaps/rc-msi-digivox-ii.c | 67 + drivers/media/IR/keymaps/rc-msi-digivox-iii.c | 85 + drivers/media/IR/keymaps/rc-rc5-streamzap.c | 81 - drivers/media/IR/keymaps/rc-rc6-mce.c | 88 +- drivers/media/IR/keymaps/rc-streamzap.c | 82 + drivers/media/IR/keymaps/rc-terratec-slim.c | 79 + drivers/media/IR/keymaps/rc-total-media-in-hand.c | 85 + drivers/media/IR/keymaps/rc-trekstor.c | 80 + drivers/media/IR/keymaps/rc-twinhan1027.c | 87 + drivers/media/IR/lirc_dev.c | 134 +- drivers/media/IR/mceusb.c | 475 +- drivers/media/IR/nuvoton-cir.c | 1246 + drivers/media/IR/nuvoton-cir.h | 408 + drivers/media/IR/streamzap.c | 376 +- drivers/media/common/saa7146_fops.c | 2 +- drivers/media/common/saa7146_i2c.c | 1 - drivers/media/common/saa7146_vbi.c | 2 +- drivers/media/common/saa7146_video.c | 2 +- drivers/media/common/tuners/Kconfig | 7 + drivers/media/common/tuners/Makefile | 1 + drivers/media/common/tuners/tda18218.c | 334 + drivers/media/common/tuners/tda18218.h | 45 + drivers/media/common/tuners/tda18218_priv.h | 106 + drivers/media/common/tuners/tda18271-common.c | 61 +- drivers/media/common/tuners/tda18271-fe.c | 16 +- drivers/media/common/tuners/tda18271.h | 5 +- drivers/media/common/tuners/xc5000.c | 2 +- drivers/media/common/tuners/xc5000.h | 4 +- drivers/media/dvb/b2c2/flexcop-i2c.c | 3 - drivers/media/dvb/dm1105/dm1105.c | 1 - drivers/media/dvb/dvb-core/dvb_frontend.c | 4 +- drivers/media/dvb/dvb-core/dvb_frontend.h | 2 +- drivers/media/dvb/dvb-usb/Kconfig | 12 + drivers/media/dvb/dvb-usb/Makefile | 3 + drivers/media/dvb/dvb-usb/af9015.c | 394 +- drivers/media/dvb/dvb-usb/af9015.h | 735 +- drivers/media/dvb/dvb-usb/anysee.c | 87 +- drivers/media/dvb/dvb-usb/dvb-usb-i2c.c | 1 - drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 6 + drivers/media/dvb/dvb-usb/friio-fe.c | 2 +- drivers/media/dvb/dvb-usb/gp8psk-fe.c | 4 +- drivers/media/dvb/dvb-usb/gp8psk.c | 9 +- drivers/media/dvb/dvb-usb/lmedm04.c | 1088 + drivers/media/dvb/dvb-usb/lmedm04.h | 173 + drivers/media/dvb/firewire/firedtv-avc.c | 61 +- drivers/media/dvb/firewire/firedtv-fe.c | 36 +- drivers/media/dvb/frontends/Kconfig | 24 +- drivers/media/dvb/frontends/Makefile | 3 +- drivers/media/dvb/frontends/af9013.c | 251 +- drivers/media/dvb/frontends/af9013.h | 1 + drivers/media/dvb/frontends/af9013_priv.h | 60 +- drivers/media/dvb/frontends/au8522_decoder.c | 27 +- drivers/media/dvb/frontends/cx22702.c | 123 +- drivers/media/dvb/frontends/cx24110.c | 2 +- drivers/media/dvb/frontends/cx24123.c | 1 - drivers/media/dvb/frontends/dibx000_common.c | 1 - drivers/media/dvb/frontends/drx397xD.c | 2 +- drivers/media/dvb/frontends/ix2505v.c | 323 + drivers/media/dvb/frontends/ix2505v.h | 64 + drivers/media/dvb/frontends/lgdt3304.c | 380 - drivers/media/dvb/frontends/lgdt3304.h | 45 - drivers/media/dvb/frontends/lgs8gxx.c | 2 +- drivers/media/dvb/frontends/mt352.c | 2 +- drivers/media/dvb/frontends/mt352.h | 2 +- drivers/media/dvb/frontends/s5h1420.c | 1 - drivers/media/dvb/frontends/s5h1432.c | 415 + drivers/media/dvb/frontends/s5h1432.h | 91 + drivers/media/dvb/frontends/si21xx.c | 2 +- drivers/media/dvb/frontends/stb6100.c | 2 +- drivers/media/dvb/frontends/stb6100.h | 4 +- drivers/media/dvb/frontends/stv0288.c | 25 +- drivers/media/dvb/frontends/stv0299.c | 2 +- drivers/media/dvb/frontends/stv0299.h | 2 +- drivers/media/dvb/frontends/tda1004x.c | 2 +- drivers/media/dvb/frontends/zl10353.c | 2 +- drivers/media/dvb/mantis/mantis_core.c | 5 +- drivers/media/dvb/mantis/mantis_i2c.c | 1 - drivers/media/dvb/mantis/mantis_ioc.c | 9 +- drivers/media/dvb/ngene/ngene-i2c.c | 1 - drivers/media/dvb/pluto2/pluto2.c | 1 - drivers/media/dvb/pt1/pt1.c | 1 - drivers/media/dvb/siano/smscoreapi.c | 3 +- drivers/media/dvb/siano/smsir.c | 2 +- drivers/media/dvb/ttpci/av7110.c | 3 +- drivers/media/dvb/ttpci/av7110_av.c | 5 +- drivers/media/dvb/ttpci/budget-core.c | 2 - drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 1 - drivers/media/radio/radio-cadet.c | 3 +- drivers/media/radio/radio-mr800.c | 75 +- drivers/media/radio/radio-si4713.c | 12 +- drivers/media/radio/si470x/radio-si470x-common.c | 29 +- drivers/media/radio/si470x/radio-si470x-usb.c | 17 +- drivers/media/radio/si470x/radio-si470x.h | 2 - drivers/media/radio/si4713-i2c.c | 2 +- drivers/media/radio/tef6862.c | 1 - drivers/media/video/Kconfig | 106 +- drivers/media/video/Makefile | 12 +- drivers/media/video/adv7170.c | 28 +- drivers/media/video/adv7175.c | 28 +- drivers/media/video/adv7180.c | 1 - drivers/media/video/au0828/au0828-cards.c | 4 +- drivers/media/video/au0828/au0828-video.c | 4 +- drivers/media/video/bt819.c | 28 +- drivers/media/video/bt856.c | 28 +- drivers/media/video/bt866.c | 28 +- drivers/media/video/bt8xx/bttv-cards.c | 22 +- drivers/media/video/bt8xx/bttv-driver.c | 273 +- drivers/media/video/bt8xx/bttv-i2c.c | 43 +- drivers/media/video/bt8xx/bttv-input.c | 84 +- drivers/media/video/bt8xx/bttv-risc.c | 2 +- drivers/media/video/bt8xx/bttv.h | 1 - drivers/media/video/bt8xx/bttvp.h | 13 +- drivers/media/video/cafe_ccic.c | 180 +- drivers/media/video/cpia2/Kconfig | 2 +- drivers/media/video/cpia2/cpia2.h | 8 +- drivers/media/video/cpia2/cpia2_core.c | 51 +- drivers/media/video/cpia2/cpia2_v4l.c | 332 +- drivers/media/video/cpia2/cpia2dev.h | 4 +- drivers/media/video/cs5345.c | 27 +- drivers/media/video/cs53l32a.c | 27 +- drivers/media/video/cx18/cx18-driver.h | 19 +- drivers/media/video/cx18/cx18-i2c.c | 23 +- drivers/media/video/cx18/cx18-ioctl.c | 1 - drivers/media/video/cx231xx/Kconfig | 1 + drivers/media/video/cx231xx/Makefile | 2 +- drivers/media/video/cx231xx/cx231xx-417.c | 2194 ++ drivers/media/video/cx231xx/cx231xx-audio.c | 256 +- drivers/media/video/cx231xx/cx231xx-avcore.c | 687 +- drivers/media/video/cx231xx/cx231xx-cards.c | 427 +- drivers/media/video/cx231xx/cx231xx-conf-reg.h | 1 + drivers/media/video/cx231xx/cx231xx-core.c | 787 +- drivers/media/video/cx231xx/cx231xx-dif.h | 3178 +++ drivers/media/video/cx231xx/cx231xx-dvb.c | 250 +- drivers/media/video/cx231xx/cx231xx-i2c.c | 11 +- drivers/media/video/cx231xx/cx231xx-input.c | 222 - drivers/media/video/cx231xx/cx231xx-vbi.c | 109 +- drivers/media/video/cx231xx/cx231xx-vbi.h | 2 +- drivers/media/video/cx231xx/cx231xx-video.c | 595 +- drivers/media/video/cx231xx/cx231xx.h | 260 +- drivers/media/video/cx23885/cx23885-417.c | 2 +- drivers/media/video/cx23885/cx23885-cards.c | 2 +- drivers/media/video/cx23885/cx23885-core.c | 3 +- drivers/media/video/cx23885/cx23885-dvb.c | 7 +- drivers/media/video/cx23885/cx23885-video.c | 11 +- drivers/media/video/cx23885/cx23888-ir.c | 1 + drivers/media/video/cx25840/cx25840-audio.c | 62 +- drivers/media/video/cx25840/cx25840-core.c | 44 +- drivers/media/video/cx25840/cx25840-ir.c | 1 + drivers/media/video/cx88/cx88-alsa.c | 117 +- drivers/media/video/cx88/cx88-blackbird.c | 16 +- drivers/media/video/cx88/cx88-cards.c | 44 +- drivers/media/video/cx88/cx88-core.c | 30 +- drivers/media/video/cx88/cx88-dsp.c | 11 +- drivers/media/video/cx88/cx88-dvb.c | 181 +- drivers/media/video/cx88/cx88-i2c.c | 31 +- drivers/media/video/cx88/cx88-input.c | 57 +- drivers/media/video/cx88/cx88-mpeg.c | 6 +- drivers/media/video/cx88/cx88-tvaudio.c | 43 +- drivers/media/video/cx88/cx88-vbi.c | 2 +- drivers/media/video/cx88/cx88-video.c | 86 +- drivers/media/video/cx88/cx88-vp3054-i2c.c | 2 - drivers/media/video/cx88/cx88.h | 74 +- drivers/media/video/davinci/vpfe_capture.c | 40 +- drivers/media/video/davinci/vpif_capture.c | 18 +- drivers/media/video/davinci/vpif_display.c | 16 +- drivers/media/video/em28xx/em28xx-audio.c | 75 +- drivers/media/video/em28xx/em28xx-cards.c | 57 +- drivers/media/video/em28xx/em28xx-video.c | 97 +- drivers/media/video/em28xx/em28xx.h | 18 +- drivers/media/video/fsl-viu.c | 7 +- drivers/media/video/gspca/Kconfig | 18 + drivers/media/video/gspca/Makefile | 4 + drivers/media/video/gspca/benq.c | 23 +- drivers/media/video/gspca/conex.c | 14 +- drivers/media/video/gspca/cpia1.c | 133 +- drivers/media/video/gspca/etoms.c | 12 +- drivers/media/video/gspca/finepix.c | 15 +- drivers/media/video/gspca/gl860/gl860-mi2020.c | 6 +- drivers/media/video/gspca/gl860/gl860.c | 6 +- drivers/media/video/gspca/gspca.c | 161 +- drivers/media/video/gspca/gspca.h | 12 +- drivers/media/video/gspca/jeilinj.c | 15 +- drivers/media/video/gspca/konica.c | 646 + drivers/media/video/gspca/m5602/m5602_core.c | 8 +- drivers/media/video/gspca/m5602/m5602_mt9m111.c | 48 +- drivers/media/video/gspca/m5602/m5602_mt9m111.h | 14 +- drivers/media/video/gspca/m5602/m5602_ov7660.c | 70 +- drivers/media/video/gspca/m5602/m5602_ov7660.h | 9 +- drivers/media/video/gspca/m5602/m5602_ov9650.c | 102 +- drivers/media/video/gspca/m5602/m5602_ov9650.h | 12 +- drivers/media/video/gspca/m5602/m5602_po1030.c | 136 +- drivers/media/video/gspca/m5602/m5602_po1030.h | 13 +- drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 28 +- drivers/media/video/gspca/m5602/m5602_s5k4aa.h | 14 +- drivers/media/video/gspca/m5602/m5602_s5k83a.h | 12 +- drivers/media/video/gspca/mars.c | 327 +- drivers/media/video/gspca/mr97310a.c | 56 +- drivers/media/video/gspca/ov519.c | 389 +- drivers/media/video/gspca/ov534.c | 19 +- drivers/media/video/gspca/ov534_9.c | 19 +- drivers/media/video/gspca/pac207.c | 26 +- drivers/media/video/gspca/pac7302.c | 32 +- drivers/media/video/gspca/pac7311.c | 32 +- drivers/media/video/gspca/sn9c2028.c | 19 +- drivers/media/video/gspca/sn9c20x.c | 65 +- drivers/media/video/gspca/sonixb.c | 21 +- drivers/media/video/gspca/sonixj.c | 926 +- drivers/media/video/gspca/spca1528.c | 15 +- drivers/media/video/gspca/spca500.c | 14 +- drivers/media/video/gspca/spca501.c | 16 +- drivers/media/video/gspca/spca505.c | 18 +- drivers/media/video/gspca/spca508.c | 16 +- drivers/media/video/gspca/spca561.c | 16 +- drivers/media/video/gspca/sq905.c | 21 +- drivers/media/video/gspca/sq905c.c | 15 +- drivers/media/video/gspca/sq930x.c | 23 +- drivers/media/video/gspca/stk014.c | 174 +- drivers/media/video/gspca/stv0680.c | 17 +- drivers/media/video/gspca/stv06xx/stv06xx.c | 14 +- drivers/media/video/gspca/stv06xx/stv06xx.h | 2 +- drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c | 19 +- drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h | 2 +- drivers/media/video/gspca/stv06xx/stv06xx_st6422.c | 2 +- drivers/media/video/gspca/stv06xx/stv06xx_vv6410.c | 2 +- drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | 4 +- drivers/media/video/gspca/sunplus.c | 27 +- drivers/media/video/gspca/t613.c | 10 +- drivers/media/video/gspca/tv8532.c | 8 +- drivers/media/video/gspca/vc032x.c | 19 +- drivers/media/video/gspca/w996Xcf.c | 10 +- drivers/media/video/gspca/xirlink_cit.c | 3253 +++ drivers/media/video/gspca/zc3xx.c | 37 +- drivers/media/video/hdpvr/hdpvr-control.c | 5 +- drivers/media/video/hdpvr/hdpvr-core.c | 36 +- drivers/media/video/hdpvr/hdpvr-i2c.c | 1 - drivers/media/video/hdpvr/hdpvr-video.c | 5 +- drivers/media/video/hdpvr/hdpvr.h | 7 +- drivers/media/video/hexium_gemini.c | 1 - drivers/media/video/hexium_orion.c | 1 - drivers/media/video/imx074.c | 508 + drivers/media/video/indycam.c | 27 +- drivers/media/video/ir-kbd-i2c.c | 62 +- drivers/media/video/ivtv/ivtv-driver.h | 14 +- drivers/media/video/ivtv/ivtv-i2c.c | 42 +- drivers/media/video/ivtv/ivtv-ioctl.c | 1 - drivers/media/video/ks0127.c | 27 +- drivers/media/video/m52790.c | 28 +- drivers/media/video/mem2mem_testdev.c | 2 +- drivers/media/video/msp3400-driver.c | 38 +- drivers/media/video/mt9m001.c | 26 +- drivers/media/video/mt9m111.c | 38 +- drivers/media/video/mt9t031.c | 24 +- drivers/media/video/mt9t112.c | 14 +- drivers/media/video/mt9v011.c | 29 +- drivers/media/video/mt9v022.c | 26 +- drivers/media/video/mx1_camera.c | 12 +- drivers/media/video/mx2_camera.c | 44 +- drivers/media/video/mx3_camera.c | 11 +- drivers/media/video/mxb.c | 17 +- drivers/media/video/omap/omap_vout.c | 2 +- drivers/media/video/omap1_camera.c | 1702 ++ drivers/media/video/omap24xxcam.c | 4 +- drivers/media/video/ov6650.c | 1225 + drivers/media/video/ov7670.c | 268 +- drivers/media/video/ov7670.h | 20 + drivers/media/video/ov772x.c | 18 +- drivers/media/video/ov9640.c | 12 +- drivers/media/video/pvrusb2/pvrusb2-hdw.c | 11 +- drivers/media/video/pwc/Kconfig | 2 +- drivers/media/video/pwc/pwc-ctrl.c | 20 +- drivers/media/video/pwc/pwc-if.c | 35 +- drivers/media/video/pwc/pwc-misc.c | 4 +- drivers/media/video/pwc/pwc-uncompress.c | 2 +- drivers/media/video/pwc/pwc-v4l.c | 322 +- drivers/media/video/pwc/pwc.h | 6 +- drivers/media/video/pxa_camera.c | 12 +- drivers/media/video/rj54n1cb0c.c | 26 +- drivers/media/video/s2255drv.c | 4 +- drivers/media/video/s5p-fimc/Makefile | 2 +- drivers/media/video/s5p-fimc/fimc-capture.c | 819 + drivers/media/video/s5p-fimc/fimc-core.c | 952 +- drivers/media/video/s5p-fimc/fimc-core.h | 377 +- drivers/media/video/s5p-fimc/fimc-reg.c | 321 +- drivers/media/video/s5p-fimc/regs-fimc.h | 64 +- drivers/media/video/saa5246a.c | 1123 - drivers/media/video/saa5249.c | 650 - drivers/media/video/saa6588.c | 29 +- drivers/media/video/saa7110.c | 27 +- drivers/media/video/saa7115.c | 33 +- drivers/media/video/saa7127.c | 27 +- drivers/media/video/saa7134/Kconfig | 11 +- drivers/media/video/saa7134/Makefile | 7 +- drivers/media/video/saa7134/saa6752hs.c | 27 +- drivers/media/video/saa7134/saa7134-cards.c | 8 +- drivers/media/video/saa7134/saa7134-core.c | 6 +- drivers/media/video/saa7134/saa7134-dvb.c | 2 +- drivers/media/video/saa7134/saa7134-empress.c | 2 +- drivers/media/video/saa7134/saa7134-i2c.c | 1 - drivers/media/video/saa7134/saa7134-input.c | 15 +- drivers/media/video/saa7134/saa7134-video.c | 16 +- drivers/media/video/saa7134/saa7134.h | 16 +- drivers/media/video/saa7164/Makefile | 2 +- drivers/media/video/saa7164/saa7164-api.c | 973 +- drivers/media/video/saa7164/saa7164-buffer.c | 194 +- drivers/media/video/saa7164/saa7164-bus.c | 131 +- drivers/media/video/saa7164/saa7164-cards.c | 33 +- drivers/media/video/saa7164/saa7164-cmd.c | 35 +- drivers/media/video/saa7164/saa7164-core.c | 890 +- drivers/media/video/saa7164/saa7164-dvb.c | 109 +- drivers/media/video/saa7164/saa7164-encoder.c | 1503 + drivers/media/video/saa7164/saa7164-fw.c | 11 +- drivers/media/video/saa7164/saa7164-i2c.c | 2 +- drivers/media/video/saa7164/saa7164-reg.h | 59 +- drivers/media/video/saa7164/saa7164-types.h | 255 +- drivers/media/video/saa7164/saa7164-vbi.c | 1375 + drivers/media/video/saa7164/saa7164.h | 295 +- drivers/media/video/saa717x.c | 27 +- drivers/media/video/saa7185.c | 28 +- drivers/media/video/saa7191.c | 27 +- drivers/media/video/sh_mobile_ceu_camera.c | 30 +- drivers/media/video/sh_vou.c | 7 +- drivers/media/video/sn9c102/sn9c102_devtable.h | 4 + drivers/media/video/soc_camera.c | 200 +- drivers/media/video/sr030pc30.c | 894 + drivers/media/video/tda7432.c | 27 +- drivers/media/video/tda9840.c | 27 +- drivers/media/video/tda9875.c | 27 +- drivers/media/video/tea6415c.c | 27 +- drivers/media/video/tea6420.c | 27 +- drivers/media/video/tlg2300/pd-video.c | 4 +- drivers/media/video/tlv320aic23b.c | 28 +- drivers/media/video/tuner-core.c | 40 +- drivers/media/video/tvaudio.c | 40 +- drivers/media/video/tvp514x.c | 67 +- drivers/media/video/tvp5150.c | 31 +- drivers/media/video/tvp7002.c | 126 +- drivers/media/video/tw9910.c | 20 +- drivers/media/video/upd64031a.c | 27 +- drivers/media/video/upd64083.c | 27 +- drivers/media/video/usbvideo/Kconfig | 10 +- drivers/media/video/usbvision/usbvision-i2c.c | 15 +- drivers/media/video/usbvision/usbvision-video.c | 8 +- drivers/media/video/usbvision/usbvision.h | 1 + drivers/media/video/uvc/uvc_ctrl.c | 712 +- drivers/media/video/uvc/uvc_driver.c | 19 +- drivers/media/video/uvc/uvc_isight.c | 2 +- drivers/media/video/uvc/uvc_queue.c | 11 +- drivers/media/video/uvc/uvc_status.c | 4 +- drivers/media/video/uvc/uvc_v4l2.c | 56 +- drivers/media/video/uvc/uvc_video.c | 52 +- drivers/media/video/uvc/uvcvideo.h | 40 +- drivers/media/video/v4l1-compat.c | 13 +- drivers/media/video/v4l2-common.c | 27 + drivers/media/video/v4l2-ctrls.c | 4 + drivers/media/video/v4l2-dev.c | 119 +- drivers/media/video/v4l2-event.c | 9 +- drivers/media/video/v4l2-mem2mem.c | 8 +- drivers/media/video/via-camera.c | 1474 + drivers/media/video/via-camera.h | 93 + drivers/media/video/videobuf-core.c | 115 +- drivers/media/video/videobuf-dma-contig.c | 15 +- drivers/media/video/videobuf-dma-sg.c | 13 +- drivers/media/video/videobuf-dvb.c | 2 +- drivers/media/video/videobuf-vmalloc.c | 9 +- drivers/media/video/vino.c | 4 +- drivers/media/video/vivi.c | 17 +- drivers/media/video/vp27smpx.c | 28 +- drivers/media/video/vpx3220.c | 27 +- drivers/media/video/wm8739.c | 27 +- drivers/media/video/wm8775.c | 132 +- drivers/media/video/zoran/zoran.h | 2 - drivers/media/video/zoran/zoran_card.c | 23 +- drivers/media/video/zoran/zoran_device.c | 12 +- drivers/media/video/zoran/zoran_driver.c | 2 +- drivers/media/video/zr364xx.c | 4 +- drivers/mfd/88pm860x-core.c | 51 +- drivers/mfd/Kconfig | 91 +- drivers/mfd/Makefile | 9 +- drivers/mfd/ab3100-core.c | 143 +- drivers/mfd/ab8500-core.c | 299 +- drivers/mfd/ab8500-debugfs.c | 652 + drivers/mfd/ab8500-i2c.c | 105 + drivers/mfd/ab8500-spi.c | 2 +- drivers/mfd/da903x.c | 8 +- drivers/mfd/ezx-pcap.c | 11 +- drivers/mfd/htc-pasic3.c | 7 - drivers/mfd/jz4740-adc.c | 2 +- drivers/mfd/max8925-core.c | 11 +- drivers/mfd/max8998-irq.c | 258 + drivers/mfd/max8998.c | 90 +- drivers/mfd/mc13783-core.c | 752 - drivers/mfd/mc13xxx-core.c | 840 + drivers/mfd/mfd-core.c | 18 +- drivers/mfd/pcf50633-core.c | 9 +- drivers/mfd/sh_mobile_sdhi.c | 19 + drivers/mfd/stmpe.c | 32 + drivers/mfd/tc6393xb.c | 2 +- drivers/mfd/timberdale.c | 14 + drivers/mfd/tps6507x.c | 2 +- drivers/mfd/tps6586x.c | 225 +- drivers/mfd/twl-core.c | 40 +- drivers/mfd/twl-core.h | 10 + drivers/mfd/twl4030-irq.c | 4 +- drivers/mfd/twl4030-power.c | 30 +- drivers/mfd/twl6030-irq.c | 75 + drivers/mfd/vx855.c | 147 + drivers/mfd/wm831x-core.c | 148 +- drivers/mfd/wm831x-i2c.c | 143 + drivers/mfd/wm831x-spi.c | 232 + drivers/misc/Kconfig | 10 + drivers/misc/Makefile | 2 + drivers/misc/ab8500-pwm.c | 168 + drivers/misc/ti-st/Kconfig | 17 + drivers/misc/ti-st/Makefile | 6 + drivers/{staging => misc}/ti-st/st_core.c | 91 +- drivers/{staging => misc}/ti-st/st_kim.c | 32 +- drivers/{staging => misc}/ti-st/st_ll.c | 7 +- drivers/mmc/Makefile | 4 +- drivers/mmc/card/Kconfig | 17 + drivers/mmc/card/Makefile | 4 - drivers/mmc/card/block.c | 61 +- drivers/mmc/card/mmc_test.c | 469 +- drivers/mmc/card/queue.c | 14 +- drivers/mmc/core/Makefile | 4 - drivers/mmc/core/bus.c | 58 +- drivers/mmc/core/bus.h | 2 +- drivers/mmc/core/core.c | 179 +- drivers/mmc/core/core.h | 7 +- drivers/mmc/core/debugfs.c | 35 +- drivers/mmc/core/host.c | 3 +- drivers/mmc/core/mmc.c | 58 +- drivers/mmc/core/sd.c | 10 +- drivers/mmc/core/sdio.c | 54 +- drivers/mmc/core/sdio_bus.c | 85 +- drivers/mmc/host/Kconfig | 37 + drivers/mmc/host/Makefile | 7 +- drivers/mmc/host/at91_mci.c | 11 +- drivers/mmc/host/atmel-mci.c | 5 +- drivers/mmc/host/au1xmmc.c | 4 +- drivers/mmc/host/bfin_sdh.c | 2 +- drivers/mmc/host/cb710-mmc.c | 54 +- drivers/mmc/host/davinci_mmc.c | 8 +- drivers/mmc/host/imxmmc.c | 3 +- drivers/mmc/host/jz4740_mmc.c | 3 +- drivers/mmc/host/mmc_spi.c | 24 +- drivers/mmc/host/mmci.c | 31 +- drivers/mmc/host/msm_sdcc.c | 3 +- drivers/mmc/host/mvsdio.c | 3 +- drivers/mmc/host/mxcmmc.c | 3 +- drivers/mmc/host/omap.c | 3 +- drivers/mmc/host/omap_hsmmc.c | 28 +- drivers/mmc/host/pxamci.c | 43 +- drivers/mmc/host/s3cmci.c | 3 +- drivers/mmc/host/sdhci-cns3xxx.c | 2 +- drivers/mmc/host/sdhci-esdhc-imx.c | 143 + drivers/mmc/host/sdhci-esdhc.h | 83 + drivers/mmc/host/sdhci-of-esdhc.c | 70 +- drivers/mmc/host/sdhci-pci.c | 89 + drivers/mmc/host/sdhci-pltfm.c | 44 +- drivers/mmc/host/sdhci-pltfm.h | 10 +- drivers/mmc/host/sdhci-pxa.c | 253 + drivers/mmc/host/sdhci.c | 86 +- drivers/mmc/host/sdhci.h | 150 +- drivers/mmc/host/sh_mmcif.c | 15 +- drivers/mmc/host/tifm_sd.c | 3 +- drivers/mmc/host/tmio_mmc.c | 30 +- drivers/mmc/host/ushc.c | 566 + drivers/mmc/host/via-sdmmc.c | 3 +- drivers/mmc/host/wbsd.c | 3 +- drivers/net/Kconfig | 12 +- drivers/net/atl1c/atl1c.h | 2 - drivers/net/atl1c/atl1c_main.c | 6 +- drivers/net/atlx/atl1.c | 12 +- drivers/net/atlx/atl1.h | 9 +- drivers/net/atlx/atlx.c | 4 + drivers/net/benet/be_cmds.c | 36 - drivers/net/benet/be_cmds.h | 2 - drivers/net/benet/be_main.c | 49 +- drivers/net/bnx2x/bnx2x.h | 5 - drivers/net/bnx2x/bnx2x_cmn.c | 3 +- drivers/net/bnx2x/bnx2x_cmn.h | 55 - drivers/net/bnx2x/bnx2x_init_ops.h | 34 +- drivers/net/bnx2x/bnx2x_link.c | 137 +- drivers/net/bnx2x/bnx2x_link.h | 15 - drivers/net/bnx2x/bnx2x_main.c | 55 +- drivers/net/bonding/bond_main.c | 4 +- drivers/net/caif/Kconfig | 7 + drivers/net/caif/Makefile | 4 + drivers/net/caif/caif_shm_u5500.c | 129 + drivers/net/caif/caif_shmcore.c | 744 + drivers/net/can/Kconfig | 8 + drivers/net/can/Makefile | 1 + drivers/net/can/at91_can.c | 95 +- drivers/net/can/flexcan.c | 3 +- drivers/net/can/mcp251x.c | 3 + drivers/net/can/pch_can.c | 1463 + drivers/net/can/sja1000/Kconfig | 12 + drivers/net/can/sja1000/Makefile | 1 + drivers/net/can/sja1000/tscan1.c | 216 + drivers/net/cxgb3/cxgb3_main.c | 8 +- drivers/net/cxgb4/cxgb4.h | 1 - drivers/net/cxgb4/cxgb4_main.c | 33 +- drivers/net/cxgb4/sge.c | 23 +- drivers/net/e1000/e1000_main.c | 2 +- drivers/net/ehea/ehea.h | 2 + drivers/net/ehea/ehea_main.c | 42 +- drivers/net/gianfar.c | 6 +- drivers/net/jme.c | 45 +- drivers/net/macb.c | 27 +- drivers/net/mlx4/icm.c | 28 +- drivers/net/mlx4/icm.h | 2 - drivers/net/mlx4/port.c | 11 + drivers/net/phy/phy.c | 13 +- drivers/net/phy/phy_device.c | 19 +- drivers/net/qlcnic/qlcnic.h | 7 +- drivers/net/qlcnic/qlcnic_ethtool.c | 23 +- drivers/net/qlcnic/qlcnic_main.c | 19 +- drivers/net/qlge/qlge.h | 12 +- drivers/net/qlge/qlge_main.c | 24 +- drivers/net/qlge/qlge_mpi.c | 6 +- drivers/net/sb1000.c | 6 +- drivers/net/sgiseeq.c | 2 +- drivers/net/slhc.c | 15 +- drivers/net/smsc911x.c | 3 +- drivers/net/smsc911x.h | 11 + drivers/net/tg3.c | 10 +- drivers/net/tokenring/tms380tr.c | 2 +- drivers/net/typhoon.c | 92 +- drivers/net/vmxnet3/upt1_defs.h | 8 +- drivers/net/vmxnet3/vmxnet3_defs.h | 6 +- drivers/net/vmxnet3/vmxnet3_drv.c | 22 +- drivers/net/vmxnet3/vmxnet3_ethtool.c | 14 +- drivers/net/vmxnet3/vmxnet3_int.h | 19 +- drivers/net/vxge/vxge-config.c | 332 +- drivers/net/vxge/vxge-config.h | 227 +- drivers/net/vxge/vxge-ethtool.c | 2 +- drivers/net/vxge/vxge-main.c | 64 +- drivers/net/vxge/vxge-main.h | 59 +- drivers/net/vxge/vxge-traffic.c | 101 +- drivers/net/vxge/vxge-traffic.h | 134 - drivers/net/wireless/ath/ath5k/base.c | 1 + .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 191 +- drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 14 +- drivers/net/wireless/ath/ath9k/beacon.c | 2 +- drivers/net/wireless/ath/ath9k/init.c | 1 + drivers/net/wireless/ath/ath9k/main.c | 7 +- drivers/net/wireless/ath/ath9k/xmit.c | 8 +- drivers/net/wireless/ath/carl9170/cmd.h | 51 +- drivers/net/wireless/ath/carl9170/main.c | 2 +- drivers/net/wireless/ath/carl9170/usb.c | 25 +- drivers/net/wireless/b43/phy_n.c | 2 +- drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 3 +- drivers/net/wireless/wl1251/Makefile | 8 +- drivers/parisc/dino.c | 29 +- drivers/parisc/eisa.c | 29 +- drivers/parisc/gsc.c | 36 +- drivers/parisc/iosapic.c | 56 +- drivers/parisc/led.c | 6 +- drivers/parisc/superio.c | 25 +- drivers/pci/Makefile | 4 +- drivers/pci/bus.c | 53 +- drivers/pci/hotplug/ibmphp_hpc.c | 4 +- drivers/pci/msi.h | 4 +- drivers/pci/pci.c | 79 +- drivers/pci/pci.h | 3 - drivers/pci/pcie/aer/aerdrv.c | 2 +- drivers/pci/pcie/aer/aerdrv.h | 3 + drivers/pci/pcie/aer/aerdrv_acpi.c | 34 + drivers/pci/pcie/aer/aerdrv_core.c | 2 +- drivers/pci/pcie/portdrv_acpi.c | 2 +- drivers/pci/probe.c | 4 +- drivers/pci/proc.c | 4 +- drivers/pci/quirks.c | 31 + drivers/pci/setup-res.c | 2 +- drivers/platform/x86/intel_pmic_gpio.c | 1 - drivers/rapidio/rio-driver.c | 2 +- drivers/rapidio/rio-scan.c | 187 +- drivers/rapidio/rio-sysfs.c | 26 +- drivers/rapidio/rio.c | 330 +- drivers/rapidio/rio.h | 5 + drivers/rapidio/switches/Kconfig | 7 + drivers/rapidio/switches/Makefile | 1 + drivers/rapidio/switches/idt_gen2.c | 447 + drivers/rapidio/switches/idtcps.c | 10 + drivers/rapidio/switches/tsi568.c | 15 +- drivers/rapidio/switches/tsi57x.c | 7 +- drivers/regulator/Kconfig | 15 + drivers/regulator/Makefile | 5 +- drivers/regulator/ab8500.c | 86 +- drivers/regulator/core.c | 57 +- drivers/regulator/dummy.h | 4 - drivers/regulator/lp3972.c | 660 + drivers/regulator/max8952.c | 366 + drivers/regulator/max8998.c | 270 +- drivers/rtc/Kconfig | 31 +- drivers/rtc/Makefile | 4 +- drivers/rtc/class.c | 4 +- drivers/rtc/rtc-ab8500.c | 103 +- drivers/rtc/rtc-bfin.c | 43 +- drivers/rtc/rtc-ds3232.c | 181 + drivers/rtc/rtc-jz4740.c | 45 +- drivers/rtc/rtc-lpc32xx.c | 414 + drivers/rtc/rtc-max8998.c | 300 + drivers/rtc/rtc-mc13783.c | 428 - drivers/rtc/rtc-mc13xxx.c | 437 + drivers/rtc/rtc-omap.c | 12 +- drivers/rtc/rtc-rs5c313.c | 34 +- drivers/rtc/rtc-s3c.c | 92 +- drivers/sh/intc/chip.c | 53 +- drivers/sh/intc/core.c | 45 +- drivers/sh/intc/dynamic.c | 91 +- drivers/sh/intc/internals.h | 2 +- drivers/sh/intc/virq.c | 14 +- drivers/sh/maple/maple.c | 20 +- drivers/staging/Kconfig | 32 +- drivers/staging/Makefile | 17 +- drivers/staging/adis16255/adis16255.c | 4 +- drivers/staging/ath6kl/Kconfig | 163 + drivers/staging/ath6kl/Makefile | 159 + drivers/staging/ath6kl/TODO | 8 + drivers/staging/ath6kl/bmi/include/bmi_internal.h | 55 + drivers/staging/ath6kl/bmi/src/bmi.c | 1010 + .../staging/ath6kl/hif/common/hif_sdio_common.h | 87 + .../hif/sdio/linux_sdio/include/hif_internal.h | 134 + .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 1298 + .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | 393 + drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 1471 + drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 398 + drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c | 784 + drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c | 756 + .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | 1280 + drivers/staging/ath6kl/htc2/htc.c | 579 + drivers/staging/ath6kl/htc2/htc_debug.h | 38 + drivers/staging/ath6kl/htc2/htc_internal.h | 220 + drivers/staging/ath6kl/htc2/htc_recv.c | 1578 ++ drivers/staging/ath6kl/htc2/htc_send.c | 1023 + drivers/staging/ath6kl/htc2/htc_services.c | 450 + drivers/staging/ath6kl/include/a_config.h | 53 + drivers/staging/ath6kl/include/a_debug.h | 224 + drivers/staging/ath6kl/include/a_drv.h | 54 + drivers/staging/ath6kl/include/a_drv_api.h | 232 + drivers/staging/ath6kl/include/a_osapi.h | 61 + drivers/staging/ath6kl/include/a_types.h | 58 + drivers/staging/ath6kl/include/aggr_recv_api.h | 140 + drivers/staging/ath6kl/include/ar3kconfig.h | 65 + drivers/staging/ath6kl/include/ar6000_api.h | 54 + drivers/staging/ath6kl/include/ar6000_diag.h | 48 + drivers/staging/ath6kl/include/ar6kap_common.h | 44 + drivers/staging/ath6kl/include/athbtfilter.h | 135 + drivers/staging/ath6kl/include/athendpack.h | 52 + drivers/staging/ath6kl/include/athstartpack.h | 55 + drivers/staging/ath6kl/include/bmi.h | 135 + .../ath6kl/include/common/AR6002/AR6002_regdump.h | 60 + .../ath6kl/include/common/AR6002/AR6K_version.h | 52 + .../staging/ath6kl/include/common/AR6002/addrs.h | 90 + .../common/AR6002/hw2.0/hw/analog_intf_reg.h | 64 + .../include/common/AR6002/hw2.0/hw/analog_reg.h | 1932 ++ .../include/common/AR6002/hw2.0/hw/apb_map.h | 13 + .../include/common/AR6002/hw2.0/hw/gpio_reg.h | 977 + .../include/common/AR6002/hw2.0/hw/mbox_host_reg.h | 386 + .../include/common/AR6002/hw2.0/hw/mbox_reg.h | 481 + .../include/common/AR6002/hw2.0/hw/rtc_reg.h | 1163 + .../ath6kl/include/common/AR6002/hw2.0/hw/si_reg.h | 186 + .../include/common/AR6002/hw2.0/hw/uart_reg.h | 327 + .../include/common/AR6002/hw2.0/hw/vmc_reg.h | 76 + .../common/AR6002/hw4.0/hw/analog_intf_ares_reg.h | 3291 +++ .../AR6002/hw4.0/hw/analog_intf_athr_wlan_reg.h | 3674 +++ .../common/AR6002/hw4.0/hw/analog_intf_reg.h | 37 + .../common/AR6002/hw4.0/hw/apb_athr_wlan_map.h | 40 + .../include/common/AR6002/hw4.0/hw/apb_map.h | 48 + .../include/common/AR6002/hw4.0/hw/bb_lc_reg.h | 7076 +++++ .../include/common/AR6002/hw4.0/hw/efuse_reg.h | 108 + .../common/AR6002/hw4.0/hw/gpio_athr_wlan_reg.h | 1253 + .../include/common/AR6002/hw4.0/hw/gpio_reg.h | 1094 + .../include/common/AR6002/hw4.0/hw/mac_dma_reg.h | 605 + .../include/common/AR6002/hw4.0/hw/mac_pcu_reg.h | 3065 ++ .../include/common/AR6002/hw4.0/hw/mbox_host_reg.h | 37 + .../include/common/AR6002/hw4.0/hw/mbox_reg.h | 560 + .../common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h | 522 + .../include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h | 638 + .../include/common/AR6002/hw4.0/hw/rdma_reg.h | 564 + .../include/common/AR6002/hw4.0/hw/rtc_reg.h | 975 + .../include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h | 2065 ++ .../ath6kl/include/common/AR6002/hw4.0/hw/si_reg.h | 209 + .../include/common/AR6002/hw4.0/hw/uart_reg.h | 260 + .../include/common/AR6002/hw4.0/hw/umbox_reg.h | 37 + .../common/AR6002/hw4.0/hw/umbox_wlan_reg.h | 322 + .../include/common/AR6002/hw4.0/hw/vmc_reg.h | 167 + .../include/common/AR6002/hw4.0/hw/vmc_wlan_reg.h | 195 + drivers/staging/ath6kl/include/common/a_hci.h | 682 + drivers/staging/ath6kl/include/common/athdefs.h | 84 + drivers/staging/ath6kl/include/common/bmi_msg.h | 241 + drivers/staging/ath6kl/include/common/btcoexGpio.h | 86 + drivers/staging/ath6kl/include/common/cnxmgmt.h | 36 + drivers/staging/ath6kl/include/common/dbglog.h | 134 + drivers/staging/ath6kl/include/common/dbglog_id.h | 558 + drivers/staging/ath6kl/include/common/discovery.h | 75 + .../staging/ath6kl/include/common/dset_internal.h | 63 + drivers/staging/ath6kl/include/common/dsetid.h | 134 + .../staging/ath6kl/include/common/epping_test.h | 120 + drivers/staging/ath6kl/include/common/gmboxif.h | 78 + drivers/staging/ath6kl/include/common/gpio.h | 45 + drivers/staging/ath6kl/include/common/htc.h | 236 + .../staging/ath6kl/include/common/htc_services.h | 52 + drivers/staging/ath6kl/include/common/ini_dset.h | 82 + drivers/staging/ath6kl/include/common/pkt_log.h | 45 + drivers/staging/ath6kl/include/common/regDb.h | 29 + drivers/staging/ath6kl/include/common/regdump.h | 59 + .../include/common/regulatory/reg_dbschema.h | 237 + .../include/common/regulatory/reg_dbvalues.h | 504 + drivers/staging/ath6kl/include/common/roaming.h | 41 + drivers/staging/ath6kl/include/common/targaddrs.h | 245 + drivers/staging/ath6kl/include/common/testcmd.h | 185 + drivers/staging/ath6kl/include/common/tlpm.h | 38 + drivers/staging/ath6kl/include/common/wlan_defs.h | 79 + drivers/staging/ath6kl/include/common/wlan_dset.h | 33 + drivers/staging/ath6kl/include/common/wmi.h | 3119 +++ drivers/staging/ath6kl/include/common/wmi_thin.h | 347 + drivers/staging/ath6kl/include/common/wmix.h | 279 + drivers/staging/ath6kl/include/common_drv.h | 108 + drivers/staging/ath6kl/include/dbglog_api.h | 52 + drivers/staging/ath6kl/include/dl_list.h | 153 + drivers/staging/ath6kl/include/dset_api.h | 65 + drivers/staging/ath6kl/include/gpio_api.h | 59 + drivers/staging/ath6kl/include/hci_transport_api.h | 259 + drivers/staging/ath6kl/include/hif.h | 458 + drivers/staging/ath6kl/include/host_version.h | 52 + drivers/staging/ath6kl/include/htc_api.h | 575 + drivers/staging/ath6kl/include/htc_packet.h | 227 + drivers/staging/ath6kl/include/target_reg_table.h | 244 + drivers/staging/ath6kl/include/wlan_api.h | 128 + drivers/staging/ath6kl/include/wmi_api.h | 441 + drivers/staging/ath6kl/miscdrv/ar3kconfig.c | 566 + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 572 + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h | 75 + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c | 969 + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h | 127 + drivers/staging/ath6kl/miscdrv/common_drv.c | 1027 + drivers/staging/ath6kl/miscdrv/credit_dist.c | 418 + drivers/staging/ath6kl/miscdrv/miscdrv.h | 42 + drivers/staging/ath6kl/os/linux/ar6000_android.c | 413 + drivers/staging/ath6kl/os/linux/ar6000_drv.c | 6443 +++++ drivers/staging/ath6kl/os/linux/ar6000_pm.c | 731 + drivers/staging/ath6kl/os/linux/ar6000_raw_if.c | 455 + drivers/staging/ath6kl/os/linux/ar6k_pal.c | 481 + drivers/staging/ath6kl/os/linux/cfg80211.c | 1470 + drivers/staging/ath6kl/os/linux/eeprom.c | 574 + .../staging/ath6kl/os/linux/export_hci_transport.c | 125 + drivers/staging/ath6kl/os/linux/hci_bridge.c | 1144 + .../staging/ath6kl/os/linux/include/ar6000_drv.h | 762 + drivers/staging/ath6kl/os/linux/include/ar6k_pal.h | 36 + .../ath6kl/os/linux/include/ar6xapi_linux.h | 197 + .../staging/ath6kl/os/linux/include/athdrv_linux.h | 1219 + .../ath6kl/os/linux/include/athtypes_linux.h | 53 + drivers/staging/ath6kl/os/linux/include/cfg80211.h | 50 + .../staging/ath6kl/os/linux/include/config_linux.h | 60 + .../staging/ath6kl/os/linux/include/debug_linux.h | 50 + .../ath6kl/os/linux/include/export_hci_transport.h | 76 + .../ath6kl/os/linux/include/ieee80211_ioctl.h | 179 + .../staging/ath6kl/os/linux/include/osapi_linux.h | 387 + .../staging/ath6kl/os/linux/include/wlan_config.h | 111 + .../ath6kl/os/linux/include/wmi_filter_linux.h | 293 + drivers/staging/ath6kl/os/linux/ioctl.c | 4733 ++++ drivers/staging/ath6kl/os/linux/netbuf.c | 234 + drivers/staging/ath6kl/os/linux/wireless_ext.c | 2725 ++ drivers/staging/ath6kl/reorder/aggr_rx_internal.h | 116 + drivers/staging/ath6kl/reorder/rcv_aggr.c | 666 + drivers/staging/ath6kl/wlan/include/ieee80211.h | 401 + .../staging/ath6kl/wlan/include/ieee80211_node.h | 93 + drivers/staging/ath6kl/wlan/src/wlan_node.c | 636 + drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c | 200 + drivers/staging/ath6kl/wlan/src/wlan_utils.c | 61 + drivers/staging/ath6kl/wmi/wmi.c | 6670 +++++ drivers/staging/ath6kl/wmi/wmi_host.h | 102 + {fs => drivers/staging}/autofs/Kconfig | 0 {fs => drivers/staging}/autofs/Makefile | 2 +- drivers/staging/autofs/TODO | 8 + {fs => drivers/staging}/autofs/autofs_i.h | 2 +- {fs => drivers/staging}/autofs/dirhash.c | 2 +- {fs => drivers/staging}/autofs/init.c | 2 +- {fs => drivers/staging}/autofs/inode.c | 2 +- {fs => drivers/staging}/autofs/root.c | 2 +- {fs => drivers/staging}/autofs/symlink.c | 2 +- {fs => drivers/staging}/autofs/waitq.c | 2 +- drivers/staging/batman-adv/CHANGELOG | 63 - drivers/staging/batman-adv/Makefile | 2 +- drivers/staging/batman-adv/README | 50 +- drivers/staging/batman-adv/TODO | 9 +- drivers/staging/batman-adv/aggregation.c | 70 +- drivers/staging/batman-adv/bat_debugfs.c | 2 + drivers/staging/batman-adv/bat_sysfs.c | 140 +- drivers/staging/batman-adv/bitarray.c | 22 +- drivers/staging/batman-adv/bitarray.h | 7 +- drivers/staging/batman-adv/hard-interface.c | 291 +- drivers/staging/batman-adv/hard-interface.h | 19 +- drivers/staging/batman-adv/hash.c | 6 +- drivers/staging/batman-adv/hash.h | 4 +- drivers/staging/batman-adv/icmp_socket.c | 73 +- drivers/staging/batman-adv/main.c | 146 +- drivers/staging/batman-adv/main.h | 30 +- drivers/staging/batman-adv/originator.c | 186 +- drivers/staging/batman-adv/originator.h | 8 +- drivers/staging/batman-adv/packet.h | 28 +- drivers/staging/batman-adv/routing.c | 448 +- drivers/staging/batman-adv/routing.h | 16 +- drivers/staging/batman-adv/send.c | 175 +- drivers/staging/batman-adv/send.h | 7 +- drivers/staging/batman-adv/soft-interface.c | 241 +- drivers/staging/batman-adv/soft-interface.h | 13 +- drivers/staging/batman-adv/sysfs-class-net-mesh | 8 + drivers/staging/batman-adv/translation-table.c | 271 +- drivers/staging/batman-adv/translation-table.h | 30 +- drivers/staging/batman-adv/types.h | 103 +- drivers/staging/batman-adv/unicast.c | 269 + drivers/staging/batman-adv/unicast.h | 39 + drivers/staging/batman-adv/vis.c | 534 +- drivers/staging/batman-adv/vis.h | 27 +- drivers/staging/bcm/Adapter.h | 714 + drivers/staging/bcm/Arp.c | 94 + drivers/staging/bcm/Bcmchar.c | 2438 ++ drivers/staging/bcm/Bcmnet.c | 264 + drivers/staging/bcm/CmHost.c | 2441 ++ drivers/staging/bcm/CmHost.h | 166 + drivers/staging/bcm/DDRInit.c | 1302 + drivers/staging/bcm/DDRInit.h | 9 + drivers/staging/bcm/Debug.c | 41 + drivers/staging/bcm/Debug.h | 297 + drivers/staging/bcm/HandleControlPacket.c | 247 + drivers/staging/bcm/HostMIBSInterface.h | 230 + drivers/staging/bcm/HostMibs.h | 7 + drivers/staging/bcm/IPv6Protocol.c | 400 + drivers/staging/bcm/IPv6ProtocolHdr.h | 119 + drivers/staging/bcm/InterfaceAdapter.h | 97 + drivers/staging/bcm/InterfaceDld.c | 510 + drivers/staging/bcm/InterfaceIdleMode.c | 318 + drivers/staging/bcm/InterfaceIdleMode.h | 16 + drivers/staging/bcm/InterfaceInit.c | 868 + drivers/staging/bcm/InterfaceInit.h | 51 + drivers/staging/bcm/InterfaceIsr.c | 203 + drivers/staging/bcm/InterfaceIsr.h | 15 + drivers/staging/bcm/InterfaceMacros.h | 18 + drivers/staging/bcm/InterfaceMisc.c | 290 + drivers/staging/bcm/InterfaceMisc.h | 45 + drivers/staging/bcm/InterfaceRx.c | 256 + drivers/staging/bcm/InterfaceRx.h | 7 + drivers/staging/bcm/InterfaceTx.c | 259 + drivers/staging/bcm/InterfaceTx.h | 13 + drivers/staging/bcm/Interfacemain.h | 10 + drivers/staging/bcm/Ioctl.h | 360 + drivers/staging/bcm/Kconfig | 7 + drivers/staging/bcm/LeakyBucket.c | 399 + drivers/staging/bcm/Macros.h | 399 + drivers/staging/bcm/Makefile | 12 + drivers/staging/bcm/Misc.c | 2243 ++ drivers/staging/bcm/Osal_Misc.c | 27 + drivers/staging/bcm/PHSDefines.h | 125 + drivers/staging/bcm/PHSModule.c | 1641 ++ drivers/staging/bcm/PHSModule.h | 95 + drivers/staging/bcm/Protocol.h | 151 + drivers/staging/bcm/Prototypes.h | 322 + drivers/staging/bcm/Qos.c | 892 + drivers/staging/bcm/Queue.h | 31 + drivers/staging/bcm/TODO | 15 + drivers/staging/bcm/Transmit.c | 555 + drivers/staging/bcm/Typedefs.h | 47 + drivers/staging/bcm/Version.h | 35 + drivers/staging/bcm/cntrl_SignalingInterface.h | 677 + drivers/staging/bcm/headers.h | 109 + drivers/staging/bcm/hostmibs.c | 164 + drivers/staging/bcm/led_control.c | 1006 + drivers/staging/bcm/led_control.h | 106 + drivers/staging/bcm/nvm.c | 5614 ++++ drivers/staging/bcm/nvm.h | 489 + drivers/staging/bcm/osal_misc.h | 49 + drivers/staging/bcm/sort.c | 63 + drivers/staging/bcm/target_params.h | 81 + drivers/staging/bcm/vendorspecificextn.c | 146 + drivers/staging/bcm/vendorspecificextn.h | 18 + drivers/staging/brcm80211/Kconfig | 33 + drivers/staging/brcm80211/Makefile | 76 + drivers/staging/brcm80211/README | 94 + drivers/staging/brcm80211/TODO | 49 + drivers/staging/brcm80211/brcmfmac/Kconfig | 15 + drivers/staging/brcm80211/brcmfmac/Makefile | 47 + drivers/staging/brcm80211/brcmfmac/README | 36 + drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 632 + drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 658 + drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 1238 + .../brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 231 + drivers/staging/brcm80211/brcmfmac/dhd.h | 468 + drivers/staging/brcm80211/brcmfmac/dhd_bus.h | 82 + drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 487 + drivers/staging/brcm80211/brcmfmac/dhd_common.c | 1910 ++ .../staging/brcm80211/brcmfmac/dhd_custom_gpio.c | 160 + drivers/staging/brcm80211/brcmfmac/dhd_dbg.h | 103 + drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 2929 ++ .../staging/brcm80211/brcmfmac/dhd_linux_sched.c | 26 + drivers/staging/brcm80211/brcmfmac/dhd_proto.h | 92 + drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 6103 ++++ drivers/staging/brcm80211/brcmfmac/dngl_stats.h | 32 + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 4229 +++ drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 394 + drivers/staging/brcm80211/brcmfmac/wl_iw.c | 3767 +++ drivers/staging/brcm80211/brcmfmac/wl_iw.h | 149 + drivers/staging/brcm80211/include/aidmp.h | 374 + drivers/staging/brcm80211/include/bcm_rpc.h | 79 + drivers/staging/brcm80211/include/bcm_rpc_tp.h | 137 + drivers/staging/brcm80211/include/bcm_xdr.h | 60 + drivers/staging/brcm80211/include/bcmcdc.h | 98 + drivers/staging/brcm80211/include/bcmdefs.h | 200 + drivers/staging/brcm80211/include/bcmdevs.h | 192 + drivers/staging/brcm80211/include/bcmendian.h | 303 + drivers/staging/brcm80211/include/bcmnvram.h | 172 + drivers/staging/brcm80211/include/bcmotp.h | 44 + drivers/staging/brcm80211/include/bcmsdbus.h | 113 + drivers/staging/brcm80211/include/bcmsdh.h | 198 + drivers/staging/brcm80211/include/bcmsdh_sdmmc.h | 110 + drivers/staging/brcm80211/include/bcmsdpcm.h | 207 + drivers/staging/brcm80211/include/bcmsrom.h | 34 + drivers/staging/brcm80211/include/bcmsrom_fmt.h | 367 + drivers/staging/brcm80211/include/bcmsrom_tbl.h | 583 + drivers/staging/brcm80211/include/bcmutils.h | 502 + drivers/staging/brcm80211/include/bcmwifi.h | 192 + drivers/staging/brcm80211/include/d11.h | 1778 ++ drivers/staging/brcm80211/include/dbus.h | 353 + drivers/staging/brcm80211/include/dhdioctl.h | 107 + drivers/staging/brcm80211/include/epivers.h | 44 + drivers/staging/brcm80211/include/hnddma.h | 243 + drivers/staging/brcm80211/include/hndpmu.h | 71 + drivers/staging/brcm80211/include/hndrte_armtrap.h | 75 + drivers/staging/brcm80211/include/hndrte_cons.h | 57 + drivers/staging/brcm80211/include/hndsoc.h | 199 + drivers/staging/brcm80211/include/linux_osl.h | 407 + drivers/staging/brcm80211/include/linuxver.h | 38 + drivers/staging/brcm80211/include/msgtrace.h | 67 + drivers/staging/brcm80211/include/nicpci.h | 79 + drivers/staging/brcm80211/include/osl.h | 59 + .../staging/brcm80211/include/packed_section_end.h | 32 + .../brcm80211/include/packed_section_start.h | 36 + drivers/staging/brcm80211/include/pci_core.h | 122 + drivers/staging/brcm80211/include/pcicfg.h | 524 + drivers/staging/brcm80211/include/pcie_core.h | 299 + drivers/staging/brcm80211/include/proto/802.11.h | 322 + drivers/staging/brcm80211/include/proto/802.1d.h | 37 + drivers/staging/brcm80211/include/proto/bcmeth.h | 48 + drivers/staging/brcm80211/include/proto/bcmevent.h | 217 + drivers/staging/brcm80211/include/proto/ethernet.h | 110 + drivers/staging/brcm80211/include/proto/wpa.h | 127 + drivers/staging/brcm80211/include/qmath.h | 78 + drivers/staging/brcm80211/include/rpc_osl.h | 33 + drivers/staging/brcm80211/include/sbchipc.h | 1588 ++ drivers/staging/brcm80211/include/sbconfig.h | 272 + drivers/staging/brcm80211/include/sbhnddma.h | 315 + drivers/staging/brcm80211/include/sbhndpio.h | 52 + drivers/staging/brcm80211/include/sbpcmcia.h | 217 + drivers/staging/brcm80211/include/sbsdio.h | 152 + drivers/staging/brcm80211/include/sbsdpcmdev.h | 281 + drivers/staging/brcm80211/include/sbsocram.h | 175 + drivers/staging/brcm80211/include/sdio.h | 552 + drivers/staging/brcm80211/include/sdioh.h | 63 + drivers/staging/brcm80211/include/sdiovar.h | 44 + drivers/staging/brcm80211/include/siutils.h | 377 + drivers/staging/brcm80211/include/spid.h | 155 + drivers/staging/brcm80211/include/wlioctl.h | 2025 ++ drivers/staging/brcm80211/phy/phy_version.h | 36 + drivers/staging/brcm80211/phy/wlc_phy_cmn.c | 3456 +++ drivers/staging/brcm80211/phy/wlc_phy_hal.h | 262 + drivers/staging/brcm80211/phy/wlc_phy_int.h | 1229 + drivers/staging/brcm80211/phy/wlc_phy_lcn.c | 5320 ++++ drivers/staging/brcm80211/phy/wlc_phy_lcn.h | 119 + drivers/staging/brcm80211/phy/wlc_phy_n.c |29234 ++++++++++++++++++++ drivers/staging/brcm80211/phy/wlc_phy_radio.h | 1533 + drivers/staging/brcm80211/phy/wlc_phyreg_n.h | 167 + drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c | 3638 +++ drivers/staging/brcm80211/phy/wlc_phytbl_lcn.h | 49 + drivers/staging/brcm80211/phy/wlc_phytbl_n.c |10631 +++++++ drivers/staging/brcm80211/phy/wlc_phytbl_n.h | 39 + drivers/staging/brcm80211/sys/d11ucode_ext.h | 35 + drivers/staging/brcm80211/sys/wl_dbg.h | 82 + drivers/staging/brcm80211/sys/wl_export.h | 63 + drivers/staging/brcm80211/sys/wl_mac80211.c | 2382 ++ drivers/staging/brcm80211/sys/wl_mac80211.h | 161 + drivers/staging/brcm80211/sys/wl_ucode.h | 37 + drivers/staging/brcm80211/sys/wl_ucode_loader.c | 90 + drivers/staging/brcm80211/sys/wlc_alloc.c | 373 + drivers/staging/brcm80211/sys/wlc_alloc.h | 25 + drivers/staging/brcm80211/sys/wlc_ampdu.c | 1411 + drivers/staging/brcm80211/sys/wlc_ampdu.h | 40 + drivers/staging/brcm80211/sys/wlc_antsel.c | 322 + drivers/staging/brcm80211/sys/wlc_antsel.h | 28 + drivers/staging/brcm80211/sys/wlc_bmac.c | 4206 +++ drivers/staging/brcm80211/sys/wlc_bmac.h | 277 + drivers/staging/brcm80211/sys/wlc_bsscfg.h | 152 + drivers/staging/brcm80211/sys/wlc_cfg.h | 310 + drivers/staging/brcm80211/sys/wlc_channel.c | 1599 ++ drivers/staging/brcm80211/sys/wlc_channel.h | 159 + drivers/staging/brcm80211/sys/wlc_event.c | 226 + drivers/staging/brcm80211/sys/wlc_event.h | 51 + drivers/staging/brcm80211/sys/wlc_key.h | 144 + drivers/staging/brcm80211/sys/wlc_mac80211.c | 8675 ++++++ drivers/staging/brcm80211/sys/wlc_mac80211.h | 1040 + drivers/staging/brcm80211/sys/wlc_phy_shim.c | 243 + drivers/staging/brcm80211/sys/wlc_phy_shim.h | 112 + drivers/staging/brcm80211/sys/wlc_pub.h | 627 + drivers/staging/brcm80211/sys/wlc_rate.c | 499 + drivers/staging/brcm80211/sys/wlc_rate.h | 170 + drivers/staging/brcm80211/sys/wlc_rpc.h | 527 + drivers/staging/brcm80211/sys/wlc_rpctx.h | 71 + drivers/staging/brcm80211/sys/wlc_scb.h | 84 + drivers/staging/brcm80211/sys/wlc_stf.c | 593 + drivers/staging/brcm80211/sys/wlc_stf.h | 42 + drivers/staging/brcm80211/sys/wlc_types.h | 52 + drivers/staging/brcm80211/util/aiutils.c | 708 + drivers/staging/brcm80211/util/bcmotp.c | 965 + drivers/staging/brcm80211/util/bcmsrom.c | 2076 ++ drivers/staging/brcm80211/util/bcmutils.c | 1044 + drivers/staging/brcm80211/util/bcmwifi.c | 189 + drivers/staging/brcm80211/util/hnddma.c | 2690 ++ drivers/staging/brcm80211/util/hndpmu.c | 2693 ++ drivers/staging/brcm80211/util/linux_osl.c | 424 + drivers/staging/brcm80211/util/nicpci.c | 881 + drivers/staging/brcm80211/util/nvram/nvram_ro.c | 212 + drivers/staging/brcm80211/util/qmath.c | 681 + drivers/staging/brcm80211/util/sbutils.c | 585 + drivers/staging/brcm80211/util/siutils.c | 2021 ++ drivers/staging/brcm80211/util/siutils_priv.h | 32 + drivers/staging/comedi/Makefile | 2 +- drivers/staging/comedi/comedi_fops.c | 3 +- .../comedi/drivers/addi-data/APCI1710_82x54.c | 2 +- .../comedi/drivers/addi-data/APCI1710_82x54.h | 2 +- .../comedi/drivers/addi-data/APCI1710_Chrono.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Dig_io.h | 2 +- .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 2 +- .../comedi/drivers/addi-data/APCI1710_INCCPT.h | 2 +- .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Inp_cpt.h | 2 +- .../comedi/drivers/addi-data/APCI1710_Pwm.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Pwm.h | 2 +- .../comedi/drivers/addi-data/APCI1710_Ssi.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Ssi.h | 2 +- .../comedi/drivers/addi-data/APCI1710_Tor.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Tor.h | 2 +- .../comedi/drivers/addi-data/APCI1710_Ttl.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Ttl.h | 2 +- .../comedi/drivers/addi-data/addi_amcc_S5920.c | 2 +- .../comedi/drivers/addi-data/addi_amcc_S5920.h | 2 +- .../comedi/drivers/addi-data/addi_amcc_s5933.h | 2 +- .../staging/comedi/drivers/addi-data/addi_common.c | 2 +- .../staging/comedi/drivers/addi-data/addi_common.h | 2 +- .../staging/comedi/drivers/addi-data/addi_eeprom.c | 2 +- .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 6 +- .../comedi/drivers/addi-data/hwdrv_APCI1710.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci035.c | 4 +- .../comedi/drivers/addi-data/hwdrv_apci035.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1032.c | 4 +- .../comedi/drivers/addi-data/hwdrv_apci1032.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1500.c | 4 +- .../comedi/drivers/addi-data/hwdrv_apci1500.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1516.c | 4 +- .../comedi/drivers/addi-data/hwdrv_apci1516.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1564.c | 4 +- .../comedi/drivers/addi-data/hwdrv_apci1564.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci2016.c | 4 +- .../comedi/drivers/addi-data/hwdrv_apci2016.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci2032.c | 4 +- .../comedi/drivers/addi-data/hwdrv_apci2032.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci2200.c | 4 +- .../comedi/drivers/addi-data/hwdrv_apci2200.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3120.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3120.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3200.c | 4 +- .../comedi/drivers/addi-data/hwdrv_apci3200.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3501.c | 4 +- .../comedi/drivers/addi-data/hwdrv_apci3501.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3xxx.h | 2 +- drivers/staging/comedi/drivers/adl_pci6208.c | 5 +- drivers/staging/comedi/drivers/adl_pci9111.c | 219 +- drivers/staging/comedi/drivers/adl_pci9118.c | 42 +- drivers/staging/comedi/drivers/adv_pci1710.c | 13 +- drivers/staging/comedi/drivers/adv_pci1723.c | 5 +- drivers/staging/comedi/drivers/adv_pci_dio.c | 29 +- drivers/staging/comedi/drivers/aio_aio12_8.c | 6 +- drivers/staging/comedi/drivers/aio_iiro_16.c | 6 +- drivers/staging/comedi/drivers/cb_pcidas.c | 19 +- drivers/staging/comedi/drivers/cb_pcidas64.c | 62 +- drivers/staging/comedi/drivers/cb_pcidda.c | 15 +- drivers/staging/comedi/drivers/cb_pcidio.c | 9 +- drivers/staging/comedi/drivers/cb_pcimdas.c | 6 +- drivers/staging/comedi/drivers/dt2817.c | 14 +- drivers/staging/comedi/drivers/dt3000.c | 17 +- drivers/staging/comedi/drivers/dt9812.c | 2 +- drivers/staging/comedi/drivers/me4000.c | 29 +- drivers/staging/comedi/drivers/ni_labpc.c | 16 +- drivers/staging/comedi/drivers/rtd520.c | 7 +- drivers/staging/comedi/drivers/skel.c | 7 +- drivers/staging/comedi/drivers/usbdux.c | 2 +- drivers/staging/cpia/Kconfig | 39 + drivers/staging/cpia/Makefile | 5 + drivers/staging/cpia/TODO | 8 + drivers/{media/video => staging/cpia}/cpia.c | 0 drivers/{media/video => staging/cpia}/cpia.h | 0 drivers/{media/video => staging/cpia}/cpia_pp.c | 0 drivers/{media/video => staging/cpia}/cpia_usb.c | 0 drivers/staging/crystalhd/Makefile | 2 +- drivers/staging/crystalhd/crystalhd_lnx.c | 1 + drivers/staging/crystalhd/crystalhd_lnx.h | 2 +- drivers/staging/cx25821/Kconfig | 2 +- drivers/staging/cx25821/Makefile | 10 +- drivers/staging/cx25821/cx25821-alsa.c | 2 +- drivers/staging/cx25821/cx25821-audio-upstream.c | 15 +- drivers/staging/cx25821/cx25821-audio-upstream.h | 4 +- drivers/staging/cx25821/cx25821-audio.h | 13 +- drivers/staging/cx25821/cx25821-core.c | 77 +- drivers/staging/cx25821/cx25821-i2c.c | 2 +- drivers/staging/cx25821/cx25821-medusa-reg.h | 10 +- drivers/staging/cx25821/cx25821-medusa-video.c | 8 +- drivers/staging/cx25821/cx25821-reg.h | 4 +- .../staging/cx25821/cx25821-video-upstream-ch2.c | 135 +- .../staging/cx25821/cx25821-video-upstream-ch2.h | 14 +- drivers/staging/cx25821/cx25821-video-upstream.c | 28 +- drivers/staging/cx25821/cx25821-video-upstream.h | 10 +- drivers/staging/cx25821/cx25821-video.c | 6 +- drivers/staging/cx25821/cx25821.h | 51 +- drivers/staging/cxt1e1/Kconfig | 2 +- drivers/staging/cxt1e1/Makefile | 8 +- drivers/staging/cxt1e1/functions.c | 4 +- drivers/staging/cxt1e1/linux.c | 20 +- drivers/staging/cxt1e1/musycc.c | 22 +- drivers/staging/cxt1e1/pmcc4_drv.c | 14 +- drivers/staging/cxt1e1/sbeproc.c | 13 +- drivers/staging/dream/Makefile | 2 +- drivers/staging/dream/camera/Makefile | 2 +- drivers/staging/dream/pmem.c | 2 +- drivers/staging/dream/qdsp5/Makefile | 2 +- drivers/staging/dt3155v4l/dt3155v4l.c | 8 +- drivers/staging/easycap/Makefile | 14 +- drivers/staging/et131x/Makefile | 2 +- drivers/staging/et131x/et131x_initpci.c | 2 +- drivers/staging/frontier/alphatrack.c | 2 +- drivers/staging/frontier/tranzport.c | 56 +- drivers/staging/ft1000/Kconfig | 22 + drivers/staging/ft1000/Makefile | 3 + drivers/staging/ft1000/TODO | 9 + drivers/staging/ft1000/ft1000-pcmcia/Makefile | 3 + drivers/staging/ft1000/ft1000-pcmcia/boot.h | 158 + drivers/staging/ft1000/ft1000-pcmcia/ft1000.conf | 14 + drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 409 + drivers/staging/ft1000/ft1000-pcmcia/ft1000.img | Bin 0 -> 305770 bytes drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c | 513 + drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.h | 1 + drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h | 66 + drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 940 + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 2294 ++ drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 219 + drivers/staging/ft1000/ft1000-usb/Makefile | 3 + drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c | 936 + .../staging/ft1000/ft1000-usb/ft1000_download.c | 1248 + drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 2326 ++ drivers/staging/ft1000/ft1000-usb/ft1000_hw.h | 10 + drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h | 139 + drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 232 + drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 276 + drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 608 + drivers/staging/ft1000/ft1000-usb/ft3000.img | Bin 0 -> 280414 bytes drivers/staging/go7007/Kconfig | 2 +- drivers/staging/go7007/Makefile | 10 +- drivers/staging/go7007/go7007-driver.c | 55 +- drivers/staging/go7007/go7007-usb.c | 2 +- drivers/staging/go7007/go7007-v4l2.c | 19 +- drivers/staging/go7007/s2250-board.c | 34 +- drivers/staging/go7007/wis-ov7640.c | 1 + drivers/staging/go7007/wis-saa7113.c | 1 + drivers/staging/go7007/wis-saa7115.c | 1 + drivers/staging/go7007/wis-sony-tuner.c | 1 + drivers/staging/go7007/wis-tw2804.c | 1 + drivers/staging/go7007/wis-tw9903.c | 1 + drivers/staging/go7007/wis-uda1342.c | 1 + drivers/staging/hv/Makefile | 10 +- drivers/staging/hv/TODO | 2 - drivers/staging/hv/blkvsc.c | 2 +- drivers/staging/hv/blkvsc_drv.c | 2 - drivers/staging/hv/channel.c | 841 +- drivers/staging/hv/channel.h | 122 +- drivers/staging/hv/channel_interface.c | 152 - drivers/staging/hv/channel_interface.h | 35 - drivers/staging/hv/channel_mgmt.c | 342 +- drivers/staging/hv/channel_mgmt.h | 10 +- drivers/staging/hv/connection.c | 4 +- drivers/staging/hv/hv_utils.c | 12 +- drivers/staging/hv/netvsc.c | 137 +- drivers/staging/hv/netvsc_drv.c | 4 +- drivers/staging/hv/storvsc.c | 93 +- drivers/staging/hv/storvsc_drv.c | 2 - drivers/staging/hv/vmbus.c | 35 +- drivers/staging/hv/vmbus.h | 2 - drivers/staging/hv/vmbus_api.h | 55 +- drivers/staging/hv/vmbus_drv.c | 84 +- drivers/staging/hv/vmbus_private.h | 3 +- drivers/staging/iio/Documentation/generic_buffer.c | 318 + drivers/staging/iio/Documentation/iio_utils.h | 396 +- .../iio/Documentation/lis3l02dqbuffersimple.c | 238 - drivers/staging/iio/Documentation/overview.txt | 17 +- drivers/staging/iio/Documentation/ring.txt | 6 +- drivers/staging/iio/Documentation/sysfs-bus-iio | 390 + .../staging/iio/Documentation/sysfs-bus-iio-light | 64 + drivers/staging/iio/Documentation/sysfs-class-iio | 294 - drivers/staging/iio/Documentation/userspace.txt | 56 +- drivers/staging/iio/accel/accel.h | 172 +- drivers/staging/iio/accel/adis16209_core.c | 48 +- drivers/staging/iio/accel/adis16209_ring.c | 90 +- drivers/staging/iio/accel/adis16209_trigger.c | 2 +- drivers/staging/iio/accel/adis16220_core.c | 26 +- drivers/staging/iio/accel/adis16240_core.c | 37 +- drivers/staging/iio/accel/adis16240_ring.c | 72 +- drivers/staging/iio/accel/adis16240_trigger.c | 2 +- drivers/staging/iio/accel/inclinometer.h | 2 + drivers/staging/iio/accel/lis3l02dq_core.c | 66 +- drivers/staging/iio/accel/lis3l02dq_ring.c | 79 +- drivers/staging/iio/accel/sca3000.h | 2 +- drivers/staging/iio/accel/sca3000_core.c | 71 +- drivers/staging/iio/accel/sca3000_ring.c | 91 +- drivers/staging/iio/adc/Kconfig | 35 + drivers/staging/iio/adc/Makefile | 8 + drivers/staging/iio/adc/ad7476.h | 77 + drivers/staging/iio/adc/ad7476_core.c | 293 + drivers/staging/iio/adc/ad7476_ring.c | 207 + drivers/staging/iio/adc/ad799x.h | 159 + drivers/staging/iio/adc/ad799x_core.c | 923 + drivers/staging/iio/adc/ad799x_ring.c | 240 + drivers/staging/iio/adc/adc.h | 19 +- drivers/staging/iio/adc/max1363_core.c | 208 +- drivers/staging/iio/adc/max1363_ring.c | 22 +- drivers/staging/iio/chrdev.h | 2 - drivers/staging/iio/gyro/adis16260_core.c | 36 +- drivers/staging/iio/gyro/adis16260_ring.c | 68 +- drivers/staging/iio/gyro/adis16260_trigger.c | 2 +- drivers/staging/iio/gyro/gyro.h | 46 +- drivers/staging/iio/iio.h | 106 +- drivers/staging/iio/imu/adis16300_core.c | 50 +- drivers/staging/iio/imu/adis16300_ring.c | 95 +- drivers/staging/iio/imu/adis16300_trigger.c | 2 +- drivers/staging/iio/imu/adis16350_core.c | 59 +- drivers/staging/iio/imu/adis16350_ring.c | 113 +- drivers/staging/iio/imu/adis16350_trigger.c | 2 +- drivers/staging/iio/imu/adis16400_core.c | 69 +- drivers/staging/iio/imu/adis16400_ring.c | 122 +- drivers/staging/iio/imu/adis16400_trigger.c | 2 +- drivers/staging/iio/industrialio-core.c | 90 +- drivers/staging/iio/industrialio-ring.c | 61 +- drivers/staging/iio/light/Kconfig | 12 + drivers/staging/iio/light/Makefile | 1 + drivers/staging/iio/light/isl29018.c | 563 + drivers/staging/iio/light/light.h | 7 - drivers/staging/iio/light/tsl2563.c | 35 +- drivers/staging/iio/magnetometer/Kconfig | 10 + drivers/staging/iio/magnetometer/Makefile | 1 + drivers/staging/iio/magnetometer/ak8975.c | 558 + drivers/staging/iio/magnetometer/hmc5843.c | 61 +- drivers/staging/iio/magnetometer/magnet.h | 12 +- drivers/staging/iio/ring_generic.h | 241 +- drivers/staging/iio/ring_sw.c | 79 +- drivers/staging/iio/ring_sw.h | 12 +- drivers/staging/iio/sysfs.h | 162 +- drivers/staging/iio/trigger.h | 6 +- drivers/staging/iio/trigger/iio-trig-gpio.c | 2 +- .../staging/iio/trigger/iio-trig-periodic-rtc.c | 12 +- drivers/staging/intel_sst/Kconfig | 18 + drivers/staging/intel_sst/Makefile | 7 + drivers/staging/intel_sst/TODO | 13 + drivers/staging/intel_sst/intel_sst.c | 512 + drivers/staging/intel_sst/intel_sst.h | 131 + .../staging/intel_sst/intel_sst_app_interface.c | 1216 + drivers/staging/intel_sst/intel_sst_common.h | 618 + .../staging/intel_sst/intel_sst_drv_interface.c | 493 + drivers/staging/intel_sst/intel_sst_dsp.c | 486 + drivers/staging/intel_sst/intel_sst_fw_ipc.h | 392 + drivers/staging/intel_sst/intel_sst_ioctl.h | 435 + drivers/staging/intel_sst/intel_sst_ipc.c | 656 + drivers/staging/intel_sst/intel_sst_pvt.c | 311 + drivers/staging/intel_sst/intel_sst_stream.c | 576 + .../staging/intel_sst/intel_sst_stream_encoded.c | 1275 + drivers/staging/intel_sst/intelmid.c | 1220 + drivers/staging/intel_sst/intelmid.h | 186 + drivers/staging/intel_sst/intelmid_ctrl.c | 629 + drivers/staging/intel_sst/intelmid_msic_control.c | 410 + drivers/staging/intel_sst/intelmid_pvt.c | 174 + drivers/staging/intel_sst/intelmid_snd_control.h | 114 + drivers/staging/intel_sst/intelmid_v0_control.c | 771 + drivers/staging/intel_sst/intelmid_v1_control.c | 900 + drivers/staging/intel_sst/intelmid_v2_control.c | 1001 + drivers/staging/intel_sst/jack.h | 10 + drivers/staging/keucr/Kconfig | 13 + drivers/staging/keucr/Makefile | 16 + drivers/staging/keucr/TODO | 14 + drivers/staging/keucr/common.h | 26 + drivers/staging/keucr/init.c | 543 + drivers/staging/keucr/init.h | 2066 ++ drivers/staging/keucr/ms.c | 956 + drivers/staging/keucr/ms.h | 381 + drivers/staging/keucr/msscsi.c | 324 + drivers/staging/keucr/scsiglue.c | 448 + drivers/staging/keucr/scsiglue.h | 10 + drivers/staging/keucr/sdscsi.c | 210 + drivers/staging/keucr/smcommon.h | 33 + drivers/staging/keucr/smil.h | 290 + drivers/staging/keucr/smilecc.c | 201 + drivers/staging/keucr/smilmain.c | 1852 ++ drivers/staging/keucr/smilsub.c | 1661 ++ drivers/staging/keucr/smscsi.c | 193 + drivers/staging/keucr/transport.c | 783 + drivers/staging/keucr/transport.h | 144 + drivers/staging/keucr/usb.c | 709 + drivers/staging/keucr/usb.h | 238 + drivers/staging/line6/Kconfig | 67 +- drivers/staging/line6/Makefile | 2 +- drivers/staging/line6/audio.c | 16 +- drivers/staging/line6/audio.h | 7 +- drivers/staging/line6/capture.c | 239 +- drivers/staging/line6/capture.h | 25 +- drivers/staging/line6/config.h | 6 +- drivers/staging/line6/control.c | 38 +- drivers/staging/line6/control.h | 190 +- drivers/staging/line6/driver.c | 566 +- drivers/staging/line6/driver.h | 59 +- drivers/staging/line6/dumprequest.c | 60 +- drivers/staging/line6/dumprequest.h | 28 +- drivers/staging/line6/midi.c | 100 +- drivers/staging/line6/midi.h | 9 +- drivers/staging/line6/midibuf.c | 90 +- drivers/staging/line6/midibuf.h | 31 +- drivers/staging/line6/pcm.c | 319 +- drivers/staging/line6/pcm.h | 145 +- drivers/staging/line6/playback.c | 313 +- drivers/staging/line6/playback.h | 29 +- drivers/staging/line6/pod.c | 774 +- drivers/staging/line6/pod.h | 127 +- drivers/staging/line6/revision.h | 2 +- drivers/staging/line6/toneport.c | 279 +- drivers/staging/line6/toneport.h | 33 +- drivers/staging/line6/usbdefs.h | 44 +- drivers/staging/line6/variax.c | 365 +- drivers/staging/line6/variax.h | 84 +- drivers/staging/lirc/Kconfig | 2 +- drivers/staging/lirc/lirc_igorplugusb.c | 190 +- drivers/staging/lirc/lirc_imon.c | 16 +- drivers/staging/lirc/lirc_it87.c | 23 +- drivers/staging/lirc/lirc_ite8709.c | 6 +- drivers/staging/lirc/lirc_parallel.c | 62 +- drivers/staging/lirc/lirc_sasem.c | 15 +- drivers/staging/lirc/lirc_serial.c | 24 +- drivers/staging/lirc/lirc_sir.c | 24 +- drivers/staging/lirc/lirc_zilog.c | 13 +- drivers/staging/msm/mddihost.c | 2 +- drivers/staging/msm/mdp.c | 10 +- drivers/staging/msm/msm_fb.c | 2 +- drivers/staging/msm/staging-devices.c | 2 +- drivers/staging/octeon/Makefile | 20 +- drivers/staging/octeon/cvmx-fpa.c | 2 +- drivers/staging/octeon/cvmx-fpa.h | 2 +- drivers/staging/octeon/cvmx-helper-board.c | 19 - drivers/staging/octeon/cvmx-helper-board.h | 29 - drivers/staging/octeon/ethernet.c | 13 +- drivers/staging/olpc_dcon/Kconfig | 8 + drivers/staging/olpc_dcon/Makefile | 1 + drivers/staging/olpc_dcon/TODO | 17 + drivers/staging/olpc_dcon/olpc_dcon.c | 870 + drivers/staging/olpc_dcon/olpc_dcon.h | 75 + drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 171 + drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 219 + drivers/staging/otus/80211core/amsdu.c | 129 - drivers/staging/otus/80211core/cagg.c | 3621 --- drivers/staging/otus/80211core/cagg.h | 435 - drivers/staging/otus/80211core/ccmd.c | 1766 -- drivers/staging/otus/80211core/cfunc.c | 1226 - drivers/staging/otus/80211core/cfunc.h | 449 - drivers/staging/otus/80211core/chb.c | 200 - drivers/staging/otus/80211core/cic.c | 499 - drivers/staging/otus/80211core/cinit.c | 1912 -- drivers/staging/otus/80211core/cmm.c | 2183 -- drivers/staging/otus/80211core/cmmap.c | 2435 -- drivers/staging/otus/80211core/cmmsta.c | 5817 ---- drivers/staging/otus/80211core/coid.c | 2696 -- drivers/staging/otus/80211core/cprecomp.h | 32 - drivers/staging/otus/80211core/cpsmgr.c | 730 - drivers/staging/otus/80211core/cscanmgr.c | 533 - drivers/staging/otus/80211core/ctkip.c | 599 - drivers/staging/otus/80211core/ctxrx.c | 4115 --- drivers/staging/otus/80211core/cwep.c | 299 - drivers/staging/otus/80211core/cwm.c | 131 - drivers/staging/otus/80211core/cwm.h | 45 - drivers/staging/otus/80211core/freqctrl.c | 259 - drivers/staging/otus/80211core/ledmgr.c | 556 - drivers/staging/otus/80211core/performance.c | 431 - drivers/staging/otus/80211core/performance.h | 97 - drivers/staging/otus/80211core/pub_usb.h | 102 - drivers/staging/otus/80211core/pub_zfi.h | 820 - drivers/staging/otus/80211core/pub_zfw.h | 93 - drivers/staging/otus/80211core/queue.c | 304 - drivers/staging/otus/80211core/queue.h | 37 - drivers/staging/otus/80211core/ratectrl.c | 875 - drivers/staging/otus/80211core/ratectrl.h | 37 - drivers/staging/otus/80211core/struct.h | 1315 - drivers/staging/otus/80211core/wlan.h | 595 - drivers/staging/otus/Kconfig | 34 - drivers/staging/otus/Makefile | 67 - drivers/staging/otus/TODO | 8 - drivers/staging/otus/apdbg.c | 379 - drivers/staging/otus/athr_common.h | 141 - drivers/staging/otus/hal/hpDKfwu.c | 832 - drivers/staging/otus/hal/hpani.c | 721 - drivers/staging/otus/hal/hpani.h | 419 - drivers/staging/otus/hal/hpfw2.c | 1018 - drivers/staging/otus/hal/hpfwbu.c | 5269 ---- drivers/staging/otus/hal/hpfwspiu.c | 655 - drivers/staging/otus/hal/hpfwu.c | 1017 - drivers/staging/otus/hal/hpfwu.c.drv_ba_resend | 742 - drivers/staging/otus/hal/hpfwu_2k.c | 1016 - drivers/staging/otus/hal/hpfwu_BA.c | 874 - drivers/staging/otus/hal/hpfwu_FB50_mdk.c | 721 - drivers/staging/otus/hal/hpfwu_OTUS_RC.c | 715 - drivers/staging/otus/hal/hpfwu_txstream.c | 1017 - drivers/staging/otus/hal/hpfwuinit.c | 240 - drivers/staging/otus/hal/hpmain.c | 4672 ---- drivers/staging/otus/hal/hpreg.c | 2270 -- drivers/staging/otus/hal/hpreg.h | 524 - drivers/staging/otus/hal/hprw.c | 1568 -- drivers/staging/otus/hal/hpusb.c | 1589 -- drivers/staging/otus/hal/hpusb.h | 437 - drivers/staging/otus/hal/otus.ini | 414 - drivers/staging/otus/ioctl.c | 2756 -- drivers/staging/otus/oal_dt.h | 60 - drivers/staging/otus/oal_marc.h | 143 - drivers/staging/otus/usbdrv.c | 1143 - drivers/staging/otus/usbdrv.h | 245 - drivers/staging/otus/wrap_buf.c | 111 - drivers/staging/otus/wrap_dbg.c | 95 - drivers/staging/otus/wrap_ev.c | 292 - drivers/staging/otus/wrap_mem.c | 105 - drivers/staging/otus/wrap_mis.c | 103 - drivers/staging/otus/wrap_pkt.c | 147 - drivers/staging/otus/wrap_sec.c | 125 - drivers/staging/otus/wrap_usb.c | 187 - drivers/staging/otus/wwrap.c | 1048 - drivers/staging/otus/zdcompat.h | 45 - drivers/staging/otus/zdusb.c | 226 - drivers/staging/otus/zdusb.h | 47 - drivers/staging/phison/phison.c | 2 +- drivers/staging/pohmelfs/config.c | 34 +- drivers/staging/quatech_usb2/quatech_usb2.c | 2 +- drivers/staging/quickstart/quickstart.c | 7 +- drivers/staging/rt2860/Makefile | 10 +- drivers/staging/rt2860/ap.h | 20 +- drivers/staging/rt2860/common/ba_action.c | 5 +- drivers/staging/rt2860/common/cmm_mac_usb.c | 5 +- drivers/staging/rt2860/common/cmm_wpa.c | 4 +- drivers/staging/rt2860/common/mlme.c | 7 +- drivers/staging/rt2860/common/rtmp_init.c | 20 +- drivers/staging/rt2860/eeprom.h | 4 +- drivers/staging/rt2860/iface/rtmp_pci.h | 42 +- drivers/staging/rt2860/iface/rtmp_usb.h | 110 +- drivers/staging/rt2860/oid.h | 2 +- drivers/staging/rt2860/rt_linux.c | 7 +- drivers/staging/rt2860/rt_linux.h | 3 - drivers/staging/rt2860/rtmp.h | 26 +- drivers/staging/rt2860/sta/assoc.c | 7 +- drivers/staging/rt2860/sta/connect.c | 24 +- drivers/staging/rt2860/sta/rtmp_data.c | 5 +- drivers/staging/rt2860/sta/sync.c | 12 +- drivers/staging/rt2860/sta_ioctl.c | 11 +- drivers/staging/rt2870/Makefile | 10 +- drivers/staging/rt2870/common/rtusb_io.c | 11 +- drivers/staging/rtl8187se/Makefile | 16 +- drivers/staging/rtl8187se/ieee80211/ieee80211.h | 1 - .../rtl8187se/ieee80211/ieee80211_softmac.c | 4 +- drivers/staging/rtl8187se/r8180_core.c | 10 +- drivers/staging/rtl8187se/r8180_dm.h | 12 +- drivers/staging/rtl8187se/r8180_hw.h | 432 +- drivers/staging/rtl8187se/r8180_rtl8225.h | 20 +- drivers/staging/rtl8187se/r8180_wx.c | 722 +- drivers/staging/rtl8187se/r8185b_init.c | 1508 +- drivers/staging/rtl8192e/Makefile | 14 +- drivers/staging/rtl8192e/dot11d.h | 8 +- drivers/staging/rtl8192e/ieee80211.h | 213 +- .../staging/rtl8192e/ieee80211/ieee80211_module.c | 71 +- drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 2 +- .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 18 +- drivers/staging/rtl8192e/r8180_93cx6.c | 13 +- drivers/staging/rtl8192e/r8190_rtl8256.c | 2 - drivers/staging/rtl8192e/r8190_rtl8256.h | 12 +- drivers/staging/rtl8192e/r8192E.h | 8 +- drivers/staging/rtl8192e/r8192E_core.c | 1423 +- drivers/staging/rtl8192e/r8192E_dm.c | 480 +- drivers/staging/rtl8192e/r8192E_dm.h | 2 - drivers/staging/rtl8192e/r8192E_wx.c | 38 +- drivers/staging/rtl8192e/r8192E_wx.h | 2 +- drivers/staging/rtl8192e/r8192_pm.c | 6 +- drivers/staging/rtl8192e/r819xE_cmdpkt.c | 310 +- drivers/staging/rtl8192e/r819xE_cmdpkt.h | 2 +- drivers/staging/rtl8192e/r819xE_firmware.c | 40 +- drivers/staging/rtl8192e/r819xE_phy.c | 39 +- drivers/staging/rtl8192e/r819xE_phy.h | 50 +- drivers/staging/rtl8192su/Kconfig | 9 - drivers/staging/rtl8192su/Makefile | 39 - drivers/staging/rtl8192su/TODO | 21 - drivers/staging/rtl8192su/authors | 1 - drivers/staging/rtl8192su/ieee80211/Makefile | 30 - drivers/staging/rtl8192su/ieee80211/dot11d.c | 224 - drivers/staging/rtl8192su/ieee80211/dot11d.h | 111 - drivers/staging/rtl8192su/ieee80211/ieee80211.h | 1934 -- .../staging/rtl8192su/ieee80211/ieee80211_crypt.c | 242 - .../staging/rtl8192su/ieee80211/ieee80211_crypt.h | 86 - .../rtl8192su/ieee80211/ieee80211_crypt_ccmp.c | 471 - .../rtl8192su/ieee80211/ieee80211_crypt_tkip.c | 776 - .../rtl8192su/ieee80211/ieee80211_crypt_wep.c | 294 - .../staging/rtl8192su/ieee80211/ieee80211_module.c | 301 - .../staging/rtl8192su/ieee80211/ieee80211_r8192s.h | 449 - drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 2580 -- .../rtl8192su/ieee80211/ieee80211_softmac.c | 3291 --- .../rtl8192su/ieee80211/ieee80211_softmac_wx.c | 625 - drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 916 - drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 772 - drivers/staging/rtl8192su/ieee80211/readme | 162 - drivers/staging/rtl8192su/ieee80211/rtl819x_BA.h | 79 - .../staging/rtl8192su/ieee80211/rtl819x_BAProc.c | 745 - drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h | 530 - .../staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 1725 -- drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h | 540 - drivers/staging/rtl8192su/ieee80211/rtl819x_TS.h | 71 - .../staging/rtl8192su/ieee80211/rtl819x_TSProc.c | 631 - drivers/staging/rtl8192su/r8192SU_HWImg.c | 647 - drivers/staging/rtl8192su/r8192SU_HWImg.h | 60 - drivers/staging/rtl8192su/r8192SU_led.c | 2338 -- drivers/staging/rtl8192su/r8192SU_led.h | 93 - drivers/staging/rtl8192su/r8192S_Efuse.c | 2199 -- drivers/staging/rtl8192su/r8192S_Efuse.h | 79 - drivers/staging/rtl8192su/r8192S_firmware.c | 481 - drivers/staging/rtl8192su/r8192S_firmware.h | 210 - drivers/staging/rtl8192su/r8192S_hw.h | 1445 - drivers/staging/rtl8192su/r8192S_phy.c | 3634 --- drivers/staging/rtl8192su/r8192S_phy.h | 135 - drivers/staging/rtl8192su/r8192S_phyreg.h | 1033 - drivers/staging/rtl8192su/r8192S_rtl6052.c | 842 - drivers/staging/rtl8192su/r8192S_rtl6052.h | 87 - drivers/staging/rtl8192su/r8192S_rtl8225.c | 292 - drivers/staging/rtl8192su/r8192S_rtl8225.h | 30 - drivers/staging/rtl8192su/r8192U.h | 1519 - drivers/staging/rtl8192su/r8192U_core.c | 7712 ------ drivers/staging/rtl8192su/r8192U_dm.c | 3982 --- drivers/staging/rtl8192su/r8192U_dm.h | 254 - drivers/staging/rtl8192su/r8192U_pm.c | 72 - drivers/staging/rtl8192su/r8192U_pm.h | 25 - drivers/staging/rtl8192su/r8192U_wx.c | 1296 - drivers/staging/rtl8192su/r8192U_wx.h | 22 - drivers/staging/rtl8192su/r819xU_HTGen.h | 22 - drivers/staging/rtl8192su/r819xU_HTType.h | 383 - drivers/staging/rtl8192su/r819xU_cmdpkt.c | 512 - drivers/staging/rtl8192su/r819xU_cmdpkt.h | 192 - drivers/staging/rtl8192u/Makefile | 22 +- drivers/staging/rtl8192u/ieee80211/Makefile | 16 +- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 +- .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 2 +- drivers/staging/rtl8192u/r8192U_core.c | 25 +- drivers/staging/rtl8192u/r819xU_firmware.c | 2 +- drivers/staging/rtl8712/Kconfig | 18 + drivers/staging/rtl8712/Makefile | 34 + drivers/staging/rtl8712/TODO | 16 + drivers/staging/rtl8712/basic_types.h | 23 + drivers/staging/rtl8712/big_endian.h | 69 + drivers/staging/rtl8712/drv_types.h | 165 + drivers/staging/rtl8712/ethernet.h | 23 + drivers/staging/rtl8712/farray.h |10197 +++++++ drivers/staging/rtl8712/generic.h | 153 + drivers/staging/rtl8712/hal_init.c | 358 + drivers/staging/rtl8712/ieee80211.c | 454 + drivers/staging/rtl8712/ieee80211.h | 770 + drivers/staging/rtl8712/if_ether.h | 116 + drivers/staging/rtl8712/ip.h | 137 + drivers/staging/rtl8712/little_endian.h | 69 + drivers/staging/rtl8712/mlme_linux.c | 170 + drivers/staging/rtl8712/mlme_osdep.h | 18 + drivers/staging/rtl8712/mp_custom_oid.h | 274 + drivers/staging/rtl8712/os_intfs.c | 464 + drivers/staging/rtl8712/osdep_intf.h | 19 + drivers/staging/rtl8712/osdep_service.h | 257 + drivers/staging/rtl8712/recv_linux.c | 169 + drivers/staging/rtl8712/recv_osdep.h | 27 + drivers/staging/rtl8712/rtl8712_bitdef.h | 19 + drivers/staging/rtl8712/rtl8712_cmd.c | 465 + drivers/staging/rtl8712/rtl8712_cmd.h | 157 + drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h | 89 + drivers/staging/rtl8712/rtl8712_cmdctrl_regdef.h | 15 + drivers/staging/rtl8712/rtl8712_debugctrl_bitdef.h | 36 + drivers/staging/rtl8712/rtl8712_debugctrl_regdef.h | 28 + .../staging/rtl8712/rtl8712_edcasetting_bitdef.h | 52 + .../staging/rtl8712/rtl8712_edcasetting_regdef.h | 18 + drivers/staging/rtl8712/rtl8712_efuse.c | 568 + drivers/staging/rtl8712/rtl8712_efuse.h | 43 + drivers/staging/rtl8712/rtl8712_event.h | 73 + drivers/staging/rtl8712/rtl8712_fifoctrl_bitdef.h | 126 + drivers/staging/rtl8712/rtl8712_fifoctrl_regdef.h | 57 + drivers/staging/rtl8712/rtl8712_gp_bitdef.h | 54 + drivers/staging/rtl8712/rtl8712_gp_regdef.h | 17 + drivers/staging/rtl8712/rtl8712_hal.h | 124 + drivers/staging/rtl8712/rtl8712_interrupt_bitdef.h | 39 + drivers/staging/rtl8712/rtl8712_io.c | 151 + drivers/staging/rtl8712/rtl8712_led.c | 1815 ++ .../staging/rtl8712/rtl8712_macsetting_bitdef.h | 28 + .../staging/rtl8712/rtl8712_macsetting_regdef.h | 16 + drivers/staging/rtl8712/rtl8712_powersave_bitdef.h | 33 + drivers/staging/rtl8712/rtl8712_powersave_regdef.h | 20 + drivers/staging/rtl8712/rtl8712_ratectrl_bitdef.h | 30 + drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h | 31 + drivers/staging/rtl8712/rtl8712_recv.c | 1131 + drivers/staging/rtl8712/rtl8712_recv.h | 128 + drivers/staging/rtl8712/rtl8712_regdef.h | 19 + drivers/staging/rtl8712/rtl8712_security_bitdef.h | 29 + drivers/staging/rtl8712/rtl8712_spec.h | 110 + drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h | 145 + drivers/staging/rtl8712/rtl8712_syscfg_regdef.h | 31 + drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h | 44 + drivers/staging/rtl8712/rtl8712_timectrl_regdef.h | 20 + drivers/staging/rtl8712/rtl8712_wmac_bitdef.h | 37 + drivers/staging/rtl8712/rtl8712_wmac_regdef.h | 24 + drivers/staging/rtl8712/rtl8712_xmit.c | 509 + drivers/staging/rtl8712/rtl8712_xmit.h | 95 + drivers/staging/rtl8712/rtl871x_byteorder.h | 13 + drivers/staging/rtl8712/rtl871x_cmd.c | 926 + drivers/staging/rtl8712/rtl871x_cmd.h | 719 + drivers/staging/rtl8712/rtl871x_debug.h | 142 + drivers/staging/rtl8712/rtl871x_eeprom.c | 233 + drivers/staging/rtl8712/rtl871x_eeprom.h | 82 + drivers/staging/rtl8712/rtl871x_event.h | 95 + drivers/staging/rtl8712/rtl871x_ht.h | 19 + drivers/staging/rtl8712/rtl871x_io.c | 163 + drivers/staging/rtl8712/rtl871x_io.h | 233 + drivers/staging/rtl8712/rtl871x_ioctl.h | 97 + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 2246 ++ drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 535 + drivers/staging/rtl8712/rtl871x_ioctl_rtl.h | 96 + drivers/staging/rtl8712/rtl871x_ioctl_set.c | 379 + drivers/staging/rtl8712/rtl871x_ioctl_set.h | 24 + drivers/staging/rtl8712/rtl871x_led.h | 99 + drivers/staging/rtl8712/rtl871x_mlme.c | 1840 ++ drivers/staging/rtl8712/rtl871x_mlme.h | 208 + drivers/staging/rtl8712/rtl871x_mp.c | 736 + drivers/staging/rtl8712/rtl871x_mp.h | 318 + drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 1475 + drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 457 + drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h | 1025 + drivers/staging/rtl8712/rtl871x_pwrctrl.c | 250 + drivers/staging/rtl8712/rtl871x_pwrctrl.h | 127 + drivers/staging/rtl8712/rtl871x_recv.c | 693 + drivers/staging/rtl8712/rtl871x_recv.h | 330 + drivers/staging/rtl8712/rtl871x_rf.h | 43 + drivers/staging/rtl8712/rtl871x_security.c | 1389 + drivers/staging/rtl8712/rtl871x_security.h | 196 + drivers/staging/rtl8712/rtl871x_sta_mgt.c | 299 + drivers/staging/rtl8712/rtl871x_wlan_sme.h | 22 + drivers/staging/rtl8712/rtl871x_xmit.c | 1052 + drivers/staging/rtl8712/rtl871x_xmit.h | 260 + drivers/staging/rtl8712/sta_info.h | 125 + drivers/staging/rtl8712/swab.h | 106 + drivers/staging/rtl8712/usb_halinit.c | 317 + drivers/staging/rtl8712/usb_intf.c | 571 + drivers/staging/rtl8712/usb_ops.c | 201 + drivers/staging/rtl8712/usb_ops.h | 25 + drivers/staging/rtl8712/usb_ops_linux.c | 529 + drivers/staging/rtl8712/usb_osintf.h | 24 + drivers/staging/rtl8712/usb_vendor_req.h | 33 + drivers/staging/rtl8712/wifi.h | 622 + drivers/staging/rtl8712/wlan_bssdef.h | 242 + drivers/staging/rtl8712/xmit_linux.c | 182 + drivers/staging/rtl8712/xmit_osdep.h | 38 + drivers/staging/sbe-2t3e3/2t3e3.h | 894 + drivers/staging/sbe-2t3e3/Kconfig | 13 + drivers/staging/sbe-2t3e3/Makefile | 4 + drivers/staging/sbe-2t3e3/TODO | 6 + drivers/staging/sbe-2t3e3/cpld.c | 366 + drivers/staging/sbe-2t3e3/ctrl.c | 362 + drivers/staging/sbe-2t3e3/ctrl.h | 131 + drivers/staging/sbe-2t3e3/dc.c | 502 + drivers/staging/sbe-2t3e3/exar7250.c | 217 + drivers/staging/sbe-2t3e3/exar7300.c | 182 + drivers/staging/sbe-2t3e3/intr.c | 635 + drivers/staging/sbe-2t3e3/io.c | 352 + drivers/staging/sbe-2t3e3/main.c | 171 + drivers/staging/sbe-2t3e3/maps.c | 104 + drivers/staging/sbe-2t3e3/module.c | 210 + drivers/staging/sbe-2t3e3/netdev.c | 142 + drivers/staging/slicoss/slic.h | 8 +- drivers/staging/slicoss/slicoss.c | 44 +- drivers/staging/sm7xx/smtcfb.c | 13 +- {fs => drivers/staging}/smbfs/Kconfig | 0 {fs => drivers/staging}/smbfs/Makefile | 12 +- drivers/staging/smbfs/TODO | 8 + {fs => drivers/staging}/smbfs/cache.c | 2 +- {fs => drivers/staging}/smbfs/dir.c | 6 +- {fs => drivers/staging}/smbfs/file.c | 5 +- {fs => drivers/staging}/smbfs/getopt.c | 0 {fs => drivers/staging}/smbfs/getopt.h | 0 {fs => drivers/staging}/smbfs/inode.c | 8 +- {fs => drivers/staging}/smbfs/ioctl.c | 5 +- {fs => drivers/staging}/smbfs/proc.c | 7 +- {fs => drivers/staging}/smbfs/proto.h | 0 {fs => drivers/staging}/smbfs/request.c | 7 +- {fs => drivers/staging}/smbfs/request.h | 0 {include/linux => drivers/staging/smbfs}/smb.h | 0 {fs => drivers/staging}/smbfs/smb_debug.h | 0 {include/linux => drivers/staging/smbfs}/smb_fs.h | 8 +- .../linux => drivers/staging/smbfs}/smb_fs_i.h | 0 .../linux => drivers/staging/smbfs}/smb_fs_sb.h | 2 +- .../linux => drivers/staging/smbfs}/smb_mount.h | 0 .../staging/smbfs}/smbfs.txt | 0 {fs => drivers/staging}/smbfs/smbiod.c | 7 +- {include/linux => drivers/staging/smbfs}/smbno.h | 0 {fs => drivers/staging}/smbfs/sock.c | 7 +- {fs => drivers/staging}/smbfs/symlink.c | 5 +- drivers/staging/solo6x10/Makefile | 2 +- drivers/staging/solo6x10/solo6010-core.c | 40 +- drivers/staging/solo6x10/solo6010-g723.c | 2 +- drivers/staging/solo6x10/solo6010-i2c.c | 2 +- drivers/staging/solo6x10/solo6010-p2m.c | 2 +- drivers/staging/solo6x10/solo6010-v4l2-enc.c | 2 +- drivers/staging/solo6x10/solo6010-v4l2.c | 2 +- drivers/staging/speakup/DefaultKeyAssignments | 46 + drivers/staging/speakup/Kconfig | 195 + drivers/staging/speakup/Makefile | 30 + drivers/staging/speakup/TODO | 47 + drivers/staging/speakup/buffers.c | 107 + drivers/staging/speakup/devsynth.c | 94 + drivers/staging/speakup/fakekey.c | 105 + drivers/staging/speakup/i18n.c | 628 + drivers/staging/speakup/i18n.h | 228 + drivers/staging/speakup/keyhelp.c | 214 + drivers/staging/speakup/kobjects.c | 1022 + drivers/staging/speakup/main.c | 2310 ++ drivers/staging/speakup/selection.c | 151 + drivers/staging/speakup/serialio.c | 215 + drivers/staging/speakup/serialio.h | 55 + drivers/staging/speakup/speakup.h | 130 + drivers/staging/speakup/speakup_acnt.h | 16 + drivers/staging/speakup/speakup_acntpc.c | 335 + drivers/staging/speakup/speakup_acntsa.c | 163 + drivers/staging/speakup/speakup_apollo.c | 227 + drivers/staging/speakup/speakup_audptr.c | 195 + drivers/staging/speakup/speakup_bns.c | 147 + drivers/staging/speakup/speakup_decext.c | 253 + drivers/staging/speakup/speakup_decpc.c | 504 + drivers/staging/speakup/speakup_dectlk.c | 322 + drivers/staging/speakup/speakup_dtlk.c | 402 + drivers/staging/speakup/speakup_dtlk.h | 54 + drivers/staging/speakup/speakup_dummy.c | 148 + drivers/staging/speakup/speakup_keypc.c | 335 + drivers/staging/speakup/speakup_ltlk.c | 194 + drivers/staging/speakup/speakup_soft.c | 379 + drivers/staging/speakup/speakup_spkout.c | 165 + drivers/staging/speakup/speakup_txprt.c | 147 + drivers/staging/speakup/speakupmap.h | 65 + drivers/staging/speakup/speakupmap.map | 93 + drivers/staging/speakup/spk_priv.h | 93 + drivers/staging/speakup/spk_priv_keyinfo.h | 110 + drivers/staging/speakup/spk_types.h | 193 + drivers/staging/speakup/spkguide.txt | 1575 ++ drivers/staging/speakup/synth.c | 463 + drivers/staging/speakup/thread.c | 58 + drivers/staging/speakup/varhandlers.c | 404 + drivers/staging/spectra/Kconfig | 2 +- drivers/staging/spectra/flash.c | 2 +- drivers/staging/spectra/flash.h | 2 +- drivers/staging/spectra/lld_emu.c | 10 +- drivers/staging/spectra/lld_mtd.c | 8 +- drivers/staging/spectra/lld_nand.c | 7 +- drivers/staging/stradis/Kconfig | 7 + drivers/staging/stradis/Makefile | 3 + drivers/staging/stradis/TODO | 6 + drivers/{media/video => staging/stradis}/stradis.c | 0 drivers/staging/ti-st/Kconfig | 13 +- drivers/staging/ti-st/Makefile | 2 - drivers/staging/ti-st/bt_drv.c | 2 +- drivers/staging/ti-st/fm.h | 13 - drivers/staging/ti-st/st.h | 83 - drivers/staging/ti-st/st_core.h | 128 - drivers/staging/ti-st/st_kim.h | 180 - drivers/staging/ti-st/st_ll.h | 69 - drivers/staging/tidspbridge/Kconfig | 1 + drivers/staging/tidspbridge/Makefile | 13 +- drivers/staging/tidspbridge/TODO | 1 + drivers/staging/tidspbridge/core/_deh.h | 5 +- drivers/staging/tidspbridge/core/_tiomap.h | 19 +- drivers/staging/tidspbridge/core/chnl_sm.c | 1 - drivers/staging/tidspbridge/core/dsp-clock.c | 1 - drivers/staging/tidspbridge/core/dsp-mmu.c | 317 + drivers/staging/tidspbridge/core/io_sm.c | 181 +- .../staging/tidspbridge/{services => core}/sync.c | 17 + drivers/staging/tidspbridge/core/tiomap3430.c | 1088 +- drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 22 +- drivers/staging/tidspbridge/core/tiomap_io.c | 22 +- drivers/staging/tidspbridge/core/ue_deh.c | 115 +- drivers/staging/tidspbridge/gen/gb.c | 1 - drivers/staging/tidspbridge/gen/gs.c | 1 - drivers/staging/tidspbridge/hw/EasiGlobal.h | 41 - drivers/staging/tidspbridge/hw/MMUAccInt.h | 76 - drivers/staging/tidspbridge/hw/MMURegAcM.h | 225 - drivers/staging/tidspbridge/hw/hw_defs.h | 58 - drivers/staging/tidspbridge/hw/hw_mmu.c | 562 - drivers/staging/tidspbridge/hw/hw_mmu.h | 163 - .../staging/tidspbridge/include/dspbridge/cfg.h | 222 - .../tidspbridge/include/dspbridge/cfgdefs.h | 1 - .../staging/tidspbridge/include/dspbridge/cmm.h | 19 - .../staging/tidspbridge/include/dspbridge/dev.h | 24 - .../staging/tidspbridge/include/dspbridge/dmm.h | 75 - .../staging/tidspbridge/include/dspbridge/drv.h | 12 +- .../tidspbridge/include/dspbridge/dsp-mmu.h | 67 + .../tidspbridge/include/dspbridge/dspdefs.h | 44 - .../tidspbridge/include/dspbridge/dspioctl.h | 7 - .../tidspbridge/include/dspbridge/host_os.h | 19 - .../staging/tidspbridge/include/dspbridge/mgr.h | 2 +- .../staging/tidspbridge/include/dspbridge/proc.h | 46 - .../tidspbridge/include/dspbridge/services.h | 50 - .../staging/tidspbridge/include/dspbridge/wdt.h | 2 +- drivers/staging/tidspbridge/pmgr/chnl.c | 1 - drivers/staging/tidspbridge/pmgr/cmm.c | 18 - drivers/staging/tidspbridge/pmgr/dbll.c | 2 +- drivers/staging/tidspbridge/pmgr/dev.c | 132 +- drivers/staging/tidspbridge/pmgr/dmm.c | 533 - drivers/staging/tidspbridge/pmgr/dspapi.c | 62 +- drivers/staging/tidspbridge/pmgr/io.c | 3 - drivers/staging/tidspbridge/rmgr/dbdcd.c | 8 + drivers/staging/tidspbridge/rmgr/drv.c | 74 +- drivers/staging/tidspbridge/rmgr/drv_interface.c | 29 +- drivers/staging/tidspbridge/rmgr/dspdrv.c | 12 +- drivers/staging/tidspbridge/rmgr/mgr.c | 52 +- drivers/staging/tidspbridge/rmgr/nldr.c | 17 +- drivers/staging/tidspbridge/rmgr/node.c | 58 +- drivers/staging/tidspbridge/rmgr/proc.c | 245 +- drivers/staging/tidspbridge/rmgr/strm.c | 12 +- drivers/staging/tidspbridge/services/cfg.c | 253 - drivers/staging/tidspbridge/services/ntfy.c | 31 - drivers/staging/tidspbridge/services/services.c | 70 - drivers/staging/tm6000/Makefile | 10 +- drivers/staging/tm6000/TODO | 6 + drivers/staging/tm6000/tm6000-alsa.c | 109 +- drivers/staging/tm6000/tm6000-cards.c | 41 +- drivers/staging/tm6000/tm6000-core.c | 163 +- drivers/staging/tm6000/tm6000-dvb.c | 32 +- drivers/staging/tm6000/tm6000-i2c.c | 43 +- drivers/staging/tm6000/tm6000-input.c | 34 +- drivers/staging/tm6000/tm6000-regs.h | 32 +- drivers/staging/tm6000/tm6000-stds.c | 350 +- drivers/staging/tm6000/tm6000-usb-isoc.h | 32 +- drivers/staging/tm6000/tm6000-video.c | 442 +- drivers/staging/tm6000/tm6000.h | 54 +- drivers/staging/udlfb/udlfb.c | 987 +- drivers/staging/udlfb/udlfb.h | 39 +- drivers/staging/udlfb/udlfb.txt | 144 + drivers/staging/usbip/Makefile | 11 +- drivers/staging/usbip/stub_dev.c | 2 +- drivers/staging/usbip/usbip_common.c | 2 +- drivers/staging/usbip/usbip_event.c | 16 +- drivers/staging/usbip/vhci_hcd.c | 2 + drivers/staging/vme/bridges/vme_ca91cx42.c | 94 +- drivers/staging/vme/devices/vme_user.c | 2 +- drivers/staging/vt6655/Makefile | 4 +- drivers/staging/vt6655/device_main.c | 3 +- drivers/staging/vt6655/iocmd.h | 4 - drivers/staging/vt6655/iwctl.c | 6 +- drivers/staging/vt6655/ttype.h | 7 - drivers/staging/vt6655/vntwifi.c | 6 +- drivers/staging/vt6656/80211mgr.h | 10 +- drivers/staging/vt6656/Makefile | 4 +- drivers/staging/vt6656/baseband.c | 2 - drivers/staging/vt6656/bssdb.c | 14 +- drivers/staging/vt6656/card.c | 2 +- drivers/staging/vt6656/channel.c | 12 +- drivers/staging/vt6656/device.h | 19 +- drivers/staging/vt6656/dpc.c | 17 +- drivers/staging/vt6656/firmware.c | 6 +- drivers/staging/vt6656/iocmd.h | 4 - drivers/staging/vt6656/ioctl.c | 2 +- drivers/staging/vt6656/iwctl.c | 20 +- drivers/staging/vt6656/iwctl.h | 3 - drivers/staging/vt6656/key.c | 2 +- drivers/staging/vt6656/mac.c | 12 +- drivers/staging/vt6656/main_usb.c | 29 +- drivers/staging/vt6656/power.c | 6 +- drivers/staging/vt6656/rxtx.c | 26 +- drivers/staging/vt6656/tether.h | 32 +- drivers/staging/vt6656/usbpipe.c | 52 +- drivers/staging/vt6656/wcmd.c | 4 +- drivers/staging/vt6656/wmgr.c | 19 +- drivers/staging/vt6656/wmgr.h | 2 +- drivers/staging/vt6656/wpa.c | 8 +- drivers/staging/vt6656/wpactl.c | 6 +- drivers/staging/westbridge/Kconfig | 53 + drivers/staging/westbridge/TODO | 7 + drivers/staging/westbridge/astoria/Kconfig | 9 + drivers/staging/westbridge/astoria/Makefile | 11 + drivers/staging/westbridge/astoria/api/Makefile | 14 + .../staging/westbridge/astoria/api/src/cyasdma.c | 1107 + .../staging/westbridge/astoria/api/src/cyasintr.c | 143 + .../westbridge/astoria/api/src/cyaslep2pep.c | 358 + .../westbridge/astoria/api/src/cyaslowlevel.c | 1264 + .../staging/westbridge/astoria/api/src/cyasmisc.c | 3474 +++ .../staging/westbridge/astoria/api/src/cyasmtp.c | 1128 + .../westbridge/astoria/api/src/cyasstorage.c | 4104 +++ .../staging/westbridge/astoria/api/src/cyasusb.c | 3718 +++ .../arch/arm/mach-omap2/cyashalomap_kernel.c | 2450 ++ .../plat-omap/include/mach/westbridge/cyashaldef.h | 55 + .../cyashalomap_kernel.h | 319 + .../westbridge-omap3-pnand-hal/cyasmemmap.h | 558 + .../cyasomapdev_kernel.h | 72 + drivers/staging/westbridge/astoria/block/Kconfig | 9 + drivers/staging/westbridge/astoria/block/Makefile | 11 + .../westbridge/astoria/block/cyasblkdev_block.c | 1628 ++ .../westbridge/astoria/block/cyasblkdev_queue.c | 417 + .../westbridge/astoria/block/cyasblkdev_queue.h | 64 + drivers/staging/westbridge/astoria/device/Kconfig | 9 + drivers/staging/westbridge/astoria/device/Makefile | 23 + .../westbridge/astoria/device/cyandevice_export.h | 132 + .../staging/westbridge/astoria/device/cyasdevice.c | 412 + drivers/staging/westbridge/astoria/gadget/Kconfig | 9 + drivers/staging/westbridge/astoria/gadget/Makefile | 11 + .../staging/westbridge/astoria/gadget/cyasgadget.c | 2176 ++ .../staging/westbridge/astoria/gadget/cyasgadget.h | 193 + .../westbridge/astoria/gadget/cyasgadget_ioctl.h | 99 + .../astoria/include/linux/westbridge/cyanerr.h | 418 + .../astoria/include/linux/westbridge/cyanmedia.h | 59 + .../astoria/include/linux/westbridge/cyanmisc.h | 614 + .../astoria/include/linux/westbridge/cyanregs.h | 180 + .../include/linux/westbridge/cyansdkversion.h | 30 + .../astoria/include/linux/westbridge/cyanstorage.h | 419 + .../astoria/include/linux/westbridge/cyantioch.h | 35 + .../astoria/include/linux/westbridge/cyantypes.h | 31 + .../astoria/include/linux/westbridge/cyanusb.h | 619 + .../include/linux/westbridge/cyas_cplus_end.h | 11 + .../include/linux/westbridge/cyas_cplus_start.h | 11 + .../astoria/include/linux/westbridge/cyascast.h | 35 + .../astoria/include/linux/westbridge/cyasdevice.h | 1057 + .../astoria/include/linux/westbridge/cyasdma.h | 375 + .../astoria/include/linux/westbridge/cyaserr.h | 1094 + .../astoria/include/linux/westbridge/cyashal.h | 108 + .../astoria/include/linux/westbridge/cyashalcb.h | 44 + .../astoria/include/linux/westbridge/cyashaldoc.h | 800 + .../astoria/include/linux/westbridge/cyasintr.h | 104 + .../astoria/include/linux/westbridge/cyaslep2pep.h | 36 + .../include/linux/westbridge/cyaslowlevel.h | 366 + .../astoria/include/linux/westbridge/cyasmedia.h | 54 + .../astoria/include/linux/westbridge/cyasmisc.h | 1549 ++ .../include/linux/westbridge/cyasmisc_dep.h | 53 + .../astoria/include/linux/westbridge/cyasmtp.h | 646 + .../include/linux/westbridge/cyasprotocol.h | 3838 +++ .../astoria/include/linux/westbridge/cyasregs.h | 201 + .../astoria/include/linux/westbridge/cyasstorage.h | 2759 ++ .../include/linux/westbridge/cyasstorage_dep.h | 309 + .../astoria/include/linux/westbridge/cyastoria.h | 36 + .../include/linux/westbridge/cyastsdkversion.h | 30 + .../astoria/include/linux/westbridge/cyastypes.h | 71 + .../astoria/include/linux/westbridge/cyasusb.h | 1862 ++ .../astoria/include/linux/westbridge/cyasusb_dep.h | 224 + drivers/staging/winbond/Makefile | 2 +- drivers/staging/winbond/TODO | 2 +- drivers/staging/winbond/core.h | 43 +- drivers/staging/winbond/mac_structures.h | 17 - drivers/staging/winbond/mds.c | 207 +- drivers/staging/winbond/mds_f.h | 2 +- drivers/staging/winbond/mds_s.h | 1 - drivers/staging/winbond/mlme_s.h | 188 - drivers/staging/winbond/mlmetxrx.c | 31 - drivers/staging/winbond/mlmetxrx_f.h | 2 - drivers/staging/winbond/phy_calibration.c | 20 - drivers/staging/winbond/scan_s.h | 110 - drivers/staging/winbond/wb35rx.c | 2 +- drivers/staging/winbond/wb35tx.c | 2 +- drivers/staging/winbond/wbhal_f.h | 10 - drivers/staging/winbond/wbhal_s.h | 37 +- drivers/staging/winbond/wbusb.c | 21 +- drivers/staging/wlags49_h2/Makefile | 10 +- drivers/staging/wlags49_h2/hcf.c | 1 + drivers/staging/wlags49_h2/hcfdef.h | 8 - drivers/staging/wlags49_h2/mdd.h | 2 +- drivers/staging/wlags49_h2/wl_main.c | 88 +- drivers/staging/wlags49_h2/wl_netdev.c | 5 +- drivers/staging/wlags49_h2/wl_util.c | 72 +- drivers/staging/wlags49_h2/wl_util.h | 5 - drivers/staging/wlags49_h2/wl_wext.c | 9 +- drivers/staging/wlags49_h25/Makefile | 10 +- drivers/staging/wlan-ng/Makefile | 2 +- drivers/staging/wlan-ng/hfa384x_usb.c | 2 +- drivers/staging/xgifb/Makefile | 2 +- drivers/staging/xgifb/XGI_accel.h | 3 +- drivers/staging/xgifb/XGI_main.h | 30 +- drivers/staging/xgifb/XGI_main_26.c | 3876 ++-- drivers/staging/xgifb/vb_ext.c | 1737 +- drivers/staging/xgifb/vb_init.c | 5022 ++-- drivers/staging/xgifb/vb_setmode.c |17105 ++++++------- drivers/staging/xgifb/vb_table.h | 620 +- drivers/staging/xgifb/vb_util.c | 192 +- drivers/staging/zram/Kconfig | 12 - drivers/staging/zram/Makefile | 2 +- drivers/staging/zram/zram.txt | 58 +- drivers/staging/zram/zram_drv.c | 219 +- drivers/staging/zram/zram_drv.h | 57 +- drivers/staging/zram/zram_ioctl.h | 41 - drivers/staging/zram/zram_sysfs.c | 224 + drivers/usb/otg/twl4030-usb.c | 13 +- drivers/video/fbmem.c | 60 +- drivers/video/gbefb.c | 6 +- drivers/video/matrox/matroxfb_DAC1064.c | 5 +- drivers/video/matrox/matroxfb_maven.c | 2 +- drivers/video/omap/blizzard.c | 2 +- drivers/video/savage/savagefb-i2c.c | 9 + drivers/video/via/Makefile | 2 +- drivers/video/via/accel.c | 55 +- drivers/video/via/accel.h | 3 +- drivers/video/via/chip.h | 3 + drivers/video/via/dvi.c | 189 +- drivers/video/via/dvi.h | 4 +- drivers/video/via/global.h | 1 - drivers/video/via/hw.c | 648 +- drivers/video/via/hw.h | 53 +- drivers/video/via/ioctl.c | 2 + drivers/video/via/lcd.c | 90 +- drivers/video/via/lcd.h | 6 +- drivers/video/via/lcdtbl.h | 591 - drivers/video/via/tbl1636.c | 71 - drivers/video/via/tbl1636.h | 34 - drivers/video/via/via-core.c | 32 +- drivers/video/via/via_i2c.c | 31 +- drivers/video/via/viafbdev.c | 294 +- drivers/video/via/viafbdev.h | 7 + drivers/video/via/vt1636.c | 121 +- drivers/w1/w1.c | 8 +- drivers/watchdog/Kconfig | 23 +- drivers/watchdog/Makefile | 1 + drivers/watchdog/bcm63xx_wdt.c | 350 + drivers/watchdog/f71808e_wdt.c | 10 +- drivers/watchdog/iTCO_wdt.c | 26 +- drivers/watchdog/it8712f_wdt.c | 25 +- drivers/watchdog/it87_wdt.c | 96 +- drivers/watchdog/machzwd.c | 4 +- fs/9p/Kconfig | 13 + fs/9p/Makefile | 1 + fs/9p/acl.c | 392 + fs/9p/acl.h | 49 + fs/9p/fid.c | 1 + fs/9p/v9fs.c | 22 +- fs/9p/v9fs.h | 10 +- fs/9p/v9fs_vfs.h | 4 + fs/9p/vfs_addr.c | 30 + fs/9p/vfs_dir.c | 4 +- fs/9p/vfs_file.c | 265 +- fs/9p/vfs_inode.c | 253 +- fs/9p/vfs_super.c | 14 +- fs/9p/xattr.c | 52 +- fs/9p/xattr.h | 6 + fs/Kconfig | 3 - fs/Kconfig.binfmt | 4 +- fs/Makefile | 2 - fs/compat.c | 31 +- fs/compat_ioctl.c | 29 +- fs/eventpoll.c | 35 +- fs/exec.c | 168 +- fs/ext2/balloc.c | 3 +- fs/ext3/balloc.c | 17 +- fs/ext3/ialloc.c | 11 +- fs/ext3/inode.c | 20 +- fs/ext3/resize.c | 13 +- fs/ext3/super.c | 41 +- fs/ext4/Makefile | 2 +- fs/ext4/balloc.c | 5 +- fs/ext4/block_validity.c | 7 +- fs/ext4/dir.c | 2 +- fs/ext4/ext4.h | 110 +- fs/ext4/ext4_extents.h | 65 +- fs/ext4/extents.c | 368 +- fs/ext4/file.c | 44 +- fs/ext4/fsync.c | 83 + fs/ext4/ialloc.c | 135 +- fs/ext4/inode.c | 585 +- fs/ext4/mballoc.c | 554 +- fs/ext4/migrate.c | 2 +- fs/ext4/move_extent.c | 22 +- fs/ext4/namei.c | 63 +- fs/ext4/page-io.c | 430 + fs/ext4/resize.c | 52 +- fs/ext4/super.c | 531 +- fs/ext4/xattr.c | 4 +- fs/ext4/xattr.h | 10 +- fs/fcntl.c | 62 +- fs/fuse/dev.c | 7 +- fs/hfsplus/dir.c | 4 +- fs/hfsplus/ioctl.c | 2 +- fs/ioctl.c | 39 + fs/isofs/inode.c | 40 + fs/jbd/checkpoint.c | 4 +- fs/jbd/commit.c | 8 +- fs/jbd/journal.c | 44 +- fs/jbd/recovery.c | 2 +- fs/jbd/transaction.c | 6 +- fs/jbd2/checkpoint.c | 10 + fs/jbd2/commit.c | 12 +- fs/jbd2/journal.c | 6 +- fs/jbd2/transaction.c | 1 + fs/lockd/svc.c | 11 - fs/lockd/svclock.c | 6 +- fs/lockd/svcsubs.c | 9 +- fs/locks.c | 57 +- fs/nfs/Kconfig | 1 - fs/nfs/direct.c | 2 +- fs/nfs/idmap.c | 2 +- fs/nfs/nfs4proc.c | 4 +- fs/nfs/pagelist.c | 8 +- fs/nfsd/Kconfig | 1 - fs/nfsd/nfs4state.c | 26 +- fs/proc/base.c | 8 +- fs/proc/softirqs.c | 4 +- fs/proc/stat.c | 14 +- fs/proc/task_mmu.c | 6 + fs/quota/Kconfig | 4 +- fs/quota/dquot.c | 30 +- fs/select.c | 6 +- fs/xfs/Kconfig | 1 + include/asm-generic/cputime.h | 6 +- include/asm-generic/gpio.h | 4 +- include/asm-generic/vmlinux.lds.h | 3 +- include/linux/Kbuild | 5 - include/linux/amba/pl08x.h | 222 + include/linux/basic_mmio_gpio.h | 20 + include/linux/blkdev.h | 8 + include/linux/cgroup.h | 4 + include/linux/connector.h | 8 - include/linux/dmaengine.h | 60 +- include/linux/fb.h | 6 + include/linux/fs.h | 15 + include/linux/highmem.h | 51 +- include/linux/i2c/adp5588.h | 21 +- include/linux/i2c/twl.h | 77 + include/linux/init_task.h | 4 +- include/linux/intel_mid_dma.h | 16 +- include/linux/interrupt.h | 2 +- include/linux/ioport.h | 1 + include/linux/jbd2.h | 2 +- include/linux/kernel_stat.h | 18 +- include/linux/kfifo.h | 33 +- include/linux/magic.h | 1 + include/linux/mfd/88pm860x.h | 2 +- include/linux/mfd/ab8500.h | 28 +- include/linux/mfd/abx500.h | 4 +- include/linux/mfd/core.h | 3 + include/linux/mfd/max8998-private.h | 129 +- include/linux/mfd/max8998.h | 23 +- include/linux/mfd/mc13783.h | 239 +- include/linux/mfd/mc13xxx.h | 154 + include/linux/mfd/pcf50633/core.h | 7 + include/linux/mfd/sh_mobile_sdhi.h | 2 + include/linux/mfd/stmpe.h | 6 + include/linux/mfd/tmio.h | 6 + include/linux/mfd/tps6586x.h | 31 + include/linux/mfd/wm831x/core.h | 12 + include/linux/mmc/card.h | 6 + include/linux/mmc/core.h | 2 + include/linux/mmc/host.h | 48 +- include/linux/mmc/mmc.h | 10 +- include/linux/{ => mmc}/sdhci-pltfm.h | 2 +- include/linux/mmc/sdhci.h | 144 + include/linux/mmc/sh_mmcif.h | 1 + include/linux/mmu_notifier.h | 2 +- include/linux/netdevice.h | 18 +- include/linux/pci.h | 5 +- include/linux/pci_ids.h | 28 +- include/linux/pci_regs.h | 6 +- include/linux/percpu-defs.h | 12 - include/linux/percpu_counter.h | 10 + include/linux/phy.h | 12 - include/linux/poll.h | 2 + include/linux/ptrace.h | 12 +- include/linux/ramoops.h | 15 + include/linux/regulator/lp3972.h | 48 + include/linux/regulator/machine.h | 5 + include/linux/regulator/max8952.h | 135 + include/linux/ring_buffer.h | 12 - include/linux/rio.h | 17 +- include/linux/rio_ids.h | 2 + include/linux/rio_regs.h | 18 +- include/linux/sched.h | 16 +- include/linux/sh_intc.h | 3 - include/linux/smp.h | 19 +- include/linux/spi/74x164.h | 11 + include/linux/synclink.h | 5 + include/linux/syscalls.h | 3 +- include/linux/ti_wilink_st.h | 400 + include/linux/tracehook.h | 2 +- include/linux/tty.h | 1 + include/linux/via-core.h | 4 +- include/linux/videodev2.h | 12 +- include/linux/videotext.h | 125 - include/linux/virtio_9p.h | 1 - include/linux/writeback.h | 2 + include/media/ir-core.h | 41 +- include/media/ir-kbd-i2c.h | 10 +- include/media/lirc_dev.h | 6 +- include/media/omap1_camera.h | 35 + include/media/rc-map.h | 19 +- include/media/s3c_fimc.h | 60 + include/media/sh_vou.h | 1 - include/media/soc_camera.h | 9 +- include/media/sr030pc30.h | 21 + include/media/v4l2-chip-ident.h | 8 + include/media/v4l2-common.h | 10 + include/media/v4l2-dev.h | 8 +- include/media/v4l2-device.h | 57 +- include/media/v4l2-i2c-drv.h | 80 - include/media/v4l2-mediabus.h | 8 + include/media/v4l2-subdev.h | 24 +- include/media/videobuf-core.h | 19 +- include/media/videobuf-dma-contig.h | 3 +- include/media/videobuf-dma-sg.h | 3 +- include/media/videobuf-vmalloc.h | 3 +- include/media/wm8775.h | 3 + include/net/9p/9p.h | 54 + include/net/9p/client.h | 4 + include/net/caif/caif_shm.h | 26 + include/net/dst.h | 2 +- include/net/fib_rules.h | 2 +- include/net/garp.h | 2 +- include/net/inetpeer.h | 2 +- include/net/ip.h | 4 +- include/net/ip6_tunnel.h | 2 +- include/net/ipip.h | 6 +- include/net/net_namespace.h | 2 +- include/net/protocol.h | 4 +- include/net/sock.h | 2 +- include/net/xfrm.h | 4 +- include/trace/events/ext4.h | 379 +- include/trace/events/irq.h | 54 +- include/trace/events/jbd2.h | 78 +- init/Kconfig | 117 +- init/initramfs.c | 9 +- ipc/compat.c | 6 + ipc/compat_mq.c | 5 + ipc/shm.c | 63 +- kernel/cgroup.c | 129 +- kernel/cgroup_freezer.c | 72 +- kernel/cred.c | 4 +- kernel/exit.c | 2 + kernel/fork.c | 2 + kernel/irq/irqdesc.c | 15 + kernel/kprobes.c | 7 +- kernel/module.c | 2 +- kernel/ns_cgroup.c | 8 + kernel/perf_event.c | 94 +- kernel/ptrace.c | 36 +- kernel/resource.c | 153 +- kernel/signal.c | 5 +- kernel/smp.c | 8 +- kernel/softirq.c | 16 +- kernel/taskstats.c | 172 +- kernel/trace/ring_buffer.c | 335 +- kernel/trace/trace.c | 8 +- kernel/trace/trace_kprobe.c | 1 - kernel/tsacct.c | 10 +- lib/Kconfig.debug | 13 + mm/highmem.c | 6 +- mm/maccess.c | 2 +- mm/memcontrol.c | 406 +- mm/mempolicy.c | 2 +- mm/swap.c | 1 + net/802/garp.c | 18 +- net/802/stp.c | 4 +- net/8021q/vlan.c | 6 +- net/9p/client.c | 178 +- net/9p/protocol.c | 5 +- net/9p/trans_virtio.c | 76 +- net/core/dev.c | 38 +- net/core/fib_rules.c | 21 +- net/core/filter.c | 4 +- net/core/net-sysfs.c | 20 +- net/core/net_namespace.c | 4 +- net/core/pktgen.c | 30 +- net/core/sock.c | 2 +- net/core/sysctl_net_core.c | 3 +- net/ipv4/fib_hash.c | 36 +- net/ipv4/gre.c | 5 +- net/ipv4/inetpeer.c | 138 +- net/ipv4/ip_gre.c | 1 + net/ipv4/ip_sockglue.c | 10 +- net/ipv4/ipip.c | 1 + net/ipv4/protocol.c | 8 +- net/ipv4/route.c | 75 +- net/ipv4/tunnel4.c | 29 +- net/ipv4/udp.c | 2 +- net/ipv6/addrconf.c | 16 +- net/ipv6/ip6_tunnel.c | 2 + net/ipv6/ipv6_sockglue.c | 4 + net/ipv6/netfilter/Kconfig | 5 + net/ipv6/netfilter/Makefile | 5 +- net/ipv6/netfilter/nf_conntrack_reasm.c | 5 +- net/ipv6/protocol.c | 8 +- net/ipv6/raw.c | 2 +- net/ipv6/sit.c | 1 + net/ipv6/tunnel6.c | 24 +- net/ipv6/udp.c | 2 +- net/l2tp/l2tp_core.c | 53 +- net/l2tp/l2tp_core.h | 33 - net/l2tp/l2tp_ip.c | 2 +- net/mac80211/ibss.c | 1 + net/mac80211/main.c | 8 +- net/mac80211/rate.c | 3 + net/netfilter/Kconfig | 2 + net/netfilter/xt_TPROXY.c | 10 +- net/netfilter/xt_socket.c | 12 +- net/netlink/af_netlink.c | 65 +- net/wireless/reg.c | 2 +- scripts/Makefile.clean | 2 + scripts/Makefile.lib | 4 +- scripts/basic/docproc.c | 5 +- scripts/coccicheck | 46 +- .../{ => api}/alloc/drop_kmalloc_cast.cocci | 0 .../{ => api}/alloc/kzalloc-simple.cocci | 6 +- scripts/coccinelle/{ => api}/err_cast.cocci | 0 scripts/coccinelle/api/kstrdup.cocci | 39 + scripts/coccinelle/api/memdup.cocci | 40 + scripts/coccinelle/api/memdup_user.cocci | 35 + scripts/coccinelle/{ => api}/resource_size.cocci | 0 scripts/coccinelle/free/kfree.cocci | 117 + scripts/coccinelle/iterators/fen.cocci | 64 + scripts/coccinelle/iterators/itnull.cocci | 58 + .../coccinelle/iterators/list_entry_update.cocci | 62 + scripts/coccinelle/locks/call_kern.cocci | 74 + scripts/coccinelle/locks/double_lock.cocci | 92 + scripts/coccinelle/locks/flags.cocci | 80 + scripts/coccinelle/locks/mini_lock.cocci | 95 + scripts/coccinelle/misc/doubleinit.cocci | 53 + scripts/coccinelle/misc/ifcol.cocci | 48 + scripts/coccinelle/{ => null}/deref_null.cocci | 0 scripts/coccinelle/null/eno.cocci | 20 + scripts/coccinelle/null/kmerr.cocci | 72 + scripts/coccinelle/tests/doublebitand.cocci | 54 + scripts/coccinelle/tests/doubletest.cocci | 40 + scripts/extract-ikconfig | 41 +- scripts/kallsyms.c | 8 +- scripts/kconfig/Makefile | 87 +- scripts/kconfig/conf.c | 15 +- scripts/kconfig/confdata.c | 126 +- scripts/kconfig/expr.h | 2 +- scripts/kconfig/gconf.c | 20 +- scripts/kconfig/gconf.glade | 1 - scripts/kconfig/kxgettext.c | 15 +- scripts/kconfig/lex.zconf.c_shipped | 7 +- scripts/kconfig/lkc.h | 8 +- scripts/kconfig/lkc_proto.h | 3 + scripts/kconfig/lxdialog/check-lxdialog.sh | 2 + scripts/kconfig/mconf.c | 64 +- scripts/kconfig/menu.c | 6 +- scripts/kconfig/nconf.c | 487 +- scripts/kconfig/nconf.gui.c | 22 +- scripts/kconfig/nconf.h | 3 +- scripts/kconfig/qconf.cc | 174 +- scripts/kconfig/qconf.h | 76 +- scripts/kconfig/symbol.c | 51 +- scripts/kconfig/util.c | 7 +- scripts/kconfig/zconf.l | 7 +- scripts/kconfig/zconf.tab.c_shipped | 547 +- scripts/kconfig/zconf.y | 18 +- scripts/mod/modpost.c | 5 +- scripts/namespace.pl | 147 +- scripts/package/builddeb | 4 +- scripts/package/mkspec | 2 +- scripts/setlocalversion | 6 +- security/keys/process_keys.c | 2 +- sound/oss/sb_ess.c | 1 - sound/pci/hda/patch_sigmatel.c | 78 + sound/sh/aica.c | 2 +- sound/soc/codecs/ad73311.c | 2 +- sound/soc/codecs/max98088.c | 2 +- sound/soc/codecs/wm9090.c | 2 +- sound/soc/fsl/pcm030-audio-fabric.c | 3 +- sound/soc/sh/sh7760-ac97.c | 4 +- sound/usb/card.h | 2 + sound/usb/pcm.c | 2 + sound/usb/proc.c | 5 + sound/usb/urb.c | 170 +- tools/perf/Documentation/perf-list.txt | 17 + tools/perf/Documentation/perf-probe.txt | 18 +- tools/perf/Documentation/perf-record.txt | 4 + tools/perf/builtin-probe.c | 78 +- tools/perf/builtin-record.c | 8 +- tools/perf/builtin-trace.c | 17 +- tools/perf/scripts/perl/bin/failed-syscalls-report | 2 +- tools/perf/scripts/perl/bin/rw-by-file-report | 2 +- tools/perf/scripts/perl/bin/rw-by-pid-report | 2 +- tools/perf/scripts/perl/bin/rwtop-report | 2 +- tools/perf/scripts/perl/bin/wakeup-latency-report | 2 +- tools/perf/scripts/perl/bin/workqueue-stats-report | 2 +- .../python/Perf-Trace-Util/lib/Perf/Trace/Util.py | 58 + .../python/bin/failed-syscalls-by-pid-report | 2 +- .../scripts/python/bin/futex-contention-record | 2 + .../scripts/python/bin/futex-contention-report | 4 + tools/perf/scripts/python/bin/netdev-times-report | 2 +- .../perf/scripts/python/bin/sched-migration-report | 2 +- tools/perf/scripts/python/bin/sctop-report | 2 +- .../python/bin/syscall-counts-by-pid-report | 2 +- .../perf/scripts/python/bin/syscall-counts-report | 2 +- .../perf/scripts/python/failed-syscalls-by-pid.py | 21 +- tools/perf/scripts/python/futex-contention.py | 50 + tools/perf/scripts/python/sctop.py | 9 +- tools/perf/scripts/python/syscall-counts-by-pid.py | 21 +- tools/perf/scripts/python/syscall-counts.py | 5 +- tools/perf/util/debug.c | 4 +- tools/perf/util/debug.h | 2 +- tools/perf/util/map.h | 10 + tools/perf/util/probe-event.c | 189 +- tools/perf/util/probe-event.h | 16 +- tools/perf/util/probe-finder.c | 645 +- tools/perf/util/probe-finder.h | 31 +- tools/perf/util/ui/browser.c | 1 - usr/Makefile | 6 +- usr/initramfs_data.S | 21 +- usr/initramfs_data.bz2.S | 29 - usr/initramfs_data.gz.S | 29 - usr/initramfs_data.lzma.S | 29 - usr/initramfs_data.lzo.S | 29 - 2920 files changed, 510099 insertions(+), 176997 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-block-zram create mode 100644 Documentation/DocBook/v4l/pixfmt-srggb10.xml create mode 100644 Documentation/DocBook/v4l/pixfmt-srggb8.xml create mode 100644 Documentation/DocBook/v4l/pixfmt-y10.xml create mode 100644 Documentation/dvb/lmedm04.txt create mode 100644 Kconfig create mode 100644 arch/arm/mach-omap2/dsp.c create mode 100644 arch/arm/plat-mxc/include/mach/dma.h create mode 100644 arch/arm/plat-mxc/include/mach/sdma.h create mode 100644 arch/arm/plat-omap/include/plat/dsp.h create mode 100644 arch/arm/plat-pxa/include/plat/sdhci.h create mode 100644 arch/mn10300/configs/asb2364_defconfig create mode 100644 arch/mn10300/include/asm/rwlock.h create mode 100644 arch/mn10300/include/asm/smsc911x.h create mode 100644 arch/mn10300/include/asm/spinlock_types.h create mode 100644 arch/mn10300/kernel/cevt-mn10300.c create mode 100644 arch/mn10300/kernel/csrc-mn10300.c create mode 100644 arch/mn10300/kernel/fpu-nofpu-low.S create mode 100644 arch/mn10300/kernel/fpu-nofpu.c create mode 100644 arch/mn10300/kernel/smp-low.S create mode 100644 arch/mn10300/kernel/smp.c create mode 100644 arch/mn10300/mm/Kconfig.cache create mode 100644 arch/mn10300/mm/cache-flush-by-reg.S create mode 100644 arch/mn10300/mm/cache-flush-by-tag.S create mode 100644 arch/mn10300/mm/cache-flush-icache.c delete mode 100644 arch/mn10300/mm/cache-flush-mn10300.S create mode 100644 arch/mn10300/mm/cache-inv-by-reg.S create mode 100644 arch/mn10300/mm/cache-inv-by-tag.S create mode 100644 arch/mn10300/mm/cache-inv-icache.c delete mode 100644 arch/mn10300/mm/cache-mn10300.S create mode 100644 arch/mn10300/mm/cache-smp-flush.c create mode 100644 arch/mn10300/mm/cache-smp-inv.c create mode 100644 arch/mn10300/mm/cache-smp.c create mode 100644 arch/mn10300/mm/cache-smp.h create mode 100644 arch/mn10300/mm/tlb-smp.c create mode 100644 arch/mn10300/proc-mn103e010/include/proc/dmactl-regs.h create mode 100644 arch/mn10300/proc-mn103e010/include/proc/intctl-regs.h create mode 100644 arch/mn10300/proc-mn2ws0050/Makefile create mode 100644 arch/mn10300/proc-mn2ws0050/include/proc/cache.h create mode 100644 arch/mn10300/proc-mn2ws0050/include/proc/clock.h create mode 100644 arch/mn10300/proc-mn2ws0050/include/proc/dmactl-regs.h create mode 100644 arch/mn10300/proc-mn2ws0050/include/proc/intctl-regs.h create mode 100644 arch/mn10300/proc-mn2ws0050/include/proc/irq.h create mode 100644 arch/mn10300/proc-mn2ws0050/include/proc/nand-regs.h create mode 100644 arch/mn10300/proc-mn2ws0050/include/proc/proc.h create mode 100644 arch/mn10300/proc-mn2ws0050/include/proc/smp-regs.h create mode 100644 arch/mn10300/proc-mn2ws0050/proc-init.c create mode 100644 arch/mn10300/unit-asb2364/Makefile create mode 100644 arch/mn10300/unit-asb2364/include/unit/clock.h create mode 100644 arch/mn10300/unit-asb2364/include/unit/fpga-regs.h create mode 100644 arch/mn10300/unit-asb2364/include/unit/irq.h create mode 100644 arch/mn10300/unit-asb2364/include/unit/leds.h create mode 100644 arch/mn10300/unit-asb2364/include/unit/serial.h create mode 100644 arch/mn10300/unit-asb2364/include/unit/smsc911x.h create mode 100644 arch/mn10300/unit-asb2364/include/unit/timex.h create mode 100644 arch/mn10300/unit-asb2364/irq-fpga.c create mode 100644 arch/mn10300/unit-asb2364/leds.c create mode 100644 arch/mn10300/unit-asb2364/smsc911x.c create mode 100644 arch/mn10300/unit-asb2364/unit-init.c delete mode 100644 arch/powerpc/include/asm/fsldma.h create mode 100644 arch/sh/mm/gup.c create mode 100644 arch/x86/platform/Makefile create mode 100644 arch/x86/platform/efi/Makefile rename arch/x86/{kernel => platform/efi}/efi.c (100%) rename arch/x86/{kernel => platform/efi}/efi_32.c (100%) rename arch/x86/{kernel => platform/efi}/efi_64.c (100%) rename arch/x86/{kernel => platform/efi}/efi_stub_32.S (100%) rename arch/x86/{kernel => platform/efi}/efi_stub_64.S (100%) create mode 100644 arch/x86/platform/mrst/Makefile rename arch/x86/{kernel => platform/mrst}/mrst.c (100%) create mode 100644 arch/x86/platform/olpc/Makefile rename arch/x86/{kernel => platform/olpc}/olpc-xo1.c (100%) rename arch/x86/{kernel => platform/olpc}/olpc.c (100%) rename arch/x86/{kernel => platform/olpc}/olpc_ofw.c (100%) create mode 100644 arch/x86/platform/scx200/Makefile rename arch/x86/{kernel => platform/scx200}/scx200_32.c (100%) create mode 100644 arch/x86/platform/sfi/Makefile rename arch/x86/{kernel => platform/sfi}/sfi.c (100%) create mode 100644 arch/x86/platform/uv/Makefile rename arch/x86/{kernel => platform/uv}/bios_uv.c (100%) rename arch/x86/{kernel => platform/uv}/tlb_uv.c (100%) rename arch/x86/{kernel => platform/uv}/uv_irq.c (100%) rename arch/x86/{kernel => platform/uv}/uv_sysfs.c (100%) rename arch/x86/{kernel => platform/uv}/uv_time.c (100%) create mode 100644 arch/x86/platform/visws/Makefile rename arch/x86/{kernel => platform/visws}/visws_quirks.c (100%) create mode 100644 drivers/dma/amba-pl08x.c create mode 100644 drivers/dma/imx-dma.c create mode 100644 drivers/dma/imx-sdma.c create mode 100644 drivers/gpio/74x164.c create mode 100644 drivers/gpio/basic_mmio_gpio.c create mode 100644 drivers/gpio/pch_gpio.c create mode 100644 drivers/gpio/vx855_gpio.c create mode 100644 drivers/hwmon/w83795.c rename drivers/{hwmon => macintosh}/ams/Makefile (100%) rename drivers/{hwmon => macintosh}/ams/ams-core.c (100%) rename drivers/{hwmon => macintosh}/ams/ams-i2c.c (100%) rename drivers/{hwmon => macintosh}/ams/ams-input.c (100%) rename drivers/{hwmon => macintosh}/ams/ams-pmu.c (100%) rename drivers/{hwmon => macintosh}/ams/ams.h (100%) create mode 100644 drivers/media/IR/ir-rc5-sz-decoder.c create mode 100644 drivers/media/IR/keymaps/rc-alink-dtu-m.c create mode 100644 drivers/media/IR/keymaps/rc-anysee.c create mode 100644 drivers/media/IR/keymaps/rc-avermedia-rm-ks.c create mode 100644 drivers/media/IR/keymaps/rc-azurewave-ad-tu700.c create mode 100644 drivers/media/IR/keymaps/rc-digitalnow-tinytwin.c create mode 100644 drivers/media/IR/keymaps/rc-digittrade.c create mode 100644 drivers/media/IR/keymaps/rc-leadtek-y04g0051.c create mode 100644 drivers/media/IR/keymaps/rc-lme2510.c create mode 100644 drivers/media/IR/keymaps/rc-msi-digivox-ii.c create mode 100644 drivers/media/IR/keymaps/rc-msi-digivox-iii.c delete mode 100644 drivers/media/IR/keymaps/rc-rc5-streamzap.c create mode 100644 drivers/media/IR/keymaps/rc-streamzap.c create mode 100644 drivers/media/IR/keymaps/rc-terratec-slim.c create mode 100644 drivers/media/IR/keymaps/rc-total-media-in-hand.c create mode 100644 drivers/media/IR/keymaps/rc-trekstor.c create mode 100644 drivers/media/IR/keymaps/rc-twinhan1027.c create mode 100644 drivers/media/IR/nuvoton-cir.c create mode 100644 drivers/media/IR/nuvoton-cir.h create mode 100644 drivers/media/common/tuners/tda18218.c create mode 100644 drivers/media/common/tuners/tda18218.h create mode 100644 drivers/media/common/tuners/tda18218_priv.h create mode 100644 drivers/media/dvb/dvb-usb/lmedm04.c create mode 100644 drivers/media/dvb/dvb-usb/lmedm04.h create mode 100644 drivers/media/dvb/frontends/ix2505v.c create mode 100644 drivers/media/dvb/frontends/ix2505v.h delete mode 100644 drivers/media/dvb/frontends/lgdt3304.c delete mode 100644 drivers/media/dvb/frontends/lgdt3304.h create mode 100644 drivers/media/dvb/frontends/s5h1432.c create mode 100644 drivers/media/dvb/frontends/s5h1432.h create mode 100644 drivers/media/video/cx231xx/cx231xx-417.c create mode 100644 drivers/media/video/cx231xx/cx231xx-dif.h delete mode 100644 drivers/media/video/cx231xx/cx231xx-input.c create mode 100644 drivers/media/video/gspca/konica.c create mode 100644 drivers/media/video/gspca/xirlink_cit.c create mode 100644 drivers/media/video/imx074.c create mode 100644 drivers/media/video/omap1_camera.c create mode 100644 drivers/media/video/ov6650.c create mode 100644 drivers/media/video/ov7670.h create mode 100644 drivers/media/video/s5p-fimc/fimc-capture.c delete mode 100644 drivers/media/video/saa5246a.c delete mode 100644 drivers/media/video/saa5249.c create mode 100644 drivers/media/video/saa7164/saa7164-encoder.c create mode 100644 drivers/media/video/saa7164/saa7164-vbi.c create mode 100644 drivers/media/video/sr030pc30.c create mode 100644 drivers/media/video/via-camera.c create mode 100644 drivers/media/video/via-camera.h create mode 100644 drivers/mfd/ab8500-debugfs.c create mode 100644 drivers/mfd/ab8500-i2c.c create mode 100644 drivers/mfd/max8998-irq.c delete mode 100644 drivers/mfd/mc13783-core.c create mode 100644 drivers/mfd/mc13xxx-core.c create mode 100644 drivers/mfd/twl-core.h create mode 100644 drivers/mfd/vx855.c create mode 100644 drivers/mfd/wm831x-i2c.c create mode 100644 drivers/mfd/wm831x-spi.c create mode 100644 drivers/misc/ab8500-pwm.c create mode 100644 drivers/misc/ti-st/Kconfig create mode 100644 drivers/misc/ti-st/Makefile rename drivers/{staging => misc}/ti-st/st_core.c (93%) rename drivers/{staging => misc}/ti-st/st_kim.c (97%) rename drivers/{staging => misc}/ti-st/st_ll.c (95%) create mode 100644 drivers/mmc/host/sdhci-esdhc-imx.c create mode 100644 drivers/mmc/host/sdhci-esdhc.h create mode 100644 drivers/mmc/host/sdhci-pxa.c create mode 100644 drivers/mmc/host/ushc.c create mode 100644 drivers/net/caif/caif_shm_u5500.c create mode 100644 drivers/net/caif/caif_shmcore.c create mode 100644 drivers/net/can/pch_can.c create mode 100644 drivers/net/can/sja1000/tscan1.c create mode 100644 drivers/rapidio/switches/idt_gen2.c create mode 100644 drivers/regulator/lp3972.c create mode 100644 drivers/regulator/max8952.c create mode 100644 drivers/rtc/rtc-lpc32xx.c create mode 100644 drivers/rtc/rtc-max8998.c delete mode 100644 drivers/rtc/rtc-mc13783.c create mode 100644 drivers/rtc/rtc-mc13xxx.c create mode 100644 drivers/staging/ath6kl/Kconfig create mode 100644 drivers/staging/ath6kl/Makefile create mode 100644 drivers/staging/ath6kl/TODO create mode 100644 drivers/staging/ath6kl/bmi/include/bmi_internal.h create mode 100644 drivers/staging/ath6kl/bmi/src/bmi.c create mode 100644 drivers/staging/ath6kl/hif/common/hif_sdio_common.h create mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h create mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c create mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c create mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.c create mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.h create mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c create mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c create mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c create mode 100644 drivers/staging/ath6kl/htc2/htc.c create mode 100644 drivers/staging/ath6kl/htc2/htc_debug.h create mode 100644 drivers/staging/ath6kl/htc2/htc_internal.h create mode 100644 drivers/staging/ath6kl/htc2/htc_recv.c create mode 100644 drivers/staging/ath6kl/htc2/htc_send.c create mode 100644 drivers/staging/ath6kl/htc2/htc_services.c create mode 100644 drivers/staging/ath6kl/include/a_config.h create mode 100644 drivers/staging/ath6kl/include/a_debug.h create mode 100644 drivers/staging/ath6kl/include/a_drv.h create mode 100644 drivers/staging/ath6kl/include/a_drv_api.h create mode 100644 drivers/staging/ath6kl/include/a_osapi.h create mode 100644 drivers/staging/ath6kl/include/a_types.h create mode 100644 drivers/staging/ath6kl/include/aggr_recv_api.h create mode 100644 drivers/staging/ath6kl/include/ar3kconfig.h create mode 100644 drivers/staging/ath6kl/include/ar6000_api.h create mode 100644 drivers/staging/ath6kl/include/ar6000_diag.h create mode 100644 drivers/staging/ath6kl/include/ar6kap_common.h create mode 100644 drivers/staging/ath6kl/include/athbtfilter.h create mode 100644 drivers/staging/ath6kl/include/athendpack.h create mode 100644 drivers/staging/ath6kl/include/athstartpack.h create mode 100644 drivers/staging/ath6kl/include/bmi.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/AR6002_regdump.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/addrs.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/analog_intf_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/analog_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/apb_map.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/gpio_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/mbox_host_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/mbox_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/rtc_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/si_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/uart_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/vmc_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/analog_intf_ares_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/analog_intf_athr_wlan_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/analog_intf_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/bb_lc_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/efuse_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/gpio_athr_wlan_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/gpio_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mac_dma_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mac_pcu_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rdma_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/si_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/umbox_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/umbox_wlan_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/vmc_reg.h create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/vmc_wlan_reg.h create mode 100644 drivers/staging/ath6kl/include/common/a_hci.h create mode 100644 drivers/staging/ath6kl/include/common/athdefs.h create mode 100644 drivers/staging/ath6kl/include/common/bmi_msg.h create mode 100644 drivers/staging/ath6kl/include/common/btcoexGpio.h create mode 100644 drivers/staging/ath6kl/include/common/cnxmgmt.h create mode 100644 drivers/staging/ath6kl/include/common/dbglog.h create mode 100644 drivers/staging/ath6kl/include/common/dbglog_id.h create mode 100644 drivers/staging/ath6kl/include/common/discovery.h create mode 100644 drivers/staging/ath6kl/include/common/dset_internal.h create mode 100644 drivers/staging/ath6kl/include/common/dsetid.h create mode 100644 drivers/staging/ath6kl/include/common/epping_test.h create mode 100644 drivers/staging/ath6kl/include/common/gmboxif.h create mode 100644 drivers/staging/ath6kl/include/common/gpio.h create mode 100644 drivers/staging/ath6kl/include/common/htc.h create mode 100644 drivers/staging/ath6kl/include/common/htc_services.h create mode 100644 drivers/staging/ath6kl/include/common/ini_dset.h create mode 100644 drivers/staging/ath6kl/include/common/pkt_log.h create mode 100644 drivers/staging/ath6kl/include/common/regDb.h create mode 100644 drivers/staging/ath6kl/include/common/regdump.h create mode 100644 drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h create mode 100644 drivers/staging/ath6kl/include/common/regulatory/reg_dbvalues.h create mode 100644 drivers/staging/ath6kl/include/common/roaming.h create mode 100644 drivers/staging/ath6kl/include/common/targaddrs.h create mode 100644 drivers/staging/ath6kl/include/common/testcmd.h create mode 100644 drivers/staging/ath6kl/include/common/tlpm.h create mode 100644 drivers/staging/ath6kl/include/common/wlan_defs.h create mode 100644 drivers/staging/ath6kl/include/common/wlan_dset.h create mode 100644 drivers/staging/ath6kl/include/common/wmi.h create mode 100644 drivers/staging/ath6kl/include/common/wmi_thin.h create mode 100644 drivers/staging/ath6kl/include/common/wmix.h create mode 100644 drivers/staging/ath6kl/include/common_drv.h create mode 100644 drivers/staging/ath6kl/include/dbglog_api.h create mode 100644 drivers/staging/ath6kl/include/dl_list.h create mode 100644 drivers/staging/ath6kl/include/dset_api.h create mode 100644 drivers/staging/ath6kl/include/gpio_api.h create mode 100644 drivers/staging/ath6kl/include/hci_transport_api.h create mode 100644 drivers/staging/ath6kl/include/hif.h create mode 100644 drivers/staging/ath6kl/include/host_version.h create mode 100644 drivers/staging/ath6kl/include/htc_api.h create mode 100644 drivers/staging/ath6kl/include/htc_packet.h create mode 100644 drivers/staging/ath6kl/include/target_reg_table.h create mode 100644 drivers/staging/ath6kl/include/wlan_api.h create mode 100644 drivers/staging/ath6kl/include/wmi_api.h create mode 100644 drivers/staging/ath6kl/miscdrv/ar3kconfig.c create mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c create mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h create mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c create mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h create mode 100644 drivers/staging/ath6kl/miscdrv/common_drv.c create mode 100644 drivers/staging/ath6kl/miscdrv/credit_dist.c create mode 100644 drivers/staging/ath6kl/miscdrv/miscdrv.h create mode 100644 drivers/staging/ath6kl/os/linux/ar6000_android.c create mode 100644 drivers/staging/ath6kl/os/linux/ar6000_drv.c create mode 100644 drivers/staging/ath6kl/os/linux/ar6000_pm.c create mode 100644 drivers/staging/ath6kl/os/linux/ar6000_raw_if.c create mode 100644 drivers/staging/ath6kl/os/linux/ar6k_pal.c create mode 100644 drivers/staging/ath6kl/os/linux/cfg80211.c create mode 100644 drivers/staging/ath6kl/os/linux/eeprom.c create mode 100644 drivers/staging/ath6kl/os/linux/export_hci_transport.c create mode 100644 drivers/staging/ath6kl/os/linux/hci_bridge.c create mode 100644 drivers/staging/ath6kl/os/linux/include/ar6000_drv.h create mode 100644 drivers/staging/ath6kl/os/linux/include/ar6k_pal.h create mode 100644 drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h create mode 100644 drivers/staging/ath6kl/os/linux/include/athdrv_linux.h create mode 100644 drivers/staging/ath6kl/os/linux/include/athendpack_linux.h create mode 100644 drivers/staging/ath6kl/os/linux/include/athstartpack_linux.h create mode 100644 drivers/staging/ath6kl/os/linux/include/athtypes_linux.h create mode 100644 drivers/staging/ath6kl/os/linux/include/cfg80211.h create mode 100644 drivers/staging/ath6kl/os/linux/include/config_linux.h create mode 100644 drivers/staging/ath6kl/os/linux/include/debug_linux.h create mode 100644 drivers/staging/ath6kl/os/linux/include/export_hci_transport.h create mode 100644 drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h create mode 100644 drivers/staging/ath6kl/os/linux/include/osapi_linux.h create mode 100644 drivers/staging/ath6kl/os/linux/include/wlan_config.h create mode 100644 drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h create mode 100644 drivers/staging/ath6kl/os/linux/ioctl.c create mode 100644 drivers/staging/ath6kl/os/linux/netbuf.c create mode 100644 drivers/staging/ath6kl/os/linux/wireless_ext.c create mode 100644 drivers/staging/ath6kl/reorder/aggr_rx_internal.h create mode 100644 drivers/staging/ath6kl/reorder/rcv_aggr.c create mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211.h create mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211_node.h create mode 100644 drivers/staging/ath6kl/wlan/src/wlan_node.c create mode 100644 drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c create mode 100644 drivers/staging/ath6kl/wlan/src/wlan_utils.c create mode 100644 drivers/staging/ath6kl/wmi/wmi.c create mode 100644 drivers/staging/ath6kl/wmi/wmi_host.h rename {fs => drivers/staging}/autofs/Kconfig (100%) rename {fs => drivers/staging}/autofs/Makefile (59%) create mode 100644 drivers/staging/autofs/TODO rename {fs => drivers/staging}/autofs/autofs_i.h (99%) rename {fs => drivers/staging}/autofs/dirhash.c (99%) rename {fs => drivers/staging}/autofs/init.c (97%) rename {fs => drivers/staging}/autofs/inode.c (99%) rename {fs => drivers/staging}/autofs/root.c (99%) rename {fs => drivers/staging}/autofs/symlink.c (95%) rename {fs => drivers/staging}/autofs/waitq.c (99%) delete mode 100644 drivers/staging/batman-adv/CHANGELOG create mode 100644 drivers/staging/batman-adv/unicast.c create mode 100644 drivers/staging/batman-adv/unicast.h create mode 100644 drivers/staging/bcm/Adapter.h create mode 100644 drivers/staging/bcm/Arp.c create mode 100644 drivers/staging/bcm/Bcmchar.c create mode 100644 drivers/staging/bcm/Bcmnet.c create mode 100644 drivers/staging/bcm/CmHost.c create mode 100644 drivers/staging/bcm/CmHost.h create mode 100644 drivers/staging/bcm/DDRInit.c create mode 100644 drivers/staging/bcm/DDRInit.h create mode 100644 drivers/staging/bcm/Debug.c create mode 100644 drivers/staging/bcm/Debug.h create mode 100644 drivers/staging/bcm/HandleControlPacket.c create mode 100644 drivers/staging/bcm/HostMIBSInterface.h create mode 100644 drivers/staging/bcm/HostMibs.h create mode 100644 drivers/staging/bcm/IPv6Protocol.c create mode 100644 drivers/staging/bcm/IPv6ProtocolHdr.h create mode 100644 drivers/staging/bcm/InterfaceAdapter.h create mode 100644 drivers/staging/bcm/InterfaceDld.c create mode 100644 drivers/staging/bcm/InterfaceIdleMode.c create mode 100644 drivers/staging/bcm/InterfaceIdleMode.h create mode 100644 drivers/staging/bcm/InterfaceInit.c create mode 100644 drivers/staging/bcm/InterfaceInit.h create mode 100644 drivers/staging/bcm/InterfaceIsr.c create mode 100644 drivers/staging/bcm/InterfaceIsr.h create mode 100644 drivers/staging/bcm/InterfaceMacros.h create mode 100644 drivers/staging/bcm/InterfaceMisc.c create mode 100644 drivers/staging/bcm/InterfaceMisc.h create mode 100644 drivers/staging/bcm/InterfaceRx.c create mode 100644 drivers/staging/bcm/InterfaceRx.h create mode 100644 drivers/staging/bcm/InterfaceTx.c create mode 100644 drivers/staging/bcm/InterfaceTx.h create mode 100644 drivers/staging/bcm/Interfacemain.h create mode 100644 drivers/staging/bcm/Ioctl.h create mode 100644 drivers/staging/bcm/Kconfig create mode 100644 drivers/staging/bcm/LeakyBucket.c create mode 100644 drivers/staging/bcm/Macros.h create mode 100644 drivers/staging/bcm/Makefile create mode 100644 drivers/staging/bcm/Misc.c create mode 100644 drivers/staging/bcm/Osal_Misc.c create mode 100644 drivers/staging/bcm/PHSDefines.h create mode 100644 drivers/staging/bcm/PHSModule.c create mode 100644 drivers/staging/bcm/PHSModule.h create mode 100644 drivers/staging/bcm/Protocol.h create mode 100644 drivers/staging/bcm/Prototypes.h create mode 100644 drivers/staging/bcm/Qos.c create mode 100644 drivers/staging/bcm/Queue.h create mode 100644 drivers/staging/bcm/TODO create mode 100644 drivers/staging/bcm/Transmit.c create mode 100644 drivers/staging/bcm/Typedefs.h create mode 100644 drivers/staging/bcm/Version.h create mode 100644 drivers/staging/bcm/cntrl_SignalingInterface.h create mode 100644 drivers/staging/bcm/headers.h create mode 100644 drivers/staging/bcm/hostmibs.c create mode 100644 drivers/staging/bcm/led_control.c create mode 100644 drivers/staging/bcm/led_control.h create mode 100644 drivers/staging/bcm/nvm.c create mode 100644 drivers/staging/bcm/nvm.h create mode 100644 drivers/staging/bcm/osal_misc.h create mode 100644 drivers/staging/bcm/sort.c create mode 100644 drivers/staging/bcm/target_params.h create mode 100644 drivers/staging/bcm/vendorspecificextn.c create mode 100644 drivers/staging/bcm/vendorspecificextn.h create mode 100644 drivers/staging/brcm80211/Kconfig create mode 100644 drivers/staging/brcm80211/Makefile create mode 100644 drivers/staging/brcm80211/README create mode 100644 drivers/staging/brcm80211/TODO create mode 100644 drivers/staging/brcm80211/brcmfmac/Kconfig create mode 100644 drivers/staging/brcm80211/brcmfmac/Makefile create mode 100644 drivers/staging/brcm80211/brcmfmac/README create mode 100644 drivers/staging/brcm80211/brcmfmac/bcmsdh.c create mode 100644 drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c create mode 100644 drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c create mode 100644 drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c create mode 100644 drivers/staging/brcm80211/brcmfmac/dhd.h create mode 100644 drivers/staging/brcm80211/brcmfmac/dhd_bus.h create mode 100644 drivers/staging/brcm80211/brcmfmac/dhd_cdc.c create mode 100644 drivers/staging/brcm80211/brcmfmac/dhd_common.c create mode 100644 drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c create mode 100644 drivers/staging/brcm80211/brcmfmac/dhd_dbg.h create mode 100644 drivers/staging/brcm80211/brcmfmac/dhd_linux.c create mode 100644 drivers/staging/brcm80211/brcmfmac/dhd_linux_sched.c create mode 100644 drivers/staging/brcm80211/brcmfmac/dhd_proto.h create mode 100644 drivers/staging/brcm80211/brcmfmac/dhd_sdio.c create mode 100644 drivers/staging/brcm80211/brcmfmac/dngl_stats.h create mode 100644 drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c create mode 100644 drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h create mode 100644 drivers/staging/brcm80211/brcmfmac/wl_iw.c create mode 100644 drivers/staging/brcm80211/brcmfmac/wl_iw.h create mode 100644 drivers/staging/brcm80211/include/aidmp.h create mode 100644 drivers/staging/brcm80211/include/bcm_rpc.h create mode 100644 drivers/staging/brcm80211/include/bcm_rpc_tp.h create mode 100644 drivers/staging/brcm80211/include/bcm_xdr.h create mode 100644 drivers/staging/brcm80211/include/bcmcdc.h create mode 100644 drivers/staging/brcm80211/include/bcmdefs.h create mode 100644 drivers/staging/brcm80211/include/bcmdevs.h create mode 100644 drivers/staging/brcm80211/include/bcmendian.h create mode 100644 drivers/staging/brcm80211/include/bcmnvram.h create mode 100644 drivers/staging/brcm80211/include/bcmotp.h create mode 100644 drivers/staging/brcm80211/include/bcmsdbus.h create mode 100644 drivers/staging/brcm80211/include/bcmsdh.h create mode 100644 drivers/staging/brcm80211/include/bcmsdh_sdmmc.h create mode 100644 drivers/staging/brcm80211/include/bcmsdpcm.h create mode 100644 drivers/staging/brcm80211/include/bcmsrom.h create mode 100644 drivers/staging/brcm80211/include/bcmsrom_fmt.h create mode 100644 drivers/staging/brcm80211/include/bcmsrom_tbl.h create mode 100644 drivers/staging/brcm80211/include/bcmutils.h create mode 100644 drivers/staging/brcm80211/include/bcmwifi.h create mode 100644 drivers/staging/brcm80211/include/d11.h create mode 100644 drivers/staging/brcm80211/include/dbus.h create mode 100644 drivers/staging/brcm80211/include/dhdioctl.h create mode 100644 drivers/staging/brcm80211/include/epivers.h create mode 100644 drivers/staging/brcm80211/include/hnddma.h create mode 100644 drivers/staging/brcm80211/include/hndpmu.h create mode 100644 drivers/staging/brcm80211/include/hndrte_armtrap.h create mode 100644 drivers/staging/brcm80211/include/hndrte_cons.h create mode 100644 drivers/staging/brcm80211/include/hndsoc.h create mode 100644 drivers/staging/brcm80211/include/linux_osl.h create mode 100644 drivers/staging/brcm80211/include/linuxver.h create mode 100644 drivers/staging/brcm80211/include/msgtrace.h create mode 100644 drivers/staging/brcm80211/include/nicpci.h create mode 100644 drivers/staging/brcm80211/include/osl.h create mode 100644 drivers/staging/brcm80211/include/packed_section_end.h create mode 100644 drivers/staging/brcm80211/include/packed_section_start.h create mode 100644 drivers/staging/brcm80211/include/pci_core.h create mode 100644 drivers/staging/brcm80211/include/pcicfg.h create mode 100644 drivers/staging/brcm80211/include/pcie_core.h create mode 100644 drivers/staging/brcm80211/include/proto/802.11.h create mode 100644 drivers/staging/brcm80211/include/proto/802.1d.h create mode 100644 drivers/staging/brcm80211/include/proto/bcmeth.h create mode 100644 drivers/staging/brcm80211/include/proto/bcmevent.h create mode 100644 drivers/staging/brcm80211/include/proto/ethernet.h create mode 100644 drivers/staging/brcm80211/include/proto/wpa.h create mode 100644 drivers/staging/brcm80211/include/qmath.h create mode 100644 drivers/staging/brcm80211/include/rpc_osl.h create mode 100644 drivers/staging/brcm80211/include/sbchipc.h create mode 100644 drivers/staging/brcm80211/include/sbconfig.h create mode 100644 drivers/staging/brcm80211/include/sbhnddma.h create mode 100644 drivers/staging/brcm80211/include/sbhndpio.h create mode 100644 drivers/staging/brcm80211/include/sbpcmcia.h create mode 100644 drivers/staging/brcm80211/include/sbsdio.h create mode 100644 drivers/staging/brcm80211/include/sbsdpcmdev.h create mode 100644 drivers/staging/brcm80211/include/sbsocram.h create mode 100644 drivers/staging/brcm80211/include/sdio.h create mode 100644 drivers/staging/brcm80211/include/sdioh.h create mode 100644 drivers/staging/brcm80211/include/sdiovar.h create mode 100644 drivers/staging/brcm80211/include/siutils.h create mode 100644 drivers/staging/brcm80211/include/spid.h create mode 100644 drivers/staging/brcm80211/include/wlioctl.h create mode 100644 drivers/staging/brcm80211/phy/phy_version.h create mode 100644 drivers/staging/brcm80211/phy/wlc_phy_cmn.c create mode 100644 drivers/staging/brcm80211/phy/wlc_phy_hal.h create mode 100644 drivers/staging/brcm80211/phy/wlc_phy_int.h create mode 100644 drivers/staging/brcm80211/phy/wlc_phy_lcn.c create mode 100644 drivers/staging/brcm80211/phy/wlc_phy_lcn.h create mode 100644 drivers/staging/brcm80211/phy/wlc_phy_n.c create mode 100644 drivers/staging/brcm80211/phy/wlc_phy_radio.h create mode 100644 drivers/staging/brcm80211/phy/wlc_phyreg_n.h create mode 100644 drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c create mode 100644 drivers/staging/brcm80211/phy/wlc_phytbl_lcn.h create mode 100644 drivers/staging/brcm80211/phy/wlc_phytbl_n.c create mode 100644 drivers/staging/brcm80211/phy/wlc_phytbl_n.h create mode 100644 drivers/staging/brcm80211/sys/d11ucode_ext.h create mode 100644 drivers/staging/brcm80211/sys/wl_dbg.h create mode 100644 drivers/staging/brcm80211/sys/wl_export.h create mode 100644 drivers/staging/brcm80211/sys/wl_mac80211.c create mode 100644 drivers/staging/brcm80211/sys/wl_mac80211.h create mode 100644 drivers/staging/brcm80211/sys/wl_ucode.h create mode 100644 drivers/staging/brcm80211/sys/wl_ucode_loader.c create mode 100644 drivers/staging/brcm80211/sys/wlc_alloc.c create mode 100644 drivers/staging/brcm80211/sys/wlc_alloc.h create mode 100644 drivers/staging/brcm80211/sys/wlc_ampdu.c create mode 100644 drivers/staging/brcm80211/sys/wlc_ampdu.h create mode 100644 drivers/staging/brcm80211/sys/wlc_antsel.c create mode 100644 drivers/staging/brcm80211/sys/wlc_antsel.h create mode 100644 drivers/staging/brcm80211/sys/wlc_bmac.c create mode 100644 drivers/staging/brcm80211/sys/wlc_bmac.h create mode 100644 drivers/staging/brcm80211/sys/wlc_bsscfg.h create mode 100644 drivers/staging/brcm80211/sys/wlc_cfg.h create mode 100644 drivers/staging/brcm80211/sys/wlc_channel.c create mode 100644 drivers/staging/brcm80211/sys/wlc_channel.h create mode 100644 drivers/staging/brcm80211/sys/wlc_event.c create mode 100644 drivers/staging/brcm80211/sys/wlc_event.h create mode 100644 drivers/staging/brcm80211/sys/wlc_key.h create mode 100644 drivers/staging/brcm80211/sys/wlc_mac80211.c create mode 100644 drivers/staging/brcm80211/sys/wlc_mac80211.h create mode 100644 drivers/staging/brcm80211/sys/wlc_phy_shim.c create mode 100644 drivers/staging/brcm80211/sys/wlc_phy_shim.h create mode 100644 drivers/staging/brcm80211/sys/wlc_pub.h create mode 100644 drivers/staging/brcm80211/sys/wlc_rate.c create mode 100644 drivers/staging/brcm80211/sys/wlc_rate.h create mode 100644 drivers/staging/brcm80211/sys/wlc_rpc.h create mode 100644 drivers/staging/brcm80211/sys/wlc_rpctx.h create mode 100644 drivers/staging/brcm80211/sys/wlc_scb.h create mode 100644 drivers/staging/brcm80211/sys/wlc_stf.c create mode 100644 drivers/staging/brcm80211/sys/wlc_stf.h create mode 100644 drivers/staging/brcm80211/sys/wlc_types.h create mode 100644 drivers/staging/brcm80211/util/aiutils.c create mode 100644 drivers/staging/brcm80211/util/bcmotp.c create mode 100644 drivers/staging/brcm80211/util/bcmsrom.c create mode 100644 drivers/staging/brcm80211/util/bcmutils.c create mode 100644 drivers/staging/brcm80211/util/bcmwifi.c create mode 100644 drivers/staging/brcm80211/util/hnddma.c create mode 100644 drivers/staging/brcm80211/util/hndpmu.c create mode 100644 drivers/staging/brcm80211/util/linux_osl.c create mode 100644 drivers/staging/brcm80211/util/nicpci.c create mode 100644 drivers/staging/brcm80211/util/nvram/nvram_ro.c create mode 100644 drivers/staging/brcm80211/util/qmath.c create mode 100644 drivers/staging/brcm80211/util/sbutils.c create mode 100644 drivers/staging/brcm80211/util/siutils.c create mode 100644 drivers/staging/brcm80211/util/siutils_priv.h create mode 100644 drivers/staging/cpia/Kconfig create mode 100644 drivers/staging/cpia/Makefile create mode 100644 drivers/staging/cpia/TODO rename drivers/{media/video => staging/cpia}/cpia.c (100%) rename drivers/{media/video => staging/cpia}/cpia.h (100%) rename drivers/{media/video => staging/cpia}/cpia_pp.c (100%) rename drivers/{media/video => staging/cpia}/cpia_usb.c (100%) create mode 100644 drivers/staging/ft1000/Kconfig create mode 100644 drivers/staging/ft1000/Makefile create mode 100644 drivers/staging/ft1000/TODO create mode 100644 drivers/staging/ft1000/ft1000-pcmcia/Makefile create mode 100644 drivers/staging/ft1000/ft1000-pcmcia/boot.h create mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000.conf create mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000.h create mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000.img create mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c create mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.h create mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h create mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c create mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c create mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c create mode 100644 drivers/staging/ft1000/ft1000-usb/Makefile create mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c create mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_download.c create mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c create mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_hw.h create mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h create mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_proc.c create mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_usb.c create mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_usb.h create mode 100644 drivers/staging/ft1000/ft1000-usb/ft3000.img delete mode 100644 drivers/staging/hv/channel_interface.c delete mode 100644 drivers/staging/hv/channel_interface.h create mode 100644 drivers/staging/iio/Documentation/generic_buffer.c delete mode 100644 drivers/staging/iio/Documentation/lis3l02dqbuffersimple.c create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-light delete mode 100644 drivers/staging/iio/Documentation/sysfs-class-iio create mode 100644 drivers/staging/iio/adc/ad7476.h create mode 100644 drivers/staging/iio/adc/ad7476_core.c create mode 100644 drivers/staging/iio/adc/ad7476_ring.c create mode 100644 drivers/staging/iio/adc/ad799x.h create mode 100644 drivers/staging/iio/adc/ad799x_core.c create mode 100644 drivers/staging/iio/adc/ad799x_ring.c create mode 100644 drivers/staging/iio/light/isl29018.c delete mode 100644 drivers/staging/iio/light/light.h create mode 100644 drivers/staging/iio/magnetometer/ak8975.c create mode 100644 drivers/staging/intel_sst/Kconfig create mode 100644 drivers/staging/intel_sst/Makefile create mode 100644 drivers/staging/intel_sst/TODO create mode 100644 drivers/staging/intel_sst/intel_sst.c create mode 100644 drivers/staging/intel_sst/intel_sst.h create mode 100644 drivers/staging/intel_sst/intel_sst_app_interface.c create mode 100644 drivers/staging/intel_sst/intel_sst_common.h create mode 100644 drivers/staging/intel_sst/intel_sst_drv_interface.c create mode 100644 drivers/staging/intel_sst/intel_sst_dsp.c create mode 100644 drivers/staging/intel_sst/intel_sst_fw_ipc.h create mode 100644 drivers/staging/intel_sst/intel_sst_ioctl.h create mode 100644 drivers/staging/intel_sst/intel_sst_ipc.c create mode 100644 drivers/staging/intel_sst/intel_sst_pvt.c create mode 100644 drivers/staging/intel_sst/intel_sst_stream.c create mode 100644 drivers/staging/intel_sst/intel_sst_stream_encoded.c create mode 100644 drivers/staging/intel_sst/intelmid.c create mode 100644 drivers/staging/intel_sst/intelmid.h create mode 100644 drivers/staging/intel_sst/intelmid_ctrl.c create mode 100644 drivers/staging/intel_sst/intelmid_msic_control.c create mode 100644 drivers/staging/intel_sst/intelmid_pvt.c create mode 100644 drivers/staging/intel_sst/intelmid_snd_control.h create mode 100644 drivers/staging/intel_sst/intelmid_v0_control.c create mode 100644 drivers/staging/intel_sst/intelmid_v1_control.c create mode 100644 drivers/staging/intel_sst/intelmid_v2_control.c create mode 100644 drivers/staging/intel_sst/jack.h create mode 100644 drivers/staging/keucr/Kconfig create mode 100644 drivers/staging/keucr/Makefile create mode 100644 drivers/staging/keucr/TODO create mode 100644 drivers/staging/keucr/common.h create mode 100644 drivers/staging/keucr/init.c create mode 100644 drivers/staging/keucr/init.h create mode 100644 drivers/staging/keucr/ms.c create mode 100644 drivers/staging/keucr/ms.h create mode 100644 drivers/staging/keucr/msscsi.c create mode 100644 drivers/staging/keucr/scsiglue.c create mode 100644 drivers/staging/keucr/scsiglue.h create mode 100644 drivers/staging/keucr/sdscsi.c create mode 100644 drivers/staging/keucr/smcommon.h create mode 100644 drivers/staging/keucr/smil.h create mode 100644 drivers/staging/keucr/smilecc.c create mode 100644 drivers/staging/keucr/smilmain.c create mode 100644 drivers/staging/keucr/smilsub.c create mode 100644 drivers/staging/keucr/smscsi.c create mode 100644 drivers/staging/keucr/transport.c create mode 100644 drivers/staging/keucr/transport.h create mode 100644 drivers/staging/keucr/usb.c create mode 100644 drivers/staging/keucr/usb.h create mode 100644 drivers/staging/olpc_dcon/Kconfig create mode 100644 drivers/staging/olpc_dcon/Makefile create mode 100644 drivers/staging/olpc_dcon/TODO create mode 100644 drivers/staging/olpc_dcon/olpc_dcon.c create mode 100644 drivers/staging/olpc_dcon/olpc_dcon.h create mode 100644 drivers/staging/olpc_dcon/olpc_dcon_xo_1.c create mode 100644 drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c delete mode 100644 drivers/staging/otus/80211core/amsdu.c delete mode 100644 drivers/staging/otus/80211core/cagg.c delete mode 100644 drivers/staging/otus/80211core/cagg.h delete mode 100644 drivers/staging/otus/80211core/ccmd.c delete mode 100644 drivers/staging/otus/80211core/cfunc.c delete mode 100644 drivers/staging/otus/80211core/cfunc.h delete mode 100644 drivers/staging/otus/80211core/chb.c delete mode 100644 drivers/staging/otus/80211core/cic.c delete mode 100644 drivers/staging/otus/80211core/cinit.c delete mode 100644 drivers/staging/otus/80211core/cmm.c delete mode 100644 drivers/staging/otus/80211core/cmmap.c delete mode 100644 drivers/staging/otus/80211core/cmmsta.c delete mode 100644 drivers/staging/otus/80211core/coid.c delete mode 100644 drivers/staging/otus/80211core/cprecomp.h delete mode 100644 drivers/staging/otus/80211core/cpsmgr.c delete mode 100644 drivers/staging/otus/80211core/cscanmgr.c delete mode 100644 drivers/staging/otus/80211core/ctkip.c delete mode 100644 drivers/staging/otus/80211core/ctxrx.c delete mode 100644 drivers/staging/otus/80211core/cwep.c delete mode 100644 drivers/staging/otus/80211core/cwm.c delete mode 100644 drivers/staging/otus/80211core/cwm.h delete mode 100644 drivers/staging/otus/80211core/freqctrl.c delete mode 100644 drivers/staging/otus/80211core/ledmgr.c delete mode 100644 drivers/staging/otus/80211core/performance.c delete mode 100644 drivers/staging/otus/80211core/performance.h delete mode 100644 drivers/staging/otus/80211core/pub_usb.h delete mode 100644 drivers/staging/otus/80211core/pub_zfi.h delete mode 100644 drivers/staging/otus/80211core/pub_zfw.h delete mode 100644 drivers/staging/otus/80211core/queue.c delete mode 100644 drivers/staging/otus/80211core/queue.h delete mode 100644 drivers/staging/otus/80211core/ratectrl.c delete mode 100644 drivers/staging/otus/80211core/ratectrl.h delete mode 100644 drivers/staging/otus/80211core/struct.h delete mode 100644 drivers/staging/otus/80211core/wlan.h delete mode 100644 drivers/staging/otus/Kconfig delete mode 100644 drivers/staging/otus/Makefile delete mode 100644 drivers/staging/otus/TODO delete mode 100644 drivers/staging/otus/apdbg.c delete mode 100644 drivers/staging/otus/athr_common.h delete mode 100644 drivers/staging/otus/hal/hpDKfwu.c delete mode 100644 drivers/staging/otus/hal/hpani.c delete mode 100644 drivers/staging/otus/hal/hpani.h delete mode 100644 drivers/staging/otus/hal/hpfw2.c delete mode 100644 drivers/staging/otus/hal/hpfwbu.c delete mode 100644 drivers/staging/otus/hal/hpfwspiu.c delete mode 100644 drivers/staging/otus/hal/hpfwu.c delete mode 100644 drivers/staging/otus/hal/hpfwu.c.drv_ba_resend delete mode 100644 drivers/staging/otus/hal/hpfwu_2k.c delete mode 100644 drivers/staging/otus/hal/hpfwu_BA.c delete mode 100644 drivers/staging/otus/hal/hpfwu_FB50_mdk.c delete mode 100644 drivers/staging/otus/hal/hpfwu_OTUS_RC.c delete mode 100644 drivers/staging/otus/hal/hpfwu_txstream.c delete mode 100644 drivers/staging/otus/hal/hpfwuinit.c delete mode 100644 drivers/staging/otus/hal/hpmain.c delete mode 100644 drivers/staging/otus/hal/hpreg.c delete mode 100644 drivers/staging/otus/hal/hpreg.h delete mode 100644 drivers/staging/otus/hal/hprw.c delete mode 100644 drivers/staging/otus/hal/hpusb.c delete mode 100644 drivers/staging/otus/hal/hpusb.h delete mode 100644 drivers/staging/otus/hal/otus.ini delete mode 100644 drivers/staging/otus/ioctl.c delete mode 100644 drivers/staging/otus/oal_dt.h delete mode 100644 drivers/staging/otus/oal_marc.h delete mode 100644 drivers/staging/otus/usbdrv.c delete mode 100644 drivers/staging/otus/usbdrv.h delete mode 100644 drivers/staging/otus/wrap_buf.c delete mode 100644 drivers/staging/otus/wrap_dbg.c delete mode 100644 drivers/staging/otus/wrap_ev.c delete mode 100644 drivers/staging/otus/wrap_mem.c delete mode 100644 drivers/staging/otus/wrap_mis.c delete mode 100644 drivers/staging/otus/wrap_pkt.c delete mode 100644 drivers/staging/otus/wrap_sec.c delete mode 100644 drivers/staging/otus/wrap_usb.c delete mode 100644 drivers/staging/otus/wwrap.c delete mode 100644 drivers/staging/otus/zdcompat.h delete mode 100644 drivers/staging/otus/zdusb.c delete mode 100644 drivers/staging/otus/zdusb.h delete mode 100644 drivers/staging/rtl8192su/Kconfig delete mode 100644 drivers/staging/rtl8192su/Makefile delete mode 100644 drivers/staging/rtl8192su/TODO delete mode 100644 drivers/staging/rtl8192su/authors delete mode 100644 drivers/staging/rtl8192su/ieee80211/Makefile delete mode 100644 drivers/staging/rtl8192su/ieee80211/dot11d.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/dot11d.h delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211.h delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt.h delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_ccmp.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_wep.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_module.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_r8192s.h delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/readme delete mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_BA.h delete mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h delete mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h delete mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_TS.h delete mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_TSProc.c delete mode 100644 drivers/staging/rtl8192su/r8192SU_HWImg.c delete mode 100644 drivers/staging/rtl8192su/r8192SU_HWImg.h delete mode 100644 drivers/staging/rtl8192su/r8192SU_led.c delete mode 100644 drivers/staging/rtl8192su/r8192SU_led.h delete mode 100644 drivers/staging/rtl8192su/r8192S_Efuse.c delete mode 100644 drivers/staging/rtl8192su/r8192S_Efuse.h delete mode 100644 drivers/staging/rtl8192su/r8192S_firmware.c delete mode 100644 drivers/staging/rtl8192su/r8192S_firmware.h delete mode 100644 drivers/staging/rtl8192su/r8192S_hw.h delete mode 100644 drivers/staging/rtl8192su/r8192S_phy.c delete mode 100644 drivers/staging/rtl8192su/r8192S_phy.h delete mode 100644 drivers/staging/rtl8192su/r8192S_phyreg.h delete mode 100644 drivers/staging/rtl8192su/r8192S_rtl6052.c delete mode 100644 drivers/staging/rtl8192su/r8192S_rtl6052.h delete mode 100644 drivers/staging/rtl8192su/r8192S_rtl8225.c delete mode 100644 drivers/staging/rtl8192su/r8192S_rtl8225.h delete mode 100644 drivers/staging/rtl8192su/r8192U.h delete mode 100644 drivers/staging/rtl8192su/r8192U_core.c delete mode 100644 drivers/staging/rtl8192su/r8192U_dm.c delete mode 100644 drivers/staging/rtl8192su/r8192U_dm.h delete mode 100644 drivers/staging/rtl8192su/r8192U_pm.c delete mode 100644 drivers/staging/rtl8192su/r8192U_pm.h delete mode 100644 drivers/staging/rtl8192su/r8192U_wx.c delete mode 100644 drivers/staging/rtl8192su/r8192U_wx.h delete mode 100644 drivers/staging/rtl8192su/r819xU_HTGen.h delete mode 100644 drivers/staging/rtl8192su/r819xU_HTType.h delete mode 100644 drivers/staging/rtl8192su/r819xU_cmdpkt.c delete mode 100644 drivers/staging/rtl8192su/r819xU_cmdpkt.h create mode 100644 drivers/staging/rtl8712/Kconfig create mode 100644 drivers/staging/rtl8712/Makefile create mode 100644 drivers/staging/rtl8712/TODO create mode 100644 drivers/staging/rtl8712/basic_types.h create mode 100644 drivers/staging/rtl8712/big_endian.h create mode 100644 drivers/staging/rtl8712/drv_types.h create mode 100644 drivers/staging/rtl8712/ethernet.h create mode 100644 drivers/staging/rtl8712/farray.h create mode 100644 drivers/staging/rtl8712/generic.h create mode 100644 drivers/staging/rtl8712/hal_init.c create mode 100644 drivers/staging/rtl8712/ieee80211.c create mode 100644 drivers/staging/rtl8712/ieee80211.h create mode 100644 drivers/staging/rtl8712/if_ether.h create mode 100644 drivers/staging/rtl8712/ip.h create mode 100644 drivers/staging/rtl8712/little_endian.h create mode 100644 drivers/staging/rtl8712/mlme_linux.c create mode 100644 drivers/staging/rtl8712/mlme_osdep.h create mode 100644 drivers/staging/rtl8712/mp_custom_oid.h create mode 100644 drivers/staging/rtl8712/os_intfs.c create mode 100644 drivers/staging/rtl8712/osdep_intf.h create mode 100644 drivers/staging/rtl8712/osdep_service.h create mode 100644 drivers/staging/rtl8712/recv_linux.c create mode 100644 drivers/staging/rtl8712/recv_osdep.h create mode 100644 drivers/staging/rtl8712/rtl8712_bitdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_cmd.c create mode 100644 drivers/staging/rtl8712/rtl8712_cmd.h create mode 100644 drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_cmdctrl_regdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_debugctrl_bitdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_debugctrl_regdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_edcasetting_bitdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_edcasetting_regdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_efuse.c create mode 100644 drivers/staging/rtl8712/rtl8712_efuse.h create mode 100644 drivers/staging/rtl8712/rtl8712_event.h create mode 100644 drivers/staging/rtl8712/rtl8712_fifoctrl_bitdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_fifoctrl_regdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_gp_bitdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_gp_regdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_hal.h create mode 100644 drivers/staging/rtl8712/rtl8712_interrupt_bitdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_io.c create mode 100644 drivers/staging/rtl8712/rtl8712_led.c create mode 100644 drivers/staging/rtl8712/rtl8712_macsetting_bitdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_macsetting_regdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_powersave_bitdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_powersave_regdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_ratectrl_bitdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_recv.c create mode 100644 drivers/staging/rtl8712/rtl8712_recv.h create mode 100644 drivers/staging/rtl8712/rtl8712_regdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_security_bitdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_spec.h create mode 100644 drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_syscfg_regdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_timectrl_regdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_wmac_bitdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_wmac_regdef.h create mode 100644 drivers/staging/rtl8712/rtl8712_xmit.c create mode 100644 drivers/staging/rtl8712/rtl8712_xmit.h create mode 100644 drivers/staging/rtl8712/rtl871x_byteorder.h create mode 100644 drivers/staging/rtl8712/rtl871x_cmd.c create mode 100644 drivers/staging/rtl8712/rtl871x_cmd.h create mode 100644 drivers/staging/rtl8712/rtl871x_debug.h create mode 100644 drivers/staging/rtl8712/rtl871x_eeprom.c create mode 100644 drivers/staging/rtl8712/rtl871x_eeprom.h create mode 100644 drivers/staging/rtl8712/rtl871x_event.h create mode 100644 drivers/staging/rtl8712/rtl871x_ht.h create mode 100644 drivers/staging/rtl8712/rtl871x_io.c create mode 100644 drivers/staging/rtl8712/rtl871x_io.h create mode 100644 drivers/staging/rtl8712/rtl871x_ioctl.h create mode 100644 drivers/staging/rtl8712/rtl871x_ioctl_linux.c create mode 100644 drivers/staging/rtl8712/rtl871x_ioctl_rtl.c create mode 100644 drivers/staging/rtl8712/rtl871x_ioctl_rtl.h create mode 100644 drivers/staging/rtl8712/rtl871x_ioctl_set.c create mode 100644 drivers/staging/rtl8712/rtl871x_ioctl_set.h create mode 100644 drivers/staging/rtl8712/rtl871x_led.h create mode 100644 drivers/staging/rtl8712/rtl871x_mlme.c create mode 100644 drivers/staging/rtl8712/rtl871x_mlme.h create mode 100644 drivers/staging/rtl8712/rtl871x_mp.c create mode 100644 drivers/staging/rtl8712/rtl871x_mp.h create mode 100644 drivers/staging/rtl8712/rtl871x_mp_ioctl.c create mode 100644 drivers/staging/rtl8712/rtl871x_mp_ioctl.h create mode 100644 drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h create mode 100644 drivers/staging/rtl8712/rtl871x_pwrctrl.c create mode 100644 drivers/staging/rtl8712/rtl871x_pwrctrl.h create mode 100644 drivers/staging/rtl8712/rtl871x_recv.c create mode 100644 drivers/staging/rtl8712/rtl871x_recv.h create mode 100644 drivers/staging/rtl8712/rtl871x_rf.h create mode 100644 drivers/staging/rtl8712/rtl871x_security.c create mode 100644 drivers/staging/rtl8712/rtl871x_security.h create mode 100644 drivers/staging/rtl8712/rtl871x_sta_mgt.c create mode 100644 drivers/staging/rtl8712/rtl871x_wlan_sme.h create mode 100644 drivers/staging/rtl8712/rtl871x_xmit.c create mode 100644 drivers/staging/rtl8712/rtl871x_xmit.h create mode 100644 drivers/staging/rtl8712/sta_info.h create mode 100644 drivers/staging/rtl8712/swab.h create mode 100644 drivers/staging/rtl8712/usb_halinit.c create mode 100644 drivers/staging/rtl8712/usb_intf.c create mode 100644 drivers/staging/rtl8712/usb_ops.c create mode 100644 drivers/staging/rtl8712/usb_ops.h create mode 100644 drivers/staging/rtl8712/usb_ops_linux.c create mode 100644 drivers/staging/rtl8712/usb_osintf.h create mode 100644 drivers/staging/rtl8712/usb_vendor_req.h create mode 100644 drivers/staging/rtl8712/wifi.h create mode 100644 drivers/staging/rtl8712/wlan_bssdef.h create mode 100644 drivers/staging/rtl8712/xmit_linux.c create mode 100644 drivers/staging/rtl8712/xmit_osdep.h create mode 100644 drivers/staging/sbe-2t3e3/2t3e3.h create mode 100644 drivers/staging/sbe-2t3e3/Kconfig create mode 100644 drivers/staging/sbe-2t3e3/Makefile create mode 100644 drivers/staging/sbe-2t3e3/TODO create mode 100644 drivers/staging/sbe-2t3e3/cpld.c create mode 100644 drivers/staging/sbe-2t3e3/ctrl.c create mode 100644 drivers/staging/sbe-2t3e3/ctrl.h create mode 100644 drivers/staging/sbe-2t3e3/dc.c create mode 100644 drivers/staging/sbe-2t3e3/exar7250.c create mode 100644 drivers/staging/sbe-2t3e3/exar7300.c create mode 100644 drivers/staging/sbe-2t3e3/intr.c create mode 100644 drivers/staging/sbe-2t3e3/io.c create mode 100644 drivers/staging/sbe-2t3e3/main.c create mode 100644 drivers/staging/sbe-2t3e3/maps.c create mode 100644 drivers/staging/sbe-2t3e3/module.c create mode 100644 drivers/staging/sbe-2t3e3/netdev.c rename {fs => drivers/staging}/smbfs/Kconfig (100%) rename {fs => drivers/staging}/smbfs/Makefile (50%) create mode 100644 drivers/staging/smbfs/TODO rename {fs => drivers/staging}/smbfs/cache.c (99%) rename {fs => drivers/staging}/smbfs/dir.c (99%) rename {fs => drivers/staging}/smbfs/file.c (99%) rename {fs => drivers/staging}/smbfs/getopt.c (100%) rename {fs => drivers/staging}/smbfs/getopt.h (100%) rename {fs => drivers/staging}/smbfs/inode.c (99%) rename {fs => drivers/staging}/smbfs/ioctl.c (96%) rename {fs => drivers/staging}/smbfs/proc.c (99%) rename {fs => drivers/staging}/smbfs/proto.h (100%) rename {fs => drivers/staging}/smbfs/request.c (99%) rename {fs => drivers/staging}/smbfs/request.h (100%) rename {include/linux => drivers/staging/smbfs}/smb.h (100%) rename {fs => drivers/staging}/smbfs/smb_debug.h (100%) rename {include/linux => drivers/staging/smbfs}/smb_fs.h (97%) rename {include/linux => drivers/staging/smbfs}/smb_fs_i.h (100%) rename {include/linux => drivers/staging/smbfs}/smb_fs_sb.h (98%) rename {include/linux => drivers/staging/smbfs}/smb_mount.h (100%) rename {Documentation/filesystems => drivers/staging/smbfs}/smbfs.txt (100%) rename {fs => drivers/staging}/smbfs/smbiod.c (98%) rename {include/linux => drivers/staging/smbfs}/smbno.h (100%) rename {fs => drivers/staging}/smbfs/sock.c (99%) rename {fs => drivers/staging}/smbfs/symlink.c (96%) create mode 100644 drivers/staging/speakup/DefaultKeyAssignments create mode 100644 drivers/staging/speakup/Kconfig create mode 100644 drivers/staging/speakup/Makefile create mode 100644 drivers/staging/speakup/TODO create mode 100644 drivers/staging/speakup/buffers.c create mode 100644 drivers/staging/speakup/devsynth.c create mode 100644 drivers/staging/speakup/fakekey.c create mode 100644 drivers/staging/speakup/i18n.c create mode 100644 drivers/staging/speakup/i18n.h create mode 100644 drivers/staging/speakup/keyhelp.c create mode 100644 drivers/staging/speakup/kobjects.c create mode 100644 drivers/staging/speakup/main.c create mode 100644 drivers/staging/speakup/selection.c create mode 100644 drivers/staging/speakup/serialio.c create mode 100644 drivers/staging/speakup/serialio.h create mode 100644 drivers/staging/speakup/speakup.h create mode 100644 drivers/staging/speakup/speakup_acnt.h create mode 100644 drivers/staging/speakup/speakup_acntpc.c create mode 100644 drivers/staging/speakup/speakup_acntsa.c create mode 100644 drivers/staging/speakup/speakup_apollo.c create mode 100644 drivers/staging/speakup/speakup_audptr.c create mode 100644 drivers/staging/speakup/speakup_bns.c create mode 100644 drivers/staging/speakup/speakup_decext.c create mode 100644 drivers/staging/speakup/speakup_decpc.c create mode 100644 drivers/staging/speakup/speakup_dectlk.c create mode 100644 drivers/staging/speakup/speakup_dtlk.c create mode 100644 drivers/staging/speakup/speakup_dtlk.h create mode 100644 drivers/staging/speakup/speakup_dummy.c create mode 100644 drivers/staging/speakup/speakup_keypc.c create mode 100644 drivers/staging/speakup/speakup_ltlk.c create mode 100644 drivers/staging/speakup/speakup_soft.c create mode 100644 drivers/staging/speakup/speakup_spkout.c create mode 100644 drivers/staging/speakup/speakup_txprt.c create mode 100644 drivers/staging/speakup/speakupmap.h create mode 100644 drivers/staging/speakup/speakupmap.map create mode 100644 drivers/staging/speakup/spk_priv.h create mode 100644 drivers/staging/speakup/spk_priv_keyinfo.h create mode 100644 drivers/staging/speakup/spk_types.h create mode 100644 drivers/staging/speakup/spkguide.txt create mode 100644 drivers/staging/speakup/synth.c create mode 100644 drivers/staging/speakup/thread.c create mode 100644 drivers/staging/speakup/varhandlers.c create mode 100644 drivers/staging/stradis/Kconfig create mode 100644 drivers/staging/stradis/Makefile create mode 100644 drivers/staging/stradis/TODO rename drivers/{media/video => staging/stradis}/stradis.c (100%) delete mode 100644 drivers/staging/ti-st/fm.h delete mode 100644 drivers/staging/ti-st/st.h delete mode 100644 drivers/staging/ti-st/st_core.h delete mode 100644 drivers/staging/ti-st/st_kim.h delete mode 100644 drivers/staging/ti-st/st_ll.h create mode 100644 drivers/staging/tidspbridge/core/dsp-mmu.c rename drivers/staging/tidspbridge/{services => core}/sync.c (85%) delete mode 100644 drivers/staging/tidspbridge/hw/EasiGlobal.h delete mode 100644 drivers/staging/tidspbridge/hw/MMUAccInt.h delete mode 100644 drivers/staging/tidspbridge/hw/MMURegAcM.h delete mode 100644 drivers/staging/tidspbridge/hw/hw_defs.h delete mode 100644 drivers/staging/tidspbridge/hw/hw_mmu.c delete mode 100644 drivers/staging/tidspbridge/hw/hw_mmu.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/cfg.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dmm.h create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dsp-mmu.h delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/services.h delete mode 100644 drivers/staging/tidspbridge/pmgr/dmm.c delete mode 100644 drivers/staging/tidspbridge/services/cfg.c delete mode 100644 drivers/staging/tidspbridge/services/ntfy.c delete mode 100644 drivers/staging/tidspbridge/services/services.c create mode 100644 drivers/staging/tm6000/TODO create mode 100644 drivers/staging/udlfb/udlfb.txt create mode 100644 drivers/staging/westbridge/Kconfig create mode 100644 drivers/staging/westbridge/TODO create mode 100644 drivers/staging/westbridge/astoria/Kconfig create mode 100644 drivers/staging/westbridge/astoria/Makefile create mode 100644 drivers/staging/westbridge/astoria/api/Makefile create mode 100644 drivers/staging/westbridge/astoria/api/src/cyasdma.c create mode 100644 drivers/staging/westbridge/astoria/api/src/cyasintr.c create mode 100644 drivers/staging/westbridge/astoria/api/src/cyaslep2pep.c create mode 100644 drivers/staging/westbridge/astoria/api/src/cyaslowlevel.c create mode 100644 drivers/staging/westbridge/astoria/api/src/cyasmisc.c create mode 100644 drivers/staging/westbridge/astoria/api/src/cyasmtp.c create mode 100644 drivers/staging/westbridge/astoria/api/src/cyasstorage.c create mode 100644 drivers/staging/westbridge/astoria/api/src/cyasusb.c create mode 100644 drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c create mode 100644 drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/cyashaldef.h create mode 100644 drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h create mode 100644 drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h create mode 100644 drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasomapdev_kernel.h create mode 100644 drivers/staging/westbridge/astoria/block/Kconfig create mode 100644 drivers/staging/westbridge/astoria/block/Makefile create mode 100644 drivers/staging/westbridge/astoria/block/cyasblkdev_block.c create mode 100644 drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c create mode 100644 drivers/staging/westbridge/astoria/block/cyasblkdev_queue.h create mode 100644 drivers/staging/westbridge/astoria/device/Kconfig create mode 100644 drivers/staging/westbridge/astoria/device/Makefile create mode 100644 drivers/staging/westbridge/astoria/device/cyandevice_export.h create mode 100644 drivers/staging/westbridge/astoria/device/cyasdevice.c create mode 100644 drivers/staging/westbridge/astoria/gadget/Kconfig create mode 100644 drivers/staging/westbridge/astoria/gadget/Makefile create mode 100644 drivers/staging/westbridge/astoria/gadget/cyasgadget.c create mode 100644 drivers/staging/westbridge/astoria/gadget/cyasgadget.h create mode 100644 drivers/staging/westbridge/astoria/gadget/cyasgadget_ioctl.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanerr.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanmedia.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanmisc.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanregs.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyansdkversion.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanstorage.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyantioch.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyantypes.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanusb.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyas_cplus_end.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyas_cplus_start.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyascast.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdevice.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdma.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyaserr.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyashal.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyashalcb.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyashaldoc.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasintr.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyaslep2pep.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyaslowlevel.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmedia.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmisc.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmisc_dep.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmtp.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasprotocol.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasregs.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasstorage.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasstorage_dep.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyastoria.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyastsdkversion.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyastypes.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasusb.h create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasusb_dep.h delete mode 100644 drivers/staging/winbond/mlme_s.h delete mode 100644 drivers/staging/winbond/scan_s.h delete mode 100644 drivers/staging/zram/zram_ioctl.h create mode 100644 drivers/staging/zram/zram_sysfs.c delete mode 100644 drivers/video/via/lcdtbl.h delete mode 100644 drivers/video/via/tbl1636.c delete mode 100644 drivers/video/via/tbl1636.h create mode 100644 drivers/watchdog/bcm63xx_wdt.c create mode 100644 fs/9p/acl.c create mode 100644 fs/9p/acl.h create mode 100644 fs/ext4/page-io.c create mode 100644 include/linux/amba/pl08x.h create mode 100644 include/linux/basic_mmio_gpio.h create mode 100644 include/linux/mfd/mc13xxx.h rename include/linux/{ => mmc}/sdhci-pltfm.h (93%) create mode 100644 include/linux/mmc/sdhci.h create mode 100644 include/linux/ramoops.h create mode 100644 include/linux/regulator/lp3972.h create mode 100644 include/linux/regulator/max8952.h create mode 100644 include/linux/spi/74x164.h create mode 100644 include/linux/ti_wilink_st.h delete mode 100644 include/linux/videotext.h create mode 100644 include/media/omap1_camera.h create mode 100644 include/media/s3c_fimc.h create mode 100644 include/media/sr030pc30.h delete mode 100644 include/media/v4l2-i2c-drv.h create mode 100644 include/net/caif/caif_shm.h rename scripts/coccinelle/{ => api}/alloc/drop_kmalloc_cast.cocci (100%) rename scripts/coccinelle/{ => api}/alloc/kzalloc-simple.cocci (87%) rename scripts/coccinelle/{ => api}/err_cast.cocci (100%) create mode 100644 scripts/coccinelle/api/kstrdup.cocci create mode 100644 scripts/coccinelle/api/memdup.cocci create mode 100644 scripts/coccinelle/api/memdup_user.cocci rename scripts/coccinelle/{ => api}/resource_size.cocci (100%) create mode 100644 scripts/coccinelle/free/kfree.cocci create mode 100644 scripts/coccinelle/iterators/fen.cocci create mode 100644 scripts/coccinelle/iterators/itnull.cocci create mode 100644 scripts/coccinelle/iterators/list_entry_update.cocci create mode 100644 scripts/coccinelle/locks/call_kern.cocci create mode 100644 scripts/coccinelle/locks/double_lock.cocci create mode 100644 scripts/coccinelle/locks/flags.cocci create mode 100644 scripts/coccinelle/locks/mini_lock.cocci create mode 100644 scripts/coccinelle/misc/doubleinit.cocci create mode 100644 scripts/coccinelle/misc/ifcol.cocci rename scripts/coccinelle/{ => null}/deref_null.cocci (100%) create mode 100644 scripts/coccinelle/null/eno.cocci create mode 100644 scripts/coccinelle/null/kmerr.cocci create mode 100644 scripts/coccinelle/tests/doublebitand.cocci create mode 100644 scripts/coccinelle/tests/doubletest.cocci create mode 100644 tools/perf/scripts/python/bin/futex-contention-record create mode 100644 tools/perf/scripts/python/bin/futex-contention-report create mode 100644 tools/perf/scripts/python/futex-contention.py delete mode 100644 usr/initramfs_data.bz2.S delete mode 100644 usr/initramfs_data.gz.S delete mode 100644 usr/initramfs_data.lzma.S delete mode 100644 usr/initramfs_data.lzo.S Merging fixes/fixes $ git merge fixes/fixes Already up-to-date. Merging arm-current/master $ git merge arm-current/master Merge made by recursive. arch/arm/include/asm/memblock.h | 7 ------- arch/arm/kernel/vmlinux.lds.S | 1 + arch/arm/mach-ixp2000/core.c | 2 +- arch/arm/mach-sa1100/cpu-sa1100.c | 5 ++--- arch/arm/mm/cache-fa.S | 12 ++++++++++++ arch/arm/mm/cache-v3.S | 10 ++++++++++ arch/arm/mm/cache-v4.S | 10 ++++++++++ arch/arm/mm/cache-v4wb.S | 12 ++++++++++++ arch/arm/mm/cache-v4wt.S | 12 ++++++++++++ arch/arm/mm/fault-armv.c | 28 ++++++++++++++++++++++++++-- arch/arm/mm/mmu.c | 18 ++++++++---------- arch/arm/mm/proc-arm1020.S | 15 +++++++++++++++ arch/arm/mm/proc-arm1020e.S | 15 +++++++++++++++ arch/arm/mm/proc-arm1022.S | 15 +++++++++++++++ arch/arm/mm/proc-arm1026.S | 15 +++++++++++++++ arch/arm/mm/proc-arm920.S | 12 ++++++++++++ arch/arm/mm/proc-arm922.S | 12 ++++++++++++ arch/arm/mm/proc-arm925.S | 12 ++++++++++++ arch/arm/mm/proc-arm926.S | 12 ++++++++++++ arch/arm/mm/proc-arm940.S | 12 ++++++++++++ arch/arm/mm/proc-arm946.S | 12 ++++++++++++ arch/arm/mm/proc-feroceon.S | 13 +++++++++++++ arch/arm/mm/proc-xsc3.S | 12 ++++++++++++ arch/arm/mm/proc-xscale.S | 12 ++++++++++++ 24 files changed, 263 insertions(+), 23 deletions(-) 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 Auto-merging arch/sparc/Kconfig Merge made by recursive. arch/sparc/Kconfig | 3 -- arch/sparc/include/asm/jump_label.h | 1 - arch/sparc/kernel/leon_smp.c | 4 +- arch/sparc/kernel/rtrap_32.S | 6 ++-- arch/sparc/kernel/rtrap_64.S | 36 ++-------------------------------- arch/sparc/mm/fault_32.c | 12 +++++++++++ 6 files changed, 20 insertions(+), 42 deletions(-) Merging scsi-rc-fixes/master $ git merge scsi-rc-fixes/master Already up-to-date. Merging net-current/master $ git merge net-current/master Auto-merging drivers/net/Kconfig Merge made by recursive. drivers/net/Kconfig | 1 + drivers/net/atarilance.c | 2 +- drivers/net/cxgb3/cxgb3_main.c | 2 +- drivers/net/cxgb3/sge.c | 4 +- drivers/net/e1000e/82571.c | 38 ++++++ drivers/net/e1000e/e1000.h | 3 + drivers/net/e1000e/netdev.c | 29 +++++- drivers/net/igb/igb_main.c | 1 - drivers/net/igbvf/netdev.c | 8 +- drivers/net/ixgb/ixgb_main.c | 1 + drivers/net/ixgbe/ixgbe_dcb.c | 39 ++++++- drivers/net/ixgbe/ixgbe_dcb.h | 5 +- drivers/net/ixgbe/ixgbe_dcb_82599.c | 5 + drivers/net/ixgbe/ixgbe_dcb_82599.h | 3 + drivers/net/ixgbe/ixgbe_main.c | 12 ++- drivers/net/lib8390.c | 1 - drivers/net/netxen/netxen_nic_ctx.c | 15 --- drivers/net/netxen/netxen_nic_main.c | 7 + drivers/net/stmmac/stmmac_main.c | 40 ++----- drivers/usb/gadget/u_ether.c | 2 +- include/linux/dccp.h | 4 +- include/linux/socket.h | 2 +- include/net/ip_fib.h | 2 + net/compat.c | 10 +- net/core/iovec.c | 20 ++-- net/core/pktgen.c | 7 +- net/dccp/ccid.h | 34 +++++- net/dccp/ccids/ccid2.c | 23 +++-- net/dccp/ccids/ccid2.h | 5 + net/dccp/ccids/ccid3.c | 12 +- net/dccp/dccp.h | 5 +- net/dccp/output.c | 209 ++++++++++++++++++++-------------- net/dccp/proto.c | 21 ++++- net/dccp/timer.c | 27 +++-- net/ipv4/fib_frontend.c | 2 +- net/ipv4/fib_hash.c | 18 +++ net/ipv4/fib_trie.c | 5 + 37 files changed, 420 insertions(+), 204 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 Merge made by recursive. drivers/net/wireless/ath/ath5k/attach.c | 17 +++++++-------- drivers/net/wireless/ath/ath9k/ath9k.h | 2 +- drivers/net/wireless/ath/ath9k/hif_usb.c | 10 +++++++- drivers/net/wireless/ath/ath9k/main.c | 31 ++++++++++++++++++++++++++++- drivers/net/wireless/ath/ath9k/recv.c | 15 ++++++------- drivers/net/wireless/ath/ath9k/xmit.c | 18 ++++++++-------- net/mac80211/main.c | 5 ++- 7 files changed, 65 insertions(+), 33 deletions(-) Merging kbuild-current/rc-fixes $ git merge kbuild-current/rc-fixes 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 gcl-current/merge $ git merge gcl-current/merge Already up-to-date. Merging arm/devel $ git merge arm/devel Auto-merging arch/arm/Kconfig Auto-merging arch/arm/mach-s3c64xx/Kconfig Removing arch/arm/mach-s5pc100/irq-gpio.c Auto-merging arch/arm/mach-shmobile/board-ap4evb.c Auto-merging arch/sh/boards/mach-ap325rxa/setup.c Auto-merging arch/sh/boards/mach-ecovec24/setup.c Auto-merging arch/sh/boards/mach-kfr2r09/setup.c Auto-merging arch/sh/boards/mach-migor/setup.c Auto-merging arch/sh/boards/mach-se/7724/setup.c Merge made by recursive. arch/arm/Kconfig | 12 + arch/arm/configs/mx51_defconfig | 1 + arch/arm/include/asm/hardware/cache-l2x0.h | 13 +- arch/arm/include/asm/outercache.h | 24 + arch/arm/kernel/machine_kexec.c | 3 + arch/arm/mach-imx/mach-mx27_3ds.c | 38 ++ arch/arm/mach-mx25/Kconfig | 1 + arch/arm/mach-mx25/mach-mx25_3ds.c | 10 + arch/arm/mach-mx3/Kconfig | 2 + arch/arm/mach-mx3/devices.c | 16 +- arch/arm/mach-mx3/mach-mx31_3ds.c | 38 +- arch/arm/mach-mx3/mach-mx35_3ds.c | 16 + arch/arm/mach-mx5/Kconfig | 2 + arch/arm/mach-mx5/Makefile | 1 + arch/arm/mach-mx5/board-mx51_babbage.c | 49 ++- arch/arm/mach-mx5/clock-mx51.c | 22 +- arch/arm/mach-mx5/cpu_op-mx51.c | 29 + arch/arm/mach-mx5/cpu_op-mx51.h | 14 + arch/arm/mach-mx5/devices-imx51.h | 2 + arch/arm/mach-omap2/omap4-common.c | 13 + arch/arm/mach-s3c2410/include/mach/gpio.h | 10 +- .../mach-s3c2410/include/mach/regs-s3c2443-clock.h | 2 + arch/arm/mach-s3c2410/include/mach/vmalloc.h | 2 +- arch/arm/mach-s3c2412/s3c2412.c | 3 +- arch/arm/mach-s3c2416/Kconfig | 6 + arch/arm/mach-s3c2416/Makefile | 2 +- arch/arm/mach-s3c2416/irq.c | 2 + arch/arm/mach-s3c2416/pm.c | 84 +++ arch/arm/mach-s3c2416/s3c2416.c | 3 +- arch/arm/mach-s3c2440/s3c244x.c | 3 +- arch/arm/mach-s3c2443/s3c2443.c | 3 +- arch/arm/mach-s3c24a0/include/mach/vmalloc.h | 2 +- arch/arm/mach-s3c64xx/Kconfig | 21 + arch/arm/mach-s3c64xx/Makefile | 1 + arch/arm/mach-s3c64xx/dev-audio.c | 63 +-- arch/arm/mach-s3c64xx/gpiolib.c | 8 +- arch/arm/mach-s3c64xx/include/mach/vmalloc.h | 2 +- arch/arm/mach-s3c64xx/mach-mini6410.c | 357 +++++++++++ arch/arm/mach-s3c64xx/mach-real6410.c | 198 ++++++- arch/arm/mach-s3c64xx/setup-fb-24bpp.c | 13 +- arch/arm/mach-s3c64xx/setup-ide.c | 11 +- arch/arm/mach-s3c64xx/setup-keypad.c | 16 +- arch/arm/mach-s3c64xx/setup-sdhci-gpio.c | 41 +- arch/arm/mach-s5p6442/Kconfig | 1 - arch/arm/mach-s5p6442/clock.c | 28 + arch/arm/mach-s5p6442/dev-audio.c | 30 +- arch/arm/mach-s5p6442/dev-spi.c | 6 +- arch/arm/mach-s5p6442/dma.c | 2 +- arch/arm/mach-s5p6442/include/mach/regs-clock.h | 1 + arch/arm/mach-s5p6442/include/mach/vmalloc.h | 2 +- arch/arm/mach-s5p64x0/Kconfig | 2 - arch/arm/mach-s5p64x0/clock-s5p6440.c | 19 +- arch/arm/mach-s5p64x0/clock-s5p6450.c | 19 +- arch/arm/mach-s5p64x0/clock.c | 18 - arch/arm/mach-s5p64x0/dev-audio.c | 26 +- arch/arm/mach-s5p64x0/dev-spi.c | 38 +- arch/arm/mach-s5p64x0/dma.c | 2 +- arch/arm/mach-s5p64x0/include/mach/regs-clock.h | 2 + arch/arm/mach-s5p64x0/include/mach/vmalloc.h | 2 +- arch/arm/mach-s5p64x0/setup-i2c0.c | 12 +- arch/arm/mach-s5p64x0/setup-i2c1.c | 12 +- arch/arm/mach-s5pc100/Kconfig | 1 - arch/arm/mach-s5pc100/Makefile | 2 +- arch/arm/mach-s5pc100/clock.c | 174 ++++-- arch/arm/mach-s5pc100/dev-audio.c | 86 ++- arch/arm/mach-s5pc100/dev-spi.c | 22 +- arch/arm/mach-s5pc100/dma.c | 4 +- arch/arm/mach-s5pc100/gpiolib.c | 216 +++----- arch/arm/mach-s5pc100/include/mach/gpio.h | 7 - arch/arm/mach-s5pc100/include/mach/irqs.h | 13 +- arch/arm/mach-s5pc100/include/mach/map.h | 2 + arch/arm/mach-s5pc100/include/mach/regs-gpio.h | 49 +-- arch/arm/mach-s5pc100/include/mach/vmalloc.h | 2 +- arch/arm/mach-s5pc100/irq-gpio.c | 266 -------- arch/arm/mach-s5pc100/mach-smdkc100.c | 4 + arch/arm/mach-s5pc100/setup-fb-24bpp.c | 30 +- arch/arm/mach-s5pc100/setup-i2c0.c | 6 +- arch/arm/mach-s5pc100/setup-i2c1.c | 6 +- arch/arm/mach-s5pc100/setup-ide.c | 41 +- arch/arm/mach-s5pc100/setup-keypad.c | 15 +- arch/arm/mach-s5pc100/setup-sdhci-gpio.c | 35 +- arch/arm/mach-s5pv210/Kconfig | 37 +- arch/arm/mach-s5pv210/Makefile | 3 + arch/arm/mach-s5pv210/clock.c | 207 ++++++- arch/arm/mach-s5pv210/cpu.c | 15 + arch/arm/mach-s5pv210/cpufreq.c | 484 +++++++++++++++ arch/arm/mach-s5pv210/dev-audio.c | 86 ++-- arch/arm/mach-s5pv210/dev-spi.c | 19 +- arch/arm/mach-s5pv210/dma.c | 4 +- arch/arm/mach-s5pv210/gpiolib.c | 14 +- arch/arm/mach-s5pv210/include/mach/irqs.h | 12 +- arch/arm/mach-s5pv210/include/mach/map.h | 12 + arch/arm/mach-s5pv210/include/mach/pm-core.h | 43 ++ arch/arm/mach-s5pv210/include/mach/regs-clock.h | 39 ++- arch/arm/mach-s5pv210/include/mach/regs-gpio.h | 7 - arch/arm/mach-s5pv210/include/mach/regs-sys.h | 19 + arch/arm/mach-s5pv210/include/mach/vmalloc.h | 2 +- arch/arm/mach-s5pv210/mach-aquila.c | 169 ++++++ arch/arm/mach-s5pv210/mach-goni.c | 381 ++++++++++++- arch/arm/mach-s5pv210/mach-smdkc110.c | 4 + arch/arm/mach-s5pv210/mach-smdkv210.c | 4 + arch/arm/mach-s5pv210/mach-torbreck.c | 131 ++++ arch/arm/mach-s5pv210/pm.c | 166 +++++ arch/arm/mach-s5pv210/setup-fb-24bpp.c | 34 +- arch/arm/mach-s5pv210/setup-i2c0.c | 6 +- arch/arm/mach-s5pv210/setup-i2c1.c | 6 +- arch/arm/mach-s5pv210/setup-i2c2.c | 6 +- arch/arm/mach-s5pv210/setup-ide.c | 49 +- arch/arm/mach-s5pv210/setup-keypad.c | 14 +- arch/arm/mach-s5pv210/setup-sdhci-gpio.c | 57 +-- arch/arm/mach-s5pv210/sleep.S | 170 ++++++ arch/arm/mach-s5pv310/Kconfig | 95 +++- arch/arm/mach-s5pv310/Makefile | 10 +- arch/arm/mach-s5pv310/clock.c | 635 +++++++++++++++++-- arch/arm/mach-s5pv310/cpu.c | 47 ++- arch/arm/mach-s5pv310/gpiolib.c | 304 ++++++++++ arch/arm/mach-s5pv310/hotplug.c | 144 +++++ arch/arm/mach-s5pv310/include/mach/irqs.h | 44 ++- arch/arm/mach-s5pv310/include/mach/map.h | 19 +- arch/arm/mach-s5pv310/include/mach/regs-clock.h | 32 +- arch/arm/mach-s5pv310/include/mach/regs-gpio.h | 42 ++ arch/arm/mach-s5pv310/include/mach/regs-srom.h | 50 ++ arch/arm/mach-s5pv310/include/mach/vmalloc.h | 2 +- arch/arm/mach-s5pv310/irq-combiner.c | 6 +- arch/arm/mach-s5pv310/irq-eint.c | 228 +++++++ arch/arm/mach-s5pv310/mach-smdkc210.c | 202 +++++++ arch/arm/mach-s5pv310/mach-smdkv310.c | 121 ++++- arch/arm/mach-s5pv310/mach-universal_c210.c | 81 +++- arch/arm/mach-s5pv310/setup-i2c0.c | 6 +- arch/arm/mach-s5pv310/setup-i2c1.c | 6 +- arch/arm/mach-s5pv310/setup-i2c2.c | 6 +- arch/arm/mach-s5pv310/setup-i2c3.c | 23 + arch/arm/mach-s5pv310/setup-i2c4.c | 23 + arch/arm/mach-s5pv310/setup-i2c5.c | 23 + arch/arm/mach-s5pv310/setup-i2c6.c | 23 + arch/arm/mach-s5pv310/setup-i2c7.c | 23 + arch/arm/mach-s5pv310/setup-sdhci-gpio.c | 152 +++++ arch/arm/mach-s5pv310/setup-sdhci.c | 69 +++ arch/arm/mach-shmobile/board-ap4evb.c | 326 +++++++---- arch/arm/mach-shmobile/clock-sh7367.c | 2 +- arch/arm/mach-shmobile/clock-sh7372.c | 78 ++- arch/arm/mach-shmobile/clock-sh7377.c | 2 +- arch/arm/mach-shmobile/include/mach/sh7372.h | 10 +- arch/arm/mach-shmobile/intc-sh7372.c | 28 + arch/arm/mach-shmobile/pfc-sh7372.c | 8 +- arch/arm/mach-shmobile/setup-sh7367.c | 1 - arch/arm/mach-shmobile/setup-sh7372.c | 94 +++- arch/arm/mach-shmobile/setup-sh7377.c | 1 - arch/arm/mach-ux500/cpu.c | 45 ++ arch/arm/mm/Kconfig | 8 + arch/arm/mm/cache-l2x0.c | 78 +++- arch/arm/mm/init.c | 155 ++++-- arch/arm/mm/mmu.c | 59 +- arch/arm/plat-mxc/Makefile | 1 + arch/arm/plat-mxc/cpufreq.c | 206 +++++++ arch/arm/plat-mxc/devices/Kconfig | 6 +- arch/arm/plat-mxc/devices/Makefile | 1 + arch/arm/plat-mxc/devices/platform-gpio_keys.c | 27 + arch/arm/plat-mxc/gpio.c | 32 + arch/arm/plat-mxc/include/mach/devices-common.h | 4 + arch/arm/plat-mxc/include/mach/iomux-mx51.h | 2 + arch/arm/plat-mxc/include/mach/mx31.h | 1 - arch/arm/plat-mxc/include/mach/mx35.h | 2 - arch/arm/plat-mxc/include/mach/mxc.h | 13 +- arch/arm/plat-s3c24xx/common-smdk.c | 2 +- arch/arm/plat-s3c24xx/gpiolib.c | 8 +- arch/arm/plat-s5p/Kconfig | 5 + arch/arm/plat-s5p/Makefile | 3 + arch/arm/plat-s5p/clock.c | 29 +- arch/arm/plat-s5p/include/plat/irqs.h | 18 + arch/arm/plat-s5p/include/plat/map-s5p.h | 40 +- arch/arm/plat-s5p/include/plat/s5p-clock.h | 4 + arch/arm/plat-s5p/irq-eint.c | 10 +- arch/arm/plat-s5p/irq-gpioint.c | 237 ++++++++ arch/arm/plat-s5p/irq-pm.c | 93 +++ arch/arm/plat-s5p/pm.c | 52 ++ arch/arm/plat-samsung/Kconfig | 25 + arch/arm/plat-samsung/Makefile | 5 + arch/arm/plat-samsung/dev-hsmmc.c | 8 +- arch/arm/plat-samsung/dev-hsmmc1.c | 8 +- arch/arm/plat-samsung/dev-hsmmc2.c | 8 +- arch/arm/plat-samsung/dev-hsmmc3.c | 12 +- arch/arm/plat-samsung/dev-i2c2.c | 4 +- arch/arm/plat-samsung/dev-i2c3.c | 68 +++ arch/arm/plat-samsung/dev-i2c4.c | 68 +++ arch/arm/plat-samsung/dev-i2c5.c | 68 +++ arch/arm/plat-samsung/dev-i2c6.c | 68 +++ arch/arm/plat-samsung/dev-i2c7.c | 68 +++ arch/arm/plat-samsung/gpio-config.c | 50 ++ arch/arm/plat-samsung/gpio.c | 8 + arch/arm/plat-samsung/include/plat/audio.h | 9 + arch/arm/plat-samsung/include/plat/devs.h | 7 + .../plat-samsung/include/plat/gpio-cfg-helpers.h | 6 + arch/arm/plat-samsung/include/plat/gpio-cfg.h | 56 ++ arch/arm/plat-samsung/include/plat/gpio-core.h | 15 + arch/arm/plat-samsung/include/plat/iic.h | 10 + arch/arm/plat-samsung/include/plat/map-base.h | 4 +- arch/arm/plat-samsung/include/plat/nand-core.h | 28 + arch/arm/plat-samsung/include/plat/sdhci.h | 64 ++ arch/arm/plat-samsung/pm-gpio.c | 4 +- arch/arm/plat-samsung/s3c-pl330.c | 34 +- arch/sh/boards/mach-ap325rxa/setup.c | 29 +- arch/sh/boards/mach-ecovec24/setup.c | 60 ++- arch/sh/boards/mach-kfr2r09/setup.c | 29 +- arch/sh/boards/mach-migor/setup.c | 58 +- arch/sh/boards/mach-se/7724/setup.c | 54 +- drivers/video/sh_mipi_dsi.c | 32 +- drivers/video/sh_mobile_hdmi.c | 629 +++++++++++++------- drivers/video/sh_mobile_lcdcfb.c | 348 +++++++---- drivers/video/sh_mobile_lcdcfb.h | 41 ++ include/video/sh_mobile_lcdc.h | 5 +- 211 files changed, 8600 insertions(+), 2059 deletions(-) create mode 100644 arch/arm/mach-mx5/cpu_op-mx51.c create mode 100644 arch/arm/mach-mx5/cpu_op-mx51.h create mode 100644 arch/arm/mach-s3c2416/pm.c create mode 100644 arch/arm/mach-s3c64xx/mach-mini6410.c delete mode 100644 arch/arm/mach-s5pc100/irq-gpio.c create mode 100644 arch/arm/mach-s5pv210/cpufreq.c create mode 100644 arch/arm/mach-s5pv210/include/mach/pm-core.h create mode 100644 arch/arm/mach-s5pv210/include/mach/regs-sys.h create mode 100644 arch/arm/mach-s5pv210/mach-torbreck.c create mode 100644 arch/arm/mach-s5pv210/pm.c create mode 100644 arch/arm/mach-s5pv210/sleep.S create mode 100644 arch/arm/mach-s5pv310/gpiolib.c create mode 100644 arch/arm/mach-s5pv310/hotplug.c create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-gpio.h create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-srom.h create mode 100644 arch/arm/mach-s5pv310/irq-eint.c create mode 100644 arch/arm/mach-s5pv310/mach-smdkc210.c create mode 100644 arch/arm/mach-s5pv310/setup-i2c3.c create mode 100644 arch/arm/mach-s5pv310/setup-i2c4.c create mode 100644 arch/arm/mach-s5pv310/setup-i2c5.c create mode 100644 arch/arm/mach-s5pv310/setup-i2c6.c create mode 100644 arch/arm/mach-s5pv310/setup-i2c7.c create mode 100644 arch/arm/mach-s5pv310/setup-sdhci-gpio.c create mode 100644 arch/arm/mach-s5pv310/setup-sdhci.c create mode 100644 arch/arm/plat-mxc/cpufreq.c create mode 100644 arch/arm/plat-mxc/devices/platform-gpio_keys.c create mode 100644 arch/arm/plat-s5p/irq-gpioint.c create mode 100644 arch/arm/plat-s5p/irq-pm.c create mode 100644 arch/arm/plat-s5p/pm.c create mode 100644 arch/arm/plat-samsung/dev-i2c3.c create mode 100644 arch/arm/plat-samsung/dev-i2c4.c create mode 100644 arch/arm/plat-samsung/dev-i2c5.c create mode 100644 arch/arm/plat-samsung/dev-i2c6.c create mode 100644 arch/arm/plat-samsung/dev-i2c7.c create mode 100644 arch/arm/plat-samsung/include/plat/nand-core.h create mode 100644 drivers/video/sh_mobile_lcdcfb.h Merging davinci/davinci-next $ git merge davinci/davinci-next Already up-to-date. Merging i.MX/for-next $ git merge i.MX/for-next Already up-to-date. Merging msm/for-next $ git merge msm/for-next Merge made by recursive. arch/arm/mach-msm/Kconfig | 9 +++++---- arch/arm/mach-msm/board-halibut.c | 1 - arch/arm/mach-msm/include/mach/debug-macro.S | 13 +++++++++++-- arch/arm/mach-msm/iommu_dev.c | 22 +++++++++++++--------- arch/arm/mach-msm/timer.c | 2 +- drivers/video/msm/mddi.c | 5 ++--- drivers/video/msm/mdp.c | 3 ++- 7 files changed, 34 insertions(+), 21 deletions(-) Merging omap/for-next $ git merge omap/for-next Already up-to-date. 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/mach-s3c2410/mach-h1940.c Auto-merging arch/arm/mach-s3c2440/mach-rx1950.c Merge made by recursive. arch/arm/mach-s3c2410/h1940-bluetooth.c | 13 +- arch/arm/mach-s3c2410/include/mach/h1940-latch.h | 57 ++---- arch/arm/mach-s3c2410/mach-h1940.c | 169 +++++++++++++++-- arch/arm/mach-s3c2440/mach-rx1950.c | 218 +++++++++++++++++++++- arch/arm/plat-s3c24xx/Kconfig | 1 + 5 files changed, 395 insertions(+), 63 deletions(-) Merging s5p/for-next $ git merge s5p/for-next Already up-to-date. Merging tegra/for-next $ git merge tegra/for-next Already up-to-date. Merging avr32/avr32-arch $ git merge avr32/avr32-arch Already up-to-date. Merging blackfin/for-linus $ git merge blackfin/for-linus Removing arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h Removing arch/blackfin/mach-bf518/include/mach/defBF51x_base.h Removing arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h Removing arch/blackfin/mach-bf527/include/mach/defBF52x_base.h Removing arch/blackfin/mach-bf533/include/mach/fio_flag.h Merge made by recursive. arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 113 ++ arch/blackfin/include/asm/bfin_dma.h | 91 + arch/blackfin/include/asm/bfin_serial.h | 263 +++ arch/blackfin/include/asm/dma.h | 37 +- arch/blackfin/include/asm/io.h | 268 +--- arch/blackfin/include/mach-common/ports-a.h | 25 + arch/blackfin/include/mach-common/ports-b.h | 25 + arch/blackfin/include/mach-common/ports-c.h | 25 + arch/blackfin/include/mach-common/ports-d.h | 25 + arch/blackfin/include/mach-common/ports-e.h | 25 + arch/blackfin/include/mach-common/ports-f.h | 25 + arch/blackfin/include/mach-common/ports-g.h | 25 + arch/blackfin/include/mach-common/ports-h.h | 25 + arch/blackfin/include/mach-common/ports-i.h | 25 + arch/blackfin/include/mach-common/ports-j.h | 25 + arch/blackfin/mach-bf518/dma.c | 2 +- .../blackfin/mach-bf518/include/mach/bfin_serial.h | 14 + .../mach-bf518/include/mach/bfin_serial_5xx.h | 73 +- arch/blackfin/mach-bf518/include/mach/blackfin.h | 68 +- arch/blackfin/mach-bf518/include/mach/cdefBF512.h | 1038 ++++++++++- arch/blackfin/mach-bf518/include/mach/cdefBF514.h | 5 +- arch/blackfin/mach-bf518/include/mach/cdefBF516.h | 5 +- arch/blackfin/mach-bf518/include/mach/cdefBF518.h | 5 +- .../mach-bf518/include/mach/cdefBF51x_base.h | 1061 ---------- arch/blackfin/mach-bf518/include/mach/defBF512.h | 1388 +++++++++++++- .../mach-bf518/include/mach/defBF51x_base.h | 1495 -------------- arch/blackfin/mach-bf518/include/mach/gpio.h | 4 + arch/blackfin/mach-bf527/dma.c | 2 +- .../blackfin/mach-bf527/include/mach/bfin_serial.h | 14 + .../mach-bf527/include/mach/bfin_serial_5xx.h | 73 +- arch/blackfin/mach-bf527/include/mach/blackfin.h | 48 +- arch/blackfin/mach-bf527/include/mach/cdefBF522.h | 1092 ++++++++++- arch/blackfin/mach-bf527/include/mach/cdefBF525.h | 7 +- arch/blackfin/mach-bf527/include/mach/cdefBF527.h | 7 +- .../mach-bf527/include/mach/cdefBF52x_base.h | 1113 ----------- arch/blackfin/mach-bf527/include/mach/defBF522.h | 1393 +++++++++++++- arch/blackfin/mach-bf527/include/mach/defBF525.h | 2 +- arch/blackfin/mach-bf527/include/mach/defBF527.h | 2 +- .../mach-bf527/include/mach/defBF52x_base.h | 1506 -------------- arch/blackfin/mach-bf527/include/mach/gpio.h | 4 + arch/blackfin/mach-bf533/boards/blackstamp.c | 15 +- arch/blackfin/mach-bf533/boards/ip0x.c | 9 - arch/blackfin/mach-bf533/boards/stamp.c | 20 +- arch/blackfin/mach-bf533/dma.c | 2 +- .../blackfin/mach-bf533/include/mach/bfin_serial.h | 14 + .../mach-bf533/include/mach/bfin_serial_5xx.h | 74 +- arch/blackfin/mach-bf533/include/mach/blackfin.h | 30 +- arch/blackfin/mach-bf533/include/mach/cdefBF532.h | 63 +- arch/blackfin/mach-bf533/include/mach/defBF532.h | 128 +-- arch/blackfin/mach-bf533/include/mach/fio_flag.h | 55 - arch/blackfin/mach-bf533/include/mach/gpio.h | 2 + arch/blackfin/mach-bf537/dma.c | 2 +- .../blackfin/mach-bf537/include/mach/bfin_serial.h | 14 + .../mach-bf537/include/mach/bfin_serial_5xx.h | 72 +- arch/blackfin/mach-bf537/include/mach/blackfin.h | 38 +- arch/blackfin/mach-bf537/include/mach/cdefBF534.h | 27 +- arch/blackfin/mach-bf537/include/mach/cdefBF537.h | 5 +- arch/blackfin/mach-bf537/include/mach/defBF534.h | 111 +- arch/blackfin/mach-bf537/include/mach/defBF537.h | 5 +- arch/blackfin/mach-bf537/include/mach/gpio.h | 4 + arch/blackfin/mach-bf538/dma.c | 18 +- .../blackfin/mach-bf538/include/mach/bfin_serial.h | 14 + .../mach-bf538/include/mach/bfin_serial_5xx.h | 73 +- arch/blackfin/mach-bf538/include/mach/blackfin.h | 37 +- arch/blackfin/mach-bf538/include/mach/cdefBF538.h | 504 ++--- arch/blackfin/mach-bf538/include/mach/cdefBF539.h | 8 +- arch/blackfin/mach-bf538/include/mach/defBF538.h | 1825 +++++++++++++++++ arch/blackfin/mach-bf538/include/mach/defBF539.h | 2095 +------------------- arch/blackfin/mach-bf538/include/mach/gpio.h | 5 + arch/blackfin/mach-bf548/dma.c | 2 +- .../blackfin/mach-bf548/include/mach/bfin_serial.h | 16 + .../mach-bf548/include/mach/bfin_serial_5xx.h | 60 +- arch/blackfin/mach-bf548/include/mach/blackfin.h | 70 +- arch/blackfin/mach-bf548/include/mach/cdefBF542.h | 10 +- arch/blackfin/mach-bf548/include/mach/cdefBF544.h | 10 +- arch/blackfin/mach-bf548/include/mach/cdefBF547.h | 10 +- arch/blackfin/mach-bf548/include/mach/cdefBF548.h | 10 +- arch/blackfin/mach-bf548/include/mach/cdefBF549.h | 10 +- .../mach-bf548/include/mach/cdefBF54x_base.h | 23 +- arch/blackfin/mach-bf548/include/mach/defBF542.h | 7 +- arch/blackfin/mach-bf548/include/mach/defBF544.h | 7 +- arch/blackfin/mach-bf548/include/mach/defBF547.h | 7 +- arch/blackfin/mach-bf548/include/mach/defBF548.h | 7 +- arch/blackfin/mach-bf548/include/mach/defBF549.h | 7 +- .../mach-bf548/include/mach/defBF54x_base.h | 321 +--- arch/blackfin/mach-bf548/include/mach/gpio.h | 11 + arch/blackfin/mach-bf561/dma.c | 18 +- .../blackfin/mach-bf561/include/mach/bfin_serial.h | 14 + .../mach-bf561/include/mach/bfin_serial_5xx.h | 74 +- arch/blackfin/mach-bf561/include/mach/blackfin.h | 26 +- arch/blackfin/mach-bf561/include/mach/cdefBF561.h | 503 ++--- arch/blackfin/mach-bf561/include/mach/defBF561.h | 408 ++--- arch/blackfin/mach-bf561/include/mach/gpio.h | 2 + arch/blackfin/mach-bf561/smp.c | 4 +- drivers/net/irda/bfin_sir.h | 2 + include/asm-generic/io.h | 30 + 96 files changed, 8439 insertions(+), 9942 deletions(-) create mode 100644 arch/blackfin/configs/BF561-EZKIT-SMP_defconfig create mode 100644 arch/blackfin/include/asm/bfin_dma.h create mode 100644 arch/blackfin/include/asm/bfin_serial.h create mode 100644 arch/blackfin/include/mach-common/ports-a.h create mode 100644 arch/blackfin/include/mach-common/ports-b.h create mode 100644 arch/blackfin/include/mach-common/ports-c.h create mode 100644 arch/blackfin/include/mach-common/ports-d.h create mode 100644 arch/blackfin/include/mach-common/ports-e.h create mode 100644 arch/blackfin/include/mach-common/ports-f.h create mode 100644 arch/blackfin/include/mach-common/ports-g.h create mode 100644 arch/blackfin/include/mach-common/ports-h.h create mode 100644 arch/blackfin/include/mach-common/ports-i.h create mode 100644 arch/blackfin/include/mach-common/ports-j.h create mode 100644 arch/blackfin/mach-bf518/include/mach/bfin_serial.h delete mode 100644 arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h delete mode 100644 arch/blackfin/mach-bf518/include/mach/defBF51x_base.h create mode 100644 arch/blackfin/mach-bf527/include/mach/bfin_serial.h delete mode 100644 arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h delete mode 100644 arch/blackfin/mach-bf527/include/mach/defBF52x_base.h create mode 100644 arch/blackfin/mach-bf533/include/mach/bfin_serial.h delete mode 100644 arch/blackfin/mach-bf533/include/mach/fio_flag.h create mode 100644 arch/blackfin/mach-bf537/include/mach/bfin_serial.h create mode 100644 arch/blackfin/mach-bf538/include/mach/bfin_serial.h create mode 100644 arch/blackfin/mach-bf538/include/mach/defBF538.h create mode 100644 arch/blackfin/mach-bf548/include/mach/bfin_serial.h create mode 100644 arch/blackfin/mach-bf561/include/mach/bfin_serial.h Merging cris/for-next $ git merge cris/for-next Merge made by recursive. drivers/serial/crisv10.c | 23 +++++++++++++++-------- 1 files changed, 15 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 Merge made by recursive. arch/m68k/include/asm/cacheflush_no.h | 30 ++------- arch/m68k/include/asm/m5407sim.h | 34 ---------- arch/m68k/include/asm/m54xxacr.h | 118 +++++++++++++++++++++++++++++++++ arch/m68k/include/asm/mcfcache.h | 22 ++++--- 4 files changed, 137 insertions(+), 67 deletions(-) create mode 100644 arch/m68k/include/asm/m54xxacr.h Merging microblaze/next $ git merge microblaze/next Already up-to-date. Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Resolved 'drivers/usb/host/Kconfig' using previous resolution. Resolved 'drivers/usb/host/Makefile' using previous resolution. Auto-merging arch/mips/Kconfig Auto-merging arch/mips/cavium-octeon/serial.c Auto-merging arch/mips/kernel/setup.c Auto-merging drivers/usb/host/Kconfig CONFLICT (content): Merge conflict in drivers/usb/host/Kconfig Auto-merging drivers/usb/host/Makefile CONFLICT (content): Merge conflict in drivers/usb/host/Makefile Auto-merging drivers/usb/host/ehci-hcd.c Auto-merging drivers/usb/host/ohci-hcd.c Auto-merging drivers/watchdog/octeon-wdt-main.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master a561c75] Merge remote branch 'mips/mips-for-linux-next' $ git diff -M --stat --summary HEAD^.. arch/mips/Kconfig | 5 + arch/mips/Kconfig.debug | 9 + arch/mips/Makefile | 4 +- arch/mips/cavium-octeon/Kconfig | 23 + arch/mips/cavium-octeon/csrc-octeon.c | 34 +- arch/mips/cavium-octeon/dma-octeon.c | 581 +++++++------- arch/mips/cavium-octeon/executive/cvmx-l2c.c | 810 +++++++++++-------- arch/mips/cavium-octeon/octeon-platform.c | 112 +++- arch/mips/cavium-octeon/serial.c | 2 +- arch/mips/cavium-octeon/setup.c | 120 ++- arch/mips/include/asm/atomic.h | 208 +++--- arch/mips/include/asm/bitops.h | 270 +++---- arch/mips/include/asm/bootinfo.h | 12 + arch/mips/include/asm/cmpxchg.h | 7 +- arch/mips/include/asm/cpu.h | 3 +- arch/mips/include/asm/device.h | 15 +- arch/mips/include/asm/dma-mapping.h | 96 ++- arch/mips/include/asm/dma.h | 3 + .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 8 +- .../include/asm/mach-cavium-octeon/dma-coherence.h | 24 +- arch/mips/include/asm/mach-ip27/dma-coherence.h | 5 +- arch/mips/include/asm/mach-ip32/dma-coherence.h | 5 +- arch/mips/include/asm/mach-jazz/dma-coherence.h | 9 +- arch/mips/include/asm/octeon/cvmx-agl-defs.h | 616 ++++++++++----- arch/mips/include/asm/octeon/cvmx-asm.h | 11 + arch/mips/include/asm/octeon/cvmx-ciu-defs.h | 857 ++++++++++++++++++-- arch/mips/include/asm/octeon/cvmx-gpio-defs.h | 74 ++- arch/mips/include/asm/octeon/cvmx-iob-defs.h | 242 ++++-- arch/mips/include/asm/octeon/cvmx-ipd-defs.h | 314 +++++--- arch/mips/include/asm/octeon/cvmx-l2c-defs.h | 738 +++++++++++++++-- arch/mips/include/asm/octeon/cvmx-l2c.h | 225 +++--- arch/mips/include/asm/octeon/cvmx-l2d-defs.h | 38 +- arch/mips/include/asm/octeon/cvmx-l2t-defs.h | 5 +- arch/mips/include/asm/octeon/cvmx-led-defs.h | 41 +- arch/mips/include/asm/octeon/cvmx-mio-defs.h | 807 ++++++++++++++----- arch/mips/include/asm/octeon/cvmx-mixx-defs.h | 200 ++++-- arch/mips/include/asm/octeon/cvmx-npei-defs.h | 681 +++++++--------- arch/mips/include/asm/octeon/cvmx-npi-defs.h | 362 +++------ arch/mips/include/asm/octeon/cvmx-pci-defs.h | 265 ++---- arch/mips/include/asm/octeon/cvmx-pciercx-defs.h | 435 +++++++---- arch/mips/include/asm/octeon/cvmx-pescx-defs.h | 50 +- arch/mips/include/asm/octeon/cvmx-pexp-defs.h | 378 +++++----- arch/mips/include/asm/octeon/cvmx-pow-defs.h | 157 +++-- arch/mips/include/asm/octeon/cvmx-rnm-defs.h | 67 ++- arch/mips/include/asm/octeon/cvmx-smix-defs.h | 46 +- arch/mips/include/asm/octeon/cvmx-uctlx-defs.h | 261 ++++++ arch/mips/include/asm/octeon/octeon-model.h | 36 +- arch/mips/include/asm/octeon/octeon.h | 1 + arch/mips/include/asm/octeon/pci-octeon.h | 10 + arch/mips/include/asm/system.h | 52 +- arch/mips/include/asm/thread_info.h | 2 + arch/mips/kernel/cpu-probe.c | 7 + arch/mips/kernel/irq.c | 24 + arch/mips/kernel/setup.c | 1 + arch/mips/loongson/Kconfig | 2 - arch/mips/mm/c-octeon.c | 16 +- arch/mips/mm/c-r4k.c | 21 +- arch/mips/mm/dma-default.c | 165 ++--- arch/mips/mm/uasm.c | 20 +- arch/mips/pci/pci-octeon.c | 60 ++- arch/mips/pci/pcie-octeon.c | 5 + drivers/ata/pata_octeon_cf.c | 2 +- drivers/usb/host/Kconfig | 27 +- drivers/usb/host/Makefile | 1 + drivers/usb/host/ehci-hcd.c | 5 + drivers/usb/host/ehci-octeon.c | 207 +++++ drivers/usb/host/octeon2-common.c | 185 +++++ drivers/usb/host/ohci-hcd.c | 5 + drivers/usb/host/ohci-octeon.c | 214 +++++ drivers/watchdog/octeon-wdt-main.c | 4 +- 70 files changed, 6904 insertions(+), 3403 deletions(-) create mode 100644 arch/mips/include/asm/octeon/cvmx-uctlx-defs.h create mode 100644 drivers/usb/host/ehci-octeon.c create mode 100644 drivers/usb/host/octeon2-common.c create mode 100644 drivers/usb/host/ohci-octeon.c Merging parisc/next $ git merge parisc/next Already up-to-date. Merging powerpc/next $ git merge powerpc/next Already up-to-date. Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging 52xx-and-virtex/next $ git merge 52xx-and-virtex/next Auto-merging arch/powerpc/platforms/Kconfig Auto-merging arch/powerpc/sysdev/mpc8xxx_gpio.c Merge made by recursive. arch/powerpc/platforms/Kconfig | 7 ++- arch/powerpc/sysdev/mpc8xxx_gpio.c | 75 ++++++++++++++++++++++++++++++++---- 2 files changed, 71 insertions(+), 11 deletions(-) Merging galak/next $ git merge galak/next Already up-to-date. Merging s390/features $ git merge s390/features Merge made by recursive. arch/s390/kernel/setup.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) Merging sh/master $ git merge sh/master Already up-to-date. Merging genesis/master $ git merge genesis/master Already up-to-date. Merging sparc/master $ git merge sparc/master Already up-to-date. Merging tile/master $ git merge tile/master Already up-to-date. Merging xtensa/master $ git merge xtensa/master Resolved 'arch/xtensa/configs/iss_defconfig' using previous resolution. Auto-merging arch/xtensa/Kconfig Auto-merging arch/xtensa/Makefile Auto-merging arch/xtensa/configs/iss_defconfig CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig Auto-merging arch/xtensa/include/asm/coprocessor.h Auto-merging arch/xtensa/kernel/Makefile Auto-merging arch/xtensa/kernel/time.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 0f91ccb] Merge remote branch 'xtensa/master' $ git diff -M --stat --summary HEAD^.. arch/xtensa/Kconfig | 17 +- arch/xtensa/Makefile | 5 +- arch/xtensa/boot/Makefile | 1 + arch/xtensa/include/asm/coprocessor.h | 9 +- arch/xtensa/include/asm/io.h | 40 ++-- arch/xtensa/include/asm/irq.h | 7 +- arch/xtensa/include/asm/serial.h | 12 +- arch/xtensa/kernel/Makefile | 4 +- arch/xtensa/kernel/time.c | 2 +- arch/xtensa/platforms/xtavnet/Makefile | 10 + .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++ .../platforms/xtavnet/include/platform/lcd.h | 22 ++ .../platforms/xtavnet/include/platform/serial.h | 1 + arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++ arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++ 15 files changed, 526 insertions(+), 37 deletions(-) create mode 100644 arch/xtensa/platforms/xtavnet/Makefile create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c create mode 100644 arch/xtensa/platforms/xtavnet/setup.c Merging ceph/for-next $ git merge ceph/for-next Already up-to-date. Merging cifs/master $ git merge cifs/master Auto-merging fs/cifs/file.c Merge made by recursive. fs/cifs/Kconfig | 3 + fs/cifs/cifsencrypt.c | 390 +++++++++++++++++++++++++++++++++++++------------ fs/cifs/cifsfs.c | 1 - fs/cifs/cifsfs.h | 2 +- fs/cifs/cifsglob.h | 49 +++++-- fs/cifs/cifspdu.h | 13 ++- fs/cifs/cifsproto.h | 14 +- fs/cifs/connect.c | 36 ++++- fs/cifs/file.c | 57 +++----- fs/cifs/inode.c | 15 +-- fs/cifs/misc.c | 2 +- fs/cifs/sess.c | 133 ++++++++---------- fs/cifs/transport.c | 6 +- 13 files changed, 470 insertions(+), 251 deletions(-) Merging configfs/linux-next $ git merge configfs/linux-next Already up-to-date. Merging ecryptfs/next $ git merge ecryptfs/next Auto-merging fs/ecryptfs/ecryptfs_kernel.h Merge made by recursive. fs/ecryptfs/ecryptfs_kernel.h | 1 + fs/ecryptfs/inode.c | 11 ++++++--- fs/ecryptfs/keystore.c | 45 ++++++++++++++++++++++++++++++++++------ fs/ecryptfs/main.c | 8 ++++++- fs/ecryptfs/super.c | 2 + 5 files changed, 55 insertions(+), 12 deletions(-) Merging ext3/for_next $ git merge ext3/for_next Already up-to-date. Merging ext4/next $ git merge ext4/next Already up-to-date. Merging fatfs/master $ git merge fatfs/master Already up-to-date. Merging fuse/for-next $ git merge fuse/for-next Already up-to-date. Merging gfs2/master $ git merge gfs2/master Already up-to-date. Merging hfsplus/for-next $ git merge hfsplus/for-next Already up-to-date. Merging jfs/next $ git merge jfs/next Already up-to-date. Merging logfs/master $ git merge logfs/master Resolved 'fs/logfs/logfs.h' using previous resolution. Auto-merging fs/logfs/dir.c Auto-merging fs/logfs/file.c Auto-merging fs/logfs/logfs.h CONFLICT (content): Merge conflict in fs/logfs/logfs.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 01ec8f2] Merge remote branch 'logfs/master' $ git diff -M --stat --summary HEAD^.. Merging nfs/linux-next $ git merge nfs/linux-next Already up-to-date. Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Already up-to-date. Merging nilfs2/for-next $ git merge nilfs2/for-next Already up-to-date. Merging ocfs2/linux-next $ git merge ocfs2/linux-next Already up-to-date. Merging omfs/for-next $ git merge omfs/for-next Already up-to-date. Merging squashfs/master $ git merge squashfs/master Merge made by recursive. fs/squashfs/xattr.c | 9 +++++---- fs/squashfs/xattr.h | 4 ++-- fs/squashfs/xattr_id.c | 1 + 3 files changed, 8 insertions(+), 6 deletions(-) Merging udf/for_next $ git merge udf/for_next Already up-to-date. Merging v9fs/for-next $ git merge v9fs/for-next Already up-to-date. Merging ubifs/linux-next $ git merge ubifs/linux-next Already up-to-date. Merging xfs/master $ git merge xfs/master Already up-to-date. Merging vfs/for-next $ git merge vfs/for-next Already up-to-date. Merging pci/linux-next $ git merge pci/linux-next Already up-to-date. Merging hid/for-next $ git merge hid/for-next Already up-to-date. Merging quilt/i2c $ git merge quilt/i2c Already up-to-date. Merging bjdooks-i2c/next-i2c $ git merge bjdooks-i2c/next-i2c Auto-merging drivers/i2c/busses/Kconfig Merge made by recursive. drivers/i2c/busses/Kconfig | 9 + drivers/i2c/busses/Makefile | 1 + drivers/i2c/busses/i2c-intel-mid.c | 1135 ++++++++++++++++++++++++++++++++++++ drivers/i2c/busses/i2c-nomadik.c | 36 +- drivers/i2c/busses/i2c-s3c2410.c | 10 +- 5 files changed, 1175 insertions(+), 16 deletions(-) create mode 100644 drivers/i2c/busses/i2c-intel-mid.c Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Auto-merging MAINTAINERS Merge made by recursive. Merging hwmon-staging/hwmon-next $ git merge hwmon-staging/hwmon-next Already up-to-date. Merging quilt/kernel-doc $ git merge quilt/kernel-doc Resolved 'lib/idr.c' using previous resolution. Auto-merging lib/idr.c CONFLICT (content): Merge conflict in lib/idr.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 6776669] Merge branch 'quilt/kernel-doc' $ git diff -M --stat --summary HEAD^.. Merging v4l-dvb/master $ git merge v4l-dvb/master Already up-to-date. Merging kbuild/for-next $ git merge kbuild/for-next Already up-to-date! Merge made by recursive. Merging kconfig/for-next $ git merge kconfig/for-next Already up-to-date! Merge made by recursive. 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 Already up-to-date. Merging acpi/test $ git merge acpi/test Already up-to-date. Merging idle-test/idle-test $ git merge idle-test/idle-test Already up-to-date. Merging ieee1394/for-next $ git merge ieee1394/for-next Already up-to-date! Merge made by recursive. Merging ubi/linux-next $ git merge ubi/linux-next Already up-to-date. Merging kvm/linux-next $ git merge kvm/linux-next Merge made by recursive. arch/x86/kvm/mmu.c | 9 +++++---- arch/x86/kvm/x86.c | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) Merging dlm/next $ git merge dlm/next Already up-to-date. Merging swiotlb/master $ git merge swiotlb/master Already up-to-date. Merging ibft/master $ git merge ibft/master Already up-to-date. Merging scsi/master $ git merge scsi/master Merge made by recursive. Documentation/scsi/ChangeLog.megaraid_sas | 47 +++ drivers/s390/scsi/zfcp_fc.h | 2 +- drivers/s390/scsi/zfcp_fsf.c | 3 - drivers/s390/scsi/zfcp_unit.c | 4 +- drivers/scsi/bfa/bfa.h | 48 ++-- drivers/scsi/bfa/bfa_cb_ioim.h | 22 +- drivers/scsi/bfa/bfa_core.c | 178 +++++----- drivers/scsi/bfa/bfa_cs.h | 24 +- drivers/scsi/bfa/bfa_defs.h | 54 ++-- drivers/scsi/bfa/bfa_defs_fcs.h | 48 ++-- drivers/scsi/bfa/bfa_defs_svc.h | 82 +++--- drivers/scsi/bfa/bfa_drv.c | 6 +- drivers/scsi/bfa/bfa_fc.h | 30 +- drivers/scsi/bfa/bfa_fcbuild.c | 196 ++++++------ drivers/scsi/bfa/bfa_fcpim.c | 351 ++++++++++---------- drivers/scsi/bfa/bfa_fcpim.h | 18 +- drivers/scsi/bfa/bfa_fcs.c | 335 ++++--------------- drivers/scsi/bfa/bfa_fcs.h | 43 +-- drivers/scsi/bfa/bfa_fcs_fcpim.c | 34 +- drivers/scsi/bfa/bfa_fcs_lport.c | 468 +++++++++++--------------- drivers/scsi/bfa/bfa_fcs_rport.c | 198 ++++++------ drivers/scsi/bfa/bfa_hw_cb.c | 16 +- drivers/scsi/bfa/bfa_hw_ct.c | 22 +- drivers/scsi/bfa/bfa_ioc.c | 397 +++++++++++----------- drivers/scsi/bfa/bfa_ioc.h | 108 +++--- drivers/scsi/bfa/bfa_ioc_cb.c | 90 +++--- drivers/scsi/bfa/bfa_ioc_ct.c | 167 +++++----- drivers/scsi/bfa/bfa_modules.h | 6 +- drivers/scsi/bfa/bfa_os_inc.h | 82 +---- drivers/scsi/bfa/bfa_port.c | 40 ++-- drivers/scsi/bfa/bfa_svc.c | 504 ++++++++++++++-------------- drivers/scsi/bfa/bfa_svc.h | 41 ++-- drivers/scsi/bfa/bfad.c | 73 +---- drivers/scsi/bfa/bfad_attr.c | 38 +- drivers/scsi/bfa/bfad_debugfs.c | 4 +- drivers/scsi/bfa/bfad_drv.h | 5 +- drivers/scsi/bfa/bfad_im.c | 71 ++-- drivers/scsi/bfa/bfi.h | 58 ++-- drivers/scsi/bfa/bfi_ms.h | 50 ++-- drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 3 + drivers/scsi/device_handler/scsi_dh_rdac.c | 2 + drivers/scsi/fcoe/fcoe.c | 18 +- drivers/scsi/fcoe/libfcoe.c | 2 +- drivers/scsi/gdth.c | 8 + drivers/scsi/ipr.c | 2 + drivers/scsi/ipr.h | 1 + drivers/scsi/libfc/fc_disc.c | 5 +- drivers/scsi/libfc/fc_fcp.c | 24 +- drivers/scsi/libfc/fc_lport.c | 12 +- drivers/scsi/libfc/fc_rport.c | 4 +- drivers/scsi/lpfc/lpfc.h | 12 +- drivers/scsi/lpfc/lpfc_attr.c | 7 +- drivers/scsi/lpfc/lpfc_bsg.c | 4 +- drivers/scsi/lpfc/lpfc_crtn.h | 4 + drivers/scsi/lpfc/lpfc_els.c | 439 +++++++++++++++++++++---- drivers/scsi/lpfc/lpfc_hbadisc.c | 437 +++++++++++++++++------- drivers/scsi/lpfc/lpfc_hw.h | 41 +++ drivers/scsi/lpfc/lpfc_hw4.h | 167 ++++------ drivers/scsi/lpfc/lpfc_init.c | 102 ++++-- drivers/scsi/lpfc/lpfc_mbox.c | 28 ++ drivers/scsi/lpfc/lpfc_scsi.c | 9 +- drivers/scsi/lpfc/lpfc_sli.c | 458 +++++++++++++++---------- drivers/scsi/lpfc/lpfc_sli4.h | 9 +- drivers/scsi/lpfc/lpfc_version.h | 2 +- drivers/scsi/megaraid/megaraid_sas.c | 126 +++++++- drivers/scsi/megaraid/megaraid_sas.h | 7 +- drivers/scsi/osd/osd_initiator.c | 244 +++++++++++++- drivers/scsi/pmcraid.h | 1 - drivers/scsi/qla2xxx/qla_attr.c | 4 + drivers/scsi/qla2xxx/qla_bsg.c | 125 +++++++ drivers/scsi/qla2xxx/qla_bsg.h | 2 + drivers/scsi/qla2xxx/qla_def.h | 2 - drivers/scsi/qla2xxx/qla_gbl.h | 1 + drivers/scsi/qla2xxx/qla_init.c | 28 +- drivers/scsi/qla2xxx/qla_iocb.c | 4 +- drivers/scsi/qla2xxx/qla_isr.c | 21 +- drivers/scsi/qla2xxx/qla_os.c | 207 ++++++------ drivers/scsi/qla4xxx/ql4_dbg.c | 101 ++++++ drivers/scsi/qla4xxx/ql4_def.h | 20 +- drivers/scsi/qla4xxx/ql4_fw.h | 3 + drivers/scsi/qla4xxx/ql4_glbl.h | 1 + drivers/scsi/qla4xxx/ql4_init.c | 10 +- drivers/scsi/qla4xxx/ql4_iocb.c | 10 +- drivers/scsi/qla4xxx/ql4_isr.c | 16 +- drivers/scsi/qla4xxx/ql4_mbx.c | 11 +- drivers/scsi/qla4xxx/ql4_nx.c | 89 +++--- drivers/scsi/qla4xxx/ql4_nx.h | 5 +- drivers/scsi/qla4xxx/ql4_os.c | 109 ++++--- drivers/scsi/qla4xxx/ql4_version.h | 2 +- drivers/scsi/scsi_lib.c | 3 +- drivers/scsi/scsi_sysfs.c | 3 +- drivers/scsi/sd.c | 23 ++ drivers/scsi/sr_ioctl.c | 9 + include/scsi/libfc.h | 2 +- include/scsi/osd_initiator.h | 16 +- include/scsi/osd_protocol.h | 42 +++ include/scsi/osd_types.h | 5 + 97 files changed, 4031 insertions(+), 2984 deletions(-) Merging async_tx/next $ git merge async_tx/next Already up-to-date. Merging net/master $ git merge net/master Already up-to-date. Merging wireless/master $ git merge wireless/master Already up-to-date. Merging bluetooth/master $ git merge bluetooth/master Auto-merging net/bluetooth/l2cap.c Merge made by recursive. drivers/bluetooth/btusb.c | 2 ++ net/bluetooth/hci_event.c | 6 ++++++ net/bluetooth/hidp/Kconfig | 2 +- net/bluetooth/l2cap.c | 8 ++++---- 4 files changed, 13 insertions(+), 5 deletions(-) Merging mtd/master $ git merge mtd/master Resolved 'drivers/mtd/mtd_blkdevs.c' using previous resolution. Auto-merging arch/powerpc/Kconfig Auto-merging drivers/mtd/chips/cfi_cmdset_0002.c Auto-merging drivers/mtd/devices/m25p80.c Auto-merging drivers/mtd/maps/Kconfig Auto-merging drivers/mtd/maps/pcmciamtd.c Auto-merging drivers/mtd/maps/physmap_of.c Auto-merging drivers/mtd/mtd_blkdevs.c CONFLICT (content): Merge conflict in drivers/mtd/mtd_blkdevs.c Auto-merging drivers/mtd/mtdchar.c Auto-merging drivers/mtd/nand/davinci_nand.c Auto-merging drivers/mtd/nand/omap2.c Auto-merging drivers/mtd/ofpart.c Auto-merging fs/jffs2/dir.c Auto-merging fs/jffs2/fs.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 4bfc105] Merge remote branch 'mtd/master' $ git diff -M --stat --summary HEAD^.. arch/arm/mach-u300/clock.c | 6 +- arch/arm/mach-u300/core.c | 47 +- arch/arm/mach-u300/include/mach/u300-regs.h | 2 - arch/arm/plat-pxa/include/plat/pxa3xx_nand.h | 18 +- arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h | 97 +++ arch/powerpc/Kconfig | 7 +- arch/powerpc/include/asm/fsl_lbc.h | 34 +- arch/powerpc/sysdev/fsl_lbc.c | 244 +++++- drivers/mtd/chips/cfi_cmdset_0001.c | 4 +- drivers/mtd/chips/cfi_cmdset_0002.c | 83 +- drivers/mtd/chips/cfi_probe.c | 2 + drivers/mtd/chips/cfi_util.c | 7 + drivers/mtd/devices/block2mtd.c | 1 - drivers/mtd/devices/m25p80.c | 4 + drivers/mtd/devices/phram.c | 2 +- drivers/mtd/maps/Kconfig | 9 + drivers/mtd/maps/Makefile | 1 + drivers/mtd/maps/bcm963xx-flash.c | 271 +++++++ drivers/mtd/maps/gpio-addr-flash.c | 10 +- drivers/mtd/maps/pcmciamtd.c | 4 - drivers/mtd/maps/physmap_of.c | 20 +- drivers/mtd/mtd_blkdevs.c | 63 +- drivers/mtd/mtdchar.c | 111 +++- drivers/mtd/mtdpart.c | 154 ++++- drivers/mtd/nand/Kconfig | 15 +- drivers/mtd/nand/Makefile | 1 + drivers/mtd/nand/bf5xx_nand.c | 14 +- drivers/mtd/nand/davinci_nand.c | 11 +- drivers/mtd/nand/denali.c | 1 + drivers/mtd/nand/fsl_elbc_nand.c | 484 +++++------- drivers/mtd/nand/fsl_upm.c | 10 +- drivers/mtd/nand/fsmc_nand.c | 866 +++++++++++++++++++++ drivers/mtd/nand/mpc5121_nfc.c | 11 +- drivers/mtd/nand/nand_base.c | 338 ++++++--- drivers/mtd/nand/nand_bbt.c | 250 +++++- drivers/mtd/nand/nand_ids.c | 31 + drivers/mtd/nand/nandsim.c | 19 +- drivers/mtd/nand/ndfc.c | 8 +- drivers/mtd/nand/omap2.c | 4 +- drivers/mtd/nand/pxa3xx_nand.c | 348 +++------ drivers/mtd/nand/r852.c | 30 +- drivers/mtd/nand/r852.h | 2 - drivers/mtd/ofpart.c | 2 +- drivers/mtd/onenand/Kconfig | 7 +- drivers/mtd/onenand/onenand_base.c | 7 +- drivers/mtd/onenand/samsung.c | 133 +++- drivers/mtd/sm_ftl.h | 8 +- fs/jffs2/build.c | 2 +- fs/jffs2/compr.c | 6 +- fs/jffs2/compr.h | 4 +- fs/jffs2/compr_lzo.c | 4 +- fs/jffs2/compr_rtime.c | 6 +- fs/jffs2/compr_rubin.c | 11 +- fs/jffs2/compr_zlib.c | 6 +- fs/jffs2/dir.c | 3 +- fs/jffs2/erase.c | 2 +- fs/jffs2/fs.c | 22 +- fs/jffs2/gc.c | 7 +- fs/jffs2/jffs2_fs_sb.h | 1 + fs/jffs2/nodelist.c | 8 +- fs/jffs2/nodelist.h | 3 +- fs/jffs2/scan.c | 12 +- include/linux/mtd/bbm.h | 4 +- include/linux/mtd/cfi.h | 1 + include/linux/mtd/fsmc.h | 181 +++++ include/linux/mtd/inftl.h | 14 +- include/linux/mtd/mtd.h | 15 + include/linux/mtd/nand.h | 426 +++++++---- include/linux/mtd/partitions.h | 7 +- include/mtd/mtd-abi.h | 16 +- include/mtd/mtd-user.h | 2 +- 71 files changed, 3407 insertions(+), 1157 deletions(-) create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h create mode 100644 drivers/mtd/maps/bcm963xx-flash.c create mode 100644 drivers/mtd/nand/fsmc_nand.c create mode 100644 include/linux/mtd/fsmc.h Merging crypto/master $ git merge crypto/master Already up-to-date. Merging sound/for-next $ git merge sound/for-next Already up-to-date! Merge made by recursive. Merging sound-asoc/for-next $ git merge sound-asoc/for-next Auto-merging sound/soc/soc-core.c Merge made by recursive. sound/soc/soc-core.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) Merging cpufreq/next $ git merge cpufreq/next Already up-to-date. Merging quilt/rr $ git merge quilt/rr Auto-merging drivers/block/virtio_blk.c Auto-merging drivers/char/virtio_console.c Auto-merging kernel/module.c Merge made by recursive. 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 Resolved 'fs/ocfs2/file.c' using previous resolution. Auto-merging fs/ocfs2/file.c CONFLICT (content): Merge conflict in fs/ocfs2/file.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master a24f25d] Merge remote branch 'block/for-next' $ git diff -M --stat --summary HEAD^.. Merging quilt/device-mapper $ git merge quilt/device-mapper Already up-to-date. 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 Merge made by recursive. drivers/pcmcia/pd6729.c | 8 ++++---- drivers/pcmcia/pd6729.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) Merging battery/master $ git merge battery/master Already up-to-date. Merging leds/for-mm $ git merge leds/for-mm Auto-merging drivers/leds/Kconfig Auto-merging drivers/leds/leds-gpio.c Merge made by recursive. Merging backlight/for-mm $ git merge backlight/for-mm Already up-to-date. Merging mmc/mmc-next $ git merge mmc/mmc-next Already up-to-date. Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Merge made by recursive. arch/arm/include/asm/kgdb.h | 5 ++- arch/arm/kernel/kgdb.c | 2 +- drivers/char/keyboard.c | 38 +++++++++++++++++++++++++ drivers/char/sysrq.c | 64 +++++++++++++++++++++++++++++++++++++++++-- drivers/serial/kgdboc.c | 13 +++++++++ include/linux/kbd_kern.h | 1 + 6 files changed, 117 insertions(+), 6 deletions(-) Merging slab/for-next $ git merge slab/for-next Merge made by recursive. Documentation/vm/Makefile | 2 +- include/linux/slub_def.h | 55 +++++++++++++-------------- mm/slub.c | 33 ++++++++++++---- {Documentation/vm => tools/slub}/slabinfo.c | 6 +- 4 files changed, 55 insertions(+), 41 deletions(-) rename {Documentation/vm => tools/slub}/slabinfo.c (99%) Merging uclinux/for-next $ git merge uclinux/for-next Already up-to-date. Merging md/for-next $ git merge md/for-next Already up-to-date. Merging mfd/for-next $ git merge mfd/for-next Already up-to-date. Merging hdlc/hdlc-next $ git merge hdlc/hdlc-next Already up-to-date. Merging drm/drm-next $ git merge drm/drm-next Already up-to-date. Merging viafb/viafb-next $ git merge viafb/viafb-next Already up-to-date. Merging voltage/for-next $ git merge voltage/for-next CONFLICT (rename/add): Rename arch/arm/mach-s5p6440/include/mach/dma.h->include/linux/regulator/lp3972.h in HEAD. include/linux/regulator/lp3972.h added in voltage/for-next Adding as include/linux/regulator/lp3972.h~voltage_for-next instead Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 8a8f8e3] Merge remote branch 'voltage/for-next' $ git diff -M --stat --summary HEAD^.. Merging security-testing/next $ git merge security-testing/next Already up-to-date. Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging agp/agp-next $ git merge agp/agp-next Auto-merging drivers/char/agp/backend.c Auto-merging drivers/char/agp/hp-agp.c Merge made by recursive. Merging watchdog/master $ git merge watchdog/master Recorded preimage for 'drivers/watchdog/bcm63xx_wdt.c' Recorded preimage for 'drivers/watchdog/iTCO_wdt.c' Auto-merging drivers/watchdog/bcm63xx_wdt.c CONFLICT (add/add): Merge conflict in drivers/watchdog/bcm63xx_wdt.c Auto-merging drivers/watchdog/iTCO_wdt.c CONFLICT (content): Merge conflict in drivers/watchdog/iTCO_wdt.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/watchdog/bcm63xx_wdt.c'. Recorded resolution for 'drivers/watchdog/iTCO_wdt.c'. [master fa2c4c3] Merge remote branch 'watchdog/master' $ git diff -M --stat --summary HEAD^.. drivers/watchdog/bcm63xx_wdt.c | 42 +++++++++++---------------------------- 1 files changed, 12 insertions(+), 30 deletions(-) Merging bdev/master $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master $ git merge dwmw2-iommu/master Already up-to-date. Merging cputime/cputime $ git merge cputime/cputime Already up-to-date. Merging osd/linux-next $ git merge osd/linux-next Already up-to-date. Merging jc_docs/docs-next $ git merge jc_docs/docs-next Already up-to-date. 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 fsnotify/for-next $ git merge fsnotify/for-next Merge made by recursive. fs/notify/Kconfig | 2 +- fs/notify/fanotify/fanotify.c | 27 ++++++++-- fs/notify/fanotify/fanotify_user.c | 96 +++++++++++++++++++++++++++++++++--- fs/notify/fsnotify.c | 35 ++++++++----- fs/notify/inode_mark.c | 9 +++- fs/notify/inotify/inotify_user.c | 2 +- fs/notify/vfsmount_mark.c | 6 ++- include/linux/Kbuild | 1 + include/linux/fanotify.h | 36 ++++++++++--- include/linux/fsnotify.h | 29 ++++++----- include/linux/fsnotify_backend.h | 26 ++++++++-- include/linux/sched.h | 3 + 12 files changed, 213 insertions(+), 59 deletions(-) Merging irda/for-next $ git merge irda/for-next Already up-to-date. Merging catalin/for-next $ git merge catalin/for-next Resolved 'arch/arm/kernel/Makefile' using previous resolution. Resolved 'arch/arm/mach-vexpress/ct-ca9x4.c' using previous resolution. Resolved 'arch/arm/mm/flush.c' using previous resolution. Resolved 'arch/arm/mm/mmu.c' using previous resolution. Auto-merging Documentation/arm/00-INDEX Auto-merging arch/arm/include/asm/assembler.h Auto-merging arch/arm/include/asm/cacheflush.h Auto-merging arch/arm/include/asm/pgtable.h Auto-merging arch/arm/include/asm/smp_plat.h Auto-merging arch/arm/include/asm/tlbflush.h Auto-merging arch/arm/kernel/Makefile CONFLICT (content): Merge conflict in arch/arm/kernel/Makefile Auto-merging arch/arm/kernel/entry-armv.S Auto-merging arch/arm/mach-vexpress/ct-ca9x4.c CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/ct-ca9x4.c Auto-merging arch/arm/mm/Kconfig Auto-merging arch/arm/mm/cache-l2x0.c Auto-merging arch/arm/mm/fault-armv.c Auto-merging arch/arm/mm/flush.c CONFLICT (content): Merge conflict in arch/arm/mm/flush.c Auto-merging arch/arm/mm/mmu.c CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c Auto-merging arch/arm/mm/proc-v7.S Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 3aa31bf] Merge remote branch 'catalin/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/arm/00-INDEX | 2 + Documentation/arm/swp_emulation | 27 ++++ arch/arm/include/asm/assembler.h | 13 +- arch/arm/include/asm/domain.h | 31 ++++- arch/arm/include/asm/futex.h | 9 +- arch/arm/include/asm/traps.h | 2 + arch/arm/include/asm/uaccess.h | 16 +- arch/arm/kernel/Makefile | 1 + arch/arm/kernel/entry-armv.S | 4 +- arch/arm/kernel/fiq.c | 5 + arch/arm/kernel/swp_emulate.c | 263 ++++++++++++++++++++++++++++++++++++++ arch/arm/kernel/traps.c | 14 ++- arch/arm/lib/getuser.S | 13 +- arch/arm/lib/putuser.S | 29 ++-- arch/arm/lib/uaccess.S | 83 ++++++------ arch/arm/mm/Kconfig | 35 +++++ arch/arm/mm/mmu.c | 7 +- arch/arm/mm/proc-macros.S | 7 + arch/arm/mm/proc-v7.S | 9 +- 19 files changed, 478 insertions(+), 92 deletions(-) create mode 100644 Documentation/arm/swp_emulation create mode 100644 arch/arm/kernel/swp_emulate.c Merging alacrity/linux-next $ git merge alacrity/linux-next Resolved 'include/linux/Kbuild' 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 Auto-merging lib/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master c9931d2] 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 | 248 +++++++ drivers/vbus/pci-bridge.c | 1016 ++++++++++++++++++++++++++++ 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, 4389 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 Already up-to-date. Merging i7300_edac/linux_next $ git merge i7300_edac/linux_next Already up-to-date! Merge made by recursive. Merging devicetree/next-devicetree $ git merge devicetree/next-devicetree Already up-to-date. Merging spi/next-spi $ git merge spi/next-spi Merge made by recursive. drivers/spi/spi.c | 98 ++++++++++++++++++++++++--------------------- drivers/spi/spi_bfin5xx.c | 22 ++++++++-- include/linux/spi/spi.h | 3 + 3 files changed, 72 insertions(+), 51 deletions(-) Merging omap_dss2/for-next $ git merge omap_dss2/for-next Auto-merging arch/arm/plat-omap/fb.c Auto-merging drivers/video/omap2/omapfb/omapfb-main.c Auto-merging drivers/video/omap2/vram.c Merge made by recursive. arch/arm/plat-omap/include/plat/vram.h | 1 + drivers/video/omap2/omapfb/omapfb-main.c | 2 +- drivers/video/omap2/vram.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletions(-) Merging tip/auto-latest $ git merge tip/auto-latest Auto-merging arch/x86/kernel/setup.c Auto-merging include/linux/sched.h Merge made by recursive. arch/x86/include/asm/apic.h | 1 + arch/x86/include/asm/i387.h | 24 ++++++ arch/x86/include/asm/io_apic.h | 7 +- arch/x86/include/asm/uv/uv_hub.h | 21 +++++- arch/x86/kernel/apic/apic.c | 102 ++++++++++++++++---------- arch/x86/kernel/apic/io_apic.c | 6 +- arch/x86/kernel/apic/x2apic_uv_x.c | 25 ++++++- arch/x86/kernel/cpu/mcheck/mce_amd.c | 135 +++++++++++++++++++--------------- arch/x86/kernel/process.c | 1 - arch/x86/kernel/setup.c | 5 +- arch/x86/oprofile/op_model_amd.c | 1 + include/linux/irq.h | 5 + include/linux/irqnr.h | 2 +- include/linux/rcupdate.h | 2 +- include/linux/sched.h | 7 +- include/linux/timer.h | 32 +++++++- include/linux/workqueue.h | 8 ++ kernel/irq/manage.c | 8 ++- kernel/kthread.c | 2 +- kernel/posix-timers.c | 10 ++- kernel/sched.c | 14 ++-- kernel/sched_fair.c | 25 +++++-- kernel/sched_stats.h | 20 +----- kernel/softirq.c | 4 +- kernel/time/timecompare.c | 5 +- kernel/time/timekeeping.c | 9 ++- kernel/timer.c | 46 +++--------- kernel/trace/trace_selftest.c | 2 +- kernel/watchdog.c | 2 +- 29 files changed, 331 insertions(+), 200 deletions(-) Merging rcu/rcu/next $ git merge rcu/rcu/next Already up-to-date. Merging oprofile/for-next $ git merge oprofile/for-next Already up-to-date. Merging xen/upstream/xen $ git merge xen/upstream/xen Resolved 'arch/x86/xen/mmu.c' using previous resolution. Auto-merging arch/x86/xen/mmu.c CONFLICT (content): Merge conflict in arch/x86/xen/mmu.c Auto-merging arch/x86/xen/setup.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 3bc1229] Merge remote branch 'xen/upstream/xen' $ git diff -M --stat --summary HEAD^.. arch/x86/xen/setup.c | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) Merging swiotlb-xen/master $ git merge swiotlb-xen/master Resolved 'arch/x86/include/asm/io_apic.h' using previous resolution. Resolved 'drivers/pci/Makefile' using previous resolution. Auto-merging MAINTAINERS Auto-merging arch/x86/Kconfig Auto-merging arch/x86/include/asm/io.h Auto-merging arch/x86/include/asm/io_apic.h CONFLICT (content): Merge conflict in arch/x86/include/asm/io_apic.h Auto-merging arch/x86/kernel/apic/io_apic.c Auto-merging arch/x86/pci/i386.c Auto-merging arch/x86/xen/enlighten.c Auto-merging arch/x86/xen/pci-swiotlb-xen.c Auto-merging arch/x86/xen/setup.c Auto-merging drivers/block/xen-blkfront.c Auto-merging drivers/net/xen-netfront.c Auto-merging drivers/pci/Makefile CONFLICT (content): Merge conflict in drivers/pci/Makefile Auto-merging drivers/pci/bus.c Auto-merging drivers/xen/events.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master e9b2214] Merge remote branch 'swiotlb-xen/master' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 20 +- arch/x86/Kconfig | 5 + arch/x86/include/asm/io.h | 13 + arch/x86/include/asm/io_apic.h | 2 + arch/x86/include/asm/pci.h | 33 +- arch/x86/include/asm/pci_x86.h | 1 + arch/x86/include/asm/x86_init.h | 9 + arch/x86/include/asm/xen/pci.h | 53 ++ arch/x86/kernel/apic/io_apic.c | 9 +- arch/x86/kernel/x86_init.c | 7 + arch/x86/pci/Makefile | 1 + arch/x86/pci/common.c | 17 +- arch/x86/pci/i386.c | 2 + arch/x86/pci/xen.c | 142 +++++ arch/x86/xen/enlighten.c | 3 + arch/x86/xen/pci-swiotlb-xen.c | 4 + arch/x86/xen/setup.c | 2 - drivers/block/xen-blkfront.c | 2 + drivers/input/xen-kbdfront.c | 2 + drivers/net/xen-netfront.c | 2 + drivers/pci/Kconfig | 21 + drivers/pci/Makefile | 2 + drivers/pci/bus.c | 1 + drivers/pci/msi.c | 14 +- drivers/pci/xen-pcifront.c | 1148 ++++++++++++++++++++++++++++++++++++ drivers/video/xen-fbfront.c | 2 + drivers/xen/Kconfig | 3 +- drivers/xen/Makefile | 1 + drivers/xen/biomerge.c | 13 + drivers/xen/events.c | 344 ++++++++++- drivers/xen/xenbus/xenbus_client.c | 2 + include/xen/events.h | 18 + include/xen/interface/io/pciif.h | 112 ++++ include/xen/interface/io/xenbus.h | 8 +- 34 files changed, 1982 insertions(+), 36 deletions(-) create mode 100644 arch/x86/include/asm/xen/pci.h create mode 100644 arch/x86/pci/xen.c create mode 100644 drivers/pci/xen-pcifront.c create mode 100644 drivers/xen/biomerge.c create mode 100644 include/xen/interface/io/pciif.h Merging xen-pvhvm/linux-next $ git merge xen-pvhvm/linux-next Recorded preimage for 'arch/x86/xen/setup.c' Auto-merging arch/x86/xen/Kconfig Auto-merging arch/x86/xen/enlighten.c Auto-merging arch/x86/xen/mmu.c Auto-merging arch/x86/xen/setup.c CONFLICT (content): Merge conflict in arch/x86/xen/setup.c Auto-merging arch/x86/xen/smp.c Auto-merging drivers/char/hvc_xen.c Auto-merging drivers/xen/events.c Auto-merging drivers/xen/xenbus/xenbus_probe.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/x86/xen/setup.c'. [master d5b0325] Merge remote branch 'xen-pvhvm/linux-next' $ git diff -M --stat --summary HEAD^.. arch/x86/include/asm/acpi.h | 3 + arch/x86/include/asm/xen/pci.h | 12 ++ arch/x86/kernel/acpi/boot.c | 60 +++++-- arch/x86/pci/xen.c | 308 ++++++++++++++++++++++++++++++++++-- arch/x86/xen/Kconfig | 10 ++ arch/x86/xen/enlighten.c | 2 + arch/x86/xen/mmu.c | 47 ++++++- arch/x86/xen/smp.c | 26 +++ drivers/char/hvc_xen.c | 98 ++++++++---- drivers/xen/Makefile | 1 + drivers/xen/events.c | 195 +++++++++++++++++++++--- drivers/xen/pci.c | 117 ++++++++++++++ drivers/xen/xenbus/xenbus_probe.c | 29 ++++- include/xen/events.h | 8 + include/xen/interface/features.h | 3 + include/xen/interface/physdev.h | 67 ++++++++ 16 files changed, 894 insertions(+), 92 deletions(-) create mode 100644 drivers/xen/pci.c Merging edac-amd/for-next $ git merge edac-amd/for-next Renaming drivers/edac/edac_mce_amd.h->drivers/edac/mce_amd.h Auto-merging drivers/edac/mce_amd.h Auto-merging drivers/edac/Kconfig Auto-merging drivers/edac/Makefile Auto-merging drivers/edac/amd64_edac.c Auto-merging drivers/edac/edac_device_sysfs.c Auto-merging drivers/edac/edac_mc_sysfs.c Merge made by recursive. Merging percpu/for-next $ git merge percpu/for-next Already up-to-date. 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 Already up-to-date. Merging drivers-x86/linux-next $ git merge drivers-x86/linux-next Already up-to-date. Merging hwpoison/hwpoison $ git merge hwpoison/hwpoison Already up-to-date. Merging sysctl/master $ git merge sysctl/master Already up-to-date. Merging quilt/driver-core $ git merge quilt/driver-core Already up-to-date. Merging quilt/tty $ git merge quilt/tty Already up-to-date. Merging quilt/usb $ git merge quilt/usb Already up-to-date. Merging staging-next/staging-next $ git merge staging-next/staging-next Already up-to-date. Merging slabh/slabh $ git merge slabh/slabh Already up-to-date. Merging bkl-trivial/trivial $ git merge bkl-trivial/trivial Already up-to-date. Merging bkl-llseek/llseek $ git merge bkl-llseek/llseek Already up-to-date. Merging bkl-vfs/vfs $ git merge bkl-vfs/vfs Already up-to-date. Merging bkl-config/config $ git merge bkl-config/config Already up-to-date. Merging irqflags/master $ git merge irqflags/master Already up-to-date. Merging cleancache/linux-next $ git merge cleancache/linux-next Resolved 'include/linux/fs.h' using previous resolution. Resolved 'mm/Kconfig' using previous resolution. Auto-merging arch/x86/include/asm/xen/hypercall.h Auto-merging drivers/xen/Makefile Auto-merging fs/btrfs/super.c Auto-merging fs/buffer.c Auto-merging fs/ext3/super.c Auto-merging fs/ext4/super.c Auto-merging fs/ocfs2/super.c Auto-merging fs/super.c Auto-merging include/linux/fs.h CONFLICT (content): Merge conflict in include/linux/fs.h Auto-merging mm/Kconfig CONFLICT (content): Merge conflict in mm/Kconfig Auto-merging mm/Makefile Auto-merging mm/filemap.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 5f9c59a] Merge remote branch 'cleancache/linux-next' $ git diff -M --stat --summary HEAD^.. .../ABI/testing/sysfs-kernel-mm-cleancache | 11 + Documentation/vm/cleancache.txt | 267 ++++++++++++++++++++ arch/x86/include/asm/xen/hypercall.h | 7 + drivers/xen/Makefile | 1 + drivers/xen/tmem.c | 264 +++++++++++++++++++ fs/btrfs/extent_io.c | 9 + fs/btrfs/super.c | 2 + fs/buffer.c | 5 + fs/ext3/super.c | 2 + fs/ext4/super.c | 2 + fs/mpage.c | 7 + fs/ocfs2/super.c | 2 + fs/super.c | 3 + include/linux/cleancache.h | 118 +++++++++ include/linux/fs.h | 5 + include/xen/interface/xen.h | 22 ++ mm/Kconfig | 22 ++ mm/Makefile | 1 + mm/cleancache.c | 245 ++++++++++++++++++ mm/filemap.c | 11 + mm/truncate.c | 10 + 21 files changed, 1016 insertions(+), 0 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache create mode 100644 Documentation/vm/cleancache.txt create mode 100644 drivers/xen/tmem.c create mode 100644 include/linux/cleancache.h create mode 100644 mm/cleancache.c Merging scsi-post-merge/merge-base:master