$ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 4142e0d Merge branch 'osync_cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 Merging origin/master $ git merge origin/master Updating 4142e0d..0cb583f Fast forward CREDITS | 2 +- Documentation/arm/SA1100/ADSBitsy | 2 +- Documentation/arm/SA1100/Assabet | 2 +- Documentation/arm/SA1100/Brutus | 2 +- Documentation/arm/SA1100/GraphicsClient | 4 +- Documentation/arm/SA1100/GraphicsMaster | 4 +- Documentation/arm/SA1100/Victor | 2 +- Documentation/arm/Samsung-S3C24XX/CPUfreq.txt | 75 + Documentation/filesystems/seq_file.txt | 2 +- Documentation/flexible-arrays.txt | 99 + Documentation/input/sentelic.txt | 475 ++ Documentation/intel_txt.txt | 210 + Documentation/ioctl/ioctl-number.txt | 2 +- Documentation/kernel-parameters.txt | 50 +- Documentation/kvm/api.txt | 759 +++ Documentation/power/runtime_pm.txt | 378 ++ Documentation/video4linux/CARDLIST.cx23885 | 2 + Documentation/video4linux/CARDLIST.cx88 | 1 + Documentation/video4linux/CARDLIST.em28xx | 5 +- Documentation/video4linux/CARDLIST.saa7134 | 4 + Documentation/video4linux/CARDLIST.tuner | 1 + Documentation/video4linux/CQcam.txt | 4 +- Documentation/video4linux/gspca.txt | 6 + Documentation/video4linux/si4713.txt | 176 + Documentation/vm/slub.txt | 10 + Documentation/x86/zero-page.txt | 1 + MAINTAINERS | 49 +- Makefile | 2 +- arch/alpha/include/asm/agp.h | 4 - arch/alpha/include/asm/percpu.h | 100 +- arch/alpha/include/asm/tlbflush.h | 1 + arch/alpha/kernel/vmlinux.lds.S | 9 +- arch/arm/Kconfig | 264 +- arch/arm/Kconfig.debug | 1 + arch/arm/Makefile | 17 +- arch/arm/boot/Makefile | 9 +- arch/arm/boot/compressed/head-sa1100.S | 2 +- arch/arm/boot/compressed/head.S | 184 +- arch/arm/common/vic.c | 95 +- arch/arm/configs/bcmring_defconfig | 725 +++ arch/arm/configs/cpu9260_defconfig | 1338 +++++ arch/arm/configs/cpu9g20_defconfig | 1328 +++++ arch/arm/configs/cpuat91_defconfig | 1316 +++++ arch/arm/configs/jornada720_defconfig | 329 +- arch/arm/configs/nhk8815_defconfig | 1316 +++++ arch/arm/configs/s5pc100_defconfig | 892 ++++ arch/arm/include/asm/assembler.h | 133 +- arch/arm/include/asm/device.h | 3 + arch/arm/include/asm/elf.h | 3 + arch/arm/include/asm/ftrace.h | 35 + arch/arm/include/asm/futex.h | 1 + arch/arm/include/asm/mach/mmc.h | 2 + arch/arm/include/asm/memory.h | 23 +- arch/arm/include/asm/mmu_context.h | 2 + arch/arm/include/asm/page-nommu.h | 3 - arch/arm/include/asm/page.h | 4 + arch/arm/include/asm/pgalloc.h | 16 +- arch/arm/include/asm/pgtable.h | 37 +- arch/arm/include/asm/ptrace.h | 8 + arch/arm/include/asm/thread_info.h | 2 + arch/arm/include/asm/uaccess.h | 7 +- arch/arm/include/asm/unified.h | 126 + arch/arm/include/asm/unistd.h | 7 +- arch/arm/kernel/Makefile | 4 +- arch/arm/kernel/armksyms.c | 1 + arch/arm/kernel/calls.S | 10 +- arch/arm/kernel/crunch.c | 13 +- arch/arm/kernel/entry-armv.S | 179 +- arch/arm/kernel/entry-common.S | 57 +- arch/arm/kernel/entry-header.S | 92 +- arch/arm/kernel/head-common.S | 15 +- arch/arm/kernel/head-nommu.S | 16 +- arch/arm/kernel/head.S | 28 +- arch/arm/kernel/irq.c | 2 +- arch/arm/kernel/module.c | 53 + arch/arm/kernel/process.c | 2 +- arch/arm/kernel/ptrace.c | 8 +- arch/arm/kernel/return_address.c | 71 + arch/arm/kernel/setup.c | 28 +- arch/arm/kernel/signal.c | 86 +- arch/arm/kernel/stacktrace.c | 4 +- arch/arm/kernel/unwind.c | 4 + arch/arm/kernel/vmlinux.lds.S | 1 + arch/arm/lib/ashldi3.S | 4 +- arch/arm/lib/ashrdi3.S | 4 +- arch/arm/lib/backtrace.S | 8 +- arch/arm/lib/bitops.h | 2 +- arch/arm/lib/clear_user.S | 15 +- arch/arm/lib/copy_from_user.S | 19 +- arch/arm/lib/copy_template.S | 24 +- arch/arm/lib/copy_to_user.S | 19 +- arch/arm/lib/csumpartialcopyuser.S | 48 +- arch/arm/lib/div64.S | 4 +- arch/arm/lib/findbit.S | 34 +- arch/arm/lib/getuser.S | 5 + arch/arm/lib/io-writesw-armv4.S | 5 +- arch/arm/lib/lib1funcs.S | 2 +- arch/arm/lib/lshrdi3.S | 4 +- arch/arm/lib/memcpy.S | 7 +- arch/arm/lib/memmove.S | 28 +- arch/arm/lib/putuser.S | 15 + arch/arm/lib/sha1.S | 4 +- arch/arm/lib/strncpy_from_user.S | 2 +- arch/arm/lib/strnlen_user.S | 2 +- arch/arm/mach-at91/Kconfig | 70 +- arch/arm/mach-at91/Makefile | 9 + arch/arm/mach-at91/Makefile.boot | 4 + arch/arm/mach-at91/at91sam9260_devices.c | 116 + arch/arm/mach-at91/at91sam9261.c | 22 +- arch/arm/mach-at91/at91sam9263_devices.c | 14 +- arch/arm/mach-at91/at91sam9g45.c | 360 ++ arch/arm/mach-at91/at91sam9g45_devices.c | 1230 +++++ arch/arm/mach-at91/board-afeb-9260v1.c | 12 + arch/arm/mach-at91/board-cpu9krea.c | 385 ++ arch/arm/mach-at91/board-cpuat91.c | 185 + arch/arm/mach-at91/board-sam9261ek.c | 14 + arch/arm/mach-at91/board-sam9263ek.c | 4 +- arch/arm/mach-at91/board-sam9g20ek.c | 1 + arch/arm/mach-at91/board-sam9m10g45ek.c | 389 ++ arch/arm/mach-at91/board-sam9rlek.c | 79 + arch/arm/mach-at91/clock.c | 66 +- arch/arm/mach-at91/generic.h | 2 + arch/arm/mach-at91/gpio.c | 15 - arch/arm/mach-at91/include/mach/at91sam9261.h | 3 + arch/arm/mach-at91/include/mach/at91sam9g45.h | 155 + .../mach-at91/include/mach/at91sam9g45_matrix.h | 153 + arch/arm/mach-at91/include/mach/board.h | 14 +- arch/arm/mach-at91/include/mach/cpu.h | 23 + arch/arm/mach-at91/include/mach/hardware.h | 4 +- arch/arm/mach-at91/include/mach/timex.h | 10 + arch/arm/mach-at91/pm.c | 3 +- arch/arm/mach-bcmring/Kconfig | 21 + arch/arm/mach-bcmring/Makefile | 8 + arch/arm/mach-bcmring/Makefile.boot | 6 + arch/arm/mach-bcmring/arch.c | 157 + arch/arm/mach-bcmring/clock.c | 224 + arch/arm/mach-bcmring/clock.h | 33 + arch/arm/mach-bcmring/core.c | 367 ++ arch/arm/mach-bcmring/core.h | 30 + arch/arm/mach-bcmring/csp/Makefile | 3 + arch/arm/mach-bcmring/csp/chipc/Makefile | 1 + arch/arm/mach-bcmring/csp/chipc/chipcHw.c | 776 +++ arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c | 293 + arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c | 124 + arch/arm/mach-bcmring/csp/chipc/chipcHw_str.c | 64 + arch/arm/mach-bcmring/csp/dmac/Makefile | 1 + arch/arm/mach-bcmring/csp/dmac/dmacHw.c | 917 ++++ arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c | 1017 ++++ arch/arm/mach-bcmring/csp/tmr/Makefile | 1 + arch/arm/mach-bcmring/csp/tmr/tmrHw.c | 576 ++ arch/arm/mach-bcmring/dma.c | 2321 ++++++++ arch/arm/mach-bcmring/dma_device.c | 593 +++ arch/arm/mach-bcmring/include/cfg_global.h | 13 + arch/arm/mach-bcmring/include/cfg_global_defines.h | 40 + arch/arm/mach-bcmring/include/csp/cache.h | 35 + arch/arm/mach-bcmring/include/csp/delay.h | 36 + arch/arm/mach-bcmring/include/csp/dmacHw.h | 596 +++ arch/arm/mach-bcmring/include/csp/errno.h | 32 + arch/arm/mach-bcmring/include/csp/intcHw.h | 40 + arch/arm/mach-bcmring/include/csp/module.h | 32 + arch/arm/mach-bcmring/include/csp/reg.h | 114 + arch/arm/mach-bcmring/include/csp/secHw.h | 65 + arch/arm/mach-bcmring/include/csp/stdint.h | 30 + arch/arm/mach-bcmring/include/csp/string.h | 34 + arch/arm/mach-bcmring/include/csp/tmrHw.h | 263 + arch/arm/mach-bcmring/include/mach/clkdev.h | 7 + arch/arm/mach-bcmring/include/mach/csp/cap.h | 63 + .../arm/mach-bcmring/include/mach/csp/cap_inline.h | 409 ++ .../mach-bcmring/include/mach/csp/chipcHw_def.h | 1123 ++++ .../mach-bcmring/include/mach/csp/chipcHw_inline.h | 1673 ++++++ .../mach-bcmring/include/mach/csp/chipcHw_reg.h | 530 ++ arch/arm/mach-bcmring/include/mach/csp/ddrcReg.h | 872 +++ .../mach-bcmring/include/mach/csp/dmacHw_priv.h | 145 + .../arm/mach-bcmring/include/mach/csp/dmacHw_reg.h | 406 ++ arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h | 73 + .../arm/mach-bcmring/include/mach/csp/intcHw_reg.h | 246 + arch/arm/mach-bcmring/include/mach/csp/mm_addr.h | 101 + arch/arm/mach-bcmring/include/mach/csp/mm_io.h | 147 + arch/arm/mach-bcmring/include/mach/csp/secHw_def.h | 100 + .../mach-bcmring/include/mach/csp/secHw_inline.h | 79 + arch/arm/mach-bcmring/include/mach/csp/tmrHw_reg.h | 82 + arch/arm/mach-bcmring/include/mach/dma.h | 826 +++ arch/arm/mach-bcmring/include/mach/entry-macro.S | 86 + arch/arm/mach-bcmring/include/mach/hardware.h | 60 + arch/arm/mach-bcmring/include/mach/io.h | 56 + arch/arm/mach-bcmring/include/mach/irqs.h | 132 + arch/arm/mach-bcmring/include/mach/memory.h | 33 + .../mach-bcmring/include/mach/memory_settings.h | 67 + arch/arm/mach-bcmring/include/mach/system.h | 54 + arch/arm/mach-bcmring/include/mach/timer.h | 77 + arch/arm/mach-bcmring/include/mach/timex.h | 25 + arch/arm/mach-bcmring/include/mach/uncompress.h | 43 + arch/arm/mach-bcmring/include/mach/vmalloc.h | 25 + arch/arm/mach-bcmring/irq.c | 127 + arch/arm/mach-bcmring/mm.c | 56 + arch/arm/mach-bcmring/timer.c | 62 + arch/arm/mach-ep93xx/adssphere.c | 11 +- arch/arm/mach-ep93xx/clock.c | 131 +- arch/arm/mach-ep93xx/core.c | 202 +- arch/arm/mach-ep93xx/edb93xx.c | 10 +- arch/arm/mach-ep93xx/gesbc9312.c | 11 +- arch/arm/mach-ep93xx/gpio.c | 65 +- arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 103 +- arch/arm/mach-ep93xx/include/mach/hardware.h | 17 +- arch/arm/mach-ep93xx/include/mach/io.h | 17 +- arch/arm/mach-ep93xx/include/mach/platform.h | 20 + arch/arm/mach-ep93xx/include/mach/system.h | 12 +- arch/arm/mach-ep93xx/include/mach/ts72xx.h | 1 - arch/arm/mach-ep93xx/micro9.c | 11 +- arch/arm/mach-ep93xx/ts72xx.c | 15 +- arch/arm/mach-integrator/include/mach/hardware.h | 4 + arch/arm/mach-integrator/integrator_cp.c | 18 +- arch/arm/mach-kirkwood/Kconfig | 6 + arch/arm/mach-kirkwood/Makefile | 1 + arch/arm/mach-kirkwood/common.c | 5 +- arch/arm/mach-kirkwood/include/mach/kirkwood.h | 1 + arch/arm/mach-kirkwood/openrd_base-setup.c | 84 + arch/arm/mach-mx1/clock.c | 86 +- arch/arm/mach-mx1/devices.c | 87 +- arch/arm/mach-mx1/generic.c | 7 + arch/arm/mach-mx1/mx1ads.c | 10 +- arch/arm/mach-mx1/scb9328.c | 16 +- arch/arm/mach-mx2/Kconfig | 35 + arch/arm/mach-mx2/Makefile | 3 + arch/arm/mach-mx2/clock_imx21.c | 2 +- arch/arm/mach-mx2/clock_imx27.c | 11 +- arch/arm/mach-mx2/devices.c | 332 +- arch/arm/mach-mx2/devices.h | 9 +- arch/arm/mach-mx2/eukrea_cpuimx27.c | 234 + arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c | 249 + arch/arm/mach-mx2/generic.c | 12 + arch/arm/mach-mx2/mx21ads.c | 44 +- arch/arm/mach-mx2/mx27ads.c | 38 +- arch/arm/mach-mx2/mx27lite.c | 2 +- arch/arm/mach-mx2/mx27pdk.c | 2 +- arch/arm/mach-mx2/pca100.c | 244 + arch/arm/mach-mx2/pcm038.c | 17 +- arch/arm/mach-mx2/pcm970-baseboard.c | 112 +- arch/arm/mach-mx25/Kconfig | 9 + arch/arm/mach-mx25/Makefile | 3 + arch/arm/mach-mx25/Makefile.boot | 3 + arch/arm/mach-mx25/clock.c | 219 + arch/arm/mach-mx25/devices.c | 402 ++ arch/arm/mach-mx25/devices.h | 19 + arch/arm/mach-mx25/mm.c | 76 + arch/arm/mach-mx25/mx25pdk.c | 58 + arch/arm/mach-mx3/armadillo5x0.c | 2 +- arch/arm/mach-mx3/clock-imx35.c | 22 +- arch/arm/mach-mx3/clock.c | 22 +- arch/arm/mach-mx3/devices.c | 163 +- arch/arm/mach-mx3/devices.h | 6 + arch/arm/mach-mx3/mm.c | 14 + arch/arm/mach-mx3/mx31ads.c | 2 +- arch/arm/mach-mx3/mx31lilly.c | 2 +- arch/arm/mach-mx3/mx31lite.c | 7 +- arch/arm/mach-mx3/mx31moboard-devboard.c | 43 - arch/arm/mach-mx3/mx31moboard-marxbot.c | 55 +- arch/arm/mach-mx3/mx31moboard.c | 134 +- arch/arm/mach-mx3/mx31pdk.c | 2 +- arch/arm/mach-mx3/mx35pdk.c | 2 +- arch/arm/mach-mx3/pcm037.c | 42 +- arch/arm/mach-mx3/pcm043.c | 8 +- arch/arm/mach-mx3/qong.c | 7 +- arch/arm/mach-mxc91231/Kconfig | 11 + arch/arm/mach-mxc91231/Makefile | 2 + arch/arm/mach-mxc91231/Makefile.boot | 3 + arch/arm/mach-mxc91231/clock.c | 642 +++ arch/arm/mach-mxc91231/crm_regs.h | 399 ++ arch/arm/mach-mxc91231/devices.c | 251 + arch/arm/mach-mxc91231/devices.h | 13 + arch/arm/mach-mxc91231/iomux.c | 177 + arch/arm/mach-mxc91231/magx-zn5.c | 63 + arch/arm/mach-mxc91231/mm.c | 94 + arch/arm/mach-mxc91231/system.c | 51 + arch/arm/mach-netx/include/mach/entry-macro.S | 4 +- arch/arm/mach-nomadik/Kconfig | 21 + arch/arm/mach-nomadik/Makefile | 19 + arch/arm/mach-nomadik/Makefile.boot | 4 + arch/arm/mach-nomadik/board-nhk8815.c | 111 + arch/arm/mach-nomadik/clock.c | 45 + arch/arm/mach-nomadik/clock.h | 14 + arch/arm/mach-nomadik/cpu-8815.c | 139 + arch/arm/mach-nomadik/gpio.c | 396 ++ arch/arm/mach-nomadik/i2c-8815nhk.c | 65 + arch/arm/mach-nomadik/include/mach/clkdev.h | 7 + arch/arm/mach-nomadik/include/mach/debug-macro.S | 22 + arch/arm/mach-nomadik/include/mach/entry-macro.S | 43 + arch/arm/mach-nomadik/include/mach/gpio.h | 71 + arch/arm/mach-nomadik/include/mach/hardware.h | 90 + arch/arm/mach-nomadik/include/mach/io.h | 22 + arch/arm/mach-nomadik/include/mach/irqs.h | 82 + arch/arm/mach-nomadik/include/mach/memory.h | 28 + arch/arm/mach-nomadik/include/mach/mtu.h | 45 + arch/arm/mach-nomadik/include/mach/setup.h | 22 + arch/arm/mach-nomadik/include/mach/system.h | 45 + arch/arm/mach-nomadik/include/mach/timex.h | 6 + arch/arm/mach-nomadik/include/mach/uncompress.h | 63 + arch/arm/mach-nomadik/include/mach/vmalloc.h | 2 + arch/arm/mach-nomadik/timer.c | 164 + arch/arm/mach-omap2/board-4430sdp.c | 2 +- arch/arm/mach-omap2/mcbsp.c | 41 + arch/arm/mach-omap2/serial.c | 10 + arch/arm/mach-orion5x/Kconfig | 21 + arch/arm/mach-orion5x/Makefile | 3 + arch/arm/mach-orion5x/addr-map.c | 3 +- arch/arm/mach-orion5x/d2net-setup.c | 365 ++ arch/arm/mach-orion5x/net2big-setup.c | 431 ++ arch/arm/mach-pxa/include/mach/pxa27x_keypad.h | 7 +- arch/arm/mach-pxa/sharpsl_pm.c | 4 +- arch/arm/mach-realview/Kconfig | 2 +- arch/arm/mach-realview/core.c | 7 + arch/arm/mach-realview/include/mach/gpio.h | 6 + arch/arm/mach-realview/include/mach/hardware.h | 4 + arch/arm/mach-realview/platsmp.c | 18 +- arch/arm/mach-realview/realview_eb.c | 22 +- arch/arm/mach-realview/realview_pb1176.c | 22 +- arch/arm/mach-realview/realview_pb11mp.c | 22 +- arch/arm/mach-realview/realview_pba8.c | 22 +- arch/arm/mach-realview/realview_pbx.c | 22 +- arch/arm/mach-s3c2410/Kconfig | 18 + arch/arm/mach-s3c2410/Makefile | 2 + arch/arm/mach-s3c2410/cpu-freq.c | 159 + arch/arm/mach-s3c2410/dma.c | 11 + arch/arm/mach-s3c2410/include/mach/irqs.h | 6 + arch/arm/mach-s3c2410/include/mach/map.h | 8 + arch/arm/mach-s3c2410/include/mach/regs-gpio.h | 4 +- arch/arm/mach-s3c2410/include/mach/regs-mem.h | 10 + .../mach-s3c2410/include/mach/regs-s3c2412-mem.h | 23 +- arch/arm/mach-s3c2410/include/mach/spi.h | 3 + arch/arm/mach-s3c2410/irq.c | 15 +- arch/arm/mach-s3c2410/mach-bast.c | 41 + arch/arm/mach-s3c2410/pll.c | 95 + arch/arm/mach-s3c2410/pm.c | 12 + arch/arm/mach-s3c2410/s3c2410.c | 29 + arch/arm/mach-s3c2412/Kconfig | 9 + arch/arm/mach-s3c2412/Makefile | 1 + arch/arm/mach-s3c2412/cpu-freq.c | 257 + arch/arm/mach-s3c2412/s3c2412.c | 12 + arch/arm/mach-s3c2440/Kconfig | 7 + arch/arm/mach-s3c2440/mach-osiris.c | 9 + arch/arm/mach-s3c24a0/include/mach/map.h | 1 + arch/arm/mach-s3c6400/include/mach/map.h | 8 +- arch/arm/mach-s3c6400/s3c6400.c | 2 + arch/arm/mach-s3c6410/Kconfig | 10 + arch/arm/mach-s3c6410/Makefile | 3 +- arch/arm/mach-s3c6410/cpu.c | 2 + arch/arm/mach-s3c6410/mach-hmt.c | 276 + arch/arm/mach-s3c6410/mach-ncp.c | 2 +- arch/arm/mach-s3c6410/mach-smdk6410.c | 26 +- arch/arm/mach-s5pc100/Kconfig | 22 + arch/arm/mach-s5pc100/Makefile | 17 + arch/arm/mach-s5pc100/Makefile.boot | 2 + arch/arm/mach-s5pc100/cpu.c | 97 + arch/arm/mach-s5pc100/include/mach/debug-macro.S | 38 + arch/arm/mach-s5pc100/include/mach/entry-macro.S | 50 + arch/arm/mach-s5pc100/include/mach/gpio-core.h | 21 + arch/arm/mach-s5pc100/include/mach/gpio.h | 146 + arch/arm/mach-s5pc100/include/mach/hardware.h | 14 + arch/arm/mach-s5pc100/include/mach/irqs.h | 14 + arch/arm/mach-s5pc100/include/mach/map.h | 75 + arch/arm/mach-s5pc100/include/mach/memory.h | 18 + arch/arm/mach-s5pc100/include/mach/pwm-clock.h | 56 + arch/arm/mach-s5pc100/include/mach/regs-irq.h | 24 + arch/arm/mach-s5pc100/include/mach/system.h | 24 + arch/arm/mach-s5pc100/include/mach/tick.h | 29 + arch/arm/mach-s5pc100/include/mach/uncompress.h | 28 + arch/arm/mach-s5pc100/mach-smdkc100.c | 103 + arch/arm/mach-sa1100/include/mach/assabet.h | 2 +- arch/arm/mach-sa1100/include/mach/hardware.h | 2 +- arch/arm/mach-sa1100/include/mach/memory.h | 2 +- arch/arm/mach-sa1100/include/mach/neponset.h | 2 +- arch/arm/mach-sa1100/include/mach/system.h | 2 +- arch/arm/mach-sa1100/include/mach/uncompress.h | 2 +- arch/arm/mach-sa1100/pm.c | 2 +- arch/arm/mach-sa1100/time.c | 2 +- arch/arm/mach-u300/mmc.c | 2 + arch/arm/mach-versatile/core.c | 17 +- arch/arm/mach-versatile/include/mach/gpio.h | 6 + arch/arm/mach-versatile/include/mach/irqs.h | 11 +- arch/arm/mach-versatile/versatile_pb.c | 17 +- arch/arm/mach-w90x900/Kconfig | 30 + arch/arm/mach-w90x900/Makefile | 12 +- arch/arm/mach-w90x900/clksel.c | 91 + arch/arm/mach-w90x900/clock.c | 26 +- arch/arm/mach-w90x900/clock.h | 12 +- arch/arm/mach-w90x900/cpu.c | 212 + arch/arm/mach-w90x900/cpu.h | 49 +- arch/arm/mach-w90x900/dev.c | 389 ++ arch/arm/mach-w90x900/gpio.c | 78 +- arch/arm/mach-w90x900/include/mach/regs-clock.h | 22 + arch/arm/mach-w90x900/include/mach/regs-ebi.h | 33 + .../arm/mach-w90x900/include/mach/w90p910_keypad.h | 15 + arch/arm/mach-w90x900/irq.c | 172 +- arch/arm/mach-w90x900/mach-nuc910evb.c | 44 + arch/arm/mach-w90x900/mach-nuc950evb.c | 44 + arch/arm/mach-w90x900/mach-nuc960evb.c | 44 + arch/arm/mach-w90x900/mach-w90p910evb.c | 267 - arch/arm/mach-w90x900/mfp-w90p910.c | 116 - arch/arm/mach-w90x900/mfp.c | 158 + arch/arm/mach-w90x900/nuc910.c | 60 + arch/arm/mach-w90x900/nuc910.h | 28 + arch/arm/mach-w90x900/nuc950.c | 54 + arch/arm/mach-w90x900/nuc950.h | 28 + arch/arm/mach-w90x900/nuc960.c | 54 + arch/arm/mach-w90x900/nuc960.h | 28 + arch/arm/mach-w90x900/time.c | 153 +- arch/arm/mach-w90x900/w90p910.c | 136 - arch/arm/mm/Kconfig | 2 +- arch/arm/mm/alignment.c | 20 +- arch/arm/mm/cache-v7.S | 16 +- arch/arm/mm/dma-mapping.c | 94 +- arch/arm/mm/fault.c | 24 + arch/arm/mm/flush.c | 9 +- arch/arm/mm/highmem.c | 8 + arch/arm/mm/init.c | 32 + arch/arm/mm/nommu.c | 1 + arch/arm/mm/proc-macros.S | 8 +- arch/arm/mm/proc-v7.S | 7 +- arch/arm/mm/proc-xscale.S | 2 +- arch/arm/plat-iop/setup.c | 2 +- arch/arm/plat-mxc/Kconfig | 17 + arch/arm/plat-mxc/clock.c | 170 +- arch/arm/plat-mxc/gpio.c | 42 +- .../arm/plat-mxc/include/mach/board-armadillo5x0.h | 7 - .../plat-mxc/include/mach/board-eukrea_cpuimx27.h | 40 + arch/arm/plat-mxc/include/mach/board-mx21ads.h | 6 - arch/arm/plat-mxc/include/mach/board-mx27ads.h | 6 - arch/arm/plat-mxc/include/mach/board-mx27lite.h | 5 - arch/arm/plat-mxc/include/mach/board-mx27pdk.h | 5 - arch/arm/plat-mxc/include/mach/board-mx31ads.h | 5 - arch/arm/plat-mxc/include/mach/board-mx31lilly.h | 5 - arch/arm/plat-mxc/include/mach/board-mx31lite.h | 3 - arch/arm/plat-mxc/include/mach/board-mx31moboard.h | 5 - arch/arm/plat-mxc/include/mach/board-mx31pdk.h | 5 - arch/arm/plat-mxc/include/mach/board-mx35pdk.h | 5 - arch/arm/plat-mxc/include/mach/board-pcm037.h | 5 - arch/arm/plat-mxc/include/mach/board-pcm038.h | 5 - arch/arm/plat-mxc/include/mach/board-pcm043.h | 5 - arch/arm/plat-mxc/include/mach/board-qong.h | 5 - arch/arm/plat-mxc/include/mach/common.h | 19 +- arch/arm/plat-mxc/include/mach/debug-macro.S | 68 +- arch/arm/plat-mxc/include/mach/entry-macro.S | 3 +- arch/arm/plat-mxc/include/mach/hardware.h | 8 + arch/arm/plat-mxc/include/mach/imxfb.h | 29 +- arch/arm/plat-mxc/include/mach/iomux-mx25.h | 517 ++ arch/arm/plat-mxc/include/mach/iomux-mx3.h | 25 + arch/arm/plat-mxc/include/mach/iomux-mxc91231.h | 287 + arch/arm/plat-mxc/include/mach/iomux-v3.h | 35 +- arch/arm/plat-mxc/include/mach/iomux.h | 6 + arch/arm/plat-mxc/include/mach/irqs.h | 4 + arch/arm/plat-mxc/include/mach/memory.h | 4 + arch/arm/plat-mxc/include/mach/mx1.h | 22 - arch/arm/plat-mxc/include/mach/mx21.h | 5 - arch/arm/plat-mxc/include/mach/mx25.h | 44 + arch/arm/plat-mxc/include/mach/mx27.h | 7 - arch/arm/plat-mxc/include/mach/mx2x.h | 18 - arch/arm/plat-mxc/include/mach/mx31.h | 2 +- arch/arm/plat-mxc/include/mach/mx35.h | 1 + arch/arm/plat-mxc/include/mach/mx3x.h | 21 - arch/arm/plat-mxc/include/mach/mxc.h | 28 +- arch/arm/plat-mxc/include/mach/mxc91231.h | 315 ++ arch/arm/plat-mxc/include/mach/system.h | 10 + arch/arm/plat-mxc/include/mach/timex.h | 4 + arch/arm/plat-mxc/include/mach/uncompress.h | 68 +- arch/arm/plat-mxc/iomux-v3.c | 15 +- arch/arm/plat-mxc/irq.c | 6 +- arch/arm/plat-mxc/pwm.c | 19 +- arch/arm/plat-mxc/system.c | 29 +- arch/arm/plat-mxc/time.c | 39 +- arch/arm/plat-omap/debug-leds.c | 11 +- arch/arm/plat-omap/gpio.c | 263 +- arch/arm/plat-omap/include/mach/dma.h | 88 + arch/arm/plat-omap/include/mach/mcbsp.h | 8 +- arch/arm/plat-omap/include/mach/system.h | 2 +- arch/arm/plat-omap/mcbsp.c | 2 +- arch/arm/plat-s3c/Kconfig | 5 + arch/arm/plat-s3c/Makefile | 6 +- arch/arm/plat-s3c/dev-nand.c | 30 + arch/arm/plat-s3c/include/plat/adc.h | 8 +- arch/arm/plat-s3c/include/plat/cpu-freq.h | 87 +- arch/arm/plat-s3c/include/plat/cpu.h | 1 + arch/arm/plat-s3c/include/plat/devs.h | 3 + arch/arm/plat-s3c/include/plat/hwmon.h | 41 + arch/arm/plat-s3c/include/plat/map-base.h | 8 +- arch/arm/{plat-s3c24xx => plat-s3c}/pwm.c | 5 +- arch/arm/plat-s3c24xx/Kconfig | 66 + arch/arm/plat-s3c24xx/Makefile | 12 +- arch/arm/plat-s3c24xx/adc.c | 64 +- arch/arm/plat-s3c24xx/cpu-freq-debugfs.c | 199 + arch/arm/plat-s3c24xx/cpu-freq.c | 716 +++ arch/arm/plat-s3c24xx/cpu.c | 2 +- arch/arm/plat-s3c24xx/devs.c | 71 +- arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h | 282 + arch/arm/plat-s3c24xx/include/plat/fiq.h | 13 + arch/arm/plat-s3c24xx/include/plat/s3c2410.h | 1 + arch/arm/plat-s3c24xx/irq.c | 36 + arch/arm/plat-s3c24xx/s3c2410-cpufreq-utils.c | 64 + arch/arm/plat-s3c24xx/s3c2410-iotiming.c | 477 ++ arch/arm/plat-s3c24xx/s3c2412-iotiming.c | 285 + arch/arm/plat-s3c24xx/s3c2440-cpufreq.c | 311 ++ arch/arm/plat-s3c24xx/s3c2440-pll-12000000.c | 97 + arch/arm/plat-s3c24xx/s3c2440-pll-16934400.c | 127 + arch/arm/plat-s3c24xx/spi-bus1-gpd8_9_10.c | 38 + arch/arm/plat-s3c64xx/Kconfig | 1 + arch/arm/plat-s3c64xx/Makefile | 3 +- arch/arm/{plat-s3c => plat-s3c64xx}/dev-audio.c | 0 arch/arm/plat-s5pc1xx/Kconfig | 50 + arch/arm/plat-s5pc1xx/Makefile | 26 + arch/arm/plat-s5pc1xx/cpu.c | 112 + arch/arm/plat-s5pc1xx/dev-uart.c | 174 + arch/arm/plat-s5pc1xx/include/plat/irqs.h | 182 + arch/arm/plat-s5pc1xx/include/plat/pll.h | 38 + arch/arm/plat-s5pc1xx/include/plat/regs-clock.h | 421 ++ arch/arm/plat-s5pc1xx/include/plat/s5pc100.h | 65 + arch/arm/plat-s5pc1xx/irq.c | 259 + arch/arm/plat-s5pc1xx/s5pc100-clock.c | 1139 ++++ arch/arm/plat-s5pc1xx/s5pc100-init.c | 27 + arch/arm/plat-s5pc1xx/setup-i2c0.c | 25 + arch/arm/plat-s5pc1xx/setup-i2c1.c | 25 + arch/arm/tools/mach-types | 139 +- arch/arm/vfp/entry.S | 2 + arch/arm/vfp/vfphw.S | 48 +- arch/avr32/kernel/vmlinux.lds.S | 9 +- arch/blackfin/include/asm/bfin_rotary.h | 39 + arch/blackfin/kernel/vmlinux.lds.S | 5 +- arch/blackfin/mm/sram-alloc.c | 6 +- arch/cris/include/asm/mmu_context.h | 3 +- arch/cris/kernel/vmlinux.lds.S | 9 +- arch/cris/mm/fault.c | 2 +- arch/frv/kernel/vmlinux.lds.S | 2 + arch/h8300/kernel/vmlinux.lds.S | 5 +- arch/ia64/Kconfig | 7 + arch/ia64/include/asm/agp.h | 4 - arch/ia64/include/asm/device.h | 3 + arch/ia64/include/asm/kvm_host.h | 4 +- arch/ia64/include/asm/kvm_para.h | 4 + arch/ia64/kernel/head.S | 1 + arch/ia64/kernel/head.h | 1 + arch/ia64/kernel/process.c | 7 + arch/ia64/kernel/setup.c | 6 + arch/ia64/kernel/smp.c | 3 +- arch/ia64/kernel/vmlinux.lds.S | 16 +- arch/ia64/kvm/Kconfig | 11 +- arch/ia64/kvm/kvm-ia64.c | 85 +- arch/ia64/kvm/vcpu.c | 4 +- arch/ia64/sn/kernel/setup.c | 2 +- arch/m32r/kernel/vmlinux.lds.S | 10 +- arch/m68k/kernel/vmlinux-std.lds | 10 +- arch/m68k/kernel/vmlinux-sun3.lds | 9 +- arch/m68knommu/kernel/vmlinux.lds.S | 7 +- arch/microblaze/include/asm/device.h | 3 + arch/microblaze/kernel/vmlinux.lds.S | 6 +- arch/mips/kernel/vmlinux.lds.S | 21 +- arch/mn10300/kernel/vmlinux.lds.S | 8 +- arch/parisc/include/asm/agp.h | 4 - arch/parisc/kernel/vmlinux.lds.S | 8 +- arch/powerpc/Kconfig | 32 +- arch/powerpc/Makefile | 2 +- arch/powerpc/boot/4xx.c | 142 + arch/powerpc/boot/4xx.h | 1 + arch/powerpc/boot/Makefile | 6 +- arch/powerpc/boot/cuboot-hotfoot.c | 142 + arch/powerpc/boot/cuboot-kilauea.c | 49 + arch/powerpc/boot/dcr.h | 4 +- arch/powerpc/boot/dts/arches.dts | 50 + arch/powerpc/boot/dts/canyonlands.dts | 49 +- arch/powerpc/boot/dts/eiger.dts | 421 ++ arch/powerpc/boot/dts/gef_sbc310.dts | 64 +- arch/powerpc/boot/dts/hotfoot.dts | 294 + arch/powerpc/boot/dts/kilauea.dts | 44 +- arch/powerpc/boot/dts/mgcoge.dts | 53 + arch/powerpc/boot/dts/mpc8272ads.dts | 8 + arch/powerpc/boot/dts/mpc8377_rdb.dts | 2 +- arch/powerpc/boot/dts/mpc8377_wlan.dts | 464 ++ arch/powerpc/boot/dts/mpc8378_rdb.dts | 2 +- arch/powerpc/boot/dts/mpc8379_rdb.dts | 2 +- arch/powerpc/boot/dts/mpc8536ds.dts | 40 +- arch/powerpc/boot/dts/mpc8536ds_36b.dts | 475 ++ arch/powerpc/boot/dts/mpc8548cds.dts | 20 + arch/powerpc/boot/dts/mpc8569mds.dts | 45 + arch/powerpc/boot/dts/p2020rdb.dts | 586 ++ arch/powerpc/boot/dts/sbc8349.dts | 60 +- arch/powerpc/boot/dts/sbc8560.dts | 1 - arch/powerpc/boot/mktree.c | 10 +- arch/powerpc/boot/ppcboot-hotfoot.h | 133 + arch/powerpc/boot/wrapper | 3 +- arch/powerpc/configs/40x/kilauea_defconfig | 298 +- arch/powerpc/configs/44x/arches_defconfig | 382 ++- arch/powerpc/configs/44x/canyonlands_defconfig | 350 ++- arch/powerpc/configs/44x/eiger_defconfig | 1252 +++++ arch/powerpc/configs/83xx/sbc834x_defconfig | 320 ++- arch/powerpc/configs/mgcoge_defconfig | 86 +- arch/powerpc/configs/mpc85xx_defconfig | 1 + arch/powerpc/include/asm/agp.h | 4 - arch/powerpc/include/asm/bitops.h | 194 +- arch/powerpc/include/asm/cell-regs.h | 11 + arch/powerpc/include/asm/cputhreads.h | 16 + arch/powerpc/include/asm/device.h | 10 +- arch/powerpc/include/asm/dma-mapping.h | 318 +- arch/powerpc/include/asm/exception-64e.h | 205 + .../include/asm/{exception.h => exception-64s.h} | 25 +- arch/powerpc/include/asm/hardirq.h | 30 +- arch/powerpc/include/asm/hw_irq.h | 5 + arch/powerpc/include/asm/iommu.h | 10 - arch/powerpc/include/asm/irq.h | 7 +- arch/powerpc/include/asm/kvm_host.h | 4 +- arch/powerpc/include/asm/machdep.h | 6 +- arch/powerpc/include/asm/mmu-40x.h | 3 + arch/powerpc/include/asm/mmu-44x.h | 6 + arch/powerpc/include/asm/mmu-8xx.h | 3 + arch/powerpc/include/asm/mmu-book3e.h | 208 +- arch/powerpc/include/asm/mmu-hash32.h | 16 +- arch/powerpc/include/asm/mmu-hash64.h | 22 +- arch/powerpc/include/asm/mmu.h | 46 + arch/powerpc/include/asm/mmu_context.h | 15 +- arch/powerpc/include/asm/nvram.h | 3 + arch/powerpc/include/asm/paca.h | 23 +- arch/powerpc/include/asm/page.h | 4 + arch/powerpc/include/asm/page_64.h | 10 + arch/powerpc/include/asm/pci-bridge.h | 40 +- arch/powerpc/include/asm/pci.h | 11 +- arch/powerpc/include/asm/pgalloc.h | 46 +- arch/powerpc/include/asm/pgtable-ppc32.h | 9 +- arch/powerpc/include/asm/pgtable-ppc64-64k.h | 4 +- arch/powerpc/include/asm/pgtable-ppc64.h | 67 +- arch/powerpc/include/asm/pmc.h | 16 +- arch/powerpc/include/asm/ppc-opcode.h | 6 + arch/powerpc/include/asm/ppc-pci.h | 1 - arch/powerpc/include/asm/ppc_asm.h | 26 +- arch/powerpc/include/asm/pte-40x.h | 2 +- arch/powerpc/include/asm/pte-44x.h | 2 +- arch/powerpc/include/asm/pte-8xx.h | 1 - arch/powerpc/include/asm/pte-book3e.h | 84 + arch/powerpc/include/asm/pte-common.h | 25 +- arch/powerpc/include/asm/pte-fsl-booke.h | 9 +- arch/powerpc/include/asm/pte-hash32.h | 1 - arch/powerpc/include/asm/reg.h | 141 +- arch/powerpc/include/asm/reg_booke.h | 50 +- arch/powerpc/include/asm/setup.h | 2 +- arch/powerpc/include/asm/smp.h | 10 + arch/powerpc/include/asm/swiotlb.h | 8 +- arch/powerpc/include/asm/systbl.h | 4 +- arch/powerpc/include/asm/tlb.h | 38 +- arch/powerpc/include/asm/tlbflush.h | 11 +- arch/powerpc/include/asm/vdso.h | 3 +- arch/powerpc/kernel/Makefile | 19 +- arch/powerpc/kernel/asm-offsets.c | 19 +- arch/powerpc/kernel/cpu_setup_6xx.S | 2 +- arch/powerpc/kernel/cputable.c | 62 +- arch/powerpc/kernel/dma-iommu.c | 2 +- arch/powerpc/kernel/dma-swiotlb.c | 53 +- arch/powerpc/kernel/dma.c | 13 +- arch/powerpc/kernel/entry_32.S | 20 +- arch/powerpc/kernel/entry_64.S | 102 +- arch/powerpc/kernel/exceptions-64e.S | 1001 ++++ arch/powerpc/kernel/exceptions-64s.S | 78 +- arch/powerpc/kernel/fpu.S | 2 +- arch/powerpc/kernel/head_32.S | 40 +- arch/powerpc/kernel/head_40x.S | 124 +- arch/powerpc/kernel/head_44x.S | 58 +- arch/powerpc/kernel/head_64.S | 83 +- arch/powerpc/kernel/head_8xx.S | 13 +- arch/powerpc/kernel/head_booke.h | 50 +- arch/powerpc/kernel/head_fsl_booke.S | 100 +- arch/powerpc/kernel/ibmebus.c | 2 +- arch/powerpc/kernel/lparcfg.c | 3 + arch/powerpc/kernel/misc_32.S | 7 + arch/powerpc/kernel/of_platform.c | 2 +- arch/powerpc/kernel/paca.c | 3 + arch/powerpc/kernel/pci-common.c | 133 +- arch/powerpc/kernel/pci_32.c | 105 +- arch/powerpc/kernel/pci_64.c | 335 +-- arch/powerpc/kernel/pci_of_scan.c | 358 ++ arch/powerpc/kernel/perf_counter.c | 68 +- arch/powerpc/kernel/process.c | 16 +- arch/powerpc/kernel/prom_init.c | 107 +- arch/powerpc/kernel/rtas.c | 7 +- arch/powerpc/kernel/setup_32.c | 8 + arch/powerpc/kernel/setup_64.c | 95 +- arch/powerpc/kernel/smp.c | 15 +- arch/powerpc/kernel/sys_ppc32.c | 12 + arch/powerpc/kernel/sysfs.c | 3 + arch/powerpc/kernel/time.c | 33 +- arch/powerpc/kernel/vdso.c | 7 +- arch/powerpc/kernel/vdso32/Makefile | 1 + arch/powerpc/kernel/vdso64/Makefile | 2 + arch/powerpc/kernel/vector.S | 2 +- arch/powerpc/kernel/vio.c | 2 +- arch/powerpc/kernel/vmlinux.lds.S | 17 +- arch/powerpc/kvm/44x.c | 4 +- arch/powerpc/kvm/44x_tlb.c | 11 +- arch/powerpc/kvm/Kconfig | 14 +- arch/powerpc/kvm/Makefile | 4 +- arch/powerpc/kvm/booke.c | 2 +- arch/powerpc/kvm/booke_interrupts.S | 18 +- arch/powerpc/kvm/e500.c | 7 +- arch/powerpc/kvm/e500_emulate.c | 3 + arch/powerpc/kvm/e500_tlb.c | 26 +- arch/powerpc/kvm/e500_tlb.h | 6 +- arch/powerpc/kvm/emulate.c | 7 +- arch/powerpc/kvm/powerpc.c | 32 +- arch/powerpc/kvm/trace.h | 104 + arch/powerpc/mm/40x_mmu.c | 4 +- arch/powerpc/mm/Makefile | 1 + arch/powerpc/mm/fsl_booke_mmu.c | 2 +- arch/powerpc/mm/hash_low_32.S | 4 +- arch/powerpc/mm/hugetlbpage.c | 8 +- arch/powerpc/mm/init_32.c | 2 - arch/powerpc/mm/init_64.c | 55 +- arch/powerpc/mm/mmu_context_nohash.c | 96 +- arch/powerpc/mm/mmu_decl.h | 37 +- arch/powerpc/mm/pgtable.c | 179 +- arch/powerpc/mm/pgtable_32.c | 2 +- arch/powerpc/mm/pgtable_64.c | 59 +- arch/powerpc/mm/slb.c | 46 +- arch/powerpc/mm/stab.c | 2 +- arch/powerpc/mm/tlb_hash32.c | 3 + arch/powerpc/mm/tlb_hash64.c | 20 +- arch/powerpc/mm/tlb_low_64e.S | 770 +++ arch/powerpc/mm/tlb_nohash.c | 268 +- arch/powerpc/mm/tlb_nohash_low.S | 87 +- arch/powerpc/platforms/40x/Kconfig | 10 + arch/powerpc/platforms/40x/ppc40x_simple.c | 3 +- arch/powerpc/platforms/44x/Kconfig | 12 + arch/powerpc/platforms/44x/ppc44x_simple.c | 1 + arch/powerpc/platforms/82xx/mgcoge.c | 69 +- arch/powerpc/platforms/82xx/mpc8272_ads.c | 22 +- arch/powerpc/platforms/83xx/Kconfig | 4 +- arch/powerpc/platforms/83xx/mpc837x_rdb.c | 28 +- arch/powerpc/platforms/83xx/mpc83xx.h | 4 + arch/powerpc/platforms/85xx/Kconfig | 9 + arch/powerpc/platforms/85xx/Makefile | 3 +- arch/powerpc/platforms/85xx/mpc8536_ds.c | 3 +- arch/powerpc/platforms/85xx/mpc85xx_ds.c | 3 +- arch/powerpc/platforms/85xx/mpc85xx_mds.c | 7 +- arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 141 + arch/powerpc/platforms/85xx/sbc8560.c | 39 +- arch/powerpc/platforms/85xx/smp.c | 23 - arch/powerpc/platforms/86xx/gef_ppc9a.c | 37 +- arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 3 +- arch/powerpc/platforms/86xx/mpc86xx_smp.c | 1 - arch/powerpc/platforms/Kconfig.cputype | 38 +- arch/powerpc/platforms/amigaone/setup.c | 6 +- arch/powerpc/platforms/cell/Kconfig | 7 - arch/powerpc/platforms/cell/celleb_setup.c | 3 +- arch/powerpc/platforms/cell/iommu.c | 2 +- arch/powerpc/platforms/cell/smp.c | 2 - arch/powerpc/platforms/cell/spufs/Makefile | 3 +- arch/powerpc/platforms/cell/spufs/context.c | 1 + arch/powerpc/platforms/cell/spufs/file.c | 1 + arch/powerpc/platforms/cell/spufs/sched.c | 2 + arch/powerpc/platforms/cell/spufs/spufs.h | 5 - arch/powerpc/platforms/cell/spufs/sputrace.c | 272 - arch/powerpc/platforms/cell/spufs/sputrace.h | 39 + arch/powerpc/platforms/iseries/exception.S | 59 +- arch/powerpc/platforms/iseries/exception.h | 6 +- arch/powerpc/platforms/iseries/mf.c | 2 +- arch/powerpc/platforms/pasemi/idle.c | 2 +- arch/powerpc/platforms/powermac/cpufreq_32.c | 8 - arch/powerpc/platforms/powermac/feature.c | 13 +- arch/powerpc/platforms/powermac/pci.c | 61 + arch/powerpc/platforms/powermac/smp.c | 2 +- arch/powerpc/platforms/ps3/mm.c | 2 +- arch/powerpc/platforms/ps3/smp.c | 2 +- arch/powerpc/platforms/ps3/system-bus.c | 6 +- arch/powerpc/platforms/pseries/pci_dlpar.c | 2 +- arch/powerpc/platforms/pseries/reconfig.c | 9 +- arch/powerpc/platforms/pseries/setup.c | 4 - arch/powerpc/platforms/pseries/smp.c | 2 - arch/powerpc/sysdev/fsl_rio.c | 18 +- arch/powerpc/sysdev/fsl_soc.c | 6 +- arch/powerpc/sysdev/ipic.c | 7 +- arch/powerpc/sysdev/mmio_nvram.c | 32 + arch/powerpc/sysdev/mpic.c | 13 +- arch/powerpc/sysdev/qe_lib/gpio.c | 4 +- arch/powerpc/sysdev/qe_lib/qe_ic.c | 5 +- arch/powerpc/xmon/Makefile | 2 + arch/powerpc/xmon/xmon.c | 2 +- arch/s390/include/asm/kvm.h | 9 - arch/s390/include/asm/kvm_host.h | 15 +- arch/s390/include/asm/kvm_para.h | 4 + arch/s390/include/asm/percpu.h | 32 +- arch/s390/include/asm/timex.h | 8 + arch/s390/kernel/debug.c | 8 +- arch/s390/kernel/time.c | 1 + arch/s390/kernel/vmlinux.lds.S | 9 +- arch/s390/kvm/Kconfig | 9 +- arch/s390/kvm/gaccess.h | 23 +- arch/s390/kvm/intercept.c | 18 +- arch/s390/kvm/interrupt.c | 8 +- arch/s390/kvm/kvm-s390.c | 78 +- arch/s390/kvm/kvm-s390.h | 32 +- arch/s390/kvm/sigp.c | 60 +- arch/sh/kernel/vmlinux.lds.S | 10 +- arch/sparc/Kconfig | 2 +- arch/sparc/include/asm/agp.h | 4 - arch/sparc/include/asm/device.h | 3 + arch/sparc/kernel/smp_64.c | 132 +- arch/sparc/kernel/vmlinux.lds.S | 8 +- arch/um/include/asm/common.lds.S | 5 - arch/um/kernel/dyn.lds.S | 2 + arch/um/kernel/uml.lds.S | 2 + arch/x86/Kconfig | 13 +- arch/x86/include/asm/agp.h | 4 - arch/x86/include/asm/apicdef.h | 2 + arch/x86/include/asm/bootparam.h | 3 +- arch/x86/include/asm/cacheflush.h | 54 +- arch/x86/include/asm/device.h | 3 + arch/x86/include/asm/fixmap.h | 3 + arch/x86/include/asm/iomap.h | 9 +- arch/x86/include/asm/kvm.h | 10 + .../asm/{kvm_x86_emulate.h => kvm_emulate.h} | 0 arch/x86/include/asm/kvm_host.h | 60 +- arch/x86/include/asm/kvm_para.h | 2 + arch/x86/include/asm/msr-index.h | 1 + arch/x86/include/asm/mtrr.h | 6 + arch/x86/include/asm/pat.h | 5 + arch/x86/include/asm/percpu.h | 9 - arch/x86/include/asm/vmx.h | 8 + arch/x86/kernel/Makefile | 1 + arch/x86/kernel/cpu/cpu_debug.c | 4 +- arch/x86/kernel/cpu/mcheck/mce.c | 20 +- arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 +- arch/x86/kernel/cpu/mtrr/main.c | 46 +- arch/x86/kernel/cpu/perf_counter.c | 14 +- arch/x86/kernel/kvm.c | 7 +- arch/x86/kernel/kvmclock.c | 4 +- arch/x86/kernel/reboot.c | 7 + arch/x86/kernel/setup.c | 23 +- arch/x86/kernel/setup_percpu.c | 364 +-- arch/x86/kernel/smpboot.c | 16 + arch/x86/kernel/tboot.c | 447 ++ arch/x86/kernel/vmlinux.lds.S | 11 +- arch/x86/kvm/Kconfig | 21 +- arch/x86/kvm/Makefile | 35 +- arch/x86/kvm/{x86_emulate.c => emulate.c} | 265 +- arch/x86/kvm/i8254.c | 160 +- arch/x86/kvm/i8254.h | 5 +- arch/x86/kvm/i8259.c | 116 +- arch/x86/kvm/irq.h | 1 - arch/x86/kvm/kvm_cache_regs.h | 9 + arch/x86/kvm/kvm_svm.h | 51 - arch/x86/kvm/kvm_timer.h | 2 +- arch/x86/kvm/lapic.c | 334 +- arch/x86/kvm/lapic.h | 4 + arch/x86/kvm/mmu.c | 587 ++- arch/x86/kvm/mmu.h | 4 +- arch/x86/kvm/mmutrace.h | 220 + arch/x86/kvm/paging_tmpl.h | 141 +- arch/x86/kvm/svm.c | 889 ++-- arch/x86/kvm/timer.c | 16 +- arch/x86/kvm/trace.h | 355 ++ arch/x86/kvm/vmx.c | 497 ++- arch/x86/kvm/x86.c | 815 ++- arch/x86/kvm/x86.h | 4 + arch/x86/mm/highmem_32.c | 1 + arch/x86/mm/iomap_32.c | 27 +- arch/x86/mm/ioremap.c | 18 +- arch/x86/mm/pageattr.c | 29 +- arch/x86/mm/pat.c | 353 +- arch/x86/power/cpu.c | 2 +- arch/xtensa/kernel/vmlinux.lds.S | 13 +- block/Makefile | 2 +- block/as-iosched.c | 10 +- block/blk-barrier.c | 31 +- block/blk-core.c | 166 +- block/blk-iopoll.c | 227 + block/blk-merge.c | 51 +- block/blk-settings.c | 21 +- block/blk-sysfs.c | 7 +- block/blk.h | 1 + block/cfq-iosched.c | 82 +- block/elevator.c | 16 +- block/genhd.c | 22 +- block/ioctl.c | 49 +- drivers/acpi/acpica/hwsleep.c | 3 + drivers/amba/bus.c | 26 +- drivers/base/dd.c | 11 + drivers/base/platform.c | 84 +- drivers/base/power/Makefile | 1 + drivers/base/power/main.c | 199 +- drivers/base/power/power.h | 31 +- drivers/base/power/runtime.c | 1011 ++++ drivers/block/aoe/aoeblk.c | 3 + drivers/block/cciss.c | 4 +- drivers/block/floppy.c | 9 +- drivers/block/loop.c | 2 +- drivers/block/paride/pcd.c | 12 +- drivers/block/ps3vram.c | 2 +- drivers/block/sx8.c | 4 +- drivers/block/viodasd.c | 12 +- drivers/char/agp/agp.h | 15 +- drivers/char/agp/ali-agp.c | 4 +- drivers/char/agp/amd-k7-agp.c | 10 +- drivers/char/agp/amd64-agp.c | 7 +- drivers/char/agp/ati-agp.c | 7 +- drivers/char/agp/backend.c | 32 +- drivers/char/agp/efficeon-agp.c | 4 +- drivers/char/agp/generic.c | 20 +- drivers/char/agp/hp-agp.c | 8 +- drivers/char/agp/i460-agp.c | 17 +- drivers/char/agp/intel-agp.c | 182 +- drivers/char/agp/nvidia-agp.c | 2 +- drivers/char/agp/parisc-agp.c | 12 +- drivers/char/agp/sgi-agp.c | 8 +- drivers/char/agp/sworks-agp.c | 10 +- drivers/char/agp/uninorth-agp.c | 53 +- drivers/char/generic_nvram.c | 27 +- drivers/char/hvc_console.c | 2 - drivers/char/hvc_vio.c | 4 +- drivers/char/hvsi.c | 3 +- drivers/char/serial167.c | 5 +- drivers/cpufreq/cpufreq_conservative.c | 12 +- drivers/cpufreq/cpufreq_ondemand.c | 15 +- drivers/dma/at_hdmac.c | 19 +- drivers/dma/dw_dmac.c | 15 +- drivers/dma/txx9dmac.c | 15 +- drivers/edac/Makefile | 6 +- drivers/edac/amd64_edac.c | 328 +- drivers/edac/amd64_edac.h | 71 +- drivers/edac/amd64_edac_dbg.c | 2 +- drivers/edac/amd64_edac_err_types.c | 161 - drivers/edac/edac_mce_amd.c | 422 ++ drivers/edac/edac_mce_amd.h | 69 + drivers/hid/Kconfig | 29 +- drivers/hid/Makefile | 6 +- drivers/hid/hid-a4tech.c | 4 +- drivers/hid/hid-apple.c | 4 +- drivers/hid/hid-belkin.c | 4 +- drivers/hid/hid-cherry.c | 4 +- drivers/hid/hid-chicony.c | 4 +- drivers/hid/hid-core.c | 71 +- drivers/hid/hid-cypress.c | 4 +- drivers/hid/hid-debug.c | 439 ++- drivers/hid/hid-ezkey.c | 4 +- drivers/hid/hid-gyration.c | 4 +- drivers/hid/hid-ids.h | 14 +- drivers/hid/hid-input.c | 13 +- drivers/hid/hid-kensington.c | 4 +- drivers/hid/hid-kye.c | 4 +- drivers/hid/hid-lg.c | 6 +- drivers/hid/hid-lgff.c | 6 +- drivers/hid/hid-microsoft.c | 4 +- drivers/hid/hid-monterey.c | 4 +- drivers/hid/hid-ntrig.c | 37 +- drivers/hid/hid-petalynx.c | 4 +- drivers/hid/hid-pl.c | 4 +- drivers/hid/hid-samsung.c | 43 +- drivers/hid/hid-sjoy.c | 4 +- drivers/hid/hid-sony.c | 4 +- drivers/hid/hid-sunplus.c | 4 +- drivers/hid/hid-tmff.c | 10 +- drivers/hid/hid-topseed.c | 4 +- drivers/hid/hid-twinhan.c | 147 + drivers/hid/hid-wacom.c | 4 +- drivers/hid/hid-zpff.c | 4 +- drivers/hid/usbhid/hid-core.c | 12 +- drivers/hid/usbhid/hid-quirks.c | 2 +- drivers/hid/usbhid/hiddev.c | 2 +- drivers/hwmon/Kconfig | 17 + drivers/hwmon/Makefile | 1 + drivers/hwmon/s3c-hwmon.c | 405 ++ drivers/i2c/busses/i2c-pxa.c | 25 +- drivers/i2c/busses/i2c-s3c2410.c | 25 +- drivers/ide/at91_ide.c | 2 - drivers/ide/ide-cd.c | 32 +- drivers/ide/ide-disk_proc.c | 129 +- drivers/ide/ide-floppy_proc.c | 30 +- drivers/ide/ide-ioctls.c | 8 +- drivers/ide/ide-iops.c | 17 +- drivers/ide/ide-probe.c | 31 +- drivers/ide/ide-proc.c | 340 +- drivers/ide/ide-tape.c | 160 +- drivers/ide/ide-taskfile.c | 126 +- drivers/ide/palm_bk3710.c | 2 +- drivers/input/joydev.c | 106 +- drivers/input/joystick/xpad.c | 2 + drivers/input/keyboard/Kconfig | 26 +- drivers/input/keyboard/Makefile | 2 + drivers/input/keyboard/atkbd.c | 43 +- drivers/input/keyboard/bf54x-keys.c | 26 +- drivers/input/keyboard/gpio_keys.c | 19 +- drivers/input/keyboard/hil_kbd.c | 607 ++- drivers/input/keyboard/lkkbd.c | 62 +- drivers/input/keyboard/matrix_keypad.c | 15 +- drivers/input/keyboard/pxa27x_keypad.c | 219 +- drivers/input/keyboard/sh_keysc.c | 22 +- drivers/input/keyboard/sunkbd.c | 142 +- drivers/input/keyboard/tosakbd.c | 18 +- drivers/input/keyboard/twl4030_keypad.c | 480 ++ drivers/input/keyboard/w90p910_keypad.c | 281 + drivers/input/misc/Kconfig | 10 + drivers/input/misc/Makefile | 1 + drivers/input/misc/bfin_rotary.c | 283 + drivers/input/misc/cobalt_btns.c | 2 +- drivers/input/misc/dm355evm_keys.c | 42 +- drivers/input/misc/wistron_btns.c | 84 +- drivers/input/mouse/Kconfig | 16 +- drivers/input/mouse/Makefile | 2 +- drivers/input/mouse/alps.c | 20 +- drivers/input/mouse/alps.h | 4 +- drivers/input/mouse/bcm5974.c | 31 +- drivers/input/mouse/elantech.c | 2 +- drivers/input/mouse/elantech.h | 4 +- drivers/input/mouse/hgpk.c | 61 +- drivers/input/mouse/hgpk.h | 6 +- drivers/input/mouse/hil_ptr.c | 447 -- drivers/input/mouse/lifebook.c | 8 +- drivers/input/mouse/lifebook.h | 4 +- drivers/input/mouse/logips2pp.c | 41 +- drivers/input/mouse/logips2pp.h | 4 +- drivers/input/mouse/psmouse-base.c | 113 +- drivers/input/mouse/psmouse.h | 30 +- drivers/input/mouse/sentelic.c | 867 +++ drivers/input/mouse/sentelic.h | 98 + drivers/input/mouse/synaptics.c | 34 +- drivers/input/mouse/synaptics.h | 2 +- drivers/input/mouse/touchkit_ps2.c | 4 +- drivers/input/mouse/touchkit_ps2.h | 4 +- drivers/input/mouse/trackpoint.c | 2 +- drivers/input/mouse/trackpoint.h | 4 +- drivers/input/mouse/vsxxxaa.c | 8 +- drivers/input/serio/at32psif.c | 2 +- drivers/input/serio/i8042-x86ia64io.h | 71 +- drivers/input/serio/i8042.c | 242 +- drivers/input/serio/libps2.c | 15 +- drivers/input/serio/serio.c | 23 +- drivers/input/touchscreen/Kconfig | 16 +- drivers/input/touchscreen/atmel_tsadcc.c | 8 +- drivers/input/touchscreen/eeti_ts.c | 22 +- drivers/input/touchscreen/h3600_ts_input.c | 9 +- drivers/input/touchscreen/mainstone-wm97xx.c | 53 +- drivers/input/touchscreen/tsc2007.c | 264 +- drivers/input/touchscreen/ucb1400_ts.c | 5 +- drivers/input/touchscreen/usbtouchscreen.c | 81 + drivers/input/touchscreen/w90p910_ts.c | 38 +- drivers/input/touchscreen/wacom_w8001.c | 121 +- drivers/input/touchscreen/wm97xx-core.c | 6 +- drivers/macintosh/macio_asic.c | 6 +- drivers/macintosh/therm_windtunnel.c | 4 +- drivers/md/dm-mpath.c | 42 +- drivers/md/dm-raid1.c | 2 +- drivers/md/dm-stripe.c | 4 +- drivers/md/dm.c | 28 +- drivers/md/linear.c | 2 +- drivers/md/multipath.c | 4 +- drivers/md/raid0.c | 2 +- drivers/md/raid1.c | 14 +- drivers/md/raid10.c | 6 +- drivers/md/raid5.c | 2 +- drivers/media/common/ir-functions.c | 15 +- drivers/media/common/ir-keymaps.c | 5022 ++++++++++-------- drivers/media/common/tuners/tda18271-fe.c | 20 +- drivers/media/common/tuners/tda18271-priv.h | 20 +- drivers/media/common/tuners/tda18271.h | 3 + drivers/media/common/tuners/tuner-simple.c | 6 + drivers/media/common/tuners/tuner-types.c | 25 + drivers/media/dvb/Kconfig | 13 + drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 218 +- drivers/media/dvb/bt8xx/dst.c | 2 +- drivers/media/dvb/dm1105/dm1105.c | 150 +- drivers/media/dvb/dvb-core/dmxdev.c | 231 +- drivers/media/dvb/dvb-core/dmxdev.h | 9 +- drivers/media/dvb/dvb-core/dvb_demux.c | 8 +- drivers/media/dvb/dvb-core/dvb_frontend.c | 35 +- drivers/media/dvb/dvb-core/dvbdev.h | 5 + drivers/media/dvb/dvb-usb/Kconfig | 6 +- drivers/media/dvb/dvb-usb/a800.c | 68 +- drivers/media/dvb/dvb-usb/af9005-remote.c | 76 +- drivers/media/dvb/dvb-usb/af9015.c | 20 +- drivers/media/dvb/dvb-usb/af9015.h | 460 +- drivers/media/dvb/dvb-usb/anysee.c | 92 +- drivers/media/dvb/dvb-usb/cinergyT2-core.c | 74 +- drivers/media/dvb/dvb-usb/cinergyT2-fe.c | 1 + drivers/media/dvb/dvb-usb/cxusb.c | 260 +- drivers/media/dvb/dvb-usb/dib0700_devices.c | 387 +- drivers/media/dvb/dvb-usb/dibusb-common.c | 244 +- drivers/media/dvb/dvb-usb/dibusb-mc.c | 10 +- drivers/media/dvb/dvb-usb/digitv.c | 114 +- drivers/media/dvb/dvb-usb/dtt200u.c | 36 +- drivers/media/dvb/dvb-usb/dvb-usb-i2c.c | 2 +- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 6 + drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 73 +- drivers/media/dvb/dvb-usb/dvb-usb.h | 17 +- drivers/media/dvb/dvb-usb/dw2102.c | 403 +- drivers/media/dvb/dvb-usb/m920x.c | 68 +- drivers/media/dvb/dvb-usb/nova-t-usb2.c | 97 +- drivers/media/dvb/dvb-usb/opera1.c | 55 +- drivers/media/dvb/dvb-usb/vp702x.c | 6 +- drivers/media/dvb/dvb-usb/vp7045.c | 102 +- drivers/media/dvb/firewire/firedtv-avc.c | 143 +- drivers/media/dvb/frontends/Kconfig | 7 + drivers/media/dvb/frontends/Makefile | 1 + drivers/media/dvb/frontends/cx22700.c | 2 +- drivers/media/dvb/frontends/cx24113.c | 6 +- drivers/media/dvb/frontends/cx24123.c | 2 +- drivers/media/dvb/frontends/dib0070.c | 2 +- drivers/media/dvb/frontends/dib7000p.c | 2 +- drivers/media/dvb/frontends/dvb-pll.c | 75 + drivers/media/dvb/frontends/dvb-pll.h | 4 + drivers/media/dvb/frontends/lgs8gxx.c | 484 ++- drivers/media/dvb/frontends/lgs8gxx.h | 11 +- drivers/media/dvb/frontends/lgs8gxx_priv.h | 12 +- drivers/media/dvb/frontends/mt312.c | 7 +- drivers/media/dvb/frontends/stb6100.c | 4 +- drivers/media/dvb/frontends/stv0900_core.c | 8 +- drivers/media/dvb/frontends/stv0900_sw.c | 2 +- drivers/media/dvb/frontends/stv6110.c | 48 +- drivers/media/dvb/frontends/stv6110.h | 2 +- drivers/media/dvb/frontends/tda10021.c | 2 +- drivers/media/dvb/frontends/tda8261.c | 4 +- drivers/media/dvb/frontends/ves1820.c | 2 +- drivers/media/dvb/frontends/zl10036.c | 2 +- drivers/media/dvb/frontends/zl10039.c | 308 ++ drivers/media/dvb/frontends/zl10039.h | 40 + drivers/media/dvb/frontends/zl10353.c | 14 +- drivers/media/dvb/pluto2/pluto2.c | 2 +- drivers/media/dvb/ttpci/av7110_v4l.c | 2 +- drivers/media/dvb/ttpci/budget-ci.c | 6 +- drivers/media/radio/Kconfig | 59 +- drivers/media/radio/Makefile | 4 +- drivers/media/radio/radio-cadet.c | 6 +- drivers/media/radio/radio-si470x.c | 1863 ------- drivers/media/radio/radio-si4713.c | 367 ++ drivers/media/radio/si470x/Kconfig | 37 + drivers/media/radio/si470x/Makefile | 9 + drivers/media/radio/si470x/radio-si470x-common.c | 798 +++ drivers/media/radio/si470x/radio-si470x-i2c.c | 401 ++ drivers/media/radio/si470x/radio-si470x-usb.c | 988 ++++ drivers/media/radio/si470x/radio-si470x.h | 225 + drivers/media/radio/si4713-i2c.c | 2060 +++++++ drivers/media/radio/si4713-i2c.h | 237 + drivers/media/video/Kconfig | 6 +- drivers/media/video/au0828/au0828-dvb.c | 2 +- drivers/media/video/au0828/au0828-i2c.c | 1 - drivers/media/video/bt8xx/bttv-cards.c | 1 + drivers/media/video/bt8xx/bttv-driver.c | 14 +- drivers/media/video/bt8xx/bttv-i2c.c | 2 - drivers/media/video/bt8xx/bttv-input.c | 27 +- drivers/media/video/cafe_ccic.c | 1 - drivers/media/video/cx18/cx18-cards.c | 8 +- drivers/media/video/cx18/cx18-cards.h | 18 +- drivers/media/video/cx18/cx18-driver.c | 41 +- drivers/media/video/cx18/cx18-fileops.c | 2 +- drivers/media/video/cx18/cx18-i2c.c | 59 +- drivers/media/video/cx18/cx18-ioctl.c | 2 +- drivers/media/video/cx231xx/cx231xx-conf-reg.h | 8 +- drivers/media/video/cx231xx/cx231xx-i2c.c | 1 - drivers/media/video/cx231xx/cx231xx-video.c | 4 +- drivers/media/video/cx231xx/cx231xx.h | 2 +- drivers/media/video/cx23885/cimax2.c | 1 + drivers/media/video/cx23885/cx23885-417.c | 57 +- drivers/media/video/cx23885/cx23885-cards.c | 77 +- drivers/media/video/cx23885/cx23885-core.c | 30 +- drivers/media/video/cx23885/cx23885-dvb.c | 54 +- drivers/media/video/cx23885/cx23885-i2c.c | 1 - drivers/media/video/cx23885/cx23885.h | 14 +- drivers/media/video/cx25840/cx25840-core.c | 15 +- drivers/media/video/cx25840/cx25840-firmware.c | 48 +- drivers/media/video/cx88/cx88-cards.c | 56 +- drivers/media/video/cx88/cx88-dvb.c | 16 +- drivers/media/video/cx88/cx88-input.c | 78 +- drivers/media/video/cx88/cx88.h | 1 + drivers/media/video/em28xx/em28xx-cards.c | 115 +- drivers/media/video/em28xx/em28xx-i2c.c | 1 - drivers/media/video/em28xx/em28xx-video.c | 161 +- drivers/media/video/em28xx/em28xx.h | 8 +- drivers/media/video/gspca/Kconfig | 21 +- drivers/media/video/gspca/Makefile | 2 + drivers/media/video/gspca/conex.c | 2 +- drivers/media/video/gspca/etoms.c | 4 +- drivers/media/video/gspca/gspca.c | 66 +- drivers/media/video/gspca/gspca.h | 5 +- drivers/media/video/gspca/jeilinj.c | 388 ++ drivers/media/video/gspca/m5602/m5602_s5k83a.c | 4 +- drivers/media/video/gspca/mr97310a.c | 853 +++- drivers/media/video/gspca/pac207.c | 37 +- drivers/media/video/gspca/pac7311.c | 2 + drivers/media/video/gspca/sn9c20x.c | 235 +- drivers/media/video/gspca/sonixj.c | 40 +- drivers/media/video/gspca/spca501.c | 2 +- drivers/media/video/gspca/spca506.c | 2 +- drivers/media/video/gspca/spca508.c | 59 +- drivers/media/video/gspca/stv06xx/stv06xx.c | 4 +- drivers/media/video/gspca/sunplus.c | 386 +- drivers/media/video/gspca/t613.c | 210 +- drivers/media/video/gspca/tv8532.c | 2 +- drivers/media/video/gspca/vc032x.c | 1126 +++-- drivers/media/video/gspca/zc3xx.c | 2 +- drivers/media/video/hdpvr/hdpvr-control.c | 24 +- drivers/media/video/hdpvr/hdpvr-core.c | 12 +- drivers/media/video/hdpvr/hdpvr-i2c.c | 1 - drivers/media/video/hdpvr/hdpvr-video.c | 6 +- drivers/media/video/ir-kbd-i2c.c | 64 +- drivers/media/video/ivtv/ivtv-cards.c | 70 +- drivers/media/video/ivtv/ivtv-cards.h | 3 +- drivers/media/video/ivtv/ivtv-driver.c | 3 +- drivers/media/video/ivtv/ivtv-gpio.c | 13 - drivers/media/video/ivtv/ivtv-i2c.c | 2 - drivers/media/video/meye.c | 3 +- drivers/media/video/pvrusb2/pvrusb2-audio.c | 5 +- drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 1 - drivers/media/video/pwc/pwc-if.c | 78 +- drivers/media/video/pwc/pwc-v4l.c | 2 +- drivers/media/video/pwc/pwc.h | 7 +- drivers/media/video/saa6588.c | 60 +- drivers/media/video/saa7134/Kconfig | 1 + drivers/media/video/saa7134/saa6752hs.c | 2 +- drivers/media/video/saa7134/saa7134-alsa.c | 242 +- drivers/media/video/saa7134/saa7134-cards.c | 213 +- drivers/media/video/saa7134/saa7134-core.c | 4 +- drivers/media/video/saa7134/saa7134-dvb.c | 17 +- drivers/media/video/saa7134/saa7134-input.c | 120 +- drivers/media/video/saa7134/saa7134-video.c | 5 +- drivers/media/video/saa7134/saa7134.h | 9 + drivers/media/video/sn9c102/sn9c102_devtable.h | 2 +- drivers/media/video/stk-webcam.c | 1 - drivers/media/video/stv680.c | 9 +- drivers/media/video/tuner-core.c | 4 +- drivers/media/video/tveeprom.c | 4 +- drivers/media/video/uvc/uvc_ctrl.c | 255 +- drivers/media/video/uvc/uvc_driver.c | 570 ++- drivers/media/video/uvc/uvc_isight.c | 7 +- drivers/media/video/uvc/uvc_v4l2.c | 277 +- drivers/media/video/uvc/uvc_video.c | 434 +- drivers/media/video/uvc/uvcvideo.h | 278 +- drivers/media/video/v4l1-compat.c | 5 +- drivers/media/video/v4l2-common.c | 52 + drivers/media/video/v4l2-compat-ioctl32.c | 67 +- drivers/media/video/v4l2-ioctl.c | 33 +- drivers/media/video/vino.c | 1 - drivers/media/video/w9968cf.c | 1 - drivers/media/video/zoran/zoran_card.c | 3 +- drivers/media/video/zr364xx.c | 1226 ++++- drivers/message/fusion/mptbase.c | 94 +- drivers/message/fusion/mptbase.h | 21 +- drivers/message/fusion/mptfc.c | 19 - drivers/message/fusion/mptsas.c | 62 +- drivers/message/fusion/mptscsih.c | 67 +- drivers/message/fusion/mptscsih.h | 1 - drivers/message/fusion/mptspi.c | 21 - drivers/misc/Kconfig | 13 + drivers/misc/Makefile | 1 + drivers/misc/enclosure.c | 69 +- drivers/misc/ep93xx_pwm.c | 384 ++ drivers/mmc/host/mmci.c | 79 +- drivers/mmc/host/mmci.h | 2 + drivers/mtd/chips/cfi_cmdset_0001.c | 2 +- drivers/mtd/chips/cfi_cmdset_0020.c | 2 +- drivers/mtd/maps/bfin-async-flash.c | 2 +- drivers/mtd/maps/ceiva.c | 2 +- drivers/mtd/maps/dc21285.c | 4 +- drivers/mtd/maps/ipaq-flash.c | 2 +- drivers/mtd/maps/pxa2xx-flash.c | 2 +- drivers/mtd/maps/sa1100-flash.c | 2 +- drivers/mtd/mtdblock.c | 4 +- drivers/mtd/mtdpart.c | 2 +- drivers/mtd/nand/ts7250.c | 5 +- drivers/net/Kconfig | 2 +- drivers/net/smc91x.c | 4 +- drivers/net/smc91x.h | 2 +- drivers/pci/dmar.c | 7 + drivers/pci/intel-iommu.c | 17 +- drivers/pci/pci-driver.c | 16 +- drivers/platform/x86/hp-wmi.c | 15 +- drivers/ps3/ps3stor_lib.c | 65 +- drivers/rtc/rtc-sa1100.c | 2 +- drivers/s390/scsi/zfcp_aux.c | 288 +- drivers/s390/scsi/zfcp_ccw.c | 94 +- drivers/s390/scsi/zfcp_dbf.c | 544 +-- drivers/s390/scsi/zfcp_dbf.h | 175 +- drivers/s390/scsi/zfcp_def.h | 183 +- drivers/s390/scsi/zfcp_erp.c | 155 +- drivers/s390/scsi/zfcp_ext.h | 102 +- drivers/s390/scsi/zfcp_fc.c | 176 +- drivers/s390/scsi/zfcp_fsf.c | 635 ++-- drivers/s390/scsi/zfcp_fsf.h | 3 +- drivers/s390/scsi/zfcp_qdio.c | 369 +- drivers/s390/scsi/zfcp_scsi.c | 73 +- drivers/s390/scsi/zfcp_sysfs.c | 34 +- drivers/scsi/Kconfig | 6 + drivers/scsi/Makefile | 1 + drivers/scsi/bnx2i/bnx2i_init.c | 100 +- drivers/scsi/bnx2i/bnx2i_iscsi.c | 13 +- drivers/scsi/ch.c | 6 + drivers/scsi/constants.c | 95 +- drivers/scsi/device_handler/scsi_dh.c | 56 +- drivers/scsi/device_handler/scsi_dh_alua.c | 2 +- drivers/scsi/device_handler/scsi_dh_emc.c | 59 +- drivers/scsi/device_handler/scsi_dh_rdac.c | 116 +- drivers/scsi/fcoe/fcoe.c | 1078 +++-- drivers/scsi/fcoe/fcoe.h | 36 +- drivers/scsi/fcoe/libfcoe.c | 30 +- drivers/scsi/fnic/fnic_fcs.c | 2 +- drivers/scsi/fnic/fnic_main.c | 20 +- drivers/scsi/ibmvscsi/ibmvfc.c | 2 +- drivers/scsi/ipr.h | 2 +- drivers/scsi/iscsi_tcp.c | 31 +- drivers/scsi/libfc/fc_disc.c | 523 +-- drivers/scsi/libfc/fc_elsct.c | 49 +- drivers/scsi/libfc/fc_exch.c | 515 ++- drivers/scsi/libfc/fc_fcp.c | 31 +- drivers/scsi/libfc/fc_lport.c | 283 +- drivers/scsi/libfc/fc_rport.c | 1144 +++-- drivers/scsi/libiscsi.c | 201 +- drivers/scsi/libsrp.c | 1 + drivers/scsi/lpfc/Makefile | 2 +- drivers/scsi/lpfc/lpfc.h | 19 + drivers/scsi/lpfc/lpfc_attr.c | 10 +- drivers/scsi/lpfc/lpfc_bsg.c | 904 ++++ drivers/scsi/lpfc/lpfc_crtn.h | 18 +- drivers/scsi/lpfc/lpfc_ct.c | 2 + drivers/scsi/lpfc/lpfc_els.c | 2 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 259 +- drivers/scsi/lpfc/lpfc_hw.h | 4 +- drivers/scsi/lpfc/lpfc_hw4.h | 74 +- drivers/scsi/lpfc/lpfc_init.c | 134 +- drivers/scsi/lpfc/lpfc_mbox.c | 93 +- drivers/scsi/lpfc/lpfc_mem.c | 41 +- drivers/scsi/lpfc/lpfc_nl.h | 20 + drivers/scsi/lpfc/lpfc_scsi.c | 7 +- drivers/scsi/lpfc/lpfc_sli.c | 263 +- drivers/scsi/lpfc/lpfc_sli4.h | 5 + drivers/scsi/lpfc/lpfc_version.h | 2 +- drivers/scsi/lpfc/lpfc_vport.c | 53 +- drivers/scsi/mpt2sas/mpt2sas_base.c | 96 +- drivers/scsi/mpt2sas/mpt2sas_base.h | 51 +- drivers/scsi/mpt2sas/mpt2sas_config.c | 904 +--- drivers/scsi/mpt2sas/mpt2sas_ctl.c | 16 +- drivers/scsi/mpt2sas/mpt2sas_scsih.c | 252 +- drivers/scsi/mpt2sas/mpt2sas_transport.c | 33 +- drivers/scsi/pcmcia/nsp_cs.c | 2 +- drivers/scsi/pmcraid.c | 5604 ++++++++++++++++++++ drivers/scsi/pmcraid.h | 1029 ++++ drivers/scsi/qla2xxx/qla_attr.c | 9 +- drivers/scsi/qla2xxx/qla_def.h | 39 +- drivers/scsi/qla2xxx/qla_fw.h | 2 +- drivers/scsi/qla2xxx/qla_gbl.h | 20 + drivers/scsi/qla2xxx/qla_gs.c | 4 + drivers/scsi/qla2xxx/qla_init.c | 239 +- drivers/scsi/qla2xxx/qla_iocb.c | 206 +- drivers/scsi/qla2xxx/qla_isr.c | 309 ++- drivers/scsi/qla2xxx/qla_mbx.c | 7 +- drivers/scsi/qla2xxx/qla_mid.c | 27 +- drivers/scsi/qla2xxx/qla_os.c | 141 +- drivers/scsi/qla2xxx/qla_version.h | 2 +- drivers/scsi/qla4xxx/ql4_isr.c | 8 +- drivers/scsi/scsi.c | 13 +- drivers/scsi/scsi_error.c | 6 +- drivers/scsi/scsi_lib.c | 7 +- drivers/scsi/scsi_transport_fc.c | 4 +- drivers/scsi/scsi_transport_iscsi.c | 73 +- drivers/scsi/scsi_transport_sas.c | 4 - drivers/scsi/sd.c | 2 + drivers/scsi/ses.c | 209 +- drivers/scsi/sg.c | 2 +- drivers/scsi/stex.c | 33 +- drivers/serial/Kconfig | 9 +- drivers/serial/Makefile | 1 + drivers/serial/amba-pl011.c | 26 + drivers/serial/imx.c | 65 +- drivers/serial/serial_ks8695.c | 6 +- drivers/spi/amba-pl022.c | 2 - drivers/staging/dst/dcore.c | 5 +- drivers/usb/musb/musb_core.c | 18 +- drivers/video/Kconfig | 4 +- drivers/video/atmel_lcdfb.c | 6 +- drivers/video/backlight/Kconfig | 2 +- drivers/video/imxfb.c | 184 +- drivers/video/ps3fb.c | 2 +- drivers/video/sa1100fb.c | 2 +- drivers/xen/events.c | 13 +- fs/btrfs/extent-tree.c | 3 +- fs/btrfs/volumes.c | 4 +- fs/gfs2/rgrp.c | 6 +- fs/partitions/check.c | 12 +- fs/splice.c | 8 +- include/asm-generic/Kbuild.asm | 5 + include/asm-generic/device.h | 3 + include/asm-generic/vmlinux.lds.h | 24 +- include/linux/Kbuild | 4 + include/linux/agp_backend.h | 5 +- include/linux/amba/bus.h | 5 + include/linux/amba/pl093.h | 80 + include/linux/bio.h | 69 +- include/linux/blk-iopoll.h | 48 + include/linux/blkdev.h | 44 +- include/linux/cred.h | 13 +- include/linux/device.h | 9 +- include/linux/dma-mapping.h | 1 + include/linux/dtlk.h | 19 - include/linux/dvb/dmx.h | 2 + include/linux/enclosure.h | 5 +- include/linux/fs.h | 4 +- include/linux/genhd.h | 21 +- include/linux/hid-debug.h | 48 +- include/linux/hid.h | 22 +- include/linux/i2c/twl4030.h | 19 +- include/linux/ide.h | 30 +- include/linux/input/eeti_ts.h | 9 + include/linux/input/matrix_keypad.h | 32 + include/linux/interrupt.h | 1 + include/linux/io-mapping.h | 17 +- include/linux/kvm.h | 127 +- include/linux/kvm_host.h | 114 +- include/linux/kvm_para.h | 1 + include/linux/libps2.h | 1 + include/linux/mtd/partitions.h | 2 +- include/linux/page-flags.h | 4 +- include/linux/pci_ids.h | 1 + include/linux/percpu-defs.h | 66 +- include/linux/percpu.h | 88 +- include/linux/platform_device.h | 5 +- include/linux/pm.h | 115 +- include/linux/pm_runtime.h | 114 + include/linux/selinux.h | 9 + include/linux/serio.h | 2 - include/linux/slob_def.h | 5 - include/linux/slub_def.h | 8 +- include/linux/tboot.h | 162 + include/linux/tty.h | 4 - include/linux/usb/video.h | 164 + include/linux/videodev2.h | 105 +- include/linux/vmalloc.h | 6 + include/linux/wm97xx.h | 7 + include/media/ir-common.h | 138 +- include/media/ir-kbd-i2c.h | 22 +- include/media/radio-si4713.h | 30 + include/media/si4713.h | 49 + include/media/tuner.h | 1 + include/media/v4l2-subdev.h | 5 + include/scsi/fc/fc_gs.h | 1 + include/scsi/fc_encode.h | 60 +- include/scsi/fc_frame.h | 7 - include/scsi/iscsi_if.h | 1 + include/scsi/libfc.h | 244 +- include/scsi/libiscsi.h | 3 + include/scsi/scsi_device.h | 3 + include/scsi/scsi_dh.h | 5 + include/trace/events/kvm.h | 151 + init/main.c | 24 - ipc/shm.c | 2 +- kernel/Makefile | 2 +- kernel/cpu.c | 15 + kernel/cred.c | 3 +- kernel/gcov/Kconfig | 2 +- kernel/module.c | 6 +- kernel/perf_counter.c | 7 +- kernel/power/Kconfig | 14 + kernel/power/hibernate.c | 21 +- kernel/power/main.c | 17 + kernel/power/power.h | 2 +- kernel/power/snapshot.c | 412 ++- kernel/printk.c | 6 - kernel/sched.c | 4 +- kernel/smp.c | 40 +- kernel/sysctl.c | 10 +- kernel/trace/trace_events.c | 6 +- lib/Kconfig.debug | 17 +- lib/inflate.c | 2 +- mm/Kconfig | 2 +- mm/Makefile | 2 +- mm/allocpercpu.c | 28 + mm/hugetlb.c | 1 + mm/kmemleak-test.c | 6 +- mm/page-writeback.c | 5 +- mm/percpu.c | 1420 ++++-- mm/quicklist.c | 2 +- mm/slob.c | 5 + mm/slub.c | 86 +- mm/swapfile.c | 6 +- mm/vmalloc.c | 338 ++- net/ipv4/syncookies.c | 5 +- net/ipv6/syncookies.c | 5 +- net/rds/ib_stats.c | 2 +- net/rds/iw_stats.c | 2 +- net/rds/page.c | 2 +- scripts/extract-ikconfig | 14 + scripts/kconfig/Makefile | 34 +- scripts/kconfig/streamline_config.pl | 366 ++ scripts/module-common.lds | 8 + security/Kconfig | 30 + security/keys/gc.c | 78 +- security/keys/key.c | 4 +- security/keys/keyctl.c | 3 +- security/keys/keyring.c | 24 +- security/selinux/avc.c | 26 +- security/selinux/exports.c | 6 + sound/soc/atmel/sam9g20_wm8731.c | 36 - sound/soc/s3c24xx/s3c24xx-ac97.h | 6 - virt/kvm/Kconfig | 14 + virt/kvm/coalesced_mmio.c | 74 +- virt/kvm/coalesced_mmio.h | 1 + virt/kvm/eventfd.c | 578 ++ virt/kvm/ioapic.c | 78 +- virt/kvm/iodev.h | 55 +- virt/kvm/irq_comm.c | 51 +- virt/kvm/kvm_main.c | 298 +- virt/kvm/kvm_trace.c | 285 - 1499 files changed, 110463 insertions(+), 25929 deletions(-) create mode 100644 Documentation/arm/Samsung-S3C24XX/CPUfreq.txt create mode 100644 Documentation/flexible-arrays.txt create mode 100644 Documentation/input/sentelic.txt create mode 100644 Documentation/intel_txt.txt create mode 100644 Documentation/kvm/api.txt create mode 100644 Documentation/power/runtime_pm.txt create mode 100644 Documentation/video4linux/si4713.txt create mode 100644 arch/arm/configs/bcmring_defconfig create mode 100644 arch/arm/configs/cpu9260_defconfig create mode 100644 arch/arm/configs/cpu9g20_defconfig create mode 100644 arch/arm/configs/cpuat91_defconfig create mode 100644 arch/arm/configs/nhk8815_defconfig create mode 100644 arch/arm/configs/s5pc100_defconfig create mode 100644 arch/arm/include/asm/unified.h create mode 100644 arch/arm/kernel/return_address.c create mode 100644 arch/arm/mach-at91/at91sam9g45.c create mode 100644 arch/arm/mach-at91/at91sam9g45_devices.c create mode 100644 arch/arm/mach-at91/board-cpu9krea.c create mode 100644 arch/arm/mach-at91/board-cpuat91.c create mode 100644 arch/arm/mach-at91/board-sam9m10g45ek.c create mode 100644 arch/arm/mach-at91/include/mach/at91sam9g45.h create mode 100644 arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h create mode 100644 arch/arm/mach-bcmring/Kconfig create mode 100644 arch/arm/mach-bcmring/Makefile create mode 100644 arch/arm/mach-bcmring/Makefile.boot create mode 100644 arch/arm/mach-bcmring/arch.c create mode 100644 arch/arm/mach-bcmring/clock.c create mode 100644 arch/arm/mach-bcmring/clock.h create mode 100644 arch/arm/mach-bcmring/core.c create mode 100644 arch/arm/mach-bcmring/core.h create mode 100644 arch/arm/mach-bcmring/csp/Makefile create mode 100644 arch/arm/mach-bcmring/csp/chipc/Makefile create mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw.c create mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c create mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c create mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_str.c create mode 100644 arch/arm/mach-bcmring/csp/dmac/Makefile create mode 100644 arch/arm/mach-bcmring/csp/dmac/dmacHw.c create mode 100644 arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c create mode 100644 arch/arm/mach-bcmring/csp/tmr/Makefile create mode 100644 arch/arm/mach-bcmring/csp/tmr/tmrHw.c create mode 100644 arch/arm/mach-bcmring/dma.c create mode 100644 arch/arm/mach-bcmring/dma_device.c create mode 100644 arch/arm/mach-bcmring/include/cfg_global.h create mode 100644 arch/arm/mach-bcmring/include/cfg_global_defines.h create mode 100644 arch/arm/mach-bcmring/include/csp/cache.h create mode 100644 arch/arm/mach-bcmring/include/csp/delay.h create mode 100644 arch/arm/mach-bcmring/include/csp/dmacHw.h create mode 100644 arch/arm/mach-bcmring/include/csp/errno.h create mode 100644 arch/arm/mach-bcmring/include/csp/intcHw.h create mode 100644 arch/arm/mach-bcmring/include/csp/module.h create mode 100644 arch/arm/mach-bcmring/include/csp/reg.h create mode 100644 arch/arm/mach-bcmring/include/csp/secHw.h create mode 100644 arch/arm/mach-bcmring/include/csp/stdint.h create mode 100644 arch/arm/mach-bcmring/include/csp/string.h create mode 100644 arch/arm/mach-bcmring/include/csp/tmrHw.h create mode 100644 arch/arm/mach-bcmring/include/mach/clkdev.h create mode 100644 arch/arm/mach-bcmring/include/mach/csp/cap.h create mode 100644 arch/arm/mach-bcmring/include/mach/csp/cap_inline.h create mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_def.h create mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_inline.h create mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_reg.h create mode 100644 arch/arm/mach-bcmring/include/mach/csp/ddrcReg.h create mode 100644 arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h create mode 100644 arch/arm/mach-bcmring/include/mach/csp/dmacHw_reg.h create mode 100644 arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h create mode 100644 arch/arm/mach-bcmring/include/mach/csp/intcHw_reg.h create mode 100644 arch/arm/mach-bcmring/include/mach/csp/mm_addr.h create mode 100644 arch/arm/mach-bcmring/include/mach/csp/mm_io.h create mode 100644 arch/arm/mach-bcmring/include/mach/csp/secHw_def.h create mode 100644 arch/arm/mach-bcmring/include/mach/csp/secHw_inline.h create mode 100644 arch/arm/mach-bcmring/include/mach/csp/tmrHw_reg.h create mode 100644 arch/arm/mach-bcmring/include/mach/dma.h create mode 100644 arch/arm/mach-bcmring/include/mach/entry-macro.S create mode 100644 arch/arm/mach-bcmring/include/mach/hardware.h create mode 100644 arch/arm/mach-bcmring/include/mach/io.h create mode 100644 arch/arm/mach-bcmring/include/mach/irqs.h create mode 100644 arch/arm/mach-bcmring/include/mach/memory.h create mode 100644 arch/arm/mach-bcmring/include/mach/memory_settings.h create mode 100644 arch/arm/mach-bcmring/include/mach/system.h create mode 100644 arch/arm/mach-bcmring/include/mach/timer.h create mode 100644 arch/arm/mach-bcmring/include/mach/timex.h create mode 100644 arch/arm/mach-bcmring/include/mach/uncompress.h create mode 100644 arch/arm/mach-bcmring/include/mach/vmalloc.h create mode 100644 arch/arm/mach-bcmring/irq.c create mode 100644 arch/arm/mach-bcmring/mm.c create mode 100644 arch/arm/mach-bcmring/timer.c create mode 100644 arch/arm/mach-kirkwood/openrd_base-setup.c create mode 100644 arch/arm/mach-mx2/eukrea_cpuimx27.c create mode 100644 arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c create mode 100644 arch/arm/mach-mx2/pca100.c create mode 100644 arch/arm/mach-mx25/Kconfig create mode 100644 arch/arm/mach-mx25/Makefile create mode 100644 arch/arm/mach-mx25/Makefile.boot create mode 100644 arch/arm/mach-mx25/clock.c create mode 100644 arch/arm/mach-mx25/devices.c create mode 100644 arch/arm/mach-mx25/devices.h create mode 100644 arch/arm/mach-mx25/mm.c create mode 100644 arch/arm/mach-mx25/mx25pdk.c create mode 100644 arch/arm/mach-mxc91231/Kconfig create mode 100644 arch/arm/mach-mxc91231/Makefile create mode 100644 arch/arm/mach-mxc91231/Makefile.boot create mode 100644 arch/arm/mach-mxc91231/clock.c create mode 100644 arch/arm/mach-mxc91231/crm_regs.h create mode 100644 arch/arm/mach-mxc91231/devices.c create mode 100644 arch/arm/mach-mxc91231/devices.h create mode 100644 arch/arm/mach-mxc91231/iomux.c create mode 100644 arch/arm/mach-mxc91231/magx-zn5.c create mode 100644 arch/arm/mach-mxc91231/mm.c create mode 100644 arch/arm/mach-mxc91231/system.c create mode 100644 arch/arm/mach-nomadik/Kconfig create mode 100644 arch/arm/mach-nomadik/Makefile create mode 100644 arch/arm/mach-nomadik/Makefile.boot create mode 100644 arch/arm/mach-nomadik/board-nhk8815.c create mode 100644 arch/arm/mach-nomadik/clock.c create mode 100644 arch/arm/mach-nomadik/clock.h create mode 100644 arch/arm/mach-nomadik/cpu-8815.c create mode 100644 arch/arm/mach-nomadik/gpio.c create mode 100644 arch/arm/mach-nomadik/i2c-8815nhk.c create mode 100644 arch/arm/mach-nomadik/include/mach/clkdev.h create mode 100644 arch/arm/mach-nomadik/include/mach/debug-macro.S create mode 100644 arch/arm/mach-nomadik/include/mach/entry-macro.S create mode 100644 arch/arm/mach-nomadik/include/mach/gpio.h create mode 100644 arch/arm/mach-nomadik/include/mach/hardware.h create mode 100644 arch/arm/mach-nomadik/include/mach/io.h create mode 100644 arch/arm/mach-nomadik/include/mach/irqs.h create mode 100644 arch/arm/mach-nomadik/include/mach/memory.h create mode 100644 arch/arm/mach-nomadik/include/mach/mtu.h create mode 100644 arch/arm/mach-nomadik/include/mach/setup.h create mode 100644 arch/arm/mach-nomadik/include/mach/system.h create mode 100644 arch/arm/mach-nomadik/include/mach/timex.h create mode 100644 arch/arm/mach-nomadik/include/mach/uncompress.h create mode 100644 arch/arm/mach-nomadik/include/mach/vmalloc.h create mode 100644 arch/arm/mach-nomadik/timer.c create mode 100644 arch/arm/mach-orion5x/d2net-setup.c create mode 100644 arch/arm/mach-orion5x/net2big-setup.c create mode 100644 arch/arm/mach-realview/include/mach/gpio.h create mode 100644 arch/arm/mach-s3c2410/cpu-freq.c create mode 100644 arch/arm/mach-s3c2410/pll.c create mode 100644 arch/arm/mach-s3c2412/cpu-freq.c create mode 100644 arch/arm/mach-s3c6410/mach-hmt.c create mode 100644 arch/arm/mach-s5pc100/Kconfig create mode 100644 arch/arm/mach-s5pc100/Makefile create mode 100644 arch/arm/mach-s5pc100/Makefile.boot create mode 100644 arch/arm/mach-s5pc100/cpu.c create mode 100644 arch/arm/mach-s5pc100/include/mach/debug-macro.S create mode 100644 arch/arm/mach-s5pc100/include/mach/entry-macro.S create mode 100644 arch/arm/mach-s5pc100/include/mach/gpio-core.h create mode 100644 arch/arm/mach-s5pc100/include/mach/gpio.h create mode 100644 arch/arm/mach-s5pc100/include/mach/hardware.h create mode 100644 arch/arm/mach-s5pc100/include/mach/irqs.h create mode 100644 arch/arm/mach-s5pc100/include/mach/map.h create mode 100644 arch/arm/mach-s5pc100/include/mach/memory.h create mode 100644 arch/arm/mach-s5pc100/include/mach/pwm-clock.h create mode 100644 arch/arm/mach-s5pc100/include/mach/regs-irq.h create mode 100644 arch/arm/mach-s5pc100/include/mach/system.h create mode 100644 arch/arm/mach-s5pc100/include/mach/tick.h create mode 100644 arch/arm/mach-s5pc100/include/mach/uncompress.h create mode 100644 arch/arm/mach-s5pc100/mach-smdkc100.c create mode 100644 arch/arm/mach-versatile/include/mach/gpio.h create mode 100644 arch/arm/mach-w90x900/clksel.c create mode 100644 arch/arm/mach-w90x900/cpu.c create mode 100644 arch/arm/mach-w90x900/dev.c create mode 100644 arch/arm/mach-w90x900/include/mach/regs-ebi.h create mode 100644 arch/arm/mach-w90x900/include/mach/w90p910_keypad.h create mode 100644 arch/arm/mach-w90x900/mach-nuc910evb.c create mode 100644 arch/arm/mach-w90x900/mach-nuc950evb.c create mode 100644 arch/arm/mach-w90x900/mach-nuc960evb.c delete mode 100644 arch/arm/mach-w90x900/mach-w90p910evb.c delete mode 100644 arch/arm/mach-w90x900/mfp-w90p910.c create mode 100644 arch/arm/mach-w90x900/mfp.c create mode 100644 arch/arm/mach-w90x900/nuc910.c create mode 100644 arch/arm/mach-w90x900/nuc910.h create mode 100644 arch/arm/mach-w90x900/nuc950.c create mode 100644 arch/arm/mach-w90x900/nuc950.h create mode 100644 arch/arm/mach-w90x900/nuc960.c create mode 100644 arch/arm/mach-w90x900/nuc960.h delete mode 100644 arch/arm/mach-w90x900/w90p910.c create mode 100644 arch/arm/plat-mxc/include/mach/board-eukrea_cpuimx27.h create mode 100644 arch/arm/plat-mxc/include/mach/iomux-mx25.h create mode 100644 arch/arm/plat-mxc/include/mach/iomux-mxc91231.h create mode 100644 arch/arm/plat-mxc/include/mach/mx25.h create mode 100644 arch/arm/plat-mxc/include/mach/mxc91231.h create mode 100644 arch/arm/plat-s3c/dev-nand.c create mode 100644 arch/arm/plat-s3c/include/plat/hwmon.h rename arch/arm/{plat-s3c24xx => plat-s3c}/pwm.c (99%) create mode 100644 arch/arm/plat-s3c24xx/cpu-freq-debugfs.c create mode 100644 arch/arm/plat-s3c24xx/cpu-freq.c create mode 100644 arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h create mode 100644 arch/arm/plat-s3c24xx/include/plat/fiq.h create mode 100644 arch/arm/plat-s3c24xx/s3c2410-cpufreq-utils.c create mode 100644 arch/arm/plat-s3c24xx/s3c2410-iotiming.c create mode 100644 arch/arm/plat-s3c24xx/s3c2412-iotiming.c create mode 100644 arch/arm/plat-s3c24xx/s3c2440-cpufreq.c create mode 100644 arch/arm/plat-s3c24xx/s3c2440-pll-12000000.c create mode 100644 arch/arm/plat-s3c24xx/s3c2440-pll-16934400.c create mode 100644 arch/arm/plat-s3c24xx/spi-bus1-gpd8_9_10.c rename arch/arm/{plat-s3c => plat-s3c64xx}/dev-audio.c (100%) create mode 100644 arch/arm/plat-s5pc1xx/Kconfig create mode 100644 arch/arm/plat-s5pc1xx/Makefile create mode 100644 arch/arm/plat-s5pc1xx/cpu.c create mode 100644 arch/arm/plat-s5pc1xx/dev-uart.c create mode 100644 arch/arm/plat-s5pc1xx/include/plat/irqs.h create mode 100644 arch/arm/plat-s5pc1xx/include/plat/pll.h create mode 100644 arch/arm/plat-s5pc1xx/include/plat/regs-clock.h create mode 100644 arch/arm/plat-s5pc1xx/include/plat/s5pc100.h create mode 100644 arch/arm/plat-s5pc1xx/irq.c create mode 100644 arch/arm/plat-s5pc1xx/s5pc100-clock.c create mode 100644 arch/arm/plat-s5pc1xx/s5pc100-init.c create mode 100644 arch/arm/plat-s5pc1xx/setup-i2c0.c create mode 100644 arch/arm/plat-s5pc1xx/setup-i2c1.c create mode 100644 arch/blackfin/include/asm/bfin_rotary.h create mode 100644 arch/ia64/kernel/head.h create mode 100644 arch/powerpc/boot/cuboot-hotfoot.c create mode 100644 arch/powerpc/boot/cuboot-kilauea.c create mode 100644 arch/powerpc/boot/dts/eiger.dts create mode 100644 arch/powerpc/boot/dts/hotfoot.dts create mode 100644 arch/powerpc/boot/dts/mpc8377_wlan.dts create mode 100644 arch/powerpc/boot/dts/mpc8536ds_36b.dts create mode 100644 arch/powerpc/boot/dts/p2020rdb.dts create mode 100644 arch/powerpc/boot/ppcboot-hotfoot.h create mode 100644 arch/powerpc/configs/44x/eiger_defconfig create mode 100644 arch/powerpc/include/asm/exception-64e.h rename arch/powerpc/include/asm/{exception.h => exception-64s.h} (94%) create mode 100644 arch/powerpc/include/asm/pte-book3e.h create mode 100644 arch/powerpc/kernel/exceptions-64e.S create mode 100644 arch/powerpc/kernel/pci_of_scan.c create mode 100644 arch/powerpc/kvm/trace.h create mode 100644 arch/powerpc/mm/tlb_low_64e.S create mode 100644 arch/powerpc/platforms/85xx/mpc85xx_rdb.c delete mode 100644 arch/powerpc/platforms/cell/spufs/sputrace.c create mode 100644 arch/powerpc/platforms/cell/spufs/sputrace.h rename arch/x86/include/asm/{kvm_x86_emulate.h => kvm_emulate.h} (100%) create mode 100644 arch/x86/kernel/tboot.c rename arch/x86/kvm/{x86_emulate.c => emulate.c} (90%) delete mode 100644 arch/x86/kvm/kvm_svm.h create mode 100644 arch/x86/kvm/mmutrace.h create mode 100644 arch/x86/kvm/trace.h create mode 100644 block/blk-iopoll.c create mode 100644 drivers/base/power/runtime.c delete mode 100644 drivers/edac/amd64_edac_err_types.c create mode 100644 drivers/edac/edac_mce_amd.c create mode 100644 drivers/edac/edac_mce_amd.h create mode 100644 drivers/hid/hid-twinhan.c create mode 100644 drivers/hwmon/s3c-hwmon.c create mode 100644 drivers/input/keyboard/twl4030_keypad.c create mode 100644 drivers/input/keyboard/w90p910_keypad.c create mode 100644 drivers/input/misc/bfin_rotary.c delete mode 100644 drivers/input/mouse/hil_ptr.c create mode 100644 drivers/input/mouse/sentelic.c create mode 100644 drivers/input/mouse/sentelic.h create mode 100644 drivers/media/dvb/frontends/zl10039.c create mode 100644 drivers/media/dvb/frontends/zl10039.h delete mode 100644 drivers/media/radio/radio-si470x.c create mode 100644 drivers/media/radio/radio-si4713.c create mode 100644 drivers/media/radio/si470x/Kconfig create mode 100644 drivers/media/radio/si470x/Makefile create mode 100644 drivers/media/radio/si470x/radio-si470x-common.c create mode 100644 drivers/media/radio/si470x/radio-si470x-i2c.c create mode 100644 drivers/media/radio/si470x/radio-si470x-usb.c create mode 100644 drivers/media/radio/si470x/radio-si470x.h create mode 100644 drivers/media/radio/si4713-i2c.c create mode 100644 drivers/media/radio/si4713-i2c.h create mode 100644 drivers/media/video/gspca/jeilinj.c create mode 100644 drivers/misc/ep93xx_pwm.c create mode 100644 drivers/scsi/lpfc/lpfc_bsg.c create mode 100644 drivers/scsi/pmcraid.c create mode 100644 drivers/scsi/pmcraid.h create mode 100644 include/linux/amba/pl093.h create mode 100644 include/linux/blk-iopoll.h create mode 100644 include/linux/input/eeti_ts.h create mode 100644 include/linux/pm_runtime.h create mode 100644 include/linux/tboot.h create mode 100644 include/linux/usb/video.h create mode 100644 include/media/radio-si4713.h create mode 100644 include/media/si4713.h create mode 100644 include/trace/events/kvm.h create mode 100644 scripts/kconfig/streamline_config.pl create mode 100644 scripts/module-common.lds create mode 100644 virt/kvm/Kconfig create mode 100644 virt/kvm/eventfd.c delete mode 100644 virt/kvm/kvm_trace.c 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/common/vic.c | 1 + arch/arm/include/asm/cache.h | 2 +- arch/arm/lib/copy_page.S | 16 ++++++++-------- arch/arm/mm/Kconfig | 5 +++++ 4 files changed, 15 insertions(+), 9 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 uptodate! Merge made by recursive. Merging sparc-current/master $ git merge sparc-current/master Merge made by recursive. arch/sparc/kernel/time_32.c | 4 ++++ 1 files changed, 4 insertions(+), 0 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 Already up-to-date. Merging sound-current/for-linus $ git merge sound-current/for-linus Already up-to-date. Merging pci-current/for-linus $ git merge pci-current/for-linus Already up-to-date. Merging wireless-current/master $ git merge wireless-current/master Already up-to-date. Merging kbuild-current/master $ git merge kbuild-current/master Already up-to-date. Merging quilt/driver-core.current $ git merge quilt/driver-core.current Already up-to-date. Merging quilt/tty.current $ git merge quilt/tty.current Merge made by recursive. drivers/isdn/gigaset/interface.c | 19 +++++++------------ drivers/serial/bfin_5xx.c | 4 ++++ drivers/serial/serial_cs.c | 1 + 3 files changed, 12 insertions(+), 12 deletions(-) Merging quilt/usb.current $ git merge quilt/usb.current Merge made by recursive. drivers/usb/class/cdc-acm.c | 2 + drivers/usb/class/cdc-wdm.c | 30 +++- drivers/usb/core/config.c | 2 +- drivers/usb/host/sl811-hcd.c | 8 +- drivers/usb/host/xhci-dbg.c | 5 +- drivers/usb/host/xhci-hcd.c | 370 +++++++++++++++++++++++++++++++-------- drivers/usb/host/xhci-mem.c | 64 ++++++- drivers/usb/host/xhci-pci.c | 13 ++ drivers/usb/host/xhci-ring.c | 232 ++++++++++++++++++++++--- drivers/usb/host/xhci.h | 41 ++++- drivers/usb/serial/console.c | 1 + drivers/usb/serial/ftdi_sio.c | 7 + drivers/usb/serial/ftdi_sio.h | 10 + drivers/usb/serial/option.c | 4 + drivers/usb/serial/pl2303.c | 1 + drivers/usb/serial/pl2303.h | 4 + drivers/usb/serial/usb-serial.c | 19 ++- drivers/usb/storage/onetouch.c | 2 +- include/linux/usb/serial.h | 1 + 19 files changed, 693 insertions(+), 123 deletions(-) Merging cpufreq-current/fixes $ git merge cpufreq-current/fixes Already up-to-date. Merging input-current/for-linus $ git merge input-current/for-linus Already up-to-date. Merging md-current/for-linus $ git merge md-current/for-linus Already up-to-date. Merging audit-current/for-linus $ git merge audit-current/for-linus Already up-to-date. Merging crypto-current/master $ git merge crypto-current/master Already up-to-date. Merging ide-curent/master $ git merge ide-curent/master Already up-to-date. Merging dwmw2/master $ git merge dwmw2/master Already up-to-date. $ git am -3 ../patches/0001-edac-need-to-export-cpu_llc_id.patch Applying: edac: need to export cpu_llc_id Merging arm/devel $ git merge arm/devel Auto-merging arch/arm/kernel/vmlinux.lds.S Merge made by recursive. Documentation/arm/tcm.txt | 145 ++++++++++++ arch/arm/Kconfig | 5 + arch/arm/include/asm/cputype.h | 5 + arch/arm/include/asm/tcm.h | 31 +++ arch/arm/kernel/Makefile | 1 + arch/arm/kernel/setup.c | 2 + arch/arm/kernel/tcm.c | 246 ++++++++++++++++++++ arch/arm/kernel/tcm.h | 17 ++ arch/arm/kernel/vmlinux.lds.S | 57 +++++ arch/arm/mach-at91/at91sam9g45_devices.c | 49 ++++ arch/arm/mach-at91/at91sam9rl_devices.c | 47 ++++ arch/arm/mach-integrator/integrator_cp.c | 4 +- arch/arm/mach-realview/core.c | 6 +- arch/arm/mach-realview/core.h | 4 +- arch/arm/mach-u300/include/mach/memory.h | 8 + arch/arm/mach-u300/mmc.c | 6 +- arch/arm/mach-versatile/core.c | 2 +- arch/arm/mach-versatile/versatile_pb.c | 4 +- arch/arm/mm/init.c | 8 + drivers/mmc/host/mmci.c | 59 ++++-- drivers/mmc/host/mmci.h | 2 +- .../asm/mach/mmc.h => include/linux/amba/mmci.h | 9 +- 22 files changed, 681 insertions(+), 36 deletions(-) create mode 100644 Documentation/arm/tcm.txt create mode 100644 arch/arm/include/asm/tcm.h create mode 100644 arch/arm/kernel/tcm.c create mode 100644 arch/arm/kernel/tcm.h rename arch/arm/include/asm/mach/mmc.h => include/linux/amba/mmci.h (63%) Merging davinci/for-next $ git merge davinci/for-next Auto-merging MAINTAINERS Auto-merging sound/soc/davinci/davinci-pcm.c Merge made by recursive. MAINTAINERS | 6 + arch/arm/configs/da830_omapl137_defconfig | 1254 ++++++++++++++++++++++ arch/arm/configs/da850_omapl138_defconfig | 1229 +++++++++++++++++++++ arch/arm/configs/davinci_all_defconfig | 173 ++-- arch/arm/mach-davinci/Kconfig | 49 +- arch/arm/mach-davinci/Makefile | 14 +- arch/arm/mach-davinci/Makefile.boot | 10 + arch/arm/mach-davinci/board-da830-evm.c | 157 +++ arch/arm/mach-davinci/board-da850-evm.c | 415 +++++++ arch/arm/mach-davinci/board-dm355-evm.c | 7 +- arch/arm/mach-davinci/board-dm365-evm.c | 492 +++++++++ arch/arm/mach-davinci/board-dm644x-evm.c | 7 +- arch/arm/mach-davinci/board-dm646x-evm.c | 93 ++ arch/arm/mach-davinci/clock.c | 5 +- arch/arm/mach-davinci/da830.c | 1205 +++++++++++++++++++++ arch/arm/mach-davinci/da850.c | 820 ++++++++++++++ arch/arm/mach-davinci/devices-da8xx.c | 450 ++++++++ arch/arm/mach-davinci/devices.c | 60 +- arch/arm/mach-davinci/dm355.c | 91 ++- arch/arm/mach-davinci/dm365.c | 926 ++++++++++++++++ arch/arm/mach-davinci/dm644x.c | 85 ++- arch/arm/mach-davinci/dm646x.c | 217 ++++- arch/arm/mach-davinci/dma.c | 955 ++++++++++++----- arch/arm/mach-davinci/gpio.c | 105 ++- arch/arm/mach-davinci/include/mach/asp.h | 56 +- arch/arm/mach-davinci/include/mach/common.h | 2 +- arch/arm/mach-davinci/include/mach/cputype.h | 24 + arch/arm/mach-davinci/include/mach/da8xx.h | 121 +++ arch/arm/mach-davinci/include/mach/debug-macro.S | 8 + arch/arm/mach-davinci/include/mach/dm355.h | 5 + arch/arm/mach-davinci/include/mach/dm365.h | 29 + arch/arm/mach-davinci/include/mach/dm644x.h | 2 + arch/arm/mach-davinci/include/mach/dm646x.h | 6 + arch/arm/mach-davinci/include/mach/edma.h | 67 ++- arch/arm/mach-davinci/include/mach/gpio.h | 13 +- arch/arm/mach-davinci/include/mach/hardware.h | 17 + arch/arm/mach-davinci/include/mach/io.h | 23 +- arch/arm/mach-davinci/include/mach/irqs.h | 205 ++++- arch/arm/mach-davinci/include/mach/memory.h | 9 +- arch/arm/mach-davinci/include/mach/mux.h | 722 +++++++++++++ arch/arm/mach-davinci/include/mach/psc.h | 62 ++ arch/arm/mach-davinci/include/mach/serial.h | 6 +- arch/arm/mach-davinci/include/mach/system.h | 4 +- arch/arm/mach-davinci/include/mach/uncompress.h | 7 +- arch/arm/mach-davinci/include/mach/vmalloc.h | 2 +- arch/arm/mach-davinci/mux.c | 14 + arch/arm/mach-davinci/sram.c | 2 +- arch/arm/mach-davinci/time.c | 16 +- arch/arm/mach-davinci/usb.c | 13 + sound/soc/davinci/davinci-pcm.c | 6 +- 50 files changed, 9759 insertions(+), 507 deletions(-) create mode 100644 arch/arm/configs/da830_omapl137_defconfig create mode 100644 arch/arm/configs/da850_omapl138_defconfig create mode 100644 arch/arm/mach-davinci/board-da830-evm.c create mode 100644 arch/arm/mach-davinci/board-da850-evm.c create mode 100644 arch/arm/mach-davinci/board-dm365-evm.c create mode 100644 arch/arm/mach-davinci/da830.c create mode 100644 arch/arm/mach-davinci/da850.c create mode 100644 arch/arm/mach-davinci/devices-da8xx.c create mode 100644 arch/arm/mach-davinci/dm365.c create mode 100644 arch/arm/mach-davinci/include/mach/da8xx.h create mode 100644 arch/arm/mach-davinci/include/mach/dm365.h Merging pxa/for-next $ git merge pxa/for-next Auto-merging MAINTAINERS Removing arch/arm/configs/littleton_defconfig Removing arch/arm/configs/zylonite_defconfig Auto-merging arch/arm/include/asm/cputype.h Auto-merging drivers/net/irda/pxaficp_ir.c Auto-merging drivers/rtc/rtc-sa1100.c Auto-merging sound/arm/pxa2xx-ac97.c Merge made by recursive. MAINTAINERS | 8 +- arch/arm/configs/littleton_defconfig | 783 --------------- arch/arm/configs/pxa3xx_defconfig | 1332 ++++++++++++++++++++++++++ arch/arm/configs/xcep_defconfig | 1129 ++++++++++++++++++++++ arch/arm/configs/zylonite_defconfig | 736 -------------- arch/arm/include/asm/cputype.h | 5 +- arch/arm/mach-pxa/Kconfig | 36 + arch/arm/mach-pxa/Makefile | 4 + arch/arm/mach-pxa/balloon3.c | 361 +++++++ arch/arm/mach-pxa/clock.h | 1 - arch/arm/mach-pxa/cm-x270.c | 146 ++- arch/arm/mach-pxa/cm-x300.c | 71 +-- arch/arm/mach-pxa/colibri-pxa300.c | 1 + arch/arm/mach-pxa/colibri-pxa320.c | 33 + arch/arm/mach-pxa/colibri-pxa3xx.c | 52 +- arch/arm/mach-pxa/corgi.c | 233 +++-- arch/arm/mach-pxa/csb726.c | 54 +- arch/arm/mach-pxa/devices.c | 27 + arch/arm/mach-pxa/devices.h | 2 + arch/arm/mach-pxa/e740.c | 1 - arch/arm/mach-pxa/e750.c | 1 - arch/arm/mach-pxa/em-x270.c | 45 +- arch/arm/mach-pxa/eseries.c | 39 +- arch/arm/mach-pxa/gumstix.c | 5 +- arch/arm/mach-pxa/hx4700.c | 65 +- arch/arm/mach-pxa/idp.c | 5 +- arch/arm/mach-pxa/imote2.c | 3 + arch/arm/mach-pxa/include/mach/balloon3.h | 134 +++ arch/arm/mach-pxa/include/mach/colibri.h | 6 + arch/arm/mach-pxa/include/mach/entry-macro.S | 25 +- arch/arm/mach-pxa/include/mach/hardware.h | 17 + arch/arm/mach-pxa/include/mach/irda.h | 2 + arch/arm/mach-pxa/include/mach/irqs.h | 42 +- arch/arm/mach-pxa/include/mach/mfp.h | 301 +------ arch/arm/mach-pxa/include/mach/mmc.h | 5 + arch/arm/mach-pxa/include/mach/palmtc.h | 86 ++ arch/arm/mach-pxa/include/mach/palmtx.h | 5 + arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | 4 +- arch/arm/mach-pxa/include/mach/pxafb.h | 3 +- arch/arm/mach-pxa/include/mach/regs-intc.h | 11 + arch/arm/mach-pxa/include/mach/uncompress.h | 2 +- arch/arm/mach-pxa/irq.c | 8 +- arch/arm/mach-pxa/littleton.c | 43 +- arch/arm/mach-pxa/lubbock.c | 18 +- arch/arm/mach-pxa/magician.c | 59 +- arch/arm/mach-pxa/mainstone.c | 16 +- arch/arm/mach-pxa/mioa701.c | 84 +-- arch/arm/mach-pxa/palmld.c | 143 +-- arch/arm/mach-pxa/palmt5.c | 111 +-- arch/arm/mach-pxa/palmtc.c | 436 +++++++++ arch/arm/mach-pxa/palmte2.c | 110 +-- arch/arm/mach-pxa/palmtx.c | 225 +++-- arch/arm/mach-pxa/palmz72.c | 116 +--- arch/arm/mach-pxa/pcm990-baseboard.c | 67 +- arch/arm/mach-pxa/poodle.c | 80 +-- arch/arm/mach-pxa/pxa2xx.c | 1 + arch/arm/mach-pxa/pxa300.c | 2 + arch/arm/mach-pxa/pxa320.c | 2 + arch/arm/mach-pxa/pxa930.c | 19 +- arch/arm/mach-pxa/spitz.c | 237 +++-- arch/arm/mach-pxa/tosa.c | 91 +-- arch/arm/mach-pxa/treo680.c | 159 +--- arch/arm/mach-pxa/trizeps4.c | 4 + arch/arm/mach-pxa/xcep.c | 187 ++++ arch/arm/mach-pxa/zylonite.c | 3 + arch/arm/plat-pxa/dma.c | 281 +++++- arch/arm/plat-pxa/include/plat/mfp.h | 73 ++- arch/arm/plat-pxa/mfp.c | 3 + drivers/i2c/busses/Kconfig | 4 +- drivers/mmc/host/pxamci.c | 104 ++- drivers/net/irda/pxaficp_ir.c | 47 +- drivers/pcmcia/Makefile | 1 + drivers/pcmcia/pxa2xx_base.c | 18 +- drivers/pcmcia/pxa2xx_palmtc.c | 230 +++++ drivers/rtc/rtc-pxa.c | 27 +- drivers/rtc/rtc-sa1100.c | 23 +- drivers/serial/pxa.c | 20 +- drivers/spi/pxa2xx_spi.c | 30 +- drivers/usb/host/ohci-pxa27x.c | 30 +- drivers/video/backlight/da903x_bl.c | 20 +- drivers/video/pxafb.c | 32 +- include/linux/fb.h | 1 + sound/arm/pxa2xx-ac97.c | 20 +- 83 files changed, 5606 insertions(+), 3400 deletions(-) delete mode 100644 arch/arm/configs/littleton_defconfig create mode 100644 arch/arm/configs/pxa3xx_defconfig create mode 100644 arch/arm/configs/xcep_defconfig delete mode 100644 arch/arm/configs/zylonite_defconfig create mode 100644 arch/arm/mach-pxa/balloon3.c create mode 100644 arch/arm/mach-pxa/include/mach/balloon3.h create mode 100644 arch/arm/mach-pxa/include/mach/palmtc.h create mode 100644 arch/arm/mach-pxa/palmtc.c create mode 100644 arch/arm/mach-pxa/xcep.c create mode 100644 drivers/pcmcia/pxa2xx_palmtc.c Merging thumb-2/thumb-2 $ git merge thumb-2/thumb-2 Resolved 'arch/arm/include/asm/unified.h' using previous resolution. Auto-merging arch/arm/Kconfig Auto-merging arch/arm/Makefile Auto-merging arch/arm/boot/compressed/head.S Auto-merging arch/arm/include/asm/assembler.h Auto-merging arch/arm/include/asm/memory.h Auto-merging arch/arm/include/asm/unified.h CONFLICT (add/add): Merge conflict in arch/arm/include/asm/unified.h Auto-merging arch/arm/kernel/entry-armv.S Auto-merging arch/arm/kernel/entry-common.S Auto-merging arch/arm/kernel/head-nommu.S Auto-merging arch/arm/kernel/setup.c Auto-merging arch/arm/lib/sha1.S Auto-merging arch/arm/mm/proc-v7.S Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 453d1b1] Merge commit 'thumb-2/thumb-2' $ git diff -M --stat --summary HEAD^.. arch/arm/include/asm/unified.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) Merging avr32/avr32-arch $ git merge avr32/avr32-arch Merge made by recursive. arch/avr32/boards/atngw100/mrmt.c | 1 + arch/avr32/boards/atngw100/setup.c | 5 ---- arch/avr32/mach-at32ap/at32ap700x.c | 35 ++++++++++++++------------ arch/avr32/mach-at32ap/include/mach/board.h | 1 + arch/avr32/mach-at32ap/include/mach/cpu.h | 2 + 5 files changed, 23 insertions(+), 21 deletions(-) Merging blackfin/for-linus $ git merge blackfin/for-linus Already up-to-date. Merging cris/for-next $ git merge cris/for-next Auto-merging drivers/net/cris/eth_v10.c Merge made by recursive. arch/cris/arch-v10/kernel/time.c | 1 - arch/cris/arch-v32/kernel/smp.c | 2 -- arch/cris/arch-v32/kernel/time.c | 1 - arch/cris/arch-v32/mach-a3/io.c | 2 +- arch/cris/arch-v32/mach-fs/io.c | 2 +- arch/cris/include/arch-v10/arch/mmu.h | 9 +++++---- arch/cris/include/arch-v32/arch/mmu.h | 10 ++++++---- arch/cris/include/asm/hardirq.h | 12 ++---------- arch/cris/include/asm/pgtable.h | 2 ++ arch/cris/kernel/irq.c | 5 ----- drivers/net/cris/eth_v10.c | 20 +++++++++++++++++--- drivers/serial/crisv10.c | 1 + 12 files changed, 35 insertions(+), 32 deletions(-) Merging ia64/test $ git merge ia64/test Auto-merging arch/ia64/kernel/head.S Merge made by recursive. arch/ia64/include/asm/mca.h | 2 + arch/ia64/kernel/crash.c | 83 ++++++++++++++++++++++++----------- arch/ia64/kernel/head.S | 2 +- arch/ia64/kernel/machine_kexec.c | 15 ++++++ arch/ia64/kernel/mca.c | 15 ++++++- arch/ia64/kernel/mca_asm.S | 47 ++++++++++++++++++++ arch/ia64/kernel/relocate_kernel.S | 2 +- 7 files changed, 136 insertions(+), 30 deletions(-) Merging m68k/for-next $ git merge m68k/for-next Merge made by recursive. drivers/rtc/Kconfig | 19 +++ drivers/rtc/Makefile | 2 + drivers/rtc/rtc-msm6242.c | 268 +++++++++++++++++++++++++++++++++++++++++++++ drivers/rtc/rtc-rp5c01.c | 222 +++++++++++++++++++++++++++++++++++++ 4 files changed, 511 insertions(+), 0 deletions(-) create mode 100644 drivers/rtc/rtc-msm6242.c create mode 100644 drivers/rtc/rtc-rp5c01.c Merging m68knommu/for-next $ git merge m68knommu/for-next Removing arch/m68k/include/asm/checksum_mm.h Removing arch/m68k/include/asm/checksum_no.h Removing arch/m68k/include/asm/dma_mm.h Removing arch/m68k/include/asm/dma_no.h Removing arch/m68k/include/asm/elia.h Removing arch/m68k/include/asm/irq_mm.h Removing arch/m68k/include/asm/irq_no.h Removing arch/m68k/include/asm/processor_mm.h Removing arch/m68k/include/asm/processor_no.h Auto-merging drivers/net/fec.c Merge made by recursive. arch/m68k/include/asm/checksum.h | 173 +++++++- arch/m68k/include/asm/checksum_mm.h | 148 ------- arch/m68k/include/asm/checksum_no.h | 132 ------ arch/m68k/include/asm/dma.h | 492 +++++++++++++++++++++- arch/m68k/include/asm/dma_mm.h | 16 - arch/m68k/include/asm/dma_no.h | 494 --------------------- arch/m68k/include/asm/elia.h | 41 -- arch/m68k/include/asm/gpio.h | 238 ++++++++++ arch/m68k/include/asm/hardirq_no.h | 10 +- arch/m68k/include/asm/io_no.h | 2 +- arch/m68k/include/asm/irq.h | 135 ++++++- arch/m68k/include/asm/irq_mm.h | 126 ------ arch/m68k/include/asm/irq_no.h | 26 -- arch/m68k/include/asm/m5206sim.h | 33 +- arch/m68k/include/asm/m520xsim.h | 77 +++- arch/m68k/include/asm/m523xsim.h | 77 ++++ arch/m68k/include/asm/m5249sim.h | 54 ++- arch/m68k/include/asm/m5272sim.h | 62 +++- arch/m68k/include/asm/m527xsim.h | 169 +++++++ arch/m68k/include/asm/m528xsim.h | 151 +++++++ arch/m68k/include/asm/m5307sim.h | 32 +- arch/m68k/include/asm/m532xsim.h | 198 ++++----- arch/m68k/include/asm/m5407sim.h | 28 +- arch/m68k/include/asm/mcfgpio.h | 40 ++ arch/m68k/include/asm/mcfintc.h | 89 ++++ arch/m68k/include/asm/mcfne.h | 83 ---- arch/m68k/include/asm/mcfsim.h | 95 +---- arch/m68k/include/asm/mcfsmc.h | 6 +- arch/m68k/include/asm/nettel.h | 4 +- arch/m68k/include/asm/page_no.h | 4 +- arch/m68k/include/asm/pinmux.h | 30 ++ arch/m68k/include/asm/processor.h | 173 +++++++- arch/m68k/include/asm/processor_mm.h | 130 ------ arch/m68k/include/asm/processor_no.h | 143 ------ arch/m68k/include/asm/ptrace.h | 12 + arch/m68k/include/asm/timex.h | 17 +- arch/m68knommu/Kconfig | 6 + arch/m68knommu/kernel/irq.c | 26 -- arch/m68knommu/kernel/ptrace.c | 18 +- arch/m68knommu/kernel/time.c | 2 +- arch/m68knommu/lib/checksum.c | 11 +- arch/m68knommu/platform/5206/Makefile | 2 +- arch/m68knommu/platform/5206/config.c | 56 +-- arch/m68knommu/platform/5206/gpio.c | 49 ++ arch/m68knommu/platform/5206e/Makefile | 2 +- arch/m68knommu/platform/5206e/config.c | 58 +-- arch/m68knommu/platform/5206e/gpio.c | 49 ++ arch/m68knommu/platform/520x/Makefile | 2 +- arch/m68knommu/platform/520x/config.c | 30 -- arch/m68knommu/platform/520x/gpio.c | 211 +++++++++ arch/m68knommu/platform/523x/Makefile | 2 +- arch/m68knommu/platform/523x/config.c | 66 +--- arch/m68knommu/platform/523x/gpio.c | 283 ++++++++++++ arch/m68knommu/platform/5249/Makefile | 2 +- arch/m68knommu/platform/5249/config.c | 49 +-- arch/m68knommu/platform/5249/gpio.c | 65 +++ arch/m68knommu/platform/5249/intc2.c | 59 +++ arch/m68knommu/platform/5272/Makefile | 2 +- arch/m68knommu/platform/5272/config.c | 78 +--- arch/m68knommu/platform/5272/gpio.c | 81 ++++ arch/m68knommu/platform/5272/intc.c | 138 ++++++ arch/m68knommu/platform/527x/Makefile | 2 +- arch/m68knommu/platform/527x/config.c | 49 -- arch/m68knommu/platform/527x/gpio.c | 607 ++++++++++++++++++++++++++ arch/m68knommu/platform/528x/Makefile | 2 +- arch/m68knommu/platform/528x/config.c | 51 +-- arch/m68knommu/platform/528x/gpio.c | 438 +++++++++++++++++++ arch/m68knommu/platform/5307/Makefile | 2 +- arch/m68knommu/platform/5307/config.c | 65 +-- arch/m68knommu/platform/5307/gpio.c | 49 ++ arch/m68knommu/platform/532x/Makefile | 2 +- arch/m68knommu/platform/532x/config.c | 53 +--- arch/m68knommu/platform/532x/gpio.c | 337 ++++++++++++++ arch/m68knommu/platform/5407/Makefile | 2 +- arch/m68knommu/platform/5407/config.c | 68 +-- arch/m68knommu/platform/5407/gpio.c | 49 ++ arch/m68knommu/platform/68328/ints.c | 72 ++-- arch/m68knommu/platform/68360/ints.c | 44 ++- arch/m68knommu/platform/coldfire/Makefile | 21 +- arch/m68knommu/platform/coldfire/gpio.c | 127 ++++++ arch/m68knommu/platform/coldfire/intc-2.c | 93 ++++ arch/m68knommu/platform/coldfire/intc-simr.c | 78 ++++ arch/m68knommu/platform/coldfire/intc.c | 153 +++++++ arch/m68knommu/platform/coldfire/pinmux.c | 28 ++ arch/m68knommu/platform/coldfire/pit.c | 8 - arch/m68knommu/platform/coldfire/timers.c | 18 +- arch/m68knommu/platform/coldfire/vectors.c | 20 +- drivers/net/fec.c | 18 +- 88 files changed, 5231 insertions(+), 2312 deletions(-) delete mode 100644 arch/m68k/include/asm/checksum_mm.h delete mode 100644 arch/m68k/include/asm/checksum_no.h delete mode 100644 arch/m68k/include/asm/dma_mm.h delete mode 100644 arch/m68k/include/asm/dma_no.h delete mode 100644 arch/m68k/include/asm/elia.h create mode 100644 arch/m68k/include/asm/gpio.h delete mode 100644 arch/m68k/include/asm/irq_mm.h delete mode 100644 arch/m68k/include/asm/irq_no.h create mode 100644 arch/m68k/include/asm/mcfgpio.h create mode 100644 arch/m68k/include/asm/mcfintc.h create mode 100644 arch/m68k/include/asm/pinmux.h delete mode 100644 arch/m68k/include/asm/processor_mm.h delete mode 100644 arch/m68k/include/asm/processor_no.h create mode 100644 arch/m68knommu/platform/5206/gpio.c create mode 100644 arch/m68knommu/platform/5206e/gpio.c create mode 100644 arch/m68knommu/platform/520x/gpio.c create mode 100644 arch/m68knommu/platform/523x/gpio.c create mode 100644 arch/m68knommu/platform/5249/gpio.c create mode 100644 arch/m68knommu/platform/5249/intc2.c create mode 100644 arch/m68knommu/platform/5272/gpio.c create mode 100644 arch/m68knommu/platform/5272/intc.c create mode 100644 arch/m68knommu/platform/527x/gpio.c create mode 100644 arch/m68knommu/platform/528x/gpio.c create mode 100644 arch/m68knommu/platform/5307/gpio.c create mode 100644 arch/m68knommu/platform/532x/gpio.c create mode 100644 arch/m68knommu/platform/5407/gpio.c create mode 100644 arch/m68knommu/platform/coldfire/gpio.c create mode 100644 arch/m68knommu/platform/coldfire/intc-2.c create mode 100644 arch/m68knommu/platform/coldfire/intc-simr.c create mode 100644 arch/m68knommu/platform/coldfire/intc.c create mode 100644 arch/m68knommu/platform/coldfire/pinmux.c Merging microblaze/next $ git merge microblaze/next Resolved 'kernel/gcov/Kconfig' using previous resolution. Auto-merging arch/microblaze/kernel/vmlinux.lds.S Auto-merging kernel/gcov/Kconfig CONFLICT (content): Merge conflict in kernel/gcov/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master c8d34f0] Merge commit 'microblaze/next' $ git diff -M --stat --summary HEAD^.. Documentation/gcov.txt | 2 +- arch/microblaze/Kconfig | 1 + arch/microblaze/include/asm/io.h | 3 + arch/microblaze/include/asm/setup.h | 2 +- arch/microblaze/include/asm/syscall.h | 99 +++++++++++++++++++++++++++++++++ arch/microblaze/kernel/entry.S | 66 ++++++++++++++++++--- arch/microblaze/kernel/head.S | 14 ++++- arch/microblaze/kernel/ptrace.c | 62 ++++++++++++++++++++ arch/microblaze/kernel/setup.c | 12 ++++- arch/microblaze/kernel/vmlinux.lds.S | 39 +++---------- drivers/mtd/Kconfig | 2 +- drivers/mtd/maps/Kconfig | 2 +- drivers/usb/Kconfig | 1 - kernel/gcov/Kconfig | 2 +- 14 files changed, 257 insertions(+), 50 deletions(-) create mode 100644 arch/microblaze/include/asm/syscall.h Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Already up-to-date. Merging parisc/next $ git merge parisc/next Resolved 'arch/parisc/include/asm/thread_info.h' using previous resolution. Resolved 'arch/parisc/kernel/entry.S' using previous resolution. Resolved 'arch/parisc/kernel/signal.c' using previous resolution. Auto-merging MAINTAINERS Auto-merging arch/parisc/include/asm/thread_info.h CONFLICT (content): Merge conflict in arch/parisc/include/asm/thread_info.h Auto-merging arch/parisc/kernel/entry.S CONFLICT (content): Merge conflict in arch/parisc/kernel/entry.S Auto-merging arch/parisc/kernel/module.c Auto-merging arch/parisc/kernel/signal.c CONFLICT (content): Merge conflict in arch/parisc/kernel/signal.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master f79ea75] Merge commit 'parisc/next' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 1 + arch/parisc/Kconfig | 1 + arch/parisc/include/asm/elf.h | 1 + arch/parisc/include/asm/hardirq.h | 20 +-- arch/parisc/include/asm/ptrace.h | 38 +++- arch/parisc/include/asm/syscall.h | 40 +++ arch/parisc/include/asm/thread_info.h | 10 +- arch/parisc/kernel/asm-offsets.c | 4 +- arch/parisc/kernel/entry.S | 29 +- arch/parisc/kernel/irq.c | 5 - arch/parisc/kernel/module.c | 2 +- arch/parisc/kernel/ptrace.c | 457 +++++++++++++++++++++++++++++++-- arch/parisc/kernel/signal.c | 4 + arch/parisc/kernel/syscall.S | 22 +- 14 files changed, 560 insertions(+), 74 deletions(-) create mode 100644 arch/parisc/include/asm/syscall.h Merging powerpc/next $ git merge powerpc/next Already up-to-date. Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging galak/next $ git merge galak/next Already up-to-date. Merging s390/features $ git merge s390/features Already up-to-date. Merging sh/master $ git merge sh/master Resolved 'arch/sh/kernel/vmlinux.lds.S' using previous resolution. Auto-merging Documentation/kernel-parameters.txt Removing arch/sh/boot/compressed/misc_32.c Removing arch/sh/boot/compressed/misc_64.c Removing arch/sh/boot/compressed/piggy.S Removing arch/sh/include/cpu-common/cpu/cacheflush.h Removing arch/sh/include/cpu-sh2a/cpu/cacheflush.h Removing arch/sh/include/cpu-sh3/cpu/cacheflush.h Removing arch/sh/include/cpu-sh4/cpu/cacheflush.h Removing arch/sh/include/cpu-sh5/cpu/cacheflush.h Removing arch/sh/include/mach-common/mach/migor.h Removing arch/sh/kernel/Makefile_32 Removing arch/sh/kernel/Makefile_64 Auto-merging arch/sh/kernel/signal_32.c Auto-merging arch/sh/kernel/signal_64.c Auto-merging arch/sh/kernel/vmlinux.lds.S CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S Removing arch/sh/lib64/clear_page.S Removing arch/sh/mm/Makefile_32 Removing arch/sh/mm/Makefile_64 Removing arch/sh/mm/pg-nommu.c Removing arch/sh/mm/pg-sh4.c Removing arch/sh/mm/pg-sh7705.c Removing arch/sh/mm/tlb-nommu.c Auto-merging drivers/input/keyboard/sh_keysc.c Auto-merging drivers/video/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 93516ac] Merge commit 'sh/master' $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 2 +- arch/sh/Kconfig | 43 +- arch/sh/Kconfig.debug | 23 +- arch/sh/Makefile | 26 +- arch/sh/boards/Kconfig | 22 +- arch/sh/boards/board-ap325rxa.c | 10 +- arch/sh/boards/board-sh7785lcr.c | 18 + arch/sh/boards/mach-ecovec24/Makefile | 9 + arch/sh/boards/mach-ecovec24/setup.c | 660 +++++++ arch/sh/boards/mach-highlander/setup.c | 7 + arch/sh/boards/mach-kfr2r09/Makefile | 2 + arch/sh/boards/mach-kfr2r09/lcd_wqvga.c | 332 ++++ arch/sh/boards/mach-kfr2r09/setup.c | 386 ++++ arch/sh/boards/mach-migor/setup.c | 11 +- arch/sh/boards/mach-se/7722/setup.c | 4 + arch/sh/boards/mach-se/7724/setup.c | 110 +- arch/sh/boards/mach-x3proto/setup.c | 7 + arch/sh/boot/.gitignore | 5 +- arch/sh/boot/Makefile | 48 +- arch/sh/boot/compressed/.gitignore | 1 + arch/sh/boot/compressed/Makefile | 21 +- arch/sh/boot/compressed/head_32.S | 2 +- arch/sh/boot/compressed/misc.c | 149 ++ arch/sh/boot/compressed/misc_32.c | 206 -- arch/sh/boot/compressed/misc_64.c | 210 -- arch/sh/boot/compressed/piggy.S | 8 - arch/sh/boot/compressed/vmlinux.scr | 10 + arch/sh/boot/romimage/Makefile | 19 + arch/sh/boot/romimage/head.S | 10 + arch/sh/boot/romimage/vmlinux.scr | 6 + arch/sh/configs/ecovec24-romimage_defconfig | 1032 ++++++++++ arch/sh/configs/ecovec24_defconfig | 1558 +++++++++++++++ arch/sh/configs/kfr2r09-romimage_defconfig | 774 ++++++++ arch/sh/configs/kfr2r09_defconfig | 1059 ++++++++++ arch/sh/configs/snapgear_defconfig | 77 +- arch/sh/drivers/dma/Kconfig | 6 +- arch/sh/drivers/heartbeat.c | 10 + arch/sh/drivers/pci/pci.c | 4 + arch/sh/include/asm/Kbuild | 2 +- arch/sh/include/asm/bug.h | 31 + arch/sh/include/asm/bugs.h | 24 +- arch/sh/include/asm/cachectl.h | 19 + arch/sh/include/asm/cacheflush.h | 114 +- arch/sh/include/asm/device.h | 16 +- arch/sh/include/asm/dma-sh.h | 1 + arch/sh/include/asm/dwarf.h | 398 ++++ arch/sh/include/asm/entry-macros.S | 86 +- arch/sh/include/asm/ftrace.h | 8 +- arch/sh/include/asm/hardirq.h | 13 +- arch/sh/include/asm/heartbeat.h | 1 + arch/sh/include/asm/hwblk.h | 72 + arch/sh/include/asm/io.h | 16 +- arch/sh/include/asm/kdebug.h | 1 + arch/sh/include/asm/kgdb.h | 3 - arch/sh/include/asm/lmb.h | 6 + arch/sh/include/asm/mmu_context.h | 2 +- arch/sh/include/asm/page.h | 24 +- arch/sh/include/asm/pgtable.h | 34 +- arch/sh/include/asm/pgtable_32.h | 30 +- arch/sh/include/asm/pgtable_64.h | 5 + arch/sh/include/asm/processor.h | 15 +- arch/sh/include/asm/romimage-macros.h | 73 + arch/sh/include/asm/sections.h | 1 + arch/sh/include/asm/sh_keysc.h | 1 + arch/sh/include/asm/stacktrace.h | 25 + arch/sh/include/asm/suspend.h | 9 + arch/sh/include/asm/syscall_32.h | 1 + arch/sh/include/asm/system.h | 19 +- arch/sh/include/asm/system_32.h | 43 +- arch/sh/include/asm/system_64.h | 10 + arch/sh/include/asm/thread_info.h | 11 +- arch/sh/include/asm/types.h | 2 + arch/sh/include/asm/unistd_32.h | 2 +- arch/sh/include/asm/unistd_64.h | 2 +- arch/sh/include/asm/unwinder.h | 31 + arch/sh/include/asm/vmlinux.lds.h | 17 + arch/sh/include/asm/watchdog.h | 19 +- arch/sh/include/cpu-common/cpu/cacheflush.h | 44 - arch/sh/include/cpu-sh2a/cpu/cacheflush.h | 34 - arch/sh/include/cpu-sh3/cpu/cacheflush.h | 46 - arch/sh/include/cpu-sh4/cpu/cacheflush.h | 43 - arch/sh/include/cpu-sh4/cpu/dma-sh4a.h | 3 +- arch/sh/include/cpu-sh4/cpu/freq.h | 4 + arch/sh/include/cpu-sh4/cpu/sh7722.h | 14 + arch/sh/include/cpu-sh4/cpu/sh7723.h | 17 + arch/sh/include/cpu-sh4/cpu/sh7724.h | 17 + arch/sh/include/cpu-sh4/cpu/sh7757.h | 243 +++ arch/sh/include/cpu-sh5/cpu/cacheflush.h | 33 - arch/sh/include/mach-common/mach/migor.h | 64 - arch/sh/include/mach-common/mach/romimage.h | 1 + arch/sh/include/mach-common/mach/sh7785lcr.h | 2 + .../mach-ecovec24/mach/partner-jet-setup.txt | 82 + arch/sh/include/mach-ecovec24/mach/romimage.h | 20 + arch/sh/include/mach-kfr2r09/mach/kfr2r09.h | 21 + .../mach-kfr2r09/mach/partner-jet-setup.txt | 143 ++ arch/sh/include/mach-kfr2r09/mach/romimage.h | 20 + arch/sh/include/mach-migor/mach/migor.h | 14 + arch/sh/kernel/Makefile | 44 +- arch/sh/kernel/Makefile_32 | 37 - arch/sh/kernel/Makefile_64 | 19 - arch/sh/kernel/asm-offsets.c | 1 + arch/sh/kernel/cpu/Makefile | 2 +- arch/sh/kernel/cpu/hwblk.c | 155 ++ arch/sh/kernel/cpu/init.c | 36 +- arch/sh/kernel/cpu/irq/ipr.c | 1 + arch/sh/kernel/cpu/sh2/entry.S | 3 +- arch/sh/kernel/cpu/sh2/probe.c | 1 + arch/sh/kernel/cpu/sh2a/entry.S | 3 +- arch/sh/kernel/cpu/sh2a/probe.c | 2 + arch/sh/kernel/cpu/sh3/clock-sh7709.c | 11 - arch/sh/kernel/cpu/sh3/entry.S | 102 +- arch/sh/kernel/cpu/sh3/ex.S | 4 +- arch/sh/kernel/cpu/sh3/probe.c | 2 + arch/sh/kernel/cpu/sh4/probe.c | 21 +- arch/sh/kernel/cpu/sh4a/Makefile | 9 +- arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 63 +- arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 113 +- arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 124 +- arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 130 ++ arch/sh/kernel/cpu/sh4a/hwblk-sh7722.c | 106 + arch/sh/kernel/cpu/sh4a/hwblk-sh7723.c | 117 ++ arch/sh/kernel/cpu/sh4a/hwblk-sh7724.c | 121 ++ arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c | 2019 ++++++++++++++++++++ arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 2 +- arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 39 +- arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 42 +- arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 43 + arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 513 +++++ arch/sh/kernel/cpu/sh4a/setup-shx3.c | 55 +- arch/sh/kernel/cpu/sh4a/smp-shx3.c | 2 + arch/sh/kernel/cpu/sh5/probe.c | 2 + arch/sh/kernel/cpu/shmobile/Makefile | 2 + arch/sh/kernel/cpu/shmobile/cpuidle.c | 113 ++ arch/sh/kernel/cpu/shmobile/pm.c | 42 +- arch/sh/kernel/cpu/shmobile/pm_runtime.c | 303 +++ arch/sh/kernel/cpu/shmobile/sleep.S | 155 +- arch/sh/kernel/cpufreq.c | 10 +- arch/sh/kernel/dumpstack.c | 123 ++ arch/sh/kernel/dwarf.c | 972 ++++++++++ arch/sh/kernel/early_printk.c | 5 +- arch/sh/kernel/entry-common.S | 103 +- arch/sh/kernel/ftrace.c | 188 ++ arch/sh/kernel/io.c | 97 +- arch/sh/kernel/io_generic.c | 50 +- arch/sh/kernel/io_trapped.c | 10 +- arch/sh/kernel/irq.c | 19 +- arch/sh/kernel/kgdb.c | 4 - arch/sh/kernel/localtimer.c | 9 +- arch/sh/kernel/nmi_debug.c | 77 + arch/sh/kernel/process_32.c | 25 +- arch/sh/kernel/process_64.c | 24 +- arch/sh/kernel/ptrace_32.c | 12 + arch/sh/kernel/setup.c | 80 +- arch/sh/kernel/sh_ksyms_32.c | 10 +- arch/sh/kernel/sh_ksyms_64.c | 9 - arch/sh/kernel/signal_32.c | 12 +- arch/sh/kernel/signal_64.c | 38 +- arch/sh/kernel/stacktrace.c | 98 +- arch/sh/kernel/sys_sh.c | 43 + arch/sh/kernel/syscalls_32.S | 2 +- arch/sh/kernel/syscalls_64.S | 2 +- arch/sh/kernel/time.c | 31 +- arch/sh/kernel/traps.c | 45 +- arch/sh/kernel/traps_32.c | 220 ++- arch/sh/kernel/unwinder.c | 164 ++ arch/sh/kernel/vmlinux.lds.S | 88 +- arch/sh/lib/Makefile | 4 +- arch/sh/lib/{clear_page.S => __clear_user.S} | 48 +- arch/sh/lib/copy_page.S | 11 +- arch/sh/lib/delay.c | 5 +- arch/sh/lib/mcount.S | 228 +++- arch/sh/lib64/Makefile | 2 +- arch/sh/lib64/clear_page.S | 54 - arch/sh/mm/Kconfig | 7 +- arch/sh/mm/Makefile | 68 +- arch/sh/mm/Makefile_32 | 43 - arch/sh/mm/Makefile_64 | 46 - arch/sh/mm/cache-sh2.c | 13 +- arch/sh/mm/cache-sh2a.c | 23 +- arch/sh/mm/cache-sh3.c | 25 +- arch/sh/mm/cache-sh4.c | 362 ++-- arch/sh/mm/cache-sh5.c | 307 +--- arch/sh/mm/cache-sh7705.c | 72 +- arch/sh/mm/cache.c | 316 +++ arch/sh/mm/fault_32.c | 196 ++- arch/sh/mm/fault_64.c | 11 +- arch/sh/mm/flush-sh4.c | 108 ++ arch/sh/mm/init.c | 50 +- arch/sh/mm/ioremap_32.c | 8 - arch/sh/mm/ioremap_64.c | 6 +- arch/sh/mm/kmap.c | 65 + arch/sh/mm/mmap.c | 2 +- arch/sh/mm/nommu.c | 96 + arch/sh/mm/numa.c | 36 +- arch/sh/mm/pg-nommu.c | 38 - arch/sh/mm/pg-sh4.c | 146 -- arch/sh/mm/pg-sh7705.c | 138 -- arch/sh/mm/tlb-nommu.c | 62 - arch/sh/mm/tlb-pteaex.c | 28 +- arch/sh/mm/tlb-sh3.c | 27 +- arch/sh/mm/tlb-sh4.c | 37 +- arch/sh/mm/tlb-sh5.c | 21 +- arch/sh/mm/tlbflush_64.c | 22 +- arch/sh/oprofile/backtrace.c | 84 +- arch/sh/tools/mach-types | 3 + drivers/i2c/busses/i2c-sh_mobile.c | 39 +- drivers/input/keyboard/sh_keysc.c | 3 + drivers/media/video/sh_mobile_ceu_camera.c | 41 +- drivers/rtc/rtc-ds1302.c | 69 +- drivers/rtc/rtc-sh.c | 97 +- drivers/serial/sh-sci.c | 8 +- drivers/serial/sh-sci.h | 17 + drivers/sh/intc.c | 71 +- drivers/uio/uio_pdrv_genirq.c | 54 + drivers/usb/gadget/Kconfig | 28 +- drivers/usb/gadget/Makefile | 1 + drivers/usb/gadget/gadget_chips.h | 8 + drivers/usb/gadget/m66592-udc.c | 286 ++-- drivers/usb/gadget/m66592-udc.h | 90 +- drivers/usb/gadget/r8a66597-udc.c | 1689 ++++++++++++++++ drivers/usb/gadget/r8a66597-udc.h | 256 +++ drivers/usb/host/Kconfig | 7 - drivers/usb/host/r8a66597-hcd.c | 210 ++- drivers/usb/host/r8a66597.h | 442 +---- drivers/video/Kconfig | 2 +- drivers/video/sh_mobile_lcdcfb.c | 292 +++- include/linux/sh_intc.h | 1 - include/linux/usb/m66592.h | 44 + include/linux/usb/r8a66597.h | 375 ++++- 229 files changed, 18978 insertions(+), 4038 deletions(-) create mode 100644 arch/sh/boards/mach-ecovec24/Makefile create mode 100644 arch/sh/boards/mach-ecovec24/setup.c create mode 100644 arch/sh/boards/mach-kfr2r09/Makefile create mode 100644 arch/sh/boards/mach-kfr2r09/lcd_wqvga.c create mode 100644 arch/sh/boards/mach-kfr2r09/setup.c create mode 100644 arch/sh/boot/compressed/.gitignore create mode 100644 arch/sh/boot/compressed/misc.c delete mode 100644 arch/sh/boot/compressed/misc_32.c delete mode 100644 arch/sh/boot/compressed/misc_64.c delete mode 100644 arch/sh/boot/compressed/piggy.S create mode 100644 arch/sh/boot/compressed/vmlinux.scr create mode 100644 arch/sh/boot/romimage/Makefile create mode 100644 arch/sh/boot/romimage/head.S create mode 100644 arch/sh/boot/romimage/vmlinux.scr create mode 100644 arch/sh/configs/ecovec24-romimage_defconfig create mode 100644 arch/sh/configs/ecovec24_defconfig create mode 100644 arch/sh/configs/kfr2r09-romimage_defconfig create mode 100644 arch/sh/configs/kfr2r09_defconfig create mode 100644 arch/sh/include/asm/cachectl.h create mode 100644 arch/sh/include/asm/dwarf.h create mode 100644 arch/sh/include/asm/hwblk.h create mode 100644 arch/sh/include/asm/lmb.h create mode 100644 arch/sh/include/asm/romimage-macros.h create mode 100644 arch/sh/include/asm/stacktrace.h create mode 100644 arch/sh/include/asm/unwinder.h create mode 100644 arch/sh/include/asm/vmlinux.lds.h delete mode 100644 arch/sh/include/cpu-common/cpu/cacheflush.h delete mode 100644 arch/sh/include/cpu-sh2a/cpu/cacheflush.h delete mode 100644 arch/sh/include/cpu-sh3/cpu/cacheflush.h delete mode 100644 arch/sh/include/cpu-sh4/cpu/cacheflush.h create mode 100644 arch/sh/include/cpu-sh4/cpu/sh7757.h delete mode 100644 arch/sh/include/cpu-sh5/cpu/cacheflush.h delete mode 100644 arch/sh/include/mach-common/mach/migor.h create mode 100644 arch/sh/include/mach-common/mach/romimage.h create mode 100644 arch/sh/include/mach-ecovec24/mach/partner-jet-setup.txt create mode 100644 arch/sh/include/mach-ecovec24/mach/romimage.h create mode 100644 arch/sh/include/mach-kfr2r09/mach/kfr2r09.h create mode 100644 arch/sh/include/mach-kfr2r09/mach/partner-jet-setup.txt create mode 100644 arch/sh/include/mach-kfr2r09/mach/romimage.h create mode 100644 arch/sh/include/mach-migor/mach/migor.h delete mode 100644 arch/sh/kernel/Makefile_32 delete mode 100644 arch/sh/kernel/Makefile_64 create mode 100644 arch/sh/kernel/cpu/hwblk.c create mode 100644 arch/sh/kernel/cpu/sh4a/clock-sh7757.c create mode 100644 arch/sh/kernel/cpu/sh4a/hwblk-sh7722.c create mode 100644 arch/sh/kernel/cpu/sh4a/hwblk-sh7723.c create mode 100644 arch/sh/kernel/cpu/sh4a/hwblk-sh7724.c create mode 100644 arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c create mode 100644 arch/sh/kernel/cpu/sh4a/setup-sh7757.c create mode 100644 arch/sh/kernel/cpu/shmobile/cpuidle.c create mode 100644 arch/sh/kernel/cpu/shmobile/pm_runtime.c create mode 100644 arch/sh/kernel/dumpstack.c create mode 100644 arch/sh/kernel/dwarf.c create mode 100644 arch/sh/kernel/nmi_debug.c create mode 100644 arch/sh/kernel/unwinder.c rename arch/sh/lib/{clear_page.S => __clear_user.S} (75%) delete mode 100644 arch/sh/lib64/clear_page.S delete mode 100644 arch/sh/mm/Makefile_32 delete mode 100644 arch/sh/mm/Makefile_64 create mode 100644 arch/sh/mm/cache.c create mode 100644 arch/sh/mm/flush-sh4.c create mode 100644 arch/sh/mm/kmap.c create mode 100644 arch/sh/mm/nommu.c delete mode 100644 arch/sh/mm/pg-nommu.c delete mode 100644 arch/sh/mm/pg-sh4.c delete mode 100644 arch/sh/mm/pg-sh7705.c delete mode 100644 arch/sh/mm/tlb-nommu.c create mode 100644 drivers/usb/gadget/r8a66597-udc.c create mode 100644 drivers/usb/gadget/r8a66597-udc.h create mode 100644 include/linux/usb/m66592.h Merging sparc/master $ git merge sparc/master Already up-to-date. Merging xtensa/master $ git merge xtensa/master Auto-merging arch/xtensa/Kconfig Merge made by recursive. Merging cifs/master $ git merge cifs/master Merge made by recursive. fs/cifs/cifsglob.h | 9 +++++---- fs/cifs/cifsproto.h | 2 +- fs/cifs/dir.c | 11 +++++------ fs/cifs/file.c | 16 ++++++++++------ fs/cifs/misc.c | 7 +++---- 5 files changed, 24 insertions(+), 21 deletions(-) Merging configfs/linux-next $ git merge configfs/linux-next Already up-to-date. Merging ecryptfs/next $ git merge ecryptfs/next Merge made by recursive. fs/ecryptfs/Kconfig | 4 +++- fs/ecryptfs/crypto.c | 15 ++++++++------- fs/ecryptfs/keystore.c | 11 ++++------- fs/ecryptfs/super.c | 2 -- 4 files changed, 15 insertions(+), 17 deletions(-) Merging ext3/for_next $ git merge ext3/for_next Auto-merging MAINTAINERS Auto-merging drivers/staging/pohmelfs/inode.c Auto-merging fs/ext3/file.c Auto-merging fs/ext4/file.c Auto-merging fs/fs-writeback.c Auto-merging fs/splice.c Auto-merging fs/sync.c Auto-merging include/linux/fs.h Auto-merging include/linux/writeback.h Merge made by recursive. MAINTAINERS | 3 +-- fs/ext3/inode.c | 28 ++++++++++++++++++++++++---- fs/jbd/checkpoint.c | 6 +++--- fs/jbd/commit.c | 2 +- fs/jbd/journal.c | 30 +++++++++++++++--------------- fs/jbd/recovery.c | 18 +++++++++--------- fs/jbd/revoke.c | 16 ++++++++-------- fs/jbd/transaction.c | 9 +++++---- include/linux/jbd.h | 26 +++++++++++++------------- 9 files changed, 79 insertions(+), 59 deletions(-) Merging ext4/next $ git merge ext4/next Auto-merging fs/ext4/namei.c Merge made by recursive. Documentation/filesystems/ext4.txt | 8 +- fs/ext4/Kconfig | 11 +- fs/ext4/balloc.c | 2 +- fs/ext4/ext4.h | 84 ++++++-- fs/ext4/ext4_extents.h | 3 +- fs/ext4/ext4_jbd2.c | 9 +- fs/ext4/extents.c | 112 ++++++---- fs/ext4/fsync.c | 13 +- fs/ext4/ialloc.c | 2 +- fs/ext4/inode.c | 128 +++++++---- fs/ext4/ioctl.c | 7 +- fs/ext4/mballoc.c | 420 ++++++++++++++++++------------------ fs/ext4/mballoc.h | 22 ++- fs/ext4/migrate.c | 2 +- fs/ext4/move_extent.c | 47 +++-- fs/ext4/namei.c | 22 ++- fs/ext4/resize.c | 7 +- fs/ext4/super.c | 152 ++++++++------ fs/jbd2/commit.c | 11 +- fs/jbd2/journal.c | 6 + fs/jbd2/transaction.c | 7 +- include/linux/jbd2.h | 2 +- include/trace/events/ext4.h | 109 +++++++--- include/trace/events/jbd2.h | 2 +- 24 files changed, 704 insertions(+), 484 deletions(-) Merging fatfs/master $ git merge fatfs/master Merge made by recursive. Documentation/filesystems/vfat.txt | 2 +- fs/fat/inode.c | 4 ++-- fs/fat/namei_vfat.c | 15 ++++----------- fs/nls/nls_base.c | 8 ++++---- 4 files changed, 11 insertions(+), 18 deletions(-) Merging fuse/for-next $ git merge fuse/for-next Auto-merging fs/fuse/dev.c Auto-merging fs/fuse/inode.c Merge made by recursive. fs/fuse/dev.c | 10 +++++----- fs/fuse/fuse_i.h | 12 ++++++------ fs/fuse/inode.c | 14 ++++++++++++++ include/linux/fuse.h | 29 +++++++++++++++++++++++++++-- 4 files changed, 52 insertions(+), 13 deletions(-) Merging gfs2/master $ git merge gfs2/master Already up-to-date. Merging jfs/next $ git merge jfs/next Already up-to-date. Merging nfs/linux-next $ git merge nfs/linux-next Already up-to-date. Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Auto-merging fs/nfsd/nfssvc.c Auto-merging include/linux/nfs4.h Auto-merging net/sunrpc/clnt.c Merge made by recursive. fs/lockd/clntlock.c | 2 +- fs/lockd/host.c | 4 +- fs/lockd/mon.c | 2 +- fs/lockd/svcsubs.c | 2 +- fs/nfsd/export.c | 2 + fs/nfsd/nfs3xdr.c | 75 ++-- fs/nfsd/nfs4acl.c | 4 +- fs/nfsd/nfs4callback.c | 234 ++++++++++- fs/nfsd/nfs4proc.c | 89 ++-- fs/nfsd/nfs4state.c | 660 ++++++++++++++---------------- fs/nfsd/nfs4xdr.c | 42 +-- fs/nfsd/nfsctl.c | 8 +- fs/nfsd/nfsfh.c | 158 ++++---- fs/nfsd/nfssvc.c | 50 ++- include/linux/lockd/lockd.h | 43 -- include/linux/nfs4.h | 2 +- include/linux/nfsd/nfsd.h | 3 + include/linux/nfsd/state.h | 75 +++- include/linux/nfsd/xdr4.h | 19 +- include/linux/sunrpc/clnt.h | 114 +++++ include/linux/sunrpc/svc.h | 2 - include/linux/sunrpc/svc_xprt.h | 1 + include/linux/sunrpc/svcsock.h | 1 + include/linux/sunrpc/xprt.h | 19 + include/linux/sunrpc/xprtrdma.h | 5 - include/linux/sunrpc/xprtsock.h | 11 - net/sunrpc/auth_gss/svcauth_gss.c | 6 +- net/sunrpc/cache.c | 87 +++-- net/sunrpc/clnt.c | 1 + net/sunrpc/sched.c | 7 +- net/sunrpc/sunrpc.h | 14 + net/sunrpc/svc_xprt.c | 25 +- net/sunrpc/svcauth_unix.c | 1 + net/sunrpc/svcsock.c | 335 +++++++++++---- net/sunrpc/xprt.c | 15 +- net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 +- net/sunrpc/xprtsock.c | 242 +++++++++++- 37 files changed, 1525 insertions(+), 839 deletions(-) Merging nilfs2/for-next $ git merge nilfs2/for-next Merge made by recursive. Merging ocfs2/linux-next $ git merge ocfs2/linux-next Auto-merging arch/x86/ia32/ia32entry.S Auto-merging arch/x86/include/asm/unistd_32.h Auto-merging arch/x86/include/asm/unistd_64.h Auto-merging fs/namei.c Auto-merging fs/ocfs2/file.c Auto-merging fs/ocfs2/ioctl.c Auto-merging include/linux/fs.h Auto-merging include/linux/security.h Auto-merging include/linux/syscalls.h Auto-merging security/capability.c Auto-merging security/security.c Merge made by recursive. Documentation/filesystems/reflink.txt | 174 ++ Documentation/filesystems/vfs.txt | 4 + arch/x86/ia32/ia32entry.S | 1 + arch/x86/include/asm/unistd_32.h | 1 + arch/x86/include/asm/unistd_64.h | 2 + arch/x86/kernel/syscall_table_32.S | 1 + fs/namei.c | 137 ++ fs/ocfs2/Makefile | 1 + fs/ocfs2/alloc.c | 1342 ++++++----- fs/ocfs2/alloc.h | 101 +- fs/ocfs2/aops.c | 37 +- fs/ocfs2/aops.h | 2 + fs/ocfs2/buffer_head_io.c | 47 +- fs/ocfs2/buffer_head_io.h | 8 +- fs/ocfs2/cluster/masklog.c | 1 + fs/ocfs2/cluster/masklog.h | 1 + fs/ocfs2/dir.c | 107 +- fs/ocfs2/dlm/dlmthread.c | 6 +- fs/ocfs2/dlmglue.c | 105 +- fs/ocfs2/dlmglue.h | 6 + fs/ocfs2/extent_map.c | 33 +- fs/ocfs2/extent_map.h | 8 +- fs/ocfs2/file.c | 151 ++- fs/ocfs2/file.h | 2 + fs/ocfs2/inode.c | 86 +- fs/ocfs2/inode.h | 20 +- fs/ocfs2/ioctl.c | 14 + fs/ocfs2/journal.c | 82 +- fs/ocfs2/journal.h | 94 +- fs/ocfs2/localalloc.c | 12 +- fs/ocfs2/namei.c | 343 +++- fs/ocfs2/namei.h | 6 + fs/ocfs2/ocfs2.h | 52 +- fs/ocfs2/ocfs2_fs.h | 107 +- fs/ocfs2/ocfs2_lockid.h | 5 + fs/ocfs2/quota_global.c | 5 +- fs/ocfs2/quota_local.c | 26 +- fs/ocfs2/refcounttree.c | 4249 +++++++++++++++++++++++++++++++++ fs/ocfs2/refcounttree.h | 108 + fs/ocfs2/resize.c | 16 +- fs/ocfs2/slot_map.c | 10 +- fs/ocfs2/suballoc.c | 35 +- fs/ocfs2/super.c | 13 +- fs/ocfs2/uptodate.c | 265 ++- fs/ocfs2/uptodate.h | 51 +- fs/ocfs2/xattr.c | 2056 +++++++++++++++-- fs/ocfs2/xattr.h | 15 +- include/linux/fcntl.h | 8 + include/linux/fs.h | 2 + include/linux/security.h | 23 + include/linux/syscalls.h | 3 + security/capability.c | 7 + security/security.c | 8 + 53 files changed, 8823 insertions(+), 1176 deletions(-) create mode 100644 Documentation/filesystems/reflink.txt create mode 100644 fs/ocfs2/refcounttree.c create mode 100644 fs/ocfs2/refcounttree.h Merging squashfs/master $ git merge squashfs/master Already up-to-date. 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 Resolved 'fs/ubifs/super.c' using previous resolution. Auto-merging fs/ubifs/super.c CONFLICT (content): Merge conflict in fs/ubifs/super.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 3de3082] Merge commit 'ubifs/linux-next' $ git diff -M --stat --summary HEAD^.. fs/ubifs/commit.c | 2 +- fs/ubifs/debug.c | 2 +- fs/ubifs/debug.h | 3 ++ fs/ubifs/file.c | 62 +++++++++++++++++++-------------------- fs/ubifs/gc.c | 2 +- fs/ubifs/key.h | 35 ++++------------------ fs/ubifs/log.c | 2 +- fs/ubifs/lprops.c | 2 +- fs/ubifs/master.c | 20 +++++++++---- fs/ubifs/orphan.c | 7 ++-- fs/ubifs/recovery.c | 4 +- fs/ubifs/replay.c | 6 ++-- fs/ubifs/scan.c | 32 ++++++++++++++------ fs/ubifs/super.c | 33 ++++++--------------- fs/ubifs/tnc.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++-- fs/ubifs/tnc_commit.c | 2 +- fs/ubifs/ubifs.h | 2 +- fs/ubifs/xattr.c | 4 +- 18 files changed, 176 insertions(+), 120 deletions(-) Merging xfs/master $ git merge xfs/master Resolved 'fs/xfs/linux-2.6/xfs_lrw.c' using previous resolution. Auto-merging MAINTAINERS Auto-merging fs/xfs/linux-2.6/xfs_iops.c Auto-merging fs/xfs/linux-2.6/xfs_lrw.c CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_lrw.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 72d4b58] Merge commit 'xfs/master' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 2 +- fs/xfs/linux-2.6/xfs_aops.c | 1 - fs/xfs/linux-2.6/xfs_file.c | 19 +- fs/xfs/linux-2.6/xfs_iops.c | 1 - fs/xfs/linux-2.6/xfs_lrw.c | 8 +- fs/xfs/linux-2.6/xfs_stats.c | 51 ++-- fs/xfs/linux-2.6/xfs_super.c | 24 +- fs/xfs/linux-2.6/xfs_sync.c | 15 - fs/xfs/linux-2.6/xfs_sync.h | 1 - fs/xfs/quota/xfs_qm_stats.c | 78 ++--- fs/xfs/xfs_ag.h | 9 + fs/xfs/xfs_bmap.c | 2 +- fs/xfs/xfs_bmap.h | 11 - fs/xfs/xfs_bmap_btree.c | 20 +- fs/xfs/xfs_bmap_btree.h | 1 - fs/xfs/xfs_btree.c | 42 +--- fs/xfs/xfs_btree.h | 15 - fs/xfs/xfs_ialloc.c | 805 +++++++++++++++++++++--------------------- fs/xfs/xfs_ialloc.h | 18 +- fs/xfs/xfs_iget.c | 27 -- fs/xfs/xfs_inode.c | 8 +- fs/xfs/xfs_inode.h | 8 - fs/xfs/xfs_inode_item.c | 10 - fs/xfs/xfs_inode_item.h | 2 - fs/xfs/xfs_inum.h | 1 - fs/xfs/xfs_itable.c | 98 +++--- fs/xfs/xfs_itable.h | 5 - fs/xfs/xfs_log_priv.h | 2 - fs/xfs/xfs_log_recover.c | 2 +- fs/xfs/xfs_mount.c | 2 +- fs/xfs/xfs_mount.h | 3 - fs/xfs/xfs_mru_cache.c | 29 -- fs/xfs/xfs_mru_cache.h | 1 - fs/xfs/xfs_rw.c | 84 ----- fs/xfs/xfs_rw.h | 7 - fs/xfs/xfs_trans.h | 2 +- fs/xfs/xfs_trans_buf.c | 4 +- fs/xfs/xfs_trans_inode.c | 86 +----- fs/xfs/xfs_vnodeops.c | 17 +- 39 files changed, 593 insertions(+), 928 deletions(-) Merging reiserfs-bkl/reiserfs/kill-bkl $ git merge reiserfs-bkl/reiserfs/kill-bkl Merge made by recursive. fs/reiserfs/Makefile | 2 +- fs/reiserfs/bitmap.c | 4 ++ fs/reiserfs/dir.c | 8 +++ fs/reiserfs/do_balan.c | 17 ++---- fs/reiserfs/fix_node.c | 19 ++++++-- fs/reiserfs/inode.c | 84 +++++++++++++++++++------------ fs/reiserfs/ioctl.c | 6 ++- fs/reiserfs/journal.c | 109 ++++++++++++++++++++++++++++------------ fs/reiserfs/lock.c | 88 ++++++++++++++++++++++++++++++++ fs/reiserfs/namei.c | 20 +++++-- fs/reiserfs/prints.c | 4 -- fs/reiserfs/resize.c | 2 + fs/reiserfs/stree.c | 53 ++++++++++++++++--- fs/reiserfs/super.c | 52 ++++++++++++++----- fs/reiserfs/xattr.c | 6 +- include/linux/reiserfs_fs.h | 68 +++++++++++++++++++++++-- include/linux/reiserfs_fs_sb.h | 20 +++++++ 17 files changed, 438 insertions(+), 124 deletions(-) create mode 100644 fs/reiserfs/lock.c Merging vfs/for-next $ git merge vfs/for-next Already up-to-date. Merging pci/linux-next $ git merge pci/linux-next Resolved 'arch/powerpc/kernel/pci_64.c' using previous resolution. Auto-merging arch/powerpc/include/asm/pci.h Auto-merging arch/powerpc/kernel/pci_64.c CONFLICT (content): Merge conflict in arch/powerpc/kernel/pci_64.c Auto-merging arch/sparc/include/asm/pci_32.h Auto-merging arch/sparc/include/asm/pci_64.h Auto-merging arch/x86/kernel/pci-dma.c Auto-merging drivers/pci/pci-driver.c Auto-merging drivers/pci/quirks.c Auto-merging drivers/video/Kconfig Auto-merging include/linux/pci_ids.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 890019b] Merge commit 'pci/linux-next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-bus-pci | 10 + Documentation/PCI/pci-error-recovery.txt | 119 ++- Documentation/vgaarbiter.txt | 194 +++++ arch/alpha/include/asm/pci.h | 1 - arch/arm/include/asm/pci.h | 2 - arch/frv/mb93090-mb00/pci-frv.c | 10 +- arch/h8300/include/asm/pci.h | 1 - arch/ia64/include/asm/pci.h | 14 +- arch/mips/include/asm/pci.h | 2 - arch/mn10300/include/asm/pci.h | 13 +- arch/parisc/include/asm/pci.h | 1 - arch/powerpc/include/asm/pci.h | 1 - arch/powerpc/platforms/pseries/eeh.c | 10 +- arch/sh/include/asm/pci.h | 1 - arch/sparc/include/asm/pci_32.h | 1 - arch/sparc/include/asm/pci_64.h | 1 - arch/um/include/asm/pci.h | 1 - arch/x86/include/asm/pci.h | 1 - arch/x86/kernel/pci-dma.c | 4 +- arch/x86/kernel/quirks.c | 2 +- arch/x86/pci/amd_bus.c | 64 +-- arch/x86/pci/common.c | 69 ++ drivers/acpi/pci_root.c | 17 +- drivers/acpi/power.c | 58 +- drivers/acpi/scan.c | 1 + drivers/acpi/sleep.c | 12 +- drivers/acpi/wakeup.c | 4 +- drivers/gpu/Makefile | 2 +- drivers/gpu/vga/Kconfig | 10 + drivers/gpu/vga/Makefile | 1 + drivers/gpu/vga/vgaarb.c | 1205 ++++++++++++++++++++++++++++++ drivers/pci/Makefile | 3 + drivers/pci/hotplug/Makefile | 2 +- drivers/pci/hotplug/acpi_pcihp.c | 117 +-- drivers/pci/hotplug/acpiphp.h | 3 - drivers/pci/hotplug/acpiphp_glue.c | 187 +---- drivers/pci/hotplug/pci_hotplug_core.c | 3 +- drivers/pci/hotplug/pciehp.h | 9 - drivers/pci/hotplug/pciehp_acpi.c | 7 +- drivers/pci/hotplug/pciehp_ctrl.c | 5 - drivers/pci/hotplug/pciehp_hpc.c | 10 +- drivers/pci/hotplug/pciehp_pci.c | 137 +---- drivers/pci/hotplug/pcihp_slot.c | 187 +++++ drivers/pci/hotplug/shpchp.h | 9 - drivers/pci/hotplug/shpchp_pci.c | 62 +-- drivers/pci/legacy.c | 34 + drivers/pci/msi.c | 283 ++++---- drivers/pci/pci-acpi.c | 29 +- drivers/pci/pci-driver.c | 132 ++-- drivers/pci/pci-stub.c | 45 ++- drivers/pci/pci-sysfs.c | 37 + drivers/pci/pci.c | 106 +++- drivers/pci/pci.h | 2 +- drivers/pci/pcie/aer/aer_inject.c | 25 +- drivers/pci/pcie/aer/aerdrv.c | 22 +- drivers/pci/pcie/aer/aerdrv.h | 34 +- drivers/pci/pcie/aer/aerdrv_core.c | 107 ++-- drivers/pci/pcie/aer/aerdrv_errprint.c | 190 +++--- drivers/pci/pcie/aspm.c | 495 ++++++------- drivers/pci/pcie/portdrv_core.c | 6 - drivers/pci/pcie/portdrv_pci.c | 1 + drivers/pci/probe.c | 33 +- drivers/pci/quirks.c | 36 +- drivers/pci/search.c | 31 - drivers/pci/setup-bus.c | 22 +- drivers/pci/setup-res.c | 1 + drivers/pcmcia/yenta_socket.c | 16 +- drivers/video/Kconfig | 2 + include/acpi/acpi_bus.h | 18 +- include/asm-generic/pci.h | 13 +- include/linux/pci.h | 14 + include/linux/pci_hotplug.h | 16 +- include/linux/pci_ids.h | 3 + include/linux/vgaarb.h | 200 +++++ 74 files changed, 3145 insertions(+), 1381 deletions(-) create mode 100644 Documentation/vgaarbiter.txt create mode 100644 drivers/gpu/vga/Kconfig create mode 100644 drivers/gpu/vga/Makefile create mode 100644 drivers/gpu/vga/vgaarb.c create mode 100644 drivers/pci/hotplug/pcihp_slot.c create mode 100644 drivers/pci/legacy.c create mode 100644 include/linux/vgaarb.h $ git am -3 ../patches/pci_powerpc_of_fixup.patch Applying: pci: merge fixup for fundamental reset conflict with powerpc tree $ git reset HEAD^ arch/powerpc/kernel/pci_of_scan.c: locally modified $ git add . $ git commit -v -a --amend [master 0ed2c11] Merge commit 'pci/linux-next' Merging hid/for-next $ git merge hid/for-next Already up-to-date. Merging quilt/i2c $ git merge quilt/i2c Removing Documentation/i2c/chips/pca9539 Removing Documentation/i2c/chips/pcf8574 Removing Documentation/i2c/chips/pcf8575 Auto-merging drivers/i2c/busses/Kconfig Removing drivers/i2c/chips/pca9539.c Removing drivers/i2c/chips/pcf8574.c Removing drivers/i2c/chips/pcf8575.c Auto-merging include/linux/pci_ids.h Merge made by recursive. Documentation/i2c/busses/i2c-piix4 | 2 + Documentation/i2c/chips/pca9539 | 58 -------- Documentation/i2c/chips/pcf8574 | 65 --------- Documentation/i2c/chips/pcf8575 | 69 --------- block/genhd.c | 2 +- drivers/base/class.c | 87 +++++++++++ drivers/base/core.c | 4 +- drivers/base/driver.c | 4 +- drivers/block/cciss.c | 2 +- drivers/firewire/core-device.c | 2 +- drivers/firmware/dmi-id.c | 2 +- drivers/gpio/pcf857x.c | 1 + drivers/i2c/Kconfig | 8 + drivers/i2c/busses/Kconfig | 3 +- drivers/i2c/busses/i2c-piix4.c | 9 +- drivers/i2c/busses/i2c-pnx.c | 7 +- drivers/i2c/busses/i2c-taos-evm.c | 45 +++--- drivers/i2c/busses/scx200_acb.c | 6 +- drivers/i2c/chips/Kconfig | 48 ------ drivers/i2c/chips/Makefile | 3 - drivers/i2c/chips/pca9539.c | 152 -------------------- drivers/i2c/chips/pcf8574.c | 215 ---------------------------- drivers/i2c/chips/pcf8575.c | 198 ------------------------- drivers/i2c/chips/tsl2550.c | 42 ++---- drivers/i2c/i2c-core.c | 165 +++++++++++++++------- drivers/infiniband/hw/ehca/ehca_main.c | 2 +- drivers/infiniband/hw/ipath/ipath_kernel.h | 2 +- drivers/infiniband/hw/ipath/ipath_sysfs.c | 2 +- drivers/input/input.c | 2 +- drivers/misc/enclosure.c | 4 +- drivers/mmc/core/mmc.c | 2 +- drivers/mmc/core/sd.c | 2 +- drivers/mtd/mtdcore.c | 2 +- drivers/s390/cio/css.c | 2 +- drivers/s390/cio/device.c | 2 +- drivers/s390/net/netiucv.c | 2 +- drivers/scsi/scsi_priv.h | 2 +- drivers/scsi/scsi_sysfs.c | 4 +- drivers/usb/core/endpoint.c | 2 +- drivers/usb/core/sysfs.c | 4 +- drivers/usb/core/usb.h | 4 +- drivers/uwb/lc-dev.c | 2 +- fs/partitions/check.c | 2 +- include/linux/attribute_container.h | 2 +- include/linux/device.h | 14 ++- include/linux/i2c-id.h | 11 -- include/linux/i2c.h | 2 - include/linux/netdevice.h | 2 +- include/linux/pci_ids.h | 1 + include/linux/transport_class.h | 2 +- net/bluetooth/hci_sysfs.c | 4 +- net/core/net-sysfs.c | 2 +- 52 files changed, 310 insertions(+), 973 deletions(-) delete mode 100644 Documentation/i2c/chips/pca9539 delete mode 100644 Documentation/i2c/chips/pcf8574 delete mode 100644 Documentation/i2c/chips/pcf8575 delete mode 100644 drivers/i2c/chips/pca9539.c delete mode 100644 drivers/i2c/chips/pcf8574.c delete mode 100644 drivers/i2c/chips/pcf8575.c Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Auto-merging MAINTAINERS Merge made by recursive. Documentation/hwmon/pcf8591 | 28 ++-- Documentation/hwmon/tmp421 | 36 +++++ MAINTAINERS | 6 + drivers/hwmon/Kconfig | 110 ++++++++------ drivers/hwmon/Makefile | 7 +- drivers/hwmon/abituguru.c | 2 +- drivers/hwmon/abituguru3.c | 79 +++++----- drivers/hwmon/applesmc.c | 2 +- drivers/hwmon/dme1737.c | 2 +- drivers/hwmon/f71805f.c | 2 +- drivers/hwmon/hdaps.c | 3 +- drivers/hwmon/hwmon-vid.c | 10 +- drivers/hwmon/it87.c | 2 +- drivers/hwmon/lm78.c | 2 +- drivers/hwmon/lm85.c | 32 ++++ drivers/hwmon/pc87360.c | 2 +- drivers/hwmon/pc87427.c | 8 +- drivers/hwmon/sis5595.c | 2 +- drivers/hwmon/smsc47b397.c | 2 +- drivers/hwmon/smsc47m1.c | 2 +- drivers/hwmon/tmp421.c | 347 +++++++++++++++++++++++++++++++++++++++++++ drivers/hwmon/via686a.c | 2 +- drivers/hwmon/vt1211.c | 8 +- drivers/hwmon/vt8231.c | 2 +- drivers/hwmon/w83627ehf.c | 2 +- drivers/hwmon/w83627hf.c | 2 +- drivers/hwmon/w83781d.c | 2 +- 27 files changed, 579 insertions(+), 125 deletions(-) create mode 100644 Documentation/hwmon/tmp421 create mode 100644 drivers/hwmon/tmp421.c Merging quilt/kernel-doc $ git merge quilt/kernel-doc Merge made by recursive. Documentation/kernel-doc-nano-HOWTO.txt | 4 +++- Documentation/kref.txt | 1 - mm/mmap.c | 2 +- scripts/kernel-doc | 21 ++++++++++++++++----- 4 files changed, 20 insertions(+), 8 deletions(-) Merging v4l-dvb/master $ git merge v4l-dvb/master Resolved 'drivers/media/video/sh_mobile_ceu_camera.c' using previous resolution. Auto-merging arch/sh/boards/board-ap325rxa.c Auto-merging drivers/media/video/sh_mobile_ceu_camera.c CONFLICT (content): Merge conflict in drivers/media/video/sh_mobile_ceu_camera.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 34673b7] Merge commit 'v4l-dvb/master' $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/Makefile | 2 +- Documentation/DocBook/dvb/audio.xml | 1473 ++++++++++++ Documentation/DocBook/dvb/ca.xml | 221 ++ Documentation/DocBook/dvb/demux.xml | 973 ++++++++ Documentation/DocBook/dvb/dvbapi.xml | 79 + Documentation/DocBook/dvb/dvbstb.pdf | Bin 0 -> 1881 bytes Documentation/DocBook/dvb/dvbstb.png | Bin 0 -> 22655 bytes Documentation/DocBook/dvb/examples.xml | 365 +++ Documentation/DocBook/dvb/frontend.xml | 1765 ++++++++++++++ Documentation/DocBook/dvb/intro.xml | 191 ++ Documentation/DocBook/dvb/kdapi.xml | 2309 ++++++++++++++++++ Documentation/DocBook/dvb/net.xml | 12 + Documentation/DocBook/dvb/video.xml | 1971 ++++++++++++++++ Documentation/DocBook/media-entities.tmpl | 363 +++ Documentation/DocBook/media-indices.tmpl | 85 + Documentation/DocBook/media.tmpl | 112 + Documentation/DocBook/v4l/biblio.xml | 188 ++ Documentation/DocBook/v4l/capture.c.xml | 659 ++++++ Documentation/DocBook/v4l/common.xml | 1169 ++++++++++ Documentation/DocBook/v4l/compat.xml | 2457 ++++++++++++++++++++ Documentation/DocBook/v4l/controls.xml | 2049 ++++++++++++++++ Documentation/DocBook/v4l/crop.gif | Bin 0 -> 5967 bytes Documentation/DocBook/v4l/crop.pdf | Bin 0 -> 5846 bytes Documentation/DocBook/v4l/dev-capture.xml | 115 + Documentation/DocBook/v4l/dev-codec.xml | 26 + Documentation/DocBook/v4l/dev-effect.xml | 25 + Documentation/DocBook/v4l/dev-osd.xml | 164 ++ Documentation/DocBook/v4l/dev-output.xml | 111 + Documentation/DocBook/v4l/dev-overlay.xml | 379 +++ Documentation/DocBook/v4l/dev-radio.xml | 57 + Documentation/DocBook/v4l/dev-raw-vbi.xml | 347 +++ Documentation/DocBook/v4l/dev-rds.xml | 168 ++ Documentation/DocBook/v4l/dev-sliced-vbi.xml | 708 ++++++ Documentation/DocBook/v4l/dev-teletext.xml | 40 + Documentation/DocBook/v4l/driver.xml | 208 ++ Documentation/DocBook/v4l/fdl-appendix.xml | 671 ++++++ Documentation/DocBook/v4l/fieldseq_bt.gif | Bin 0 -> 25430 bytes Documentation/DocBook/v4l/fieldseq_bt.pdf | Bin 0 -> 9185 bytes Documentation/DocBook/v4l/fieldseq_tb.gif | Bin 0 -> 25323 bytes Documentation/DocBook/v4l/fieldseq_tb.pdf | Bin 0 -> 9173 bytes Documentation/DocBook/v4l/func-close.xml | 70 + Documentation/DocBook/v4l/func-ioctl.xml | 146 ++ Documentation/DocBook/v4l/func-mmap.xml | 185 ++ Documentation/DocBook/v4l/func-munmap.xml | 83 + Documentation/DocBook/v4l/func-open.xml | 121 + Documentation/DocBook/v4l/func-poll.xml | 127 + Documentation/DocBook/v4l/func-read.xml | 189 ++ Documentation/DocBook/v4l/func-select.xml | 138 ++ Documentation/DocBook/v4l/func-write.xml | 136 ++ Documentation/DocBook/v4l/io.xml | 1073 +++++++++ Documentation/DocBook/v4l/keytable.c.xml | 172 ++ Documentation/DocBook/v4l/libv4l.xml | 167 ++ Documentation/DocBook/v4l/pixfmt-grey.xml | 70 + Documentation/DocBook/v4l/pixfmt-nv12.xml | 151 ++ Documentation/DocBook/v4l/pixfmt-nv16.xml | 174 ++ Documentation/DocBook/v4l/pixfmt-packed-rgb.xml | 862 +++++++ Documentation/DocBook/v4l/pixfmt-packed-yuv.xml | 244 ++ Documentation/DocBook/v4l/pixfmt-sbggr16.xml | 91 + Documentation/DocBook/v4l/pixfmt-sbggr8.xml | 75 + Documentation/DocBook/v4l/pixfmt-sgbrg8.xml | 75 + Documentation/DocBook/v4l/pixfmt-sgrbg8.xml | 75 + Documentation/DocBook/v4l/pixfmt-uyvy.xml | 128 + Documentation/DocBook/v4l/pixfmt-vyuy.xml | 128 + Documentation/DocBook/v4l/pixfmt-y16.xml | 89 + Documentation/DocBook/v4l/pixfmt-y41p.xml | 157 ++ Documentation/DocBook/v4l/pixfmt-yuv410.xml | 141 ++ Documentation/DocBook/v4l/pixfmt-yuv411p.xml | 155 ++ Documentation/DocBook/v4l/pixfmt-yuv420.xml | 157 ++ Documentation/DocBook/v4l/pixfmt-yuv422p.xml | 161 ++ Documentation/DocBook/v4l/pixfmt-yuyv.xml | 128 + Documentation/DocBook/v4l/pixfmt-yvyu.xml | 128 + Documentation/DocBook/v4l/pixfmt.xml | 796 +++++++ Documentation/DocBook/v4l/remote_controllers.xml | 170 ++ Documentation/DocBook/v4l/v4l2.xml | 481 ++++ Documentation/DocBook/v4l/v4l2grab.c.xml | 164 ++ Documentation/DocBook/v4l/vbi_525.gif | Bin 0 -> 4741 bytes Documentation/DocBook/v4l/vbi_525.pdf | Bin 0 -> 3395 bytes Documentation/DocBook/v4l/vbi_625.gif | Bin 0 -> 5095 bytes Documentation/DocBook/v4l/vbi_625.pdf | Bin 0 -> 3683 bytes Documentation/DocBook/v4l/vbi_hsync.gif | Bin 0 -> 2400 bytes Documentation/DocBook/v4l/vbi_hsync.pdf | Bin 0 -> 7405 bytes Documentation/DocBook/v4l/videodev2.h.xml | 1639 +++++++++++++ Documentation/DocBook/v4l/vidioc-cropcap.xml | 174 ++ .../DocBook/v4l/vidioc-dbg-g-chip-ident.xml | 275 +++ .../DocBook/v4l/vidioc-dbg-g-register.xml | 275 +++ Documentation/DocBook/v4l/vidioc-encoder-cmd.xml | 204 ++ Documentation/DocBook/v4l/vidioc-enum-fmt.xml | 164 ++ .../DocBook/v4l/vidioc-enum-frameintervals.xml | 270 +++ .../DocBook/v4l/vidioc-enum-framesizes.xml | 282 +++ Documentation/DocBook/v4l/vidioc-enumaudio.xml | 86 + Documentation/DocBook/v4l/vidioc-enumaudioout.xml | 89 + Documentation/DocBook/v4l/vidioc-enuminput.xml | 287 +++ Documentation/DocBook/v4l/vidioc-enumoutput.xml | 172 ++ Documentation/DocBook/v4l/vidioc-enumstd.xml | 391 ++++ Documentation/DocBook/v4l/vidioc-g-audio.xml | 188 ++ Documentation/DocBook/v4l/vidioc-g-audioout.xml | 154 ++ Documentation/DocBook/v4l/vidioc-g-crop.xml | 143 ++ Documentation/DocBook/v4l/vidioc-g-ctrl.xml | 130 + Documentation/DocBook/v4l/vidioc-g-enc-index.xml | 213 ++ Documentation/DocBook/v4l/vidioc-g-ext-ctrls.xml | 307 +++ Documentation/DocBook/v4l/vidioc-g-fbuf.xml | 456 ++++ Documentation/DocBook/v4l/vidioc-g-fmt.xml | 201 ++ Documentation/DocBook/v4l/vidioc-g-frequency.xml | 145 ++ Documentation/DocBook/v4l/vidioc-g-input.xml | 100 + Documentation/DocBook/v4l/vidioc-g-jpegcomp.xml | 180 ++ Documentation/DocBook/v4l/vidioc-g-modulator.xml | 246 ++ Documentation/DocBook/v4l/vidioc-g-output.xml | 100 + Documentation/DocBook/v4l/vidioc-g-parm.xml | 332 +++ Documentation/DocBook/v4l/vidioc-g-priority.xml | 144 ++ .../DocBook/v4l/vidioc-g-sliced-vbi-cap.xml | 264 +++ Documentation/DocBook/v4l/vidioc-g-std.xml | 99 + Documentation/DocBook/v4l/vidioc-g-tuner.xml | 535 +++++ Documentation/DocBook/v4l/vidioc-log-status.xml | 58 + Documentation/DocBook/v4l/vidioc-overlay.xml | 83 + Documentation/DocBook/v4l/vidioc-qbuf.xml | 168 ++ Documentation/DocBook/v4l/vidioc-querybuf.xml | 103 + Documentation/DocBook/v4l/vidioc-querycap.xml | 284 +++ Documentation/DocBook/v4l/vidioc-queryctrl.xml | 428 ++++ Documentation/DocBook/v4l/vidioc-querystd.xml | 83 + Documentation/DocBook/v4l/vidioc-reqbufs.xml | 160 ++ .../DocBook/v4l/vidioc-s-hw-freq-seek.xml | 129 + Documentation/DocBook/v4l/vidioc-streamon.xml | 106 + Documentation/dvb/get_dvb_firmware | 37 +- Documentation/video4linux/soc-camera.txt | 40 + arch/sh/boards/board-ap325rxa.c | 58 +- drivers/media/common/tuners/tda18271-common.c | 3 +- drivers/media/common/tuners/tda18271-fe.c | 83 +- drivers/media/common/tuners/tda18271-maps.c | 3 +- drivers/media/common/tuners/tda18271-priv.h | 1 + drivers/media/common/tuners/tda18271.h | 14 + drivers/media/common/tuners/tuner-xc2028.c | 20 +- drivers/media/common/tuners/tuner-xc2028.h | 2 + drivers/media/dvb/dvb-usb/af9015.c | 50 +- drivers/media/dvb/dvb-usb/dib0700_devices.c | 122 +- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 5 + drivers/media/dvb/frontends/dib7000p.c | 33 +- drivers/media/video/Kconfig | 71 + drivers/media/video/Makefile | 4 + drivers/media/video/adv7343.c | 1 - drivers/media/video/cx18/cx18-i2c.c | 2 +- drivers/media/video/cx23885/cx23885-dvb.c | 4 + drivers/media/video/davinci/Makefile | 15 + drivers/media/video/davinci/ccdc_hw_device.h | 110 + drivers/media/video/davinci/dm355_ccdc.c | 978 ++++++++ drivers/media/video/davinci/dm355_ccdc_regs.h | 310 +++ drivers/media/video/davinci/dm644x_ccdc.c | 878 +++++++ drivers/media/video/davinci/dm644x_ccdc_regs.h | 145 ++ drivers/media/video/davinci/vpfe_capture.c | 2124 +++++++++++++++++ drivers/media/video/davinci/vpif.c | 234 ++ drivers/media/video/davinci/vpif.h | 632 +++++ drivers/media/video/davinci/vpif_display.c | 1679 +++++++++++++ drivers/media/video/davinci/vpif_display.h | 175 ++ drivers/media/video/davinci/vpss.c | 301 +++ drivers/media/video/em28xx/Makefile | 2 +- drivers/media/video/em28xx/em28xx-cards.c | 5 +- drivers/media/video/em28xx/em28xx-core.c | 51 +- drivers/media/video/em28xx/em28xx-reg.h | 16 + drivers/media/video/em28xx/em28xx-vbi.c | 142 ++ drivers/media/video/em28xx/em28xx-video.c | 589 ++++- drivers/media/video/em28xx/em28xx.h | 25 +- drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 13 + drivers/media/video/mt9m001.c | 435 ++-- drivers/media/video/mt9m111.c | 524 +++-- drivers/media/video/mt9t031.c | 491 +++-- drivers/media/video/mt9v022.c | 434 ++-- drivers/media/video/mx1_camera.c | 78 +- drivers/media/video/mx3_camera.c | 207 +- drivers/media/video/ov772x.c | 381 ++-- drivers/media/video/pvrusb2/pvrusb2-devattr.c | 2 + drivers/media/video/pxa_camera.c | 358 ++-- drivers/media/video/saa7134/saa7134-dvb.c | 1 + drivers/media/video/sh_mobile_ceu_camera.c | 1058 ++++++++- drivers/media/video/soc_camera.c | 725 ++++--- drivers/media/video/soc_camera_platform.c | 163 +- drivers/media/video/tvp514x.c | 1030 ++++----- drivers/media/video/tvp514x_regs.h | 10 - drivers/media/video/tw9910.c | 361 ++-- drivers/staging/Kconfig | 2 + drivers/staging/Makefile | 1 + drivers/staging/cx25821/Kconfig | 34 + drivers/staging/cx25821/Makefile | 14 + drivers/staging/cx25821/README | 6 + drivers/staging/cx25821/cx25821-alsa.c | 789 +++++++ drivers/staging/cx25821/cx25821-audio-upstream.c | 804 +++++++ drivers/staging/cx25821/cx25821-audio-upstream.h | 57 + drivers/staging/cx25821/cx25821-audio.h | 57 + drivers/staging/cx25821/cx25821-audups11.c | 434 ++++ drivers/staging/cx25821/cx25821-biffuncs.h | 45 + drivers/staging/cx25821/cx25821-cards.c | 70 + drivers/staging/cx25821/cx25821-core.c | 1551 ++++++++++++ drivers/staging/cx25821/cx25821-gpio.c | 98 + drivers/staging/cx25821/cx25821-gpio.h | 2 + drivers/staging/cx25821/cx25821-i2c.c | 419 ++++ drivers/staging/cx25821/cx25821-medusa-defines.h | 51 + drivers/staging/cx25821/cx25821-medusa-reg.h | 455 ++++ drivers/staging/cx25821/cx25821-medusa-video.c | 869 +++++++ drivers/staging/cx25821/cx25821-medusa-video.h | 49 + drivers/staging/cx25821/cx25821-reg.h | 1592 +++++++++++++ drivers/staging/cx25821/cx25821-sram.h | 261 +++ .../staging/cx25821/cx25821-video-upstream-ch2.c | 835 +++++++ .../staging/cx25821/cx25821-video-upstream-ch2.h | 101 + drivers/staging/cx25821/cx25821-video-upstream.c | 894 +++++++ drivers/staging/cx25821/cx25821-video-upstream.h | 109 + drivers/staging/cx25821/cx25821-video.c | 1299 +++++++++++ drivers/staging/cx25821/cx25821-video.h | 194 ++ drivers/staging/cx25821/cx25821-video0.c | 451 ++++ drivers/staging/cx25821/cx25821-video1.c | 451 ++++ drivers/staging/cx25821/cx25821-video2.c | 452 ++++ drivers/staging/cx25821/cx25821-video3.c | 451 ++++ drivers/staging/cx25821/cx25821-video4.c | 450 ++++ drivers/staging/cx25821/cx25821-video5.c | 450 ++++ drivers/staging/cx25821/cx25821-video6.c | 450 ++++ drivers/staging/cx25821/cx25821-video7.c | 449 ++++ drivers/staging/cx25821/cx25821-videoioctl.c | 496 ++++ drivers/staging/cx25821/cx25821-vidups10.c | 435 ++++ drivers/staging/cx25821/cx25821-vidups9.c | 433 ++++ drivers/staging/cx25821/cx25821.h | 602 +++++ drivers/staging/go7007/go7007-driver.c | 12 +- drivers/staging/go7007/go7007-fw.c | 3 +- drivers/staging/go7007/go7007-i2c.c | 12 +- drivers/staging/go7007/go7007-priv.h | 6 +- drivers/staging/go7007/go7007-usb.c | 10 +- drivers/staging/go7007/go7007-v4l2.c | 66 +- drivers/staging/go7007/go7007.txt | 176 +- drivers/staging/go7007/s2250-board.c | 20 +- drivers/staging/go7007/s2250-loader.c | 8 +- drivers/staging/go7007/snd-go7007.c | 2 +- drivers/staging/go7007/wis-tw9903.c | 3 +- drivers/staging/tm6000/Kconfig | 32 + drivers/staging/tm6000/Makefile | 15 + drivers/staging/tm6000/README | 11 + drivers/staging/tm6000/hack.c | 252 ++ drivers/staging/tm6000/hack.h | 45 + drivers/staging/tm6000/tm6000-alsa.c | 413 ++++ drivers/staging/tm6000/tm6000-cards.c | 630 +++++ drivers/staging/tm6000/tm6000-core.c | 511 ++++ drivers/staging/tm6000/tm6000-dvb.c | 322 +++ drivers/staging/tm6000/tm6000-i2c.c | 262 +++ drivers/staging/tm6000/tm6000-regs.h | 86 + drivers/staging/tm6000/tm6000-stds.c | 873 +++++++ drivers/staging/tm6000/tm6000-usb-isoc.h | 53 + drivers/staging/tm6000/tm6000-video.c | 1573 +++++++++++++ drivers/staging/tm6000/tm6000.h | 279 +++ include/linux/videodev2.h | 4 +- include/media/davinci/ccdc_types.h | 43 + include/media/davinci/dm355_ccdc.h | 321 +++ include/media/davinci/dm644x_ccdc.h | 184 ++ include/media/davinci/vpfe_capture.h | 198 ++ include/media/davinci/vpfe_types.h | 51 + include/media/davinci/vpss.h | 69 + include/media/soc_camera.h | 113 +- include/media/soc_camera_platform.h | 9 +- include/media/tvp514x.h | 4 - 253 files changed, 72412 insertions(+), 2872 deletions(-) create mode 100644 Documentation/DocBook/dvb/audio.xml create mode 100644 Documentation/DocBook/dvb/ca.xml create mode 100644 Documentation/DocBook/dvb/demux.xml create mode 100644 Documentation/DocBook/dvb/dvbapi.xml create mode 100644 Documentation/DocBook/dvb/dvbstb.pdf create mode 100644 Documentation/DocBook/dvb/dvbstb.png create mode 100644 Documentation/DocBook/dvb/examples.xml create mode 100644 Documentation/DocBook/dvb/frontend.xml create mode 100644 Documentation/DocBook/dvb/intro.xml create mode 100644 Documentation/DocBook/dvb/kdapi.xml create mode 100644 Documentation/DocBook/dvb/net.xml create mode 100644 Documentation/DocBook/dvb/video.xml create mode 100644 Documentation/DocBook/media-entities.tmpl create mode 100644 Documentation/DocBook/media-indices.tmpl create mode 100644 Documentation/DocBook/media.tmpl create mode 100644 Documentation/DocBook/v4l/biblio.xml create mode 100644 Documentation/DocBook/v4l/capture.c.xml create mode 100644 Documentation/DocBook/v4l/common.xml create mode 100644 Documentation/DocBook/v4l/compat.xml create mode 100644 Documentation/DocBook/v4l/controls.xml create mode 100644 Documentation/DocBook/v4l/crop.gif create mode 100644 Documentation/DocBook/v4l/crop.pdf create mode 100644 Documentation/DocBook/v4l/dev-capture.xml create mode 100644 Documentation/DocBook/v4l/dev-codec.xml create mode 100644 Documentation/DocBook/v4l/dev-effect.xml create mode 100644 Documentation/DocBook/v4l/dev-osd.xml create mode 100644 Documentation/DocBook/v4l/dev-output.xml create mode 100644 Documentation/DocBook/v4l/dev-overlay.xml create mode 100644 Documentation/DocBook/v4l/dev-radio.xml create mode 100644 Documentation/DocBook/v4l/dev-raw-vbi.xml create mode 100644 Documentation/DocBook/v4l/dev-rds.xml create mode 100644 Documentation/DocBook/v4l/dev-sliced-vbi.xml create mode 100644 Documentation/DocBook/v4l/dev-teletext.xml create mode 100644 Documentation/DocBook/v4l/driver.xml create mode 100644 Documentation/DocBook/v4l/fdl-appendix.xml create mode 100644 Documentation/DocBook/v4l/fieldseq_bt.gif create mode 100644 Documentation/DocBook/v4l/fieldseq_bt.pdf create mode 100644 Documentation/DocBook/v4l/fieldseq_tb.gif create mode 100644 Documentation/DocBook/v4l/fieldseq_tb.pdf create mode 100644 Documentation/DocBook/v4l/func-close.xml create mode 100644 Documentation/DocBook/v4l/func-ioctl.xml create mode 100644 Documentation/DocBook/v4l/func-mmap.xml create mode 100644 Documentation/DocBook/v4l/func-munmap.xml create mode 100644 Documentation/DocBook/v4l/func-open.xml create mode 100644 Documentation/DocBook/v4l/func-poll.xml create mode 100644 Documentation/DocBook/v4l/func-read.xml create mode 100644 Documentation/DocBook/v4l/func-select.xml create mode 100644 Documentation/DocBook/v4l/func-write.xml create mode 100644 Documentation/DocBook/v4l/io.xml create mode 100644 Documentation/DocBook/v4l/keytable.c.xml create mode 100644 Documentation/DocBook/v4l/libv4l.xml create mode 100644 Documentation/DocBook/v4l/pixfmt-grey.xml create mode 100644 Documentation/DocBook/v4l/pixfmt-nv12.xml create mode 100644 Documentation/DocBook/v4l/pixfmt-nv16.xml create mode 100644 Documentation/DocBook/v4l/pixfmt-packed-rgb.xml create mode 100644 Documentation/DocBook/v4l/pixfmt-packed-yuv.xml create mode 100644 Documentation/DocBook/v4l/pixfmt-sbggr16.xml create mode 100644 Documentation/DocBook/v4l/pixfmt-sbggr8.xml create mode 100644 Documentation/DocBook/v4l/pixfmt-sgbrg8.xml create mode 100644 Documentation/DocBook/v4l/pixfmt-sgrbg8.xml create mode 100644 Documentation/DocBook/v4l/pixfmt-uyvy.xml create mode 100644 Documentation/DocBook/v4l/pixfmt-vyuy.xml create mode 100644 Documentation/DocBook/v4l/pixfmt-y16.xml create mode 100644 Documentation/DocBook/v4l/pixfmt-y41p.xml create mode 100644 Documentation/DocBook/v4l/pixfmt-yuv410.xml create mode 100644 Documentation/DocBook/v4l/pixfmt-yuv411p.xml create mode 100644 Documentation/DocBook/v4l/pixfmt-yuv420.xml create mode 100644 Documentation/DocBook/v4l/pixfmt-yuv422p.xml create mode 100644 Documentation/DocBook/v4l/pixfmt-yuyv.xml create mode 100644 Documentation/DocBook/v4l/pixfmt-yvyu.xml create mode 100644 Documentation/DocBook/v4l/pixfmt.xml create mode 100644 Documentation/DocBook/v4l/remote_controllers.xml create mode 100644 Documentation/DocBook/v4l/v4l2.xml create mode 100644 Documentation/DocBook/v4l/v4l2grab.c.xml create mode 100644 Documentation/DocBook/v4l/vbi_525.gif create mode 100644 Documentation/DocBook/v4l/vbi_525.pdf create mode 100644 Documentation/DocBook/v4l/vbi_625.gif create mode 100644 Documentation/DocBook/v4l/vbi_625.pdf create mode 100644 Documentation/DocBook/v4l/vbi_hsync.gif create mode 100644 Documentation/DocBook/v4l/vbi_hsync.pdf create mode 100644 Documentation/DocBook/v4l/videodev2.h.xml create mode 100644 Documentation/DocBook/v4l/vidioc-cropcap.xml create mode 100644 Documentation/DocBook/v4l/vidioc-dbg-g-chip-ident.xml create mode 100644 Documentation/DocBook/v4l/vidioc-dbg-g-register.xml create mode 100644 Documentation/DocBook/v4l/vidioc-encoder-cmd.xml create mode 100644 Documentation/DocBook/v4l/vidioc-enum-fmt.xml create mode 100644 Documentation/DocBook/v4l/vidioc-enum-frameintervals.xml create mode 100644 Documentation/DocBook/v4l/vidioc-enum-framesizes.xml create mode 100644 Documentation/DocBook/v4l/vidioc-enumaudio.xml create mode 100644 Documentation/DocBook/v4l/vidioc-enumaudioout.xml create mode 100644 Documentation/DocBook/v4l/vidioc-enuminput.xml create mode 100644 Documentation/DocBook/v4l/vidioc-enumoutput.xml create mode 100644 Documentation/DocBook/v4l/vidioc-enumstd.xml create mode 100644 Documentation/DocBook/v4l/vidioc-g-audio.xml create mode 100644 Documentation/DocBook/v4l/vidioc-g-audioout.xml create mode 100644 Documentation/DocBook/v4l/vidioc-g-crop.xml create mode 100644 Documentation/DocBook/v4l/vidioc-g-ctrl.xml create mode 100644 Documentation/DocBook/v4l/vidioc-g-enc-index.xml create mode 100644 Documentation/DocBook/v4l/vidioc-g-ext-ctrls.xml create mode 100644 Documentation/DocBook/v4l/vidioc-g-fbuf.xml create mode 100644 Documentation/DocBook/v4l/vidioc-g-fmt.xml create mode 100644 Documentation/DocBook/v4l/vidioc-g-frequency.xml create mode 100644 Documentation/DocBook/v4l/vidioc-g-input.xml create mode 100644 Documentation/DocBook/v4l/vidioc-g-jpegcomp.xml create mode 100644 Documentation/DocBook/v4l/vidioc-g-modulator.xml create mode 100644 Documentation/DocBook/v4l/vidioc-g-output.xml create mode 100644 Documentation/DocBook/v4l/vidioc-g-parm.xml create mode 100644 Documentation/DocBook/v4l/vidioc-g-priority.xml create mode 100644 Documentation/DocBook/v4l/vidioc-g-sliced-vbi-cap.xml create mode 100644 Documentation/DocBook/v4l/vidioc-g-std.xml create mode 100644 Documentation/DocBook/v4l/vidioc-g-tuner.xml create mode 100644 Documentation/DocBook/v4l/vidioc-log-status.xml create mode 100644 Documentation/DocBook/v4l/vidioc-overlay.xml create mode 100644 Documentation/DocBook/v4l/vidioc-qbuf.xml create mode 100644 Documentation/DocBook/v4l/vidioc-querybuf.xml create mode 100644 Documentation/DocBook/v4l/vidioc-querycap.xml create mode 100644 Documentation/DocBook/v4l/vidioc-queryctrl.xml create mode 100644 Documentation/DocBook/v4l/vidioc-querystd.xml create mode 100644 Documentation/DocBook/v4l/vidioc-reqbufs.xml create mode 100644 Documentation/DocBook/v4l/vidioc-s-hw-freq-seek.xml create mode 100644 Documentation/DocBook/v4l/vidioc-streamon.xml create mode 100644 drivers/media/video/davinci/Makefile create mode 100644 drivers/media/video/davinci/ccdc_hw_device.h create mode 100644 drivers/media/video/davinci/dm355_ccdc.c create mode 100644 drivers/media/video/davinci/dm355_ccdc_regs.h create mode 100644 drivers/media/video/davinci/dm644x_ccdc.c create mode 100644 drivers/media/video/davinci/dm644x_ccdc_regs.h create mode 100644 drivers/media/video/davinci/vpfe_capture.c create mode 100644 drivers/media/video/davinci/vpif.c create mode 100644 drivers/media/video/davinci/vpif.h create mode 100644 drivers/media/video/davinci/vpif_display.c create mode 100644 drivers/media/video/davinci/vpif_display.h create mode 100644 drivers/media/video/davinci/vpss.c create mode 100644 drivers/media/video/em28xx/em28xx-vbi.c create mode 100644 drivers/staging/cx25821/Kconfig create mode 100644 drivers/staging/cx25821/Makefile create mode 100644 drivers/staging/cx25821/README create mode 100644 drivers/staging/cx25821/cx25821-alsa.c create mode 100644 drivers/staging/cx25821/cx25821-audio-upstream.c create mode 100644 drivers/staging/cx25821/cx25821-audio-upstream.h create mode 100644 drivers/staging/cx25821/cx25821-audio.h create mode 100644 drivers/staging/cx25821/cx25821-audups11.c create mode 100644 drivers/staging/cx25821/cx25821-biffuncs.h create mode 100644 drivers/staging/cx25821/cx25821-cards.c create mode 100644 drivers/staging/cx25821/cx25821-core.c create mode 100644 drivers/staging/cx25821/cx25821-gpio.c create mode 100644 drivers/staging/cx25821/cx25821-gpio.h create mode 100644 drivers/staging/cx25821/cx25821-i2c.c create mode 100644 drivers/staging/cx25821/cx25821-medusa-defines.h create mode 100644 drivers/staging/cx25821/cx25821-medusa-reg.h create mode 100644 drivers/staging/cx25821/cx25821-medusa-video.c create mode 100644 drivers/staging/cx25821/cx25821-medusa-video.h create mode 100644 drivers/staging/cx25821/cx25821-reg.h create mode 100644 drivers/staging/cx25821/cx25821-sram.h create mode 100644 drivers/staging/cx25821/cx25821-video-upstream-ch2.c create mode 100644 drivers/staging/cx25821/cx25821-video-upstream-ch2.h create mode 100644 drivers/staging/cx25821/cx25821-video-upstream.c create mode 100644 drivers/staging/cx25821/cx25821-video-upstream.h create mode 100644 drivers/staging/cx25821/cx25821-video.c create mode 100644 drivers/staging/cx25821/cx25821-video.h create mode 100644 drivers/staging/cx25821/cx25821-video0.c create mode 100644 drivers/staging/cx25821/cx25821-video1.c create mode 100644 drivers/staging/cx25821/cx25821-video2.c create mode 100644 drivers/staging/cx25821/cx25821-video3.c create mode 100644 drivers/staging/cx25821/cx25821-video4.c create mode 100644 drivers/staging/cx25821/cx25821-video5.c create mode 100644 drivers/staging/cx25821/cx25821-video6.c create mode 100644 drivers/staging/cx25821/cx25821-video7.c create mode 100644 drivers/staging/cx25821/cx25821-videoioctl.c create mode 100644 drivers/staging/cx25821/cx25821-vidups10.c create mode 100644 drivers/staging/cx25821/cx25821-vidups9.c create mode 100644 drivers/staging/cx25821/cx25821.h create mode 100644 drivers/staging/tm6000/Kconfig create mode 100644 drivers/staging/tm6000/Makefile create mode 100644 drivers/staging/tm6000/README create mode 100644 drivers/staging/tm6000/hack.c create mode 100644 drivers/staging/tm6000/hack.h create mode 100644 drivers/staging/tm6000/tm6000-alsa.c create mode 100644 drivers/staging/tm6000/tm6000-cards.c create mode 100644 drivers/staging/tm6000/tm6000-core.c create mode 100644 drivers/staging/tm6000/tm6000-dvb.c create mode 100644 drivers/staging/tm6000/tm6000-i2c.c create mode 100644 drivers/staging/tm6000/tm6000-regs.h create mode 100644 drivers/staging/tm6000/tm6000-stds.c create mode 100644 drivers/staging/tm6000/tm6000-usb-isoc.h create mode 100644 drivers/staging/tm6000/tm6000-video.c create mode 100644 drivers/staging/tm6000/tm6000.h create mode 100644 include/media/davinci/ccdc_types.h create mode 100644 include/media/davinci/dm355_ccdc.h create mode 100644 include/media/davinci/dm644x_ccdc.h create mode 100644 include/media/davinci/vpfe_capture.h create mode 100644 include/media/davinci/vpfe_types.h create mode 100644 include/media/davinci/vpss.h Merging quota/for_next $ git merge quota/for_next Already up-to-date. Merging kbuild/master $ git merge kbuild/master Resolved 'scripts/extract-ikconfig' using previous resolution. Removing scripts/binoffset.c Auto-merging scripts/extract-ikconfig CONFLICT (content): Merge conflict in scripts/extract-ikconfig Auto-merging scripts/kconfig/mconf.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master f5eef61] Merge commit 'kbuild/master' $ git diff -M --stat --summary HEAD^.. Documentation/dontdiff | 1 - scripts/.gitignore | 1 - scripts/binoffset.c | 163 ------------------------------------------- scripts/extract-ikconfig | 127 ++++++++++++---------------------- scripts/kconfig/conf.c | 22 +++--- scripts/kconfig/expr.c | 2 + scripts/kconfig/gconf.c | 21 +----- scripts/kconfig/lkc_proto.h | 2 + scripts/kconfig/mconf.c | 78 +-------------------- scripts/kconfig/menu.c | 79 +++++++++++++++++++++ scripts/kconfig/qconf.cc | 10 +-- usr/Makefile | 2 +- 12 files changed, 150 insertions(+), 358 deletions(-) delete mode 100644 scripts/binoffset.c Merging kconfig/for-next $ git merge kconfig/for-next Already up-to-date. Merging ide/master $ git merge ide/master Already up-to-date. Merging libata/NEXT $ git merge libata/NEXT Already up-to-date. Merging infiniband/for-next $ git merge infiniband/for-next Auto-merging include/linux/Kbuild Merge made by recursive. Documentation/Makefile | 3 +- Documentation/ummunotify/Makefile | 7 + Documentation/ummunotify/ummunotify.txt | 150 ++++++++ Documentation/ummunotify/umn-test.c | 200 +++++++++++ drivers/char/Kconfig | 12 + drivers/char/Makefile | 1 + drivers/char/ummunotify.c | 566 +++++++++++++++++++++++++++++++ include/linux/Kbuild | 1 + include/linux/ummunotify.h | 121 +++++++ 9 files changed, 1060 insertions(+), 1 deletions(-) create mode 100644 Documentation/ummunotify/Makefile create mode 100644 Documentation/ummunotify/ummunotify.txt create mode 100644 Documentation/ummunotify/umn-test.c create mode 100644 drivers/char/ummunotify.c create mode 100644 include/linux/ummunotify.h Merging acpi/test $ git merge acpi/test Resolved 'drivers/acpi/power.c' using previous resolution. Resolved 'drivers/pci/dmar.c' using previous resolution. Auto-merging MAINTAINERS Auto-merging arch/x86/kernel/reboot.c Auto-merging drivers/acpi/acpica/hwsleep.c Auto-merging drivers/acpi/blacklist.c Auto-merging drivers/acpi/pci_root.c Auto-merging drivers/acpi/power.c CONFLICT (content): Merge conflict in drivers/acpi/power.c Auto-merging drivers/acpi/scan.c Auto-merging drivers/acpi/sleep.c Auto-merging drivers/char/agp/hp-agp.c Auto-merging drivers/pci/dmar.c CONFLICT (content): Merge conflict in drivers/pci/dmar.c Auto-merging include/acpi/acpi_bus.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master bc865e8] Merge commit 'acpi/test' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/stable/sysfs-class-backlight | 36 + Documentation/ABI/testing/sysfs-class-lcd | 23 + Documentation/ABI/testing/sysfs-class-led | 28 + .../ABI/testing/sysfs-platform-asus-laptop | 52 ++ .../ABI/testing/sysfs-platform-eeepc-laptop | 50 ++ Documentation/laptops/asus-laptop.txt | 258 ++++++ Documentation/leds-class.txt | 9 +- MAINTAINERS | 8 + arch/ia64/hp/common/sba_iommu.c | 7 +- arch/x86/include/asm/acpi.h | 1 - arch/x86/kernel/reboot.c | 2 +- arch/x86/pci/mmconfig-shared.c | 2 + drivers/acpi/Kconfig | 17 +- drivers/acpi/Makefile | 2 + drivers/acpi/ac.c | 2 + drivers/acpi/acpi_memhotplug.c | 51 +- drivers/acpi/acpi_pad.c | 514 ++++++++++++ drivers/acpi/acpica/Makefile | 4 +- drivers/acpi/acpica/acconfig.h | 10 +- drivers/acpi/acpica/acdebug.h | 4 - drivers/acpi/acpica/acglobal.h | 37 +- drivers/acpi/acpica/achware.h | 8 + drivers/acpi/acpica/acinterp.h | 4 +- drivers/acpi/acpica/aclocal.h | 16 + drivers/acpi/acpica/acmacros.h | 2 + drivers/acpi/acpica/acnamesp.h | 25 + drivers/acpi/acpica/acobject.h | 1 + drivers/acpi/acpica/acparser.h | 2 + drivers/acpi/acpica/acpredef.h | 584 ++++++++----- drivers/acpi/acpica/acutils.h | 30 +- drivers/acpi/acpica/amlcode.h | 1 + drivers/acpi/acpica/dsfield.c | 18 +- drivers/acpi/acpica/dsmethod.c | 15 +- drivers/acpi/acpica/dsmthdat.c | 8 +- drivers/acpi/acpica/dsobject.c | 23 +- drivers/acpi/acpica/dswload.c | 41 +- drivers/acpi/acpica/evevent.c | 13 +- drivers/acpi/acpica/evgpe.c | 8 +- drivers/acpi/acpica/evgpeblk.c | 4 +- drivers/acpi/acpica/evrgnini.c | 45 +- drivers/acpi/acpica/exconfig.c | 7 + drivers/acpi/acpica/exdump.c | 6 +- drivers/acpi/acpica/exfield.c | 82 ++- drivers/acpi/acpica/exfldio.c | 7 +- drivers/acpi/acpica/exutils.c | 53 +- drivers/acpi/acpica/hwgpe.c | 34 +- drivers/acpi/acpica/hwregs.c | 206 +++++- drivers/acpi/acpica/hwsleep.c | 24 +- drivers/acpi/acpica/hwtimer.c | 2 +- drivers/acpi/acpica/hwxface.c | 195 +++-- drivers/acpi/acpica/nsalloc.c | 88 ++- drivers/acpi/acpica/nsdumpdv.c | 7 +- drivers/acpi/acpica/nseval.c | 137 +++ drivers/acpi/acpica/nsinit.c | 15 + drivers/acpi/acpica/nsload.c | 3 +- drivers/acpi/acpica/nspredef.c | 718 +++++++++-------- drivers/acpi/acpica/nsrepair.c | 203 +++++ drivers/acpi/acpica/nsutils.c | 5 +- drivers/acpi/acpica/nsxfeval.c | 23 +- drivers/acpi/acpica/nsxfname.c | 237 ++++-- drivers/acpi/acpica/psloop.c | 119 +++- drivers/acpi/acpica/psxface.c | 4 + drivers/acpi/acpica/tbutils.c | 82 ++- drivers/acpi/acpica/utdelete.c | 6 + drivers/acpi/acpica/uteval.c | 378 +-------- drivers/acpi/acpica/utglobal.c | 12 +- drivers/acpi/acpica/utids.c | 382 +++++++++ drivers/acpi/acpica/utinit.c | 22 +- drivers/acpi/acpica/utmisc.c | 85 ++- drivers/acpi/acpica/utxface.c | 26 +- drivers/acpi/battery.c | 22 + drivers/acpi/blacklist.c | 2 + drivers/acpi/bus.c | 3 +- drivers/acpi/button.c | 2 + drivers/acpi/cm_sbs.c | 2 + drivers/acpi/container.c | 13 +- drivers/acpi/dock.c | 10 +- drivers/acpi/ec.c | 269 +++---- drivers/acpi/event.c | 2 + drivers/acpi/fan.c | 2 + drivers/acpi/glue.c | 10 +- drivers/acpi/internal.h | 22 +- drivers/acpi/numa.c | 2 + drivers/acpi/osl.c | 94 ++- drivers/acpi/pci_irq.c | 2 + drivers/acpi/pci_link.c | 2 + drivers/acpi/pci_root.c | 2 + drivers/acpi/pci_slot.c | 5 +- drivers/acpi/power.c | 2 + drivers/acpi/processor_core.c | 246 +++--- drivers/acpi/processor_idle.c | 12 +- drivers/acpi/processor_perflib.c | 2 + drivers/acpi/processor_thermal.c | 5 +- drivers/acpi/processor_throttling.c | 5 +- drivers/acpi/sbs.c | 2 + drivers/acpi/sbshc.c | 2 + drivers/acpi/scan.c | 180 +++-- drivers/acpi/sleep.c | 22 +- drivers/acpi/system.c | 2 + drivers/acpi/tables.c | 6 + drivers/acpi/thermal.c | 2 + drivers/acpi/utils.c | 2 + drivers/acpi/video.c | 112 ++- drivers/acpi/video_detect.c | 2 + drivers/char/agp/hp-agp.c | 9 +- drivers/ide/ide-acpi.c | 5 +- drivers/pci/dmar.c | 4 +- drivers/pci/hotplug/acpiphp_ibm.c | 12 +- drivers/platform/x86/Kconfig | 1 + drivers/platform/x86/acerhdf.c | 97 ++- drivers/platform/x86/asus-laptop.c | 227 ++++-- drivers/platform/x86/eeepc-laptop.c | 340 +++++--- drivers/platform/x86/fujitsu-laptop.c | 109 ++-- drivers/platform/x86/sony-laptop.c | 7 +- drivers/platform/x86/wmi.c | 1 - drivers/pnp/pnpacpi/core.c | 6 +- include/acpi/acpi_bus.h | 16 +- include/acpi/acpiosxf.h | 3 + include/acpi/acpixf.h | 10 +- include/acpi/actbl.h | 78 ++- include/acpi/actbl1.h | 872 +++++--------------- include/acpi/actbl2.h | 868 +++++++++++++++++++ include/acpi/actypes.h | 92 +- include/acpi/platform/aclinux.h | 4 +- include/linux/acpi.h | 15 +- 125 files changed, 6079 insertions(+), 2900 deletions(-) create mode 100644 Documentation/ABI/stable/sysfs-class-backlight create mode 100644 Documentation/ABI/testing/sysfs-class-lcd create mode 100644 Documentation/ABI/testing/sysfs-class-led create mode 100644 Documentation/ABI/testing/sysfs-platform-asus-laptop create mode 100644 Documentation/ABI/testing/sysfs-platform-eeepc-laptop create mode 100644 Documentation/laptops/asus-laptop.txt create mode 100644 drivers/acpi/acpi_pad.c create mode 100644 drivers/acpi/acpica/nsrepair.c create mode 100644 drivers/acpi/acpica/utids.c create mode 100644 include/acpi/actbl2.h Merging ieee1394/for-next $ git merge ieee1394/for-next Merge made by recursive. drivers/firewire/core-card.c | 13 +++++-------- drivers/firewire/core-transaction.c | 2 +- drivers/firewire/core.h | 14 ++++++++++++++ drivers/firewire/ohci.c | 4 ++-- drivers/firewire/sbp2.c | 16 ++++++++-------- drivers/ieee1394/raw1394.c | 4 +++- drivers/ieee1394/sbp2.c | 3 +-- include/linux/firewire.h | 14 -------------- 8 files changed, 34 insertions(+), 36 deletions(-) Merging ubi/linux-next $ git merge ubi/linux-next Merge made by recursive. drivers/mtd/ubi/debug.c | 32 +++++++++++++++++++++++++++++ drivers/mtd/ubi/debug.h | 2 + drivers/mtd/ubi/io.c | 51 +++++++++++++++++++++++++++++++--------------- drivers/mtd/ubi/scan.c | 22 +++++++++++++++++-- drivers/mtd/ubi/scan.h | 2 + drivers/mtd/ubi/ubi.h | 3 +- 6 files changed, 91 insertions(+), 21 deletions(-) Merging kvm/linux-next $ git merge kvm/linux-next Auto-merging arch/x86/kvm/x86.c Merge made by recursive. arch/ia64/include/asm/kvm.h | 1 + arch/ia64/include/asm/kvm_host.h | 1 - arch/ia64/kvm/Makefile | 2 +- arch/ia64/kvm/kvm-ia64.c | 11 +- arch/powerpc/kvm/powerpc.c | 2 +- arch/s390/kvm/kvm-s390.c | 2 +- arch/x86/include/asm/kvm.h | 1 + arch/x86/include/asm/kvm_host.h | 12 +- arch/x86/kvm/Makefile | 3 +- arch/x86/kvm/emulate.c | 154 +++++++- arch/x86/kvm/i8254.c | 2 - arch/x86/kvm/i8259.c | 44 ++- arch/x86/kvm/irq.h | 1 + arch/x86/kvm/lapic.c | 7 +- arch/x86/kvm/mmu.c | 2 +- arch/x86/kvm/svm.c | 105 +++--- arch/x86/kvm/vmx.c | 153 ++++---- arch/x86/kvm/x86.c | 64 ++-- include/linux/kvm_host.h | 50 +++- virt/kvm/assigned-dev.c | 818 ++++++++++++++++++++++++++++++++++++++ virt/kvm/eventfd.c | 2 - virt/kvm/ioapic.c | 80 +++- virt/kvm/ioapic.h | 5 + virt/kvm/irq_comm.c | 214 ++++++---- virt/kvm/kvm_main.c | 804 +------------------------------------- 25 files changed, 1395 insertions(+), 1145 deletions(-) create mode 100644 virt/kvm/assigned-dev.c Merging dlm/next $ git merge dlm/next Merge made by recursive. fs/dlm/lowcomms.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) Merging scsi/master $ git merge scsi/master Already up-to-date. Merging async_tx/next $ git merge async_tx/next Auto-merging arch/sh/drivers/dma/Kconfig Auto-merging arch/sh/include/asm/dma-sh.h Auto-merging drivers/dma/at_hdmac.c Auto-merging drivers/dma/dw_dmac.c Removing drivers/dma/ioat.c Removing drivers/dma/ioat_dma.c Removing drivers/dma/ioatdma.h Removing drivers/dma/ioatdma_hw.h Auto-merging drivers/dma/txx9dmac.c Auto-merging drivers/md/raid5.c Auto-merging include/linux/pci_ids.h Merge made by recursive. Documentation/crypto/async-tx-api.txt | 75 +- arch/arm/include/asm/hardware/iop3xx-adma.h | 81 +- arch/arm/include/asm/hardware/iop_adma.h | 3 + arch/arm/mach-iop13xx/include/mach/adma.h | 119 ++- arch/arm/mach-iop13xx/setup.c | 17 +- arch/arm/plat-iop/adma.c | 4 +- arch/powerpc/include/asm/fsldma.h | 136 ++ arch/sh/drivers/dma/Kconfig | 12 +- arch/sh/drivers/dma/Makefile | 3 +- arch/sh/include/asm/dma-sh.h | 13 + crypto/async_tx/Kconfig | 9 + crypto/async_tx/Makefile | 3 + crypto/async_tx/async_memcpy.c | 44 +- crypto/async_tx/async_memset.c | 43 +- crypto/async_tx/async_pq.c | 395 +++++ crypto/async_tx/async_raid6_recov.c | 455 +++++ crypto/async_tx/async_tx.c | 87 +- crypto/async_tx/async_xor.c | 207 ++-- crypto/async_tx/raid6test.c | 241 +++ drivers/dca/dca-core.c | 124 ++- drivers/dma/Kconfig | 14 +- drivers/dma/Makefile | 4 +- drivers/dma/at_hdmac.c | 60 +- drivers/dma/at_hdmac_regs.h | 1 + drivers/dma/dmaengine.c | 94 +- drivers/dma/dmatest.c | 40 + drivers/dma/dw_dmac.c | 50 +- drivers/dma/dw_dmac_regs.h | 1 + drivers/dma/fsldma.c | 288 +++- drivers/dma/fsldma.h | 4 +- drivers/dma/ioat.c | 202 --- drivers/dma/ioat/Makefile | 2 + drivers/dma/{ioat_dca.c => ioat/dca.c} | 13 +- drivers/dma/ioat/dma.c | 1238 ++++++++++++++ drivers/dma/ioat/dma.h | 337 ++++ drivers/dma/ioat/dma_v2.c | 869 ++++++++++ drivers/dma/ioat/dma_v2.h | 190 +++ drivers/dma/ioat/dma_v3.c | 1220 ++++++++++++++ drivers/dma/ioat/hw.h | 215 +++ drivers/dma/ioat/pci.c | 210 +++ .../dma/{ioatdma_registers.h => ioat/registers.h} | 54 +- drivers/dma/ioat_dma.c | 1741 -------------------- drivers/dma/ioatdma.h | 165 -- drivers/dma/ioatdma_hw.h | 70 - drivers/dma/iop-adma.c | 491 +++++- drivers/dma/iovlock.c | 10 + drivers/dma/mv_xor.c | 7 +- drivers/dma/mv_xor.h | 4 +- drivers/dma/shdma.c | 786 +++++++++ drivers/dma/shdma.h | 64 + drivers/dma/txx9dmac.c | 24 +- drivers/dma/txx9dmac.h | 1 + drivers/idle/i7300_idle.c | 20 +- drivers/md/Kconfig | 26 + drivers/md/raid5.c | 1470 ++++++++++------- drivers/md/raid5.h | 28 +- drivers/mmc/host/atmel-mci.c | 9 +- include/linux/async_tx.h | 129 ++- include/linux/dca.h | 11 +- include/linux/dmaengine.h | 179 ++- include/linux/pci_ids.h | 10 + 61 files changed, 9114 insertions(+), 3308 deletions(-) create mode 100644 arch/powerpc/include/asm/fsldma.h create mode 100644 crypto/async_tx/async_pq.c create mode 100644 crypto/async_tx/async_raid6_recov.c create mode 100644 crypto/async_tx/raid6test.c delete mode 100644 drivers/dma/ioat.c create mode 100644 drivers/dma/ioat/Makefile rename drivers/dma/{ioat_dca.c => ioat/dca.c} (98%) create mode 100644 drivers/dma/ioat/dma.c create mode 100644 drivers/dma/ioat/dma.h create mode 100644 drivers/dma/ioat/dma_v2.c create mode 100644 drivers/dma/ioat/dma_v2.h create mode 100644 drivers/dma/ioat/dma_v3.c create mode 100644 drivers/dma/ioat/hw.h create mode 100644 drivers/dma/ioat/pci.c rename drivers/dma/{ioatdma_registers.h => ioat/registers.h} (84%) delete mode 100644 drivers/dma/ioat_dma.c delete mode 100644 drivers/dma/ioatdma.h delete mode 100644 drivers/dma/ioatdma_hw.h create mode 100644 drivers/dma/shdma.c create mode 100644 drivers/dma/shdma.h Merging net/master $ git merge net/master Already up-to-date. Merging wireless/master $ git merge wireless/master Merge made by recursive. drivers/net/wireless/Kconfig | 1 + drivers/net/wireless/ath/ath9k/ani.c | 6 ++++-- drivers/net/wireless/b43/main.c | 8 +++----- drivers/net/wireless/hostap/hostap_main.c | 3 ++- drivers/net/wireless/iwlwifi/iwl-4965.c | 1 + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 10 +++++++++- drivers/net/wireless/iwlwifi/iwl-core.c | 9 ++++++--- drivers/net/wireless/iwlwifi/iwl-core.h | 1 + drivers/net/wireless/iwlwifi/iwl-power.c | 5 +++-- drivers/net/wireless/iwlwifi/iwl-rx.c | 24 +++++++++++++++++------- drivers/net/wireless/iwlwifi/iwl3945-base.c | 24 ++++++++++++++++-------- drivers/ssb/pci.c | 1 + drivers/ssb/sdio.c | 2 +- net/wireless/scan.c | 7 ++++++- 14 files changed, 71 insertions(+), 31 deletions(-) Merging mtd/master $ git merge mtd/master Resolved 'drivers/mtd/mtdcore.c' using previous resolution. Auto-merging drivers/mtd/mtdblock.c Auto-merging drivers/mtd/mtdcore.c CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 19a0740] Merge commit 'mtd/master' $ git diff -M --stat --summary HEAD^.. drivers/mtd/afs.c | 2 +- drivers/mtd/devices/m25p80.c | 3 + drivers/mtd/devices/mtd_dataflash.c | 4 +- drivers/mtd/devices/slram.c | 2 +- drivers/mtd/maps/physmap_of.c | 20 ++++---- drivers/mtd/maps/plat-ram.c | 2 +- drivers/mtd/maps/pmcmsp-flash.c | 76 +++++++++++++++++++++++------- drivers/mtd/mtdblock.c | 2 +- drivers/mtd/mtdcore.c | 4 +- drivers/mtd/nand/nand_base.c | 88 ++++++++++++++++++----------------- drivers/mtd/onenand/Kconfig | 2 +- drivers/mtd/onenand/onenand_base.c | 20 ++++---- drivers/mtd/tests/mtd_oobtest.c | 2 +- drivers/mtd/tests/mtd_pagetest.c | 12 ++-- include/linux/mtd/onenand_regs.h | 3 + 15 files changed, 147 insertions(+), 95 deletions(-) Merging crypto/master $ git merge crypto/master Already up-to-date. Merging sound/for-next $ git merge sound/for-next Merge made by recursive. sound/pci/hda/patch_realtek.c | 3 +- sound/pci/hda/patch_sigmatel.c | 65 +++++++++++++++++++++------------------- 2 files changed, 36 insertions(+), 32 deletions(-) Merging cpufreq/next $ git merge cpufreq/next Auto-merging drivers/cpufreq/cpufreq_ondemand.c Merge made by recursive. Documentation/cpu-freq/user-guide.txt | 9 +- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 21 ++ arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 29 +--- drivers/cpufreq/cpufreq.c | 305 +++++++++++++++++----------- drivers/cpufreq/cpufreq_ondemand.c | 139 ++++++++++--- include/linux/cpufreq.h | 10 + 6 files changed, 342 insertions(+), 171 deletions(-) Merging quilt/rr $ git merge quilt/rr Resolved 'kernel/module.c' using previous resolution. Auto-merging arch/arm/include/asm/mmu_context.h Auto-merging arch/arm/mm/flush.c Auto-merging arch/ia64/kernel/smp.c Auto-merging arch/powerpc/include/asm/smp.h Auto-merging arch/powerpc/kernel/smp.c Auto-merging arch/powerpc/platforms/powermac/smp.c Auto-merging arch/s390/include/asm/smp.h Auto-merging arch/s390/kernel/smp.c Auto-merging arch/x86/kernel/apic/io_apic.c Auto-merging arch/x86/kernel/setup.c Auto-merging arch/x86/kernel/smpboot.c Auto-merging drivers/acpi/osl.c Auto-merging drivers/acpi/processor_perflib.c Auto-merging drivers/acpi/processor_throttling.c Auto-merging drivers/net/sfc/efx.c Auto-merging drivers/net/virtio_net.c Auto-merging include/linux/interrupt.h Auto-merging include/linux/module.h Auto-merging include/linux/sched.h Auto-merging include/linux/topology.h Auto-merging init/main.c Auto-merging kernel/module.c CONFLICT (content): Merge conflict in kernel/module.c Auto-merging kernel/smp.c Auto-merging kernel/trace/trace.c Auto-merging mm/quicklist.c Auto-merging virt/kvm/kvm_main.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 7354c86] Merge branch 'quilt/rr' $ git diff -M --stat --summary HEAD^.. Documentation/lguest/lguest.c | 26 +- arch/alpha/include/asm/smp.h | 2 +- arch/alpha/include/asm/topology.h | 18 - arch/alpha/kernel/smp.c | 14 +- arch/arm/include/asm/cacheflush.h | 8 +- arch/arm/include/asm/mmu_context.h | 7 +- arch/arm/include/asm/smp.h | 1 - arch/arm/include/asm/tlbflush.h | 4 +- arch/arm/kernel/smp.c | 10 +- arch/arm/mm/context.c | 2 +- arch/arm/mm/flush.c | 10 +- arch/ia64/include/asm/smp.h | 1 - arch/ia64/include/asm/topology.h | 3 - arch/ia64/kernel/smp.c | 2 +- arch/m32r/include/asm/mmu_context.h | 4 +- arch/m32r/include/asm/smp.h | 2 +- arch/m32r/kernel/smp.c | 30 +- arch/m32r/kernel/smpboot.c | 2 +- arch/mips/alchemy/common/time.c | 2 +- arch/mips/include/asm/mach-ip27/topology.h | 2 - arch/mips/include/asm/mmu_context.h | 10 +- arch/mips/include/asm/smp-ops.h | 2 +- arch/mips/include/asm/smp.h | 2 +- arch/mips/kernel/smp-cmp.c | 6 +- arch/mips/kernel/smp-mt.c | 6 +- arch/mips/kernel/smp-up.c | 3 +- arch/mips/kernel/smp.c | 8 +- arch/mips/kernel/smtc.c | 6 +- arch/mips/mipssim/sim_smtc.c | 5 +- arch/mips/mm/c-octeon.c | 2 +- arch/mips/mti-malta/malta-smtc.c | 4 +- arch/mips/pmc-sierra/yosemite/smp.c | 4 +- arch/mips/sgi-ip27/ip27-memory.c | 2 +- arch/mips/sgi-ip27/ip27-smp.c | 4 +- arch/mips/sibyte/bcm1480/smp.c | 5 +- arch/mips/sibyte/sb1250/smp.c | 5 +- arch/mn10300/include/asm/mmu_context.h | 12 +- arch/parisc/include/asm/smp.h | 1 - arch/powerpc/include/asm/smp.h | 2 +- arch/powerpc/include/asm/topology.h | 12 - arch/powerpc/kernel/setup-common.c | 6 +- arch/powerpc/kernel/smp.c | 12 +- arch/powerpc/platforms/powermac/smp.c | 6 +- arch/powerpc/platforms/pseries/hotplug-cpu.c | 6 +- arch/s390/include/asm/smp.h | 2 +- arch/s390/include/asm/topology.h | 1 - arch/s390/kernel/smp.c | 4 +- arch/sh/include/asm/smp.h | 1 - arch/sh/include/asm/topology.h | 1 - arch/sparc/include/asm/smp_64.h | 1 - arch/sparc/include/asm/topology_64.h | 16 - arch/um/include/asm/mmu_context.h | 4 +- arch/um/kernel/smp.c | 2 +- arch/x86/include/asm/mmu_context.h | 6 +- arch/x86/include/asm/smp.h | 1 - arch/x86/kernel/apic/io_apic.c | 7 +- arch/x86/kernel/ldt.c | 4 +- arch/x86/kernel/process.c | 6 +- arch/x86/kernel/setup.c | 1 - arch/x86/kernel/smpboot.c | 9 +- arch/x86/lguest/boot.c | 10 +- arch/x86/mm/tlb.c | 15 +- arch/x86/xen/mmu.c | 4 +- drivers/acpi/osl.c | 2 +- drivers/acpi/processor_perflib.c | 3 +- drivers/acpi/processor_throttling.c | 3 +- drivers/block/virtio_blk.c | 12 +- drivers/char/hw_random/virtio-rng.c | 3 +- drivers/char/virtio_console.c | 5 +- drivers/lguest/core.c | 5 +- drivers/lguest/page_tables.c | 45 +- drivers/net/sfc/efx.c | 3 +- drivers/net/virtio_net.c | 236 ++++------ drivers/oprofile/buffer_sync.c | 3 +- drivers/virtio/virtio_balloon.c | 3 +- drivers/virtio/virtio_pci.c | 125 +++-- drivers/virtio/virtio_ring.c | 6 +- include/asm-generic/topology.h | 17 - include/linux/cpumask.h | 709 +++++++++----------------- include/linux/interrupt.h | 2 - include/linux/module.h | 15 +- include/linux/sched.h | 3 + include/linux/smp.h | 11 - include/linux/topology.h | 6 - include/linux/virtio.h | 2 +- include/linux/virtio_9p.h | 2 - include/linux/virtio_balloon.h | 3 - include/linux/virtio_blk.h | 3 - include/linux/virtio_console.h | 3 - include/linux/virtio_ids.h | 17 + include/linux/virtio_net.h | 3 - include/linux/virtio_rng.h | 3 - init/main.c | 5 - kernel/module.c | 277 ++++++++++- kernel/params.c | 7 +- kernel/smp.c | 7 - kernel/trace/trace.c | 7 +- mm/quicklist.c | 3 +- net/9p/trans_virtio.c | 5 +- virt/kvm/kvm_main.c | 3 +- 100 files changed, 935 insertions(+), 1008 deletions(-) create mode 100644 include/linux/virtio_ids.h $ git reset --hard HEAD^ HEAD is now at 042a29c Merge commit 'cpufreq/next' Merging refs/next/20090908/rr $ git merge refs/next/20090908/rr Resolved 'drivers/net/virtio_net.c' using previous resolution. Auto-merging arch/arm/include/asm/mmu_context.h Auto-merging arch/arm/mm/flush.c Auto-merging arch/ia64/kernel/smp.c Auto-merging arch/powerpc/include/asm/smp.h Auto-merging arch/powerpc/kernel/smp.c Auto-merging arch/powerpc/platforms/powermac/smp.c Auto-merging arch/s390/include/asm/smp.h Auto-merging arch/s390/kernel/smp.c Auto-merging arch/x86/kernel/apic/io_apic.c Auto-merging arch/x86/kernel/setup.c Auto-merging arch/x86/kernel/smpboot.c Auto-merging drivers/acpi/osl.c Auto-merging drivers/acpi/processor_perflib.c Auto-merging drivers/acpi/processor_throttling.c Auto-merging drivers/net/sfc/efx.c Auto-merging drivers/net/virtio_net.c CONFLICT (content): Merge conflict in drivers/net/virtio_net.c Auto-merging include/linux/interrupt.h Auto-merging include/linux/pci.h Auto-merging include/linux/sched.h Auto-merging include/linux/topology.h Auto-merging init/main.c Auto-merging kernel/module.c Auto-merging kernel/smp.c Auto-merging kernel/trace/trace.c Auto-merging mm/quicklist.c Auto-merging net/9p/trans_virtio.c Auto-merging virt/kvm/kvm_main.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 04a0119] Merge commit 'refs/next/20090908/rr' $ git diff -M --stat --summary HEAD^.. Documentation/lguest/lguest.c | 26 +- arch/alpha/include/asm/smp.h | 2 +- arch/alpha/include/asm/topology.h | 18 - arch/alpha/kernel/smp.c | 14 +- arch/arm/include/asm/cacheflush.h | 8 +- arch/arm/include/asm/mmu_context.h | 7 +- arch/arm/include/asm/smp.h | 1 - arch/arm/include/asm/tlbflush.h | 4 +- arch/arm/kernel/smp.c | 10 +- arch/arm/mm/context.c | 2 +- arch/arm/mm/flush.c | 10 +- arch/ia64/include/asm/smp.h | 1 - arch/ia64/include/asm/topology.h | 3 - arch/ia64/kernel/smp.c | 2 +- arch/m32r/include/asm/mmu_context.h | 4 +- arch/m32r/include/asm/smp.h | 2 +- arch/m32r/kernel/smp.c | 30 +- arch/m32r/kernel/smpboot.c | 2 +- arch/mips/alchemy/common/time.c | 2 +- arch/mips/include/asm/mach-ip27/topology.h | 2 - arch/mips/include/asm/mmu_context.h | 10 +- arch/mips/include/asm/smp-ops.h | 2 +- arch/mips/include/asm/smp.h | 2 +- arch/mips/kernel/smp-cmp.c | 6 +- arch/mips/kernel/smp-mt.c | 6 +- arch/mips/kernel/smp-up.c | 3 +- arch/mips/kernel/smp.c | 8 +- arch/mips/kernel/smtc.c | 6 +- arch/mips/mipssim/sim_smtc.c | 5 +- arch/mips/mm/c-octeon.c | 2 +- arch/mips/mti-malta/malta-smtc.c | 4 +- arch/mips/pmc-sierra/yosemite/smp.c | 4 +- arch/mips/sgi-ip27/ip27-memory.c | 2 +- arch/mips/sgi-ip27/ip27-smp.c | 4 +- arch/mips/sibyte/bcm1480/smp.c | 5 +- arch/mips/sibyte/sb1250/smp.c | 5 +- arch/mn10300/include/asm/mmu_context.h | 12 +- arch/parisc/include/asm/smp.h | 1 - arch/powerpc/include/asm/smp.h | 2 +- arch/powerpc/include/asm/topology.h | 12 - arch/powerpc/kernel/setup-common.c | 6 +- arch/powerpc/kernel/smp.c | 12 +- arch/powerpc/platforms/powermac/smp.c | 6 +- arch/powerpc/platforms/pseries/hotplug-cpu.c | 6 +- arch/s390/include/asm/smp.h | 2 +- arch/s390/include/asm/topology.h | 1 - arch/s390/kernel/smp.c | 4 +- arch/sh/include/asm/smp.h | 1 - arch/sh/include/asm/topology.h | 1 - arch/sparc/include/asm/smp_64.h | 1 - arch/sparc/include/asm/topology_64.h | 16 - arch/um/include/asm/mmu_context.h | 4 +- arch/um/kernel/smp.c | 2 +- arch/x86/include/asm/mmu_context.h | 6 +- arch/x86/include/asm/smp.h | 1 - arch/x86/kernel/apic/io_apic.c | 7 +- arch/x86/kernel/ldt.c | 4 +- arch/x86/kernel/process.c | 6 +- arch/x86/kernel/setup.c | 1 - arch/x86/kernel/smpboot.c | 9 +- arch/x86/lguest/boot.c | 10 +- arch/x86/mm/tlb.c | 15 +- arch/x86/xen/mmu.c | 4 +- drivers/acpi/osl.c | 2 +- drivers/acpi/processor_perflib.c | 3 +- drivers/acpi/processor_throttling.c | 3 +- drivers/block/virtio_blk.c | 3 +- drivers/char/hw_random/virtio-rng.c | 3 +- drivers/char/virtio_console.c | 5 +- drivers/lguest/core.c | 5 +- drivers/lguest/page_tables.c | 45 +- drivers/net/sfc/efx.c | 3 +- drivers/net/virtio_net.c | 236 ++++------ drivers/oprofile/buffer_sync.c | 3 +- drivers/virtio/virtio_balloon.c | 3 +- drivers/virtio/virtio_pci.c | 125 +++-- drivers/virtio/virtio_ring.c | 6 +- include/asm-generic/topology.h | 17 - include/linux/cpumask.h | 709 +++++++++----------------- include/linux/interrupt.h | 2 - include/linux/pci.h | 4 +- include/linux/sched.h | 3 + include/linux/smp.h | 11 - include/linux/topology.h | 6 - include/linux/virtio.h | 2 +- include/linux/virtio_9p.h | 2 - include/linux/virtio_balloon.h | 3 - include/linux/virtio_blk.h | 3 - include/linux/virtio_console.h | 3 - include/linux/virtio_ids.h | 17 + include/linux/virtio_net.h | 3 - include/linux/virtio_rng.h | 3 - init/main.c | 5 - kernel/smp.c | 7 - kernel/trace/trace.c | 7 +- mm/quicklist.c | 3 +- net/9p/trans_virtio.c | 5 +- virt/kvm/kvm_main.c | 3 +- 98 files changed, 648 insertions(+), 991 deletions(-) create mode 100644 include/linux/virtio_ids.h Merging mmc/next $ git merge mmc/next Already up-to-date. 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 Auto-merging fs/fs-writeback.c Auto-merging fs/fuse/inode.c Auto-merging fs/sync.c Auto-merging fs/ubifs/super.c Auto-merging include/linux/fs.h Auto-merging mm/page-writeback.c Merge made by recursive. fs/btrfs/disk-io.c | 1 + fs/fs-writeback.c | 181 +++++++++++++++++-------------------------- fs/fuse/inode.c | 2 + fs/super.c | 6 ++ fs/sync.c | 9 ++- fs/ubifs/super.c | 1 + include/linux/backing-dev.h | 1 + include/linux/fs.h | 1 + mm/backing-dev.c | 76 +++++++++++++----- mm/page-writeback.c | 9 +- 10 files changed, 150 insertions(+), 137 deletions(-) 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 Already up-to-date. Merging battery/master $ git merge battery/master Resolved 'drivers/power/wm97xx_battery.c' using previous resolution. Auto-merging drivers/input/touchscreen/wm97xx-core.c Auto-merging drivers/power/wm97xx_battery.c CONFLICT (content): Merge conflict in drivers/power/wm97xx_battery.c Auto-merging include/linux/wm97xx.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master f5da4d8] Merge commit 'battery/master' $ git diff -M --stat --summary HEAD^.. Documentation/power/power_supply_class.txt | 7 + drivers/input/touchscreen/wm97xx-core.c | 3 + drivers/power/Kconfig | 7 + drivers/power/Makefile | 1 + drivers/power/ds2760_battery.c | 147 +++++- drivers/power/olpc_battery.c | 50 ++ drivers/power/power_supply_core.c | 44 ++- drivers/power/power_supply_sysfs.c | 12 + drivers/power/wm831x_power.c | 779 ++++++++++++++++++++++++++++ drivers/power/wm8350_power.c | 22 + drivers/power/wm97xx_battery.c | 79 +++- include/linux/mfd/wm831x/pmu.h | 189 +++++++ include/linux/power_supply.h | 21 + include/linux/wm97xx.h | 18 + include/linux/wm97xx_batt.h | 18 +- 15 files changed, 1331 insertions(+), 66 deletions(-) create mode 100644 drivers/power/wm831x_power.c create mode 100644 include/linux/mfd/wm831x/pmu.h Merging leds/for-mm $ git merge leds/for-mm Merge made by recursive. drivers/leds/Kconfig | 13 +- drivers/leds/Makefile | 1 + drivers/leds/leds-clevo-mail.c | 2 +- drivers/leds/leds-cobalt-qube.c | 2 +- drivers/leds/leds-cobalt-raq.c | 4 +- drivers/leds/leds-gpio.c | 2 +- drivers/leds/leds-pca9532.c | 12 +- drivers/leds/leds-wm831x-status.c | 341 +++++++++++++++++++++++++++++++++++++ drivers/leds/ledtrig-gpio.c | 28 ++-- drivers/macintosh/via-pmu-led.c | 2 +- include/linux/mfd/wm831x/status.h | 34 ++++ 11 files changed, 412 insertions(+), 29 deletions(-) create mode 100644 drivers/leds/leds-wm831x-status.c create mode 100644 include/linux/mfd/wm831x/status.h Merging backlight/for-mm $ git merge backlight/for-mm Auto-merging drivers/video/backlight/Kconfig Merge made by recursive. drivers/video/backlight/Kconfig | 22 +++ drivers/video/backlight/Makefile | 4 +- drivers/video/backlight/adx_bl.c | 178 ++++++++++++++++++++++ drivers/video/backlight/hp680_bl.c | 2 +- drivers/video/backlight/lms283gf05.c | 242 ++++++++++++++++++++++++++++++ drivers/video/backlight/mbp_nvidia_bl.c | 36 +++++ drivers/video/backlight/wm831x_bl.c | 250 +++++++++++++++++++++++++++++++ include/linux/spi/lms283gf05.h | 28 ++++ 8 files changed, 760 insertions(+), 2 deletions(-) create mode 100644 drivers/video/backlight/adx_bl.c create mode 100644 drivers/video/backlight/lms283gf05.c create mode 100644 drivers/video/backlight/wm831x_bl.c create mode 100644 include/linux/spi/lms283gf05.h Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Auto-merging include/linux/sched.h Merge made by recursive. arch/x86/kernel/kgdb.c | 12 ++++++++---- include/linux/sched.h | 4 ++++ kernel/kgdb.c | 31 +++++++++++++++++++++++-------- kernel/softlockup.c | 16 ++++++++++++++++ 4 files changed, 51 insertions(+), 12 deletions(-) Merging slab/for-next $ git merge slab/for-next Auto-merging lib/Kconfig.debug Auto-merging mm/Makefile Merge made by recursive. Documentation/vm/slqbinfo.c | 1047 ++++++++++++ include/linux/rcu_types.h | 18 + include/linux/rcupdate.h | 11 +- include/linux/slab.h | 10 +- include/linux/slqb_def.h | 301 ++++ init/Kconfig | 9 +- lib/Kconfig.debug | 20 + mm/Makefile | 1 + mm/slqb.c | 3775 +++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 5178 insertions(+), 14 deletions(-) create mode 100644 Documentation/vm/slqbinfo.c create mode 100644 include/linux/rcu_types.h create mode 100644 include/linux/slqb_def.h create mode 100644 mm/slqb.c Merging uclinux/for-next $ git merge uclinux/for-next Already up-to-date. Merging md/for-next $ git merge md/for-next Already up-to-date. Merging mfd/for-next $ git merge mfd/for-next Auto-merging MAINTAINERS Auto-merging drivers/hwmon/Kconfig Auto-merging drivers/hwmon/Makefile Auto-merging drivers/rtc/Kconfig Auto-merging drivers/rtc/Makefile Merge made by recursive. Documentation/hwmon/wm831x | 37 + Documentation/hwmon/wm8350 | 26 + MAINTAINERS | 18 + arch/arm/mach-omap2/board-rx51-peripherals.c | 122 ++- drivers/gpio/Kconfig | 7 + drivers/gpio/Makefile | 1 + drivers/gpio/wm831x-gpio.c | 252 +++++ drivers/hwmon/Kconfig | 21 + drivers/hwmon/Makefile | 2 + drivers/hwmon/wm831x-hwmon.c | 226 ++++ drivers/hwmon/wm8350-hwmon.c | 151 +++ drivers/input/misc/Kconfig | 20 + drivers/input/misc/Makefile | 3 + drivers/input/misc/pcap_keys.c | 144 +++ drivers/input/misc/wm831x-on.c | 163 +++ drivers/input/touchscreen/Kconfig | 9 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/pcap_ts.c | 271 +++++ drivers/mfd/Kconfig | 42 + drivers/mfd/Makefile | 6 + drivers/mfd/ab3100-core.c | 62 +- drivers/mfd/ab3100-otp.c | 268 +++++ drivers/mfd/dm355evm_msp.c | 12 +- drivers/mfd/ezx-pcap.c | 105 ++- drivers/mfd/mc13783-core.c | 427 +++++++ drivers/mfd/mfd-core.c | 2 +- drivers/mfd/pcf50633-adc.c | 32 +- drivers/mfd/pcf50633-core.c | 5 +- drivers/mfd/twl4030-core.c | 23 + drivers/mfd/twl4030-irq.c | 2 +- drivers/mfd/twl4030-power.c | 472 ++++++++ drivers/mfd/wm831x-core.c | 1549 ++++++++++++++++++++++++++ drivers/mfd/wm831x-irq.c | 559 ++++++++++ drivers/mfd/wm831x-otp.c | 83 ++ drivers/mfd/wm8350-core.c | 3 + drivers/regulator/Kconfig | 31 + drivers/regulator/Makefile | 6 + drivers/regulator/ab3100.c | 694 ++++++++++++ drivers/regulator/core.c | 24 + drivers/regulator/mc13783.c | 410 +++++++ drivers/regulator/pcap-regulator.c | 318 ++++++ drivers/regulator/wm831x-dcdc.c | 862 ++++++++++++++ drivers/regulator/wm831x-isink.c | 260 +++++ drivers/regulator/wm831x-ldo.c | 852 ++++++++++++++ drivers/rtc/Kconfig | 19 + drivers/rtc/Makefile | 2 + drivers/rtc/rtc-ab3100.c | 281 +++++ drivers/rtc/rtc-wm831x.c | 523 +++++++++ include/linux/i2c/twl4030.h | 94 ++- include/linux/mfd/ab3100.h | 37 +- include/linux/mfd/core.h | 1 + include/linux/mfd/ezx-pcap.h | 7 +- include/linux/mfd/mc13783-private.h | 396 +++++++ include/linux/mfd/mc13783.h | 84 ++ include/linux/mfd/pcf50633/adc.h | 3 +- include/linux/mfd/pcf50633/core.h | 1 + include/linux/mfd/wm831x/auxadc.h | 216 ++++ include/linux/mfd/wm831x/core.h | 289 +++++ include/linux/mfd/wm831x/gpio.h | 55 + include/linux/mfd/wm831x/irq.h | 764 +++++++++++++ include/linux/mfd/wm831x/otp.h | 162 +++ include/linux/mfd/wm831x/pdata.h | 113 ++ include/linux/mfd/wm831x/regulator.h | 1218 ++++++++++++++++++++ include/linux/mfd/wm8350/core.h | 6 + include/linux/regulator/driver.h | 2 + 65 files changed, 12756 insertions(+), 100 deletions(-) create mode 100644 Documentation/hwmon/wm831x create mode 100644 Documentation/hwmon/wm8350 create mode 100644 drivers/gpio/wm831x-gpio.c create mode 100644 drivers/hwmon/wm831x-hwmon.c create mode 100644 drivers/hwmon/wm8350-hwmon.c create mode 100644 drivers/input/misc/pcap_keys.c create mode 100644 drivers/input/misc/wm831x-on.c create mode 100644 drivers/input/touchscreen/pcap_ts.c create mode 100644 drivers/mfd/ab3100-otp.c create mode 100644 drivers/mfd/mc13783-core.c create mode 100644 drivers/mfd/twl4030-power.c create mode 100644 drivers/mfd/wm831x-core.c create mode 100644 drivers/mfd/wm831x-irq.c create mode 100644 drivers/mfd/wm831x-otp.c create mode 100644 drivers/regulator/ab3100.c create mode 100644 drivers/regulator/mc13783.c create mode 100644 drivers/regulator/pcap-regulator.c create mode 100644 drivers/regulator/wm831x-dcdc.c create mode 100644 drivers/regulator/wm831x-isink.c create mode 100644 drivers/regulator/wm831x-ldo.c create mode 100644 drivers/rtc/rtc-ab3100.c create mode 100644 drivers/rtc/rtc-wm831x.c create mode 100644 include/linux/mfd/mc13783-private.h create mode 100644 include/linux/mfd/mc13783.h create mode 100644 include/linux/mfd/wm831x/auxadc.h create mode 100644 include/linux/mfd/wm831x/core.h create mode 100644 include/linux/mfd/wm831x/gpio.h create mode 100644 include/linux/mfd/wm831x/irq.h create mode 100644 include/linux/mfd/wm831x/otp.h create mode 100644 include/linux/mfd/wm831x/pdata.h create mode 100644 include/linux/mfd/wm831x/regulator.h Merging hdlc/hdlc-next $ git merge hdlc/hdlc-next Already up-to-date. Merging drm/drm-next $ git merge drm/drm-next Resolved 'firmware/Makefile' using previous resolution. Auto-merging drivers/gpu/drm/i915/i915_gem.c Auto-merging drivers/gpu/drm/i915/intel_drv.h Auto-merging drivers/gpu/drm/i915/intel_tv.c Removing drivers/gpu/drm/mga/mga_ucode.h Removing drivers/gpu/drm/radeon/r300.h Removing drivers/gpu/drm/radeon/r600_microcode.h Removing drivers/gpu/drm/radeon/radeon_microcode.h Removing drivers/gpu/drm/radeon/rs780.c Auto-merging firmware/Makefile CONFLICT (content): Merge conflict in firmware/Makefile Auto-merging firmware/WHENCE Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master a690d36] Merge commit 'drm/drm-next' $ git diff -M --stat --summary HEAD^.. drivers/gpu/drm/Kconfig | 18 +- drivers/gpu/drm/Makefile | 8 +- drivers/gpu/drm/drm_cache.c | 46 +- drivers/gpu/drm/drm_crtc.c | 77 +- drivers/gpu/drm/drm_crtc_helper.c | 220 +- drivers/gpu/drm/drm_drv.c | 4 +- drivers/gpu/drm/drm_edid.c | 504 +- drivers/gpu/drm/drm_encoder_slave.c | 116 + drivers/gpu/drm/drm_fb_helper.c | 701 + drivers/gpu/drm/drm_gem.c | 11 +- drivers/gpu/drm/drm_mm.c | 21 + drivers/gpu/drm/drm_modes.c | 435 +- drivers/gpu/drm/drm_proc.c | 17 +- drivers/gpu/drm/drm_sysfs.c | 28 + drivers/gpu/drm/i915/Makefile | 2 +- .../i915/{i915_gem_debugfs.c => i915_debugfs.c} | 91 +- drivers/gpu/drm/i915/i915_dma.c | 100 +- drivers/gpu/drm/i915/i915_drv.c | 9 +- drivers/gpu/drm/i915/i915_drv.h | 62 +- drivers/gpu/drm/i915/i915_gem.c | 14 +- drivers/gpu/drm/i915/i915_gem_tiling.c | 80 +- drivers/gpu/drm/i915/i915_irq.c | 21 + drivers/gpu/drm/i915/i915_reg.h | 143 +- drivers/gpu/drm/i915/i915_suspend.c | 4 +- drivers/gpu/drm/i915/intel_bios.c | 8 +- drivers/gpu/drm/i915/intel_crt.c | 28 + drivers/gpu/drm/i915/intel_display.c | 607 +- drivers/gpu/drm/i915/intel_drv.h | 7 +- drivers/gpu/drm/i915/intel_fb.c | 737 +- drivers/gpu/drm/i915/intel_i2c.c | 8 +- drivers/gpu/drm/i915/intel_lvds.c | 22 +- drivers/gpu/drm/i915/intel_sdvo.c | 331 +- drivers/gpu/drm/i915/intel_tv.c | 30 + drivers/gpu/drm/mga/mga_dma.c | 4 +- drivers/gpu/drm/mga/mga_drv.h | 1 - drivers/gpu/drm/mga/mga_ucode.h |11645 ---------- drivers/gpu/drm/mga/mga_warp.c | 180 +- drivers/gpu/drm/r128/r128_cce.c | 116 +- drivers/gpu/drm/r128/r128_drv.h | 8 + drivers/gpu/drm/r128/r128_state.c | 36 +- drivers/gpu/drm/radeon/Kconfig | 1 - drivers/gpu/drm/radeon/Makefile | 43 +- drivers/gpu/drm/radeon/atombios.h | 11 + drivers/gpu/drm/radeon/atombios_crtc.c | 100 +- .../gpu/drm/radeon/{radeon_share.h => avivod.h} | 41 +- drivers/gpu/drm/radeon/mkregtable.c | 720 + drivers/gpu/drm/radeon/r100.c | 1213 +- drivers/gpu/drm/radeon/r100_track.h | 124 + drivers/gpu/drm/radeon/r100d.h | 607 + drivers/gpu/drm/radeon/r200.c | 456 + drivers/gpu/drm/radeon/r300.c | 556 +- drivers/gpu/drm/radeon/r300.h | 36 - drivers/gpu/drm/radeon/r300d.h | 101 + drivers/gpu/drm/radeon/r420.c | 288 +- drivers/gpu/drm/radeon/r420d.h | 249 + drivers/gpu/drm/radeon/r520.c | 6 - drivers/gpu/drm/radeon/r600.c | 1734 ++- drivers/gpu/drm/radeon/r600_blit.c | 850 + drivers/gpu/drm/radeon/r600_blit_kms.c | 805 + drivers/gpu/drm/radeon/r600_blit_shaders.c | 1072 + drivers/gpu/drm/radeon/r600_blit_shaders.h | 14 + drivers/gpu/drm/radeon/r600_cp.c | 541 +- drivers/gpu/drm/radeon/r600_cs.c | 657 + drivers/gpu/drm/radeon/r600_microcode.h |23297 -------------------- drivers/gpu/drm/radeon/r600d.h | 661 + drivers/gpu/drm/radeon/radeon.h | 257 +- drivers/gpu/drm/radeon/radeon_asic.h | 228 +- drivers/gpu/drm/radeon/radeon_atombios.c | 128 +- drivers/gpu/drm/radeon/radeon_clocks.c | 10 +- drivers/gpu/drm/radeon/radeon_connectors.c | 273 +- drivers/gpu/drm/radeon/radeon_cp.c | 128 +- drivers/gpu/drm/radeon/radeon_device.c | 409 +- drivers/gpu/drm/radeon/radeon_display.c | 18 +- drivers/gpu/drm/radeon/radeon_drv.c | 23 +- drivers/gpu/drm/radeon/radeon_drv.h | 148 +- drivers/gpu/drm/radeon/radeon_encoders.c | 127 +- drivers/gpu/drm/radeon/radeon_fb.c | 671 +- drivers/gpu/drm/radeon/radeon_fence.c | 49 +- drivers/gpu/drm/radeon/radeon_gart.c | 9 +- drivers/gpu/drm/radeon/radeon_ioc32.c | 15 + drivers/gpu/drm/radeon/radeon_irq_kms.c | 1 - drivers/gpu/drm/radeon/radeon_kms.c | 22 +- drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 44 +- drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 339 +- drivers/gpu/drm/radeon/radeon_legacy_tv.c | 904 + drivers/gpu/drm/radeon/radeon_microcode.h | 1844 -- drivers/gpu/drm/radeon/radeon_mode.h | 52 +- drivers/gpu/drm/radeon/radeon_object.c | 8 + drivers/gpu/drm/radeon/radeon_object.h | 1 + drivers/gpu/drm/radeon/radeon_reg.h | 79 +- drivers/gpu/drm/radeon/radeon_ring.c | 121 +- drivers/gpu/drm/radeon/radeon_state.c | 18 +- drivers/gpu/drm/radeon/radeon_ttm.c | 96 +- drivers/gpu/drm/radeon/reg_srcs/r100 | 105 + drivers/gpu/drm/radeon/reg_srcs/r200 | 184 + drivers/gpu/drm/radeon/reg_srcs/r300 | 729 + drivers/gpu/drm/radeon/reg_srcs/rn50 | 30 + drivers/gpu/drm/radeon/reg_srcs/rs600 | 729 + drivers/gpu/drm/radeon/reg_srcs/rv515 | 486 + drivers/gpu/drm/radeon/rs400.c | 56 +- drivers/gpu/drm/radeon/rs600.c | 101 +- drivers/gpu/drm/radeon/rs690.c | 4 - drivers/gpu/drm/radeon/rs780.c | 102 - drivers/gpu/drm/radeon/rv515.c | 524 +- drivers/gpu/drm/radeon/{rv515r.h => rv515d.h} | 56 +- drivers/gpu/drm/radeon/rv770.c | 993 +- drivers/gpu/drm/radeon/rv770d.h | 341 + drivers/gpu/drm/ttm/ttm_bo.c | 295 +- drivers/gpu/drm/ttm/ttm_bo_util.c | 4 +- drivers/gpu/drm/ttm/ttm_global.c | 4 +- drivers/gpu/drm/ttm/ttm_memory.c | 508 +- drivers/gpu/drm/ttm/ttm_module.c | 58 +- drivers/gpu/drm/ttm/ttm_tt.c | 104 +- firmware/Makefile | 16 + firmware/WHENCE | 121 + firmware/matrox/g200_warp.H16 | 28 + firmware/matrox/g400_warp.H16 | 44 + firmware/r128/r128_cce.bin.ihex | 129 + firmware/radeon/R100_cp.bin.ihex | 130 + firmware/radeon/R200_cp.bin.ihex | 130 + firmware/radeon/R300_cp.bin.ihex | 130 + firmware/radeon/R420_cp.bin.ihex | 130 + firmware/radeon/R520_cp.bin.ihex | 130 + firmware/radeon/R600_me.bin.ihex | 1345 ++ firmware/radeon/R600_pfp.bin.ihex | 145 + firmware/radeon/RS600_cp.bin.ihex | 130 + firmware/radeon/RS690_cp.bin.ihex | 130 + firmware/radeon/RS780_me.bin.ihex | 1345 ++ firmware/radeon/RS780_pfp.bin.ihex | 145 + firmware/radeon/RV610_me.bin.ihex | 1345 ++ firmware/radeon/RV610_pfp.bin.ihex | 145 + firmware/radeon/RV620_me.bin.ihex | 1345 ++ firmware/radeon/RV620_pfp.bin.ihex | 145 + firmware/radeon/RV630_me.bin.ihex | 1345 ++ firmware/radeon/RV630_pfp.bin.ihex | 145 + firmware/radeon/RV635_me.bin.ihex | 1345 ++ firmware/radeon/RV635_pfp.bin.ihex | 145 + firmware/radeon/RV670_me.bin.ihex | 1345 ++ firmware/radeon/RV670_pfp.bin.ihex | 145 + firmware/radeon/RV710_me.bin.ihex | 341 + firmware/radeon/RV710_pfp.bin.ihex | 213 + firmware/radeon/RV730_me.bin.ihex | 341 + firmware/radeon/RV730_pfp.bin.ihex | 213 + firmware/radeon/RV770_me.bin.ihex | 341 + firmware/radeon/RV770_pfp.bin.ihex | 213 + include/drm/drmP.h | 54 +- include/drm/drm_cache.h | 38 + include/drm/drm_crtc.h | 16 + include/drm/drm_crtc_helper.h | 3 + include/drm/drm_encoder_slave.h | 162 + include/drm/drm_fb_helper.h | 82 + include/drm/drm_mm.h | 7 + include/drm/drm_mode.h | 11 +- include/drm/drm_sysfs.h | 12 + include/drm/ttm/ttm_bo_api.h | 13 +- include/drm/ttm/ttm_bo_driver.h | 94 +- include/drm/ttm/ttm_memory.h | 43 +- include/drm/ttm/ttm_module.h | 2 + 158 files changed, 34760 insertions(+), 41235 deletions(-) create mode 100644 drivers/gpu/drm/drm_encoder_slave.c create mode 100644 drivers/gpu/drm/drm_fb_helper.c rename drivers/gpu/drm/i915/{i915_gem_debugfs.c => i915_debugfs.c} (79%) delete mode 100644 drivers/gpu/drm/mga/mga_ucode.h rename drivers/gpu/drm/radeon/{radeon_share.h => avivod.h} (50%) create mode 100644 drivers/gpu/drm/radeon/mkregtable.c create mode 100644 drivers/gpu/drm/radeon/r100_track.h create mode 100644 drivers/gpu/drm/radeon/r100d.h create mode 100644 drivers/gpu/drm/radeon/r200.c delete mode 100644 drivers/gpu/drm/radeon/r300.h create mode 100644 drivers/gpu/drm/radeon/r300d.h create mode 100644 drivers/gpu/drm/radeon/r420d.h create mode 100644 drivers/gpu/drm/radeon/r600_blit.c create mode 100644 drivers/gpu/drm/radeon/r600_blit_kms.c create mode 100644 drivers/gpu/drm/radeon/r600_blit_shaders.c create mode 100644 drivers/gpu/drm/radeon/r600_blit_shaders.h create mode 100644 drivers/gpu/drm/radeon/r600_cs.c delete mode 100644 drivers/gpu/drm/radeon/r600_microcode.h create mode 100644 drivers/gpu/drm/radeon/r600d.h create mode 100644 drivers/gpu/drm/radeon/radeon_legacy_tv.c delete mode 100644 drivers/gpu/drm/radeon/radeon_microcode.h create mode 100644 drivers/gpu/drm/radeon/reg_srcs/r100 create mode 100644 drivers/gpu/drm/radeon/reg_srcs/r200 create mode 100644 drivers/gpu/drm/radeon/reg_srcs/r300 create mode 100644 drivers/gpu/drm/radeon/reg_srcs/rn50 create mode 100644 drivers/gpu/drm/radeon/reg_srcs/rs600 create mode 100644 drivers/gpu/drm/radeon/reg_srcs/rv515 delete mode 100644 drivers/gpu/drm/radeon/rs780.c rename drivers/gpu/drm/radeon/{rv515r.h => rv515d.h} (78%) create mode 100644 drivers/gpu/drm/radeon/rv770d.h create mode 100644 firmware/matrox/g200_warp.H16 create mode 100644 firmware/matrox/g400_warp.H16 create mode 100644 firmware/r128/r128_cce.bin.ihex create mode 100644 firmware/radeon/R100_cp.bin.ihex create mode 100644 firmware/radeon/R200_cp.bin.ihex create mode 100644 firmware/radeon/R300_cp.bin.ihex create mode 100644 firmware/radeon/R420_cp.bin.ihex create mode 100644 firmware/radeon/R520_cp.bin.ihex create mode 100644 firmware/radeon/R600_me.bin.ihex create mode 100644 firmware/radeon/R600_pfp.bin.ihex create mode 100644 firmware/radeon/RS600_cp.bin.ihex create mode 100644 firmware/radeon/RS690_cp.bin.ihex create mode 100644 firmware/radeon/RS780_me.bin.ihex create mode 100644 firmware/radeon/RS780_pfp.bin.ihex create mode 100644 firmware/radeon/RV610_me.bin.ihex create mode 100644 firmware/radeon/RV610_pfp.bin.ihex create mode 100644 firmware/radeon/RV620_me.bin.ihex create mode 100644 firmware/radeon/RV620_pfp.bin.ihex create mode 100644 firmware/radeon/RV630_me.bin.ihex create mode 100644 firmware/radeon/RV630_pfp.bin.ihex create mode 100644 firmware/radeon/RV635_me.bin.ihex create mode 100644 firmware/radeon/RV635_pfp.bin.ihex create mode 100644 firmware/radeon/RV670_me.bin.ihex create mode 100644 firmware/radeon/RV670_pfp.bin.ihex create mode 100644 firmware/radeon/RV710_me.bin.ihex create mode 100644 firmware/radeon/RV710_pfp.bin.ihex create mode 100644 firmware/radeon/RV730_me.bin.ihex create mode 100644 firmware/radeon/RV730_pfp.bin.ihex create mode 100644 firmware/radeon/RV770_me.bin.ihex create mode 100644 firmware/radeon/RV770_pfp.bin.ihex create mode 100644 include/drm/drm_cache.h create mode 100644 include/drm/drm_encoder_slave.h create mode 100644 include/drm/drm_fb_helper.h create mode 100644 include/drm/drm_sysfs.h Merging voltage/for-next $ git merge voltage/for-next Resolved 'drivers/regulator/Kconfig' using previous resolution. Auto-merging drivers/regulator/Kconfig CONFLICT (content): Merge conflict in drivers/regulator/Kconfig Auto-merging drivers/regulator/Makefile Auto-merging drivers/regulator/core.c Auto-merging include/linux/regulator/driver.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 1465a48] Merge commit 'voltage/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/power/regulator/overview.txt | 4 +- Documentation/power/regulator/regulator.txt | 5 +- drivers/regulator/Kconfig | 18 +- drivers/regulator/Makefile | 3 + drivers/regulator/core.c | 285 ++++++++--- drivers/regulator/da903x.c | 75 +++- drivers/regulator/fixed.c | 91 ++++- drivers/regulator/pcf50633-regulator.c | 98 +++-- drivers/regulator/tps65023-regulator.c | 632 ++++++++++++++++++++++++ drivers/regulator/tps6507x-regulator.c | 714 +++++++++++++++++++++++++++ drivers/regulator/userspace-consumer.c | 45 +- drivers/regulator/virtual.c | 56 ++- drivers/regulator/wm8350-regulator.c | 2 + include/linux/mfd/da903x.h | 4 +- include/linux/regulator/consumer.h | 4 + include/linux/regulator/driver.h | 2 + include/linux/regulator/fixed.h | 24 + include/linux/regulator/machine.h | 20 +- 18 files changed, 1922 insertions(+), 160 deletions(-) create mode 100644 drivers/regulator/tps65023-regulator.c create mode 100644 drivers/regulator/tps6507x-regulator.c Merging security-testing/next $ git merge security-testing/next Already up-to-date. Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging agp/agp-next $ git merge agp/agp-next Already up-to-date. Merging uwb/for-upstream $ git merge uwb/for-upstream Merge made by recursive. drivers/uwb/hwa-rc.c | 3 +-- drivers/uwb/lc-rc.c | 2 +- drivers/uwb/reset.c | 21 +++++++++++---------- drivers/uwb/umc-bus.c | 2 +- drivers/uwb/uwbd.c | 4 ++-- drivers/uwb/whc-rc.c | 3 +-- include/linux/uwb.h | 2 +- 7 files changed, 18 insertions(+), 19 deletions(-) Merging watchdog/master $ git merge watchdog/master Merge made by recursive. drivers/watchdog/Kconfig | 38 +++ drivers/watchdog/Makefile | 3 + drivers/watchdog/ar7_wdt.c | 107 +++++----- drivers/watchdog/booke_wdt.c | 57 +++++- drivers/watchdog/coh901327_wdt.c | 2 +- drivers/watchdog/davinci_wdt.c | 19 ++- drivers/watchdog/iop_wdt.c | 2 +- drivers/watchdog/nuc900_wdt.c | 353 ++++++++++++++++++++++++++++ drivers/watchdog/rm9k_wdt.c | 2 +- drivers/watchdog/sbc_fitpc2_wdt.c | 267 +++++++++++++++++++++ drivers/watchdog/sc1200wdt.c | 2 +- drivers/watchdog/wdt_pci.c | 21 +- drivers/watchdog/wm831x_wdt.c | 441 +++++++++++++++++++++++++++++++++++ include/linux/mfd/wm831x/watchdog.h | 52 ++++ 14 files changed, 1293 insertions(+), 73 deletions(-) create mode 100644 drivers/watchdog/nuc900_wdt.c create mode 100644 drivers/watchdog/sbc_fitpc2_wdt.c create mode 100644 drivers/watchdog/wm831x_wdt.c create mode 100644 include/linux/mfd/wm831x/watchdog.h Merging bdev/master $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master $ git merge dwmw2-iommu/master Auto-merging arch/x86/kernel/pci-dma.c Auto-merging arch/x86/kernel/pci-swiotlb.c Auto-merging drivers/pci/dmar.c Auto-merging drivers/pci/intel-iommu.c CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c Auto-merging drivers/pci/intr_remapping.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/pci/intel-iommu.c'. [master 6fb9d15b] Merge commit 'dwmw2-iommu/master' $ git diff -M --stat --summary HEAD^.. arch/ia64/kernel/pci-swiotlb.c | 2 +- arch/x86/kernel/pci-swiotlb.c | 5 +- drivers/pci/dmar.c | 37 ++++- drivers/pci/intel-iommu.c | 290 +++++++++++++++++++--------------------- drivers/pci/intr_remapping.c | 8 + drivers/pci/iova.c | 16 +-- drivers/usb/host/pci-quirks.c | 2 +- include/linux/intel-iommu.h | 2 + include/linux/iova.h | 1 - 9 files changed, 187 insertions(+), 176 deletions(-) Merging cputime/cputime $ git merge cputime/cputime Merge made by recursive. fs/proc/uptime.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) Merging osd/linux-next $ git merge osd/linux-next Merge made by recursive. Documentation/filesystems/00-INDEX | 2 + Documentation/filesystems/exofs.txt | 23 ++++++++------- drivers/scsi/osd/osd_initiator.c | 22 ++++++++++---- drivers/scsi/osd/osd_uld.c | 53 ++++++++++++++++++++++++++++++++++- fs/exofs/inode.c | 13 ++++++-- fs/exofs/super.c | 17 +++++++---- include/scsi/osd_initiator.h | 53 ++++++++++++++++++++++++++++------ include/scsi/osd_sense.h | 3 ++ 8 files changed, 148 insertions(+), 38 deletions(-) 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 Auto-merging Documentation/sound/alsa/HD-Audio-Models.txt Auto-merging Documentation/sysctl/kernel.txt Auto-merging Documentation/trace/events.txt Auto-merging Documentation/trace/ftrace.txt Auto-merging MAINTAINERS Auto-merging arch/arm/Makefile Auto-merging arch/arm/mach-at91/board-afeb-9260v1.c Auto-merging arch/arm/mach-at91/board-sam9261ek.c Auto-merging arch/arm/mach-at91/board-sam9263ek.c Auto-merging arch/arm/mach-at91/board-sam9g20ek.c Auto-merging arch/arm/mach-at91/board-sam9rlek.c Auto-merging arch/s390/hypfs/inode.c Auto-merging arch/s390/kvm/interrupt.c Auto-merging arch/sparc/kernel/irq_64.c Auto-merging arch/um/drivers/net_kern.c Auto-merging arch/x86/kernel/cpu/amd.c Auto-merging drivers/char/agp/uninorth-agp.c Auto-merging drivers/gpu/drm/i915/intel_dp.c Auto-merging drivers/gpu/drm/radeon/r300.c Auto-merging drivers/ide/ide-probe.c Auto-merging drivers/input/keyboard/atkbd.c Auto-merging drivers/lguest/page_tables.c Auto-merging drivers/media/video/cx88/cx88-dvb.c Auto-merging drivers/message/fusion/mptbase.c Auto-merging drivers/mtd/devices/m25p80.c Auto-merging drivers/mtd/devices/slram.c Auto-merging drivers/mtd/ubi/ubi.h Auto-merging drivers/net/bnx2x_reg.h Auto-merging drivers/net/bonding/bond_3ad.c Auto-merging drivers/net/e1000/e1000_hw.c Auto-merging drivers/net/ibm_newemac/core.c Auto-merging drivers/net/igb/igb_main.c Auto-merging drivers/net/ll_temac_main.c Auto-merging drivers/net/macb.c Auto-merging drivers/net/ni52.c Auto-merging drivers/net/qlge/qlge_main.c Auto-merging drivers/net/rionet.c Auto-merging drivers/net/skge.c Auto-merging drivers/net/sky2.c Auto-merging drivers/net/vxge/vxge-config.h Auto-merging drivers/net/vxge/vxge-main.c Auto-merging drivers/net/wireless/ath/ath5k/reg.h Auto-merging drivers/net/wireless/atmel.c Auto-merging drivers/net/wireless/zd1211rw/zd_chip.c Auto-merging drivers/s390/block/dasd_eckd.c Auto-merging drivers/s390/net/netiucv.c Auto-merging drivers/s390/scsi/zfcp_scsi.c Auto-merging drivers/scsi/lpfc/lpfc_ct.c Auto-merging drivers/usb/class/cdc-wdm.c Auto-merging drivers/usb/host/xhci.h Auto-merging drivers/video/imxfb.c Auto-merging fs/ext4/inode.c Auto-merging fs/gfs2/rgrp.c Auto-merging fs/ocfs2/quota_global.c Auto-merging include/acpi/actypes.h Auto-merging include/linux/mISDNif.h Auto-merging include/linux/module.h Auto-merging include/linux/workqueue.h Auto-merging kernel/trace/Kconfig Auto-merging kernel/tracepoint.c Auto-merging net/sched/sch_hfsc.c Auto-merging net/wireless/wext-compat.c Auto-merging sound/soc/codecs/wm9081.c Auto-merging sound/soc/pxa/pxa-ssp.c Merge made by recursive. Documentation/DocBook/mtdnand.tmpl | 2 +- Documentation/DocBook/scsi.tmpl | 2 +- Documentation/SubmittingPatches | 2 +- Documentation/filesystems/nfsroot.txt | 2 +- Documentation/hwmon/hpfall.c | 115 +++++++++++++++------- Documentation/hwmon/pc87427 | 2 +- Documentation/networking/regulatory.txt | 2 +- Documentation/powerpc/dts-bindings/marvell.txt | 2 +- Documentation/scsi/ChangeLog.megaraid | 2 +- Documentation/scsi/scsi_fc_transport.txt | 2 +- Documentation/sound/alsa/HD-Audio-Models.txt | 2 +- Documentation/sysctl/kernel.txt | 30 +++--- Documentation/trace/events.txt | 2 +- Documentation/trace/ftrace.txt | 2 +- MAINTAINERS | 2 +- arch/arm/Makefile | 2 +- arch/arm/mach-at91/board-afeb-9260v1.c | 2 +- arch/arm/mach-at91/board-cam60.c | 2 +- arch/arm/mach-at91/board-neocore926.c | 2 +- arch/arm/mach-at91/board-qil-a9260.c | 2 +- arch/arm/mach-at91/board-sam9260ek.c | 2 +- arch/arm/mach-at91/board-sam9261ek.c | 2 +- arch/arm/mach-at91/board-sam9263ek.c | 2 +- arch/arm/mach-at91/board-sam9g20ek.c | 2 +- arch/arm/mach-at91/board-sam9rlek.c | 2 +- arch/arm/mach-at91/board-usb-a9260.c | 2 +- arch/arm/mach-at91/board-usb-a9263.c | 2 +- arch/blackfin/mach-bf538/include/mach/defBF539.h | 2 +- arch/frv/lib/cache.S | 2 +- arch/h8300/kernel/timer/tpu.c | 1 - arch/ia64/ia32/sys_ia32.c | 2 +- arch/mn10300/include/asm/cacheflush.h | 4 +- arch/powerpc/kernel/udbg_16550.c | 2 +- arch/powerpc/platforms/powermac/udbg_scc.c | 2 +- arch/s390/hypfs/inode.c | 2 +- arch/s390/kvm/interrupt.c | 2 +- arch/sparc/kernel/irq_64.c | 2 +- arch/um/drivers/net_kern.c | 2 +- arch/um/include/shared/ptrace_user.h | 2 +- arch/x86/kernel/cpu/amd.c | 2 +- drivers/block/DAC960.c | 8 +- drivers/block/swim3.c | 2 +- drivers/char/agp/uninorth-agp.c | 2 +- drivers/char/epca.c | 2 +- drivers/char/ipmi/ipmi_poweroff.c | 4 +- drivers/edac/edac_core.h | 2 +- drivers/gpio/bt8xxgpio.c | 4 +- drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/mga/mga_state.c | 4 +- drivers/ide/ide-probe.c | 2 +- drivers/ide/umc8672.c | 4 +- drivers/infiniband/hw/ipath/ipath_iba6110.c | 2 +- drivers/input/keyboard/atkbd.c | 2 +- drivers/isdn/capi/capiutil.c | 2 +- drivers/isdn/i4l/isdn_common.c | 4 +- drivers/lguest/page_tables.c | 2 +- drivers/macintosh/rack-meter.c | 2 +- drivers/md/md.h | 2 +- drivers/media/dvb/siano/smscoreapi.c | 2 +- drivers/media/dvb/siano/smscoreapi.h | 4 +- drivers/media/radio/radio-mr800.c | 2 +- drivers/media/video/cx88/cx88-blackbird.c | 4 +- drivers/media/video/cx88/cx88-dvb.c | 4 +- drivers/media/video/cx88/cx88-mpeg.c | 4 +- drivers/media/video/cx88/cx88-video.c | 4 +- drivers/media/video/gspca/m5602/m5602_core.c | 2 +- drivers/message/fusion/mptbase.c | 4 +- drivers/mmc/host/mxcmmc.c | 2 +- drivers/mtd/devices/m25p80.c | 4 +- drivers/mtd/devices/slram.c | 2 +- drivers/mtd/ftl.c | 2 +- drivers/mtd/maps/ixp2000.c | 2 +- drivers/mtd/nand/cafe_nand.c | 4 +- drivers/mtd/nand/cmx270_nand.c | 4 +- drivers/mtd/ubi/eba.c | 2 +- drivers/mtd/ubi/ubi.h | 2 +- drivers/net/arcnet/arc-rawmode.c | 1 - drivers/net/arcnet/capmode.c | 1 - drivers/net/bnx2x_reg.h | 2 +- drivers/net/bonding/bond_3ad.c | 2 +- drivers/net/e1000/e1000_hw.c | 2 +- drivers/net/gianfar_ethtool.c | 2 +- drivers/net/ibm_newemac/core.c | 8 +- drivers/net/igb/igb_main.c | 2 +- drivers/net/ll_temac_main.c | 2 +- drivers/net/macb.c | 2 +- drivers/net/ni52.c | 4 +- drivers/net/qlge/qlge_main.c | 4 +- drivers/net/rionet.c | 2 +- drivers/net/skfp/pcmplc.c | 2 +- drivers/net/skfp/pmf.c | 8 +- drivers/net/skge.c | 2 +- drivers/net/sky2.c | 2 +- drivers/net/vxge/vxge-config.h | 2 +- drivers/net/vxge/vxge-main.c | 2 +- drivers/net/wireless/ath/ath5k/reg.h | 2 +- drivers/net/wireless/atmel.c | 2 +- drivers/net/wireless/zd1211rw/zd_chip.c | 2 +- drivers/pcmcia/pcmcia_resource.c | 2 +- drivers/rtc/rtc-omap.c | 2 +- drivers/s390/block/dasd_eckd.c | 2 +- drivers/s390/net/netiucv.c | 2 +- drivers/s390/scsi/zfcp_scsi.c | 2 +- drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +- drivers/scsi/lpfc/lpfc_ct.c | 2 +- drivers/scsi/megaraid/megaraid_sas.c | 2 +- drivers/scsi/qla4xxx/ql4_os.c | 4 +- drivers/spi/omap_uwire.c | 2 +- drivers/spi/spi_s3c24xx.c | 2 +- drivers/staging/rt2860/rtmp.h | 2 +- drivers/usb/class/cdc-wdm.c | 2 - drivers/usb/host/ehci-pci.c | 2 +- drivers/usb/host/ehci.h | 2 +- drivers/usb/host/ohci-q.c | 2 +- drivers/usb/host/xhci.h | 2 +- drivers/usb/serial/cypress_m8.h | 2 +- drivers/usb/serial/io_edgeport.c | 2 +- drivers/usb/serial/kl5kusb105.c | 2 +- drivers/usb/serial/spcp8x5.c | 2 +- drivers/usb/wusbcore/wa-hc.h | 2 +- drivers/uwb/i1480/i1480u-wlp/netdev.c | 2 +- drivers/video/cfbcopyarea.c | 2 +- drivers/video/imxfb.c | 2 +- drivers/video/omap/lcd_h3.c | 4 +- drivers/video/omap/lcd_h4.c | 4 +- drivers/video/omap/lcd_inn1510.c | 4 +- drivers/video/omap/lcd_inn1610.c | 4 +- drivers/video/omap/lcd_osk.c | 4 +- drivers/video/omap/lcd_palmte.c | 4 +- drivers/video/omap/lcd_palmtt.c | 4 +- drivers/video/omap/lcd_palmz71.c | 4 +- drivers/video/s3c2410fb.c | 2 +- drivers/xen/balloon.c | 2 +- fs/autofs/dirhash.c | 2 +- fs/btrfs/tree-log.c | 2 +- fs/cifs/cifs_dfs_ref.c | 2 +- fs/ext4/inode.c | 2 +- fs/gfs2/rgrp.c | 2 +- fs/nfs/callback_xdr.c | 2 +- fs/ntfs/layout.h | 2 +- fs/ocfs2/quota_global.c | 2 +- fs/xfs/xfs_fs.h | 2 +- include/acpi/actypes.h | 2 +- include/acpi/platform/acgcc.h | 2 +- include/linux/capability.h | 2 +- include/linux/mISDNif.h | 2 +- include/linux/module.h | 5 +- include/linux/namei.h | 2 +- include/linux/usb.h | 2 +- include/linux/workqueue.h | 2 +- include/rdma/ib_cm.h | 2 +- include/scsi/fc/fc_fc2.h | 3 +- kernel/panic.c | 2 +- kernel/trace/Kconfig | 2 +- kernel/trace/trace_hw_branches.c | 2 +- kernel/tracepoint.c | 2 +- lib/zlib_deflate/deflate.c | 4 +- mm/Kconfig.debug | 12 +- net/rxrpc/ar-call.c | 2 +- net/sched/sch_hfsc.c | 2 +- net/wireless/wext-compat.c | 2 +- scripts/basic/fixdep.c | 4 +- scripts/mod/sumversion.c | 2 - sound/oss/swarm_cs4297a.c | 3 - sound/oss/sys_timer.c | 3 - sound/soc/codecs/wm9081.c | 2 +- sound/soc/pxa/pxa-ssp.c | 2 +- sound/soc/s3c24xx/s3c24xx_uda134x.c | 2 +- 168 files changed, 300 insertions(+), 264 deletions(-) Merging audit/for-next $ git merge audit/for-next Already up-to-date. Merging omap/for-next $ git merge omap/for-next Auto-merging arch/arm/mach-omap2/board-4430sdp.c Auto-merging arch/arm/mach-omap2/serial.c Auto-merging arch/arm/plat-omap/dma.c Auto-merging arch/arm/plat-omap/gpio.c Merge made by recursive. Documentation/arm/OMAP/omap_pm | 129 ++ arch/arm/configs/n8x0_defconfig | 1104 ++++++++++++++++++ arch/arm/configs/omap3_beagle_defconfig | 41 +- arch/arm/configs/omap_3430sdp_defconfig | 20 +- arch/arm/configs/omap_zoom2_defconfig | 484 +++++++-- arch/arm/configs/rx51_defconfig | 1 + arch/arm/mach-omap1/board-ams-delta.c | 43 +- arch/arm/mach-omap1/board-fsample.c | 5 - arch/arm/mach-omap1/board-generic.c | 5 - arch/arm/mach-omap1/board-h2.c | 5 - arch/arm/mach-omap1/board-h3.c | 5 - arch/arm/mach-omap1/board-innovator.c | 5 - arch/arm/mach-omap1/board-osk.c | 5 - arch/arm/mach-omap1/board-palmte.c | 5 - arch/arm/mach-omap1/board-palmtt.c | 5 - arch/arm/mach-omap1/board-palmz71.c | 5 - arch/arm/mach-omap1/board-perseus2.c | 5 - arch/arm/mach-omap1/board-sx1.c | 5 - arch/arm/mach-omap1/board-voiceblue.c | 5 - arch/arm/mach-omap1/devices.c | 2 +- arch/arm/mach-omap1/io.c | 6 +- arch/arm/mach-omap1/pm.h | 4 +- arch/arm/mach-omap1/serial.c | 17 +- arch/arm/mach-omap1/sram.S | 12 +- arch/arm/mach-omap1/time.c | 4 +- arch/arm/mach-omap2/Kconfig | 9 + arch/arm/mach-omap2/Makefile | 10 +- arch/arm/mach-omap2/board-2430sdp.c | 18 +- arch/arm/mach-omap2/board-3430sdp.c | 29 +- arch/arm/mach-omap2/board-4430sdp.c | 5 +- arch/arm/mach-omap2/board-apollon.c | 25 +- arch/arm/mach-omap2/board-generic.c | 15 +- arch/arm/mach-omap2/board-h4.c | 25 +- arch/arm/mach-omap2/board-ldp.c | 25 +- arch/arm/mach-omap2/board-n8x0.c | 150 +++ arch/arm/mach-omap2/board-omap3beagle.c | 36 +- arch/arm/mach-omap2/board-omap3evm.c | 17 +- arch/arm/mach-omap2/board-omap3pandora.c | 25 +- arch/arm/mach-omap2/board-overo.c | 24 +- arch/arm/mach-omap2/board-rx51.c | 9 +- arch/arm/mach-omap2/board-zoom-debugboard.c | 11 +- arch/arm/mach-omap2/board-zoom2.c | 218 ++++- arch/arm/mach-omap2/clock.c | 2 + arch/arm/mach-omap2/clock34xx.c | 17 +- arch/arm/mach-omap2/clock34xx.h | 21 +- arch/arm/mach-omap2/clockdomain.c | 10 +- arch/arm/mach-omap2/cm.c | 70 ++ arch/arm/mach-omap2/cm.h | 10 +- arch/arm/mach-omap2/cm4xxx.c | 68 ++ arch/arm/mach-omap2/devices.c | 41 + arch/arm/mach-omap2/io.c | 23 +- arch/arm/mach-omap2/iommu2.c | 19 +- arch/arm/mach-omap2/mux.c | 55 + arch/arm/mach-omap2/omap-smp.c | 2 +- arch/arm/mach-omap2/omap_hwmod.c | 1554 +++++++++++++++++++++++++ arch/arm/mach-omap2/omap_hwmod_2420.h | 141 +++ arch/arm/mach-omap2/omap_hwmod_2430.h | 143 +++ arch/arm/mach-omap2/omap_hwmod_34xx.h | 168 +++ arch/arm/mach-omap2/pm-debug.c | 431 +++++++- arch/arm/mach-omap2/pm.h | 11 + arch/arm/mach-omap2/pm24xx.c | 4 +- arch/arm/mach-omap2/pm34xx.c | 40 +- arch/arm/mach-omap2/powerdomain.c | 114 ++- arch/arm/mach-omap2/prm.h | 6 +- arch/arm/mach-omap2/sdrc.h | 6 +- arch/arm/mach-omap2/serial.c | 67 +- arch/arm/mach-omap2/sram242x.S | 4 +- arch/arm/mach-omap2/sram243x.S | 4 +- arch/arm/mach-omap2/timer-gp.c | 2 +- arch/arm/mach-omap2/usb-musb.c | 12 - arch/arm/plat-omap/Kconfig | 17 + arch/arm/plat-omap/Makefile | 6 + arch/arm/plat-omap/clock.c | 2 +- arch/arm/plat-omap/common.c | 88 -- arch/arm/plat-omap/dma.c | 8 +- arch/arm/plat-omap/dmtimer.c | 5 +- arch/arm/plat-omap/gpio.c | 115 ++- arch/arm/plat-omap/include/mach/board.h | 2 - arch/arm/plat-omap/include/mach/clockdomain.h | 3 +- arch/arm/plat-omap/include/mach/control.h | 12 +- arch/arm/plat-omap/include/mach/entry-macro.S | 8 +- arch/arm/plat-omap/include/mach/gpio.h | 2 +- arch/arm/plat-omap/include/mach/io.h | 97 +- arch/arm/plat-omap/include/mach/iommu.h | 6 +- arch/arm/plat-omap/include/mach/mtd-xip.h | 2 +- arch/arm/plat-omap/include/mach/mux.h | 31 + arch/arm/plat-omap/include/mach/omap-pm.h | 301 +++++ arch/arm/plat-omap/include/mach/omap44xx.h | 8 +- arch/arm/plat-omap/include/mach/omap_device.h | 141 +++ arch/arm/plat-omap/include/mach/omap_hwmod.h | 447 +++++++ arch/arm/plat-omap/include/mach/powerdomain.h | 15 +- arch/arm/plat-omap/include/mach/sdrc.h | 15 +- arch/arm/plat-omap/include/mach/serial.h | 3 + arch/arm/plat-omap/io.c | 62 +- arch/arm/plat-omap/iommu-debug.c | 415 +++++++ arch/arm/plat-omap/iommu.c | 23 +- arch/arm/plat-omap/iovmm.c | 2 +- arch/arm/plat-omap/omap-pm-noop.c | 296 +++++ arch/arm/plat-omap/omap_device.c | 687 +++++++++++ arch/arm/plat-omap/sram.c | 18 +- drivers/input/keyboard/omap-keypad.c | 22 +- drivers/mtd/nand/ams-delta.c | 8 +- drivers/video/omap/dispc.c | 6 +- 103 files changed, 7777 insertions(+), 719 deletions(-) create mode 100644 Documentation/arm/OMAP/omap_pm create mode 100644 arch/arm/configs/n8x0_defconfig create mode 100644 arch/arm/mach-omap2/board-n8x0.c create mode 100644 arch/arm/mach-omap2/cm.c create mode 100644 arch/arm/mach-omap2/cm4xxx.c create mode 100644 arch/arm/mach-omap2/omap_hwmod.c create mode 100644 arch/arm/mach-omap2/omap_hwmod_2420.h create mode 100644 arch/arm/mach-omap2/omap_hwmod_2430.h create mode 100644 arch/arm/mach-omap2/omap_hwmod_34xx.h create mode 100644 arch/arm/plat-omap/include/mach/omap-pm.h create mode 100644 arch/arm/plat-omap/include/mach/omap_device.h create mode 100644 arch/arm/plat-omap/include/mach/omap_hwmod.h create mode 100644 arch/arm/plat-omap/iommu-debug.c create mode 100644 arch/arm/plat-omap/omap-pm-noop.c create mode 100644 arch/arm/plat-omap/omap_device.c Merging quilt/aoe $ git merge quilt/aoe Merge made by recursive. drivers/block/aoe/aoecmd.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) Merging suspend/linux-next $ git merge suspend/linux-next Already up-to-date. Merging bluetooth/master $ git merge bluetooth/master Already up-to-date. Merging fsnotify/for-next $ git merge fsnotify/for-next Auto-merging Documentation/feature-removal-schedule.txt Auto-merging init/Kconfig Auto-merging kernel/Makefile Merge made by recursive. Documentation/feature-removal-schedule.txt | 7 + fs/compat.c | 5 +- fs/exec.c | 4 +- fs/nfsd/vfs.c | 4 +- fs/notify/dnotify/dnotify.c | 8 +- fs/notify/fsnotify.c | 16 ++- fs/notify/group.c | 50 +----- fs/notify/inode_mark.c | 24 ++- fs/notify/inotify/inotify_fsnotify.c | 59 ++++++- fs/notify/inotify/inotify_user.c | 219 ++++++++++++++------- fs/notify/notification.c | 161 +++++++++------- fs/open.c | 2 +- fs/read_write.c | 8 +- include/linux/fsnotify.h | 44 +++-- include/linux/fsnotify_backend.h | 30 ++-- init/Kconfig | 10 +- kernel/Makefile | 5 +- kernel/audit.c | 1 - kernel/audit.h | 26 ++- kernel/audit_tree.c | 223 ++++++++++++--------- kernel/audit_watch.c | 296 ++++++++++++++++------------ kernel/auditfilter.c | 39 ++--- kernel/auditsc.c | 15 +- 23 files changed, 730 insertions(+), 526 deletions(-) Merging irda/for-next $ git merge irda/for-next Auto-merging drivers/net/irda/irda-usb.c Merge made by recursive. drivers/net/irda/irda-usb.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) Merging hwlat/for-linus $ git merge hwlat/for-linus Auto-merging MAINTAINERS Auto-merging drivers/misc/Kconfig Auto-merging drivers/misc/Makefile Merge made by recursive. Documentation/hwlat_detector.txt | 64 ++ MAINTAINERS | 9 + drivers/misc/Kconfig | 29 + drivers/misc/Makefile | 1 + drivers/misc/hwlat_detector.c | 1208 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 1311 insertions(+), 0 deletions(-) create mode 100644 Documentation/hwlat_detector.txt create mode 100644 drivers/misc/hwlat_detector.c Merging drbd/drbd $ git merge drbd/drbd Auto-merging MAINTAINERS Merge made by recursive. .../blockdev/drbd/DRBD-8.3-data-packets.svg | 588 +++ Documentation/blockdev/drbd/DRBD-data-packets.svg | 459 ++ Documentation/blockdev/drbd/README.txt | 16 + Documentation/blockdev/drbd/conn-states-8.dot | 18 + Documentation/blockdev/drbd/disk-states-8.dot | 16 + .../drbd/drbd-connection-state-overview.dot | 85 + Documentation/blockdev/drbd/node-states-8.dot | 14 + MAINTAINERS | 13 + drivers/block/Kconfig | 2 + drivers/block/Makefile | 1 + drivers/block/drbd/Kconfig | 82 + drivers/block/drbd/Makefile | 8 + drivers/block/drbd/drbd_actlog.c | 1484 +++++++ drivers/block/drbd/drbd_bitmap.c | 1327 ++++++ drivers/block/drbd/drbd_int.h | 2258 ++++++++++ drivers/block/drbd/drbd_main.c | 3735 ++++++++++++++++ drivers/block/drbd/drbd_nl.c | 2365 +++++++++++ drivers/block/drbd/drbd_proc.c | 266 ++ drivers/block/drbd/drbd_receiver.c | 4456 ++++++++++++++++++++ drivers/block/drbd/drbd_req.c | 1132 +++++ drivers/block/drbd/drbd_req.h | 327 ++ drivers/block/drbd/drbd_strings.c | 113 + drivers/block/drbd/drbd_tracing.c | 753 ++++ drivers/block/drbd/drbd_tracing.h | 87 + drivers/block/drbd/drbd_vli.h | 351 ++ drivers/block/drbd/drbd_worker.c | 1529 +++++++ drivers/block/drbd/drbd_wrappers.h | 91 + include/linux/drbd.h | 349 ++ include/linux/drbd_limits.h | 137 + include/linux/drbd_nl.h | 137 + include/linux/drbd_tag_magic.h | 83 + include/linux/lru_cache.h | 294 ++ lib/Kconfig | 3 + lib/Makefile | 2 + lib/lru_cache.c | 560 +++ 35 files changed, 23141 insertions(+), 0 deletions(-) create mode 100644 Documentation/blockdev/drbd/DRBD-8.3-data-packets.svg create mode 100644 Documentation/blockdev/drbd/DRBD-data-packets.svg create mode 100644 Documentation/blockdev/drbd/README.txt create mode 100644 Documentation/blockdev/drbd/conn-states-8.dot create mode 100644 Documentation/blockdev/drbd/disk-states-8.dot create mode 100644 Documentation/blockdev/drbd/drbd-connection-state-overview.dot create mode 100644 Documentation/blockdev/drbd/node-states-8.dot create mode 100644 drivers/block/drbd/Kconfig create mode 100644 drivers/block/drbd/Makefile create mode 100644 drivers/block/drbd/drbd_actlog.c create mode 100644 drivers/block/drbd/drbd_bitmap.c create mode 100644 drivers/block/drbd/drbd_int.h create mode 100644 drivers/block/drbd/drbd_main.c create mode 100644 drivers/block/drbd/drbd_nl.c create mode 100644 drivers/block/drbd/drbd_proc.c create mode 100644 drivers/block/drbd/drbd_receiver.c create mode 100644 drivers/block/drbd/drbd_req.c create mode 100644 drivers/block/drbd/drbd_req.h create mode 100644 drivers/block/drbd/drbd_strings.c create mode 100644 drivers/block/drbd/drbd_tracing.c create mode 100644 drivers/block/drbd/drbd_tracing.h create mode 100644 drivers/block/drbd/drbd_vli.h create mode 100644 drivers/block/drbd/drbd_worker.c create mode 100644 drivers/block/drbd/drbd_wrappers.h create mode 100644 include/linux/drbd.h create mode 100644 include/linux/drbd_limits.h create mode 100644 include/linux/drbd_nl.h create mode 100644 include/linux/drbd_tag_magic.h create mode 100644 include/linux/lru_cache.h create mode 100644 lib/lru_cache.c Merging kmemleak/kmemleak $ git merge kmemleak/kmemleak Already up-to-date. Merging tip/auto-latest $ git merge tip/auto-latest Resolved 'arch/x86/kernel/setup.c' using previous resolution. Auto-merging Documentation/feature-removal-schedule.txt Auto-merging Documentation/trace/events.txt Auto-merging arch/arm/plat-omap/common.c Auto-merging arch/m68knommu/kernel/time.c Auto-merging arch/powerpc/kernel/time.c Auto-merging arch/s390/kernel/time.c Auto-merging arch/sh/kernel/time.c Auto-merging arch/x86/Kconfig Removing arch/x86/include/asm/do_timer.h Auto-merging arch/x86/include/asm/msr-index.h Auto-merging arch/x86/kernel/apic/io_apic.c Removing arch/x86/kernel/cpu/mcheck/k7.c Auto-merging arch/x86/kernel/cpu/mcheck/mce.c Removing arch/x86/kernel/cpu/mcheck/non-fatal.c Removing arch/x86/kernel/cpu/mcheck/p4.c Removing arch/x86/kernel/cpu/mcheck/p6.c Auto-merging arch/x86/kernel/kvmclock.c Auto-merging arch/x86/kernel/setup.c CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c Auto-merging arch/x86/kernel/smpboot.c Removing arch/x86/kernel/time_32.c Removing arch/x86/kernel/time_64.c Auto-merging arch/x86/lguest/boot.c Auto-merging arch/x86/xen/mmu.c Auto-merging drivers/pci/intr_remapping.c Auto-merging include/asm-generic/vmlinux.lds.h Auto-merging include/linux/sched.h Auto-merging init/main.c Auto-merging kernel/hrtimer.c Auto-merging kernel/sched.c Auto-merging kernel/trace/trace.c Removing kernel/trace/trace_event_types.h Auto-merging kernel/trace/trace_events.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master e52defd] Merge commit 'tip/auto-latest' $ git diff -M --stat --summary HEAD^.. Documentation/feature-removal-schedule.txt | 10 - Documentation/trace/events.txt | 184 ++++++++++- Documentation/x86/boot.txt | 1 + arch/arm/plat-omap/common.c | 7 +- arch/ia64/include/asm/cputime.h | 1 + arch/m68knommu/kernel/time.c | 5 +- arch/mips/dec/time.c | 5 +- arch/mips/lasat/ds1603.c | 5 +- arch/mips/lasat/sysctl.c | 8 +- arch/mips/lemote/lm2e/setup.c | 5 +- arch/mips/mti-malta/malta-time.c | 5 +- arch/mips/pmc-sierra/yosemite/setup.c | 5 +- arch/mips/sibyte/swarm/setup.c | 15 +- arch/mips/sni/time.c | 5 +- arch/powerpc/include/asm/cputime.h | 13 + arch/powerpc/kernel/time.c | 23 +- arch/s390/include/asm/cputime.h | 1 + arch/s390/kernel/time.c | 38 +-- arch/sh/kernel/time.c | 6 +- arch/x86/Kconfig | 80 ++--- arch/x86/include/asm/apic.h | 19 +- arch/x86/include/asm/bootparam.h | 10 + arch/x86/include/asm/do_timer.h | 16 - arch/x86/include/asm/e820.h | 2 - arch/x86/include/asm/elf.h | 2 + arch/x86/include/asm/entry_arch.h | 2 +- arch/x86/include/asm/hpet.h | 7 +- arch/x86/include/asm/hypervisor.h | 2 +- arch/x86/include/asm/io_apic.h | 5 +- arch/x86/include/asm/irq.h | 3 +- arch/x86/include/asm/mce.h | 20 +- arch/x86/include/asm/mpspec.h | 47 ++- arch/x86/include/asm/msr-index.h | 11 + arch/x86/include/asm/nops.h | 2 + arch/x86/include/asm/paravirt.h | 41 +-- arch/x86/include/asm/paravirt_types.h | 24 -- arch/x86/include/asm/pgtable.h | 10 - arch/x86/include/asm/pgtable_types.h | 4 +- arch/x86/include/asm/setup.h | 49 +-- arch/x86/include/asm/time.h | 3 - arch/x86/include/asm/timer.h | 14 +- arch/x86/include/asm/tsc.h | 3 +- arch/x86/include/asm/vgtod.h | 1 + arch/x86/include/asm/vmware.h | 2 +- arch/x86/include/asm/x86_init.h | 129 +++++++ arch/x86/kernel/Makefile | 5 +- arch/x86/kernel/acpi/boot.c | 1 + arch/x86/kernel/apic/apic.c | 3 +- arch/x86/kernel/apic/bigsmp_32.c | 2 +- arch/x86/kernel/apic/io_apic.c | 101 ++++-- arch/x86/kernel/apic/nmi.c | 2 +- arch/x86/kernel/apic/numaq_32.c | 57 ++-- arch/x86/kernel/apic/summit_32.c | 2 +- arch/x86/kernel/cpu/hypervisor.c | 14 +- arch/x86/kernel/cpu/mcheck/Makefile | 5 +- arch/x86/kernel/cpu/mcheck/k7.c | 116 ------ arch/x86/kernel/cpu/mcheck/mce-internal.h | 14 + arch/x86/kernel/cpu/mcheck/mce-severity.c | 2 - arch/x86/kernel/cpu/mcheck/mce.c | 220 +++++------- arch/x86/kernel/cpu/mcheck/mce_intel.c | 10 +- arch/x86/kernel/cpu/mcheck/non-fatal.c | 94 ----- arch/x86/kernel/cpu/mcheck/p4.c | 163 --------- arch/x86/kernel/cpu/mcheck/p6.c | 127 ------- arch/x86/kernel/cpu/mcheck/therm_throt.c | 13 +- arch/x86/kernel/cpu/vmware.c | 21 +- arch/x86/kernel/e820.c | 19 +- arch/x86/kernel/entry_64.S | 6 +- arch/x86/kernel/head32.c | 26 ++- arch/x86/kernel/head64.c | 2 +- arch/x86/kernel/head_32.S | 1 + arch/x86/kernel/hpet.c | 60 ++-- arch/x86/kernel/i8253.c | 19 - arch/x86/kernel/irq.c | 4 +- arch/x86/kernel/irqinit.c | 38 +-- arch/x86/kernel/kvmclock.c | 7 +- arch/x86/kernel/mpparse.c | 75 ++--- arch/x86/kernel/mrst.c | 24 ++ arch/x86/kernel/paravirt.c | 34 +-- arch/x86/kernel/rtc.c | 5 +- arch/x86/kernel/setup.c | 114 +----- arch/x86/kernel/signal.c | 2 +- arch/x86/kernel/smpboot.c | 4 +- arch/x86/kernel/time.c | 121 +++++++ arch/x86/kernel/time_32.c | 137 ------- arch/x86/kernel/time_64.c | 135 ------- arch/x86/kernel/traps.c | 5 +- arch/x86/kernel/tsc.c | 78 ++++- arch/x86/kernel/visws_quirks.c | 54 +-- arch/x86/kernel/vmi_32.c | 8 +- arch/x86/kernel/vmiclock_32.c | 2 +- arch/x86/kernel/vsyscall_64.c | 1 + arch/x86/kernel/x86_init.c | 73 ++++ arch/x86/lguest/boot.c | 9 +- arch/x86/mm/mmap.c | 17 +- arch/x86/vdso/vclock_gettime.c | 39 ++- arch/x86/xen/enlighten.c | 22 +- arch/x86/xen/irq.c | 5 +- arch/x86/xen/mmu.c | 16 +- arch/x86/xen/mmu.h | 2 +- arch/x86/xen/xen-ops.h | 2 - arch/xtensa/kernel/time.c | 5 +- drivers/pci/intr_remapping.c | 89 +++++- drivers/pci/intr_remapping.h | 7 + include/asm-generic/cputime.h | 1 + include/asm-generic/vmlinux.lds.h | 5 +- include/linux/clocksource.h | 121 +------ include/linux/dmar.h | 10 + include/linux/ftrace_event.h | 6 +- include/linux/hpet.h | 2 + include/linux/hrtimer.h | 2 - include/linux/kthread.h | 1 + include/linux/poison.h | 16 +- include/linux/sched.h | 16 +- include/linux/time.h | 8 +- include/linux/timer.h | 5 - include/linux/timex.h | 5 +- include/trace/events/block.h | 4 +- include/trace/events/timer.h | 342 ++++++++++++++++++ init/main.c | 2 + kernel/fork.c | 9 +- kernel/hrtimer.c | 95 ++---- kernel/irq/manage.c | 2 +- kernel/itimer.c | 169 +++++---- kernel/kthread.c | 5 + kernel/posix-cpu-timers.c | 155 +++++---- kernel/posix-timers.c | 35 ++ kernel/rcutorture.c | 15 +- kernel/rcutree.c | 41 +-- kernel/sched.c | 9 +- kernel/time/clocksource.c | 492 ++++++++++++++------------ kernel/time/jiffies.c | 6 +- kernel/time/ntp.c | 7 +- kernel/time/timekeeping.c | 535 +++++++++++++++++++++------- kernel/timer.c | 60 +++- kernel/trace/ftrace.c | 150 ++------ kernel/trace/ring_buffer.c | 17 +- kernel/trace/trace.c | 127 +++++++- kernel/trace/trace.h | 276 ++++----------- kernel/trace/trace_boot.c | 8 +- kernel/trace/trace_entries.h | 392 ++++++++++++++++++++ kernel/trace/trace_event_profile.c | 5 +- kernel/trace/trace_event_types.h | 178 --------- kernel/trace/trace_events.c | 65 +--- kernel/trace/trace_events_filter.c | 41 +++ kernel/trace/trace_export.c | 241 +++++++------ kernel/trace/trace_functions_graph.c | 60 +++- kernel/trace/trace_irqsoff.c | 16 +- kernel/trace/trace_mmiotrace.c | 10 +- kernel/trace/trace_output.c | 42 ++- kernel/trace/trace_output.h | 2 + kernel/trace/trace_sched_wakeup.c | 52 ++-- 151 files changed, 3779 insertions(+), 3173 deletions(-) delete mode 100644 arch/x86/include/asm/do_timer.h create mode 100644 arch/x86/include/asm/x86_init.h delete mode 100644 arch/x86/kernel/cpu/mcheck/k7.c delete mode 100644 arch/x86/kernel/cpu/mcheck/non-fatal.c delete mode 100644 arch/x86/kernel/cpu/mcheck/p4.c delete mode 100644 arch/x86/kernel/cpu/mcheck/p6.c create mode 100644 arch/x86/kernel/mrst.c create mode 100644 arch/x86/kernel/time.c delete mode 100644 arch/x86/kernel/time_32.c delete mode 100644 arch/x86/kernel/time_64.c create mode 100644 arch/x86/kernel/x86_init.c create mode 100644 include/trace/events/timer.h create mode 100644 kernel/trace/trace_entries.h delete mode 100644 kernel/trace/trace_event_types.h $ git am -3 ../patches/tip-fix-merge-for-cpumask-update.patch Applying: tip: fix merge for cupmask update $ git reset HEAD^ arch/x86/kernel/time.c: locally modified $ git add . $ git commit -v -a --amend [master e2e457a] Merge commit 'tip/auto-latest' Merging oprofile/for-next $ git merge oprofile/for-next Auto-merging kernel/trace/ring_buffer.c Merge made by recursive. Merging percpu/for-next $ git merge percpu/for-next Already up-to-date. Merging sfi/sfi-test $ git merge sfi/sfi-test Resolved 'arch/x86/kernel/setup.c' using previous resolution. Auto-merging MAINTAINERS Auto-merging arch/x86/Kconfig Auto-merging arch/x86/kernel/Makefile Auto-merging arch/x86/kernel/setup.c CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c Auto-merging init/main.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master f74a648] Merge commit 'sfi/sfi-test' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 12 ++ arch/x86/Kconfig | 4 +- arch/x86/kernel/Makefile | 1 + arch/x86/kernel/setup.c | 3 + arch/x86/kernel/sfi.c | 133 +++++++++++++ arch/x86/pci/mmconfig-shared.c | 6 +- arch/x86/pci/mmconfig_32.c | 2 +- drivers/Makefile | 1 + drivers/sfi/Kconfig | 17 ++ drivers/sfi/Makefile | 3 + drivers/sfi/sfi_acpi.c | 175 +++++++++++++++++ drivers/sfi/sfi_core.c | 412 ++++++++++++++++++++++++++++++++++++++++ drivers/sfi/sfi_core.h | 70 +++++++ include/linux/sfi.h | 206 ++++++++++++++++++++ include/linux/sfi_acpi.h | 93 +++++++++ init/main.c | 2 + 16 files changed, 1136 insertions(+), 4 deletions(-) create mode 100644 arch/x86/kernel/sfi.c create mode 100644 drivers/sfi/Kconfig create mode 100644 drivers/sfi/Makefile create mode 100644 drivers/sfi/sfi_acpi.c create mode 100644 drivers/sfi/sfi_core.c create mode 100644 drivers/sfi/sfi_core.h create mode 100644 include/linux/sfi.h create mode 100644 include/linux/sfi_acpi.h Merging asm-generic/next $ git merge asm-generic/next Merge made by recursive. lib/checksum.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) Merging hwpoison/hwpoison $ git merge hwpoison/hwpoison Auto-merging Documentation/filesystems/vfs.txt Auto-merging fs/ext3/inode.c Auto-merging fs/ext4/inode.c Auto-merging fs/ocfs2/aops.c Auto-merging fs/xfs/linux-2.6/xfs_aops.c Auto-merging include/linux/fs.h Auto-merging include/linux/page-flags.h Auto-merging include/linux/sched.h Auto-merging mm/Kconfig Auto-merging mm/Makefile Auto-merging mm/page-writeback.c Merge made by recursive. Documentation/filesystems/vfs.txt | 7 + Documentation/sysctl/vm.txt | 41 ++- arch/x86/mm/fault.c | 19 +- fs/btrfs/inode.c | 1 + fs/ext2/inode.c | 2 + fs/ext3/inode.c | 3 + fs/ext4/inode.c | 4 + fs/gfs2/aops.c | 3 + fs/nfs/file.c | 1 + fs/ntfs/aops.c | 2 + fs/ocfs2/aops.c | 1 + fs/proc/meminfo.c | 9 +- fs/xfs/linux-2.6/xfs_aops.c | 1 + include/asm-generic/mman-common.h | 1 + include/asm-generic/siginfo.h | 8 +- include/linux/fs.h | 1 + include/linux/mm.h | 15 +- include/linux/page-flags.h | 17 +- include/linux/prctl.h | 2 + include/linux/rmap.h | 21 +- include/linux/sched.h | 2 + include/linux/swap.h | 34 ++- include/linux/swapops.h | 38 ++ kernel/sys.c | 22 + kernel/sysctl.c | 25 ++ mm/Kconfig | 14 + mm/Makefile | 2 + mm/filemap.c | 4 + mm/hwpoison-inject.c | 41 ++ mm/madvise.c | 30 ++ mm/memory-failure.c | 830 +++++++++++++++++++++++++++++++++++++ mm/memory.c | 24 +- mm/migrate.c | 2 +- mm/page-writeback.c | 7 + mm/page_alloc.c | 20 +- mm/rmap.c | 60 ++- mm/shmem.c | 5 +- mm/swapfile.c | 4 +- mm/truncate.c | 72 +++- mm/vmscan.c | 2 +- 40 files changed, 1329 insertions(+), 68 deletions(-) create mode 100644 mm/hwpoison-inject.c create mode 100644 mm/memory-failure.c Merging quilt/driver-core $ git merge quilt/driver-core Resolved 'drivers/base/class.c' using previous resolution. Resolved 'drivers/mtd/mtdcore.c' using previous resolution. Resolved 'init/main.c' using previous resolution. Auto-merging Documentation/trace/events.txt Auto-merging MAINTAINERS Auto-merging drivers/base/class.c CONFLICT (content): Merge conflict in drivers/base/class.c Auto-merging drivers/base/core.c Auto-merging drivers/mtd/mtdcore.c CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.c Auto-merging drivers/pcmcia/pcmcia_resource.c Auto-merging drivers/s390/net/netiucv.c Auto-merging include/linux/device.h Auto-merging init/main.c CONFLICT (content): Merge conflict in init/main.c Auto-merging kernel/Makefile Auto-merging mm/shmem.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 1721a78] Merge branch 'quilt/driver-core' $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/uio-howto.tmpl | 163 ++++++++++++ Documentation/trace/events.txt | 24 +- MAINTAINERS | 7 + drivers/base/Kconfig | 25 ++ drivers/base/Makefile | 2 + drivers/base/base.h | 13 +- drivers/base/bus.c | 23 +- drivers/base/core.c | 25 ++- drivers/base/dd.c | 31 +++- drivers/base/devtmpfs.c | 367 ++++++++++++++++++++++++++++ {kernel => drivers/base}/dma-coherent.c | 0 drivers/base/init.c | 1 + drivers/base/platform.c | 8 +- drivers/block/pktcdvd.c | 2 +- drivers/bluetooth/dtl1_cs.c | 2 +- drivers/char/mem.c | 82 +++---- drivers/misc/hpilo.c | 290 +++++++++++++++------- drivers/misc/hpilo.h | 8 +- drivers/net/wireless/iwmc3200wifi/Kconfig | 6 +- drivers/pcmcia/au1000_pb1x00.c | 1 - drivers/pcmcia/au1000_xxs1500.c | 1 - drivers/pcmcia/ds.c | 3 +- drivers/pcmcia/o2micro.h | 4 + drivers/pcmcia/pcmcia_ioctl.c | 2 +- drivers/pcmcia/pcmcia_resource.c | 4 +- drivers/uio/Kconfig | 15 +- drivers/uio/Makefile | 1 + drivers/uio/uio_pci_generic.c | 207 ++++++++++++++++ drivers/usb/host/uhci-hcd.c | 2 +- include/linux/device.h | 31 ++- include/linux/pci_regs.h | 1 + include/linux/shmem_fs.h | 3 + include/pcmcia/ss.h | 4 +- init/do_mounts.c | 2 +- init/main.c | 2 + kernel/Makefile | 1 - mm/shmem.c | 9 +- samples/trace_events/trace-events-sample.h | 2 +- 38 files changed, 1164 insertions(+), 210 deletions(-) create mode 100644 drivers/base/devtmpfs.c rename {kernel => drivers/base}/dma-coherent.c (100%) create mode 100644 drivers/uio/uio_pci_generic.c Merging quilt/tty $ git merge quilt/tty Auto-merging arch/arm/mach-omap1/board-ams-delta.c Auto-merging drivers/serial/pxa.c Auto-merging drivers/serial/sh-sci.c Auto-merging drivers/usb/serial/io_edgeport.c Auto-merging drivers/usb/serial/kl5kusb105.c Auto-merging drivers/usb/serial/spcp8x5.c Merge made by recursive. arch/mn10300/kernel/asm-offsets.c | 6 +- drivers/char/cyclades.c | 2311 ++++++++----------------------- drivers/char/esp.c | 7 +- drivers/char/isicom.c | 57 +- drivers/char/mxser.c | 62 +- drivers/char/n_tty.c | 79 +- drivers/char/riscom8.c | 164 ++-- drivers/char/tty_io.c | 22 +- drivers/char/tty_ioctl.c | 4 +- drivers/char/tty_ldisc.c | 82 +- drivers/char/tty_port.c | 31 +- drivers/char/vt.c | 14 +- drivers/char/vt_ioctl.c | 482 ++++++- drivers/net/slip.c | 96 +- drivers/serial/21285.c | 8 +- drivers/serial/8250.c | 28 +- drivers/serial/8250.h | 1 + drivers/serial/amba-pl010.c | 6 +- drivers/serial/amba-pl011.c | 6 +- drivers/serial/atmel_serial.c | 14 +- drivers/serial/bfin_5xx.c | 20 +- drivers/serial/bfin_sport_uart.c | 6 +- drivers/serial/clps711x.c | 4 +- drivers/serial/cpm_uart/cpm_uart_core.c | 2 +- drivers/serial/dz.c | 6 +- drivers/serial/icom.c | 20 +- drivers/serial/imx.c | 16 +- drivers/serial/ioc3_serial.c | 54 +- drivers/serial/ioc4_serial.c | 68 +- drivers/serial/ip22zilog.c | 14 +- drivers/serial/jsm/jsm_neo.c | 2 +- drivers/serial/jsm/jsm_tty.c | 20 +- drivers/serial/m32r_sio.c | 6 +- drivers/serial/max3100.c | 16 +- drivers/serial/mcf.c | 4 +- drivers/serial/mpc52xx_uart.c | 4 +- drivers/serial/mpsc.c | 4 +- drivers/serial/msm_serial.c | 6 +- drivers/serial/mux.c | 4 +- drivers/serial/netx-serial.c | 6 +- drivers/serial/nwpserial.c | 4 +- drivers/serial/pmac_zilog.c | 20 +- drivers/serial/pnx8xxx_uart.c | 8 +- drivers/serial/pxa.c | 6 +- drivers/serial/sa1100.c | 8 +- drivers/serial/samsung.c | 8 +- drivers/serial/sb1250-duart.c | 6 +- drivers/serial/sc26xx.c | 10 +- drivers/serial/serial_core.c | 876 ++++++------ drivers/serial/serial_ks8695.c | 6 +- drivers/serial/serial_lh7a40x.c | 6 +- drivers/serial/serial_txx9.c | 4 +- drivers/serial/sh-sci.c | 10 +- drivers/serial/sn_console.c | 22 +- drivers/serial/sunhv.c | 8 +- drivers/serial/sunsab.c | 10 +- drivers/serial/sunsu.c | 6 +- drivers/serial/sunzilog.c | 14 +- drivers/serial/timbuart.c | 10 +- drivers/serial/uartlite.c | 19 +- drivers/serial/ucc_uart.c | 4 +- drivers/serial/vr41xx_siu.c | 6 +- drivers/serial/zs.c | 6 +- drivers/usb/class/cdc-acm.c | 5 +- drivers/usb/serial/ark3116.c | 51 +- drivers/usb/serial/belkin_sa.c | 4 +- drivers/usb/serial/ch341.c | 5 +- drivers/usb/serial/console.c | 4 +- drivers/usb/serial/cp210x.c | 12 +- drivers/usb/serial/cyberjack.c | 4 +- drivers/usb/serial/cypress_m8.c | 18 +- drivers/usb/serial/digi_acceleport.c | 6 +- drivers/usb/serial/empeg.c | 18 +- drivers/usb/serial/ftdi_sio.c | 6 +- drivers/usb/serial/garmin_gps.c | 3 +- drivers/usb/serial/generic.c | 3 +- drivers/usb/serial/io_edgeport.c | 6 +- drivers/usb/serial/io_ti.c | 3 +- drivers/usb/serial/ipaq.c | 9 +- drivers/usb/serial/ipw.c | 3 +- drivers/usb/serial/ir-usb.c | 6 +- drivers/usb/serial/iuu_phoenix.c | 34 +- drivers/usb/serial/keyspan.c | 3 +- drivers/usb/serial/keyspan.h | 3 +- drivers/usb/serial/keyspan_pda.c | 2 +- drivers/usb/serial/kl5kusb105.c | 10 +- drivers/usb/serial/kobil_sct.c | 28 +- drivers/usb/serial/mct_u232.c | 15 +- drivers/usb/serial/mos7720.c | 123 ++- drivers/usb/serial/mos7840.c | 118 +-- drivers/usb/serial/navman.c | 3 +- drivers/usb/serial/omninet.c | 6 +- drivers/usb/serial/opticon.c | 3 +- drivers/usb/serial/option.c | 6 +- drivers/usb/serial/oti6858.c | 27 +- drivers/usb/serial/pl2303.c | 5 +- drivers/usb/serial/sierra.c | 3 +- drivers/usb/serial/spcp8x5.c | 26 +- drivers/usb/serial/symbolserial.c | 3 +- drivers/usb/serial/ti_usb_3410_5052.c | 6 +- drivers/usb/serial/usb-serial.c | 71 +- drivers/usb/serial/usb_debug.c | 5 +- drivers/usb/serial/visor.c | 6 +- drivers/usb/serial/whiteheat.c | 11 +- include/linux/cyclades.h | 11 +- include/linux/hayesesp.h | 1 - include/linux/kfifo.h | 4 +- include/linux/serial.h | 2 + include/linux/serial_8250.h | 1 + include/linux/serial_core.h | 93 +- include/linux/tty.h | 19 +- include/linux/usb/serial.h | 10 +- include/linux/vt.h | 32 +- include/linux/vt_kern.h | 16 +- kernel/kfifo.c | 2 +- kernel/power/console.c | 63 +- 116 files changed, 2413 insertions(+), 3363 deletions(-) Merging quilt/usb $ git merge quilt/usb Auto-merging Documentation/kernel-parameters.txt Auto-merging MAINTAINERS Auto-merging drivers/usb/Kconfig Auto-merging drivers/usb/gadget/Kconfig Auto-merging drivers/usb/host/Kconfig Auto-merging drivers/usb/host/ehci-pci.c Auto-merging drivers/usb/host/ehci.h Auto-merging drivers/usb/host/ohci-pxa27x.c Auto-merging drivers/usb/host/xhci.h Removing drivers/usb/mon/mon_dma.c Auto-merging include/linux/usb.h Merge made by recursive. Documentation/kernel-parameters.txt | 2 +- Documentation/usb/authorization.txt | 10 +- Documentation/usb/usbmon.txt | 8 +- Documentation/x86/earlyprintk.txt | 39 +- MAINTAINERS | 4 +- arch/x86/kernel/early_printk.c | 780 +--------- drivers/net/usb/cdc_eem.c | 17 +- drivers/usb/Kconfig | 3 + drivers/usb/Makefile | 2 + drivers/usb/class/usbtmc.c | 84 +- drivers/usb/core/devio.c | 247 +++- drivers/usb/core/driver.c | 75 +- drivers/usb/core/generic.c | 4 +- drivers/usb/core/hcd.c | 113 +- drivers/usb/core/hcd.h | 5 + drivers/usb/core/hub.c | 126 ++- drivers/usb/core/message.c | 32 +- drivers/usb/core/usb.c | 13 +- drivers/usb/core/usb.h | 7 + drivers/usb/early/Makefile | 5 + drivers/usb/early/ehci-dbgp.c | 996 ++++++++++++ drivers/usb/gadget/Kconfig | 31 +- drivers/usb/gadget/amd5536udc.c | 56 +- drivers/usb/gadget/at91_udc.c | 1 - drivers/usb/gadget/audio.c | 24 +- drivers/usb/gadget/composite.c | 2 +- drivers/usb/gadget/dummy_hcd.c | 5 - drivers/usb/gadget/ether.c | 31 +- drivers/usb/gadget/f_audio.c | 97 +- drivers/usb/gadget/f_eem.c | 562 +++++++ drivers/usb/gadget/f_rndis.c | 15 +- drivers/usb/gadget/fsl_qe_udc.c | 4 + drivers/usb/gadget/gmidi.c | 8 +- drivers/usb/gadget/pxa25x_udc.c | 49 +- drivers/usb/gadget/pxa25x_udc.h | 1 + drivers/usb/gadget/rndis.c | 13 +- drivers/usb/gadget/rndis.h | 3 +- drivers/usb/gadget/s3c-hsotg.c | 6 +- drivers/usb/gadget/s3c2410_udc.c | 3 +- drivers/usb/gadget/u_audio.c | 10 +- drivers/usb/gadget/u_ether.c | 85 +- drivers/usb/gadget/u_ether.h | 12 +- drivers/usb/gadget/u_serial.c | 1 - drivers/usb/host/Kconfig | 18 + drivers/usb/host/Makefile | 1 + drivers/usb/host/ehci-atmel.c | 230 +++ drivers/usb/host/ehci-au1xxx.c | 29 +- drivers/usb/host/ehci-dbg.c | 46 +- drivers/usb/host/ehci-hcd.c | 89 +- drivers/usb/host/ehci-hub.c | 84 +- drivers/usb/host/ehci-mem.c | 26 +- drivers/usb/host/ehci-pci.c | 42 +- drivers/usb/host/ehci-q.c | 95 +- drivers/usb/host/ehci-sched.c | 100 +- drivers/usb/host/ehci-w90x900.c | 181 +++ drivers/usb/host/ehci.h | 14 +- drivers/usb/host/isp1362-hcd.c | 2909 +++++++++++++++++++++++++++++++++++ drivers/usb/host/isp1362.h | 1079 +++++++++++++ drivers/usb/host/isp1760-hcd.c | 4 + drivers/usb/host/isp1760-hcd.h | 2 + drivers/usb/host/isp1760-if.c | 21 +- drivers/usb/host/ohci-at91.c | 2 +- drivers/usb/host/ohci-au1xxx.c | 27 +- drivers/usb/host/ohci-ep93xx.c | 1 - drivers/usb/host/ohci-hcd.c | 1 - drivers/usb/host/ohci-pxa27x.c | 4 + drivers/usb/host/oxu210hp-hcd.c | 1 - drivers/usb/host/uhci-q.c | 1 - drivers/usb/host/whci/asl.c | 12 +- drivers/usb/host/whci/hcd.c | 8 +- drivers/usb/host/whci/pzl.c | 12 +- drivers/usb/host/whci/qset.c | 4 +- drivers/usb/host/whci/whci-hc.h | 1 + drivers/usb/host/xhci-hcd.c | 232 +++- drivers/usb/host/xhci-mem.c | 88 +- drivers/usb/host/xhci-pci.c | 3 + drivers/usb/host/xhci-ring.c | 173 ++- drivers/usb/host/xhci.h | 80 +- drivers/usb/image/microtek.c | 37 - drivers/usb/misc/idmouse.c | 21 + drivers/usb/misc/ldusb.c | 6 + drivers/usb/misc/legousbtower.c | 6 + drivers/usb/misc/sisusbvga/sisusb.c | 53 +- drivers/usb/misc/sisusbvga/sisusb.h | 2 - drivers/usb/misc/usbsevseg.c | 69 +- drivers/usb/mon/Kconfig | 4 +- drivers/usb/mon/Makefile | 2 +- drivers/usb/mon/mon_bin.c | 12 +- drivers/usb/mon/mon_dma.c | 95 -- drivers/usb/mon/mon_main.c | 1 - drivers/usb/mon/mon_text.c | 14 - drivers/usb/mon/usb_mon.h | 14 - drivers/usb/musb/musb_core.c | 8 +- drivers/usb/otg/isp1301_omap.c | 23 +- drivers/usb/serial/ark3116.c | 24 +- drivers/usb/serial/ch341.c | 52 + drivers/usb/serial/generic.c | 206 ++- drivers/usb/serial/iuu_phoenix.c | 115 ++- drivers/usb/serial/moto_modem.c | 2 +- drivers/usb/serial/option.c | 134 ++- drivers/usb/serial/pl2303.c | 70 +- drivers/usb/serial/sierra.c | 157 ++- drivers/usb/serial/usb-serial.c | 23 +- drivers/usb/storage/datafab.c | 4 +- drivers/usb/storage/initializers.c | 2 +- drivers/usb/storage/jumpshot.c | 2 +- drivers/usb/storage/unusual_devs.h | 22 +- drivers/usb/usb-skeleton.c | 252 +++- include/linux/usb.h | 25 +- include/linux/usb/audio.h | 287 ++-- include/linux/usb/ch9.h | 8 + include/linux/usb/ehci_def.h | 35 + include/linux/usb/isp1362.h | 46 + include/linux/usb/isp1760.h | 18 + include/linux/usb/serial.h | 2 + include/linux/usbdevice_fs.h | 3 + 116 files changed, 8985 insertions(+), 2082 deletions(-) create mode 100644 drivers/usb/early/Makefile create mode 100644 drivers/usb/early/ehci-dbgp.c create mode 100644 drivers/usb/gadget/f_eem.c create mode 100644 drivers/usb/host/ehci-atmel.c create mode 100644 drivers/usb/host/ehci-w90x900.c create mode 100644 drivers/usb/host/isp1362-hcd.c create mode 100644 drivers/usb/host/isp1362.h delete mode 100644 drivers/usb/mon/mon_dma.c create mode 100644 include/linux/usb/isp1362.h create mode 100644 include/linux/usb/isp1760.h Merging quilt/staging $ git merge quilt/staging Auto-merging drivers/staging/Kconfig Auto-merging drivers/staging/Makefile Removing drivers/staging/android/lowmemorykiller.txt Removing drivers/staging/at76_usb/Kconfig Removing drivers/staging/at76_usb/Makefile Removing drivers/staging/at76_usb/TODO Removing drivers/staging/at76_usb/at76_usb.c Removing drivers/staging/at76_usb/at76_usb.h Removing drivers/staging/echo/bit_operations.h Removing drivers/staging/echo/mmx.h Removing drivers/staging/epl/Benchmark.h Removing drivers/staging/epl/Debug.h Removing drivers/staging/epl/Edrv8139.c Removing drivers/staging/epl/EdrvFec.h Removing drivers/staging/epl/EdrvSim.h Removing drivers/staging/epl/Epl.h Removing drivers/staging/epl/EplAmi.h Removing drivers/staging/epl/EplApiGeneric.c Removing drivers/staging/epl/EplApiLinux.h Removing drivers/staging/epl/EplApiLinuxKernel.c Removing drivers/staging/epl/EplApiProcessImage.c Removing drivers/staging/epl/EplCfg.h Removing drivers/staging/epl/EplDef.h Removing drivers/staging/epl/EplDll.h Removing drivers/staging/epl/EplDllCal.h Removing drivers/staging/epl/EplDllk.c Removing drivers/staging/epl/EplDllkCal.c Removing drivers/staging/epl/EplDlluCal.c Removing drivers/staging/epl/EplErrDef.h Removing drivers/staging/epl/EplErrorHandlerk.c Removing drivers/staging/epl/EplEvent.h Removing drivers/staging/epl/EplEventk.c Removing drivers/staging/epl/EplEventu.c Removing drivers/staging/epl/EplFrame.h Removing drivers/staging/epl/EplIdentu.c Removing drivers/staging/epl/EplInc.h Removing drivers/staging/epl/EplInstDef.h Removing drivers/staging/epl/EplLed.h Removing drivers/staging/epl/EplNmt.h Removing drivers/staging/epl/EplNmtCnu.c Removing drivers/staging/epl/EplNmtMnu.c Removing drivers/staging/epl/EplNmtk.c Removing drivers/staging/epl/EplNmtkCal.c Removing drivers/staging/epl/EplNmtu.c Removing drivers/staging/epl/EplNmtuCal.c Removing drivers/staging/epl/EplObd.c Removing drivers/staging/epl/EplObd.h Removing drivers/staging/epl/EplObdMacro.h Removing drivers/staging/epl/EplObdkCal.c Removing drivers/staging/epl/EplObdu.c Removing drivers/staging/epl/EplObduCal.c Removing drivers/staging/epl/EplPdo.h Removing drivers/staging/epl/EplPdok.c Removing drivers/staging/epl/EplPdokCal.c Removing drivers/staging/epl/EplPdou.c Removing drivers/staging/epl/EplSdo.h Removing drivers/staging/epl/EplSdoAc.h Removing drivers/staging/epl/EplSdoAsndu.c Removing drivers/staging/epl/EplSdoAsySequ.c Removing drivers/staging/epl/EplSdoComu.c Removing drivers/staging/epl/EplSdoUdpu.c Removing drivers/staging/epl/EplStatusu.c Removing drivers/staging/epl/EplTarget.h Removing drivers/staging/epl/EplTimer.h Removing drivers/staging/epl/EplTimeruLinuxKernel.c Removing drivers/staging/epl/EplVersion.h Removing drivers/staging/epl/Kconfig Removing drivers/staging/epl/Makefile Removing drivers/staging/epl/SharedBuff.c Removing drivers/staging/epl/SharedBuff.h Removing drivers/staging/epl/ShbIpc-LinuxKernel.c Removing drivers/staging/epl/ShbIpc.h Removing drivers/staging/epl/ShbLinuxKernel.h Removing drivers/staging/epl/SocketLinuxKernel.c Removing drivers/staging/epl/SocketLinuxKernel.h Removing drivers/staging/epl/TimerHighReskX86.c Removing drivers/staging/epl/VirtualEthernetLinux.c Removing drivers/staging/epl/amix86.c Removing drivers/staging/epl/demo_main.c Removing drivers/staging/epl/edrv.h Removing drivers/staging/epl/global.h Removing drivers/staging/epl/kernel/EplDllk.h Removing drivers/staging/epl/kernel/EplDllkCal.h Removing drivers/staging/epl/kernel/EplErrorHandlerk.h Removing drivers/staging/epl/kernel/EplEventk.h Removing drivers/staging/epl/kernel/EplNmtk.h Removing drivers/staging/epl/kernel/EplObdk.h Removing drivers/staging/epl/kernel/EplPdok.h Removing drivers/staging/epl/kernel/EplPdokCal.h Removing drivers/staging/epl/kernel/EplTimerHighResk.h Removing drivers/staging/epl/kernel/EplTimerk.h Removing drivers/staging/epl/kernel/VirtualEthernet.h Removing drivers/staging/epl/proc_fs.c Removing drivers/staging/epl/proc_fs.h Removing drivers/staging/epl/user/EplCfgMau.h Removing drivers/staging/epl/user/EplDllu.h Removing drivers/staging/epl/user/EplDlluCal.h Removing drivers/staging/epl/user/EplEventu.h Removing drivers/staging/epl/user/EplIdentu.h Removing drivers/staging/epl/user/EplLedu.h Removing drivers/staging/epl/user/EplNmtCnu.h Removing drivers/staging/epl/user/EplNmtMnu.h Removing drivers/staging/epl/user/EplNmtu.h Removing drivers/staging/epl/user/EplNmtuCal.h Removing drivers/staging/epl/user/EplObdu.h Removing drivers/staging/epl/user/EplObduCal.h Removing drivers/staging/epl/user/EplPdou.h Removing drivers/staging/epl/user/EplSdoAsndu.h Removing drivers/staging/epl/user/EplSdoAsySequ.h Removing drivers/staging/epl/user/EplSdoComu.h Removing drivers/staging/epl/user/EplSdoUdpu.h Removing drivers/staging/epl/user/EplStatusu.h Removing drivers/staging/epl/user/EplTimeru.h Removing drivers/staging/et131x/et1310_jagcore.c Removing drivers/staging/et131x/et131x_config.c Removing drivers/staging/et131x/et131x_debug.c Removing drivers/staging/et131x/et131x_debug.h Removing drivers/staging/heci/Kconfig Removing drivers/staging/heci/Makefile Removing drivers/staging/heci/TODO Removing drivers/staging/heci/heci.h Removing drivers/staging/heci/heci_data_structures.h Removing drivers/staging/heci/heci_init.c Removing drivers/staging/heci/heci_interface.c Removing drivers/staging/heci/heci_interface.h Removing drivers/staging/heci/heci_main.c Removing drivers/staging/heci/heci_version.h Removing drivers/staging/heci/interrupt.c Removing drivers/staging/heci/io_heci.c Removing drivers/staging/me4000/Kconfig Removing drivers/staging/me4000/Makefile Removing drivers/staging/me4000/README Removing drivers/staging/me4000/me4000.c Removing drivers/staging/me4000/me4000.h Removing drivers/staging/me4000/me4000_firmware.h Removing drivers/staging/me4000/me4610_firmware.h Removing drivers/staging/meilhaus/Kconfig Removing drivers/staging/meilhaus/Makefile Removing drivers/staging/meilhaus/TODO Removing drivers/staging/meilhaus/me0600_device.c Removing drivers/staging/meilhaus/me0600_device.h Removing drivers/staging/meilhaus/me0600_dio.c Removing drivers/staging/meilhaus/me0600_dio.h Removing drivers/staging/meilhaus/me0600_dio_reg.h Removing drivers/staging/meilhaus/me0600_ext_irq.c Removing drivers/staging/meilhaus/me0600_ext_irq.h Removing drivers/staging/meilhaus/me0600_ext_irq_reg.h Removing drivers/staging/meilhaus/me0600_optoi.c Removing drivers/staging/meilhaus/me0600_optoi.h Removing drivers/staging/meilhaus/me0600_optoi_reg.h Removing drivers/staging/meilhaus/me0600_relay.c Removing drivers/staging/meilhaus/me0600_relay.h Removing drivers/staging/meilhaus/me0600_relay_reg.h Removing drivers/staging/meilhaus/me0600_ttli.c Removing drivers/staging/meilhaus/me0600_ttli.h Removing drivers/staging/meilhaus/me0600_ttli_reg.h Removing drivers/staging/meilhaus/me0900_device.c Removing drivers/staging/meilhaus/me0900_device.h Removing drivers/staging/meilhaus/me0900_di.c Removing drivers/staging/meilhaus/me0900_di.h Removing drivers/staging/meilhaus/me0900_do.c Removing drivers/staging/meilhaus/me0900_do.h Removing drivers/staging/meilhaus/me0900_reg.h Removing drivers/staging/meilhaus/me1000_device.c Removing drivers/staging/meilhaus/me1000_device.h Removing drivers/staging/meilhaus/me1000_dio.c Removing drivers/staging/meilhaus/me1000_dio.h Removing drivers/staging/meilhaus/me1000_dio_reg.h Removing drivers/staging/meilhaus/me1400_device.c Removing drivers/staging/meilhaus/me1400_device.h Removing drivers/staging/meilhaus/me1400_ext_irq.c Removing drivers/staging/meilhaus/me1400_ext_irq.h Removing drivers/staging/meilhaus/me1400_ext_irq_reg.h Removing drivers/staging/meilhaus/me1600_ao.c Removing drivers/staging/meilhaus/me1600_ao.h Removing drivers/staging/meilhaus/me1600_ao_reg.h Removing drivers/staging/meilhaus/me1600_device.c Removing drivers/staging/meilhaus/me1600_device.h Removing drivers/staging/meilhaus/me4600_ai.c Removing drivers/staging/meilhaus/me4600_ai.h Removing drivers/staging/meilhaus/me4600_ai_reg.h Removing drivers/staging/meilhaus/me4600_ao.c Removing drivers/staging/meilhaus/me4600_ao.h Removing drivers/staging/meilhaus/me4600_ao_reg.h Removing drivers/staging/meilhaus/me4600_device.c Removing drivers/staging/meilhaus/me4600_device.h Removing drivers/staging/meilhaus/me4600_di.c Removing drivers/staging/meilhaus/me4600_di.h Removing drivers/staging/meilhaus/me4600_dio.c Removing drivers/staging/meilhaus/me4600_dio.h Removing drivers/staging/meilhaus/me4600_dio_reg.h Removing drivers/staging/meilhaus/me4600_do.c Removing drivers/staging/meilhaus/me4600_do.h Removing drivers/staging/meilhaus/me4600_ext_irq.c Removing drivers/staging/meilhaus/me4600_ext_irq.h Removing drivers/staging/meilhaus/me4600_ext_irq_reg.h Removing drivers/staging/meilhaus/me4600_reg.h Removing drivers/staging/meilhaus/me6000_ao.c Removing drivers/staging/meilhaus/me6000_ao.h Removing drivers/staging/meilhaus/me6000_ao_reg.h Removing drivers/staging/meilhaus/me6000_device.c Removing drivers/staging/meilhaus/me6000_device.h Removing drivers/staging/meilhaus/me6000_dio.c Removing drivers/staging/meilhaus/me6000_dio.h Removing drivers/staging/meilhaus/me6000_dio_reg.h Removing drivers/staging/meilhaus/me6000_reg.h Removing drivers/staging/meilhaus/me8100_device.c Removing drivers/staging/meilhaus/me8100_device.h Removing drivers/staging/meilhaus/me8100_di.c Removing drivers/staging/meilhaus/me8100_di.h Removing drivers/staging/meilhaus/me8100_di_reg.h Removing drivers/staging/meilhaus/me8100_do.c Removing drivers/staging/meilhaus/me8100_do.h Removing drivers/staging/meilhaus/me8100_do_reg.h Removing drivers/staging/meilhaus/me8100_reg.h Removing drivers/staging/meilhaus/me8200_device.c Removing drivers/staging/meilhaus/me8200_device.h Removing drivers/staging/meilhaus/me8200_di.c Removing drivers/staging/meilhaus/me8200_di.h Removing drivers/staging/meilhaus/me8200_di_reg.h Removing drivers/staging/meilhaus/me8200_dio.c Removing drivers/staging/meilhaus/me8200_dio.h Removing drivers/staging/meilhaus/me8200_dio_reg.h Removing drivers/staging/meilhaus/me8200_do.c Removing drivers/staging/meilhaus/me8200_do.h Removing drivers/staging/meilhaus/me8200_do_reg.h Removing drivers/staging/meilhaus/me8200_reg.h Removing drivers/staging/meilhaus/me8254.c Removing drivers/staging/meilhaus/me8254.h Removing drivers/staging/meilhaus/me8254_reg.h Removing drivers/staging/meilhaus/me8255.c Removing drivers/staging/meilhaus/me8255.h Removing drivers/staging/meilhaus/me8255_reg.h Removing drivers/staging/meilhaus/mecirc_buf.h Removing drivers/staging/meilhaus/mecommon.h Removing drivers/staging/meilhaus/medebug.h Removing drivers/staging/meilhaus/medefines.h Removing drivers/staging/meilhaus/medevice.c Removing drivers/staging/meilhaus/medevice.h Removing drivers/staging/meilhaus/medlist.c Removing drivers/staging/meilhaus/medlist.h Removing drivers/staging/meilhaus/medlock.c Removing drivers/staging/meilhaus/medlock.h Removing drivers/staging/meilhaus/medriver.h Removing drivers/staging/meilhaus/medummy.c Removing drivers/staging/meilhaus/medummy.h Removing drivers/staging/meilhaus/meerror.h Removing drivers/staging/meilhaus/mefirmware.c Removing drivers/staging/meilhaus/mefirmware.h Removing drivers/staging/meilhaus/meids.h Removing drivers/staging/meilhaus/meinternal.h Removing drivers/staging/meilhaus/meioctl.h Removing drivers/staging/meilhaus/memain.c Removing drivers/staging/meilhaus/memain.h Removing drivers/staging/meilhaus/meplx_reg.h Removing drivers/staging/meilhaus/meslist.c Removing drivers/staging/meilhaus/meslist.h Removing drivers/staging/meilhaus/meslock.c Removing drivers/staging/meilhaus/meslock.h Removing drivers/staging/meilhaus/mesubdevice.c Removing drivers/staging/meilhaus/mesubdevice.h Removing drivers/staging/meilhaus/metempl_device.c Removing drivers/staging/meilhaus/metempl_device.h Removing drivers/staging/meilhaus/metempl_sub.c Removing drivers/staging/meilhaus/metempl_sub.h Removing drivers/staging/meilhaus/metempl_sub_reg.h Removing drivers/staging/meilhaus/metypes.h Removing drivers/staging/pata_rdc/Kconfig Removing drivers/staging/pata_rdc/Makefile Removing drivers/staging/pata_rdc/pata_rdc.c Removing drivers/staging/pata_rdc/pata_rdc.h Removing drivers/staging/rspiusb/Kconfig Removing drivers/staging/rspiusb/Makefile Removing drivers/staging/rspiusb/TODO Removing drivers/staging/rspiusb/rspiusb.c Removing drivers/staging/rspiusb/rspiusb.h Auto-merging drivers/staging/rt2860/rtmp.h Removing drivers/staging/rt2870/common/firmware.h Removing drivers/staging/rt2870/link_list.h Removing drivers/staging/rt3070/2870_main_dev.c Removing drivers/staging/rt3070/Kconfig Removing drivers/staging/rt3070/Makefile Removing drivers/staging/rt3070/action.h Removing drivers/staging/rt3070/aironet.h Removing drivers/staging/rt3070/ap.h Removing drivers/staging/rt3070/chlist.h Removing drivers/staging/rt3070/common/2870_rtmp_init.c Removing drivers/staging/rt3070/common/action.c Removing drivers/staging/rt3070/common/ba_action.c Removing drivers/staging/rt3070/common/cmm_data.c Removing drivers/staging/rt3070/common/cmm_data_2870.c Removing drivers/staging/rt3070/common/cmm_info.c Removing drivers/staging/rt3070/common/cmm_sanity.c Removing drivers/staging/rt3070/common/cmm_sync.c Removing drivers/staging/rt3070/common/cmm_wpa.c Removing drivers/staging/rt3070/common/dfs.c Removing drivers/staging/rt3070/common/eeprom.c Removing drivers/staging/rt3070/common/md5.c Removing drivers/staging/rt3070/common/mlme.c Removing drivers/staging/rt3070/common/rtmp_init.c Removing drivers/staging/rt3070/common/rtmp_tkip.c Removing drivers/staging/rt3070/common/rtmp_wep.c Removing drivers/staging/rt3070/common/rtusb_bulk.c Removing drivers/staging/rt3070/common/rtusb_data.c Removing drivers/staging/rt3070/common/rtusb_io.c Removing drivers/staging/rt3070/common/spectrum.c Removing drivers/staging/rt3070/dfs.h Removing drivers/staging/rt3070/link_list.h Removing drivers/staging/rt3070/md5.h Removing drivers/staging/rt3070/mlme.h Removing drivers/staging/rt3070/oid.h Removing drivers/staging/rt3070/rt2870.h Removing drivers/staging/rt3070/rt28xx.h Removing drivers/staging/rt3070/rt_config.h Removing drivers/staging/rt3070/rt_linux.c Removing drivers/staging/rt3070/rt_linux.h Removing drivers/staging/rt3070/rt_main_dev.c Removing drivers/staging/rt3070/rt_profile.c Removing drivers/staging/rt3070/rtmp.h Removing drivers/staging/rt3070/rtmp_ckipmic.h Removing drivers/staging/rt3070/rtmp_def.h Removing drivers/staging/rt3070/rtmp_type.h Removing drivers/staging/rt3070/spectrum.h Removing drivers/staging/rt3070/spectrum_def.h Removing drivers/staging/rt3070/sta/aironet.c Removing drivers/staging/rt3070/sta/assoc.c Removing drivers/staging/rt3070/sta/auth.c Removing drivers/staging/rt3070/sta/auth_rsp.c Removing drivers/staging/rt3070/sta/connect.c Removing drivers/staging/rt3070/sta/rtmp_data.c Removing drivers/staging/rt3070/sta/sanity.c Removing drivers/staging/rt3070/sta/sync.c Removing drivers/staging/rt3070/sta/wpa.c Removing drivers/staging/rt3070/sta_ioctl.c Removing drivers/staging/rt3070/wpa.h Removing drivers/staging/rtl8187se/dot11d.h Removing drivers/staging/rtl8187se/ieee80211.h Removing drivers/staging/rtl8187se/ieee80211/internal.h Removing drivers/staging/rtl8187se/ieee80211/rtl_crypto.h Removing drivers/staging/rtl8187se/r8180_gct.c Removing drivers/staging/rtl8187se/r8180_max2820.c Removing drivers/staging/rtl8187se/r8180_max2820.h Removing drivers/staging/rtl8187se/r8180_pm.c Removing drivers/staging/rtl8187se/r8180_rtl8225.c Removing drivers/staging/rtl8187se/r8180_rtl8255.c Removing drivers/staging/rtl8187se/r8180_rtl8255.h Removing drivers/staging/rtl8187se/r8180_sa2400.c Removing drivers/staging/rtl8187se/r8180_sa2400.h Removing drivers/staging/rtl8192su/ieee80211/EndianFree.h Removing drivers/staging/rtl8192su/ieee80211/aes.c Removing drivers/staging/rtl8192su/ieee80211/api.c Removing drivers/staging/rtl8192su/ieee80211/arc4.c Removing drivers/staging/rtl8192su/ieee80211/autoload.c Removing drivers/staging/rtl8192su/ieee80211/cipher.c Removing drivers/staging/rtl8192su/ieee80211/compress.c Removing drivers/staging/rtl8192su/ieee80211/crypto_compat.h Removing drivers/staging/rtl8192su/ieee80211/digest.c Removing drivers/staging/rtl8192su/ieee80211/internal.h Removing drivers/staging/rtl8192su/ieee80211/kmap_types.h Removing drivers/staging/rtl8192su/ieee80211/michael_mic.c Removing drivers/staging/rtl8192su/ieee80211/proc.c Removing drivers/staging/rtl8192su/ieee80211/scatterwalk.c Removing drivers/staging/rtl8192su/ieee80211/scatterwalk.h Removing drivers/staging/rtl8192su/r8190_rtl8256.c Removing drivers/staging/rtl8192su/r8192S_FwImgDTM.h Removing drivers/staging/rtl8192su/r819xU_firmware.c Removing drivers/staging/rtl8192su/r819xU_firmware.h Removing drivers/staging/rtl8192su/r819xU_firmware_img.c Removing drivers/staging/rtl8192su/r819xU_firmware_img.h Removing drivers/staging/sxg/Kconfig Removing drivers/staging/sxg/Makefile Removing drivers/staging/sxg/README Removing drivers/staging/sxg/sxg.c Removing drivers/staging/sxg/sxg.h Removing drivers/staging/sxg/sxg_ethtool.c Removing drivers/staging/sxg/sxg_os.h Removing drivers/staging/sxg/sxgdbg.h Removing drivers/staging/sxg/sxghif.h Removing drivers/staging/sxg/sxghw.h Removing drivers/staging/sxg/sxgphycode-1.2.h Removing drivers/staging/vt6655/Makefile.arm Removing drivers/staging/vt6655/Makefile.x86 Removing drivers/staging/vt6655/tpci.h Merge made by recursive. drivers/staging/Kconfig | 36 +- drivers/staging/Makefile | 20 +- drivers/staging/agnx/pci.c | 2 +- drivers/staging/altpciechdma/altpciechdma.c | 2 +- drivers/staging/android/binder.c | 713 +- drivers/staging/android/lowmemorykiller.c | 41 +- drivers/staging/android/lowmemorykiller.txt | 16 - drivers/staging/asus_oled/asus_oled.c | 404 +- drivers/staging/at76_usb/Kconfig | 8 - drivers/staging/at76_usb/Makefile | 1 - drivers/staging/at76_usb/TODO | 7 - drivers/staging/at76_usb/at76_usb.c | 5579 ----------- drivers/staging/at76_usb/at76_usb.h | 706 -- drivers/staging/b3dfg/b3dfg.c | 41 +- drivers/staging/comedi/comedi.h | 1002 +- drivers/staging/comedi/comedi_compat32.c | 115 +- drivers/staging/comedi/comedi_compat32.h | 4 +- drivers/staging/comedi/comedi_fops.c | 278 +- drivers/staging/comedi/comedi_ksyms.c | 3 - drivers/staging/comedi/comedidev.h | 85 +- drivers/staging/comedi/comedilib.h | 77 +- drivers/staging/comedi/drivers.c | 184 +- drivers/staging/comedi/drivers/8253.h | 69 +- drivers/staging/comedi/drivers/8255.c | 54 +- drivers/staging/comedi/drivers/8255.h | 16 +- drivers/staging/comedi/drivers/acl7225b.c | 22 +- .../comedi/drivers/addi-data/addi_amcc_s5933.h | 3 + .../comedi/drivers/addi-data/amcc_s5933_58.h | 3 + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +- drivers/staging/comedi/drivers/adl_pci6208.c | 93 +- drivers/staging/comedi/drivers/adl_pci7296.c | 39 +- drivers/staging/comedi/drivers/adl_pci7432.c | 57 +- drivers/staging/comedi/drivers/adl_pci8164.c | 126 +- drivers/staging/comedi/drivers/adl_pci9111.c | 361 +- drivers/staging/comedi/drivers/adl_pci9118.c | 532 +- drivers/staging/comedi/drivers/adq12b.c | 371 +- drivers/staging/comedi/drivers/adv_pci1710.c | 417 +- drivers/staging/comedi/drivers/adv_pci1723.c | 73 +- drivers/staging/comedi/drivers/adv_pci_dio.c | 306 +- drivers/staging/comedi/drivers/aio_aio12_8.c | 36 +- drivers/staging/comedi/drivers/aio_iiro_16.c | 30 +- drivers/staging/comedi/drivers/amplc_dio200.c | 314 +- drivers/staging/comedi/drivers/amplc_pc236.c | 118 +- drivers/staging/comedi/drivers/amplc_pc263.c | 101 +- drivers/staging/comedi/drivers/amplc_pci224.c | 260 +- drivers/staging/comedi/drivers/amplc_pci230.c | 497 +- drivers/staging/comedi/drivers/c6xdigio.c | 42 +- drivers/staging/comedi/drivers/cb_das16_cs.c | 168 +- drivers/staging/comedi/drivers/cb_pcidas.c | 671 +- drivers/staging/comedi/drivers/cb_pcidas64.c | 1788 ++-- drivers/staging/comedi/drivers/cb_pcidda.c | 218 +- drivers/staging/comedi/drivers/cb_pcidio.c | 74 +- drivers/staging/comedi/drivers/cb_pcimdas.c | 89 +- drivers/staging/comedi/drivers/cb_pcimdda.c | 61 +- drivers/staging/comedi/drivers/comedi_bond.c | 56 +- drivers/staging/comedi/drivers/comedi_fc.c | 14 +- drivers/staging/comedi/drivers/comedi_fc.h | 4 +- drivers/staging/comedi/drivers/comedi_parport.c | 29 +- drivers/staging/comedi/drivers/comedi_test.c | 143 +- drivers/staging/comedi/drivers/contec_pci_dio.c | 48 +- drivers/staging/comedi/drivers/daqboard2000.c | 119 +- drivers/staging/comedi/drivers/das08.c | 622 +- drivers/staging/comedi/drivers/das08.h | 3 +- drivers/staging/comedi/drivers/das08_cs.c | 25 +- drivers/staging/comedi/drivers/das16.c | 828 +- drivers/staging/comedi/drivers/das16m1.c | 132 +- drivers/staging/comedi/drivers/das1800.c | 658 +- drivers/staging/comedi/drivers/das6402.c | 23 +- drivers/staging/comedi/drivers/das800.c | 224 +- drivers/staging/comedi/drivers/dmm32at.c | 144 +- drivers/staging/comedi/drivers/dt2801.c | 242 +- drivers/staging/comedi/drivers/dt2811.c | 178 +- drivers/staging/comedi/drivers/dt2814.c | 16 +- drivers/staging/comedi/drivers/dt2815.c | 38 +- drivers/staging/comedi/drivers/dt2817.c | 19 +- drivers/staging/comedi/drivers/dt282x.c | 264 +- drivers/staging/comedi/drivers/dt3000.c | 145 +- drivers/staging/comedi/drivers/dt9812.c | 85 +- drivers/staging/comedi/drivers/fl512.c | 37 +- drivers/staging/comedi/drivers/gsc_hpdi.c | 236 +- drivers/staging/comedi/drivers/icp_multi.c | 198 +- drivers/staging/comedi/drivers/icp_multi.h | 74 +- drivers/staging/comedi/drivers/ii_pci20kc.c | 127 +- drivers/staging/comedi/drivers/jr3_pci.c | 298 +- drivers/staging/comedi/drivers/jr3_pci.h | 40 +- drivers/staging/comedi/drivers/ke_counter.c | 67 +- drivers/staging/comedi/drivers/me4000.c | 881 +- drivers/staging/comedi/drivers/me_daq.c | 218 +- drivers/staging/comedi/drivers/mite.c | 138 +- drivers/staging/comedi/drivers/mite.h | 144 +- drivers/staging/comedi/drivers/mpc624.c | 48 +- drivers/staging/comedi/drivers/mpc8260cpm.c | 26 +- drivers/staging/comedi/drivers/multiq3.c | 45 +- drivers/staging/comedi/drivers/ni_6527.c | 109 +- drivers/staging/comedi/drivers/ni_65xx.c | 402 +- drivers/staging/comedi/drivers/ni_660x.c | 293 +- drivers/staging/comedi/drivers/ni_670x.c | 101 +- drivers/staging/comedi/drivers/ni_at_a2150.c | 93 +- drivers/staging/comedi/drivers/ni_at_ao.c | 69 +- drivers/staging/comedi/drivers/ni_atmio.c | 318 +- drivers/staging/comedi/drivers/ni_atmio16d.c | 128 +- drivers/staging/comedi/drivers/ni_daq_700.c | 80 +- drivers/staging/comedi/drivers/ni_daq_dio24.c | 43 +- drivers/staging/comedi/drivers/ni_labpc.c | 452 +- drivers/staging/comedi/drivers/ni_labpc.h | 5 +- drivers/staging/comedi/drivers/ni_labpc_cs.c | 70 +- drivers/staging/comedi/drivers/ni_mio_common.c | 1662 ++-- drivers/staging/comedi/drivers/ni_mio_cs.c | 36 +- drivers/staging/comedi/drivers/ni_pcidio.c | 343 +- drivers/staging/comedi/drivers/ni_pcimio.c | 2065 ++-- drivers/staging/comedi/drivers/ni_stc.h | 64 +- drivers/staging/comedi/drivers/ni_tio.c | 475 +- drivers/staging/comedi/drivers/ni_tio.h | 47 +- drivers/staging/comedi/drivers/ni_tio_internal.h | 58 +- drivers/staging/comedi/drivers/ni_tiocmd.c | 105 +- drivers/staging/comedi/drivers/pcl711.c | 107 +- drivers/staging/comedi/drivers/pcl724.c | 33 +- drivers/staging/comedi/drivers/pcl725.c | 7 +- drivers/staging/comedi/drivers/pcl726.c | 59 +- drivers/staging/comedi/drivers/pcl730.c | 16 +- drivers/staging/comedi/drivers/pcl812.c | 480 +- drivers/staging/comedi/drivers/pcl816.c | 220 +- drivers/staging/comedi/drivers/pcl818.c | 338 +- drivers/staging/comedi/drivers/pcm3724.c | 28 +- drivers/staging/comedi/drivers/pcm3730.c | 16 +- drivers/staging/comedi/drivers/pcmad.c | 19 +- drivers/staging/comedi/drivers/pcmda12.c | 25 +- drivers/staging/comedi/drivers/pcmmio.c | 287 +- drivers/staging/comedi/drivers/pcmuio.c | 228 +- drivers/staging/comedi/drivers/plx9080.h | 8 +- drivers/staging/comedi/drivers/poc.c | 104 +- drivers/staging/comedi/drivers/quatech_daqp_cs.c | 115 +- drivers/staging/comedi/drivers/rtd520.c | 487 +- drivers/staging/comedi/drivers/rti800.c | 83 +- drivers/staging/comedi/drivers/rti802.c | 21 +- drivers/staging/comedi/drivers/s526.c | 203 +- drivers/staging/comedi/drivers/s626.c | 1019 ++- drivers/staging/comedi/drivers/s626.h | 16 +- drivers/staging/comedi/drivers/serial2002.c | 201 +- drivers/staging/comedi/drivers/skel.c | 82 +- drivers/staging/comedi/drivers/ssv_dnp.c | 40 +- drivers/staging/comedi/drivers/unioxx5.c | 106 +- drivers/staging/comedi/drivers/usbdux.c | 268 +- drivers/staging/comedi/drivers/usbduxfast.c | 459 +- drivers/staging/comedi/drivers/vmk80xx.c | 135 +- drivers/staging/comedi/kcomedilib/data.c | 12 +- drivers/staging/comedi/kcomedilib/dio.c | 8 +- drivers/staging/comedi/kcomedilib/get.c | 55 +- .../staging/comedi/kcomedilib/kcomedilib_main.c | 35 +- drivers/staging/comedi/kcomedilib/ksyms.c | 4 - drivers/staging/comedi/proc.c | 23 +- drivers/staging/comedi/range.c | 21 +- drivers/staging/cowloop/Kconfig | 16 + drivers/staging/cowloop/Makefile | 1 + drivers/staging/cowloop/TODO | 11 + drivers/staging/cowloop/cowloop.c | 2842 ++++++ drivers/staging/cowloop/cowloop.h | 66 + drivers/staging/cpc-usb/TODO | 1 + drivers/staging/cpc-usb/cpc-usb_drv.c | 1 - drivers/staging/cpc-usb/cpc.h | 519 +- drivers/staging/cpc-usb/cpc_int.h | 8 +- drivers/staging/cpc-usb/cpcusb.h | 2 +- drivers/staging/dream/Kconfig | 12 + drivers/staging/dream/Makefile | 4 + drivers/staging/dream/camera/Kconfig | 46 + drivers/staging/dream/camera/Makefile | 7 + drivers/staging/dream/camera/msm_camera.c | 2181 +++++ drivers/staging/dream/camera/msm_io7x.c | 291 + drivers/staging/dream/camera/msm_io8x.c | 320 + drivers/staging/dream/camera/msm_v4l2.c | 797 ++ drivers/staging/dream/camera/msm_vfe7x.c | 701 ++ drivers/staging/dream/camera/msm_vfe7x.h | 255 + drivers/staging/dream/camera/msm_vfe8x.c | 756 ++ drivers/staging/dream/camera/msm_vfe8x.h | 895 ++ drivers/staging/dream/camera/msm_vfe8x_proc.c | 4003 ++++++++ drivers/staging/dream/camera/msm_vfe8x_proc.h | 1549 +++ drivers/staging/dream/camera/mt9d112.c | 761 ++ drivers/staging/dream/camera/mt9d112.h | 36 + drivers/staging/dream/camera/mt9d112_reg.c | 307 + drivers/staging/dream/camera/mt9p012.h | 51 + drivers/staging/dream/camera/mt9p012_fox.c | 1305 +++ drivers/staging/dream/camera/mt9p012_reg.c | 573 ++ drivers/staging/dream/camera/mt9t013.c | 1496 +++ drivers/staging/dream/camera/mt9t013.h | 48 + drivers/staging/dream/camera/mt9t013_reg.c | 266 + drivers/staging/dream/camera/s5k3e2fx.c | 1310 +++ drivers/staging/dream/camera/s5k3e2fx.h | 9 + drivers/staging/dream/gpio_axis.c | 180 + drivers/staging/dream/gpio_event.c | 223 + drivers/staging/dream/gpio_input.c | 336 + drivers/staging/dream/gpio_matrix.c | 398 + drivers/staging/dream/gpio_output.c | 84 + drivers/staging/dream/qdsp5/Makefile | 17 + drivers/staging/dream/qdsp5/adsp.c | 1163 +++ drivers/staging/dream/qdsp5/adsp.h | 369 + drivers/staging/dream/qdsp5/adsp_6210.c | 283 + drivers/staging/dream/qdsp5/adsp_6220.c | 284 + drivers/staging/dream/qdsp5/adsp_6225.c | 328 + drivers/staging/dream/qdsp5/adsp_driver.c | 641 ++ drivers/staging/dream/qdsp5/adsp_info.c | 121 + .../staging/dream/qdsp5/adsp_jpeg_patch_event.c | 31 + drivers/staging/dream/qdsp5/adsp_jpeg_verify_cmd.c | 182 + drivers/staging/dream/qdsp5/adsp_lpm_verify_cmd.c | 65 + drivers/staging/dream/qdsp5/adsp_vfe_patch_event.c | 54 + drivers/staging/dream/qdsp5/adsp_vfe_verify_cmd.c | 239 + .../staging/dream/qdsp5/adsp_video_verify_cmd.c | 163 + .../staging/dream/qdsp5/adsp_videoenc_verify_cmd.c | 235 + drivers/staging/dream/qdsp5/audio_aac.c | 1052 ++ drivers/staging/dream/qdsp5/audio_amrnb.c | 873 ++ drivers/staging/dream/qdsp5/audio_evrc.c | 845 ++ drivers/staging/dream/qdsp5/audio_in.c | 967 ++ drivers/staging/dream/qdsp5/audio_mp3.c | 971 ++ drivers/staging/dream/qdsp5/audio_out.c | 851 ++ drivers/staging/dream/qdsp5/audio_qcelp.c | 856 ++ drivers/staging/dream/qdsp5/audmgr.c | 313 + drivers/staging/dream/qdsp5/audmgr.h | 215 + drivers/staging/dream/qdsp5/audmgr_new.h | 213 + drivers/staging/dream/qdsp5/audpp.c | 429 + drivers/staging/dream/qdsp5/evlog.h | 133 + drivers/staging/dream/qdsp5/snd.c | 279 + drivers/staging/dream/smd/Kconfig | 26 + drivers/staging/dream/smd/Makefile | 6 + .../staging/dream/smd/rpc_server_dog_keepalive.c | 68 + drivers/staging/dream/smd/rpc_server_time_remote.c | 77 + drivers/staging/dream/smd/smd.c | 1330 +++ drivers/staging/dream/smd/smd_private.h | 171 + drivers/staging/dream/smd/smd_qmi.c | 860 ++ drivers/staging/dream/smd/smd_rpcrouter.c | 1274 +++ drivers/staging/dream/smd/smd_rpcrouter.h | 195 + drivers/staging/dream/smd/smd_rpcrouter_device.c | 376 + drivers/staging/dream/smd/smd_rpcrouter_servers.c | 229 + drivers/staging/dream/smd/smd_tty.c | 213 + drivers/staging/dream/synaptics_i2c_rmi.c | 658 ++ drivers/staging/dream/synaptics_i2c_rmi.h | 53 + drivers/staging/dst/export.c | 2 +- drivers/staging/echo/TODO | 5 +- drivers/staging/echo/bit_operations.h | 226 - drivers/staging/echo/echo.c | 190 +- drivers/staging/echo/echo.h | 15 +- drivers/staging/echo/fir.h | 109 +- drivers/staging/echo/mmx.h | 281 - drivers/staging/echo/oslec.h | 70 +- drivers/staging/epl/Benchmark.h | 425 - drivers/staging/epl/Debug.h | 694 -- drivers/staging/epl/Edrv8139.c | 1246 --- drivers/staging/epl/EdrvFec.h | 114 - drivers/staging/epl/EdrvSim.h | 89 - drivers/staging/epl/Epl.h | 272 - drivers/staging/epl/EplAmi.h | 323 - drivers/staging/epl/EplApiGeneric.c | 2054 ---- drivers/staging/epl/EplApiLinux.h | 141 - drivers/staging/epl/EplApiLinuxKernel.c | 1173 --- drivers/staging/epl/EplApiProcessImage.c | 328 - drivers/staging/epl/EplCfg.h | 196 - drivers/staging/epl/EplDef.h | 355 - drivers/staging/epl/EplDll.h | 205 - drivers/staging/epl/EplDllCal.h | 123 - drivers/staging/epl/EplDllk.c | 4052 -------- drivers/staging/epl/EplDllkCal.c | 1260 --- drivers/staging/epl/EplDlluCal.c | 529 -- drivers/staging/epl/EplErrDef.h | 294 - drivers/staging/epl/EplErrorHandlerk.c | 810 -- drivers/staging/epl/EplEvent.h | 279 - drivers/staging/epl/EplEventk.c | 853 -- drivers/staging/epl/EplEventu.c | 813 -- drivers/staging/epl/EplFrame.h | 344 - drivers/staging/epl/EplIdentu.c | 486 - drivers/staging/epl/EplInc.h | 370 - drivers/staging/epl/EplInstDef.h | 363 - drivers/staging/epl/EplLed.h | 92 - drivers/staging/epl/EplNmt.h | 230 - drivers/staging/epl/EplNmtCnu.c | 701 -- drivers/staging/epl/EplNmtMnu.c | 2828 ------ drivers/staging/epl/EplNmtk.c | 1840 ---- drivers/staging/epl/EplNmtkCal.c | 147 - drivers/staging/epl/EplNmtu.c | 706 -- drivers/staging/epl/EplNmtuCal.c | 158 - drivers/staging/epl/EplObd.c | 3192 ------- drivers/staging/epl/EplObd.h | 456 - drivers/staging/epl/EplObdMacro.h | 354 - drivers/staging/epl/EplObdkCal.c | 146 - drivers/staging/epl/EplObdu.c | 506 - drivers/staging/epl/EplObduCal.c | 543 -- drivers/staging/epl/EplPdo.h | 117 - drivers/staging/epl/EplPdok.c | 669 -- drivers/staging/epl/EplPdokCal.c | 266 - drivers/staging/epl/EplPdou.c | 565 -- drivers/staging/epl/EplSdo.h | 241 - drivers/staging/epl/EplSdoAc.h | 111 - drivers/staging/epl/EplSdoAsndu.c | 483 - drivers/staging/epl/EplSdoAsySequ.c | 2522 ----- drivers/staging/epl/EplSdoComu.c | 3345 ------- drivers/staging/epl/EplSdoUdpu.c | 650 -- drivers/staging/epl/EplStatusu.c | 377 - drivers/staging/epl/EplTarget.h | 140 - drivers/staging/epl/EplTimer.h | 116 - drivers/staging/epl/EplTimeruLinuxKernel.c | 446 - drivers/staging/epl/EplVersion.h | 98 - drivers/staging/epl/Kconfig | 6 - drivers/staging/epl/Makefile | 41 - drivers/staging/epl/SharedBuff.c | 1762 ---- drivers/staging/epl/SharedBuff.h | 187 - drivers/staging/epl/ShbIpc-LinuxKernel.c | 944 -- drivers/staging/epl/ShbIpc.h | 99 - drivers/staging/epl/ShbLinuxKernel.h | 68 - drivers/staging/epl/SocketLinuxKernel.c | 197 - drivers/staging/epl/SocketLinuxKernel.h | 105 - drivers/staging/epl/TimerHighReskX86.c | 510 - drivers/staging/epl/VirtualEthernetLinux.c | 348 - drivers/staging/epl/amix86.c | 861 -- drivers/staging/epl/demo_main.c | 947 -- drivers/staging/epl/edrv.h | 167 - drivers/staging/epl/global.h | 144 - drivers/staging/epl/kernel/EplDllk.h | 153 - drivers/staging/epl/kernel/EplDllkCal.h | 129 - drivers/staging/epl/kernel/EplErrorHandlerk.h | 88 - drivers/staging/epl/kernel/EplEventk.h | 96 - drivers/staging/epl/kernel/EplNmtk.h | 90 - drivers/staging/epl/kernel/EplObdk.h | 156 - drivers/staging/epl/kernel/EplPdok.h | 98 - drivers/staging/epl/kernel/EplPdokCal.h | 86 - drivers/staging/epl/kernel/EplTimerHighResk.h | 96 - drivers/staging/epl/kernel/EplTimerk.h | 108 - drivers/staging/epl/kernel/VirtualEthernet.h | 84 - drivers/staging/epl/proc_fs.c | 410 - drivers/staging/epl/proc_fs.h | 89 - drivers/staging/epl/user/EplCfgMau.h | 276 - drivers/staging/epl/user/EplDllu.h | 96 - drivers/staging/epl/user/EplDlluCal.h | 106 - drivers/staging/epl/user/EplEventu.h | 96 - drivers/staging/epl/user/EplIdentu.h | 94 - drivers/staging/epl/user/EplLedu.h | 95 - drivers/staging/epl/user/EplNmtCnu.h | 92 - drivers/staging/epl/user/EplNmtMnu.h | 117 - drivers/staging/epl/user/EplNmtu.h | 139 - drivers/staging/epl/user/EplNmtuCal.h | 80 - drivers/staging/epl/user/EplObdu.h | 169 - drivers/staging/epl/user/EplObduCal.h | 126 - drivers/staging/epl/user/EplPdou.h | 96 - drivers/staging/epl/user/EplSdoAsndu.h | 96 - drivers/staging/epl/user/EplSdoAsySequ.h | 100 - drivers/staging/epl/user/EplSdoComu.h | 114 - drivers/staging/epl/user/EplSdoUdpu.h | 97 - drivers/staging/epl/user/EplStatusu.h | 90 - drivers/staging/epl/user/EplTimeru.h | 95 - drivers/staging/et131x/Makefile | 3 - drivers/staging/et131x/et1310_address_map.h | 2304 ++--- drivers/staging/et131x/et1310_eeprom.c | 215 +- drivers/staging/et131x/et1310_eeprom.h | 22 +- drivers/staging/et131x/et1310_jagcore.c | 220 - drivers/staging/et131x/et1310_jagcore.h | 36 +- drivers/staging/et131x/et1310_mac.c | 358 +- drivers/staging/et131x/et1310_mac.h | 8 +- drivers/staging/et131x/et1310_phy.c | 770 +- drivers/staging/et131x/et1310_phy.h | 941 +- drivers/staging/et131x/et1310_pm.c | 96 +- drivers/staging/et131x/et1310_pm.h | 46 +- drivers/staging/et131x/et1310_rx.c | 572 +- drivers/staging/et131x/et1310_rx.h | 198 +- drivers/staging/et131x/et1310_tx.c | 1067 +-- drivers/staging/et131x/et1310_tx.h | 108 +- drivers/staging/et131x/et131x_adapter.h | 141 +- drivers/staging/et131x/et131x_config.c | 325 - drivers/staging/et131x/et131x_debug.c | 217 - drivers/staging/et131x/et131x_debug.h | 255 - drivers/staging/et131x/et131x_defs.h | 28 +- drivers/staging/et131x/et131x_initpci.c | 726 +- drivers/staging/et131x/et131x_initpci.h | 6 +- drivers/staging/et131x/et131x_isr.c | 240 +- drivers/staging/et131x/et131x_isr.h | 6 +- drivers/staging/et131x/et131x_netdev.c | 327 +- drivers/staging/et131x/et131x_netdev.h | 6 +- drivers/staging/et131x/et131x_version.h | 6 +- drivers/staging/heci/Kconfig | 7 - drivers/staging/heci/Makefile | 9 - drivers/staging/heci/TODO | 6 - drivers/staging/heci/heci.h | 175 - drivers/staging/heci/heci_data_structures.h | 529 -- drivers/staging/heci/heci_init.c | 1083 --- drivers/staging/heci/heci_interface.c | 498 - drivers/staging/heci/heci_interface.h | 170 - drivers/staging/heci/heci_main.c | 1576 --- drivers/staging/heci/heci_version.h | 54 - drivers/staging/heci/interrupt.c | 1555 --- drivers/staging/heci/io_heci.c | 872 -- drivers/staging/hv/BlkVsc.c | 111 + drivers/staging/hv/Channel.c | 1015 ++ drivers/staging/hv/Channel.h | 112 + drivers/staging/hv/ChannelInterface.c | 152 + drivers/staging/hv/ChannelInterface.h | 35 + drivers/staging/hv/ChannelMgmt.c | 686 ++ drivers/staging/hv/ChannelMgmt.h | 319 + drivers/staging/hv/Connection.c | 341 + drivers/staging/hv/Hv.c | 568 ++ drivers/staging/hv/Hv.h | 144 + drivers/staging/hv/Kconfig | 32 + drivers/staging/hv/Makefile | 11 + drivers/staging/hv/NetVsc.c | 1379 +++ drivers/staging/hv/NetVsc.h | 329 + drivers/staging/hv/NetVscApi.h | 123 + drivers/staging/hv/RingBuffer.c | 606 ++ drivers/staging/hv/RingBuffer.h | 101 + drivers/staging/hv/RndisFilter.c | 1000 ++ drivers/staging/hv/RndisFilter.h | 55 + drivers/staging/hv/StorVsc.c | 850 ++ drivers/staging/hv/StorVscApi.h | 113 + drivers/staging/hv/TODO | 13 + drivers/staging/hv/VersionInfo.h | 31 + drivers/staging/hv/Vmbus.c | 311 + drivers/staging/hv/VmbusApi.h | 175 + drivers/staging/hv/VmbusChannelInterface.h | 89 + drivers/staging/hv/VmbusPacketFormat.h | 160 + drivers/staging/hv/VmbusPrivate.h | 134 + drivers/staging/hv/blkvsc_drv.c | 1511 +++ drivers/staging/hv/hv_api.h | 905 ++ drivers/staging/hv/logging.h | 119 + drivers/staging/hv/netvsc_drv.c | 618 ++ drivers/staging/hv/osd.c | 156 + drivers/staging/hv/osd.h | 69 + drivers/staging/hv/rndis.h | 652 ++ drivers/staging/hv/storvsc_drv.c | 1208 +++ drivers/staging/hv/vmbus.h | 77 + drivers/staging/hv/vmbus_drv.c | 999 ++ drivers/staging/hv/vstorage.h | 192 + drivers/staging/iio/Documentation/device.txt | 49 + drivers/staging/iio/Documentation/iio_utils.h | 159 + .../iio/Documentation/lis3l02dqbuffersimple.c | 171 + drivers/staging/iio/Documentation/overview.txt | 62 + drivers/staging/iio/Documentation/ring.txt | 61 + drivers/staging/iio/Documentation/trigger.txt | 38 + drivers/staging/iio/Documentation/userspace.txt | 60 + drivers/staging/iio/Kconfig | 47 + drivers/staging/iio/Makefile | 16 + drivers/staging/iio/TODO | 69 + drivers/staging/iio/accel/Kconfig | 27 + drivers/staging/iio/accel/Makefile | 11 + drivers/staging/iio/accel/accel.h | 167 + drivers/staging/iio/accel/kxsd9.c | 395 + drivers/staging/iio/accel/lis3l02dq.h | 232 + drivers/staging/iio/accel/lis3l02dq_core.c | 926 ++ drivers/staging/iio/accel/lis3l02dq_ring.c | 600 ++ drivers/staging/iio/accel/sca3000.h | 298 + drivers/staging/iio/accel/sca3000_core.c | 1509 +++ drivers/staging/iio/accel/sca3000_ring.c | 331 + drivers/staging/iio/adc/Kconfig | 13 + drivers/staging/iio/adc/Makefile | 8 + drivers/staging/iio/adc/adc.h | 13 + drivers/staging/iio/adc/max1363.h | 269 + drivers/staging/iio/adc/max1363_core.c | 623 ++ drivers/staging/iio/adc/max1363_ring.c | 241 + drivers/staging/iio/chrdev.h | 118 + drivers/staging/iio/iio.h | 411 + drivers/staging/iio/industrialio-core.c | 851 ++ drivers/staging/iio/industrialio-ring.c | 568 ++ drivers/staging/iio/industrialio-trigger.c | 399 + drivers/staging/iio/light/Kconfig | 13 + drivers/staging/iio/light/Makefile | 5 + drivers/staging/iio/light/light.h | 12 + drivers/staging/iio/light/tsl2561.c | 276 + drivers/staging/iio/ring_generic.h | 283 + drivers/staging/iio/ring_hw.h | 22 + drivers/staging/iio/ring_sw.c | 433 + drivers/staging/iio/ring_sw.h | 189 + drivers/staging/iio/sysfs.h | 293 + drivers/staging/iio/trigger.h | 151 + drivers/staging/iio/trigger/Kconfig | 21 + drivers/staging/iio/trigger/Makefile | 5 + drivers/staging/iio/trigger/iio-trig-gpio.c | 202 + .../staging/iio/trigger/iio-trig-periodic-rtc.c | 228 + drivers/staging/iio/trigger_consumer.h | 45 + drivers/staging/line6/capture.c | 4 +- drivers/staging/line6/driver.c | 2 +- drivers/staging/line6/pod.c | 8 +- drivers/staging/me4000/Kconfig | 10 - drivers/staging/me4000/Makefile | 1 - drivers/staging/me4000/README | 13 - drivers/staging/me4000/me4000.c | 6109 ------------ drivers/staging/me4000/me4000.h | 966 -- drivers/staging/me4000/me4000_firmware.h |10033 -------------------- drivers/staging/me4000/me4610_firmware.h | 5409 ----------- drivers/staging/meilhaus/Kconfig | 128 - drivers/staging/meilhaus/Makefile | 43 - drivers/staging/meilhaus/TODO | 10 - drivers/staging/meilhaus/me0600_device.c | 213 - drivers/staging/meilhaus/me0600_device.h | 97 - drivers/staging/meilhaus/me0600_dio.c | 415 - drivers/staging/meilhaus/me0600_dio.h | 68 - drivers/staging/meilhaus/me0600_dio_reg.h | 41 - drivers/staging/meilhaus/me0600_ext_irq.c | 469 - drivers/staging/meilhaus/me0600_ext_irq.h | 58 - drivers/staging/meilhaus/me0600_ext_irq_reg.h | 18 - drivers/staging/meilhaus/me0600_optoi.c | 243 - drivers/staging/meilhaus/me0600_optoi.h | 58 - drivers/staging/meilhaus/me0600_optoi_reg.h | 35 - drivers/staging/meilhaus/me0600_relay.c | 359 - drivers/staging/meilhaus/me0600_relay.h | 63 - drivers/staging/meilhaus/me0600_relay_reg.h | 36 - drivers/staging/meilhaus/me0600_ttli.c | 238 - drivers/staging/meilhaus/me0600_ttli.h | 58 - drivers/staging/meilhaus/me0600_ttli_reg.h | 35 - drivers/staging/meilhaus/me0900_device.c | 178 - drivers/staging/meilhaus/me0900_device.h | 92 - drivers/staging/meilhaus/me0900_di.c | 245 - drivers/staging/meilhaus/me0900_di.h | 65 - drivers/staging/meilhaus/me0900_do.c | 314 - drivers/staging/meilhaus/me0900_do.h | 68 - drivers/staging/meilhaus/me0900_reg.h | 40 - drivers/staging/meilhaus/me1000_device.c | 206 - drivers/staging/meilhaus/me1000_device.h | 59 - drivers/staging/meilhaus/me1000_dio.c | 438 - drivers/staging/meilhaus/me1000_dio.h | 71 - drivers/staging/meilhaus/me1000_dio_reg.h | 50 - drivers/staging/meilhaus/me1400_device.c | 253 - drivers/staging/meilhaus/me1400_device.h | 108 - drivers/staging/meilhaus/me1400_ext_irq.c | 507 - drivers/staging/meilhaus/me1400_ext_irq.h | 62 - drivers/staging/meilhaus/me1400_ext_irq_reg.h | 56 - drivers/staging/meilhaus/me1600_ao.c | 1017 -- drivers/staging/meilhaus/me1600_ao.h | 128 - drivers/staging/meilhaus/me1600_ao_reg.h | 66 - drivers/staging/meilhaus/me1600_device.c | 259 - drivers/staging/meilhaus/me1600_device.h | 101 - drivers/staging/meilhaus/me4600_ai.c | 3405 ------- drivers/staging/meilhaus/me4600_ai.h | 175 - drivers/staging/meilhaus/me4600_ai_reg.h | 107 - drivers/staging/meilhaus/me4600_ao.c | 5974 ------------ drivers/staging/meilhaus/me4600_ao.h | 259 - drivers/staging/meilhaus/me4600_ao_reg.h | 113 - drivers/staging/meilhaus/me4600_device.c | 371 - drivers/staging/meilhaus/me4600_device.h | 151 - drivers/staging/meilhaus/me4600_di.c | 256 - drivers/staging/meilhaus/me4600_di.h | 64 - drivers/staging/meilhaus/me4600_dio.c | 510 - drivers/staging/meilhaus/me4600_dio.h | 69 - drivers/staging/meilhaus/me4600_dio_reg.h | 63 - drivers/staging/meilhaus/me4600_do.c | 433 - drivers/staging/meilhaus/me4600_do.h | 65 - drivers/staging/meilhaus/me4600_ext_irq.c | 457 - drivers/staging/meilhaus/me4600_ext_irq.h | 78 - drivers/staging/meilhaus/me4600_ext_irq_reg.h | 41 - drivers/staging/meilhaus/me4600_reg.h | 46 - drivers/staging/meilhaus/me6000_ao.c | 3709 -------- drivers/staging/meilhaus/me6000_ao.h | 195 - drivers/staging/meilhaus/me6000_ao_reg.h | 177 - drivers/staging/meilhaus/me6000_device.c | 209 - drivers/staging/meilhaus/me6000_device.h | 149 - drivers/staging/meilhaus/me6000_dio.c | 415 - drivers/staging/meilhaus/me6000_dio.h | 68 - drivers/staging/meilhaus/me6000_dio_reg.h | 43 - drivers/staging/meilhaus/me6000_reg.h | 35 - drivers/staging/meilhaus/me8100_device.c | 185 - drivers/staging/meilhaus/me8100_device.h | 97 - drivers/staging/meilhaus/me8100_di.c | 684 -- drivers/staging/meilhaus/me8100_di.h | 89 - drivers/staging/meilhaus/me8100_di_reg.h | 47 - drivers/staging/meilhaus/me8100_do.c | 391 - drivers/staging/meilhaus/me8100_do.h | 70 - drivers/staging/meilhaus/me8100_do_reg.h | 36 - drivers/staging/meilhaus/me8100_reg.h | 41 - drivers/staging/meilhaus/me8200_device.c | 192 - drivers/staging/meilhaus/me8200_device.h | 97 - drivers/staging/meilhaus/me8200_di.c | 832 -- drivers/staging/meilhaus/me8200_di.h | 92 - drivers/staging/meilhaus/me8200_di_reg.h | 75 - drivers/staging/meilhaus/me8200_dio.c | 418 - drivers/staging/meilhaus/me8200_dio.h | 68 - drivers/staging/meilhaus/me8200_dio_reg.h | 43 - drivers/staging/meilhaus/me8200_do.c | 591 -- drivers/staging/meilhaus/me8200_do.h | 75 - drivers/staging/meilhaus/me8200_do_reg.h | 40 - drivers/staging/meilhaus/me8200_reg.h | 46 - drivers/staging/meilhaus/me8254.c | 1176 --- drivers/staging/meilhaus/me8254.h | 80 - drivers/staging/meilhaus/me8254_reg.h | 172 - drivers/staging/meilhaus/me8255.c | 462 - drivers/staging/meilhaus/me8255.h | 59 - drivers/staging/meilhaus/me8255_reg.h | 50 - drivers/staging/meilhaus/mecirc_buf.h | 131 - drivers/staging/meilhaus/mecommon.h | 26 - drivers/staging/meilhaus/medebug.h | 125 - drivers/staging/meilhaus/medefines.h | 449 - drivers/staging/meilhaus/medevice.c | 1740 ---- drivers/staging/meilhaus/medevice.h | 304 - drivers/staging/meilhaus/medlist.c | 127 - drivers/staging/meilhaus/medlist.h | 91 - drivers/staging/meilhaus/medlock.c | 195 - drivers/staging/meilhaus/medlock.h | 76 - drivers/staging/meilhaus/medriver.h | 350 - drivers/staging/meilhaus/medummy.c | 1264 --- drivers/staging/meilhaus/medummy.h | 40 - drivers/staging/meilhaus/meerror.h | 100 - drivers/staging/meilhaus/mefirmware.c | 137 - drivers/staging/meilhaus/mefirmware.h | 57 - drivers/staging/meilhaus/meids.h | 31 - drivers/staging/meilhaus/meinternal.h | 363 - drivers/staging/meilhaus/meioctl.h | 515 - drivers/staging/meilhaus/memain.c | 2084 ---- drivers/staging/meilhaus/memain.h | 266 - drivers/staging/meilhaus/meplx_reg.h | 53 - drivers/staging/meilhaus/meslist.c | 173 - drivers/staging/meilhaus/meslist.h | 108 - drivers/staging/meilhaus/meslock.c | 136 - drivers/staging/meilhaus/meslock.h | 73 - drivers/staging/meilhaus/mesubdevice.c | 317 - drivers/staging/meilhaus/mesubdevice.h | 197 - drivers/staging/meilhaus/metempl_device.c | 135 - drivers/staging/meilhaus/metempl_device.h | 92 - drivers/staging/meilhaus/metempl_sub.c | 149 - drivers/staging/meilhaus/metempl_sub.h | 64 - drivers/staging/meilhaus/metempl_sub_reg.h | 35 - drivers/staging/meilhaus/metypes.h | 95 - drivers/staging/otus/80211core/cagg.c | 6 +- drivers/staging/otus/80211core/cmm.c | 4 +- drivers/staging/otus/80211core/performance.c | 6 +- drivers/staging/otus/hal/hpmain.c | 2 +- drivers/staging/otus/ioctl.c | 25 +- drivers/staging/otus/usbdrv.c | 14 - drivers/staging/otus/usbdrv.h | 4 - drivers/staging/otus/wrap_buf.c | 3 - drivers/staging/otus/wrap_dbg.c | 3 - drivers/staging/otus/wrap_ev.c | 7 - drivers/staging/otus/wrap_mem.c | 3 - drivers/staging/otus/wrap_mis.c | 3 - drivers/staging/otus/wrap_pkt.c | 4 - drivers/staging/otus/wrap_sec.c | 3 - drivers/staging/otus/wrap_usb.c | 3 - drivers/staging/otus/wwrap.c | 8 - drivers/staging/otus/zdcompat.h | 10 - drivers/staging/panel/panel.c | 50 +- drivers/staging/pata_rdc/Kconfig | 6 - drivers/staging/pata_rdc/Makefile | 2 - drivers/staging/pata_rdc/pata_rdc.c | 955 -- drivers/staging/pata_rdc/pata_rdc.h | 144 - drivers/staging/pohmelfs/config.c | 101 +- drivers/staging/pohmelfs/crypto.c | 4 +- drivers/staging/pohmelfs/dir.c | 27 +- drivers/staging/pohmelfs/inode.c | 9 +- drivers/staging/pohmelfs/net.c | 20 +- drivers/staging/pohmelfs/netfs.h | 5 + drivers/staging/pohmelfs/trans.c | 3 +- drivers/staging/quatech_usb2/Kconfig | 15 + drivers/staging/quatech_usb2/Makefile | 1 + drivers/staging/quatech_usb2/TODO | 8 + drivers/staging/quatech_usb2/quatech_usb2.c | 2025 ++++ drivers/staging/rar/Kconfig | 17 + drivers/staging/rar/Makefile | 2 + drivers/staging/rar/rar_driver.c | 444 + drivers/staging/rar/rar_driver.h | 99 + drivers/staging/rspiusb/Kconfig | 6 - drivers/staging/rspiusb/Makefile | 1 - drivers/staging/rspiusb/TODO | 22 - drivers/staging/rspiusb/rspiusb.c | 923 -- drivers/staging/rspiusb/rspiusb.h | 33 - drivers/staging/rt2860/2860_main_dev.c | 7 + drivers/staging/rt2860/ap.h | 453 - drivers/staging/rt2860/chlist.h | 5 - drivers/staging/rt2860/common/action.c | 11 +- drivers/staging/rt2860/common/ba_action.c | 19 +- drivers/staging/rt2860/common/cmm_data.c | 298 +- drivers/staging/rt2860/common/cmm_info.c | 25 +- drivers/staging/rt2860/common/cmm_sanity.c | 184 - drivers/staging/rt2860/common/cmm_wpa.c | 806 +-- drivers/staging/rt2860/common/eeprom.c | 55 +- drivers/staging/rt2860/common/mlme.c | 590 +-- drivers/staging/rt2860/common/rtmp_init.c | 386 +- drivers/staging/rt2860/common/spectrum.c | 5 - drivers/staging/rt2860/dfs.h | 12 - drivers/staging/rt2860/oid.h | 170 +- drivers/staging/rt2860/rt2860.h | 2 + drivers/staging/rt2860/rt28xx.h | 22 +- drivers/staging/rt2860/rt_config.h | 4 - drivers/staging/rt2860/rt_linux.c | 19 +- drivers/staging/rt2860/rt_linux.h | 118 +- drivers/staging/rt2860/rt_main_dev.c | 59 +- drivers/staging/rt2860/rt_profile.c | 44 +- drivers/staging/rt2860/rtmp.h | 719 +-- drivers/staging/rt2860/rtmp_ckipmic.h | 35 - drivers/staging/rt2860/rtmp_def.h | 14 - drivers/staging/rt2860/sta/assoc.c | 26 - drivers/staging/rt2860/sta/connect.c | 15 +- drivers/staging/rt2860/sta/rtmp_data.c | 15 +- drivers/staging/rt2860/sta/sync.c | 2 - drivers/staging/rt2860/sta/wpa.c | 9 - drivers/staging/rt2860/sta_ioctl.c | 3174 +------ drivers/staging/rt2860/wpa.h | 3 - drivers/staging/rt2870/2870_main_dev.c | 196 +- drivers/staging/rt2870/Kconfig | 5 +- drivers/staging/rt2870/Makefile | 2 +- drivers/staging/rt2870/common/2870_rtmp_init.c | 63 +- drivers/staging/rt2870/common/cmm_data_2870.c | 30 - drivers/staging/rt2870/common/firmware.h | 558 -- drivers/staging/rt2870/common/rtusb_bulk.c | 3 +- drivers/staging/rt2870/common/rtusb_io.c | 81 +- drivers/staging/rt2870/link_list.h | 1 - drivers/staging/rt2870/rt2870.h | 215 +- drivers/staging/rt3070/2870_main_dev.c | 1 - drivers/staging/rt3070/Kconfig | 6 - drivers/staging/rt3070/Makefile | 43 - drivers/staging/rt3070/action.h | 1 - drivers/staging/rt3070/aironet.h | 1 - drivers/staging/rt3070/ap.h | 1 - drivers/staging/rt3070/chlist.h | 1 - drivers/staging/rt3070/common/2870_rtmp_init.c | 1 - drivers/staging/rt3070/common/action.c | 1 - drivers/staging/rt3070/common/ba_action.c | 1 - drivers/staging/rt3070/common/cmm_data.c | 1 - drivers/staging/rt3070/common/cmm_data_2870.c | 1 - drivers/staging/rt3070/common/cmm_info.c | 1 - drivers/staging/rt3070/common/cmm_sanity.c | 1 - drivers/staging/rt3070/common/cmm_sync.c | 1 - drivers/staging/rt3070/common/cmm_wpa.c | 1 - drivers/staging/rt3070/common/dfs.c | 1 - drivers/staging/rt3070/common/eeprom.c | 1 - drivers/staging/rt3070/common/md5.c | 1 - drivers/staging/rt3070/common/mlme.c | 1 - drivers/staging/rt3070/common/rtmp_init.c | 1 - drivers/staging/rt3070/common/rtmp_tkip.c | 1 - drivers/staging/rt3070/common/rtmp_wep.c | 1 - drivers/staging/rt3070/common/rtusb_bulk.c | 1 - drivers/staging/rt3070/common/rtusb_data.c | 1 - drivers/staging/rt3070/common/rtusb_io.c | 1 - drivers/staging/rt3070/common/spectrum.c | 1 - drivers/staging/rt3070/dfs.h | 1 - drivers/staging/rt3070/link_list.h | 1 - drivers/staging/rt3070/md5.h | 1 - drivers/staging/rt3070/mlme.h | 1 - drivers/staging/rt3070/oid.h | 1 - drivers/staging/rt3070/rt2870.h | 1 - drivers/staging/rt3070/rt28xx.h | 1 - drivers/staging/rt3070/rt_config.h | 1 - drivers/staging/rt3070/rt_linux.c | 1 - drivers/staging/rt3070/rt_linux.h | 1 - drivers/staging/rt3070/rt_main_dev.c | 1 - drivers/staging/rt3070/rt_profile.c | 1 - drivers/staging/rt3070/rtmp.h | 1 - drivers/staging/rt3070/rtmp_ckipmic.h | 1 - drivers/staging/rt3070/rtmp_def.h | 1 - drivers/staging/rt3070/rtmp_type.h | 1 - drivers/staging/rt3070/spectrum.h | 1 - drivers/staging/rt3070/spectrum_def.h | 1 - drivers/staging/rt3070/sta/aironet.c | 1 - drivers/staging/rt3070/sta/assoc.c | 1 - drivers/staging/rt3070/sta/auth.c | 1 - drivers/staging/rt3070/sta/auth_rsp.c | 1 - drivers/staging/rt3070/sta/connect.c | 2 - drivers/staging/rt3070/sta/rtmp_data.c | 1 - drivers/staging/rt3070/sta/sanity.c | 1 - drivers/staging/rt3070/sta/sync.c | 1 - drivers/staging/rt3070/sta/wpa.c | 1 - drivers/staging/rt3070/sta_ioctl.c | 1 - drivers/staging/rt3070/wpa.h | 1 - drivers/staging/rt3090/Kconfig | 5 + drivers/staging/rt3090/Makefile | 80 + drivers/staging/{rt2860/md4.h => rt3090/action.h} | 50 +- drivers/staging/rt3090/ap.h | 512 + drivers/staging/rt3090/ap_apcli.h | 276 + .../{rt2870/md4.h => rt3090/ap_autoChSel.h} | 63 +- .../{rt2870/md4.h => rt3090/ap_autoChSel_cmm.h} | 50 +- drivers/staging/rt3090/ap_cfg.h | 118 + drivers/staging/{rt2860/md4.h => rt3090/ap_ids.h} | 66 +- drivers/staging/{rt2860/md4.h => rt3090/ap_mbss.h} | 56 +- drivers/staging/rt3090/ap_uapsd.h | 636 ++ drivers/staging/rt3090/ap_wds.h | 212 + drivers/staging/rt3090/chips/rt3090.c | 123 + drivers/staging/rt3090/chips/rt30xx.c | 525 + drivers/staging/rt3090/chips/rt3370.c | 121 + drivers/staging/rt3090/chips/rt3390.c | 122 + drivers/staging/rt3090/chips/rt33xx.c | 536 ++ drivers/staging/rt3090/chlist.h | 130 + drivers/staging/rt3090/common/action.c | 1057 +++ drivers/staging/rt3090/common/ba_action.c | 1779 ++++ drivers/staging/rt3090/common/cmm_aes.c | 1560 +++ drivers/staging/rt3090/common/cmm_asic.c | 2753 ++++++ drivers/staging/rt3090/common/cmm_cfg.c | 295 + drivers/staging/rt3090/common/cmm_data.c | 2763 ++++++ drivers/staging/rt3090/common/cmm_data_pci.c | 1576 +++ drivers/staging/rt3090/common/cmm_info.c | 3717 ++++++++ drivers/staging/rt3090/common/cmm_mac_pci.c | 1757 ++++ drivers/staging/rt3090/common/cmm_profile.c | 2321 +++++ drivers/staging/rt3090/common/cmm_sanity.c | 1718 ++++ drivers/staging/rt3090/common/cmm_sync.c | 734 ++ drivers/staging/rt3090/common/cmm_tkip.c | 966 ++ drivers/staging/rt3090/common/cmm_wep.c | 500 + drivers/staging/rt3090/common/cmm_wpa.c | 3149 ++++++ drivers/staging/rt3090/common/crypt_aes.c | 1007 ++ drivers/staging/rt3090/common/crypt_biginteger.c | 1119 +++ drivers/staging/rt3090/common/crypt_dh.c | 234 + drivers/staging/rt3090/common/crypt_hmac.c | 279 + drivers/staging/rt3090/common/crypt_md5.c | 353 + drivers/staging/rt3090/common/crypt_sha2.c | 536 ++ drivers/staging/rt3090/common/dfs.c | 481 + drivers/staging/rt3090/common/ee_efuse.c | 1548 +++ drivers/staging/rt3090/common/ee_prom.c | 308 + drivers/staging/rt3090/common/eeprom.c | 98 + drivers/staging/rt3090/common/igmp_snoop.c | 1365 +++ drivers/staging/rt3090/common/mlme.c | 6550 +++++++++++++ drivers/staging/rt3090/common/mlme_ex.c | 215 + drivers/staging/rt3090/common/netif_block.c | 147 + drivers/staging/rt3090/common/rt_channel.c | 1287 +++ drivers/staging/rt3090/common/rt_rf.c | 201 + drivers/staging/rt3090/common/rtmp_init.c | 3882 ++++++++ drivers/staging/rt3090/common/rtmp_mcu.c | 560 ++ drivers/staging/rt3090/common/rtmp_timer.c | 327 + drivers/staging/rt3090/common/spectrum.c | 2221 +++++ drivers/staging/rt3090/config.mk | 187 + .../staging/{rt2860/md4.h => rt3090/crypt_hmac.h} | 65 +- .../staging/{rt2860/md4.h => rt3090/crypt_md5.h} | 62 +- drivers/staging/rt3090/crypt_sha2.h | 107 + drivers/staging/rt3090/dfs.h | 137 + drivers/staging/rt3090/eeprom.h | 82 + drivers/staging/rt3090/firmware.h | 517 + drivers/staging/rt3090/igmp_snoop.h | 152 + drivers/staging/rt3090/ipv6.h | 215 + drivers/staging/{rt2860 => rt3090}/link_list.h | 1 - drivers/staging/rt3090/mac_pci.h | 454 + drivers/staging/rt3090/mlme.h | 1360 +++ drivers/staging/{rt2870/md4.h => rt3090/mlme_ex.h} | 67 +- .../staging/{rt2860/md4.h => rt3090/mlme_ex_def.h} | 37 +- .../staging/{rt2860/md4.h => rt3090/netif_block.h} | 38 +- drivers/staging/rt3090/oid.h | 1144 +++ drivers/staging/rt3090/pci_main_dev.c | 1195 +++ drivers/staging/{rt2870/md4.h => rt3090/rt3090.h} | 59 +- drivers/staging/{rt2860/md4.h => rt3090/rt30xx.h} | 30 +- drivers/staging/{rt2870/md4.h => rt3090/rt3370.h} | 46 +- drivers/staging/{rt2870/md4.h => rt3090/rt3390.h} | 59 +- drivers/staging/{rt2870/md4.h => rt3090/rt33xx.h} | 30 +- drivers/staging/rt3090/rt_ate.c | 6089 ++++++++++++ drivers/staging/rt3090/rt_ate.h | 314 + drivers/staging/rt3090/rt_config.h | 126 + drivers/staging/rt3090/rt_linux.c | 1623 ++++ drivers/staging/rt3090/rt_linux.h | 1034 ++ drivers/staging/rt3090/rt_main_dev.c | 897 ++ drivers/staging/rt3090/rt_pci_rbus.c | 989 ++ drivers/staging/rt3090/rt_profile.c | 101 + drivers/staging/rt3090/rtmp.h | 6873 ++++++++++++++ drivers/staging/rt3090/rtmp_chip.h | 355 + drivers/staging/rt3090/rtmp_def.h | 1650 ++++ drivers/staging/rt3090/rtmp_dot11.h | 146 + .../staging/{rt2860/md4.h => rt3090/rtmp_iface.h} | 63 +- drivers/staging/rt3090/rtmp_mac.h | 2304 +++++ .../staging/{rt2860/md4.h => rt3090/rtmp_mcu.h} | 39 +- drivers/staging/rt3090/rtmp_os.h | 93 + drivers/staging/rt3090/rtmp_pci.h | 110 + drivers/staging/rt3090/rtmp_phy.h | 631 ++ drivers/staging/rt3090/rtmp_timer.h | 162 + drivers/staging/rt3090/rtmp_type.h | 147 + drivers/staging/rt3090/spectrum.h | 234 + drivers/staging/rt3090/spectrum_def.h | 257 + drivers/staging/rt3090/sta/assoc.c | 1673 ++++ drivers/staging/rt3090/sta/auth.c | 491 + drivers/staging/rt3090/sta/auth_rsp.c | 151 + drivers/staging/rt3090/sta/connect.c | 2759 ++++++ drivers/staging/rt3090/sta/dls.c | 2207 +++++ drivers/staging/rt3090/sta/rtmp_ckipmic.c | 579 ++ drivers/staging/rt3090/sta/rtmp_data.c | 2661 ++++++ drivers/staging/rt3090/sta/sanity.c | 382 + drivers/staging/rt3090/sta/sync.c | 1840 ++++ drivers/staging/rt3090/sta/wpa.c | 396 + drivers/staging/rt3090/sta_ioctl.c | 7557 +++++++++++++++ .../staging/{rt2860/md4.h => rt3090/vr_ikans.h} | 53 +- drivers/staging/rt3090/wpa.h | 447 + drivers/staging/rtl8187se/Makefile | 16 - drivers/staging/rtl8187se/TODO | 15 + drivers/staging/rtl8187se/dot11d.h | 101 - drivers/staging/rtl8187se/ieee80211.h | 1755 ---- drivers/staging/rtl8187se/ieee80211/dot11d.c | 22 - drivers/staging/rtl8187se/ieee80211/dot11d.h | 2 - drivers/staging/rtl8187se/ieee80211/ieee80211.h | 665 +- .../staging/rtl8187se/ieee80211/ieee80211_crypt.c | 17 - .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 88 +- .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 324 +- .../rtl8187se/ieee80211/ieee80211_crypt_wep.c | 125 +- .../staging/rtl8187se/ieee80211/ieee80211_module.c | 88 - drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 512 +- .../rtl8187se/ieee80211/ieee80211_softmac.c | 1033 +-- .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 30 - drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 270 +- drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 129 +- drivers/staging/rtl8187se/ieee80211/internal.h | 115 - drivers/staging/rtl8187se/ieee80211/rtl_crypto.h | 399 - drivers/staging/rtl8187se/r8180.h | 24 +- drivers/staging/rtl8187se/r8180_93cx6.h | 2 - drivers/staging/rtl8187se/r8180_core.c | 2954 +------ drivers/staging/rtl8187se/r8180_dm.c | 58 - drivers/staging/rtl8187se/r8180_dm.h | 18 - drivers/staging/rtl8187se/r8180_gct.c | 296 - drivers/staging/rtl8187se/r8180_hw.h | 393 +- drivers/staging/rtl8187se/r8180_max2820.c | 240 - drivers/staging/rtl8187se/r8180_max2820.h | 21 - drivers/staging/rtl8187se/r8180_pm.c | 92 - drivers/staging/rtl8187se/r8180_rtl8225.c | 933 -- drivers/staging/rtl8187se/r8180_rtl8225.h | 12 +- drivers/staging/rtl8187se/r8180_rtl8225z2.c | 1552 +-- drivers/staging/rtl8187se/r8180_rtl8255.c | 1838 ---- drivers/staging/rtl8187se/r8180_rtl8255.h | 19 - drivers/staging/rtl8187se/r8180_sa2400.c | 233 - drivers/staging/rtl8187se/r8180_sa2400.h | 26 - drivers/staging/rtl8187se/r8180_wx.c | 63 +- drivers/staging/rtl8187se/r8180_wx.h | 2 +- drivers/staging/rtl8187se/r8185b_init.c | 665 +-- drivers/staging/rtl8192e/Kconfig | 6 + drivers/staging/rtl8192e/Makefile | 34 + drivers/staging/{rtl8192su => rtl8192e}/dot11d.h | 0 .../staging/{rtl8192su => rtl8192e}/ieee80211.h | 228 +- drivers/staging/rtl8192e/ieee80211/dot11d.c | 239 + .../{rtl8192su => rtl8192e/ieee80211}/dot11d.h | 0 .../{rtl8192su => rtl8192e/ieee80211}/ieee80211.h | 115 +- .../staging/rtl8192e/ieee80211/ieee80211_crypt.c | 273 + .../ieee80211}/ieee80211_crypt.h | 7 + .../rtl8192e/ieee80211/ieee80211_crypt_ccmp.c | 534 ++ .../rtl8192e/ieee80211/ieee80211_crypt_tkip.c | 1031 ++ .../rtl8192e/ieee80211/ieee80211_crypt_wep.c | 393 + .../staging/rtl8192e/ieee80211/ieee80211_module.c | 432 + drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 2802 ++++++ .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 3548 +++++++ .../rtl8192e/ieee80211/ieee80211_softmac_wx.c | 682 ++ drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 933 ++ drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 1032 ++ drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h | 69 + .../staging/rtl8192e/ieee80211/rtl819x_BAProc.c | 779 ++ drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h | 481 + .../staging/rtl8192e/ieee80211/rtl819x_HTProc.c | 1719 ++++ drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h | 748 ++ drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h | 56 + .../staging/rtl8192e/ieee80211/rtl819x_TSProc.c | 659 ++ .../{rtl8192su => rtl8192e}/ieee80211/rtl_crypto.h | 0 .../{rtl8187se => rtl8192e}/ieee80211_crypt.h | 0 drivers/staging/rtl8192e/r8180_93cx6.c | 146 + drivers/staging/rtl8192e/r8180_93cx6.h | 40 + drivers/staging/rtl8192e/r8190_rtl8256.c | 1161 +++ .../{rtl8192su => rtl8192e}/r8190_rtl8256.h | 9 +- drivers/staging/rtl8192e/r8192E.h | 1516 +++ drivers/staging/rtl8192e/r8192E_core.c | 6462 +++++++++++++ drivers/staging/rtl8192e/r8192E_dm.c | 3880 ++++++++ drivers/staging/rtl8192e/r8192E_dm.h | 312 + .../r8192U_hw.h => rtl8192e/r8192E_hw.h} | 437 +- drivers/staging/rtl8192e/r8192E_wx.c | 1344 +++ .../r8180_gct.h => rtl8192e/r8192E_wx.h} | 23 +- drivers/staging/rtl8192e/r8192_pm.c | 172 + .../{rtl8187se/r8180_pm.h => rtl8192e/r8192_pm.h} | 18 +- drivers/staging/rtl8192e/r819xE_cmdpkt.c | 804 ++ drivers/staging/rtl8192e/r819xE_cmdpkt.h | 207 + drivers/staging/rtl8192e/r819xE_firmware.c | 352 + .../r819xU_phy.c => rtl8192e/r819xE_phy.c} | 2404 ++++- .../r819xU_phy.h => rtl8192e/r819xE_phy.h} | 61 +- .../r819xU_phyreg.h => rtl8192e/r819xE_phyreg.h} | 7 + drivers/staging/rtl8192su/Makefile | 39 +- drivers/staging/rtl8192su/TODO | 18 + drivers/staging/rtl8192su/ieee80211/EndianFree.h | 199 - drivers/staging/rtl8192su/ieee80211/Makefile | 3 +- drivers/staging/rtl8192su/ieee80211/aes.c | 469 - drivers/staging/rtl8192su/ieee80211/api.c | 246 - drivers/staging/rtl8192su/ieee80211/arc4.c | 103 - drivers/staging/rtl8192su/ieee80211/autoload.c | 40 - drivers/staging/rtl8192su/ieee80211/cipher.c | 299 - drivers/staging/rtl8192su/ieee80211/compress.c | 64 - .../staging/rtl8192su/ieee80211/crypto_compat.h | 90 - drivers/staging/rtl8192su/ieee80211/digest.c | 108 - drivers/staging/rtl8192su/ieee80211/dot11d.c | 25 +- drivers/staging/rtl8192su/ieee80211/dot11d.h | 4 - drivers/staging/rtl8192su/ieee80211/ieee80211.h | 1350 +--- .../staging/rtl8192su/ieee80211/ieee80211_crypt.c | 31 +- .../staging/rtl8192su/ieee80211/ieee80211_crypt.h | 7 - .../rtl8192su/ieee80211/ieee80211_crypt_ccmp.c | 66 +- .../rtl8192su/ieee80211/ieee80211_crypt_tkip.c | 292 +- .../rtl8192su/ieee80211/ieee80211_crypt_wep.c | 126 +- .../staging/rtl8192su/ieee80211/ieee80211_module.c | 77 +- .../staging/rtl8192su/ieee80211/ieee80211_r8192s.h | 436 + drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 253 +- .../rtl8192su/ieee80211/ieee80211_softmac.c | 360 +- .../rtl8192su/ieee80211/ieee80211_softmac_wx.c | 86 - drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 26 +- drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 272 +- drivers/staging/rtl8192su/ieee80211/internal.h | 115 - drivers/staging/rtl8192su/ieee80211/kmap_types.h | 20 - drivers/staging/rtl8192su/ieee80211/michael_mic.c | 194 - drivers/staging/rtl8192su/ieee80211/proc.c | 116 - .../staging/rtl8192su/ieee80211/rtl819x_BAProc.c | 49 +- drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h | 9 - .../staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 279 +- drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h | 168 +- .../staging/rtl8192su/ieee80211/rtl819x_TSProc.c | 34 +- drivers/staging/rtl8192su/ieee80211/scatterwalk.c | 126 - drivers/staging/rtl8192su/ieee80211/scatterwalk.h | 51 - drivers/staging/rtl8192su/r8180_93cx6.h | 5 - drivers/staging/rtl8192su/r8190_rtl8256.c | 312 - drivers/staging/rtl8192su/r8192S_Efuse.c | 113 - drivers/staging/rtl8192su/r8192S_FwImgDTM.h | 3797 -------- drivers/staging/rtl8192su/r8192S_firmware.c | 483 - drivers/staging/rtl8192su/r8192S_firmware.h | 5 - drivers/staging/rtl8192su/r8192S_hw.h | 184 - drivers/staging/rtl8192su/r8192S_phy.c | 947 +-- drivers/staging/rtl8192su/r8192S_phy.h | 5 +- drivers/staging/rtl8192su/r8192S_rtl6052.c | 104 - drivers/staging/rtl8192su/r8192S_rtl6052.h | 47 - drivers/staging/rtl8192su/r8192U.h | 528 +- drivers/staging/rtl8192su/r8192U_core.c | 4898 +---------- drivers/staging/rtl8192su/r8192U_dm.c | 550 +-- drivers/staging/rtl8192su/r8192U_dm.h | 55 - drivers/staging/rtl8192su/r8192U_pm.c | 11 +- drivers/staging/rtl8192su/r8192U_pm.h | 2 - drivers/staging/rtl8192su/r8192U_wx.c | 132 +- drivers/staging/rtl8192su/r8192U_wx.h | 1 - drivers/staging/rtl8192su/r819xU_HTType.h | 9 - drivers/staging/rtl8192su/r819xU_cmdpkt.c | 113 +- drivers/staging/rtl8192su/r819xU_cmdpkt.h | 20 - drivers/staging/rtl8192su/r819xU_firmware.c | 707 -- drivers/staging/rtl8192su/r819xU_firmware.h | 106 - drivers/staging/rtl8192su/r819xU_firmware_img.c | 3447 ------- drivers/staging/rtl8192su/r819xU_firmware_img.h | 35 - drivers/staging/sep/Kconfig | 10 + drivers/staging/sep/Makefile | 2 + drivers/staging/sep/TODO | 8 + drivers/staging/sep/sep_dev.h | 110 + drivers/staging/sep/sep_driver.c | 2707 ++++++ drivers/staging/sep/sep_driver_api.h | 425 + drivers/staging/sep/sep_driver_config.h | 225 + drivers/staging/sep/sep_driver_hw_defs.h | 232 + drivers/staging/serqt_usb2/serqt_usb2.c | 2 +- drivers/staging/slicoss/slicoss.c | 2 +- drivers/staging/sxg/Kconfig | 11 - drivers/staging/sxg/Makefile | 3 - drivers/staging/sxg/README | 12 - drivers/staging/sxg/sxg.c | 4543 --------- drivers/staging/sxg/sxg.h | 787 -- drivers/staging/sxg/sxg_ethtool.c | 328 - drivers/staging/sxg/sxg_os.h | 149 - drivers/staging/sxg/sxgdbg.h | 184 - drivers/staging/sxg/sxghif.h | 1014 -- drivers/staging/sxg/sxghw.h | 1020 -- drivers/staging/sxg/sxgphycode-1.2.h | 130 - drivers/staging/udlfb/udlfb.h | 2 +- drivers/staging/usbip/Kconfig | 2 +- drivers/staging/usbip/stub_dev.c | 16 +- drivers/staging/usbip/stub_main.c | 8 +- drivers/staging/usbip/stub_rx.c | 49 +- drivers/staging/usbip/stub_tx.c | 26 +- drivers/staging/usbip/usbip_common.c | 226 +- drivers/staging/usbip/usbip_common.h | 96 +- drivers/staging/usbip/usbip_event.c | 37 +- drivers/staging/usbip/vhci_hcd.c | 156 +- drivers/staging/usbip/vhci_rx.c | 41 +- drivers/staging/usbip/vhci_sysfs.c | 22 +- drivers/staging/usbip/vhci_tx.c | 22 +- drivers/staging/vme/Kconfig | 17 + drivers/staging/vme/Makefile | 7 + drivers/staging/vme/TODO | 98 + drivers/staging/vme/bridges/Kconfig | 13 + drivers/staging/vme/bridges/Makefile | 2 + drivers/staging/vme/bridges/vme_ca91cx42.c | 1933 ++++ drivers/staging/vme/bridges/vme_ca91cx42.h | 505 + drivers/staging/vme/bridges/vme_tsi148.c | 2925 ++++++ drivers/staging/vme/bridges/vme_tsi148.h | 1387 +++ drivers/staging/vme/devices/Kconfig | 8 + drivers/staging/vme/devices/Makefile | 5 + drivers/staging/vme/devices/vme_user.c | 826 ++ drivers/staging/vme/devices/vme_user.h | 52 + drivers/staging/vme/vme.c | 1497 +++ drivers/staging/vme/vme.h | 161 + drivers/staging/vme/vme_api.txt | 372 + drivers/staging/vme/vme_bridge.h | 261 + drivers/staging/vt6655/80211hdr.h | 10 +- drivers/staging/vt6655/80211mgr.c | 38 +- drivers/staging/vt6655/80211mgr.h | 13 +- drivers/staging/vt6655/IEEE11h.c | 47 +- drivers/staging/vt6655/IEEE11h.h | 16 - drivers/staging/vt6655/Kconfig | 2 +- drivers/staging/vt6655/Makefile | 6 +- drivers/staging/vt6655/Makefile.arm | 181 - drivers/staging/vt6655/Makefile.x86 | 209 - drivers/staging/vt6655/TODO | 21 + drivers/staging/vt6655/aes_ccmp.c | 30 +- drivers/staging/vt6655/aes_ccmp.h | 2 - drivers/staging/vt6655/baseband.c | 61 +- drivers/staging/vt6655/baseband.h | 35 +- drivers/staging/vt6655/bssdb.c | 158 +- drivers/staging/vt6655/bssdb.h | 23 +- drivers/staging/vt6655/card.c | 80 +- drivers/staging/vt6655/card.h | 17 - drivers/staging/vt6655/country.h | 17 +- drivers/staging/vt6655/datarate.c | 26 +- drivers/staging/vt6655/desc.h | 103 +- drivers/staging/vt6655/device.h | 177 +- drivers/staging/vt6655/device_cfg.h | 46 +- drivers/staging/vt6655/device_main.c | 643 +- drivers/staging/vt6655/dpc.c | 304 +- drivers/staging/vt6655/dpc.h | 24 +- drivers/staging/vt6655/hostap.c | 135 +- drivers/staging/vt6655/hostap.h | 24 - drivers/staging/vt6655/iocmd.h | 23 +- drivers/staging/vt6655/ioctl.c | 101 +- drivers/staging/vt6655/ioctl.h | 17 - drivers/staging/vt6655/iowpa.h | 4 +- drivers/staging/vt6655/iwctl.c | 314 +- drivers/staging/vt6655/iwctl.h | 105 +- drivers/staging/vt6655/kcompat.h | 49 +- drivers/staging/vt6655/key.c | 153 +- drivers/staging/vt6655/key.h | 24 +- drivers/staging/vt6655/mac.c | 145 +- drivers/staging/vt6655/mac.h | 19 +- drivers/staging/vt6655/mib.c | 153 +- drivers/staging/vt6655/mib.h | 35 +- drivers/staging/vt6655/michael.c | 7 - drivers/staging/vt6655/michael.h | 4 - drivers/staging/vt6655/power.c | 45 +- drivers/staging/vt6655/power.h | 3 +- drivers/staging/vt6655/rc4.c | 7 +- drivers/staging/vt6655/rc4.h | 6 +- drivers/staging/vt6655/rf.c | 16 +- drivers/staging/vt6655/rf.h | 16 +- drivers/staging/vt6655/rxtx.c | 556 +- drivers/staging/vt6655/rxtx.h | 10 +- drivers/staging/vt6655/srom.c | 31 +- drivers/staging/vt6655/srom.h | 24 +- drivers/staging/vt6655/tcrc.c | 9 - drivers/staging/vt6655/tcrc.h | 18 - drivers/staging/vt6655/tether.c | 16 +- drivers/staging/vt6655/tether.h | 26 +- drivers/staging/vt6655/tkip.c | 12 - drivers/staging/vt6655/tkip.h | 16 - drivers/staging/vt6655/tmacro.h | 90 - drivers/staging/vt6655/tpci.h | 117 - drivers/staging/vt6655/ttype.h | 261 +- drivers/staging/vt6655/upc.h | 5 - drivers/staging/vt6655/vntwifi.c | 33 +- drivers/staging/vt6655/vntwifi.h | 19 +- drivers/staging/vt6655/wcmd.c | 137 +- drivers/staging/vt6655/wcmd.h | 22 +- drivers/staging/vt6655/wctl.c | 17 +- drivers/staging/vt6655/wctl.h | 19 - drivers/staging/vt6655/wmgr.c | 360 +- drivers/staging/vt6655/wmgr.h | 33 +- drivers/staging/vt6655/wpa.c | 71 +- drivers/staging/vt6655/wpa.h | 14 - drivers/staging/vt6655/wpa2.c | 55 +- drivers/staging/vt6655/wpa2.h | 24 +- drivers/staging/vt6655/wpactl.c | 102 +- drivers/staging/vt6655/wpactl.h | 17 - drivers/staging/vt6655/wroute.c | 28 +- drivers/staging/vt6655/wroute.h | 18 - drivers/staging/vt6656/80211hdr.h | 353 + drivers/staging/vt6656/80211mgr.c | 1026 ++ drivers/staging/vt6656/80211mgr.h | 861 ++ drivers/staging/vt6656/Kconfig | 6 + drivers/staging/vt6656/Makefile | 39 + drivers/staging/vt6656/TODO | 20 + drivers/staging/vt6656/aes_ccmp.c | 402 + .../staging/{vt6655/tbit.h => vt6656/aes_ccmp.h} | 48 +- drivers/staging/vt6656/baseband.c | 2105 ++++ drivers/staging/vt6656/baseband.h | 146 + drivers/staging/vt6656/bssdb.c | 1721 ++++ drivers/staging/vt6656/bssdb.h | 359 + drivers/staging/vt6656/card.c | 1113 +++ drivers/staging/vt6656/card.h | 95 + drivers/staging/vt6656/channel.c | 525 + .../staging/{vt6655/umem.h => vt6656/channel.h} | 58 +- drivers/staging/vt6656/control.c | 109 + .../staging/{vt6655/tbit.h => vt6656/control.h} | 69 +- drivers/staging/vt6656/country.h | 163 + drivers/staging/vt6656/datarate.c | 499 + drivers/staging/vt6656/datarate.h | 110 + drivers/staging/vt6656/desc.h | 443 + drivers/staging/vt6656/device.h | 939 ++ drivers/staging/vt6656/device_cfg.h | 107 + drivers/staging/vt6656/dpc.c | 1616 ++++ drivers/staging/{vt6655/umem.h => vt6656/dpc.h} | 65 +- drivers/staging/vt6656/firmware.c | 876 ++ .../staging/{vt6655/umem.h => vt6656/firmware.h} | 55 +- drivers/staging/vt6656/hostap.c | 868 ++ drivers/staging/{vt6655/umem.h => vt6656/hostap.h} | 63 +- drivers/staging/vt6656/int.c | 193 + drivers/staging/{vt6655/umem.h => vt6656/int.h} | 74 +- drivers/staging/vt6656/iocmd.h | 475 + drivers/staging/vt6656/ioctl.c | 701 ++ drivers/staging/{vt6655/umem.h => vt6656/ioctl.h} | 52 +- drivers/staging/vt6656/iowpa.h | 158 + drivers/staging/vt6656/iwctl.c | 2190 +++++ drivers/staging/vt6656/iwctl.h | 229 + drivers/staging/vt6656/kcompat.h | 39 + drivers/staging/vt6656/key.c | 869 ++ drivers/staging/vt6656/key.h | 177 + drivers/staging/vt6656/mac.c | 482 + drivers/staging/vt6656/mac.h | 442 + drivers/staging/vt6656/main_usb.c | 2196 +++++ drivers/staging/vt6656/mib.c | 573 ++ drivers/staging/vt6656/mib.h | 423 + drivers/staging/vt6656/michael.c | 181 + .../staging/{vt6655/tbit.h => vt6656/michael.h} | 60 +- drivers/staging/vt6656/power.c | 424 + drivers/staging/{vt6655/tbit.h => vt6656/power.h} | 90 +- drivers/staging/vt6656/rc4.c | 87 + drivers/staging/vt6656/rc4.h | 47 + drivers/staging/vt6656/rf.c | 1151 +++ drivers/staging/vt6656/rf.h | 100 + drivers/staging/vt6656/rndis.h | 162 + drivers/staging/vt6656/rxtx.c | 3239 +++++++ drivers/staging/vt6656/rxtx.h | 694 ++ drivers/staging/vt6656/srom.h | 127 + drivers/staging/vt6656/tcrc.c | 198 + drivers/staging/{vt6655/tbit.h => vt6656/tcrc.h} | 45 +- drivers/staging/vt6656/tether.c | 109 + drivers/staging/vt6656/tether.h | 236 + drivers/staging/vt6656/tkip.c | 272 + drivers/staging/{vt6655/tbit.h => vt6656/tkip.h} | 50 +- drivers/staging/vt6656/tmacro.h | 62 + drivers/staging/vt6656/ttype.h | 162 + drivers/staging/vt6656/upc.h | 166 + drivers/staging/vt6656/usbpipe.c | 841 ++ .../staging/{vt6655/tbit.h => vt6656/usbpipe.h} | 99 +- drivers/staging/vt6656/vntconfiguration.dat | 6 + drivers/staging/vt6656/wcmd.c | 1354 +++ drivers/staging/vt6656/wcmd.h | 150 + drivers/staging/vt6656/wctl.c | 254 + drivers/staging/vt6656/wctl.h | 108 + drivers/staging/vt6656/wmgr.c | 4949 ++++++++++ drivers/staging/vt6656/wmgr.h | 502 + drivers/staging/vt6656/wpa.c | 316 + drivers/staging/{vt6655/tbit.h => vt6656/wpa.h} | 84 +- drivers/staging/vt6656/wpa2.c | 363 + drivers/staging/{vt6655/umem.h => vt6656/wpa2.h} | 69 +- drivers/staging/vt6656/wpactl.c | 1008 ++ drivers/staging/{vt6655/tbit.h => vt6656/wpactl.h} | 56 +- drivers/staging/winbond/core.h | 4 +- drivers/staging/winbond/localpara.h | 1 - drivers/staging/winbond/mds.c | 22 +- drivers/staging/winbond/mds_f.h | 6 +- drivers/staging/winbond/mds_s.h | 17 +- drivers/staging/winbond/mlmetxrx.c | 2 +- drivers/staging/winbond/mlmetxrx_f.h | 32 +- drivers/staging/winbond/mto.c | 26 +- drivers/staging/winbond/mto.h | 116 +- drivers/staging/winbond/wb35rx.c | 4 +- drivers/staging/winbond/wb35tx.c | 4 +- drivers/staging/winbond/wbhal_f.h | 2 +- drivers/staging/winbond/wbhal_s.h | 4 +- drivers/staging/winbond/wbusb.c | 5 - drivers/staging/wlan-ng/hfa384x_usb.c | 205 +- drivers/staging/wlan-ng/p80211conv.c | 12 +- drivers/staging/wlan-ng/p80211hdr.h | 15 - drivers/staging/wlan-ng/p80211meta.h | 6 - drivers/staging/wlan-ng/p80211mgmt.h | 6 - drivers/staging/wlan-ng/p80211msg.h | 6 - drivers/staging/wlan-ng/p80211netdev.c | 62 +- drivers/staging/wlan-ng/p80211netdev.h | 3 - drivers/staging/wlan-ng/p80211req.c | 12 +- drivers/staging/wlan-ng/p80211types.h | 4 - drivers/staging/wlan-ng/p80211wep.c | 27 +- drivers/staging/wlan-ng/p80211wext.c | 77 +- drivers/staging/wlan-ng/prism2fw.c | 509 +- drivers/staging/wlan-ng/prism2mgmt.c | 23 +- drivers/staging/wlan-ng/prism2mib.c | 144 +- drivers/staging/wlan-ng/prism2sta.c | 153 +- drivers/staging/wlan-ng/prism2usb.c | 10 +- include/linux/gpio_event.h | 154 + 1254 files changed, 287927 insertions(+), 209389 deletions(-) delete mode 100644 drivers/staging/android/lowmemorykiller.txt delete mode 100644 drivers/staging/at76_usb/Kconfig delete mode 100644 drivers/staging/at76_usb/Makefile delete mode 100644 drivers/staging/at76_usb/TODO delete mode 100644 drivers/staging/at76_usb/at76_usb.c delete mode 100644 drivers/staging/at76_usb/at76_usb.h create mode 100644 drivers/staging/cowloop/Kconfig create mode 100644 drivers/staging/cowloop/Makefile create mode 100644 drivers/staging/cowloop/TODO create mode 100644 drivers/staging/cowloop/cowloop.c create mode 100644 drivers/staging/cowloop/cowloop.h create mode 100644 drivers/staging/dream/Kconfig create mode 100644 drivers/staging/dream/Makefile create mode 100644 drivers/staging/dream/camera/Kconfig create mode 100644 drivers/staging/dream/camera/Makefile create mode 100644 drivers/staging/dream/camera/msm_camera.c create mode 100644 drivers/staging/dream/camera/msm_io7x.c create mode 100644 drivers/staging/dream/camera/msm_io8x.c create mode 100644 drivers/staging/dream/camera/msm_v4l2.c create mode 100644 drivers/staging/dream/camera/msm_vfe7x.c create mode 100644 drivers/staging/dream/camera/msm_vfe7x.h create mode 100644 drivers/staging/dream/camera/msm_vfe8x.c create mode 100644 drivers/staging/dream/camera/msm_vfe8x.h create mode 100644 drivers/staging/dream/camera/msm_vfe8x_proc.c create mode 100644 drivers/staging/dream/camera/msm_vfe8x_proc.h create mode 100644 drivers/staging/dream/camera/mt9d112.c create mode 100644 drivers/staging/dream/camera/mt9d112.h create mode 100644 drivers/staging/dream/camera/mt9d112_reg.c create mode 100644 drivers/staging/dream/camera/mt9p012.h create mode 100644 drivers/staging/dream/camera/mt9p012_fox.c create mode 100644 drivers/staging/dream/camera/mt9p012_reg.c create mode 100644 drivers/staging/dream/camera/mt9t013.c create mode 100644 drivers/staging/dream/camera/mt9t013.h create mode 100644 drivers/staging/dream/camera/mt9t013_reg.c create mode 100644 drivers/staging/dream/camera/s5k3e2fx.c create mode 100644 drivers/staging/dream/camera/s5k3e2fx.h create mode 100644 drivers/staging/dream/gpio_axis.c create mode 100644 drivers/staging/dream/gpio_event.c create mode 100644 drivers/staging/dream/gpio_input.c create mode 100644 drivers/staging/dream/gpio_matrix.c create mode 100644 drivers/staging/dream/gpio_output.c create mode 100644 drivers/staging/dream/qdsp5/Makefile create mode 100644 drivers/staging/dream/qdsp5/adsp.c create mode 100644 drivers/staging/dream/qdsp5/adsp.h create mode 100644 drivers/staging/dream/qdsp5/adsp_6210.c create mode 100644 drivers/staging/dream/qdsp5/adsp_6220.c create mode 100644 drivers/staging/dream/qdsp5/adsp_6225.c create mode 100644 drivers/staging/dream/qdsp5/adsp_driver.c create mode 100644 drivers/staging/dream/qdsp5/adsp_info.c create mode 100644 drivers/staging/dream/qdsp5/adsp_jpeg_patch_event.c create mode 100644 drivers/staging/dream/qdsp5/adsp_jpeg_verify_cmd.c create mode 100644 drivers/staging/dream/qdsp5/adsp_lpm_verify_cmd.c create mode 100644 drivers/staging/dream/qdsp5/adsp_vfe_patch_event.c create mode 100644 drivers/staging/dream/qdsp5/adsp_vfe_verify_cmd.c create mode 100644 drivers/staging/dream/qdsp5/adsp_video_verify_cmd.c create mode 100644 drivers/staging/dream/qdsp5/adsp_videoenc_verify_cmd.c create mode 100644 drivers/staging/dream/qdsp5/audio_aac.c create mode 100644 drivers/staging/dream/qdsp5/audio_amrnb.c create mode 100644 drivers/staging/dream/qdsp5/audio_evrc.c create mode 100644 drivers/staging/dream/qdsp5/audio_in.c create mode 100644 drivers/staging/dream/qdsp5/audio_mp3.c create mode 100644 drivers/staging/dream/qdsp5/audio_out.c create mode 100644 drivers/staging/dream/qdsp5/audio_qcelp.c create mode 100644 drivers/staging/dream/qdsp5/audmgr.c create mode 100644 drivers/staging/dream/qdsp5/audmgr.h create mode 100644 drivers/staging/dream/qdsp5/audmgr_new.h create mode 100644 drivers/staging/dream/qdsp5/audpp.c create mode 100644 drivers/staging/dream/qdsp5/evlog.h create mode 100644 drivers/staging/dream/qdsp5/snd.c create mode 100644 drivers/staging/dream/smd/Kconfig create mode 100644 drivers/staging/dream/smd/Makefile create mode 100644 drivers/staging/dream/smd/rpc_server_dog_keepalive.c create mode 100644 drivers/staging/dream/smd/rpc_server_time_remote.c create mode 100644 drivers/staging/dream/smd/smd.c create mode 100644 drivers/staging/dream/smd/smd_private.h create mode 100644 drivers/staging/dream/smd/smd_qmi.c create mode 100644 drivers/staging/dream/smd/smd_rpcrouter.c create mode 100644 drivers/staging/dream/smd/smd_rpcrouter.h create mode 100644 drivers/staging/dream/smd/smd_rpcrouter_device.c create mode 100644 drivers/staging/dream/smd/smd_rpcrouter_servers.c create mode 100644 drivers/staging/dream/smd/smd_tty.c create mode 100644 drivers/staging/dream/synaptics_i2c_rmi.c create mode 100644 drivers/staging/dream/synaptics_i2c_rmi.h delete mode 100644 drivers/staging/echo/bit_operations.h delete mode 100644 drivers/staging/echo/mmx.h delete mode 100644 drivers/staging/epl/Benchmark.h delete mode 100644 drivers/staging/epl/Debug.h delete mode 100644 drivers/staging/epl/Edrv8139.c delete mode 100644 drivers/staging/epl/EdrvFec.h delete mode 100644 drivers/staging/epl/EdrvSim.h delete mode 100644 drivers/staging/epl/Epl.h delete mode 100644 drivers/staging/epl/EplAmi.h delete mode 100644 drivers/staging/epl/EplApiGeneric.c delete mode 100644 drivers/staging/epl/EplApiLinux.h delete mode 100644 drivers/staging/epl/EplApiLinuxKernel.c delete mode 100644 drivers/staging/epl/EplApiProcessImage.c delete mode 100644 drivers/staging/epl/EplCfg.h delete mode 100644 drivers/staging/epl/EplDef.h delete mode 100644 drivers/staging/epl/EplDll.h delete mode 100644 drivers/staging/epl/EplDllCal.h delete mode 100644 drivers/staging/epl/EplDllk.c delete mode 100644 drivers/staging/epl/EplDllkCal.c delete mode 100644 drivers/staging/epl/EplDlluCal.c delete mode 100644 drivers/staging/epl/EplErrDef.h delete mode 100644 drivers/staging/epl/EplErrorHandlerk.c delete mode 100644 drivers/staging/epl/EplEvent.h delete mode 100644 drivers/staging/epl/EplEventk.c delete mode 100644 drivers/staging/epl/EplEventu.c delete mode 100644 drivers/staging/epl/EplFrame.h delete mode 100644 drivers/staging/epl/EplIdentu.c delete mode 100644 drivers/staging/epl/EplInc.h delete mode 100644 drivers/staging/epl/EplInstDef.h delete mode 100644 drivers/staging/epl/EplLed.h delete mode 100644 drivers/staging/epl/EplNmt.h delete mode 100644 drivers/staging/epl/EplNmtCnu.c delete mode 100644 drivers/staging/epl/EplNmtMnu.c delete mode 100644 drivers/staging/epl/EplNmtk.c delete mode 100644 drivers/staging/epl/EplNmtkCal.c delete mode 100644 drivers/staging/epl/EplNmtu.c delete mode 100644 drivers/staging/epl/EplNmtuCal.c delete mode 100644 drivers/staging/epl/EplObd.c delete mode 100644 drivers/staging/epl/EplObd.h delete mode 100644 drivers/staging/epl/EplObdMacro.h delete mode 100644 drivers/staging/epl/EplObdkCal.c delete mode 100644 drivers/staging/epl/EplObdu.c delete mode 100644 drivers/staging/epl/EplObduCal.c delete mode 100644 drivers/staging/epl/EplPdo.h delete mode 100644 drivers/staging/epl/EplPdok.c delete mode 100644 drivers/staging/epl/EplPdokCal.c delete mode 100644 drivers/staging/epl/EplPdou.c delete mode 100644 drivers/staging/epl/EplSdo.h delete mode 100644 drivers/staging/epl/EplSdoAc.h delete mode 100644 drivers/staging/epl/EplSdoAsndu.c delete mode 100644 drivers/staging/epl/EplSdoAsySequ.c delete mode 100644 drivers/staging/epl/EplSdoComu.c delete mode 100644 drivers/staging/epl/EplSdoUdpu.c delete mode 100644 drivers/staging/epl/EplStatusu.c delete mode 100644 drivers/staging/epl/EplTarget.h delete mode 100644 drivers/staging/epl/EplTimer.h delete mode 100644 drivers/staging/epl/EplTimeruLinuxKernel.c delete mode 100644 drivers/staging/epl/EplVersion.h delete mode 100644 drivers/staging/epl/Kconfig delete mode 100644 drivers/staging/epl/Makefile delete mode 100644 drivers/staging/epl/SharedBuff.c delete mode 100644 drivers/staging/epl/SharedBuff.h delete mode 100644 drivers/staging/epl/ShbIpc-LinuxKernel.c delete mode 100644 drivers/staging/epl/ShbIpc.h delete mode 100644 drivers/staging/epl/ShbLinuxKernel.h delete mode 100644 drivers/staging/epl/SocketLinuxKernel.c delete mode 100644 drivers/staging/epl/SocketLinuxKernel.h delete mode 100644 drivers/staging/epl/TimerHighReskX86.c delete mode 100644 drivers/staging/epl/VirtualEthernetLinux.c delete mode 100644 drivers/staging/epl/amix86.c delete mode 100644 drivers/staging/epl/demo_main.c delete mode 100644 drivers/staging/epl/edrv.h delete mode 100644 drivers/staging/epl/global.h delete mode 100644 drivers/staging/epl/kernel/EplDllk.h delete mode 100644 drivers/staging/epl/kernel/EplDllkCal.h delete mode 100644 drivers/staging/epl/kernel/EplErrorHandlerk.h delete mode 100644 drivers/staging/epl/kernel/EplEventk.h delete mode 100644 drivers/staging/epl/kernel/EplNmtk.h delete mode 100644 drivers/staging/epl/kernel/EplObdk.h delete mode 100644 drivers/staging/epl/kernel/EplPdok.h delete mode 100644 drivers/staging/epl/kernel/EplPdokCal.h delete mode 100644 drivers/staging/epl/kernel/EplTimerHighResk.h delete mode 100644 drivers/staging/epl/kernel/EplTimerk.h delete mode 100644 drivers/staging/epl/kernel/VirtualEthernet.h delete mode 100644 drivers/staging/epl/proc_fs.c delete mode 100644 drivers/staging/epl/proc_fs.h delete mode 100644 drivers/staging/epl/user/EplCfgMau.h delete mode 100644 drivers/staging/epl/user/EplDllu.h delete mode 100644 drivers/staging/epl/user/EplDlluCal.h delete mode 100644 drivers/staging/epl/user/EplEventu.h delete mode 100644 drivers/staging/epl/user/EplIdentu.h delete mode 100644 drivers/staging/epl/user/EplLedu.h delete mode 100644 drivers/staging/epl/user/EplNmtCnu.h delete mode 100644 drivers/staging/epl/user/EplNmtMnu.h delete mode 100644 drivers/staging/epl/user/EplNmtu.h delete mode 100644 drivers/staging/epl/user/EplNmtuCal.h delete mode 100644 drivers/staging/epl/user/EplObdu.h delete mode 100644 drivers/staging/epl/user/EplObduCal.h delete mode 100644 drivers/staging/epl/user/EplPdou.h delete mode 100644 drivers/staging/epl/user/EplSdoAsndu.h delete mode 100644 drivers/staging/epl/user/EplSdoAsySequ.h delete mode 100644 drivers/staging/epl/user/EplSdoComu.h delete mode 100644 drivers/staging/epl/user/EplSdoUdpu.h delete mode 100644 drivers/staging/epl/user/EplStatusu.h delete mode 100644 drivers/staging/epl/user/EplTimeru.h delete mode 100644 drivers/staging/et131x/et1310_jagcore.c delete mode 100644 drivers/staging/et131x/et131x_config.c delete mode 100644 drivers/staging/et131x/et131x_debug.c delete mode 100644 drivers/staging/et131x/et131x_debug.h delete mode 100644 drivers/staging/heci/Kconfig delete mode 100644 drivers/staging/heci/Makefile delete mode 100644 drivers/staging/heci/TODO delete mode 100644 drivers/staging/heci/heci.h delete mode 100644 drivers/staging/heci/heci_data_structures.h delete mode 100644 drivers/staging/heci/heci_init.c delete mode 100644 drivers/staging/heci/heci_interface.c delete mode 100644 drivers/staging/heci/heci_interface.h delete mode 100644 drivers/staging/heci/heci_main.c delete mode 100644 drivers/staging/heci/heci_version.h delete mode 100644 drivers/staging/heci/interrupt.c delete mode 100644 drivers/staging/heci/io_heci.c create mode 100644 drivers/staging/hv/BlkVsc.c create mode 100644 drivers/staging/hv/Channel.c create mode 100644 drivers/staging/hv/Channel.h create mode 100644 drivers/staging/hv/ChannelInterface.c create mode 100644 drivers/staging/hv/ChannelInterface.h create mode 100644 drivers/staging/hv/ChannelMgmt.c create mode 100644 drivers/staging/hv/ChannelMgmt.h create mode 100644 drivers/staging/hv/Connection.c create mode 100644 drivers/staging/hv/Hv.c create mode 100644 drivers/staging/hv/Hv.h create mode 100644 drivers/staging/hv/Kconfig create mode 100644 drivers/staging/hv/Makefile create mode 100644 drivers/staging/hv/NetVsc.c create mode 100644 drivers/staging/hv/NetVsc.h create mode 100644 drivers/staging/hv/NetVscApi.h create mode 100644 drivers/staging/hv/RingBuffer.c create mode 100644 drivers/staging/hv/RingBuffer.h create mode 100644 drivers/staging/hv/RndisFilter.c create mode 100644 drivers/staging/hv/RndisFilter.h create mode 100644 drivers/staging/hv/StorVsc.c create mode 100644 drivers/staging/hv/StorVscApi.h create mode 100644 drivers/staging/hv/TODO create mode 100644 drivers/staging/hv/VersionInfo.h create mode 100644 drivers/staging/hv/Vmbus.c create mode 100644 drivers/staging/hv/VmbusApi.h create mode 100644 drivers/staging/hv/VmbusChannelInterface.h create mode 100644 drivers/staging/hv/VmbusPacketFormat.h create mode 100644 drivers/staging/hv/VmbusPrivate.h create mode 100644 drivers/staging/hv/blkvsc_drv.c create mode 100644 drivers/staging/hv/hv_api.h create mode 100644 drivers/staging/hv/logging.h create mode 100644 drivers/staging/hv/netvsc_drv.c create mode 100644 drivers/staging/hv/osd.c create mode 100644 drivers/staging/hv/osd.h create mode 100644 drivers/staging/hv/rndis.h create mode 100644 drivers/staging/hv/storvsc_drv.c create mode 100644 drivers/staging/hv/vmbus.h create mode 100644 drivers/staging/hv/vmbus_drv.c create mode 100644 drivers/staging/hv/vstorage.h create mode 100644 drivers/staging/iio/Documentation/device.txt create mode 100644 drivers/staging/iio/Documentation/iio_utils.h create mode 100644 drivers/staging/iio/Documentation/lis3l02dqbuffersimple.c create mode 100644 drivers/staging/iio/Documentation/overview.txt create mode 100644 drivers/staging/iio/Documentation/ring.txt create mode 100644 drivers/staging/iio/Documentation/trigger.txt create mode 100644 drivers/staging/iio/Documentation/userspace.txt create mode 100644 drivers/staging/iio/Kconfig create mode 100644 drivers/staging/iio/Makefile create mode 100644 drivers/staging/iio/TODO create mode 100644 drivers/staging/iio/accel/Kconfig create mode 100644 drivers/staging/iio/accel/Makefile create mode 100644 drivers/staging/iio/accel/accel.h create mode 100644 drivers/staging/iio/accel/kxsd9.c create mode 100644 drivers/staging/iio/accel/lis3l02dq.h create mode 100644 drivers/staging/iio/accel/lis3l02dq_core.c create mode 100644 drivers/staging/iio/accel/lis3l02dq_ring.c create mode 100644 drivers/staging/iio/accel/sca3000.h create mode 100644 drivers/staging/iio/accel/sca3000_core.c create mode 100644 drivers/staging/iio/accel/sca3000_ring.c create mode 100644 drivers/staging/iio/adc/Kconfig create mode 100644 drivers/staging/iio/adc/Makefile create mode 100644 drivers/staging/iio/adc/adc.h create mode 100644 drivers/staging/iio/adc/max1363.h create mode 100644 drivers/staging/iio/adc/max1363_core.c create mode 100644 drivers/staging/iio/adc/max1363_ring.c create mode 100644 drivers/staging/iio/chrdev.h create mode 100644 drivers/staging/iio/iio.h create mode 100644 drivers/staging/iio/industrialio-core.c create mode 100644 drivers/staging/iio/industrialio-ring.c create mode 100644 drivers/staging/iio/industrialio-trigger.c create mode 100644 drivers/staging/iio/light/Kconfig create mode 100644 drivers/staging/iio/light/Makefile create mode 100644 drivers/staging/iio/light/light.h create mode 100644 drivers/staging/iio/light/tsl2561.c create mode 100644 drivers/staging/iio/ring_generic.h create mode 100644 drivers/staging/iio/ring_hw.h create mode 100644 drivers/staging/iio/ring_sw.c create mode 100644 drivers/staging/iio/ring_sw.h create mode 100644 drivers/staging/iio/sysfs.h create mode 100644 drivers/staging/iio/trigger.h create mode 100644 drivers/staging/iio/trigger/Kconfig create mode 100644 drivers/staging/iio/trigger/Makefile create mode 100644 drivers/staging/iio/trigger/iio-trig-gpio.c create mode 100644 drivers/staging/iio/trigger/iio-trig-periodic-rtc.c create mode 100644 drivers/staging/iio/trigger_consumer.h delete mode 100644 drivers/staging/me4000/Kconfig delete mode 100644 drivers/staging/me4000/Makefile delete mode 100644 drivers/staging/me4000/README delete mode 100644 drivers/staging/me4000/me4000.c delete mode 100644 drivers/staging/me4000/me4000.h delete mode 100644 drivers/staging/me4000/me4000_firmware.h delete mode 100644 drivers/staging/me4000/me4610_firmware.h delete mode 100644 drivers/staging/meilhaus/Kconfig delete mode 100644 drivers/staging/meilhaus/Makefile delete mode 100644 drivers/staging/meilhaus/TODO delete mode 100644 drivers/staging/meilhaus/me0600_device.c delete mode 100644 drivers/staging/meilhaus/me0600_device.h delete mode 100644 drivers/staging/meilhaus/me0600_dio.c delete mode 100644 drivers/staging/meilhaus/me0600_dio.h delete mode 100644 drivers/staging/meilhaus/me0600_dio_reg.h delete mode 100644 drivers/staging/meilhaus/me0600_ext_irq.c delete mode 100644 drivers/staging/meilhaus/me0600_ext_irq.h delete mode 100644 drivers/staging/meilhaus/me0600_ext_irq_reg.h delete mode 100644 drivers/staging/meilhaus/me0600_optoi.c delete mode 100644 drivers/staging/meilhaus/me0600_optoi.h delete mode 100644 drivers/staging/meilhaus/me0600_optoi_reg.h delete mode 100644 drivers/staging/meilhaus/me0600_relay.c delete mode 100644 drivers/staging/meilhaus/me0600_relay.h delete mode 100644 drivers/staging/meilhaus/me0600_relay_reg.h delete mode 100644 drivers/staging/meilhaus/me0600_ttli.c delete mode 100644 drivers/staging/meilhaus/me0600_ttli.h delete mode 100644 drivers/staging/meilhaus/me0600_ttli_reg.h delete mode 100644 drivers/staging/meilhaus/me0900_device.c delete mode 100644 drivers/staging/meilhaus/me0900_device.h delete mode 100644 drivers/staging/meilhaus/me0900_di.c delete mode 100644 drivers/staging/meilhaus/me0900_di.h delete mode 100644 drivers/staging/meilhaus/me0900_do.c delete mode 100644 drivers/staging/meilhaus/me0900_do.h delete mode 100644 drivers/staging/meilhaus/me0900_reg.h delete mode 100644 drivers/staging/meilhaus/me1000_device.c delete mode 100644 drivers/staging/meilhaus/me1000_device.h delete mode 100644 drivers/staging/meilhaus/me1000_dio.c delete mode 100644 drivers/staging/meilhaus/me1000_dio.h delete mode 100644 drivers/staging/meilhaus/me1000_dio_reg.h delete mode 100644 drivers/staging/meilhaus/me1400_device.c delete mode 100644 drivers/staging/meilhaus/me1400_device.h delete mode 100644 drivers/staging/meilhaus/me1400_ext_irq.c delete mode 100644 drivers/staging/meilhaus/me1400_ext_irq.h delete mode 100644 drivers/staging/meilhaus/me1400_ext_irq_reg.h delete mode 100644 drivers/staging/meilhaus/me1600_ao.c delete mode 100644 drivers/staging/meilhaus/me1600_ao.h delete mode 100644 drivers/staging/meilhaus/me1600_ao_reg.h delete mode 100644 drivers/staging/meilhaus/me1600_device.c delete mode 100644 drivers/staging/meilhaus/me1600_device.h delete mode 100644 drivers/staging/meilhaus/me4600_ai.c delete mode 100644 drivers/staging/meilhaus/me4600_ai.h delete mode 100644 drivers/staging/meilhaus/me4600_ai_reg.h delete mode 100644 drivers/staging/meilhaus/me4600_ao.c delete mode 100644 drivers/staging/meilhaus/me4600_ao.h delete mode 100644 drivers/staging/meilhaus/me4600_ao_reg.h delete mode 100644 drivers/staging/meilhaus/me4600_device.c delete mode 100644 drivers/staging/meilhaus/me4600_device.h delete mode 100644 drivers/staging/meilhaus/me4600_di.c delete mode 100644 drivers/staging/meilhaus/me4600_di.h delete mode 100644 drivers/staging/meilhaus/me4600_dio.c delete mode 100644 drivers/staging/meilhaus/me4600_dio.h delete mode 100644 drivers/staging/meilhaus/me4600_dio_reg.h delete mode 100644 drivers/staging/meilhaus/me4600_do.c delete mode 100644 drivers/staging/meilhaus/me4600_do.h delete mode 100644 drivers/staging/meilhaus/me4600_ext_irq.c delete mode 100644 drivers/staging/meilhaus/me4600_ext_irq.h delete mode 100644 drivers/staging/meilhaus/me4600_ext_irq_reg.h delete mode 100644 drivers/staging/meilhaus/me4600_reg.h delete mode 100644 drivers/staging/meilhaus/me6000_ao.c delete mode 100644 drivers/staging/meilhaus/me6000_ao.h delete mode 100644 drivers/staging/meilhaus/me6000_ao_reg.h delete mode 100644 drivers/staging/meilhaus/me6000_device.c delete mode 100644 drivers/staging/meilhaus/me6000_device.h delete mode 100644 drivers/staging/meilhaus/me6000_dio.c delete mode 100644 drivers/staging/meilhaus/me6000_dio.h delete mode 100644 drivers/staging/meilhaus/me6000_dio_reg.h delete mode 100644 drivers/staging/meilhaus/me6000_reg.h delete mode 100644 drivers/staging/meilhaus/me8100_device.c delete mode 100644 drivers/staging/meilhaus/me8100_device.h delete mode 100644 drivers/staging/meilhaus/me8100_di.c delete mode 100644 drivers/staging/meilhaus/me8100_di.h delete mode 100644 drivers/staging/meilhaus/me8100_di_reg.h delete mode 100644 drivers/staging/meilhaus/me8100_do.c delete mode 100644 drivers/staging/meilhaus/me8100_do.h delete mode 100644 drivers/staging/meilhaus/me8100_do_reg.h delete mode 100644 drivers/staging/meilhaus/me8100_reg.h delete mode 100644 drivers/staging/meilhaus/me8200_device.c delete mode 100644 drivers/staging/meilhaus/me8200_device.h delete mode 100644 drivers/staging/meilhaus/me8200_di.c delete mode 100644 drivers/staging/meilhaus/me8200_di.h delete mode 100644 drivers/staging/meilhaus/me8200_di_reg.h delete mode 100644 drivers/staging/meilhaus/me8200_dio.c delete mode 100644 drivers/staging/meilhaus/me8200_dio.h delete mode 100644 drivers/staging/meilhaus/me8200_dio_reg.h delete mode 100644 drivers/staging/meilhaus/me8200_do.c delete mode 100644 drivers/staging/meilhaus/me8200_do.h delete mode 100644 drivers/staging/meilhaus/me8200_do_reg.h delete mode 100644 drivers/staging/meilhaus/me8200_reg.h delete mode 100644 drivers/staging/meilhaus/me8254.c delete mode 100644 drivers/staging/meilhaus/me8254.h delete mode 100644 drivers/staging/meilhaus/me8254_reg.h delete mode 100644 drivers/staging/meilhaus/me8255.c delete mode 100644 drivers/staging/meilhaus/me8255.h delete mode 100644 drivers/staging/meilhaus/me8255_reg.h delete mode 100644 drivers/staging/meilhaus/mecirc_buf.h delete mode 100644 drivers/staging/meilhaus/mecommon.h delete mode 100644 drivers/staging/meilhaus/medebug.h delete mode 100644 drivers/staging/meilhaus/medefines.h delete mode 100644 drivers/staging/meilhaus/medevice.c delete mode 100644 drivers/staging/meilhaus/medevice.h delete mode 100644 drivers/staging/meilhaus/medlist.c delete mode 100644 drivers/staging/meilhaus/medlist.h delete mode 100644 drivers/staging/meilhaus/medlock.c delete mode 100644 drivers/staging/meilhaus/medlock.h delete mode 100644 drivers/staging/meilhaus/medriver.h delete mode 100644 drivers/staging/meilhaus/medummy.c delete mode 100644 drivers/staging/meilhaus/medummy.h delete mode 100644 drivers/staging/meilhaus/meerror.h delete mode 100644 drivers/staging/meilhaus/mefirmware.c delete mode 100644 drivers/staging/meilhaus/mefirmware.h delete mode 100644 drivers/staging/meilhaus/meids.h delete mode 100644 drivers/staging/meilhaus/meinternal.h delete mode 100644 drivers/staging/meilhaus/meioctl.h delete mode 100644 drivers/staging/meilhaus/memain.c delete mode 100644 drivers/staging/meilhaus/memain.h delete mode 100644 drivers/staging/meilhaus/meplx_reg.h delete mode 100644 drivers/staging/meilhaus/meslist.c delete mode 100644 drivers/staging/meilhaus/meslist.h delete mode 100644 drivers/staging/meilhaus/meslock.c delete mode 100644 drivers/staging/meilhaus/meslock.h delete mode 100644 drivers/staging/meilhaus/mesubdevice.c delete mode 100644 drivers/staging/meilhaus/mesubdevice.h delete mode 100644 drivers/staging/meilhaus/metempl_device.c delete mode 100644 drivers/staging/meilhaus/metempl_device.h delete mode 100644 drivers/staging/meilhaus/metempl_sub.c delete mode 100644 drivers/staging/meilhaus/metempl_sub.h delete mode 100644 drivers/staging/meilhaus/metempl_sub_reg.h delete mode 100644 drivers/staging/meilhaus/metypes.h delete mode 100644 drivers/staging/pata_rdc/Kconfig delete mode 100644 drivers/staging/pata_rdc/Makefile delete mode 100644 drivers/staging/pata_rdc/pata_rdc.c delete mode 100644 drivers/staging/pata_rdc/pata_rdc.h create mode 100644 drivers/staging/quatech_usb2/Kconfig create mode 100644 drivers/staging/quatech_usb2/Makefile create mode 100644 drivers/staging/quatech_usb2/TODO create mode 100644 drivers/staging/quatech_usb2/quatech_usb2.c create mode 100644 drivers/staging/rar/Kconfig create mode 100644 drivers/staging/rar/Makefile create mode 100644 drivers/staging/rar/rar_driver.c create mode 100644 drivers/staging/rar/rar_driver.h delete mode 100644 drivers/staging/rspiusb/Kconfig delete mode 100644 drivers/staging/rspiusb/Makefile delete mode 100644 drivers/staging/rspiusb/TODO delete mode 100644 drivers/staging/rspiusb/rspiusb.c delete mode 100644 drivers/staging/rspiusb/rspiusb.h delete mode 100644 drivers/staging/rt2870/common/firmware.h delete mode 100644 drivers/staging/rt2870/link_list.h delete mode 100644 drivers/staging/rt3070/2870_main_dev.c delete mode 100644 drivers/staging/rt3070/Kconfig delete mode 100644 drivers/staging/rt3070/Makefile delete mode 100644 drivers/staging/rt3070/action.h delete mode 100644 drivers/staging/rt3070/aironet.h delete mode 100644 drivers/staging/rt3070/ap.h delete mode 100644 drivers/staging/rt3070/chlist.h delete mode 100644 drivers/staging/rt3070/common/2870_rtmp_init.c delete mode 100644 drivers/staging/rt3070/common/action.c delete mode 100644 drivers/staging/rt3070/common/ba_action.c delete mode 100644 drivers/staging/rt3070/common/cmm_data.c delete mode 100644 drivers/staging/rt3070/common/cmm_data_2870.c delete mode 100644 drivers/staging/rt3070/common/cmm_info.c delete mode 100644 drivers/staging/rt3070/common/cmm_sanity.c delete mode 100644 drivers/staging/rt3070/common/cmm_sync.c delete mode 100644 drivers/staging/rt3070/common/cmm_wpa.c delete mode 100644 drivers/staging/rt3070/common/dfs.c delete mode 100644 drivers/staging/rt3070/common/eeprom.c delete mode 100644 drivers/staging/rt3070/common/md5.c delete mode 100644 drivers/staging/rt3070/common/mlme.c delete mode 100644 drivers/staging/rt3070/common/rtmp_init.c delete mode 100644 drivers/staging/rt3070/common/rtmp_tkip.c delete mode 100644 drivers/staging/rt3070/common/rtmp_wep.c delete mode 100644 drivers/staging/rt3070/common/rtusb_bulk.c delete mode 100644 drivers/staging/rt3070/common/rtusb_data.c delete mode 100644 drivers/staging/rt3070/common/rtusb_io.c delete mode 100644 drivers/staging/rt3070/common/spectrum.c delete mode 100644 drivers/staging/rt3070/dfs.h delete mode 100644 drivers/staging/rt3070/link_list.h delete mode 100644 drivers/staging/rt3070/md5.h delete mode 100644 drivers/staging/rt3070/mlme.h delete mode 100644 drivers/staging/rt3070/oid.h delete mode 100644 drivers/staging/rt3070/rt2870.h delete mode 100644 drivers/staging/rt3070/rt28xx.h delete mode 100644 drivers/staging/rt3070/rt_config.h delete mode 100644 drivers/staging/rt3070/rt_linux.c delete mode 100644 drivers/staging/rt3070/rt_linux.h delete mode 100644 drivers/staging/rt3070/rt_main_dev.c delete mode 100644 drivers/staging/rt3070/rt_profile.c delete mode 100644 drivers/staging/rt3070/rtmp.h delete mode 100644 drivers/staging/rt3070/rtmp_ckipmic.h delete mode 100644 drivers/staging/rt3070/rtmp_def.h delete mode 100644 drivers/staging/rt3070/rtmp_type.h delete mode 100644 drivers/staging/rt3070/spectrum.h delete mode 100644 drivers/staging/rt3070/spectrum_def.h delete mode 100644 drivers/staging/rt3070/sta/aironet.c delete mode 100644 drivers/staging/rt3070/sta/assoc.c delete mode 100644 drivers/staging/rt3070/sta/auth.c delete mode 100644 drivers/staging/rt3070/sta/auth_rsp.c delete mode 100644 drivers/staging/rt3070/sta/connect.c delete mode 100644 drivers/staging/rt3070/sta/rtmp_data.c delete mode 100644 drivers/staging/rt3070/sta/sanity.c delete mode 100644 drivers/staging/rt3070/sta/sync.c delete mode 100644 drivers/staging/rt3070/sta/wpa.c delete mode 100644 drivers/staging/rt3070/sta_ioctl.c delete mode 100644 drivers/staging/rt3070/wpa.h create mode 100644 drivers/staging/rt3090/Kconfig create mode 100644 drivers/staging/rt3090/Makefile copy drivers/staging/{rt2860/md4.h => rt3090/action.h} (66%) create mode 100644 drivers/staging/rt3090/ap.h create mode 100644 drivers/staging/rt3090/ap_apcli.h copy drivers/staging/{rt2870/md4.h => rt3090/ap_autoChSel.h} (57%) copy drivers/staging/{rt2870/md4.h => rt3090/ap_autoChSel_cmm.h} (62%) create mode 100644 drivers/staging/rt3090/ap_cfg.h copy drivers/staging/{rt2860/md4.h => rt3090/ap_ids.h} (56%) copy drivers/staging/{rt2860/md4.h => rt3090/ap_mbss.h} (62%) create mode 100644 drivers/staging/rt3090/ap_uapsd.h create mode 100644 drivers/staging/rt3090/ap_wds.h create mode 100644 drivers/staging/rt3090/chips/rt3090.c create mode 100644 drivers/staging/rt3090/chips/rt30xx.c create mode 100644 drivers/staging/rt3090/chips/rt3370.c create mode 100644 drivers/staging/rt3090/chips/rt3390.c create mode 100644 drivers/staging/rt3090/chips/rt33xx.c create mode 100644 drivers/staging/rt3090/chlist.h create mode 100644 drivers/staging/rt3090/common/action.c create mode 100644 drivers/staging/rt3090/common/ba_action.c create mode 100644 drivers/staging/rt3090/common/cmm_aes.c create mode 100644 drivers/staging/rt3090/common/cmm_asic.c create mode 100644 drivers/staging/rt3090/common/cmm_cfg.c create mode 100644 drivers/staging/rt3090/common/cmm_data.c create mode 100644 drivers/staging/rt3090/common/cmm_data_pci.c create mode 100644 drivers/staging/rt3090/common/cmm_info.c create mode 100644 drivers/staging/rt3090/common/cmm_mac_pci.c create mode 100644 drivers/staging/rt3090/common/cmm_profile.c create mode 100644 drivers/staging/rt3090/common/cmm_sanity.c create mode 100644 drivers/staging/rt3090/common/cmm_sync.c create mode 100644 drivers/staging/rt3090/common/cmm_tkip.c create mode 100644 drivers/staging/rt3090/common/cmm_wep.c create mode 100644 drivers/staging/rt3090/common/cmm_wpa.c create mode 100644 drivers/staging/rt3090/common/crypt_aes.c create mode 100644 drivers/staging/rt3090/common/crypt_biginteger.c create mode 100644 drivers/staging/rt3090/common/crypt_dh.c create mode 100644 drivers/staging/rt3090/common/crypt_hmac.c create mode 100644 drivers/staging/rt3090/common/crypt_md5.c create mode 100644 drivers/staging/rt3090/common/crypt_sha2.c create mode 100644 drivers/staging/rt3090/common/dfs.c create mode 100644 drivers/staging/rt3090/common/ee_efuse.c create mode 100644 drivers/staging/rt3090/common/ee_prom.c create mode 100644 drivers/staging/rt3090/common/eeprom.c create mode 100644 drivers/staging/rt3090/common/igmp_snoop.c create mode 100644 drivers/staging/rt3090/common/mlme.c create mode 100644 drivers/staging/rt3090/common/mlme_ex.c create mode 100644 drivers/staging/rt3090/common/netif_block.c create mode 100644 drivers/staging/rt3090/common/rt_channel.c create mode 100644 drivers/staging/rt3090/common/rt_rf.c create mode 100644 drivers/staging/rt3090/common/rtmp_init.c create mode 100644 drivers/staging/rt3090/common/rtmp_mcu.c create mode 100644 drivers/staging/rt3090/common/rtmp_timer.c create mode 100644 drivers/staging/rt3090/common/spectrum.c create mode 100644 drivers/staging/rt3090/config.mk copy drivers/staging/{rt2860/md4.h => rt3090/crypt_hmac.h} (54%) copy drivers/staging/{rt2860/md4.h => rt3090/crypt_md5.h} (54%) create mode 100644 drivers/staging/rt3090/crypt_sha2.h create mode 100644 drivers/staging/rt3090/dfs.h create mode 100644 drivers/staging/rt3090/eeprom.h create mode 100644 drivers/staging/rt3090/firmware.h create mode 100644 drivers/staging/rt3090/igmp_snoop.h create mode 100644 drivers/staging/rt3090/ipv6.h rename drivers/staging/{rt2860 => rt3090}/link_list.h (99%) create mode 100644 drivers/staging/rt3090/mac_pci.h create mode 100644 drivers/staging/rt3090/mlme.h copy drivers/staging/{rt2870/md4.h => rt3090/mlme_ex.h} (56%) copy drivers/staging/{rt2860/md4.h => rt3090/mlme_ex_def.h} (67%) copy drivers/staging/{rt2860/md4.h => rt3090/netif_block.h} (72%) create mode 100644 drivers/staging/rt3090/oid.h create mode 100644 drivers/staging/rt3090/pci_main_dev.c copy drivers/staging/{rt2870/md4.h => rt3090/rt3090.h} (55%) copy drivers/staging/{rt2860/md4.h => rt3090/rt30xx.h} (79%) copy drivers/staging/{rt2870/md4.h => rt3090/rt3370.h} (65%) copy drivers/staging/{rt2870/md4.h => rt3090/rt3390.h} (55%) rename drivers/staging/{rt2870/md4.h => rt3090/rt33xx.h} (79%) create mode 100644 drivers/staging/rt3090/rt_ate.c create mode 100644 drivers/staging/rt3090/rt_ate.h create mode 100644 drivers/staging/rt3090/rt_config.h create mode 100644 drivers/staging/rt3090/rt_linux.c create mode 100644 drivers/staging/rt3090/rt_linux.h create mode 100644 drivers/staging/rt3090/rt_main_dev.c create mode 100644 drivers/staging/rt3090/rt_pci_rbus.c create mode 100644 drivers/staging/rt3090/rt_profile.c create mode 100644 drivers/staging/rt3090/rtmp.h create mode 100644 drivers/staging/rt3090/rtmp_chip.h create mode 100644 drivers/staging/rt3090/rtmp_def.h create mode 100644 drivers/staging/rt3090/rtmp_dot11.h copy drivers/staging/{rt2860/md4.h => rt3090/rtmp_iface.h} (56%) create mode 100644 drivers/staging/rt3090/rtmp_mac.h copy drivers/staging/{rt2860/md4.h => rt3090/rtmp_mcu.h} (73%) create mode 100644 drivers/staging/rt3090/rtmp_os.h create mode 100644 drivers/staging/rt3090/rtmp_pci.h create mode 100644 drivers/staging/rt3090/rtmp_phy.h create mode 100644 drivers/staging/rt3090/rtmp_timer.h create mode 100644 drivers/staging/rt3090/rtmp_type.h create mode 100644 drivers/staging/rt3090/spectrum.h create mode 100644 drivers/staging/rt3090/spectrum_def.h create mode 100644 drivers/staging/rt3090/sta/assoc.c create mode 100644 drivers/staging/rt3090/sta/auth.c create mode 100644 drivers/staging/rt3090/sta/auth_rsp.c create mode 100644 drivers/staging/rt3090/sta/connect.c create mode 100644 drivers/staging/rt3090/sta/dls.c create mode 100644 drivers/staging/rt3090/sta/rtmp_ckipmic.c create mode 100644 drivers/staging/rt3090/sta/rtmp_data.c create mode 100644 drivers/staging/rt3090/sta/sanity.c create mode 100644 drivers/staging/rt3090/sta/sync.c create mode 100644 drivers/staging/rt3090/sta/wpa.c create mode 100644 drivers/staging/rt3090/sta_ioctl.c rename drivers/staging/{rt2860/md4.h => rt3090/vr_ikans.h} (59%) create mode 100644 drivers/staging/rt3090/wpa.h create mode 100644 drivers/staging/rtl8187se/TODO delete mode 100644 drivers/staging/rtl8187se/dot11d.h delete mode 100644 drivers/staging/rtl8187se/ieee80211.h delete mode 100644 drivers/staging/rtl8187se/ieee80211/internal.h delete mode 100644 drivers/staging/rtl8187se/ieee80211/rtl_crypto.h delete mode 100644 drivers/staging/rtl8187se/r8180_gct.c delete mode 100644 drivers/staging/rtl8187se/r8180_max2820.c delete mode 100644 drivers/staging/rtl8187se/r8180_max2820.h delete mode 100644 drivers/staging/rtl8187se/r8180_pm.c delete mode 100644 drivers/staging/rtl8187se/r8180_rtl8225.c delete mode 100644 drivers/staging/rtl8187se/r8180_rtl8255.c delete mode 100644 drivers/staging/rtl8187se/r8180_rtl8255.h delete mode 100644 drivers/staging/rtl8187se/r8180_sa2400.c delete mode 100644 drivers/staging/rtl8187se/r8180_sa2400.h create mode 100644 drivers/staging/rtl8192e/Kconfig create mode 100644 drivers/staging/rtl8192e/Makefile copy drivers/staging/{rtl8192su => rtl8192e}/dot11d.h (100%) copy drivers/staging/{rtl8192su => rtl8192e}/ieee80211.h (92%) create mode 100644 drivers/staging/rtl8192e/ieee80211/dot11d.c rename drivers/staging/{rtl8192su => rtl8192e/ieee80211}/dot11d.h (100%) rename drivers/staging/{rtl8192su => rtl8192e/ieee80211}/ieee80211.h (95%) create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_crypt.c rename drivers/staging/{rtl8192su => rtl8192e/ieee80211}/ieee80211_crypt.h (92%) create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_ccmp.c create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_tkip.c create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_wep.c create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_module.c create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_softmac_wx.c create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c create mode 100644 drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c create mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_BA.h create mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_BAProc.c create mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h create mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_HTProc.c create mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h create mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h create mode 100644 drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c rename drivers/staging/{rtl8192su => rtl8192e}/ieee80211/rtl_crypto.h (100%) rename drivers/staging/{rtl8187se => rtl8192e}/ieee80211_crypt.h (100%) create mode 100644 drivers/staging/rtl8192e/r8180_93cx6.c create mode 100644 drivers/staging/rtl8192e/r8180_93cx6.h create mode 100644 drivers/staging/rtl8192e/r8190_rtl8256.c rename drivers/staging/{rtl8192su => rtl8192e}/r8190_rtl8256.h (65%) create mode 100644 drivers/staging/rtl8192e/r8192E.h create mode 100644 drivers/staging/rtl8192e/r8192E_core.c create mode 100644 drivers/staging/rtl8192e/r8192E_dm.c create mode 100644 drivers/staging/rtl8192e/r8192E_dm.h rename drivers/staging/{rtl8192su/r8192U_hw.h => rtl8192e/r8192E_hw.h} (72%) create mode 100644 drivers/staging/rtl8192e/r8192E_wx.c rename drivers/staging/{rtl8187se/r8180_gct.h => rtl8192e/r8192E_wx.h} (52%) create mode 100644 drivers/staging/rtl8192e/r8192_pm.c rename drivers/staging/{rtl8187se/r8180_pm.h => rtl8192e/r8192_pm.h} (52%) create mode 100644 drivers/staging/rtl8192e/r819xE_cmdpkt.c create mode 100644 drivers/staging/rtl8192e/r819xE_cmdpkt.h create mode 100644 drivers/staging/rtl8192e/r819xE_firmware.c rename drivers/staging/{rtl8192su/r819xU_phy.c => rtl8192e/r819xE_phy.c} (50%) rename drivers/staging/{rtl8192su/r819xU_phy.h => rtl8192e/r819xE_phy.h} (61%) rename drivers/staging/{rtl8192su/r819xU_phyreg.h => rtl8192e/r819xE_phyreg.h} (99%) create mode 100644 drivers/staging/rtl8192su/TODO delete mode 100644 drivers/staging/rtl8192su/ieee80211/EndianFree.h delete mode 100644 drivers/staging/rtl8192su/ieee80211/aes.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/api.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/arc4.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/autoload.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/cipher.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/compress.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/crypto_compat.h delete mode 100644 drivers/staging/rtl8192su/ieee80211/digest.c create mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_r8192s.h delete mode 100644 drivers/staging/rtl8192su/ieee80211/internal.h delete mode 100644 drivers/staging/rtl8192su/ieee80211/kmap_types.h delete mode 100644 drivers/staging/rtl8192su/ieee80211/michael_mic.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/proc.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/scatterwalk.c delete mode 100644 drivers/staging/rtl8192su/ieee80211/scatterwalk.h delete mode 100644 drivers/staging/rtl8192su/r8190_rtl8256.c delete mode 100644 drivers/staging/rtl8192su/r8192S_FwImgDTM.h delete mode 100644 drivers/staging/rtl8192su/r819xU_firmware.c delete mode 100644 drivers/staging/rtl8192su/r819xU_firmware.h delete mode 100644 drivers/staging/rtl8192su/r819xU_firmware_img.c delete mode 100644 drivers/staging/rtl8192su/r819xU_firmware_img.h create mode 100644 drivers/staging/sep/Kconfig create mode 100644 drivers/staging/sep/Makefile create mode 100644 drivers/staging/sep/TODO create mode 100644 drivers/staging/sep/sep_dev.h create mode 100644 drivers/staging/sep/sep_driver.c create mode 100644 drivers/staging/sep/sep_driver_api.h create mode 100644 drivers/staging/sep/sep_driver_config.h create mode 100644 drivers/staging/sep/sep_driver_hw_defs.h delete mode 100644 drivers/staging/sxg/Kconfig delete mode 100644 drivers/staging/sxg/Makefile delete mode 100644 drivers/staging/sxg/README delete mode 100644 drivers/staging/sxg/sxg.c delete mode 100644 drivers/staging/sxg/sxg.h delete mode 100644 drivers/staging/sxg/sxg_ethtool.c delete mode 100644 drivers/staging/sxg/sxg_os.h delete mode 100644 drivers/staging/sxg/sxgdbg.h delete mode 100644 drivers/staging/sxg/sxghif.h delete mode 100644 drivers/staging/sxg/sxghw.h delete mode 100644 drivers/staging/sxg/sxgphycode-1.2.h create mode 100644 drivers/staging/vme/Kconfig create mode 100644 drivers/staging/vme/Makefile create mode 100644 drivers/staging/vme/TODO create mode 100644 drivers/staging/vme/bridges/Kconfig create mode 100644 drivers/staging/vme/bridges/Makefile create mode 100644 drivers/staging/vme/bridges/vme_ca91cx42.c create mode 100644 drivers/staging/vme/bridges/vme_ca91cx42.h create mode 100644 drivers/staging/vme/bridges/vme_tsi148.c create mode 100644 drivers/staging/vme/bridges/vme_tsi148.h create mode 100644 drivers/staging/vme/devices/Kconfig create mode 100644 drivers/staging/vme/devices/Makefile create mode 100644 drivers/staging/vme/devices/vme_user.c create mode 100644 drivers/staging/vme/devices/vme_user.h create mode 100644 drivers/staging/vme/vme.c create mode 100644 drivers/staging/vme/vme.h create mode 100644 drivers/staging/vme/vme_api.txt create mode 100644 drivers/staging/vme/vme_bridge.h delete mode 100644 drivers/staging/vt6655/Makefile.arm delete mode 100644 drivers/staging/vt6655/Makefile.x86 create mode 100644 drivers/staging/vt6655/TODO delete mode 100644 drivers/staging/vt6655/tpci.h create mode 100644 drivers/staging/vt6656/80211hdr.h create mode 100644 drivers/staging/vt6656/80211mgr.c create mode 100644 drivers/staging/vt6656/80211mgr.h create mode 100644 drivers/staging/vt6656/Kconfig create mode 100644 drivers/staging/vt6656/Makefile create mode 100644 drivers/staging/vt6656/TODO create mode 100644 drivers/staging/vt6656/aes_ccmp.c copy drivers/staging/{vt6655/tbit.h => vt6656/aes_ccmp.h} (58%) create mode 100644 drivers/staging/vt6656/baseband.c create mode 100644 drivers/staging/vt6656/baseband.h create mode 100644 drivers/staging/vt6656/bssdb.c create mode 100644 drivers/staging/vt6656/bssdb.h create mode 100644 drivers/staging/vt6656/card.c create mode 100644 drivers/staging/vt6656/card.h create mode 100644 drivers/staging/vt6656/channel.c copy drivers/staging/{vt6655/umem.h => vt6656/channel.h} (56%) create mode 100644 drivers/staging/vt6656/control.c copy drivers/staging/{vt6655/tbit.h => vt6656/control.h} (53%) create mode 100644 drivers/staging/vt6656/country.h create mode 100644 drivers/staging/vt6656/datarate.c create mode 100644 drivers/staging/vt6656/datarate.h create mode 100644 drivers/staging/vt6656/desc.h create mode 100644 drivers/staging/vt6656/device.h create mode 100644 drivers/staging/vt6656/device_cfg.h create mode 100644 drivers/staging/vt6656/dpc.c copy drivers/staging/{vt6655/umem.h => vt6656/dpc.h} (56%) create mode 100644 drivers/staging/vt6656/firmware.c copy drivers/staging/{vt6655/umem.h => vt6656/firmware.h} (56%) create mode 100644 drivers/staging/vt6656/hostap.c copy drivers/staging/{vt6655/umem.h => vt6656/hostap.h} (55%) create mode 100644 drivers/staging/vt6656/int.c copy drivers/staging/{vt6655/umem.h => vt6656/int.h} (56%) create mode 100644 drivers/staging/vt6656/iocmd.h create mode 100644 drivers/staging/vt6656/ioctl.c copy drivers/staging/{vt6655/umem.h => vt6656/ioctl.h} (55%) create mode 100644 drivers/staging/vt6656/iowpa.h create mode 100644 drivers/staging/vt6656/iwctl.c create mode 100644 drivers/staging/vt6656/iwctl.h create mode 100644 drivers/staging/vt6656/kcompat.h create mode 100644 drivers/staging/vt6656/key.c create mode 100644 drivers/staging/vt6656/key.h create mode 100644 drivers/staging/vt6656/mac.c create mode 100644 drivers/staging/vt6656/mac.h create mode 100644 drivers/staging/vt6656/main_usb.c create mode 100644 drivers/staging/vt6656/mib.c create mode 100644 drivers/staging/vt6656/mib.h create mode 100644 drivers/staging/vt6656/michael.c copy drivers/staging/{vt6655/tbit.h => vt6656/michael.h} (51%) create mode 100644 drivers/staging/vt6656/power.c copy drivers/staging/{vt6655/tbit.h => vt6656/power.h} (56%) create mode 100644 drivers/staging/vt6656/rc4.c create mode 100644 drivers/staging/vt6656/rc4.h create mode 100644 drivers/staging/vt6656/rf.c create mode 100644 drivers/staging/vt6656/rf.h create mode 100644 drivers/staging/vt6656/rndis.h create mode 100644 drivers/staging/vt6656/rxtx.c create mode 100644 drivers/staging/vt6656/rxtx.h create mode 100644 drivers/staging/vt6656/srom.h create mode 100644 drivers/staging/vt6656/tcrc.c copy drivers/staging/{vt6655/tbit.h => vt6656/tcrc.h} (59%) create mode 100644 drivers/staging/vt6656/tether.c create mode 100644 drivers/staging/vt6656/tether.h create mode 100644 drivers/staging/vt6656/tkip.c copy drivers/staging/{vt6655/tbit.h => vt6656/tkip.h} (62%) create mode 100644 drivers/staging/vt6656/tmacro.h create mode 100644 drivers/staging/vt6656/ttype.h create mode 100644 drivers/staging/vt6656/upc.h create mode 100644 drivers/staging/vt6656/usbpipe.c copy drivers/staging/{vt6655/tbit.h => vt6656/usbpipe.h} (52%) create mode 100644 drivers/staging/vt6656/vntconfiguration.dat create mode 100644 drivers/staging/vt6656/wcmd.c create mode 100644 drivers/staging/vt6656/wcmd.h create mode 100644 drivers/staging/vt6656/wctl.c create mode 100644 drivers/staging/vt6656/wctl.h create mode 100644 drivers/staging/vt6656/wmgr.c create mode 100644 drivers/staging/vt6656/wmgr.h create mode 100644 drivers/staging/vt6656/wpa.c copy drivers/staging/{vt6655/tbit.h => vt6656/wpa.h} (57%) create mode 100644 drivers/staging/vt6656/wpa2.c rename drivers/staging/{vt6655/umem.h => vt6656/wpa2.h} (56%) create mode 100644 drivers/staging/vt6656/wpactl.c rename drivers/staging/{vt6655/tbit.h => vt6656/wpactl.h} (54%) create mode 100644 include/linux/gpio_event.h Merging scsi-post-merge/master $ git merge scsi-post-merge/master Resolved 'drivers/scsi/Makefile' using previous resolution. Auto-merging MAINTAINERS Auto-merging drivers/ata/ahci.c Auto-merging drivers/message/fusion/mptbase.c Auto-merging drivers/message/fusion/mptbase.h Auto-merging drivers/scsi/Kconfig Auto-merging drivers/scsi/Makefile CONFLICT (content): Merge conflict in drivers/scsi/Makefile Auto-merging drivers/scsi/qla2xxx/qla_def.h Auto-merging drivers/scsi/qla2xxx/qla_os.c Auto-merging include/linux/interrupt.h Auto-merging include/linux/libata.h Auto-merging kernel/sysctl.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 9c96ecf] Merge commit 'scsi-post-merge/master' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 8 + drivers/ata/ahci.c | 54 +- drivers/message/fusion/mptbase.c | 99 +- drivers/message/fusion/mptbase.h | 3 + drivers/scsi/Kconfig | 1 + drivers/scsi/Makefile | 1 + drivers/scsi/be2iscsi/Kconfig | 8 + drivers/scsi/be2iscsi/Makefile | 8 + drivers/scsi/be2iscsi/be.h | 183 ++ drivers/scsi/be2iscsi/be_cmds.c | 523 ++++++ drivers/scsi/be2iscsi/be_cmds.h | 877 ++++++++++ drivers/scsi/be2iscsi/be_iscsi.c | 646 ++++++++ drivers/scsi/be2iscsi/be_iscsi.h | 75 + drivers/scsi/be2iscsi/be_main.c | 3393 ++++++++++++++++++++++++++++++++++++++ drivers/scsi/be2iscsi/be_main.h | 833 ++++++++++ drivers/scsi/be2iscsi/be_mgmt.c | 321 ++++ drivers/scsi/be2iscsi/be_mgmt.h | 249 +++ drivers/scsi/qla2xxx/qla_dbg.c | 78 +- drivers/scsi/qla2xxx/qla_def.h | 5 + drivers/scsi/qla2xxx/qla_gbl.h | 1 + drivers/scsi/qla2xxx/qla_os.c | 36 + include/linux/libata.h | 2 + include/scsi/Kbuild | 1 + include/scsi/fc/Kbuild | 4 + 24 files changed, 7337 insertions(+), 72 deletions(-) create mode 100644 drivers/scsi/be2iscsi/Kconfig create mode 100644 drivers/scsi/be2iscsi/Makefile create mode 100644 drivers/scsi/be2iscsi/be.h create mode 100644 drivers/scsi/be2iscsi/be_cmds.c create mode 100644 drivers/scsi/be2iscsi/be_cmds.h create mode 100644 drivers/scsi/be2iscsi/be_iscsi.c create mode 100644 drivers/scsi/be2iscsi/be_iscsi.h create mode 100644 drivers/scsi/be2iscsi/be_main.c create mode 100644 drivers/scsi/be2iscsi/be_main.h create mode 100644 drivers/scsi/be2iscsi/be_mgmt.c create mode 100644 drivers/scsi/be2iscsi/be_mgmt.h create mode 100644 include/scsi/fc/Kbuild