From cb131d8bd977dba6087c79ca3e05d6d9e02fc8a5 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Fri, 17 Sep 2010 13:40:10 +1000 Subject: Add linux-next specific files for 20100917 Signed-off-by: Stephen Rothwell --- Next/merge.log | 7778 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 7778 insertions(+) create mode 100644 Next/merge.log (limited to 'Next/merge.log') diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..1da3e7224a68 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,7778 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 9c03f16 Merge ssh://master.kernel.org/home/hpa/tree/sec +Merging origin/master +$ git merge origin/master +Updating 9c03f16..03a7ab0 +Fast-forward + Documentation/power/regulator/overview.txt | 2 +- + Documentation/workqueue.txt | 380 +++++++++++++++++++++++++++ + arch/ia64/kernel/fsys.S | 42 +--- + arch/tile/include/arch/chip_tile64.h | 3 + + arch/tile/include/arch/chip_tilepro.h | 3 + + arch/tile/include/asm/compat.h | 5 +- + arch/tile/include/asm/io.h | 8 +- + arch/tile/include/asm/processor.h | 12 + + arch/tile/include/asm/ptrace.h | 15 +- + arch/tile/include/asm/sigcontext.h | 18 +- + arch/tile/include/asm/signal.h | 1 + + arch/tile/include/asm/syscalls.h | 21 +- + arch/tile/kernel/process.c | 30 ++- + arch/tile/kernel/signal.c | 27 +- + arch/tile/kernel/stack.c | 2 +- + drivers/gpu/drm/drm_crtc_helper.c | 10 +- + drivers/gpu/drm/drm_pci.c | 4 + + drivers/gpu/drm/drm_platform.c | 5 + + drivers/gpu/drm/drm_sysfs.c | 2 +- + drivers/gpu/drm/i915/intel_crt.c | 6 +- + drivers/gpu/drm/i915/intel_dp.c | 2 +- + drivers/gpu/drm/i915/intel_dvo.c | 3 +- + drivers/gpu/drm/i915/intel_hdmi.c | 2 +- + drivers/gpu/drm/i915/intel_lvds.c | 7 +- + drivers/gpu/drm/i915/intel_sdvo.c | 5 +- + drivers/gpu/drm/i915/intel_tv.c | 11 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 6 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 5 +- + drivers/gpu/drm/radeon/evergreen.c | 27 ++- + drivers/gpu/drm/radeon/r100.c | 24 +-- + drivers/gpu/drm/radeon/r600_blit_kms.c | 25 ++ + drivers/gpu/drm/radeon/r600_blit_shaders.h | 24 ++ + drivers/gpu/drm/radeon/r600_cs.c | 5 +- + drivers/gpu/drm/radeon/radeon_combios.c | 47 ++++ + drivers/gpu/drm/radeon/radeon_connectors.c | 15 +- + drivers/gpu/drm/radeon/radeon_display.c | 9 +- + drivers/gpu/drm/radeon/radeon_mode.h | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 7 +- + drivers/net/pcmcia/pcnet_cs.c | 139 ++++++---- + drivers/pcmcia/pcmcia_resource.c | 51 ++-- + drivers/power/apm_power.c | 1 + + drivers/power/intel_mid_battery.c | 6 +- + drivers/regulator/88pm8607.c | 4 +- + drivers/regulator/ab3100.c | 5 +- + drivers/regulator/ab8500.c | 9 +- + drivers/regulator/ad5398.c | 12 +- + drivers/regulator/isl6271a-regulator.c | 2 +- + drivers/regulator/max1586.c | 12 +- + drivers/regulator/max8998.c | 8 +- + drivers/regulator/tps6507x-regulator.c | 6 - + drivers/regulator/tps6586x-regulator.c | 4 +- + drivers/regulator/wm831x-ldo.c | 7 +- + drivers/regulator/wm8350-regulator.c | 2 +- + drivers/serial/serial_cs.c | 62 +++-- + drivers/video/via/ioctl.c | 2 + + drivers/watchdog/Kconfig | 6 +- + drivers/watchdog/sb_wdog.c | 12 +- + drivers/watchdog/ts72xx_wdt.c | 3 + + fs/cifs/connect.c | 6 +- + include/drm/drm_crtc.h | 10 +- + include/linux/workqueue.h | 4 + + kernel/workqueue.c | 27 ++- + 62 files changed, 906 insertions(+), 317 deletions(-) + create mode 100644 Documentation/workqueue.txt +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Merge made by recursive. + drivers/scsi/scsi.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + drivers/net/3c59x.c | 7 +++---- + drivers/net/bonding/bond_3ad.c | 3 +++ + drivers/net/bonding/bond_alb.c | 3 +++ + drivers/net/phy/mdio_bus.c | 4 ++-- + drivers/net/ppp_generic.c | 9 +++++++-- + include/net/tcp.h | 18 ++++++++++++++++-- + net/Kconfig | 2 +- + net/core/dev.c | 2 +- + net/ipv4/igmp.c | 2 +- + net/ipv4/ip_sockglue.c | 3 +++ + net/llc/af_llc.c | 3 ++- + net/sched/sch_atm.c | 4 ---- + 12 files changed, 42 insertions(+), 18 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Merge made by recursive. + drivers/pci/iov.c | 2 +- + drivers/pci/pci.h | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/rc-fixes +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Already up-to-date. +Merging quilt/tty.current +$ git merge quilt/tty.current +Merge made by recursive. + drivers/serial/amba-pl010.c | 9 ++------- + drivers/serial/mfd.c | 17 +++++++++-------- + 2 files changed, 11 insertions(+), 15 deletions(-) +Merging quilt/usb.current +$ git merge quilt/usb.current +Merge made by recursive. + drivers/usb/host/ehci-pci.c | 5 ++ + drivers/usb/musb/musb_debugfs.c | 5 +- + drivers/usb/otg/twl4030-usb.c | 78 +++++++++++++++++++++++++------------- + drivers/usb/serial/mos7720.c | 3 + + drivers/usb/serial/mos7840.c | 3 + + 5 files changed, 64 insertions(+), 30 deletions(-) +Merging quilt/staging.current +$ git merge quilt/staging.current +Merge made by recursive. + drivers/staging/batman-adv/hard-interface.c | 13 ------------- + drivers/staging/batman-adv/send.c | 8 ++------ + drivers/staging/vt6655/wpactl.c | 11 ++++++++--- + 3 files changed, 10 insertions(+), 22 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. +Merging gcl-current/merge +$ git merge gcl-current/merge +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Auto-merging Makefile +Auto-merging arch/arm/Kconfig +Merge made by recursive. + Makefile | 7 + + arch/arm/Kconfig | 33 +- + arch/arm/Kconfig.debug | 5 + + arch/arm/common/sa1111.c | 2 +- + arch/arm/include/asm/assembler.h | 27 +- + arch/arm/include/asm/ftrace.h | 20 +- + arch/arm/include/asm/hardware/coresight.h | 34 +- + arch/arm/include/asm/hw_breakpoint.h | 133 ++++ + arch/arm/include/asm/module.h | 31 +- + arch/arm/include/asm/processor.h | 4 + + arch/arm/include/asm/ptrace.h | 2 + + arch/arm/include/asm/smp_mpidr.h | 17 + + arch/arm/include/asm/smp_plat.h | 15 + + arch/arm/include/asm/system.h | 4 + + arch/arm/include/asm/tlbflush.h | 24 +- + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/armksyms.c | 2 + + arch/arm/kernel/entry-armv.S | 11 +- + arch/arm/kernel/entry-common.S | 63 ++- + arch/arm/kernel/etm.c | 15 + + arch/arm/kernel/ftrace.c | 188 ++++-- + arch/arm/kernel/head.S | 50 ++ + arch/arm/kernel/hw_breakpoint.c | 849 ++++++++++++++++++++++++ + arch/arm/kernel/module.c | 68 +- + arch/arm/kernel/process.c | 5 + + arch/arm/kernel/ptrace.c | 239 +++++++ + arch/arm/kernel/setup.c | 4 +- + arch/arm/kernel/unwind.c | 2 + + arch/arm/kernel/vmlinux.lds.S | 11 + + arch/arm/mach-realview/core.c | 2 + + arch/arm/mach-realview/include/mach/smp.h | 10 +- + arch/arm/mach-s3c64xx/mach-smartq.c | 2 +- + arch/arm/mach-s3c64xx/mach-smartq5.c | 2 +- + arch/arm/mach-s3c64xx/mach-smartq7.c | 2 +- + arch/arm/mach-s5pv310/include/mach/smp.h | 9 +- + arch/arm/mach-tegra/include/mach/smp.h | 10 +- + arch/arm/mach-ux500/Makefile | 4 +- + arch/arm/mach-ux500/board-mop500-sdi.c | 91 +++ + arch/arm/mach-ux500/board-mop500.c | 3 + + arch/arm/mach-ux500/board-mop500.h | 12 + + arch/arm/mach-ux500/cpu-db8500.c | 82 +++ + arch/arm/mach-ux500/devices-db8500.c | 76 +++ + arch/arm/mach-ux500/include/mach/db8500-regs.h | 2 - + arch/arm/mach-ux500/include/mach/devices.h | 7 + + arch/arm/mach-ux500/include/mach/hardware.h | 23 +- + arch/arm/mach-ux500/include/mach/irqs.h | 1 + + arch/arm/mach-ux500/include/mach/prcmu-regs.h | 91 +++ + arch/arm/mach-ux500/include/mach/prcmu.h | 15 + + arch/arm/mach-ux500/include/mach/setup.h | 7 + + arch/arm/mach-ux500/include/mach/smp.h | 9 +- + arch/arm/mach-ux500/pins-db8500.h | 66 +- + arch/arm/mach-ux500/prcmu.c | 231 +++++++ + arch/arm/mach-vexpress/include/mach/smp.h | 9 +- + arch/arm/mm/cache-v7.S | 14 +- + arch/arm/mm/fault.c | 13 + + arch/arm/mm/mmu.c | 42 +- + arch/arm/mm/proc-v6.S | 43 +- + arch/arm/mm/proc-v7.S | 31 +- + arch/arm/mm/tlb-v7.S | 33 +- + arch/arm/plat-nomadik/gpio.c | 74 ++- + arch/arm/plat-nomadik/include/plat/gpio.h | 2 + + arch/arm/plat-nomadik/include/plat/pincfg.h | 36 +- + arch/arm/plat-omap/include/plat/smp.h | 12 +- + drivers/mmc/host/mmci.c | 27 +- + drivers/mmc/host/mmci.h | 7 - + include/linux/amba/mmci.h | 2 + + kernel/trace/Kconfig | 2 +- + scripts/Makefile.build | 3 +- + scripts/recordmcount.pl | 2 + + 69 files changed, 2612 insertions(+), 363 deletions(-) + create mode 100644 arch/arm/include/asm/hw_breakpoint.h + create mode 100644 arch/arm/include/asm/smp_mpidr.h + create mode 100644 arch/arm/kernel/hw_breakpoint.c + create mode 100644 arch/arm/mach-ux500/board-mop500-sdi.c + create mode 100644 arch/arm/mach-ux500/board-mop500.h + create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-regs.h + create mode 100644 arch/arm/mach-ux500/include/mach/prcmu.h + create mode 100644 arch/arm/mach-ux500/prcmu.c +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 4 +- + arch/arm/configs/da8xx_omapl_defconfig | 2 + + arch/arm/mach-davinci/Kconfig | 68 +- + arch/arm/mach-davinci/Makefile | 3 +- + arch/arm/mach-davinci/aemif.c | 133 +++ + arch/arm/mach-davinci/board-da830-evm.c | 24 +- + arch/arm/mach-davinci/board-da850-evm.c | 91 ++- + arch/arm/mach-davinci/board-dm365-evm.c | 11 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 20 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 21 +- + arch/arm/mach-davinci/board-mityomapl138.c | 362 ++++++ + arch/arm/mach-davinci/board-neuros-osd2.c | 7 +- + arch/arm/mach-davinci/board-sffsdr.c | 7 +- + arch/arm/mach-davinci/clock.c | 75 ++- + arch/arm/mach-davinci/clock.h | 5 + + arch/arm/mach-davinci/cpufreq.c | 28 +- + arch/arm/mach-davinci/da850.c | 76 +- + arch/arm/mach-davinci/devices-da8xx.c | 70 ++- + arch/arm/mach-davinci/devices.c | 2 +- + arch/arm/mach-davinci/dm365.c | 23 +- + arch/arm/mach-davinci/dm644x.c | 23 +- + arch/arm/mach-davinci/dm646x.c | 22 +- + arch/arm/mach-davinci/dma.c | 8 +- + arch/arm/mach-davinci/include/mach/aemif.h | 36 + + arch/arm/mach-davinci/include/mach/da8xx.h | 7 +- + arch/arm/mach-davinci/include/mach/dm365.h | 2 +- + arch/arm/mach-davinci/include/mach/dm644x.h | 2 +- + arch/arm/mach-davinci/include/mach/dm646x.h | 2 +- + arch/arm/mach-davinci/include/mach/nand.h | 6 +- + arch/arm/mach-davinci/include/mach/psc.h | 1 + + arch/arm/mach-davinci/include/mach/uncompress.h | 1 + + arch/arm/mach-davinci/tnetv107x.c | 11 +- + arch/arm/mach-omap2/board-am3517evm.c | 31 +- + drivers/mtd/nand/davinci_nand.c | 61 +- + drivers/net/Kconfig | 21 + + drivers/net/Makefile | 2 + + drivers/net/davinci_cpdma.c | 965 ++++++++++++++++ + drivers/net/davinci_cpdma.h | 108 ++ + drivers/net/davinci_emac.c | 1338 +++-------------------- + drivers/net/davinci_mdio.c | 475 ++++++++ + include/linux/davinci_emac.h | 16 +- + 41 files changed, 2812 insertions(+), 1358 deletions(-) + create mode 100644 arch/arm/mach-davinci/aemif.c + create mode 100644 arch/arm/mach-davinci/board-mityomapl138.c + create mode 100644 arch/arm/mach-davinci/include/mach/aemif.h + create mode 100644 drivers/net/davinci_cpdma.c + create mode 100644 drivers/net/davinci_cpdma.h + create mode 100644 drivers/net/davinci_mdio.c +Merging i.MX/for-next +$ git merge i.MX/for-next +Auto-merging arch/arm/mach-mx3/clock-imx35.c +Auto-merging arch/arm/plat-mxc/Kconfig +Merge made by recursive. + arch/arm/mach-imx/Kconfig | 9 + + arch/arm/mach-imx/Makefile | 1 + + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 263 +++++++++++++++++++++++++++ + arch/arm/mach-mx3/Kconfig | 2 + + arch/arm/mach-mx3/clock-imx35.c | 13 +- + arch/arm/mach-mx3/mach-mx35_3ds.c | 49 +++++- + arch/arm/mach-mx5/board-mx51_babbage.c | 43 +++++- + arch/arm/plat-mxc/Kconfig | 12 ++ + arch/arm/plat-mxc/Makefile | 1 + + arch/arm/plat-mxc/epit.c | 242 ++++++++++++++++++++++++ + arch/arm/plat-mxc/include/mach/common.h | 1 + + arch/arm/plat-mxc/include/mach/iomux-mx51.h | 24 +++ + 12 files changed, 653 insertions(+), 7 deletions(-) + create mode 100644 arch/arm/mach-imx/mach-imx27_visstrim_m10.c + create mode 100644 arch/arm/plat-mxc/epit.c +Merging msm/for-next +$ git merge msm/for-next +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/mm/proc-v7.S +Merge made by recursive. + Documentation/arm/00-INDEX | 2 + + Documentation/arm/msm/gpiomux.txt | 176 ++++++++++ + arch/arm/Kconfig | 1 + + arch/arm/common/gic.c | 14 - + arch/arm/mach-msm/Kconfig | 7 + + arch/arm/mach-msm/Makefile | 7 +- + arch/arm/mach-msm/board-msm7x30.c | 20 -- + arch/arm/mach-msm/board-qsd8x50.c | 12 - + arch/arm/mach-msm/gpio.c | 409 +++++++++++++++++++---- + arch/arm/mach-msm/gpio_hw.h | 278 +++++++++++++++ + arch/arm/mach-msm/gpiomux-7x30.c | 38 ++ + arch/arm/mach-msm/gpiomux-8x50.c | 28 ++ + arch/arm/mach-msm/gpiomux-8x60.c | 19 + + arch/arm/mach-msm/gpiomux-v1.c | 33 ++ + arch/arm/mach-msm/gpiomux-v1.h | 67 ++++ + arch/arm/mach-msm/gpiomux-v2.c | 25 ++ + arch/arm/mach-msm/gpiomux-v2.h | 61 ++++ + arch/arm/mach-msm/gpiomux.c | 96 ++++++ + arch/arm/mach-msm/gpiomux.h | 114 +++++++ + arch/arm/mach-msm/include/mach/gpio.h | 123 ------- + arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 42 +++ + arch/arm/mach-msm/include/mach/msm_iomap.h | 2 + + arch/arm/mm/proc-v7.S | 26 ++- + 23 files changed, 1370 insertions(+), 230 deletions(-) + create mode 100644 Documentation/arm/msm/gpiomux.txt + create mode 100644 arch/arm/mach-msm/gpio_hw.h + create mode 100644 arch/arm/mach-msm/gpiomux-7x30.c + create mode 100644 arch/arm/mach-msm/gpiomux-8x50.c + create mode 100644 arch/arm/mach-msm/gpiomux-8x60.c + create mode 100644 arch/arm/mach-msm/gpiomux-v1.c + create mode 100644 arch/arm/mach-msm/gpiomux-v1.h + create mode 100644 arch/arm/mach-msm/gpiomux-v2.c + create mode 100644 arch/arm/mach-msm/gpiomux-v2.h + create mode 100644 arch/arm/mach-msm/gpiomux.c + create mode 100644 arch/arm/mach-msm/gpiomux.h + create mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-8x60.h +$ git am -3 ../patches/0001-ARM-fix-build-failure-for-legacy-PMD_FLAGS.patch +Applying: ARM: fix build failure for legacy PMD_FLAGS +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm/mm/proc-v7.S +$ git add . +$ git commit -v -a --amend +[master e61732b] Merge remote branch 'msm/for-next' +Merging omap/for-next +$ git merge omap/for-next +Merge made by recursive. + arch/arm/mach-omap2/board-n8x0.c | 49 +++++++++++++++++++++---------- + arch/arm/mach-omap2/board-omap4panda.c | 2 - + arch/arm/mach-omap2/mux.c | 2 +- + arch/arm/mach-omap2/omap-iommu.c | 2 - + arch/arm/plat-omap/gpio.c | 4 +- + arch/arm/plat-omap/include/plat/usb.h | 2 +- + 6 files changed, 37 insertions(+), 24 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Resolved 'arch/arm/mach-s3c64xx/Makefile' using previous resolution. +Resolved 'arch/arm/mach-s3c64xx/mach-smdk6410.c' using previous resolution. +Resolved 'arch/arm/plat-samsung/Kconfig' using previous resolution. +Resolved 'drivers/input/touchscreen/s3c2410_ts.c' using previous resolution. +Renaming arch/arm/mach-s3c2410/include/mach/ts.h->arch/arm/plat-samsung/include/plat/ts.h +Auto-merging arch/arm/plat-samsung/include/plat/ts.h +Auto-merging arch/arm/mach-s3c2410/mach-h1940.c +Auto-merging arch/arm/mach-s3c64xx/Makefile +CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/Makefile +Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c +CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-smdk6410.c +Auto-merging arch/arm/plat-s3c24xx/devs.c +Auto-merging arch/arm/plat-samsung/Kconfig +CONFLICT (content): Merge conflict in arch/arm/plat-samsung/Kconfig +Auto-merging drivers/input/touchscreen/s3c2410_ts.c +CONFLICT (content): Merge conflict in drivers/input/touchscreen/s3c2410_ts.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 33b5796] Merge remote branch 'samsung/next-samsung' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-s3c64xx/dev-ts.c | 61 +++++++++++++++++++++++++++++++++ + arch/arm/mach-s3c64xx/mach-smdk6410.c | 5 +++ + 2 files changed, 66 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/mach-s3c64xx/dev-ts.c +Merging s5p/for-next +$ git merge s5p/for-next +Auto-merging arch/arm/Kconfig +Removing arch/arm/mach-s5p6440/Kconfig +Removing arch/arm/mach-s5p6440/Makefile +Removing arch/arm/mach-s5p6440/clock.c +Removing arch/arm/mach-s5p6440/cpu.c +Removing arch/arm/mach-s5p6440/dev-audio.c +Removing arch/arm/mach-s5p6440/dev-spi.c +Removing arch/arm/mach-s5p6440/include/mach/debug-macro.S +Removing arch/arm/mach-s5p6440/include/mach/gpio.h +Removing arch/arm/mach-s5p6440/include/mach/io.h +Removing arch/arm/mach-s5p6440/include/mach/map.h +Removing arch/arm/mach-s5p6440/include/mach/regs-clock.h +Removing arch/arm/mach-s5p6440/include/mach/spi-clocks.h +Removing arch/arm/mach-s5p6440/include/mach/uncompress.h +Removing arch/arm/mach-s5p6440/init.c +Merge made by recursive. + arch/arm/Kconfig | 11 +- + arch/arm/Makefile | 2 +- + .../{s5p6440_defconfig => s5p64x0_defconfig} | 3 +- + arch/arm/mach-s3c64xx/dev-spi.c | 2 +- + arch/arm/mach-s3c64xx/mach-real6410.c | 104 ++-- + arch/arm/mach-s5p6440/Kconfig | 33 - + arch/arm/mach-s5p6440/Makefile | 25 - + arch/arm/mach-s5p6440/clock.c | 846 -------------------- + arch/arm/mach-s5p6440/cpu.c | 116 --- + arch/arm/mach-s5p6440/dev-audio.c | 127 --- + arch/arm/mach-s5p6440/dev-spi.c | 176 ---- + arch/arm/mach-s5p6440/include/mach/debug-macro.S | 37 - + arch/arm/mach-s5p6440/include/mach/gpio.h | 80 -- + arch/arm/mach-s5p6440/include/mach/io.h | 18 - + arch/arm/mach-s5p6440/include/mach/map.h | 86 -- + arch/arm/mach-s5p6440/include/mach/regs-clock.h | 130 --- + arch/arm/mach-s5p6440/include/mach/spi-clocks.h | 17 - + arch/arm/mach-s5p6440/include/mach/uncompress.h | 24 - + arch/arm/mach-s5p6440/init.c | 52 -- + arch/arm/mach-s5p6442/cpu.c | 27 +- + arch/arm/mach-s5p6442/include/mach/map.h | 6 - + arch/arm/mach-s5p64x0/Kconfig | 57 ++ + arch/arm/mach-s5p64x0/Makefile | 30 + + .../{mach-s5p6440 => mach-s5p64x0}/Makefile.boot | 0 + arch/arm/mach-s5p64x0/clock-s5p6440.c | 626 +++++++++++++++ + arch/arm/mach-s5p64x0/clock-s5p6450.c | 655 +++++++++++++++ + arch/arm/mach-s5p64x0/clock.c | 253 ++++++ + arch/arm/mach-s5p64x0/cpu.c | 208 +++++ + arch/arm/mach-s5p64x0/dev-audio.c | 164 ++++ + arch/arm/mach-s5p64x0/dev-spi.c | 232 ++++++ + arch/arm/{mach-s5p6440 => mach-s5p64x0}/dma.c | 86 ++- + arch/arm/{mach-s5p6440 => mach-s5p64x0}/gpio.c | 99 ++-- + arch/arm/mach-s5p64x0/include/mach/debug-macro.S | 39 + + .../include/mach/dma.h | 0 + .../include/mach/entry-macro.S | 8 +- + arch/arm/mach-s5p64x0/include/mach/gpio.h | 139 ++++ + .../include/mach/hardware.h | 8 +- + arch/arm/mach-s5p64x0/include/mach/i2c.h | 17 + + arch/arm/mach-s5p64x0/include/mach/io.h | 25 + + .../include/mach/irqs.h | 48 +- + arch/arm/mach-s5p64x0/include/mach/map.h | 83 ++ + .../include/mach/memory.h | 12 +- + .../include/mach/pwm-clock.h | 10 +- + arch/arm/mach-s5p64x0/include/mach/regs-clock.h | 63 ++ + .../include/mach/regs-gpio.h | 28 +- + .../include/mach/regs-irq.h | 8 +- + arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h | 46 ++ + arch/arm/mach-s5p64x0/include/mach/spi-clocks.h | 20 + + .../include/mach/system.h | 8 +- + .../include/mach/tick.h | 13 +- + .../include/mach/timex.h | 7 +- + arch/arm/mach-s5p64x0/include/mach/uncompress.h | 212 +++++ + .../include/mach/vmalloc.h | 5 +- + arch/arm/mach-s5p64x0/init.c | 73 ++ + .../{mach-s5p6440 => mach-s5p64x0}/mach-smdk6440.c | 87 ++- + arch/arm/mach-s5p64x0/mach-smdk6450.c | 182 +++++ + .../{mach-s5p6440 => mach-s5p64x0}/setup-i2c0.c | 24 +- + .../{mach-s5p6440 => mach-s5p64x0}/setup-i2c1.c | 20 +- + arch/arm/mach-s5pc100/cpu.c | 25 +- + arch/arm/mach-s5pc100/include/mach/map.h | 11 +- + arch/arm/mach-s5pv210/Kconfig | 11 +- + arch/arm/mach-s5pv210/Makefile | 1 - + arch/arm/mach-s5pv210/clock.c | 25 +- + arch/arm/mach-s5pv210/cpu.c | 24 +- + arch/arm/mach-s5pv210/include/mach/irqs.h | 2 +- + arch/arm/mach-s5pv210/include/mach/map.h | 11 +- + arch/arm/mach-s5pv210/mach-aquila.c | 2 +- + arch/arm/mach-s5pv210/mach-goni.c | 29 +- + arch/arm/mach-s5pv310/Kconfig | 22 +- + arch/arm/mach-s5pv310/Makefile | 1 + + arch/arm/mach-s5pv310/clock.c | 628 +++++++++++++-- + arch/arm/mach-s5pv310/cpu.c | 26 +- + arch/arm/mach-s5pv310/hotplug.c | 144 ++++ + arch/arm/mach-s5pv310/include/mach/irqs.h | 7 + + arch/arm/mach-s5pv310/include/mach/map.h | 7 +- + arch/arm/mach-s5pv310/include/mach/regs-clock.h | 28 +- + arch/arm/mach-s5pv310/mach-smdkc210.c | 91 +++ + arch/arm/mach-s5pv310/mach-universal_c210.c | 62 ++ + arch/arm/plat-s5p/Kconfig | 9 +- + arch/arm/plat-s5p/Makefile | 1 + + arch/arm/plat-s5p/clock.c | 19 + + arch/arm/plat-s5p/cpu.c | 34 +- + arch/arm/plat-s5p/dev-fimc0.c | 9 +- + arch/arm/plat-s5p/dev-fimc1.c | 9 +- + arch/arm/plat-s5p/dev-fimc2.c | 9 +- + arch/arm/{mach-s5pv210 => plat-s5p}/dev-onenand.c | 28 +- + arch/arm/plat-s5p/dev-uart.c | 58 ++ + arch/arm/plat-s5p/include/plat/pll.h | 7 + + arch/arm/plat-s5p/include/plat/s5p-clock.h | 8 +- + arch/arm/plat-s5p/include/plat/s5p6440.h | 7 +- + arch/arm/plat-s5p/include/plat/s5p6450.h | 36 + + arch/arm/plat-samsung/adc.c | 1 - + arch/arm/plat-samsung/dev-hsmmc3.c | 4 +- + arch/arm/plat-samsung/gpio-config.c | 7 +- + arch/arm/plat-samsung/include/plat/devs.h | 7 +- + arch/arm/plat-samsung/include/plat/gpio-cfg.h | 10 +- + arch/arm/plat-samsung/include/plat/s3c-dma-pl330.h | 20 + + arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 2 +- + drivers/serial/Kconfig | 7 +- + drivers/serial/samsung.c | 2 +- + 100 files changed, 4781 insertions(+), 2187 deletions(-) + rename arch/arm/configs/{s5p6440_defconfig => s5p64x0_defconfig} (97%) + delete mode 100644 arch/arm/mach-s5p6440/Kconfig + delete mode 100644 arch/arm/mach-s5p6440/Makefile + delete mode 100644 arch/arm/mach-s5p6440/clock.c + delete mode 100644 arch/arm/mach-s5p6440/cpu.c + delete mode 100644 arch/arm/mach-s5p6440/dev-audio.c + delete mode 100644 arch/arm/mach-s5p6440/dev-spi.c + delete mode 100644 arch/arm/mach-s5p6440/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-s5p6440/include/mach/gpio.h + delete mode 100644 arch/arm/mach-s5p6440/include/mach/io.h + delete mode 100644 arch/arm/mach-s5p6440/include/mach/map.h + delete mode 100644 arch/arm/mach-s5p6440/include/mach/regs-clock.h + delete mode 100644 arch/arm/mach-s5p6440/include/mach/spi-clocks.h + delete mode 100644 arch/arm/mach-s5p6440/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-s5p6440/init.c + create mode 100644 arch/arm/mach-s5p64x0/Kconfig + create mode 100644 arch/arm/mach-s5p64x0/Makefile + rename arch/arm/{mach-s5p6440 => mach-s5p64x0}/Makefile.boot (100%) + create mode 100644 arch/arm/mach-s5p64x0/clock-s5p6440.c + create mode 100644 arch/arm/mach-s5p64x0/clock-s5p6450.c + create mode 100644 arch/arm/mach-s5p64x0/clock.c + create mode 100644 arch/arm/mach-s5p64x0/cpu.c + create mode 100644 arch/arm/mach-s5p64x0/dev-audio.c + create mode 100644 arch/arm/mach-s5p64x0/dev-spi.c + rename arch/arm/{mach-s5p6440 => mach-s5p64x0}/dma.c (55%) + rename arch/arm/{mach-s5p6440 => mach-s5p64x0}/gpio.c (75%) + create mode 100644 arch/arm/mach-s5p64x0/include/mach/debug-macro.S + rename arch/arm/{mach-s5p6440 => mach-s5p64x0}/include/mach/dma.h (100%) + rename arch/arm/{mach-s5p6440 => mach-s5p64x0}/include/mach/entry-macro.S (58%) + create mode 100644 arch/arm/mach-s5p64x0/include/mach/gpio.h + rename arch/arm/{mach-s5p6440 => mach-s5p64x0}/include/mach/hardware.h (67%) + create mode 100644 arch/arm/mach-s5p64x0/include/mach/i2c.h + create mode 100644 arch/arm/mach-s5p64x0/include/mach/io.h + rename arch/arm/{mach-s5p6440 => mach-s5p64x0}/include/mach/irqs.h (71%) + create mode 100644 arch/arm/mach-s5p64x0/include/mach/map.h + rename arch/arm/{mach-s5p6440 => mach-s5p64x0}/include/mach/memory.h (55%) + rename arch/arm/{mach-s5p6440 => mach-s5p64x0}/include/mach/pwm-clock.h (86%) + create mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-clock.h + rename arch/arm/{mach-s5p6440 => mach-s5p64x0}/include/mach/regs-gpio.h (79%) + rename arch/arm/{mach-s5p6440 => mach-s5p64x0}/include/mach/regs-irq.h (66%) + create mode 100644 arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h + create mode 100644 arch/arm/mach-s5p64x0/include/mach/spi-clocks.h + rename arch/arm/{mach-s5p6440 => mach-s5p64x0}/include/mach/system.h (69%) + rename arch/arm/{mach-s5p6440 => mach-s5p64x0}/include/mach/tick.h (60%) + rename arch/arm/{mach-s5p6440 => mach-s5p64x0}/include/mach/timex.h (80%) + create mode 100644 arch/arm/mach-s5p64x0/include/mach/uncompress.h + rename arch/arm/{mach-s5p6440 => mach-s5p64x0}/include/mach/vmalloc.h (74%) + create mode 100644 arch/arm/mach-s5p64x0/init.c + rename arch/arm/{mach-s5p6440 => mach-s5p64x0}/mach-smdk6440.c (66%) + create mode 100644 arch/arm/mach-s5p64x0/mach-smdk6450.c + rename arch/arm/{mach-s5p6440 => mach-s5p64x0}/setup-i2c0.c (52%) + rename arch/arm/{mach-s5p6440 => mach-s5p64x0}/setup-i2c1.c (55%) + create mode 100644 arch/arm/mach-s5pv310/hotplug.c + create mode 100644 arch/arm/mach-s5pv310/mach-smdkc210.c + rename arch/arm/{mach-s5pv210 => plat-s5p}/dev-onenand.c (59%) + create mode 100644 arch/arm/plat-s5p/include/plat/s5p6450.h +Merging tegra/for-next +$ git merge tegra/for-next +Auto-merging arch/arm/Kconfig +Merge made by recursive. + arch/arm/Kconfig | 1 + + arch/arm/configs/tegra_defconfig | 1095 +++++++++++++++++++++++++ + arch/arm/mach-tegra/Kconfig | 7 + + arch/arm/mach-tegra/Makefile | 7 +- + arch/arm/mach-tegra/clock.c | 267 ++++++- + arch/arm/mach-tegra/clock.h | 58 +- + arch/arm/mach-tegra/common.c | 13 +- + arch/arm/mach-tegra/cpu-tegra.c | 185 +++++ + arch/arm/mach-tegra/dma.c | 752 +++++++++++++++++ + arch/arm/mach-tegra/fuse.c | 84 ++ + arch/arm/mach-tegra/fuse.h | 24 + + arch/arm/mach-tegra/gpio.c | 104 +++- + arch/arm/mach-tegra/include/mach/clk.h | 5 + + arch/arm/mach-tegra/include/mach/dma.h | 155 ++++ + arch/arm/mach-tegra/include/mach/gpio.h | 4 +- + arch/arm/mach-tegra/include/mach/io.h | 6 + + arch/arm/mach-tegra/include/mach/iomap.h | 33 +- + arch/arm/mach-tegra/include/mach/irqs.h | 2 + + arch/arm/mach-tegra/include/mach/legacy_irq.h | 31 + + arch/arm/mach-tegra/include/mach/pinmux-t2.h | 174 ++++ + arch/arm/mach-tegra/include/mach/pinmux.h | 210 ++---- + arch/arm/mach-tegra/io.c | 6 + + arch/arm/mach-tegra/irq.c | 137 +++ + arch/arm/mach-tegra/legacy_irq.c | 114 +++ + arch/arm/mach-tegra/pinmux-t2-tables.c | 260 ++++++ + arch/arm/mach-tegra/pinmux.c | 354 +++------ + arch/arm/mach-tegra/tegra2_clocks.c | 778 ++++++++++++++---- + arch/arm/mach-tegra/tegra2_dvfs.c | 86 ++ + arch/arm/mach-tegra/tegra2_dvfs.h | 20 + + 29 files changed, 4344 insertions(+), 628 deletions(-) + create mode 100644 arch/arm/configs/tegra_defconfig + create mode 100644 arch/arm/mach-tegra/cpu-tegra.c + create mode 100644 arch/arm/mach-tegra/dma.c + create mode 100644 arch/arm/mach-tegra/fuse.c + create mode 100644 arch/arm/mach-tegra/fuse.h + create mode 100644 arch/arm/mach-tegra/include/mach/dma.h + create mode 100644 arch/arm/mach-tegra/include/mach/legacy_irq.h + create mode 100644 arch/arm/mach-tegra/include/mach/pinmux-t2.h + create mode 100644 arch/arm/mach-tegra/legacy_irq.c + create mode 100644 arch/arm/mach-tegra/pinmux-t2-tables.c + create mode 100644 arch/arm/mach-tegra/tegra2_dvfs.c + create mode 100644 arch/arm/mach-tegra/tegra2_dvfs.h +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Already up-to-date. +Merging ia64/test +$ git merge ia64/test +Merge made by recursive. +Merging m68k/for-next +$ git merge m68k/for-next +Removing arch/m68k/include/asm/atomic_mm.h +Removing arch/m68k/include/asm/atomic_no.h +Removing arch/m68k/include/asm/machdep_mm.h +Removing arch/m68k/include/asm/machdep_no.h +Removing arch/m68k/include/asm/string_mm.h +Removing arch/m68k/include/asm/string_no.h +Removing arch/m68k/include/asm/thread_info_mm.h +Removing arch/m68k/include/asm/thread_info_no.h +Removing arch/m68k/include/asm/traps_mm.h +Removing arch/m68k/include/asm/traps_no.h +Merge made by recursive. + arch/m68k/Kconfig | 4 +- + arch/m68k/include/asm/amigahw.h | 1 - + arch/m68k/include/asm/atomic.h | 210 ++++++++++++++++++++++- + arch/m68k/include/asm/atomic_mm.h | 200 ---------------------- + arch/m68k/include/asm/atomic_no.h | 155 ----------------- + arch/m68k/include/asm/entry_mm.h | 3 + + arch/m68k/include/asm/io_mm.h | 39 +---- + arch/m68k/include/asm/ioctls.h | 80 +--------- + arch/m68k/include/asm/machdep.h | 49 +++++- + arch/m68k/include/asm/machdep_mm.h | 35 ---- + arch/m68k/include/asm/machdep_no.h | 26 --- + arch/m68k/include/asm/page.h | 48 +++++- + arch/m68k/include/asm/page_mm.h | 55 +------ + arch/m68k/include/asm/page_no.h | 51 +----- + arch/m68k/include/asm/string.h | 134 ++++++++++++++- + arch/m68k/include/asm/string_mm.h | 131 -------------- + arch/m68k/include/asm/string_no.h | 126 -------------- + arch/m68k/include/asm/system_mm.h | 2 - + arch/m68k/include/asm/system_no.h | 9 - + arch/m68k/include/asm/thread_info.h | 109 ++++++++++++- + arch/m68k/include/asm/thread_info_mm.h | 71 -------- + arch/m68k/include/asm/thread_info_no.h | 102 ----------- + arch/m68k/include/asm/traps.h | 275 +++++++++++++++++++++++++++++- + arch/m68k/include/asm/traps_mm.h | 272 ----------------------------- + arch/m68k/include/asm/traps_no.h | 154 ----------------- + arch/m68k/kernel/setup.c | 6 - + arch/m68k/kernel/time.c | 2 - + arch/m68k/sun3/sun3ints.c | 2 - + arch/m68knommu/kernel/time.c | 3 +- + arch/m68knommu/platform/coldfire/entry.S | 4 +- + drivers/video/q40fb.c | 4 +- + 31 files changed, 826 insertions(+), 1536 deletions(-) + delete mode 100644 arch/m68k/include/asm/atomic_mm.h + delete mode 100644 arch/m68k/include/asm/atomic_no.h + delete mode 100644 arch/m68k/include/asm/machdep_mm.h + delete mode 100644 arch/m68k/include/asm/machdep_no.h + delete mode 100644 arch/m68k/include/asm/string_mm.h + delete mode 100644 arch/m68k/include/asm/string_no.h + delete mode 100644 arch/m68k/include/asm/thread_info_mm.h + delete mode 100644 arch/m68k/include/asm/thread_info_no.h + delete mode 100644 arch/m68k/include/asm/traps_mm.h + delete mode 100644 arch/m68k/include/asm/traps_no.h +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Auto-merging arch/m68knommu/kernel/time.c +Merge made by recursive. + arch/m68k/kernel/asm-offsets.c | 12 ------ + arch/m68knommu/Kconfig | 4 ++ + arch/m68knommu/kernel/.gitignore | 1 + + arch/m68knommu/kernel/asm-offsets.c | 11 +----- + arch/m68knommu/kernel/ptrace.c | 18 --------- + arch/m68knommu/kernel/setup.c | 3 - + arch/m68knommu/kernel/time.c | 13 ++++-- + arch/m68knommu/kernel/traps.c | 13 ------ + arch/m68knommu/platform/5272/intc.c | 8 +-- + arch/m68knommu/platform/68328/entry.S | 32 ++++++++-------- + arch/m68knommu/platform/68328/head-de2.S | 6 --- + arch/m68knommu/platform/68328/head-ram.S | 27 ------------- + arch/m68knommu/platform/68328/ints.c | 6 +-- + arch/m68knommu/platform/68360/entry.S | 9 +++- + arch/m68knommu/platform/68360/ints.c | 6 +-- + arch/m68knommu/platform/68VZ328/config.c | 5 -- + arch/m68knommu/platform/coldfire/intc-2.c | 53 +++++++++++++++++++++----- + arch/m68knommu/platform/coldfire/intc-simr.c | 10 ++-- + arch/m68knommu/platform/coldfire/intc.c | 8 +-- + drivers/serial/68328serial.h | 5 -- + 20 files changed, 95 insertions(+), 155 deletions(-) + create mode 100644 arch/m68knommu/kernel/.gitignore +Merging microblaze/next +$ git merge microblaze/next +Merge made by recursive. + arch/microblaze/Kconfig | 17 ++++ + arch/microblaze/Makefile | 3 - + arch/microblaze/include/asm/cpuinfo.h | 1 + + arch/microblaze/include/asm/gpio.h | 5 +- + arch/microblaze/include/asm/io.h | 2 + + arch/microblaze/include/asm/page.h | 3 - + arch/microblaze/include/asm/pci.h | 2 + + arch/microblaze/include/asm/pgalloc.h | 3 +- + arch/microblaze/include/asm/pgtable.h | 7 ++ + arch/microblaze/include/asm/pvr.h | 6 +- + arch/microblaze/include/asm/seccomp.h | 16 ++++ + arch/microblaze/include/asm/setup.h | 6 ++ + arch/microblaze/include/asm/thread_info.h | 20 ++--- + arch/microblaze/include/asm/unistd.h | 5 +- + arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c | 1 + + arch/microblaze/kernel/cpu/cpuinfo-static.c | 1 + + arch/microblaze/kernel/cpu/cpuinfo.c | 2 + + arch/microblaze/kernel/cpu/mb.c | 3 +- + arch/microblaze/kernel/entry.S | 21 ++--- + arch/microblaze/kernel/exceptions.c | 25 ++---- + arch/microblaze/kernel/heartbeat.c | 9 +- + arch/microblaze/kernel/intc.c | 5 +- + arch/microblaze/kernel/kgdb.c | 3 +- + arch/microblaze/kernel/microblaze_ksyms.c | 32 ++----- + arch/microblaze/kernel/setup.c | 6 -- + arch/microblaze/kernel/syscall_table.S | 3 + + arch/microblaze/kernel/timer.c | 12 +-- + arch/microblaze/kernel/vmlinux.lds.S | 1 - + arch/microblaze/lib/Makefile | 10 ++ + arch/microblaze/lib/ashldi3.c | 29 ++++++ + arch/microblaze/lib/ashrdi3.c | 31 +++++++ + arch/microblaze/lib/divsi3.S | 73 +++++++++++++++ + arch/microblaze/lib/libgcc.h | 25 +++++ + arch/microblaze/lib/lshrdi3.c | 29 ++++++ + arch/microblaze/lib/modsi3.S | 73 +++++++++++++++ + arch/microblaze/lib/muldi3.S | 121 +++++++++++++++++++++++++ + arch/microblaze/lib/mulsi3.S | 46 ++++++++++ + arch/microblaze/lib/udivsi3.S | 84 +++++++++++++++++ + arch/microblaze/lib/umodsi3.S | 86 ++++++++++++++++++ + arch/microblaze/pci/pci-common.c | 15 --- + arch/microblaze/platform/generic/system.dts | 2 + + drivers/net/xilinx_emaclite.c | 13 +++ + drivers/serial/uartlite.c | 26 +++++- + 43 files changed, 759 insertions(+), 124 deletions(-) + create mode 100644 arch/microblaze/include/asm/seccomp.h + create mode 100644 arch/microblaze/lib/ashldi3.c + create mode 100644 arch/microblaze/lib/ashrdi3.c + create mode 100644 arch/microblaze/lib/divsi3.S + create mode 100644 arch/microblaze/lib/libgcc.h + create mode 100644 arch/microblaze/lib/lshrdi3.c + create mode 100644 arch/microblaze/lib/modsi3.S + create mode 100644 arch/microblaze/lib/muldi3.S + create mode 100644 arch/microblaze/lib/mulsi3.S + create mode 100644 arch/microblaze/lib/udivsi3.S + create mode 100644 arch/microblaze/lib/umodsi3.S +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging parisc/next +$ git merge parisc/next +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Auto-merging arch/powerpc/include/asm/compat.h +Merge made by recursive. + arch/powerpc/include/asm/checksum.h | 10 + + arch/powerpc/include/asm/compat.h | 4 +- + arch/powerpc/include/asm/cputable.h | 14 +- + arch/powerpc/include/asm/dma-mapping.h | 14 +- + arch/powerpc/include/asm/elf.h | 2 +- + arch/powerpc/include/asm/exception-64s.h | 3 +- + arch/powerpc/include/asm/kvm_fpu.h | 4 +- + arch/powerpc/include/asm/lppaca.h | 29 ++ + arch/powerpc/include/asm/machdep.h | 3 + + arch/powerpc/include/asm/paca.h | 10 +- + arch/powerpc/include/asm/page_64.h | 4 +- + arch/powerpc/include/asm/ppc_asm.h | 50 ++- + arch/powerpc/include/asm/processor.h | 4 +- + arch/powerpc/include/asm/systbl.h | 19 + + arch/powerpc/include/asm/system.h | 4 +- + arch/powerpc/include/asm/time.h | 5 - + arch/powerpc/include/asm/unistd.h | 21 +- + arch/powerpc/kernel/align.c | 4 +- + arch/powerpc/kernel/asm-offsets.c | 8 +- + arch/powerpc/kernel/dma.c | 18 + + arch/powerpc/kernel/entry_64.S | 40 +++ + arch/powerpc/kernel/fpu.S | 10 - + arch/powerpc/kernel/lparcfg.c | 14 +- + arch/powerpc/kernel/paca.c | 70 ++++- + arch/powerpc/kernel/process.c | 12 - + arch/powerpc/kernel/ptrace.c | 2 +- + arch/powerpc/kernel/smp.c | 14 +- + arch/powerpc/kernel/time.c | 272 +++++++-------- + arch/powerpc/kernel/vdso.c | 6 +- + arch/powerpc/kvm/book3s_paired_singles.c | 44 +-- + arch/powerpc/kvm/fpu.S | 8 - + arch/powerpc/lib/Makefile | 3 +- + arch/powerpc/lib/checksum_64.S | 482 +++++++++++++++++++------- + arch/powerpc/lib/checksum_wrappers_64.c | 102 ++++++ + arch/powerpc/lib/copy_32.S | 2 +- + arch/powerpc/lib/ldstfp.S | 36 +- + arch/powerpc/lib/locks.c | 4 +- + arch/powerpc/lib/sstep.c | 8 + + arch/powerpc/mm/fault.c | 6 + + arch/powerpc/mm/mmu_context_nohash.c | 6 +- + arch/powerpc/oprofile/backtrace.c | 2 +- + arch/powerpc/platforms/cell/ras.c | 4 +- + arch/powerpc/platforms/cell/spider-pic.c | 4 +- + arch/powerpc/platforms/chrp/nvram.c | 4 +- + arch/powerpc/platforms/iseries/dt.c | 4 +- + arch/powerpc/platforms/iseries/smp.c | 2 +- + arch/powerpc/platforms/maple/setup.c | 1 + + arch/powerpc/platforms/powermac/pfunc_core.c | 9 +- + arch/powerpc/platforms/pseries/dtl.c | 224 +++++++++--- + arch/powerpc/platforms/pseries/lpar.c | 25 ++- + arch/powerpc/platforms/pseries/setup.c | 52 +++ + arch/powerpc/sysdev/dart_iommu.c | 74 ++++- + drivers/macintosh/via-pmu-led.c | 4 +- + 53 files changed, 1279 insertions(+), 501 deletions(-) + create mode 100644 arch/powerpc/lib/checksum_wrappers_64.c +$ git am -3 ../patches/0001-powerpc-define-a-compat_sys_recv-cond_syscall.patch +Applying: powerpc: define a compat_sys_recv cond_syscall +$ git reset HEAD^ +Unstaged changes after reset: +M kernel/sys_ni.c +$ git add . +$ git commit -v -a --amend +[master f26d4da] Merge remote branch 'powerpc/next' +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/next +$ git merge 52xx-and-virtex/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Resolved 'arch/powerpc/platforms/85xx/mpc85xx_mds.c' using previous resolution. +Auto-merging arch/powerpc/platforms/85xx/mpc85xx_mds.c +CONFLICT (content): Merge conflict in arch/powerpc/platforms/85xx/mpc85xx_mds.c +Auto-merging arch/powerpc/sysdev/fsl_msi.c +Auto-merging arch/powerpc/sysdev/fsl_pci.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6f8cd03] Merge remote branch 'galak/next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/sysdev/fsl_msi.c | 9 +++---- + arch/powerpc/sysdev/fsl_pci.c | 43 ++++++++++++++++++++++++++++++++++++++++- + arch/powerpc/sysdev/fsl_pci.h | 1 + + 3 files changed, 47 insertions(+), 6 deletions(-) +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/Kbuild | 6 + + arch/s390/Kconfig | 1 + + arch/s390/Makefile | 4 +- + arch/s390/include/asm/hardirq.h | 4 - + arch/s390/include/asm/page.h | 8 +- + arch/s390/include/asm/pgalloc.h | 4 + + arch/s390/include/asm/pgtable.h | 32 ++++- + arch/s390/include/asm/qdio.h | 13 ++- + arch/s390/include/asm/scatterlist.h | 2 + + arch/s390/include/asm/sysinfo.h | 5 +- + arch/s390/include/asm/tlb.h | 13 +- + arch/s390/kernel/dis.c | 145 ++++++++++++++++++++-- + arch/s390/kernel/early.c | 3 +- + arch/s390/kernel/process.c | 10 +- + arch/s390/kernel/setup.c | 3 +- + arch/s390/kernel/sysinfo.c | 7 + + arch/s390/mm/Makefile | 2 +- + arch/s390/mm/fault.c | 21 +++- + arch/s390/mm/gup.c | 225 +++++++++++++++++++++++++++++++++++ + arch/s390/mm/hugetlbpage.c | 2 +- + arch/s390/mm/init.c | 52 +++++++- + arch/s390/mm/pgtable.c | 171 ++++++++++++++++++++++++--- + drivers/s390/block/dasd_3990_erp.c | 3 + + drivers/s390/char/tape_core.c | 16 ++- + drivers/s390/cio/blacklist.c | 10 +- + drivers/s390/cio/qdio.h | 29 +++++ + drivers/s390/cio/qdio_debug.c | 33 ++---- + drivers/s390/cio/qdio_main.c | 138 +++++++++++++++++++++- + drivers/s390/cio/qdio_setup.c | 1 + + drivers/s390/cio/qdio_thinint.c | 66 ++++++----- + drivers/s390/scsi/zfcp_qdio.c | 6 +- + include/asm-generic/pgtable.h | 2 +- + include/linux/page-flags.h | 2 +- + mm/rmap.c | 4 +- + 34 files changed, 900 insertions(+), 143 deletions(-) + create mode 100644 arch/s390/Kbuild + create mode 100644 arch/s390/mm/gup.c +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/Kconfig | 5 +- + arch/sh/boards/Kconfig | 16 + + arch/sh/boards/Makefile | 2 + + arch/sh/boards/board-sh2007.c | 133 +++ + arch/sh/boards/board-sh7757lcr.c | 374 +++++++ + arch/sh/configs/ap325rxa_defconfig | 1 - + arch/sh/configs/cayman_defconfig | 1 - + arch/sh/configs/dreamcast_defconfig | 1 - + arch/sh/configs/ecovec24-romimage_defconfig | 1 - + arch/sh/configs/edosk7760_defconfig | 1 - + arch/sh/configs/espt_defconfig | 1 - + arch/sh/configs/hp6xx_defconfig | 1 - + arch/sh/configs/kfr2r09-romimage_defconfig | 1 - + arch/sh/configs/kfr2r09_defconfig | 1 - + arch/sh/configs/landisk_defconfig | 1 - + arch/sh/configs/lboxre2_defconfig | 1 - + arch/sh/configs/magicpanelr2_defconfig | 1 - + arch/sh/configs/microdev_defconfig | 1 - + arch/sh/configs/migor_defconfig | 1 - + arch/sh/configs/polaris_defconfig | 1 - + arch/sh/configs/r7780mp_defconfig | 1 - + arch/sh/configs/r7785rp_defconfig | 1 - + arch/sh/configs/rts7751r2d1_defconfig | 1 - + arch/sh/configs/rts7751r2dplus_defconfig | 1 - + arch/sh/configs/sdk7780_defconfig | 1 - + arch/sh/configs/se7343_defconfig | 1 - + arch/sh/configs/se7712_defconfig | 1 - + arch/sh/configs/se7721_defconfig | 1 - + arch/sh/configs/se7722_defconfig | 1 - + arch/sh/configs/se7724_defconfig | 1 - + arch/sh/configs/se7750_defconfig | 1 - + arch/sh/configs/se7751_defconfig | 1 - + arch/sh/configs/se7780_defconfig | 1 - + arch/sh/configs/sh03_defconfig | 1 - + arch/sh/configs/sh2007_defconfig | 212 ++++ + arch/sh/configs/sh7710voipgw_defconfig | 1 - + arch/sh/configs/sh7757lcr_defconfig | 85 ++ + arch/sh/configs/sh7763rdp_defconfig | 1 - + arch/sh/configs/sh7785lcr_defconfig | 1 - + arch/sh/configs/shx3_defconfig | 1 - + arch/sh/configs/snapgear_defconfig | 1 - + arch/sh/configs/systemh_defconfig | 1 - + arch/sh/configs/titan_defconfig | 1 - + arch/sh/configs/ul2_defconfig | 1 - + arch/sh/drivers/dma/dma-api.c | 4 +- + arch/sh/drivers/pci/ops-sh7786.c | 27 +- + arch/sh/drivers/pci/pci-sh7751.c | 2 +- + arch/sh/drivers/pci/pci-sh7780.c | 2 +- + arch/sh/drivers/pci/pcie-sh7786.c | 72 +- + arch/sh/drivers/pci/pcie-sh7786.h | 56 +- + arch/sh/include/asm/Kbuild | 2 + + arch/sh/include/asm/elf.h | 27 +- + arch/sh/include/asm/fixmap.h | 4 +- + arch/sh/include/asm/irq.h | 2 +- + arch/sh/include/asm/kprobes.h | 1 - + arch/sh/include/asm/processor_32.h | 3 - + arch/sh/include/asm/processor_64.h | 3 - + arch/sh/include/asm/ptrace.h | 169 ++-- + arch/sh/include/asm/ptrace_32.h | 83 ++ + arch/sh/include/asm/ptrace_64.h | 20 + + arch/sh/include/asm/syscalls_32.h | 7 +- + arch/sh/include/asm/system_32.h | 13 +- + arch/sh/include/asm/tlbflush.h | 2 + + arch/sh/include/asm/unistd_32.h | 27 +- + arch/sh/include/asm/unistd_64.h | 5 +- + arch/sh/include/cpu-sh4/cpu/sh7757.h | 301 +++--- + arch/sh/include/mach-common/mach/sh2007.h | 117 ++ + arch/sh/kernel/Makefile | 2 +- + arch/sh/kernel/cpu/sh4/probe.c | 2 +- + arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 199 ++-- + arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c | 1582 ++++++++++++++++----------- + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 66 ++ + arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 222 +++-- + arch/sh/kernel/kprobes.c | 100 +- + arch/sh/kernel/ptrace.c | 33 + + arch/sh/kernel/ptrace_32.c | 27 + + arch/sh/kernel/ptrace_64.c | 88 ++- + arch/sh/kernel/reboot.c | 4 + + arch/sh/kernel/syscalls_32.S | 22 + + arch/sh/kernel/syscalls_64.S | 3 + + arch/sh/mm/consistent.c | 3 +- + arch/sh/mm/init.c | 52 +- + arch/sh/mm/nommu.c | 4 + + arch/sh/mm/tlbflush_32.c | 16 + + arch/sh/mm/tlbflush_64.c | 5 + + arch/sh/tools/mach-types | 2 + + drivers/Makefile | 2 +- + drivers/clocksource/sh_cmt.c | 12 +- + drivers/i2c/busses/i2c-sh_mobile.c | 23 +- + drivers/mfd/sh_mobile_sdhi.c | 2 +- + drivers/serial/sh-sci.h | 17 +- + drivers/sh/clk.c | 9 +- + drivers/usb/host/r8a66597-hcd.c | 4 +- + sound/soc/sh/siu_pcm.c | 2 + + 94 files changed, 3048 insertions(+), 1268 deletions(-) + create mode 100644 arch/sh/boards/board-sh2007.c + create mode 100644 arch/sh/boards/board-sh7757lcr.c + create mode 100644 arch/sh/configs/sh2007_defconfig + create mode 100644 arch/sh/configs/sh7757lcr_defconfig + create mode 100644 arch/sh/include/asm/ptrace_32.h + create mode 100644 arch/sh/include/asm/ptrace_64.h + create mode 100644 arch/sh/include/mach-common/mach/sh2007.h + create mode 100644 arch/sh/kernel/ptrace.c +Merging genesis/master +$ git merge genesis/master +Merge made by recursive. + arch/arm/mach-shmobile/board-ap4evb.c | 180 ++++++---- + arch/arm/mach-shmobile/clock-sh7372.c | 2 +- + arch/arm/mach-shmobile/intc-sh7372.c | 28 ++ + arch/arm/mach-shmobile/pfc-sh7372.c | 8 +- + arch/arm/mach-shmobile/setup-sh7372.c | 24 +- + arch/sh/boards/mach-ap325rxa/setup.c | 29 +- + arch/sh/boards/mach-ecovec24/setup.c | 60 ++-- + arch/sh/boards/mach-kfr2r09/setup.c | 29 +- + arch/sh/boards/mach-migor/setup.c | 58 ++-- + arch/sh/boards/mach-se/7724/setup.c | 54 ++-- + drivers/video/sh_mipi_dsi.c | 32 +- + drivers/video/sh_mobile_hdmi.c | 573 ++++++++++++++++++++------------- + drivers/video/sh_mobile_lcdcfb.c | 319 ++++++++++++------- + drivers/video/sh_mobile_lcdcfb.h | 41 +++ + include/video/sh_mobile_lcdc.h | 5 +- + 15 files changed, 907 insertions(+), 535 deletions(-) + create mode 100644 drivers/video/sh_mobile_lcdcfb.h +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging tile/master +$ git merge tile/master +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Resolved 'arch/xtensa/configs/iss_defconfig' using previous resolution. +Auto-merging arch/xtensa/Kconfig +Auto-merging arch/xtensa/Makefile +Auto-merging arch/xtensa/configs/iss_defconfig +CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig +Auto-merging arch/xtensa/include/asm/coprocessor.h +Auto-merging arch/xtensa/kernel/Makefile +Auto-merging arch/xtensa/kernel/time.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bad82f9] Merge remote branch 'xtensa/master' +$ git diff -M --stat --summary HEAD^.. + arch/xtensa/Kconfig | 17 +- + arch/xtensa/Makefile | 5 +- + arch/xtensa/boot/Makefile | 1 + + arch/xtensa/include/asm/coprocessor.h | 9 +- + arch/xtensa/include/asm/io.h | 40 ++-- + arch/xtensa/include/asm/irq.h | 7 +- + arch/xtensa/include/asm/serial.h | 12 +- + arch/xtensa/kernel/Makefile | 4 +- + arch/xtensa/kernel/time.c | 2 +- + arch/xtensa/platforms/xtavnet/Makefile | 10 + + .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++ + .../platforms/xtavnet/include/platform/lcd.h | 22 ++ + .../platforms/xtavnet/include/platform/serial.h | 1 + + arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++ + arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++ + 15 files changed, 526 insertions(+), 37 deletions(-) + create mode 100644 arch/xtensa/platforms/xtavnet/Makefile + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c + create mode 100644 arch/xtensa/platforms/xtavnet/setup.c +Merging ceph/for-next +$ git merge ceph/for-next +Already up-to-date. +Merging cifs/master +$ git merge cifs/master +Already up-to-date. +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Merge made by recursive. +Merging ext3/for_next +$ git merge ext3/for_next +Merge made by recursive. + fs/quota/Kconfig | 4 ++-- + fs/xfs/Kconfig | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging ext4/next +$ git merge ext4/next +Merge made by recursive. + fs/ext4/ext4.h | 1 + + fs/ext4/extents.c | 98 ++++++++++++++++++++++++++++++------------- + fs/ext4/mballoc.c | 97 +++++++++++++++++++++++++++++++++--------- + fs/jbd2/commit.c | 12 ++++-- + fs/jbd2/journal.c | 4 +- + include/linux/jbd2.h | 2 +- + include/trace/events/ext4.h | 5 +- + 7 files changed, 161 insertions(+), 58 deletions(-) +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/Kconfig | 2 +- + fs/gfs2/aops.c | 20 ++--- + fs/gfs2/bmap.c | 255 +++++++++++++++++++++----------------------- + fs/gfs2/bmap.h | 20 ++-- + fs/gfs2/dir.c | 28 +++--- + fs/gfs2/file.c | 2 +- + fs/gfs2/glock.c | 21 +++- + fs/gfs2/glops.c | 5 +- + fs/gfs2/incore.h | 3 +- + fs/gfs2/inode.c | 9 +- + fs/gfs2/inode.h | 15 +++ + fs/gfs2/lock_dlm.c | 4 +- + fs/gfs2/log.c | 2 +- + fs/gfs2/main.c | 2 +- + fs/gfs2/ops_fstype.c | 2 +- + fs/gfs2/ops_inode.c | 290 ++++++++++++++++++++++++++++++++++++++++++++----- + fs/gfs2/quota.c | 13 +-- + fs/gfs2/rgrp.c | 28 ++++- + fs/gfs2/super.c | 11 +- + fs/gfs2/trace_gfs2.h | 3 +- + fs/gfs2/trans.h | 1 + + 21 files changed, 497 insertions(+), 239 deletions(-) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging logfs/master +$ git merge logfs/master +Resolved 'fs/logfs/logfs.h' using previous resolution. +Auto-merging fs/logfs/dir.c +Auto-merging fs/logfs/file.c +Auto-merging fs/logfs/logfs.h +CONFLICT (content): Merge conflict in fs/logfs/logfs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4c88c6d] Merge remote branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Merge made by recursive. + fs/nfs/dns_resolve.c | 6 +- + fs/nfsd/export.c | 9 +-- + fs/nfsd/nfs4callback.c | 1 - + fs/nfsd/nfs4idmap.c | 2 +- + include/linux/sunrpc/cache.h | 33 ++++++++- + net/sunrpc/cache.c | 168 ++++++++++++++++++++++++++++++----------- + net/sunrpc/svc_xprt.c | 11 +++ + 7 files changed, 173 insertions(+), 57 deletions(-) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Removing fs/nilfs2/gcdat.c +Merge made by recursive. + fs/nilfs2/Makefile | 2 +- + fs/nilfs2/bmap.c | 22 +- + fs/nilfs2/bmap.h | 10 +- + fs/nilfs2/btnode.c | 17 +-- + fs/nilfs2/cpfile.c | 72 +++--- + fs/nilfs2/cpfile.h | 4 +- + fs/nilfs2/dat.c | 89 +++++-- + fs/nilfs2/dat.h | 4 +- + fs/nilfs2/export.h | 17 ++ + fs/nilfs2/gcdat.c | 87 ------- + fs/nilfs2/gcinode.c | 134 ++--------- + fs/nilfs2/ifile.c | 51 +++-- + fs/nilfs2/ifile.h | 4 +- + fs/nilfs2/inode.c | 167 +++++++++++--- + fs/nilfs2/ioctl.c | 21 +- + fs/nilfs2/mdt.c | 313 +++++++++++++------------ + fs/nilfs2/mdt.h | 32 ++- + fs/nilfs2/namei.c | 139 ++++++++++-- + fs/nilfs2/nilfs.h | 38 ++-- + fs/nilfs2/page.c | 55 +++-- + fs/nilfs2/page.h | 6 + + fs/nilfs2/recovery.c | 19 +- + fs/nilfs2/sb.h | 10 - + fs/nilfs2/segment.c | 98 ++++---- + fs/nilfs2/segment.h | 10 +- + fs/nilfs2/sufile.c | 77 ++++--- + fs/nilfs2/sufile.h | 6 +- + fs/nilfs2/super.c | 560 ++++++++++++++++++++++----------------------- + fs/nilfs2/the_nilfs.c | 335 +++++++++------------------ + fs/nilfs2/the_nilfs.h | 99 ++++----- + include/linux/exportfs.h | 13 + + include/linux/nilfs2_fs.h | 10 +- + 32 files changed, 1274 insertions(+), 1247 deletions(-) + create mode 100644 fs/nilfs2/export.h + delete mode 100644 fs/nilfs2/gcdat.c +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Auto-merging fs/jbd2/journal.c +Merge made by recursive. + fs/ext3/super.c | 4 +- + fs/ext4/super.c | 8 +- + fs/jbd2/journal.c | 4 + + fs/libfs.c | 29 ++++ + fs/ocfs2/aops.c | 9 +- + fs/ocfs2/aops.h | 3 +- + fs/ocfs2/dcache.c | 33 ++++- + fs/ocfs2/dcache.h | 1 + + fs/ocfs2/dir.c | 24 ++- + fs/ocfs2/dlm/dlmdebug.c | 17 ++- + fs/ocfs2/dlmglue.c | 8 + + fs/ocfs2/dlmglue.h | 1 + + fs/ocfs2/file.c | 44 ++---- + fs/ocfs2/inode.c | 1 + + fs/ocfs2/inode.h | 12 +- + fs/ocfs2/ioctl.c | 356 +++++++++++++++++++++++++++++++++++++++++++++++ + fs/ocfs2/journal.c | 9 +- + fs/ocfs2/journal.h | 3 +- + fs/ocfs2/mmap.c | 7 +- + fs/ocfs2/namei.c | 3 +- + fs/ocfs2/ocfs2.h | 26 +++-- + fs/ocfs2/ocfs2_fs.h | 5 + + fs/ocfs2/ocfs2_ioctl.h | 95 +++++++++++++ + fs/ocfs2/refcounttree.c | 48 ++++++- + fs/ocfs2/refcounttree.h | 7 +- + fs/ocfs2/super.c | 71 +++++++++- + fs/ocfs2/sysfile.c | 60 +++++++-- + fs/ocfs2/xattr.c | 4 +- + include/linux/fs.h | 2 + + 29 files changed, 780 insertions(+), 114 deletions(-) +Merging omfs/for-next +$ git merge omfs/for-next +Already up-to-date. +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 +Auto-merging fs/9p/vfs_dir.c +Auto-merging fs/9p/vfs_inode.c +Auto-merging net/9p/client.c +Merge made by recursive. + fs/9p/vfs_addr.c | 30 ++++++++++++++++++++++++++++++ + fs/9p/vfs_dir.c | 3 ++- + fs/9p/vfs_file.c | 29 +++++++++++++++++++---------- + fs/9p/vfs_inode.c | 15 ++------------- + include/net/9p/9p.h | 4 ++++ + net/9p/client.c | 49 +++++++++++++++++++++++++++++++++---------------- + 6 files changed, 90 insertions(+), 40 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Merge made by recursive. + fs/ubifs/debug.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/ubifs/debug.h | 4 ++ + fs/ubifs/gc.c | 79 ++++++++++++++++++++------- + fs/ubifs/io.c | 3 +- + fs/ubifs/key.h | 14 +++++ + fs/ubifs/scan.c | 6 ++- + fs/ubifs/tnc.c | 5 ++- + fs/ubifs/ubifs.h | 6 ++- + 8 files changed, 248 insertions(+), 25 deletions(-) +Merging xfs/master +$ git merge xfs/master +Merge made by recursive. + fs/xfs/linux-2.6/xfs_fs_subr.c | 31 +++--- + fs/xfs/linux-2.6/xfs_ioctl.c | 3 +- + fs/xfs/linux-2.6/xfs_ioctl32.c | 1 + + fs/xfs/quota/xfs_dquot.c | 164 +++++++++++++++----------------- + fs/xfs/quota/xfs_qm.c | 203 ++++++++++++---------------------------- + fs/xfs/xfs_alloc.c | 4 +- + fs/xfs/xfs_alloc_btree.c | 33 ------- + fs/xfs/xfs_bmap.c | 12 ++- + fs/xfs/xfs_bmap.h | 9 +- + fs/xfs/xfs_btree.c | 52 +++++++++-- + fs/xfs/xfs_btree.h | 14 +--- + fs/xfs/xfs_fs.h | 1 + + fs/xfs/xfs_ialloc_btree.c | 33 ------- + fs/xfs/xfs_vnodeops.c | 10 ++- + 14 files changed, 225 insertions(+), 345 deletions(-) +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Merge made by recursive. + drivers/pci/hotplug/ibmphp_hpc.c | 4 ++-- + drivers/pci/pci.c | 2 +- + drivers/pci/pcie/aer/aerdrv_core.c | 2 +- + drivers/pci/proc.c | 4 +--- + include/linux/pci.h | 2 +- + 5 files changed, 6 insertions(+), 8 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Merge made by recursive. + .../ABI/testing/sysfs-driver-hid-roccat-pyra | 98 ++ + Documentation/input/ntrig.txt | 126 +++ + drivers/hid/Kconfig | 79 +- + drivers/hid/Makefile | 3 + + drivers/hid/hid-apple.c | 7 +- + drivers/hid/hid-cherry.c | 7 +- + drivers/hid/hid-core.c | 17 +- + drivers/hid/hid-cypress.c | 9 +- + drivers/hid/hid-debug.c | 2 + + drivers/hid/hid-elecom.c | 7 +- + drivers/hid/hid-ids.h | 10 + + drivers/hid/hid-input.c | 4 + + drivers/hid/hid-kye.c | 7 +- + drivers/hid/hid-lg.c | 9 +- + drivers/hid/hid-magicmouse.c | 250 ++++-- + drivers/hid/hid-microsoft.c | 7 +- + drivers/hid/hid-monterey.c | 7 +- + drivers/hid/hid-ntrig.c | 69 ++- + drivers/hid/hid-ortek.c | 7 +- + drivers/hid/hid-petalynx.c | 7 +- + drivers/hid/hid-prodikeys.c | 7 +- + drivers/hid/hid-roccat-pyra.c | 968 ++++++++++++++++++++ + drivers/hid/hid-roccat-pyra.h | 186 ++++ + drivers/hid/hid-samsung.c | 20 +- + drivers/hid/hid-sony.c | 35 +- + drivers/hid/hid-sunplus.c | 7 +- + drivers/hid/hid-uclogic.c | 623 +++++++++++++ + drivers/hid/hid-waltop.c | 891 ++++++++++++++++++ + drivers/hid/hid-zydacron.c | 7 +- + drivers/hid/usbhid/hid-quirks.c | 4 + + include/linux/hid.h | 4 +- + 31 files changed, 3291 insertions(+), 193 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-pyra + create mode 100644 Documentation/input/ntrig.txt + create mode 100644 drivers/hid/hid-roccat-pyra.c + create mode 100644 drivers/hid/hid-roccat-pyra.h + create mode 100644 drivers/hid/hid-uclogic.c + create mode 100644 drivers/hid/hid-waltop.c +Merging quilt/i2c +$ git merge quilt/i2c +Auto-merging drivers/regulator/ad5398.c +Auto-merging drivers/regulator/isl6271a-regulator.c +Merge made by recursive. + drivers/i2c/i2c-core.c | 36 ++++++++++++++++---------------- + drivers/i2c/i2c-dev.c | 13 +++++------ + drivers/misc/bh1780gli.c | 1 - + drivers/regulator/ad5398.c | 1 - + drivers/regulator/isl6271a-regulator.c | 2 - + drivers/rtc/rtc-ds3232.c | 2 - + include/linux/i2c.h | 12 +++++++--- + 7 files changed, 32 insertions(+), 35 deletions(-) +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Already up-to-date. +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merging MAINTAINERS +Merge made by recursive. + Documentation/hwmon/lm90 | 30 +- + Documentation/hwmon/sysfs-interface | 27 +- + MAINTAINERS | 5 +- + drivers/hwmon/Kconfig | 22 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/adm1031.c | 43 +- + drivers/hwmon/emc1403.c | 1 - + drivers/hwmon/f75375s.c | 6 +- + drivers/hwmon/k8temp.c | 51 +- + drivers/hwmon/lis3lv02d_i2c.c | 4 +- + drivers/hwmon/lis3lv02d_spi.c | 4 +- + drivers/hwmon/lm75.c | 51 +- + drivers/hwmon/lm90.c | 496 +++++++-- + drivers/hwmon/lm95241.c | 21 +- + drivers/hwmon/s3c-hwmon.c | 8 +- + drivers/hwmon/w83627ehf.c | 1 + + drivers/hwmon/w83795.c | 2107 +++++++++++++++++++++++++++++++++++ + 17 files changed, 2675 insertions(+), 203 deletions(-) + create mode 100644 drivers/hwmon/w83795.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Merge made by recursive. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Resolved 'drivers/media/IR/ir-keytable.c' using previous resolution. +Resolved 'drivers/media/IR/ir-lirc-codec.c' using previous resolution. +Resolved 'drivers/media/IR/ir-raw-event.c' using previous resolution. +Resolved 'drivers/media/IR/streamzap.c' using previous resolution. +Resolved 'drivers/media/dvb/siano/smscoreapi.c' using previous resolution. +Resolved 'drivers/media/video/s5p-fimc/fimc-core.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging drivers/media/IR/Kconfig +Auto-merging drivers/media/IR/Makefile +Auto-merging drivers/media/IR/ir-core-priv.h +Auto-merging drivers/media/IR/ir-keytable.c +CONFLICT (content): Merge conflict in drivers/media/IR/ir-keytable.c +Auto-merging drivers/media/IR/ir-lirc-codec.c +CONFLICT (content): Merge conflict in drivers/media/IR/ir-lirc-codec.c +Auto-merging drivers/media/IR/ir-raw-event.c +CONFLICT (content): Merge conflict in drivers/media/IR/ir-raw-event.c +Auto-merging drivers/media/IR/ir-sysfs.c +Auto-merging drivers/media/IR/keymaps/Makefile +Auto-merging drivers/media/IR/keymaps/rc-rc6-mce.c +Auto-merging drivers/media/IR/mceusb.c +Auto-merging drivers/media/IR/streamzap.c +CONFLICT (add/add): Merge conflict in drivers/media/IR/streamzap.c +Auto-merging drivers/media/common/tuners/Kconfig +Auto-merging drivers/media/dvb/dvb-usb/Kconfig +Auto-merging drivers/media/dvb/frontends/Kconfig +Auto-merging drivers/media/dvb/siano/smscoreapi.c +CONFLICT (content): Merge conflict in drivers/media/dvb/siano/smscoreapi.c +Auto-merging drivers/media/video/cx23885/cx23885-i2c.c +Auto-merging drivers/media/video/cx23885/cx23885-video.c +Auto-merging drivers/media/video/cx88/Kconfig +Auto-merging drivers/media/video/cx88/cx88-i2c.c +Auto-merging drivers/media/video/gspca/gspca.c +Auto-merging drivers/media/video/ivtv/ivtv-driver.c +Auto-merging drivers/media/video/ivtv/ivtv-driver.h +Auto-merging drivers/media/video/ivtv/ivtv-i2c.c +Auto-merging drivers/media/video/mt9m111.c +Auto-merging drivers/media/video/s5p-fimc/fimc-core.c +CONFLICT (add/add): Merge conflict in drivers/media/video/s5p-fimc/fimc-core.c +Auto-merging drivers/media/video/soc_camera.c +Auto-merging drivers/media/video/tvp7002.c +Auto-merging drivers/media/video/v4l2-common.c +Auto-merging drivers/media/video/v4l2-dev.c +Auto-merging drivers/staging/cx25821/cx25821-alsa.c +Auto-merging include/linux/videodev2.h +Auto-merging include/media/rc-map.h +Auto-merging include/media/v4l2-device.h +Auto-merging include/media/v4l2-subdev.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2cd6adf] Merge remote branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/v4l/pixfmt.xml | 14 + + Documentation/DocBook/v4l/videodev2.h.xml | 2 + + Documentation/dvb/get_dvb_firmware | 46 +- + Documentation/dvb/lmedm04.txt | 55 + + Documentation/video4linux/v4l2-framework.txt | 5 + + drivers/media/IR/Kconfig | 12 + + drivers/media/IR/Makefile | 1 + + drivers/media/IR/ir-core-priv.h | 6 + + drivers/media/IR/ir-keytable.c | 9 +- + drivers/media/IR/ir-lirc-codec.c | 2 +- + drivers/media/IR/ir-raw-event.c | 4 +- + drivers/media/IR/ir-rc5-sz-decoder.c | 153 ++ + drivers/media/IR/ir-sysfs.c | 1 + + drivers/media/IR/keymaps/Makefile | 2 + + drivers/media/IR/keymaps/rc-lme2510.c | 68 + + drivers/media/IR/keymaps/rc-rc6-mce.c | 3 + + drivers/media/IR/keymaps/rc-streamzap.c | 82 + + drivers/media/IR/mceusb.c | 4 + + drivers/media/IR/streamzap.c | 358 +--- + drivers/media/common/tuners/Kconfig | 7 + + drivers/media/common/tuners/Makefile | 1 + + drivers/media/common/tuners/tda18218.c | 334 +++ + drivers/media/common/tuners/tda18218.h | 45 + + drivers/media/common/tuners/tda18218_priv.h | 106 + + drivers/media/common/tuners/xc5000.c | 2 +- + drivers/media/common/tuners/xc5000.h | 4 +- + drivers/media/dvb/dvb-core/dvb_frontend.h | 2 +- + drivers/media/dvb/dvb-usb/Kconfig | 12 + + drivers/media/dvb/dvb-usb/Makefile | 3 + + drivers/media/dvb/dvb-usb/af9015.c | 33 +- + drivers/media/dvb/dvb-usb/dib0700_core.c | 3 - + drivers/media/dvb/dvb-usb/dib0700_devices.c | 56 +- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 + + drivers/media/dvb/dvb-usb/friio-fe.c | 2 +- + drivers/media/dvb/dvb-usb/lmedm04.c | 936 ++++++++ + drivers/media/dvb/dvb-usb/lmedm04.h | 187 ++ + drivers/media/dvb/dvb-usb/opera1.c | 4 +- + drivers/media/dvb/frontends/Kconfig | 7 + + drivers/media/dvb/frontends/Makefile | 1 + + drivers/media/dvb/frontends/af9013.c | 14 + + drivers/media/dvb/frontends/af9013_priv.h | 5 +- + drivers/media/dvb/frontends/cx24110.c | 2 +- + drivers/media/dvb/frontends/dib7000p.c | 8 +- + drivers/media/dvb/frontends/dib7000p.h | 5 + + drivers/media/dvb/frontends/drx397xD.c | 2 +- + drivers/media/dvb/frontends/ix2505v.c | 323 +++ + drivers/media/dvb/frontends/ix2505v.h | 64 + + drivers/media/dvb/frontends/lgs8gxx.c | 2 +- + drivers/media/dvb/frontends/mt352.c | 2 +- + drivers/media/dvb/frontends/mt352.h | 2 +- + drivers/media/dvb/frontends/si21xx.c | 2 +- + drivers/media/dvb/frontends/stb6100.c | 2 +- + drivers/media/dvb/frontends/stb6100.h | 4 +- + drivers/media/dvb/frontends/stv0288.c | 4 +- + drivers/media/dvb/frontends/stv0299.c | 2 +- + drivers/media/dvb/frontends/stv0299.h | 2 +- + drivers/media/dvb/frontends/tda1004x.c | 2 +- + drivers/media/dvb/frontends/zl10353.c | 2 +- + drivers/media/dvb/siano/smscoreapi.c | 34 +- + drivers/media/video/cafe_ccic.c | 87 +- + drivers/media/video/cx18/cx18-driver.h | 19 +- + drivers/media/video/cx231xx/Makefile | 1 + + drivers/media/video/cx231xx/cx231xx-cards.c | 3 + + drivers/media/video/cx23885/cx23885-video.c | 3 +- + drivers/media/video/cx88/Kconfig | 2 +- + drivers/media/video/cx88/cx88-alsa.c | 18 +- + drivers/media/video/cx88/cx88-cards.c | 6 +- + drivers/media/video/cx88/cx88-core.c | 28 +- + drivers/media/video/cx88/cx88-dsp.c | 11 +- + drivers/media/video/cx88/cx88-dvb.c | 118 +- + drivers/media/video/cx88/cx88-i2c.c | 4 +- + drivers/media/video/cx88/cx88-mpeg.c | 6 +- + drivers/media/video/cx88/cx88-tvaudio.c | 43 +- + drivers/media/video/cx88/cx88-vbi.c | 2 +- + drivers/media/video/cx88/cx88-video.c | 33 +- + drivers/media/video/cx88/cx88.h | 52 +- + drivers/media/video/davinci/vpfe_capture.c | 36 +- + drivers/media/video/davinci/vpif_capture.c | 3 +- + drivers/media/video/davinci/vpif_display.c | 3 +- + drivers/media/video/em28xx/em28xx-video.c | 3 +- + drivers/media/video/gspca/Kconfig | 18 + + drivers/media/video/gspca/Makefile | 4 + + drivers/media/video/gspca/cpia1.c | 4 +- + drivers/media/video/gspca/gspca.c | 1 + + drivers/media/video/gspca/konica.c | 653 ++++++ + drivers/media/video/gspca/mr97310a.c | 4 +- + drivers/media/video/gspca/pac207.c | 4 +- + drivers/media/video/gspca/stv0680.c | 4 +- + drivers/media/video/gspca/xirlink_cit.c | 3260 ++++++++++++++++++++++++++ + drivers/media/video/ivtv/ivtv-driver.h | 14 +- + drivers/media/video/mt9m001.c | 26 +- + drivers/media/video/mt9m111.c | 20 +- + drivers/media/video/mt9t031.c | 24 +- + drivers/media/video/mt9t112.c | 14 +- + drivers/media/video/mt9v022.c | 26 +- + drivers/media/video/ov7670.c | 76 +- + drivers/media/video/ov772x.c | 18 +- + drivers/media/video/ov9640.c | 12 +- + drivers/media/video/pvrusb2/pvrusb2-ctrl.c | 6 +- + drivers/media/video/rj54n1cb0c.c | 26 +- + drivers/media/video/s2255drv.c | 2 +- + drivers/media/video/s5p-fimc/fimc-core.c | 3 +- + drivers/media/video/saa7134/saa7134-cards.c | 10 +- + drivers/media/video/saa7134/saa7134-video.c | 2 +- + drivers/media/video/saa7164/saa7164-buffer.c | 5 +- + drivers/media/video/soc_camera.c | 2 +- + drivers/media/video/tvp514x.c | 67 +- + drivers/media/video/tvp7002.c | 126 +- + drivers/media/video/tw9910.c | 20 +- + drivers/media/video/usbvideo/Kconfig | 10 +- + drivers/media/video/zoran/zoran_driver.c | 2 +- + drivers/media/video/zr364xx.c | 2 +- + drivers/staging/cx25821/cx25821-alsa.c | 2 +- + drivers/staging/cx25821/cx25821-video.c | 4 +- + drivers/staging/go7007/go7007-v4l2.c | 19 +- + drivers/staging/go7007/s2250-board.c | 7 +- + drivers/staging/tm6000/Kconfig | 2 +- + drivers/staging/tm6000/tm6000-input.c | 2 +- + include/linux/videodev2.h | 2 + + include/media/rc-map.h | 5 +- + include/media/v4l2-device.h | 57 +- + include/media/v4l2-mediabus.h | 6 + + include/media/v4l2-subdev.h | 24 +- + 123 files changed, 7279 insertions(+), 853 deletions(-) + create mode 100644 Documentation/dvb/lmedm04.txt + create mode 100644 drivers/media/IR/ir-rc5-sz-decoder.c + create mode 100644 drivers/media/IR/keymaps/rc-lme2510.c + create mode 100644 drivers/media/IR/keymaps/rc-streamzap.c + create mode 100644 drivers/media/common/tuners/tda18218.c + create mode 100644 drivers/media/common/tuners/tda18218.h + create mode 100644 drivers/media/common/tuners/tda18218_priv.h + create mode 100644 drivers/media/dvb/dvb-usb/lmedm04.c + create mode 100644 drivers/media/dvb/dvb-usb/lmedm04.h + create mode 100644 drivers/media/dvb/frontends/ix2505v.c + create mode 100644 drivers/media/dvb/frontends/ix2505v.h + create mode 100644 drivers/media/video/gspca/konica.c + create mode 100644 drivers/media/video/gspca/xirlink_cit.c +Merging kbuild/for-next +$ git merge kbuild/for-next +Auto-merging Makefile +Merge made by recursive. + Documentation/kbuild/makefiles.txt | 7 + + Kbuild | 4 +- + Makefile | 33 +- + scripts/Makefile.clean | 2 + + .../{ => api}/alloc/drop_kmalloc_cast.cocci | 0 + .../{ => api}/alloc/kzalloc-simple.cocci | 6 +- + scripts/coccinelle/{ => api}/err_cast.cocci | 0 + scripts/coccinelle/api/kstrdup.cocci | 39 ++ + scripts/coccinelle/api/memdup.cocci | 40 +++ + scripts/coccinelle/api/memdup_user.cocci | 35 ++ + scripts/coccinelle/{ => api}/resource_size.cocci | 0 + scripts/coccinelle/free/kfree.cocci | 116 ++++++ + scripts/coccinelle/iterators/fen.cocci | 64 ++++ + scripts/coccinelle/iterators/itnull.cocci | 58 +++ + .../coccinelle/iterators/list_entry_update.cocci | 62 ++++ + scripts/coccinelle/locks/call_kern.cocci | 74 ++++ + scripts/coccinelle/locks/double_lock.cocci | 92 +++++ + scripts/coccinelle/locks/mini_lock.cocci | 95 +++++ + scripts/coccinelle/misc/doubleinit.cocci | 53 +++ + scripts/coccinelle/misc/ifcol.cocci | 48 +++ + scripts/coccinelle/{ => null}/deref_null.cocci | 0 + scripts/coccinelle/null/eno.cocci | 20 + + scripts/coccinelle/null/kmerr.cocci | 72 ++++ + scripts/kconfig/Makefile | 85 +++-- + scripts/kconfig/conf.c | 4 +- + scripts/kconfig/confdata.c | 1 + + scripts/kconfig/nconf.c | 367 +++++++++++--------- + scripts/kconfig/nconf.gui.c | 22 +- + scripts/kconfig/nconf.h | 3 +- + scripts/kconfig/qconf.cc | 172 +++++---- + scripts/kconfig/qconf.h | 76 ++--- + scripts/mod/modpost.c | 5 +- + scripts/package/builddeb | 4 +- + scripts/setlocalversion | 6 +- + 34 files changed, 1301 insertions(+), 364 deletions(-) + rename scripts/coccinelle/{ => api}/alloc/drop_kmalloc_cast.cocci (100%) + rename scripts/coccinelle/{ => api}/alloc/kzalloc-simple.cocci (87%) + rename scripts/coccinelle/{ => api}/err_cast.cocci (100%) + create mode 100644 scripts/coccinelle/api/kstrdup.cocci + create mode 100644 scripts/coccinelle/api/memdup.cocci + create mode 100644 scripts/coccinelle/api/memdup_user.cocci + rename scripts/coccinelle/{ => api}/resource_size.cocci (100%) + create mode 100644 scripts/coccinelle/free/kfree.cocci + create mode 100644 scripts/coccinelle/iterators/fen.cocci + create mode 100644 scripts/coccinelle/iterators/itnull.cocci + create mode 100644 scripts/coccinelle/iterators/list_entry_update.cocci + create mode 100644 scripts/coccinelle/locks/call_kern.cocci + create mode 100644 scripts/coccinelle/locks/double_lock.cocci + create mode 100644 scripts/coccinelle/locks/mini_lock.cocci + create mode 100644 scripts/coccinelle/misc/doubleinit.cocci + create mode 100644 scripts/coccinelle/misc/ifcol.cocci + rename scripts/coccinelle/{ => null}/deref_null.cocci (100%) + create mode 100644 scripts/coccinelle/null/eno.cocci + create mode 100644 scripts/coccinelle/null/kmerr.cocci +Merging kconfig/for-next +$ git merge kconfig/for-next +Already uptodate! +Merge made by recursive. +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Merge made by recursive. + Documentation/ABI/testing/sysfs-ata | 99 +++++ + drivers/ata/Makefile | 2 +- + drivers/ata/libata-core.c | 62 +++- + drivers/ata/libata-eh.c | 35 +- + drivers/ata/libata-pmp.c | 18 +- + drivers/ata/libata-scsi.c | 117 +++--- + drivers/ata/libata-sff.c | 2 +- + drivers/ata/libata-transport.c | 774 +++++++++++++++++++++++++++++++++++ + drivers/ata/libata-transport.h | 18 + + drivers/ata/libata.h | 7 + + drivers/ata/sata_fsl.c | 8 +- + drivers/ata/sata_mv.c | 25 +- + drivers/ata/sata_nv.c | 57 +-- + include/linux/ata.h | 46 ++- + include/linux/libata.h | 5 + + 15 files changed, 1132 insertions(+), 143 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-ata + create mode 100644 drivers/ata/libata-transport.c + create mode 100644 drivers/ata/libata-transport.h +Merging infiniband/for-next +$ git merge infiniband/for-next +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 2 +- + drivers/infiniband/hw/cxgb4/cm.c | 2 +- + drivers/infiniband/hw/cxgb4/cq.c | 4 ++-- + drivers/infiniband/hw/cxgb4/mem.c | 2 +- + drivers/infiniband/hw/cxgb4/qp.c | 6 +++--- + drivers/infiniband/hw/nes/nes_verbs.c | 12 ++++++------ + 6 files changed, 14 insertions(+), 14 deletions(-) +Merging acpi/test +$ git merge acpi/test +Merge made by recursive. + drivers/acpi/acpica/exutils.c | 2 +- + drivers/acpi/acpica/rsutils.c | 2 +- + drivers/acpi/apei/Kconfig | 2 +- + drivers/acpi/apei/erst-dbg.c | 2 +- + drivers/acpi/apei/erst.c | 2 +- + drivers/acpi/battery.c | 1 - + drivers/acpi/bus.c | 4 ++-- + drivers/acpi/processor_perflib.c | 4 ++-- + drivers/acpi/sysfs.c | 20 ++++++++++++++------ + drivers/acpi/video_detect.c | 4 ++-- + include/acpi/acpixf.h | 2 +- + 11 files changed, 26 insertions(+), 19 deletions(-) +Merging idle-test/idle-test +$ git merge idle-test/idle-test +Merge made by recursive. + drivers/cpuidle/governors/menu.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Auto-merging drivers/Makefile +Merge made by recursive. + drivers/Makefile | 2 +- + drivers/firewire/ohci.c | 1 + + 2 files changed, 2 insertions(+), 1 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/linux-next +$ git merge kvm/linux-next +Resolved 'arch/x86/include/asm/kvm_emulate.h' using previous resolution. +Resolved 'virt/kvm/kvm_main.c' using previous resolution. +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/powerpc/kernel/asm-offsets.c +Auto-merging arch/powerpc/kernel/head_64.S +Auto-merging arch/powerpc/kvm/book3s_paired_singles.c +Auto-merging arch/x86/include/asm/kvm_emulate.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/kvm_emulate.h +Auto-merging arch/x86/kvm/emulate.c +Auto-merging arch/x86/kvm/i8259.c +Auto-merging virt/kvm/kvm_main.c +CONFLICT (content): Merge conflict in virt/kvm/kvm_main.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1d1fc4f] Merge remote branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 2 + + Documentation/kvm/api.txt | 56 +- + Documentation/kvm/ppc-pv.txt | 196 +++ + Documentation/kvm/timekeeping.txt | 612 ++++++++ + arch/ia64/kvm/lapic.h | 1 + + arch/powerpc/include/asm/kvm.h | 1 + + arch/powerpc/include/asm/kvm_asm.h | 4 +- + arch/powerpc/include/asm/kvm_book3s.h | 31 +- + arch/powerpc/include/asm/kvm_host.h | 21 +- + arch/powerpc/include/asm/kvm_para.h | 139 ++- + arch/powerpc/include/asm/kvm_ppc.h | 1 + + arch/powerpc/kernel/Makefile | 2 + + arch/powerpc/kernel/asm-offsets.c | 25 +- + arch/powerpc/kernel/exceptions-64s.S | 6 + + arch/powerpc/kernel/head_64.S | 6 - + arch/powerpc/kernel/kvm.c | 596 ++++++++ + arch/powerpc/kernel/kvm_emul.S | 302 ++++ + arch/powerpc/kvm/44x.c | 10 +- + arch/powerpc/kvm/44x_tlb.c | 9 +- + arch/powerpc/kvm/book3s.c | 272 +++-- + arch/powerpc/kvm/book3s_32_mmu.c | 111 +- + arch/powerpc/kvm/book3s_32_mmu_host.c | 75 +- + arch/powerpc/kvm/book3s_64_mmu.c | 42 +- + arch/powerpc/kvm/book3s_64_mmu_host.c | 74 +- + arch/powerpc/kvm/book3s_emulate.c | 73 +- + arch/powerpc/kvm/book3s_mmu_hpte.c | 140 ++- + arch/powerpc/kvm/book3s_paired_singles.c | 11 +- + arch/powerpc/kvm/book3s_rmhandlers.S | 32 +- + arch/powerpc/kvm/booke.c | 108 ++- + arch/powerpc/kvm/booke.h | 10 +- + arch/powerpc/kvm/booke_emulate.c | 14 +- + arch/powerpc/kvm/booke_interrupts.S | 3 +- + arch/powerpc/kvm/e500.c | 7 + + arch/powerpc/kvm/e500_tlb.c | 18 +- + arch/powerpc/kvm/e500_tlb.h | 2 +- + arch/powerpc/kvm/emulate.c | 36 +- + arch/powerpc/kvm/powerpc.c | 88 ++- + arch/powerpc/kvm/trace.h | 239 ++++ + arch/powerpc/platforms/Kconfig | 10 + + arch/s390/include/asm/Kbuild | 1 + + arch/s390/include/asm/kvm_virtio.h | 7 + + arch/x86/include/asm/kvm_emulate.h | 26 +- + arch/x86/include/asm/kvm_host.h | 18 +- + arch/x86/include/asm/kvm_para.h | 6 + + arch/x86/include/asm/pvclock.h | 38 + + arch/x86/kernel/pvclock.c | 3 +- + arch/x86/kvm/Kconfig | 7 + + arch/x86/kvm/emulate.c | 2229 ++++++++++++++++++------------ + arch/x86/kvm/i8254.c | 9 - + arch/x86/kvm/i8259.c | 16 +- + arch/x86/kvm/irq.c | 7 +- + arch/x86/kvm/mmu.c | 561 +++----- + arch/x86/kvm/mmu.h | 8 +- + arch/x86/kvm/mmu_audit.c | 296 ++++ + arch/x86/kvm/mmutrace.h | 19 + + arch/x86/kvm/paging_tmpl.h | 85 ++- + arch/x86/kvm/svm.c | 96 +- + arch/x86/kvm/vmx.c | 59 +- + arch/x86/kvm/x86.c | 443 +++++-- + arch/x86/kvm/x86.h | 2 + + drivers/s390/kvm/kvm_virtio.c | 66 +- + include/linux/kvm.h | 12 + + include/linux/kvm_host.h | 11 + + include/linux/kvm_para.h | 7 +- + mm/util.c | 13 + + virt/kvm/kvm_main.c | 78 +- + 66 files changed, 5582 insertions(+), 1926 deletions(-) + create mode 100644 Documentation/kvm/ppc-pv.txt + create mode 100644 Documentation/kvm/timekeeping.txt + create mode 100644 arch/powerpc/kernel/kvm.c + create mode 100644 arch/powerpc/kernel/kvm_emul.S + create mode 100644 arch/x86/kvm/mmu_audit.c +Merging dlm/next +$ git merge dlm/next +Merge made by recursive. + fs/dlm/lock.c | 3 +++ + include/linux/dlm.h | 4 ++-- + 2 files changed, 5 insertions(+), 2 deletions(-) +Merging swiotlb/master +$ git merge swiotlb/master +Already up-to-date. +Merging swiotlb-xen/master +$ git merge swiotlb-xen/master +Already up-to-date. +Merging ibft/master +$ git merge ibft/master +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Auto-merging drivers/s390/scsi/zfcp_qdio.c +Removing drivers/scsi/cxgb3i/Kbuild +Removing drivers/scsi/cxgb3i/cxgb3i.h +Removing drivers/scsi/cxgb3i/cxgb3i_ddp.c +Removing drivers/scsi/cxgb3i/cxgb3i_ddp.h +Removing drivers/scsi/cxgb3i/cxgb3i_init.c +Removing drivers/scsi/cxgb3i/cxgb3i_iscsi.c +Removing drivers/scsi/cxgb3i/cxgb3i_offload.c +Removing drivers/scsi/cxgb3i/cxgb3i_offload.h +Removing drivers/scsi/cxgb3i/cxgb3i_pdu.c +Removing drivers/scsi/cxgb3i/cxgb3i_pdu.h +Auto-merging drivers/scsi/qla2xxx/qla_attr.c +Auto-merging drivers/scsi/qla2xxx/qla_def.h +Auto-merging drivers/scsi/qla2xxx/qla_init.c +Auto-merging drivers/scsi/qla2xxx/qla_isr.c +Auto-merging drivers/scsi/qla2xxx/qla_mbx.c +Auto-merging drivers/scsi/qla2xxx/qla_nx.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/sd.c +Merge made by recursive. + block/bsg.c | 10 +- + drivers/message/fusion/mptbase.c | 4 +- + drivers/s390/scsi/Makefile | 5 +- + drivers/s390/scsi/zfcp_aux.c | 126 +-- + drivers/s390/scsi/zfcp_ccw.c | 17 +- + drivers/s390/scsi/zfcp_cfdc.c | 186 +++- + drivers/s390/scsi/zfcp_dbf.c | 28 +- + drivers/s390/scsi/zfcp_dbf.h | 12 +- + drivers/s390/scsi/zfcp_def.h | 78 +- + drivers/s390/scsi/zfcp_erp.c | 631 ++++---- + drivers/s390/scsi/zfcp_ext.h | 63 +- + drivers/s390/scsi/zfcp_fc.c | 2 +- + drivers/s390/scsi/zfcp_fsf.c | 609 ++++---- + drivers/s390/scsi/zfcp_qdio.c | 18 +- + drivers/s390/scsi/zfcp_scsi.c | 158 +-- + drivers/s390/scsi/zfcp_sysfs.c | 221 ++-- + drivers/s390/scsi/zfcp_unit.c | 244 +++ + drivers/scsi/Kconfig | 5 +- + drivers/scsi/Makefile | 3 +- + drivers/scsi/aacraid/commctrl.c | 2 +- + drivers/scsi/aacraid/commsup.c | 2 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 4 +- + drivers/scsi/bnx2i/bnx2i.h | 2 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 63 +- + drivers/scsi/bnx2i/bnx2i_init.c | 62 +- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 15 +- + drivers/scsi/cxgb3i/Kbuild | 4 - + drivers/scsi/cxgb3i/cxgb3i.h | 161 -- + drivers/scsi/cxgb3i/cxgb3i_ddp.c | 773 --------- + drivers/scsi/cxgb3i/cxgb3i_ddp.h | 312 ---- + drivers/scsi/cxgb3i/cxgb3i_init.c | 132 -- + drivers/scsi/cxgb3i/cxgb3i_iscsi.c | 1018 ------------ + drivers/scsi/cxgb3i/cxgb3i_offload.c | 1944 ----------------------- + drivers/scsi/cxgb3i/cxgb3i_offload.h | 243 --- + drivers/scsi/cxgb3i/cxgb3i_pdu.c | 495 ------ + drivers/scsi/cxgb3i/cxgb3i_pdu.h | 59 - + drivers/scsi/cxgbi/Kconfig | 2 + + drivers/scsi/cxgbi/Makefile | 2 + + drivers/scsi/cxgbi/cxgb3i/Kbuild | 3 + + drivers/scsi/{ => cxgbi}/cxgb3i/Kconfig | 4 +- + drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 1432 +++++++++++++++++ + drivers/scsi/cxgbi/cxgb3i/cxgb3i.h | 51 + + drivers/scsi/cxgbi/cxgb4i/Kbuild | 3 + + drivers/scsi/cxgbi/cxgb4i/Kconfig | 7 + + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 1600 +++++++++++++++++++ + drivers/scsi/cxgbi/cxgb4i/cxgb4i.h | 38 + + drivers/scsi/cxgbi/libcxgbi.c | 2610 +++++++++++++++++++++++++++++++ + drivers/scsi/cxgbi/libcxgbi.h | 753 +++++++++ + drivers/scsi/fnic/fnic_main.c | 14 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 84 +- + drivers/scsi/ibmvscsi/ibmvfc.h | 6 + + drivers/scsi/ipr.c | 106 +- + drivers/scsi/ipr.h | 8 +- + drivers/scsi/lpfc/lpfc_attr.c | 10 + + drivers/scsi/lpfc/lpfc_scsi.c | 10 - + drivers/scsi/lpfc/lpfc_sli.c | 10 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 2 +- + drivers/scsi/pm8001/pm8001_hwi.c | 6 + + drivers/scsi/qla2xxx/qla_attr.c | 39 +- + drivers/scsi/qla2xxx/qla_bsg.c | 7 +- + drivers/scsi/qla2xxx/qla_def.h | 8 + + drivers/scsi/qla2xxx/qla_gbl.h | 15 +- + drivers/scsi/qla2xxx/qla_init.c | 54 +- + drivers/scsi/qla2xxx/qla_isr.c | 8 +- + drivers/scsi/qla2xxx/qla_mbx.c | 66 +- + drivers/scsi/qla2xxx/qla_nx.c | 431 +++--- + drivers/scsi/qla2xxx/qla_nx.h | 5 + + drivers/scsi/qla2xxx/qla_os.c | 156 ++- + drivers/scsi/scsi_debug.c | 125 +- + drivers/scsi/scsi_transport_fc.c | 49 +- + drivers/scsi/scsi_transport_iscsi.c | 2 +- + drivers/scsi/sd.c | 4 +- + drivers/scsi/sd.h | 1 + + include/scsi/scsi_transport_fc.h | 4 + + 74 files changed, 8732 insertions(+), 6714 deletions(-) + create mode 100644 drivers/s390/scsi/zfcp_unit.c + delete mode 100644 drivers/scsi/cxgb3i/Kbuild + delete mode 100644 drivers/scsi/cxgb3i/cxgb3i.h + delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_ddp.c + delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_ddp.h + delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_init.c + delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_iscsi.c + delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_offload.c + delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_offload.h + delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_pdu.c + delete mode 100644 drivers/scsi/cxgb3i/cxgb3i_pdu.h + create mode 100644 drivers/scsi/cxgbi/Kconfig + create mode 100644 drivers/scsi/cxgbi/Makefile + create mode 100644 drivers/scsi/cxgbi/cxgb3i/Kbuild + rename drivers/scsi/{ => cxgbi}/cxgb3i/Kconfig (50%) + create mode 100644 drivers/scsi/cxgbi/cxgb3i/cxgb3i.c + create mode 100644 drivers/scsi/cxgbi/cxgb3i/cxgb3i.h + create mode 100644 drivers/scsi/cxgbi/cxgb4i/Kbuild + create mode 100644 drivers/scsi/cxgbi/cxgb4i/Kconfig + create mode 100644 drivers/scsi/cxgbi/cxgb4i/cxgb4i.c + create mode 100644 drivers/scsi/cxgbi/cxgb4i/cxgb4i.h + create mode 100644 drivers/scsi/cxgbi/libcxgbi.c + create mode 100644 drivers/scsi/cxgbi/libcxgbi.h +Merging async_tx/next +$ git merge async_tx/next +Auto-merging drivers/dma/Kconfig +Auto-merging drivers/dma/shdma.c +Merge made by recursive. + drivers/dma/Kconfig | 8 + + drivers/dma/Makefile | 1 + + drivers/dma/amba-pl08x.c | 2025 ++++++++++++++++++++++++++++++++++++++++++++ + drivers/dma/shdma.c | 3 +- + include/linux/amba/pl08x.h | 184 ++++ + include/linux/dmaengine.h | 2 +- + 6 files changed, 2221 insertions(+), 2 deletions(-) + create mode 100644 drivers/dma/amba-pl08x.c + create mode 100644 include/linux/amba/pl08x.h +Merging net/master +$ git merge net/master +Resolved 'drivers/net/pcmcia/pcnet_cs.c' using previous resolution. +Removing Documentation/DocBook/mac80211.tmpl +Auto-merging MAINTAINERS +Auto-merging drivers/net/3c59x.c +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging drivers/net/ll_temac_main.c +Auto-merging drivers/net/pcmcia/pcnet_cs.c +CONFLICT (content): Merge conflict in drivers/net/pcmcia/pcnet_cs.c +Auto-merging drivers/net/xilinx_emaclite.c +Auto-merging drivers/s390/scsi/zfcp_qdio.c +Auto-merging include/net/tcp.h +Auto-merging net/core/dev.c +Removing net/rds/rdma.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 595ca43] Merge remote branch 'net/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/80211.tmpl | 495 ++ + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/mac80211.tmpl | 337 - + Documentation/networking/dccp.txt | 29 +- + Documentation/networking/ip-sysctl.txt | 27 +- + Documentation/networking/phonet.txt | 16 + + Documentation/networking/timestamping.txt | 22 +- + MAINTAINERS | 35 +- + drivers/atm/firestream.c | 4 +- + drivers/atm/iphase.c | 2 +- + drivers/firewire/net.c | 13 - + drivers/ieee1394/eth1394.c | 16 - + drivers/isdn/capi/capidrv.c | 17 +- + drivers/isdn/divert/isdn_divert.c | 6 +- + drivers/isdn/hisax/hfc_sx.c | 13 +- + drivers/isdn/i4l/isdn_tty.c | 15 +- + drivers/isdn/mISDN/dsp_cmx.c | 1 + + drivers/isdn/mISDN/l1oip_core.c | 2 +- + drivers/isdn/mISDN/stack.c | 7 - + drivers/isdn/pcbit/edss1.c | 2 +- + drivers/isdn/pcbit/edss1.h | 2 +- + drivers/net/3c503.c | 8 +- + drivers/net/3c515.c | 6 +- + drivers/net/3c59x.c | 2 +- + drivers/net/8139cp.c | 2 +- + drivers/net/Kconfig | 25 + + drivers/net/Makefile | 2 + + drivers/net/acenic.c | 2 +- + drivers/net/amd8111e.c | 18 +- + drivers/net/amd8111e.h | 1 - + drivers/net/arm/am79c961a.c | 35 +- + drivers/net/arm/am79c961a.h | 1 - + drivers/net/arm/ep93xx_eth.c | 39 +- + drivers/net/arm/ether1.c | 34 +- + drivers/net/arm/ether1.h | 1 - + drivers/net/arm/ether3.c | 33 +- + drivers/net/arm/ether3.h | 1 - + drivers/net/atl1c/atl1c.h | 1 - + drivers/net/atl1c/atl1c_hw.c | 2 +- + drivers/net/atl1c/atl1c_main.c | 8 +- + drivers/net/atl1e/atl1e_main.c | 4 +- + drivers/net/atlx/atl1.c | 4 +- + drivers/net/atlx/atl2.c | 10 +- + drivers/net/atp.c | 2 +- + drivers/net/au1000_eth.c | 313 +- + drivers/net/au1000_eth.h | 42 +- + drivers/net/b44.c | 2 +- + drivers/net/bcm63xx_enet.c | 62 +- + drivers/net/bcm63xx_enet.h | 1 - + drivers/net/benet/be.h | 14 + + drivers/net/benet/be_ethtool.c | 3 + + drivers/net/benet/be_main.c | 62 +- + drivers/net/bfin_mac.c | 10 +- + drivers/net/bmac.c | 7 - + drivers/net/bna/Makefile | 11 + + drivers/net/bna/bfa_cee.c | 291 + + drivers/net/bna/bfa_cee.h | 64 + + drivers/net/bna/bfa_defs.h | 243 + + drivers/net/bna/bfa_defs_cna.h | 223 + + drivers/net/bna/bfa_defs_mfg_comm.h | 244 + + drivers/net/bna/bfa_defs_status.h | 216 + + drivers/net/bna/bfa_ioc.c | 1738 +++++ + drivers/net/bna/bfa_ioc.h | 301 + + drivers/net/bna/bfa_ioc_ct.c | 392 ++ + drivers/net/bna/bfa_sm.h | 88 + + drivers/net/bna/bfa_wc.h | 69 + + drivers/net/bna/bfi.h | 392 ++ + drivers/net/bna/bfi_cna.h | 199 + + drivers/net/bna/bfi_ctreg.h | 637 ++ + drivers/net/bna/bfi_ll.h | 438 ++ + drivers/net/bna/bna.h | 654 ++ + drivers/net/bna/bna_ctrl.c | 3624 +++++++++++ + drivers/net/bna/bna_hw.h | 1491 +++++ + drivers/net/bna/bna_txrx.c | 4209 ++++++++++++ + drivers/net/bna/bna_types.h | 1128 ++++ + drivers/net/bna/bnad.c | 3267 ++++++++++ + drivers/net/bna/bnad.h | 333 + + drivers/net/bna/bnad_ethtool.c | 1277 ++++ + drivers/net/bna/cna.h | 81 + + drivers/net/bna/cna_fwimg.c | 64 + + drivers/net/bnx2.c | 46 +- + drivers/net/bnx2x/bnx2x.h | 15 +- + drivers/net/bnx2x/bnx2x_cmn.c | 42 +- + drivers/net/bnx2x/bnx2x_cmn.h | 12 +- + drivers/net/bnx2x/bnx2x_ethtool.c | 233 +- + drivers/net/bnx2x/bnx2x_hsi.h | 130 +- + drivers/net/bnx2x/bnx2x_link.c | 8585 +++++++++++++------------ + drivers/net/bnx2x/bnx2x_link.h | 238 +- + drivers/net/bnx2x/bnx2x_main.c | 757 +-- + drivers/net/bnx2x/bnx2x_reg.h | 53 +- + drivers/net/bnx2x/bnx2x_stats.c | 7 +- + drivers/net/can/mscan/mpc5xxx_can.c | 8 +- + drivers/net/cassini.c | 2 +- + drivers/net/chelsio/sge.c | 2 +- + drivers/net/chelsio/subr.c | 2 - + drivers/net/cnic.c | 2 +- + drivers/net/cpmac.c | 39 +- + drivers/net/cxgb3/cxgb3_main.c | 24 +- + drivers/net/cxgb3/regs.h | 4 + + drivers/net/cxgb3/sge.c | 2 +- + drivers/net/cxgb3/t3_hw.c | 7 +- + drivers/net/cxgb4/cxgb4.h | 2 + + drivers/net/cxgb4/cxgb4_main.c | 94 +- + drivers/net/cxgb4/sge.c | 19 +- + drivers/net/cxgb4/t4_hw.h | 1 + + drivers/net/cxgb4/t4fw_api.h | 5 + + drivers/net/cxgb4vf/sge.c | 3 +- + drivers/net/declance.c | 2 +- + drivers/net/dl2k.c | 2 +- + drivers/net/dm9000.c | 2 +- + drivers/net/e1000/e1000_main.c | 171 +- + drivers/net/e1000e/netdev.c | 36 +- + drivers/net/eepro.c | 8 +- + drivers/net/ehea/ehea_main.c | 12 +- + drivers/net/enic/enic.h | 2 +- + drivers/net/enic/enic_main.c | 19 +- + drivers/net/enic/vnic_dev.c | 25 +- + drivers/net/enic/vnic_devcmd.h | 12 + + drivers/net/enic/vnic_enet.h | 2 +- + drivers/net/enic/vnic_resource.h | 13 + + drivers/net/enic/vnic_rq.c | 6 +- + drivers/net/enic/vnic_vic.c | 7 +- + drivers/net/enic/vnic_wq.c | 6 +- + drivers/net/epic100.c | 2 +- + drivers/net/eth16i.c | 4 +- + drivers/net/ethoc.c | 6 - + drivers/net/fealnx.c | 4 +- + drivers/net/fec_mpc52xx.c | 6 - + drivers/net/forcedeth.c | 6 +- + drivers/net/fs_enet/fs_enet-main.c | 3 +- + drivers/net/gianfar.c | 19 +- + drivers/net/greth.c | 6 +- + drivers/net/hamachi.c | 2 +- + drivers/net/hamradio/scc.c | 3 +- + drivers/net/hp.c | 8 +- + drivers/net/hydra.c | 13 +- + drivers/net/ibmlana.c | 2 +- + drivers/net/ibmveth.c | 953 ++-- + drivers/net/ibmveth.h | 59 +- + drivers/net/igb/igb.h | 2 +- + drivers/net/igb/igb_main.c | 17 +- + drivers/net/igbvf/netdev.c | 2 +- + drivers/net/ioc3-eth.c | 2 +- + drivers/net/ipg.c | 6 +- + drivers/net/irda/mcs7780.c | 2 +- + drivers/net/irda/via-ircc.c | 3 +- + drivers/net/iseries_veth.c | 2 +- + drivers/net/ixgb/ixgb_main.c | 6 +- + drivers/net/ixgbe/ixgbe.h | 30 +- + drivers/net/ixgbe/ixgbe_ethtool.c | 385 +- + drivers/net/ixgbe/ixgbe_fcoe.c | 7 +- + drivers/net/ixgbe/ixgbe_main.c | 1715 +++--- + drivers/net/ixgbe/ixgbe_type.h | 2 + + drivers/net/ixgbevf/ixgbevf.h | 1 - + drivers/net/ixgbevf/ixgbevf_main.c | 30 +- + drivers/net/ixgbevf/vf.h | 2 - + drivers/net/jme.c | 100 +- + drivers/net/jme.h | 3 - + drivers/net/ll_temac_main.c | 2 +- + drivers/net/mac8390.c | 48 +- + drivers/net/macb.c | 2 +- + drivers/net/macvtap.c | 99 +- + drivers/net/mlx4/Makefile | 2 +- + drivers/net/mlx4/alloc.c | 17 +- + drivers/net/mlx4/en_ethtool.c | 173 +- + drivers/net/mlx4/en_main.c | 24 +- + drivers/net/mlx4/en_netdev.c | 28 +- + drivers/net/mlx4/en_port.c | 32 + + drivers/net/mlx4/en_port.h | 14 + + drivers/net/mlx4/en_rx.c | 104 +- + drivers/net/mlx4/en_selftest.c | 179 + + drivers/net/mlx4/en_tx.c | 20 + + drivers/net/mlx4/eq.c | 44 + + drivers/net/mlx4/fw.c | 15 + + drivers/net/mlx4/fw.h | 6 + + drivers/net/mlx4/main.c | 6 + + drivers/net/mlx4/mlx4_en.h | 39 +- + drivers/net/mlx4/profile.c | 2 +- + drivers/net/myri10ge/myri10ge.c | 4 +- + drivers/net/natsemi.c | 2 +- + drivers/net/niu.c | 25 +- + drivers/net/ns83820.c | 53 +- + drivers/net/pasemi_mac.c | 2 +- + drivers/net/pasemi_mac_ethtool.c | 16 - + drivers/net/pci-skeleton.c | 2 +- + drivers/net/pcmcia/3c574_cs.c | 88 +- + drivers/net/pcmcia/3c589_cs.c | 17 +- + drivers/net/pcmcia/axnet_cs.c | 187 +- + drivers/net/pcmcia/com20020_cs.c | 32 +- + drivers/net/pcmcia/fmvj18x_cs.c | 60 +- + drivers/net/pcmcia/ibmtr_cs.c | 26 +- + drivers/net/pcmcia/nmclan_cs.c | 54 +- + drivers/net/pcmcia/pcnet_cs.c | 106 +- + drivers/net/pcmcia/smc91c92_cs.c | 103 +- + drivers/net/pcmcia/xirc2ps_cs.c | 104 +- + drivers/net/plip.c | 9 +- + drivers/net/pptp.c | 726 +++ + drivers/net/ps3_gelic_net.c | 4 +- + drivers/net/pxa168_eth.c | 3 - + drivers/net/qla3xxx.c | 4 +- + drivers/net/qlcnic/qlcnic.h | 107 +- + drivers/net/qlcnic/qlcnic_ctx.c | 267 +- + drivers/net/qlcnic/qlcnic_ethtool.c | 75 +- + drivers/net/qlcnic/qlcnic_hdr.h | 23 +- + drivers/net/qlcnic/qlcnic_hw.c | 77 +- + drivers/net/qlcnic/qlcnic_init.c | 271 +- + drivers/net/qlcnic/qlcnic_main.c | 1112 +++- + drivers/net/qlge/qlge_main.c | 34 +- + drivers/net/r6040.c | 67 +- + drivers/net/r8169.c | 18 +- + drivers/net/rrunner.c | 2 +- + drivers/net/s2io.c | 37 +- + drivers/net/s2io.h | 9 - + drivers/net/sb1250-mac.c | 2 +- + drivers/net/sc92031.c | 11 - + drivers/net/sfc/efx.c | 302 +- + drivers/net/sfc/efx.h | 22 +- + drivers/net/sfc/ethtool.c | 53 +- + drivers/net/sfc/falcon.c | 14 +- + drivers/net/sfc/net_driver.h | 103 +- + drivers/net/sfc/nic.c | 182 +- + drivers/net/sfc/rx.c | 73 +- + drivers/net/sfc/selftest.c | 7 +- + drivers/net/sfc/siena.c | 2 +- + drivers/net/sfc/tx.c | 78 +- + drivers/net/sh_eth.c | 4 +- + drivers/net/sis900.c | 2 +- + drivers/net/skfp/skfddi.c | 84 +- + drivers/net/skge.c | 5 +- + drivers/net/sky2.c | 3 +- + drivers/net/slip.c | 91 +- + drivers/net/slip.h | 9 - + drivers/net/smsc911x.c | 2 +- + drivers/net/spider_net.c | 4 +- + drivers/net/starfire.c | 10 +- + drivers/net/stmmac/Kconfig | 5 +- + drivers/net/stmmac/common.h | 50 +- + drivers/net/stmmac/dwmac1000_core.c | 20 +- + drivers/net/stmmac/dwmac1000_dma.c | 8 +- + drivers/net/stmmac/dwmac100_core.c | 22 +- + drivers/net/stmmac/dwmac100_dma.c | 8 +- + drivers/net/stmmac/dwmac_dma.h | 16 +- + drivers/net/stmmac/dwmac_lib.c | 22 +- + drivers/net/stmmac/enh_desc.c | 2 +- + drivers/net/stmmac/norm_desc.c | 2 +- + drivers/net/stmmac/stmmac.h | 4 +- + drivers/net/stmmac/stmmac_ethtool.c | 21 +- + drivers/net/stmmac/stmmac_main.c | 133 +- + drivers/net/stmmac/stmmac_mdio.c | 21 +- + drivers/net/sunbmac.c | 2 +- + drivers/net/sundance.c | 50 +- + drivers/net/sungem.c | 211 +- + drivers/net/sungem_phy.c | 3 +- + drivers/net/sunhme.c | 8 +- + drivers/net/sunlance.c | 2 +- + drivers/net/sunvnet.c | 50 +- + drivers/net/tehuti.c | 34 +- + drivers/net/tehuti.h | 1 - + drivers/net/tg3.c | 160 +- + drivers/net/tg3.h | 22 +- + drivers/net/tlan.c | 8 +- + drivers/net/tokenring/tms380tr.c | 6 +- + drivers/net/tulip/de4x5.c | 18 +- + drivers/net/tulip/dmfe.c | 2 +- + drivers/net/tulip/interrupt.c | 77 +- + drivers/net/tulip/tulip.h | 3 +- + drivers/net/tulip/tulip_core.c | 10 +- + drivers/net/tulip/uli526x.c | 2 +- + drivers/net/tulip/winbond-840.c | 2 +- + drivers/net/tulip/xircom_cb.c | 15 - + drivers/net/typhoon.c | 48 +- + drivers/net/usb/Kconfig | 8 + + drivers/net/usb/Makefile | 1 + + drivers/net/usb/cx82310_eth.c | 346 + + drivers/net/usb/hso.c | 9 - + drivers/net/usb/kaweth.c | 9 - + drivers/net/via-velocity.c | 2 +- + drivers/net/via-velocity.h | 11 +- + drivers/net/virtio_net.c | 14 - + drivers/net/vmxnet3/vmxnet3_drv.c | 4 +- + drivers/net/vxge/vxge-main.c | 34 +- + drivers/net/vxge/vxge-main.h | 1 - + drivers/net/wan/c101.c | 2 +- + drivers/net/wan/cycx_drv.c | 14 +- + drivers/net/wan/cycx_main.c | 6 +- + drivers/net/wan/hdlc_cisco.c | 4 +- + drivers/net/wan/lapbether.c | 2 +- + drivers/net/wan/lmc/lmc_main.c | 2 +- + drivers/net/wan/n2.c | 2 +- + drivers/net/wan/pc300_drv.c | 2 +- + drivers/net/wan/pci200syn.c | 2 +- + drivers/net/wan/z85230.c | 4 +- + drivers/net/wd.c | 8 +- + drivers/net/wireless/airo.c | 5 +- + drivers/net/wireless/at76c50x-usb.c | 7 +- + drivers/net/wireless/ath/ar9170/main.c | 31 +- + drivers/net/wireless/ath/ath.h | 1 + + drivers/net/wireless/ath/ath5k/ani.c | 6 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 7 +- + drivers/net/wireless/ath/ath5k/attach.c | 8 +- + drivers/net/wireless/ath/ath5k/base.c | 94 +- + drivers/net/wireless/ath/ath5k/debug.c | 5 +- + drivers/net/wireless/ath/ath5k/debug.h | 2 + + drivers/net/wireless/ath/ath5k/dma.c | 4 +- + drivers/net/wireless/ath/ath5k/eeprom.c | 4 +- + drivers/net/wireless/ath/ath5k/pcu.c | 36 +- + drivers/net/wireless/ath/ath5k/phy.c | 19 +- + drivers/net/wireless/ath/ath5k/reg.h | 2 +- + drivers/net/wireless/ath/ath5k/reset.c | 30 +- + drivers/net/wireless/ath/ath5k/rfbuffer.h | 4 +- + drivers/net/wireless/ath/ath9k/Makefile | 3 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 2 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 9 +- + drivers/net/wireless/ath/ath9k/beacon.c | 7 +- + drivers/net/wireless/ath/ath9k/btcoex.c | 7 + + drivers/net/wireless/ath/ath9k/calib.c | 109 +- + drivers/net/wireless/ath/ath9k/calib.h | 1 + + drivers/net/wireless/ath/ath9k/common.c | 78 +- + drivers/net/wireless/ath/ath9k/common.h | 10 + + drivers/net/wireless/ath/ath9k/gpio.c | 40 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 3 +- + drivers/net/wireless/ath/ath9k/htc.h | 42 +- + drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 134 + + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 42 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 26 +- + drivers/net/wireless/ath/ath9k/htc_hst.c | 4 +- + drivers/net/wireless/ath/ath9k/htc_hst.h | 2 +- + drivers/net/wireless/ath/ath9k/hw.h | 1 + + drivers/net/wireless/ath/ath9k/init.c | 2 +- + drivers/net/wireless/ath/ath9k/mac.c | 3 +- + drivers/net/wireless/ath/ath9k/main.c | 19 +- + drivers/net/wireless/ath/ath9k/recv.c | 19 +- + drivers/net/wireless/ath/ath9k/wmi.c | 2 + + drivers/net/wireless/ath/ath9k/wmi.h | 1 + + drivers/net/wireless/ath/ath9k/xmit.c | 18 +- + drivers/net/wireless/ath/debug.h | 2 + + drivers/net/wireless/b43/main.c | 30 +- + drivers/net/wireless/b43/phy_n.c | 64 +- + drivers/net/wireless/b43legacy/main.c | 5 + + drivers/net/wireless/hostap/hostap_ioctl.c | 2 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 10 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 12 +- + drivers/net/wireless/iwlwifi/Kconfig | 10 + + drivers/net/wireless/iwlwifi/Makefile | 1 + + drivers/net/wireless/iwlwifi/iwl-1000.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 3 +- + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 7 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 86 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 59 +- + drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 37 +- + drivers/net/wireless/iwlwifi/iwl-6000-hw.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 163 +- + drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 18 +- + drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 133 +- + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 424 ++- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 332 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 2 + + drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 704 ++ + drivers/net/wireless/iwlwifi/iwl-agn-tt.h | 129 + + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 153 +- + drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 95 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 677 ++- + drivers/net/wireless/iwlwifi/iwl-agn.h | 12 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 518 ++- + drivers/net/wireless/iwlwifi/iwl-core.c | 887 ++-- + drivers/net/wireless/iwlwifi/iwl-core.h | 92 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 112 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 185 +- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 13 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 638 +-- + drivers/net/wireless/iwlwifi/iwl-power.h | 93 - + drivers/net/wireless/iwlwifi/iwl-prph.h | 9 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 75 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 205 +- + drivers/net/wireless/iwlwifi/iwl-sta.h | 64 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 43 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 240 +- + drivers/net/wireless/iwmc3200wifi/rx.c | 7 +- + drivers/net/wireless/libertas/cfg.c | 62 +- + drivers/net/wireless/libertas/decl.h | 13 + + drivers/net/wireless/libertas/if_cs.c | 130 +- + drivers/net/wireless/libertas/if_sdio.c | 161 +- + drivers/net/wireless/libertas/if_sdio.h | 4 - + drivers/net/wireless/libertas/if_spi.c | 150 +- + drivers/net/wireless/libertas/if_spi.h | 5 - + drivers/net/wireless/libertas/if_usb.c | 60 +- + drivers/net/wireless/libertas/if_usb.h | 1 + + drivers/net/wireless/libertas/main.c | 105 + + drivers/net/wireless/libertas_tf/if_usb.c | 57 +- + drivers/net/wireless/mac80211_hwsim.c | 20 +- + drivers/net/wireless/orinoco/hw.c | 9 +- + drivers/net/wireless/orinoco/wext.c | 11 +- + drivers/net/wireless/p54/Kconfig | 18 + + drivers/net/wireless/p54/eeprom.c | 21 +- + drivers/net/wireless/p54/fwio.c | 6 +- + drivers/net/wireless/p54/main.c | 9 +- + drivers/net/wireless/p54/p54spi.c | 7 +- + drivers/net/wireless/p54/p54spi_eeprom.h | 2 +- + drivers/net/wireless/p54/p54usb.c | 2 +- + drivers/net/wireless/p54/txrx.c | 25 +- + drivers/net/wireless/prism54/isl_ioctl.c | 2 +- + drivers/net/wireless/ray_cs.c | 28 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 33 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 39 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 37 +- + drivers/net/wireless/rt2x00/rt2800.h | 38 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 389 +- + drivers/net/wireless/rt2x00/rt2800lib.h | 24 +- + drivers/net/wireless/rt2x00/rt2800pci.c | 233 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 159 +- + drivers/net/wireless/rt2x00/rt2x00.h | 31 +- + drivers/net/wireless/rt2x00/rt2x00config.c | 12 +- + drivers/net/wireless/rt2x00/rt2x00crypto.c | 17 +- + drivers/net/wireless/rt2x00/rt2x00debug.c | 13 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 71 +- + drivers/net/wireless/rt2x00/rt2x00firmware.c | 3 + + drivers/net/wireless/rt2x00/rt2x00ht.c | 10 + + drivers/net/wireless/rt2x00/rt2x00queue.c | 82 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 56 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 298 +- + drivers/net/wireless/rt2x00/rt2x00usb.h | 12 +- + drivers/net/wireless/rt2x00/rt61pci.c | 69 +- + drivers/net/wireless/rt2x00/rt73usb.c | 41 +- + drivers/net/wireless/rtl818x/rtl8180_dev.c | 143 +- + drivers/net/wireless/rtl818x/rtl8187_dev.c | 9 +- + drivers/net/wireless/wl12xx/wl1251.h | 7 +- + drivers/net/wireless/wl12xx/wl1251_acx.c | 2 +- + drivers/net/wireless/wl12xx/wl1251_acx.h | 10 +- + drivers/net/wireless/wl12xx/wl1251_boot.c | 4 +- + drivers/net/wireless/wl12xx/wl1251_boot.h | 2 - + drivers/net/wireless/wl12xx/wl1251_cmd.c | 2 +- + drivers/net/wireless/wl12xx/wl1251_cmd.h | 8 +- + drivers/net/wireless/wl12xx/wl1251_debugfs.c | 2 - + drivers/net/wireless/wl12xx/wl1251_debugfs.h | 2 - + drivers/net/wireless/wl12xx/wl1251_event.c | 33 +- + drivers/net/wireless/wl12xx/wl1251_event.h | 3 +- + drivers/net/wireless/wl12xx/wl1251_init.c | 2 - + drivers/net/wireless/wl12xx/wl1251_init.h | 2 - + drivers/net/wireless/wl12xx/wl1251_io.c | 2 - + drivers/net/wireless/wl12xx/wl1251_main.c | 55 +- + drivers/net/wireless/wl12xx/wl1251_ps.c | 2 - + drivers/net/wireless/wl12xx/wl1251_ps.h | 8 +- + drivers/net/wireless/wl12xx/wl1251_reg.h | 2 - + drivers/net/wireless/wl12xx/wl1251_rx.c | 2 - + drivers/net/wireless/wl12xx/wl1251_rx.h | 2 - + drivers/net/wireless/wl12xx/wl1251_sdio.c | 2 +- + drivers/net/wireless/wl12xx/wl1251_spi.c | 4 +- + drivers/net/wireless/wl12xx/wl1251_spi.h | 2 - + drivers/net/wireless/wl12xx/wl1251_tx.c | 26 +- + drivers/net/wireless/wl12xx/wl1251_tx.h | 2 - + drivers/net/wireless/wl12xx/wl1271_acx.c | 2 +- + drivers/net/wireless/wl12xx/wl1271_main.c | 15 +- + drivers/net/wireless/wl12xx/wl1271_scan.c | 4 +- + drivers/net/wireless/wl12xx/wl1271_tx.c | 4 +- + drivers/net/wireless/wl3501_cs.c | 11 - + drivers/net/wireless/zd1211rw/zd_chip.c | 5 + + drivers/net/xen-netfront.c | 8 +- + drivers/net/xilinx_emaclite.c | 2 +- + drivers/net/yellowfin.c | 2 +- + drivers/s390/net/Kconfig | 2 +- + drivers/s390/net/qeth_core.h | 17 + + drivers/s390/net/qeth_core_main.c | 26 +- + drivers/s390/net/qeth_l2_main.c | 173 +- + drivers/s390/net/qeth_l3_main.c | 189 +- + drivers/usb/atm/cxacru.c | 18 +- + drivers/uwb/address.c | 5 +- + drivers/uwb/wlp/wss-lc.c | 7 +- + include/linux/Kbuild | 1 + + include/linux/etherdevice.h | 18 +- + include/linux/ethtool.h | 150 +- + include/linux/if.h | 2 + + include/linux/if_ether.h | 2 - + include/linux/if_macvlan.h | 9 +- + include/linux/if_pppox.h | 50 +- + include/linux/if_vlan.h | 5 +- + include/linux/in.h | 19 + + include/linux/inetdevice.h | 14 +- + include/linux/mlx4/cmd.h | 1 + + include/linux/mlx4/device.h | 7 + + include/linux/netdevice.h | 18 +- + include/linux/nl80211.h | 166 +- + include/linux/pci_ids.h | 3 + + include/linux/phonet.h | 2 + + include/linux/phy.h | 4 +- + include/linux/pkt_cls.h | 1 + + include/linux/rds.h | 115 +- + include/linux/rtnetlink.h | 20 + + include/linux/skbuff.h | 72 +- + include/linux/spi/wl12xx.h | 2 +- + include/linux/ssb/ssb_regs.h | 1 + + include/linux/stmmac.h | 2 +- + include/linux/tc_act/Kbuild | 1 + + include/linux/tc_act/tc_csum.h | 32 + + include/linux/tc_ematch/tc_em_meta.h | 1 + + include/linux/tcp.h | 1 + + include/net/cfg80211.h | 203 +- + include/net/gre.h | 18 + + include/net/inet_connection_sock.h | 1 + + include/net/ip.h | 2 +- + include/net/irda/irlan_common.h | 1 - + include/net/irda/irlan_event.h | 2 +- + include/net/mac80211.h | 82 +- + include/net/phonet/pep.h | 5 + + include/net/phonet/phonet.h | 5 + + include/net/phonet/pn_dev.h | 1 + + include/net/raw.h | 5 +- + include/net/sctp/sctp.h | 48 +- + include/net/sock.h | 8 +- + include/net/tc_act/tc_csum.h | 15 + + include/net/tcp.h | 9 + + net/8021q/vlan_core.c | 14 +- + net/9p/trans_fd.c | 2 +- + net/atm/common.c | 2 +- + net/atm/lec.c | 1 - + net/ax25/af_ax25.c | 2 +- + net/ax25/ax25_route.c | 4 +- + net/bluetooth/af_bluetooth.c | 5 +- + net/bridge/br_if.c | 29 +- + net/bridge/br_input.c | 2 +- + net/caif/caif_dev.c | 22 +- + net/caif/caif_socket.c | 19 +- + net/caif/cfcnfg.c | 49 +- + net/caif/cfctrl.c | 59 +- + net/caif/cfdbgl.c | 4 +- + net/caif/cfdgml.c | 11 +- + net/caif/cffrml.c | 14 +- + net/caif/cfmuxl.c | 14 +- + net/caif/cfpkt_skbuff.c | 48 +- + net/caif/cfrfml.c | 12 +- + net/caif/cfserl.c | 4 +- + net/caif/cfsrvl.c | 17 +- + net/caif/cfutill.c | 12 +- + net/caif/cfveil.c | 11 +- + net/caif/cfvidl.c | 6 +- + net/caif/chnl_net.c | 46 +- + net/can/raw.c | 4 +- + net/core/datagram.c | 5 +- + net/core/dev.c | 203 +- + net/core/ethtool.c | 42 +- + net/core/flow.c | 78 +- + net/core/gen_estimator.c | 4 +- + net/core/iovec.c | 6 +- + net/core/net-sysfs.c | 5 +- + net/core/pktgen.c | 2 - + net/core/rtnetlink.c | 31 +- + net/core/skbuff.c | 92 +- + net/core/sock.c | 4 + + net/dccp/ccids/Kconfig | 31 - + net/dccp/ccids/ccid2.c | 287 +- + net/dccp/ccids/ccid2.h | 35 +- + net/dccp/ccids/ccid3.c | 191 +- + net/dccp/ccids/ccid3.h | 42 +- + net/dccp/ccids/lib/packet_history.c | 39 - + net/dccp/ccids/lib/packet_history.h | 22 +- + net/decnet/dn_nsp_out.c | 8 +- + net/econet/af_econet.c | 2 - + net/ethernet/eth.c | 6 +- + net/ipv4/Kconfig | 7 + + net/ipv4/Makefile | 1 + + net/ipv4/af_inet.c | 8 +- + net/ipv4/arp.c | 226 +- + net/ipv4/devinet.c | 4 +- + net/ipv4/fib_trie.c | 55 +- + net/ipv4/gre.c | 151 + + net/ipv4/icmp.c | 4 +- + net/ipv4/ip_fragment.c | 2 +- + net/ipv4/ip_gre.c | 75 +- + net/ipv4/ip_output.c | 15 +- + net/ipv4/ipip.c | 69 +- + net/ipv4/ipmr.c | 2 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 31 +- + net/ipv4/protocol.c | 31 +- + net/ipv4/raw.c | 2 +- + net/ipv4/route.c | 9 +- + net/ipv4/tcp.c | 11 +- + net/ipv4/tcp_input.c | 17 +- + net/ipv4/tcp_ipv4.c | 2 - + net/ipv4/tcp_output.c | 23 +- + net/ipv4/tcp_timer.c | 40 +- + net/ipv4/tunnel4.c | 19 +- + net/ipv4/udp.c | 4 +- + net/ipv4/xfrm4_tunnel.c | 4 +- + net/ipv6/addrconf.c | 3 +- + net/ipv6/ip6_output.c | 2 +- + net/ipv6/ip6_tunnel.c | 4 +- + net/ipv6/ndisc.c | 18 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +- + net/ipv6/protocol.c | 32 +- + net/ipv6/reassembly.c | 2 +- + net/ipv6/sit.c | 66 +- + net/ipv6/tunnel6.c | 17 +- + net/ipv6/xfrm6_tunnel.c | 4 +- + net/irda/irlan/irlan_eth.c | 32 +- + net/irda/irlan/irlan_event.c | 2 +- + net/irda/irnet/irnet_ppp.h | 3 +- + net/l2tp/l2tp_eth.c | 1 - + net/mac80211/aes_ccm.c | 6 +- + net/mac80211/aes_cmac.c | 6 +- + net/mac80211/agg-rx.c | 22 + + net/mac80211/cfg.c | 115 +- + net/mac80211/debugfs.c | 6 +- + net/mac80211/debugfs_key.c | 55 +- + net/mac80211/driver-ops.h | 14 + + net/mac80211/driver-trace.h | 29 +- + net/mac80211/ht.c | 28 + + net/mac80211/ibss.c | 12 +- + net/mac80211/ieee80211_i.h | 66 +- + net/mac80211/iface.c | 375 +- + net/mac80211/key.c | 111 +- + net/mac80211/key.h | 10 +- + net/mac80211/main.c | 161 +- + net/mac80211/mlme.c | 64 +- + net/mac80211/offchannel.c | 19 +- + net/mac80211/pm.c | 3 +- + net/mac80211/rate.c | 9 +- + net/mac80211/rc80211_pid_debugfs.c | 2 +- + net/mac80211/rx.c | 520 +- + net/mac80211/scan.c | 66 +- + net/mac80211/sta_info.c | 21 +- + net/mac80211/sta_info.h | 16 +- + net/mac80211/status.c | 11 +- + net/mac80211/tx.c | 67 +- + net/mac80211/util.c | 17 +- + net/mac80211/wep.c | 2 +- + net/mac80211/work.c | 39 +- + net/mac80211/wpa.c | 32 +- + net/netfilter/ipvs/ip_vs_core.c | 17 +- + net/netfilter/ipvs/ip_vs_ctl.c | 13 +- + net/netfilter/ipvs/ip_vs_sched.c | 22 +- + net/netfilter/xt_hashlimit.c | 15 +- + net/packet/af_packet.c | 4 +- + net/phonet/af_phonet.c | 17 + + net/phonet/datagram.c | 13 + + net/phonet/pep.c | 35 +- + net/phonet/pn_dev.c | 5 +- + net/phonet/socket.c | 190 +- + net/rds/af_rds.c | 26 +- + net/rds/bind.c | 82 +- + net/rds/cong.c | 8 +- + net/rds/connection.c | 157 +- + net/rds/ib.c | 194 +- + net/rds/ib.h | 100 +- + net/rds/ib_cm.c | 183 +- + net/rds/ib_rdma.c | 314 +- + net/rds/ib_recv.c | 549 +- + net/rds/ib_send.c | 682 ++- + net/rds/ib_stats.c | 2 + + net/rds/ib_sysctl.c | 17 +- + net/rds/info.c | 12 +- + net/rds/iw.c | 4 +- + net/rds/iw.h | 11 +- + net/rds/iw_cm.c | 14 +- + net/rds/iw_rdma.c | 1 - + net/rds/iw_recv.c | 24 +- + net/rds/iw_send.c | 93 +- + net/rds/iw_sysctl.c | 4 +- + net/rds/loop.c | 31 +- + net/rds/message.c | 118 +- + net/rds/page.c | 5 +- + net/rds/rdma.c | 339 +- + net/rds/rdma.h | 85 - + net/rds/rdma_transport.c | 42 +- + net/rds/rds.h | 187 +- + net/rds/recv.c | 9 +- + net/rds/send.c | 544 +- + net/rds/stats.c | 6 +- + net/rds/sysctl.c | 4 +- + net/rds/tcp.c | 8 +- + net/rds/tcp.h | 9 +- + net/rds/tcp_connect.c | 2 +- + net/rds/tcp_listen.c | 6 +- + net/rds/tcp_recv.c | 14 +- + net/rds/tcp_send.c | 66 +- + net/rds/threads.c | 69 +- + net/rds/transport.c | 19 +- + net/rds/xlist.h | 80 + + net/sched/Kconfig | 10 + + net/sched/Makefile | 1 + + net/sched/act_csum.c | 595 ++ + net/sched/cls_flow.c | 74 +- + net/sched/em_meta.c | 6 + + net/sched/sch_api.c | 2 +- + net/sched/sch_sfq.c | 33 +- + net/sctp/associola.c | 2 + + net/sctp/chunk.c | 2 + + net/sctp/inqueue.c | 2 + + net/sctp/ipv6.c | 4 +- + net/sctp/objcnt.c | 5 +- + net/sctp/output.c | 2 + + net/sctp/outqueue.c | 34 +- + net/sctp/probe.c | 4 +- + net/sctp/protocol.c | 17 +- + net/sctp/sm_make_chunk.c | 2 + + net/sctp/sm_sideeffect.c | 21 +- + net/sctp/sm_statefuns.c | 20 +- + net/sctp/sm_statetable.c | 42 +- + net/sctp/socket.c | 79 +- + net/sctp/transport.c | 9 +- + net/socket.c | 30 +- + net/tipc/bcast.c | 39 +- + net/tipc/core.c | 6 +- + net/tipc/discover.c | 8 + + net/tipc/eth_media.c | 48 +- + net/tipc/link.c | 25 +- + net/tipc/name_table.c | 48 +- + net/tipc/net.c | 1 + + net/tipc/node.c | 22 +- + net/tipc/node.h | 2 + + net/tipc/port.c | 19 +- + net/tipc/socket.c | 81 +- + net/unix/af_unix.c | 5 +- + net/wireless/core.c | 15 +- + net/wireless/core.h | 21 +- + net/wireless/mlme.c | 149 +- + net/wireless/nl80211.c | 150 +- + net/wireless/nl80211.h | 14 +- + net/wireless/reg.c | 16 +- + net/wireless/sysfs.c | 9 + + net/wireless/util.c | 13 +- + net/wireless/wext-core.c | 2 +- + net/wireless/wext-sme.c | 2 + + net/x25/af_x25.c | 18 +- + 724 files changed, 49542 insertions(+), 17587 deletions(-) + create mode 100644 Documentation/DocBook/80211.tmpl + delete mode 100644 Documentation/DocBook/mac80211.tmpl + create mode 100644 drivers/net/bna/Makefile + create mode 100644 drivers/net/bna/bfa_cee.c + create mode 100644 drivers/net/bna/bfa_cee.h + create mode 100644 drivers/net/bna/bfa_defs.h + create mode 100644 drivers/net/bna/bfa_defs_cna.h + create mode 100644 drivers/net/bna/bfa_defs_mfg_comm.h + create mode 100644 drivers/net/bna/bfa_defs_status.h + create mode 100644 drivers/net/bna/bfa_ioc.c + create mode 100644 drivers/net/bna/bfa_ioc.h + create mode 100644 drivers/net/bna/bfa_ioc_ct.c + create mode 100644 drivers/net/bna/bfa_sm.h + create mode 100644 drivers/net/bna/bfa_wc.h + create mode 100644 drivers/net/bna/bfi.h + create mode 100644 drivers/net/bna/bfi_cna.h + create mode 100644 drivers/net/bna/bfi_ctreg.h + create mode 100644 drivers/net/bna/bfi_ll.h + create mode 100644 drivers/net/bna/bna.h + create mode 100644 drivers/net/bna/bna_ctrl.c + create mode 100644 drivers/net/bna/bna_hw.h + create mode 100644 drivers/net/bna/bna_txrx.c + create mode 100644 drivers/net/bna/bna_types.h + create mode 100644 drivers/net/bna/bnad.c + create mode 100644 drivers/net/bna/bnad.h + create mode 100644 drivers/net/bna/bnad_ethtool.c + create mode 100644 drivers/net/bna/cna.h + create mode 100644 drivers/net/bna/cna_fwimg.c + create mode 100644 drivers/net/mlx4/en_selftest.c + create mode 100644 drivers/net/pptp.c + create mode 100644 drivers/net/usb/cx82310_eth.c + create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_gpio.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-tt.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-tt.h + create mode 100644 include/linux/tc_act/tc_csum.h + create mode 100644 include/net/gre.h + create mode 100644 include/net/tc_act/tc_csum.h + create mode 100644 net/ipv4/gre.c + delete mode 100644 net/rds/rdma.h + create mode 100644 net/rds/xlist.h + create mode 100644 net/sched/act_csum.c +Merging wireless/master +$ git merge wireless/master +Auto-merging MAINTAINERS +Auto-merging drivers/net/wireless/airo.c +Auto-merging drivers/net/wireless/ath/ath5k/base.c +Auto-merging drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +Auto-merging drivers/net/wireless/ath/ath9k/eeprom.h +Auto-merging drivers/net/wireless/libertas/cfg.c +Auto-merging drivers/net/wireless/ray_cs.c +Auto-merging drivers/net/wireless/rt2x00/rt2400pci.c +Auto-merging drivers/net/wireless/rt2x00/rt2500pci.c +Auto-merging drivers/net/wireless/rt2x00/rt2500usb.c +Auto-merging drivers/net/wireless/rt2x00/rt2800lib.c +Auto-merging drivers/net/wireless/rt2x00/rt61pci.c +Auto-merging drivers/net/wireless/rt2x00/rt73usb.c +Auto-merging net/mac80211/main.c +Auto-merging net/wireless/core.c +Merge made by recursive. + MAINTAINERS | 7 + + drivers/net/wireless/airo.c | 8 +- + drivers/net/wireless/ath/Kconfig | 1 + + drivers/net/wireless/ath/Makefile | 4 +- + drivers/net/wireless/ath/ath.h | 39 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 7 - + drivers/net/wireless/ath/ath5k/attach.c | 13 +- + drivers/net/wireless/ath/ath5k/base.c | 35 +- + drivers/net/wireless/ath/ath5k/pcu.c | 191 --- + drivers/net/wireless/ath/ath5k/phy.c | 2 +- + drivers/net/wireless/ath/ath5k/reg.h | 42 - + drivers/net/wireless/ath/ath9k/ani.c | 5 +- + drivers/net/wireless/ath/ath9k/ar9002_hw.c | 50 + + drivers/net/wireless/ath/ath9k/ar9002_phy.c | 35 + + drivers/net/wireless/ath/ath9k/ar9002_phy.h | 2 + + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 3 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 59 +- + drivers/net/wireless/ath/ath9k/common.c | 270 ---- + drivers/net/wireless/ath/ath9k/common.h | 6 - + drivers/net/wireless/ath/ath9k/debug.c | 53 +- + drivers/net/wireless/ath/ath9k/eeprom.h | 5 +- + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 6 +- + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 2 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 4 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 32 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 5 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 11 +- + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 3 +- + drivers/net/wireless/ath/ath9k/hw.c | 305 +---- + drivers/net/wireless/ath/ath9k/hw.h | 53 +- + drivers/net/wireless/ath/ath9k/init.c | 15 +- + drivers/net/wireless/ath/ath9k/mac.c | 2 + + drivers/net/wireless/ath/ath9k/mac.h | 21 - + drivers/net/wireless/ath/ath9k/main.c | 31 +- + drivers/net/wireless/ath/ath9k/phy.h | 3 - + drivers/net/wireless/ath/ath9k/recv.c | 563 +++++++- + drivers/net/wireless/ath/ath9k/virtual.c | 63 +- + drivers/net/wireless/ath/ath9k/wmi.c | 72 +- + drivers/net/wireless/ath/ath9k/wmi.h | 6 +- + drivers/net/wireless/ath/carl9170/Kconfig | 41 + + drivers/net/wireless/ath/carl9170/Makefile | 4 + + drivers/net/wireless/ath/carl9170/carl9170.h | 626 ++++++++ + drivers/net/wireless/ath/carl9170/cmd.c | 188 +++ + drivers/net/wireless/ath/carl9170/cmd.h | 158 ++ + drivers/net/wireless/ath/carl9170/debug.c | 908 ++++++++++++ + drivers/net/wireless/ath/carl9170/debug.h | 134 ++ + drivers/net/wireless/ath/carl9170/eeprom.h | 216 +++ + drivers/net/wireless/ath/carl9170/fw.c | 395 +++++ + drivers/net/wireless/ath/carl9170/fwcmd.h | 268 ++++ + drivers/net/wireless/ath/carl9170/fwdesc.h | 237 +++ + drivers/net/wireless/ath/carl9170/hw.h | 736 ++++++++++ + drivers/net/wireless/ath/carl9170/led.c | 190 +++ + drivers/net/wireless/ath/carl9170/mac.c | 604 ++++++++ + drivers/net/wireless/ath/carl9170/main.c | 1855 ++++++++++++++++++++++++ + drivers/net/wireless/ath/carl9170/phy.c | 1805 +++++++++++++++++++++++ + drivers/net/wireless/ath/carl9170/phy.h | 567 ++++++++ + drivers/net/wireless/ath/carl9170/rx.c | 909 ++++++++++++ + drivers/net/wireless/ath/carl9170/tx.c | 1373 ++++++++++++++++++ + drivers/net/wireless/ath/carl9170/usb.c | 1137 +++++++++++++++ + drivers/net/wireless/ath/carl9170/version.h | 7 + + drivers/net/wireless/ath/carl9170/wlan.h | 412 ++++++ + drivers/net/wireless/ath/key.c | 568 ++++++++ + drivers/net/wireless/ath/reg.h | 23 + + drivers/net/wireless/iwlwifi/iwl-3945.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 18 +- + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 151 +-- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 9 - + drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 34 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 49 +- + drivers/net/wireless/iwlwifi/iwl-agn.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 72 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 44 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 9 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 381 +++--- + drivers/net/wireless/iwlwifi/iwl-sta.c | 19 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 99 +-- + drivers/net/wireless/libertas/cfg.c | 6 +- + drivers/net/wireless/libertas/mesh.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 15 +- + drivers/net/wireless/p54/p54spi.c | 2 + + drivers/net/wireless/ray_cs.c | 16 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 122 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 123 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 34 +- + drivers/net/wireless/rt2x00/rt2800.h | 12 + + drivers/net/wireless/rt2x00/rt2800lib.c | 68 +- + drivers/net/wireless/rt2x00/rt2800lib.h | 3 +- + drivers/net/wireless/rt2x00/rt2800pci.c | 26 +- + drivers/net/wireless/rt2x00/rt2x00.h | 3 +- + drivers/net/wireless/rt2x00/rt2x00config.c | 9 +- + drivers/net/wireless/rt2x00/rt2x00lib.h | 3 +- + drivers/net/wireless/rt2x00/rt2x00link.c | 12 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 6 +- + drivers/net/wireless/rt2x00/rt61pci.c | 51 +- + drivers/net/wireless/rt2x00/rt73usb.c | 47 +- + drivers/net/wireless/wl12xx/wl1271_sdio.c | 39 +- + include/linux/nl80211.h | 4 + + include/net/cfg80211.h | 37 +- + include/net/mac80211.h | 29 +- + net/mac80211/cfg.c | 30 +- + net/mac80211/chan.c | 2 +- + net/mac80211/driver-ops.h | 6 +- + net/mac80211/driver-trace.h | 21 +- + net/mac80211/ieee80211_i.h | 2 + + net/mac80211/iface.c | 34 +- + net/mac80211/key.c | 2 +- + net/mac80211/main.c | 18 + + net/mac80211/mlme.c | 42 +- + net/mac80211/offchannel.c | 7 + + net/mac80211/rx.c | 4 +- + net/mac80211/sta_info.c | 4 +- + net/mac80211/tx.c | 1 + + net/mac80211/util.c | 22 +- + net/wireless/core.c | 51 +- + net/wireless/core.h | 9 +- + net/wireless/mlme.c | 3 +- + net/wireless/nl80211.c | 58 +- + net/wireless/radiotap.c | 3 +- + net/wireless/reg.c | 6 +- + net/wireless/sme.c | 9 +- + net/wireless/util.c | 15 +- + 123 files changed, 15402 insertions(+), 1908 deletions(-) + create mode 100644 drivers/net/wireless/ath/carl9170/Kconfig + create mode 100644 drivers/net/wireless/ath/carl9170/Makefile + create mode 100644 drivers/net/wireless/ath/carl9170/carl9170.h + create mode 100644 drivers/net/wireless/ath/carl9170/cmd.c + create mode 100644 drivers/net/wireless/ath/carl9170/cmd.h + create mode 100644 drivers/net/wireless/ath/carl9170/debug.c + create mode 100644 drivers/net/wireless/ath/carl9170/debug.h + create mode 100644 drivers/net/wireless/ath/carl9170/eeprom.h + create mode 100644 drivers/net/wireless/ath/carl9170/fw.c + create mode 100644 drivers/net/wireless/ath/carl9170/fwcmd.h + create mode 100644 drivers/net/wireless/ath/carl9170/fwdesc.h + create mode 100644 drivers/net/wireless/ath/carl9170/hw.h + create mode 100644 drivers/net/wireless/ath/carl9170/led.c + create mode 100644 drivers/net/wireless/ath/carl9170/mac.c + create mode 100644 drivers/net/wireless/ath/carl9170/main.c + create mode 100644 drivers/net/wireless/ath/carl9170/phy.c + create mode 100644 drivers/net/wireless/ath/carl9170/phy.h + create mode 100644 drivers/net/wireless/ath/carl9170/rx.c + create mode 100644 drivers/net/wireless/ath/carl9170/tx.c + create mode 100644 drivers/net/wireless/ath/carl9170/usb.c + create mode 100644 drivers/net/wireless/ath/carl9170/version.h + create mode 100644 drivers/net/wireless/ath/carl9170/wlan.h + create mode 100644 drivers/net/wireless/ath/key.c +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-omap2/clock3xxx_data.c +Auto-merging arch/arm/mach-omap2/devices.c +Auto-merging drivers/crypto/Kconfig +Merge made by recursive. + MAINTAINERS | 16 + + arch/arm/mach-omap2/clock2420_data.c | 2 +- + arch/arm/mach-omap2/clock2430_data.c | 2 +- + arch/arm/mach-omap2/clock3xxx_data.c | 2 +- + arch/arm/mach-omap2/devices.c | 71 +++ + crypto/Kconfig | 21 +- + drivers/crypto/Kconfig | 9 + + drivers/crypto/Makefile | 1 + + drivers/crypto/omap-aes.c | 948 ++++++++++++++++++++++++++++++++++ + drivers/crypto/omap-sham.c | 6 +- + include/linux/padata.h | 4 +- + 11 files changed, 1065 insertions(+), 17 deletions(-) + create mode 100644 drivers/crypto/omap-aes.c +Merging sound-asoc/for-next +$ git merge sound-asoc/for-next +Resolved 'arch/arm/mach-s3c64xx/mach-smdk6410.c' using previous resolution. +Resolved 'drivers/video/sh_mobile_hdmi.c' using previous resolution. +Auto-merging arch/arm/mach-davinci/devices.c +Auto-merging arch/arm/mach-mx3/clock-imx35.c +Auto-merging arch/arm/mach-omap2/devices.c +Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c +CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-smdk6410.c +Auto-merging arch/arm/plat-samsung/include/plat/devs.h +Auto-merging drivers/video/sh_mobile_hdmi.c +CONFLICT (content): Merge conflict in drivers/video/sh_mobile_hdmi.c +Removing include/sound/soc-of-simple.h +Removing sound/soc/blackfin/bf5xx-i2s.h +Removing sound/soc/codecs/ac97.h +Removing sound/soc/codecs/ak4104.h +Removing sound/soc/codecs/ak4642.h +Removing sound/soc/codecs/cq93vc.h +Removing sound/soc/codecs/cs4270.h +Removing sound/soc/codecs/da7210.h +Removing sound/soc/codecs/jz4740.h +Removing sound/soc/codecs/spdif_transciever.h +Removing sound/soc/codecs/twl4030.h +Removing sound/soc/codecs/wm8727.h +Removing sound/soc/davinci/davinci-vcif.h +Removing sound/soc/ep93xx/ep93xx-i2s.h +Removing sound/soc/fsl/soc-of-simple.c +Removing sound/soc/kirkwood/kirkwood-dma.h +Removing sound/soc/kirkwood/kirkwood-i2s.h +Removing sound/soc/omap/omap-mcpdm.h +Removing sound/soc/pxa/pxa2xx-pcm.h +Auto-merging sound/soc/sh/siu_pcm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6bbe84d] Merge remote branch 'sound-asoc/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-davinci/devices.c | 13 + + arch/arm/mach-ep93xx/core.c | 6 + + arch/arm/mach-kirkwood/common.c | 6 + + arch/arm/mach-mx3/clock-imx31.c | 4 +- + arch/arm/mach-mx3/clock-imx35.c | 4 +- + arch/arm/mach-mx3/devices.c | 4 +- + arch/arm/mach-omap1/devices.c | 26 + + arch/arm/mach-omap2/board-rx51-peripherals.c | 17 +- + arch/arm/mach-omap2/board-zoom2.c | 28 +- + arch/arm/mach-omap2/devices.c | 39 + + arch/arm/mach-omap2/include/mach/board-zoom.h | 2 + + arch/arm/mach-pxa/devices.c | 25 + + arch/arm/mach-pxa/devices.h | 6 + + arch/arm/mach-pxa/pxa27x.c | 4 + + arch/arm/mach-pxa/pxa3xx.c | 5 + + arch/arm/mach-pxa/zylonite.c | 11 + + arch/arm/mach-s3c64xx/dev-audio.c | 20 +- + arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 + + arch/arm/plat-mxc/audmux-v2.c | 4 +- + arch/arm/plat-omap/include/plat/mcbsp.h | 7 + + arch/arm/plat-s3c24xx/devs.c | 34 +- + arch/arm/plat-samsung/include/plat/devs.h | 2 + + arch/mips/alchemy/devboards/db1200/platform.c | 6 + + arch/powerpc/boot/dts/mpc8610_hpcd.dts | 1 + + .../include/asm/{immap_86xx.h => fsl_guts.h} | 111 +- + drivers/input/misc/twl4030-vibra.c | 4 +- + drivers/mfd/twl-core.c | 6 +- + drivers/mfd/twl4030-codec.c | 8 +- + drivers/staging/xgifb/TODO | 2 +- + drivers/video/Kconfig | 1 + + drivers/video/sh_mobile_hdmi.c | 84 +- + include/linux/i2c/twl.h | 6 +- + include/sound/sh_fsi.h | 3 - + include/sound/soc-dai.h | 98 +- + include/sound/soc-dapm.h | 18 +- + include/sound/soc-of-simple.h | 25 - + include/sound/soc.h | 242 +- + include/sound/tlv320aic3x.h | 43 +- + include/sound/wm8962.h | 23 + + include/video/sh_mobile_hdmi.h | 16 + + sound/soc/atmel/atmel-pcm.c | 59 +- + sound/soc/atmel/atmel-pcm.h | 3 - + sound/soc/atmel/atmel_ssc_dai.c | 148 +- + sound/soc/atmel/atmel_ssc_dai.h | 3 +- + sound/soc/atmel/playpaq_wm8510.c | 65 +- + sound/soc/atmel/sam9g20_wm8731.c | 59 +- + sound/soc/atmel/snd-soc-afeb9260.c | 35 +- + sound/soc/au1x/db1200.c | 39 +- + sound/soc/au1x/dbdma2.c | 95 +- + sound/soc/au1x/psc-ac97.c | 71 +- + sound/soc/au1x/psc-i2s.c | 53 +- + sound/soc/au1x/psc.h | 10 +- + sound/soc/blackfin/bf5xx-ac97-pcm.c | 43 +- + sound/soc/blackfin/bf5xx-ac97-pcm.h | 3 - + sound/soc/blackfin/bf5xx-ac97.c | 41 +- + sound/soc/blackfin/bf5xx-ac97.h | 2 - + sound/soc/blackfin/bf5xx-ad1836.c | 23 +- + sound/soc/blackfin/bf5xx-ad193x.c | 23 +- + sound/soc/blackfin/bf5xx-ad1980.c | 19 +- + sound/soc/blackfin/bf5xx-ad73311.c | 22 +- + sound/soc/blackfin/bf5xx-i2s-pcm.c | 44 +- + sound/soc/blackfin/bf5xx-i2s-pcm.h | 3 - + sound/soc/blackfin/bf5xx-i2s.c | 45 +- + sound/soc/blackfin/bf5xx-i2s.h | 14 - + sound/soc/blackfin/bf5xx-ssm2602.c | 38 +- + sound/soc/blackfin/bf5xx-tdm-pcm.c | 43 +- + sound/soc/blackfin/bf5xx-tdm-pcm.h | 3 - + sound/soc/blackfin/bf5xx-tdm.c | 15 +- + sound/soc/blackfin/bf5xx-tdm.h | 2 - + sound/soc/codecs/88pm860x-codec.c | 1486 + + sound/soc/codecs/88pm860x-codec.h | 97 + + sound/soc/codecs/Kconfig | 16 + + sound/soc/codecs/Makefile | 8 + + sound/soc/codecs/ac97.c | 124 +- + sound/soc/codecs/ac97.h | 19 - + sound/soc/codecs/ad1836.c | 191 +- + sound/soc/codecs/ad1836.h | 2 - + sound/soc/codecs/ad193x.c | 217 +- + sound/soc/codecs/ad193x.h | 3 - + sound/soc/codecs/ad1980.c | 113 +- + sound/soc/codecs/ad1980.h | 3 - + sound/soc/codecs/ad73311.c | 66 +- + sound/soc/codecs/ad73311.h | 2 - + sound/soc/codecs/ads117x.c | 72 +- + sound/soc/codecs/ads117x.h | 4 +- + sound/soc/codecs/ak4104.c | 149 +- + sound/soc/codecs/ak4104.h | 7 - + sound/soc/codecs/ak4535.c | 236 +- + sound/soc/codecs/ak4535.h | 8 - + sound/soc/codecs/ak4642.c | 171 +- + sound/soc/codecs/ak4642.h | 20 - + sound/soc/codecs/ak4671.c | 140 +- + sound/soc/codecs/ak4671.h | 3 - + sound/soc/codecs/cq93vc.c | 132 +- + sound/soc/codecs/cq93vc.h | 29 - + sound/soc/codecs/cs4270.c | 394 +- + sound/soc/codecs/cs4270.h | 28 - + sound/soc/codecs/cs42l51.c | 295 +- + sound/soc/codecs/cs42l51.h | 2 - + sound/soc/codecs/cx20442.c | 173 +- + sound/soc/codecs/cx20442.h | 2 - + sound/soc/codecs/da7210.c | 163 +- + sound/soc/codecs/da7210.h | 24 - + sound/soc/codecs/jz4740.c | 116 +- + sound/soc/codecs/jz4740.h | 20 - + sound/soc/codecs/pcm3008.c | 92 +- + sound/soc/codecs/pcm3008.h | 3 - + sound/soc/codecs/spdif_transciever.c | 102 +- + sound/soc/codecs/spdif_transciever.h | 18 - + sound/soc/codecs/ssm2602.c | 218 +- + sound/soc/codecs/ssm2602.h | 3 - + sound/soc/codecs/stac9766.c | 118 +- + sound/soc/codecs/stac9766.h | 4 - + sound/soc/codecs/tlv320aic23.c | 182 +- + sound/soc/codecs/tlv320aic23.h | 3 - + sound/soc/codecs/tlv320aic26.c | 180 +- + sound/soc/codecs/tlv320aic26.h | 3 - + sound/soc/codecs/tlv320aic3x.c | 821 +- + sound/soc/codecs/tlv320aic3x.h | 100 +- + sound/soc/codecs/tlv320dac33.c | 248 +- + sound/soc/codecs/tlv320dac33.h | 3 - + sound/soc/codecs/twl4030.c | 228 +- + sound/soc/codecs/twl4030.h | 55 - + sound/soc/codecs/twl6040.c | 170 +- + sound/soc/codecs/twl6040.h | 3 - + sound/soc/codecs/uda134x.c | 154 +- + sound/soc/codecs/uda134x.h | 3 - + sound/soc/codecs/uda1380.c | 331 +- + sound/soc/codecs/uda1380.h | 3 - + sound/soc/codecs/wl1273.c | 525 + + sound/soc/codecs/wl1273.h | 101 + + sound/soc/codecs/wm2000.h | 3 - + sound/soc/codecs/wm8350.c | 231 +- + sound/soc/codecs/wm8350.h | 3 - + sound/soc/codecs/wm8400.c | 181 +- + sound/soc/codecs/wm8400.h | 3 - + sound/soc/codecs/wm8510.c | 289 +- + sound/soc/codecs/wm8510.h | 3 - + sound/soc/codecs/wm8523.c | 177 +- + sound/soc/codecs/wm8523.h | 3 - + sound/soc/codecs/wm8580.c | 325 +- + sound/soc/codecs/wm8580.h | 17 +- + sound/soc/codecs/wm8711.c | 202 +- + sound/soc/codecs/wm8711.h | 3 - + sound/soc/codecs/wm8727.c | 106 +- + sound/soc/codecs/wm8727.h | 21 - + sound/soc/codecs/wm8728.c | 290 +- + sound/soc/codecs/wm8728.h | 9 - + sound/soc/codecs/wm8731.c | 244 +- + sound/soc/codecs/wm8731.h | 7 +- + sound/soc/codecs/wm8741.c | 378 +- + sound/soc/codecs/wm8741.h | 3 - + sound/soc/codecs/wm8750.c | 265 +- + sound/soc/codecs/wm8750.h | 9 - + sound/soc/codecs/wm8753.c | 405 +- + sound/soc/codecs/wm8753.h | 3 - + sound/soc/codecs/wm8776.c | 247 +- + sound/soc/codecs/wm8776.h | 3 - + sound/soc/codecs/wm8900.c | 247 +- + sound/soc/codecs/wm8900.h | 3 - + sound/soc/codecs/wm8903.c | 265 +- + sound/soc/codecs/wm8903.h | 3 - + sound/soc/codecs/wm8904.c | 208 +- + sound/soc/codecs/wm8904.h | 3 - + sound/soc/codecs/wm8940.c | 199 +- + sound/soc/codecs/wm8940.h | 2 - + sound/soc/codecs/wm8955.c | 181 +- + sound/soc/codecs/wm8955.h | 3 - + sound/soc/codecs/wm8960.c | 209 +- + sound/soc/codecs/wm8960.h | 3 - + sound/soc/codecs/wm8961.c | 237 +- + sound/soc/codecs/wm8961.h | 3 - + sound/soc/codecs/wm8962-tables.c |42299 ++++++++++++++++++++ + sound/soc/codecs/wm8962.c | 1859 + + sound/soc/codecs/wm8962.h | 3787 ++ + sound/soc/codecs/wm8971.c | 247 +- + sound/soc/codecs/wm8971.h | 8 - + sound/soc/codecs/wm8974.c | 167 +- + sound/soc/codecs/wm8974.h | 3 - + sound/soc/codecs/wm8978.c | 190 +- + sound/soc/codecs/wm8978.h | 3 - + sound/soc/codecs/wm8985.c | 1195 + + sound/soc/codecs/wm8985.h | 1045 + + sound/soc/codecs/wm8988.c | 262 +- + sound/soc/codecs/wm8988.h | 3 - + sound/soc/codecs/wm8990.c | 223 +- + sound/soc/codecs/wm8990.h | 8 - + sound/soc/codecs/wm8993.c | 304 +- + sound/soc/codecs/wm8993.h | 3 - + sound/soc/codecs/wm8994.c | 266 +- + sound/soc/codecs/wm8994.h | 3 - + sound/soc/codecs/wm9081.c | 208 +- + sound/soc/codecs/wm9081.h | 3 - + sound/soc/codecs/wm9090.c | 183 +- + sound/soc/codecs/wm9090.h | 2 - + sound/soc/codecs/wm9705.c | 116 +- + sound/soc/codecs/wm9705.h | 3 - + sound/soc/codecs/wm9712.c | 124 +- + sound/soc/codecs/wm9712.h | 3 - + sound/soc/codecs/wm9713.c | 131 +- + sound/soc/codecs/wm9713.h | 3 - + sound/soc/davinci/davinci-evm.c | 109 +- + sound/soc/davinci/davinci-i2s.c | 44 +- + sound/soc/davinci/davinci-i2s.h | 2 - + sound/soc/davinci/davinci-mcasp.c | 32 +- + sound/soc/davinci/davinci-mcasp.h | 2 - + sound/soc/davinci/davinci-pcm.c | 45 +- + sound/soc/davinci/davinci-pcm.h | 3 - + sound/soc/davinci/davinci-sffsdr.c | 27 +- + sound/soc/davinci/davinci-vcif.c | 25 +- + sound/soc/davinci/davinci-vcif.h | 28 - + sound/soc/ep93xx/ep93xx-i2s.c | 34 +- + sound/soc/ep93xx/ep93xx-i2s.h | 18 - + sound/soc/ep93xx/ep93xx-pcm.c | 37 +- + sound/soc/ep93xx/ep93xx-pcm.h | 2 - + sound/soc/ep93xx/snappercl15.c | 24 +- + sound/soc/fsl/Kconfig | 27 +- + sound/soc/fsl/Makefile | 11 +- + sound/soc/fsl/efika-audio-fabric.c | 20 +- + sound/soc/fsl/fsl_dma.c | 458 +- + sound/soc/fsl/fsl_dma.h | 20 - + sound/soc/fsl/fsl_ssi.c | 298 +- + sound/soc/fsl/fsl_ssi.h | 26 - + sound/soc/fsl/mpc5200_dma.c | 66 +- + sound/soc/fsl/mpc5200_dma.h | 5 - + sound/soc/fsl/mpc5200_psc_ac97.c | 34 +- + sound/soc/fsl/mpc5200_psc_ac97.h | 2 - + sound/soc/fsl/mpc5200_psc_i2s.c | 19 +- + sound/soc/fsl/mpc8610_hpcd.c | 660 +- + sound/soc/fsl/p1022_ds.c | 591 + + sound/soc/fsl/pcm030-audio-fabric.c | 21 +- + sound/soc/fsl/soc-of-simple.c | 172 - + sound/soc/imx/Kconfig | 16 + + sound/soc/imx/Makefile | 10 +- + sound/soc/imx/eukrea-tlv320.c | 16 +- + sound/soc/imx/imx-pcm-dma-mx2.c | 43 +- + sound/soc/imx/imx-pcm-fiq.c | 68 +- + sound/soc/imx/imx-ssi.c | 148 +- + sound/soc/imx/imx-ssi.h | 7 +- + sound/soc/imx/phycore-ac97.c | 19 +- + sound/soc/imx/wm1133-ev1.c | 27 +- + sound/soc/jz4740/jz4740-i2s.c | 104 +- + sound/soc/jz4740/jz4740-i2s.h | 2 - + sound/soc/jz4740/jz4740-pcm.c | 18 +- + sound/soc/jz4740/jz4740-pcm.h | 2 - + sound/soc/jz4740/qi_lb60.c | 25 +- + sound/soc/kirkwood/kirkwood-dma.c | 69 +- + sound/soc/kirkwood/kirkwood-dma.h | 17 - + sound/soc/kirkwood/kirkwood-i2s.c | 55 +- + sound/soc/kirkwood/kirkwood-i2s.h | 17 - + sound/soc/kirkwood/kirkwood-openrd.c | 24 +- + sound/soc/nuc900/nuc900-ac97.c | 12 +- + sound/soc/nuc900/nuc900-audio.c | 16 +- + sound/soc/nuc900/nuc900-audio.h | 4 - + sound/soc/nuc900/nuc900-pcm.c | 38 +- + sound/soc/omap/am3517evm.c | 25 +- + sound/soc/omap/ams-delta.c | 98 +- + sound/soc/omap/igep0020.c | 22 +- + sound/soc/omap/mcpdm.c | 19 +- + sound/soc/omap/mcpdm.h | 2 + + sound/soc/omap/n810.c | 42 +- + sound/soc/omap/omap-mcbsp.c | 123 +- + sound/soc/omap/omap-mcbsp.h | 2 - + sound/soc/omap/omap-mcpdm.c | 71 +- + sound/soc/omap/omap-mcpdm.h | 29 - + sound/soc/omap/omap-pcm.c | 47 +- + sound/soc/omap/omap-pcm.h | 2 - + sound/soc/omap/omap2evm.c | 25 +- + sound/soc/omap/omap3beagle.c | 23 +- + sound/soc/omap/omap3evm.c | 30 +- + sound/soc/omap/omap3pandora.c | 36 +- + sound/soc/omap/osk5912.c | 24 +- + sound/soc/omap/overo.c | 22 +- + sound/soc/omap/rx51.c | 41 +- + sound/soc/omap/sdp3430.c | 56 +- + sound/soc/omap/sdp4430.c | 23 +- + sound/soc/omap/zoom2.c | 64 +- + sound/soc/pxa/Kconfig | 18 + + sound/soc/pxa/Makefile | 4 + + sound/soc/pxa/corgi.c | 28 +- + sound/soc/pxa/e740_wm9705.c | 29 +- + sound/soc/pxa/e750_wm9705.c | 26 +- + sound/soc/pxa/e800_wm9712.c | 26 +- + sound/soc/pxa/em-x270.c | 22 +- + sound/soc/pxa/imote2.c | 20 +- + sound/soc/pxa/magician.c | 35 +- + sound/soc/pxa/mioa701_wm9713.c | 33 +- + sound/soc/pxa/palm27x.c | 27 +- + sound/soc/pxa/poodle.c | 29 +- + sound/soc/pxa/pxa-ssp.c | 174 +- + sound/soc/pxa/pxa-ssp.h | 2 - + sound/soc/pxa/pxa2xx-ac97.c | 46 +- + sound/soc/pxa/pxa2xx-ac97.h | 2 - + sound/soc/pxa/pxa2xx-i2s.c | 91 +- + sound/soc/pxa/pxa2xx-i2s.h | 2 - + sound/soc/pxa/pxa2xx-pcm.c | 46 +- + sound/soc/pxa/pxa2xx-pcm.h | 19 - + sound/soc/pxa/raumfeld.c | 114 +- + sound/soc/pxa/saarb.c | 200 + + sound/soc/pxa/spitz.c | 26 +- + sound/soc/pxa/tavorevb3.c | 200 + + sound/soc/pxa/tosa.c | 27 +- + sound/soc/pxa/z2.c | 26 +- + sound/soc/pxa/zylonite.c | 40 +- + sound/soc/s3c24xx/Kconfig | 26 + + sound/soc/s3c24xx/Makefile | 6 + + sound/soc/s3c24xx/aquila_wm8994.c | 295 + + sound/soc/s3c24xx/goni_wm8994.c | 298 + + sound/soc/s3c24xx/jive_wm8750.c | 23 +- + sound/soc/s3c24xx/ln2440sbc_alc650.c | 17 +- + sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 58 +- + sound/soc/s3c24xx/neo1973_wm8753.c | 37 +- + sound/soc/s3c24xx/rx1950_uda1380.c | 333 + + sound/soc/s3c24xx/s3c-ac97.c | 22 +- + sound/soc/s3c24xx/s3c-ac97.h | 2 - + sound/soc/s3c24xx/s3c-dma.c | 46 +- + sound/soc/s3c24xx/s3c-dma.h | 1 - + sound/soc/s3c24xx/s3c-i2s-v2.c | 50 +- + sound/soc/s3c24xx/s3c-i2s-v2.h | 13 +- + sound/soc/s3c24xx/s3c-pcm.c | 54 +- + sound/soc/s3c24xx/s3c-pcm.h | 3 +- + sound/soc/s3c24xx/s3c2412-i2s.c | 54 +- + sound/soc/s3c24xx/s3c2412-i2s.h | 2 - + sound/soc/s3c24xx/s3c24xx-i2s.c | 40 +- + sound/soc/s3c24xx/s3c24xx-i2s.h | 2 - + sound/soc/s3c24xx/s3c24xx_simtec.c | 15 +- + sound/soc/s3c24xx/s3c24xx_simtec.h | 4 +- + sound/soc/s3c24xx/s3c24xx_simtec_hermes.c | 25 +- + sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c | 21 +- + sound/soc/s3c24xx/s3c24xx_uda134x.c | 21 +- + sound/soc/s3c24xx/s3c64xx-i2s-v4.c | 135 +- + sound/soc/s3c24xx/s3c64xx-i2s.c | 206 +- + sound/soc/s3c24xx/s3c64xx-i2s.h | 2 - + sound/soc/s3c24xx/smartq_wm8987.c | 15 +- + sound/soc/s3c24xx/smdk2443_wm9710.c | 17 +- + sound/soc/s3c24xx/smdk64xx_wm8580.c | 68 +- + sound/soc/s3c24xx/smdk_wm9713.c | 38 +- + sound/soc/s6000/s6000-i2s.c | 56 +- + sound/soc/s6000/s6000-i2s.h | 2 - + sound/soc/s6000/s6000-pcm.c | 100 +- + sound/soc/s6000/s6000-pcm.h | 2 - + sound/soc/s6000/s6105-ipcam.c | 31 +- + sound/soc/sh/Kconfig | 11 +- + sound/soc/sh/Makefile | 2 + + sound/soc/sh/dma-sh7760.c | 53 +- + sound/soc/sh/fsi-ak4642.c | 31 +- + sound/soc/sh/fsi-da7210.c | 24 +- + sound/soc/sh/fsi-hdmi.c | 60 + + sound/soc/sh/fsi.c | 47 +- + sound/soc/sh/hac.c | 46 +- + sound/soc/sh/migor.c | 29 +- + sound/soc/sh/sh7760-ac97.c | 25 +- + sound/soc/sh/siu.h | 5 +- + sound/soc/sh/siu_dai.c | 66 +- + sound/soc/sh/siu_pcm.c | 32 +- + sound/soc/sh/ssi.c | 55 +- + sound/soc/soc-cache.c | 42 +- + sound/soc/soc-core.c | 1773 +- + sound/soc/soc-dapm.c | 88 +- + sound/soc/soc-jack.c | 10 +- + sound/soc/txx9/txx9aclc-ac97.c | 55 +- + sound/soc/txx9/txx9aclc-generic.c | 24 +- + sound/soc/txx9/txx9aclc.c | 141 +- + sound/soc/txx9/txx9aclc.h | 13 +- + 364 files changed, 64390 insertions(+), 13980 deletions(-) + rename arch/powerpc/include/asm/{immap_86xx.h => fsl_guts.h} (66%) + delete mode 100644 include/sound/soc-of-simple.h + create mode 100644 include/sound/wm8962.h + delete mode 100644 sound/soc/blackfin/bf5xx-i2s.h + create mode 100644 sound/soc/codecs/88pm860x-codec.c + create mode 100644 sound/soc/codecs/88pm860x-codec.h + delete mode 100644 sound/soc/codecs/ac97.h + delete mode 100644 sound/soc/codecs/ak4104.h + delete mode 100644 sound/soc/codecs/ak4642.h + delete mode 100644 sound/soc/codecs/cq93vc.h + delete mode 100644 sound/soc/codecs/cs4270.h + delete mode 100644 sound/soc/codecs/da7210.h + delete mode 100644 sound/soc/codecs/jz4740.h + delete mode 100644 sound/soc/codecs/spdif_transciever.h + delete mode 100644 sound/soc/codecs/twl4030.h + create mode 100644 sound/soc/codecs/wl1273.c + create mode 100644 sound/soc/codecs/wl1273.h + delete mode 100644 sound/soc/codecs/wm8727.h + create mode 100644 sound/soc/codecs/wm8962-tables.c + create mode 100644 sound/soc/codecs/wm8962.c + create mode 100644 sound/soc/codecs/wm8962.h + create mode 100644 sound/soc/codecs/wm8985.c + create mode 100644 sound/soc/codecs/wm8985.h + delete mode 100644 sound/soc/davinci/davinci-vcif.h + delete mode 100644 sound/soc/ep93xx/ep93xx-i2s.h + create mode 100644 sound/soc/fsl/p1022_ds.c + delete mode 100644 sound/soc/fsl/soc-of-simple.c + delete mode 100644 sound/soc/kirkwood/kirkwood-dma.h + delete mode 100644 sound/soc/kirkwood/kirkwood-i2s.h + delete mode 100644 sound/soc/omap/omap-mcpdm.h + delete mode 100644 sound/soc/pxa/pxa2xx-pcm.h + create mode 100644 sound/soc/pxa/saarb.c + create mode 100644 sound/soc/pxa/tavorevb3.c + create mode 100644 sound/soc/s3c24xx/aquila_wm8994.c + create mode 100644 sound/soc/s3c24xx/goni_wm8994.c + create mode 100644 sound/soc/s3c24xx/rx1950_uda1380.c + create mode 100644 sound/soc/sh/fsi-hdmi.c +Merging sound/for-next +$ git merge sound/for-next +Removing sound/isa/sgalaxy.c +Auto-merging sound/soc/s3c24xx/s3c-dma.c +Merge made by recursive. + Documentation/sound/alsa/ALSA-Configuration.txt | 82 ++- + include/sound/jack.h | 5 +- + include/sound/pcm.h | 1 + + sound/core/init.c | 9 +- + sound/core/oss/mixer_oss.c | 22 +- + sound/core/pcm.c | 36 +- + sound/core/pcm_lib.c | 14 +- + sound/core/pcm_native.c | 6 +- + sound/drivers/Kconfig | 19 + + sound/drivers/Makefile | 2 + + sound/drivers/aloop.c | 1055 +++++++++++++++++++++++ + sound/drivers/virmidi.c | 2 +- + sound/i2c/other/ak4xxx-adda.c | 2 +- + sound/isa/Kconfig | 36 +- + sound/isa/Makefile | 4 +- + sound/isa/ad1816a/ad1816a.c | 2 +- + sound/isa/azt2320.c | 2 +- + sound/isa/galaxy/Makefile | 10 + + sound/isa/galaxy/azt1605.c | 91 ++ + sound/isa/galaxy/azt2316.c | 111 +++ + sound/isa/galaxy/galaxy.c | 652 ++++++++++++++ + sound/isa/gus/gusmax.c | 4 +- + sound/isa/sb/sb8.c | 2 +- + sound/isa/sgalaxy.c | 369 -------- + sound/oss/au1550_ac97.c | 48 +- + sound/oss/dmasound/dmasound_core.c | 41 +- + sound/oss/msnd_pinnacle.c | 15 +- + sound/oss/sh_dac_audio.c | 13 +- + sound/oss/soundcard.c | 41 +- + sound/oss/swarm_cs4297a.c | 20 +- + sound/oss/vwsnd.c | 30 +- + sound/pci/Kconfig | 17 +- + sound/pci/ca0106/ca0106_main.c | 34 +- + sound/pci/emu10k1/emumpu401.c | 2 +- + sound/pci/hda/hda_codec.c | 262 +++++-- + sound/pci/hda/hda_generic.c | 41 +- + sound/pci/hda/hda_intel.c | 21 +- + sound/pci/hda/hda_local.h | 26 +- + sound/pci/hda/patch_analog.c | 41 +- + sound/pci/hda/patch_ca0110.c | 8 +- + sound/pci/hda/patch_cirrus.c | 42 +- + sound/pci/hda/patch_conexant.c | 642 ++++++++++++++- + sound/pci/hda/patch_nvhdmi.c | 2 +- + sound/pci/hda/patch_realtek.c | 757 ++++++++++++----- + sound/pci/hda/patch_sigmatel.c | 315 ++++---- + sound/pci/hda/patch_via.c | 587 ++++---------- + sound/pci/ice1712/delta.c | 10 + + sound/pci/ice1712/delta.h | 4 +- + sound/pci/ice1712/pontis.c | 6 +- + sound/pci/ice1712/prodigy192.c | 2 +- + sound/pci/oxygen/xonar_wm87x6.c | 111 ++- + sound/pci/rme96.c | 8 +- + sound/pci/rme9652/hdsp.c | 8 +- + sound/ppc/snd_ps3.c | 2 +- + sound/ppc/tumbler.c | 2 +- + sound/soc/s3c24xx/s3c-dma.c | 3 +- + sound/synth/emux/emux_hwdep.c | 3 + + sound/usb/Kconfig | 2 + + sound/usb/caiaq/audio.c | 175 ++++- + sound/usb/caiaq/control.c | 208 +++++- + sound/usb/caiaq/device.c | 10 +- + sound/usb/caiaq/device.h | 6 +- + sound/usb/caiaq/input.c | 248 +++++- + sound/usb/card.c | 31 +- + sound/usb/endpoint.c | 2 - + sound/usb/helper.c | 17 +- + sound/usb/midi.c | 9 +- + sound/usb/mixer.c | 9 +- + sound/usb/pcm.c | 4 +- + sound/usb/proc.c | 2 +- + sound/usb/quirks-table.h | 161 ++++- + sound/usb/urb.c | 2 +- + 72 files changed, 4928 insertions(+), 1660 deletions(-) + create mode 100644 sound/drivers/aloop.c + create mode 100644 sound/isa/galaxy/Makefile + create mode 100644 sound/isa/galaxy/azt1605.c + create mode 100644 sound/isa/galaxy/azt2316.c + create mode 100644 sound/isa/galaxy/galaxy.c + delete mode 100644 sound/isa/sgalaxy.c +Merging cpufreq/next +$ git merge cpufreq/next +Merge made by recursive. + drivers/cpufreq/cpufreq.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging quilt/rr +$ git merge quilt/rr +Merge made by recursive. + drivers/block/virtio_blk.c | 17 +--- + drivers/char/virtio_console.c | 237 +++++++++++++++++++++++++++++++++------ + drivers/dma/pch_dma.c | 1 + + drivers/i2c/busses/scx200_acb.c | 3 +- + 4 files changed, 209 insertions(+), 49 deletions(-) +Merging input/next +$ git merge input/next +Auto-merging drivers/hid/hid-core.c +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-input.c +Auto-merging drivers/media/IR/ir-keytable.c +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/staging/Makefile +Removing drivers/staging/mrst-touchscreen/Kconfig +Removing drivers/staging/mrst-touchscreen/Makefile +Removing drivers/staging/mrst-touchscreen/TODO +Removing drivers/staging/mrst-touchscreen/intel-mid-touch.c +Auto-merging include/media/rc-map.h +Merge made by recursive. + arch/arm/plat-omap/include/plat/omap4-keypad.h | 16 + + drivers/char/keyboard.c | 31 +- + drivers/hid/hid-core.c | 5 + + drivers/hid/hid-ids.h | 4 + + drivers/hid/hid-input.c | 108 ++- + drivers/input/evdev.c | 100 ++- + drivers/input/input.c | 198 ++++-- + drivers/input/keyboard/Kconfig | 9 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/omap4-keypad.c | 287 +++++++ + drivers/input/misc/Kconfig | 10 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/ab8500-ponkey.c | 157 ++++ + drivers/input/misc/ati_remote2.c | 93 ++- + drivers/input/serio/serio.c | 1 - + drivers/input/sparse-keymap.c | 81 ++- + drivers/input/tablet/Kconfig | 11 + + drivers/input/tablet/Makefile | 1 + + drivers/input/tablet/hanwang.c | 394 +++++++++ + drivers/input/tablet/wacom.h | 1 + + drivers/input/tablet/wacom_sys.c | 68 ++- + drivers/input/tablet/wacom_wac.c | 213 +++++- + drivers/input/tablet/wacom_wac.h | 15 + + drivers/input/touchscreen/Kconfig | 22 + + drivers/input/touchscreen/Makefile | 2 + + drivers/input/touchscreen/cy8ctmg110_ts.c | 4 +- + drivers/input/touchscreen/intel-mid-touch.c | 687 ++++++++++++++++ + drivers/input/touchscreen/lpc32xx_ts.c | 411 ++++++++++ + drivers/input/touchscreen/s3c2410_ts.c | 2 +- + drivers/input/touchscreen/stmpe-ts.c | 11 +- + drivers/input/touchscreen/tps6507x-ts.c | 3 +- + drivers/input/touchscreen/tsc2007.c | 2 +- + drivers/input/touchscreen/wacom_w8001.c | 185 ++++- + drivers/input/touchscreen/wm97xx-core.c | 18 +- + drivers/media/IR/ir-keytable.c | 393 ++++++--- + drivers/mfd/ab8500-core.c | 20 + + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/mrst-touchscreen/Kconfig | 7 - + drivers/staging/mrst-touchscreen/Makefile | 3 - + drivers/staging/mrst-touchscreen/TODO | 2 - + drivers/staging/mrst-touchscreen/intel-mid-touch.c | 864 -------------------- + include/linux/gameport.h | 4 +- + include/linux/input.h | 57 +- + include/linux/serio.h | 5 +- + include/media/rc-map.h | 2 +- + 46 files changed, 3282 insertions(+), 1230 deletions(-) + create mode 100644 arch/arm/plat-omap/include/plat/omap4-keypad.h + create mode 100644 drivers/input/keyboard/omap4-keypad.c + create mode 100644 drivers/input/misc/ab8500-ponkey.c + create mode 100644 drivers/input/tablet/hanwang.c + create mode 100644 drivers/input/touchscreen/intel-mid-touch.c + create mode 100644 drivers/input/touchscreen/lpc32xx_ts.c + delete mode 100644 drivers/staging/mrst-touchscreen/Kconfig + delete mode 100644 drivers/staging/mrst-touchscreen/Makefile + delete mode 100644 drivers/staging/mrst-touchscreen/TODO + delete mode 100644 drivers/staging/mrst-touchscreen/intel-mid-touch.c +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Removing Documentation/block/barrier.txt +Removing block/blk-barrier.c +Auto-merging drivers/block/virtio_blk.c +Auto-merging drivers/s390/scsi/zfcp_scsi.c +Auto-merging drivers/scsi/sd.c +Auto-merging fs/ext4/mballoc.c +Auto-merging fs/gfs2/log.c +Auto-merging fs/gfs2/rgrp.c +Auto-merging fs/jbd2/commit.c +Auto-merging fs/nilfs2/super.c +Auto-merging fs/nilfs2/the_nilfs.c +Auto-merging include/linux/fs.h +Merge made by recursive. + Documentation/block/00-INDEX | 4 +- + Documentation/block/barrier.txt | 261 ------ + Documentation/block/writeback_cache_control.txt | 86 ++ + Documentation/cgroups/blkio-controller.txt | 106 +++- + Documentation/lguest/lguest.c | 29 +- + block/Kconfig | 12 + + block/Makefile | 3 +- + block/blk-barrier.c | 350 -------- + block/blk-cgroup.c | 786 ++++++++++++++---- + block/blk-cgroup.h | 79 ++- + block/blk-core.c | 101 ++- + block/blk-flush.c | 262 ++++++ + block/blk-integrity.c | 93 ++- + block/blk-lib.c | 39 +- + block/blk-map.c | 5 +- + block/blk-merge.c | 23 +- + block/blk-settings.c | 28 +- + block/blk-sysfs.c | 11 + + block/blk-throttle.c | 999 +++++++++++++++++++++++ + block/blk.h | 16 +- + block/cfq-iosched.c | 1 + + block/cfq.h | 2 +- + block/elevator.c | 79 +-- + block/genhd.c | 16 +- + block/ioctl.c | 6 +- + drivers/block/brd.c | 1 - + drivers/block/cciss.c | 860 ++++++++++---------- + drivers/block/drbd/drbd_int.h | 3 +- + drivers/block/drbd/drbd_receiver.c | 3 +- + drivers/block/loop.c | 121 +++- + drivers/block/osdblk.c | 5 +- + drivers/block/pktcdvd.c | 1 - + drivers/block/ps3disk.c | 2 +- + drivers/block/virtio_blk.c | 37 +- + drivers/block/xen-blkfront.c | 47 +- + drivers/ide/ide-disk.c | 13 +- + drivers/ide/ide-io.c | 13 - + drivers/md/dm-crypt.c | 2 +- + drivers/md/dm-io.c | 20 +- + drivers/md/dm-log.c | 2 +- + drivers/md/dm-raid1.c | 8 +- + drivers/md/dm-region-hash.c | 16 +- + drivers/md/dm-snap-persistent.c | 2 +- + drivers/md/dm-snap.c | 8 +- + drivers/md/dm-stripe.c | 2 +- + drivers/md/dm-table.c | 5 - + drivers/md/dm.c | 398 ++------- + drivers/md/linear.c | 4 +- + drivers/md/md.c | 117 +--- + drivers/md/md.h | 23 +- + drivers/md/multipath.c | 4 +- + drivers/md/raid0.c | 4 +- + drivers/md/raid1.c | 176 ++--- + drivers/md/raid1.h | 2 - + drivers/md/raid10.c | 7 +- + drivers/md/raid5.c | 43 +- + drivers/md/raid5.h | 1 + + drivers/mmc/card/queue.c | 1 - + drivers/s390/block/dasd.c | 1 - + drivers/s390/scsi/zfcp_scsi.c | 1 + + drivers/scsi/aic7xxx_old.c | 22 +- + drivers/scsi/hosts.c | 1 + + drivers/scsi/libsas/sas_scsi_host.c | 13 +- + drivers/scsi/scsi_lib.c | 26 +- + drivers/scsi/scsi_sysfs.c | 2 + + drivers/scsi/sd.c | 18 +- + drivers/scsi/sg.c | 2 +- + fs/block_dev.c | 2 +- + fs/btrfs/disk-io.c | 19 +- + fs/btrfs/extent-tree.c | 3 +- + fs/btrfs/volumes.c | 4 - + fs/btrfs/volumes.h | 1 - + fs/buffer.c | 7 +- + fs/ext3/fsync.c | 3 +- + fs/ext4/fsync.c | 5 +- + fs/ext4/mballoc.c | 2 +- + fs/fat/fatent.c | 3 +- + fs/fat/misc.c | 5 +- + fs/gfs2/log.c | 19 +- + fs/gfs2/rgrp.c | 6 +- + fs/jbd/commit.c | 30 +- + fs/jbd2/checkpoint.c | 3 +- + fs/jbd2/commit.c | 74 +-- + fs/nilfs2/super.c | 10 +- + fs/nilfs2/the_nilfs.c | 7 +- + fs/partitions/check.c | 23 +- + fs/partitions/check.h | 3 + + fs/partitions/efi.c | 25 + + fs/reiserfs/file.c | 3 +- + fs/reiserfs/journal.c | 106 +-- + fs/xfs/linux-2.6/xfs_buf.c | 16 +- + fs/xfs/linux-2.6/xfs_buf.h | 11 +- + fs/xfs/linux-2.6/xfs_super.c | 3 +- + fs/xfs/linux-2.6/xfs_trace.h | 1 - + fs/xfs/xfs_log.c | 13 - + include/linux/bio.h | 4 + + include/linux/blk_types.h | 8 +- + include/linux/blkdev.h | 160 ++-- + include/linux/buffer_head.h | 2 - + include/linux/fs.h | 28 +- + include/linux/genhd.h | 53 ++- + include/linux/kernel.h | 10 + + include/scsi/scsi.h | 6 + + include/scsi/scsi_host.h | 7 + + include/scsi/scsi_tcq.h | 6 +- + init/Kconfig | 9 +- + init/do_mounts.c | 66 ++ + mm/swapfile.c | 6 +- + 108 files changed, 3603 insertions(+), 2603 deletions(-) + delete mode 100644 Documentation/block/barrier.txt + create mode 100644 Documentation/block/writeback_cache_control.txt + delete mode 100644 block/blk-barrier.c + create mode 100644 block/blk-flush.c + create mode 100644 block/blk-throttle.c +$ git reset --hard HEAD^ +HEAD is now at 670ede4 Merge remote branch 'input/next' +Merging refs/next/20100916/block +$ git merge refs/next/20100916/block +Resolved 'block/blk-core.c' using previous resolution. +Resolved 'drivers/block/loop.c' using previous resolution. +Removing Documentation/block/barrier.txt +Auto-merging Documentation/lguest/lguest.c +Removing block/blk-barrier.c +Auto-merging block/blk-core.c +CONFLICT (content): Merge conflict in block/blk-core.c +Auto-merging block/blk-sysfs.c +Auto-merging block/blk.h +Auto-merging block/elevator.c +Auto-merging drivers/block/cciss.c +Auto-merging drivers/block/loop.c +CONFLICT (content): Merge conflict in drivers/block/loop.c +Auto-merging drivers/block/virtio_blk.c +Auto-merging drivers/block/xen-blkfront.c +Auto-merging drivers/md/md.c +Auto-merging drivers/md/md.h +Auto-merging drivers/s390/scsi/zfcp_scsi.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/sd.c +Auto-merging fs/ext4/mballoc.c +Auto-merging fs/gfs2/log.c +Auto-merging fs/gfs2/rgrp.c +Auto-merging fs/jbd2/commit.c +Auto-merging fs/nilfs2/super.c +Auto-merging fs/nilfs2/the_nilfs.c +Auto-merging fs/xfs/linux-2.6/xfs_buf.c +Auto-merging fs/xfs/linux-2.6/xfs_buf.h +Auto-merging fs/xfs/xfs_log.c +Auto-merging include/linux/fs.h +Auto-merging mm/swapfile.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4cb14c8] Merge commit 'refs/next/20100916/block' +$ git diff -M --stat --summary HEAD^.. + Documentation/block/00-INDEX | 4 +- + Documentation/block/barrier.txt | 261 ------- + Documentation/block/writeback_cache_control.txt | 86 +++ + Documentation/lguest/lguest.c | 29 +- + block/Makefile | 2 +- + block/blk-barrier.c | 350 --------- + block/blk-core.c | 77 ++- + block/blk-flush.c | 265 +++++++ + block/blk-integrity.c | 93 ++- + block/blk-lib.c | 18 +- + block/blk-map.c | 5 +- + block/blk-merge.c | 23 +- + block/blk-settings.c | 28 +- + block/blk-sysfs.c | 11 + + block/blk.h | 16 +- + block/elevator.c | 79 +-- + block/genhd.c | 10 +- + block/ioctl.c | 2 +- + drivers/block/brd.c | 1 - + drivers/block/cciss.c | 860 +++++++++++------------ + drivers/block/drbd/drbd_receiver.c | 1 - + drivers/block/loop.c | 121 +++- + drivers/block/osdblk.c | 5 +- + drivers/block/pktcdvd.c | 1 - + drivers/block/ps3disk.c | 2 +- + drivers/block/virtio_blk.c | 37 +- + drivers/block/xen-blkfront.c | 47 +- + drivers/ide/ide-disk.c | 13 +- + drivers/ide/ide-io.c | 13 - + drivers/md/dm-crypt.c | 2 +- + drivers/md/dm-io.c | 20 +- + drivers/md/dm-log.c | 2 +- + drivers/md/dm-raid1.c | 8 +- + drivers/md/dm-region-hash.c | 16 +- + drivers/md/dm-snap-persistent.c | 2 +- + drivers/md/dm-snap.c | 8 +- + drivers/md/dm-stripe.c | 2 +- + drivers/md/dm-table.c | 5 - + drivers/md/dm.c | 398 +++--------- + drivers/md/linear.c | 4 +- + drivers/md/md.c | 117 +--- + drivers/md/md.h | 23 +- + drivers/md/multipath.c | 4 +- + drivers/md/raid0.c | 4 +- + drivers/md/raid1.c | 176 ++--- + drivers/md/raid1.h | 2 - + drivers/md/raid10.c | 7 +- + drivers/md/raid5.c | 43 +- + drivers/md/raid5.h | 1 + + drivers/mmc/card/queue.c | 1 - + drivers/s390/block/dasd.c | 1 - + drivers/s390/scsi/zfcp_scsi.c | 1 + + drivers/scsi/aic7xxx_old.c | 21 +- + drivers/scsi/hosts.c | 1 + + drivers/scsi/libsas/sas_scsi_host.c | 13 +- + drivers/scsi/scsi_lib.c | 26 +- + drivers/scsi/scsi_sysfs.c | 2 + + drivers/scsi/sd.c | 18 +- + fs/btrfs/disk-io.c | 19 +- + fs/btrfs/extent-tree.c | 2 +- + fs/btrfs/volumes.c | 4 - + fs/btrfs/volumes.h | 1 - + fs/buffer.c | 7 +- + fs/ext4/mballoc.c | 3 +- + fs/fat/fatent.c | 4 +- + fs/fat/misc.c | 5 +- + fs/gfs2/log.c | 19 +- + fs/gfs2/rgrp.c | 5 +- + fs/jbd/commit.c | 30 +- + fs/jbd2/commit.c | 72 +-- + fs/nilfs2/super.c | 10 +- + fs/nilfs2/the_nilfs.c | 7 +- + fs/partitions/check.c | 23 +- + fs/partitions/check.h | 3 + + fs/partitions/efi.c | 25 + + fs/reiserfs/journal.c | 106 +--- + fs/xfs/linux-2.6/xfs_buf.c | 16 +- + fs/xfs/linux-2.6/xfs_buf.h | 11 +- + fs/xfs/linux-2.6/xfs_trace.h | 1 - + fs/xfs/xfs_log.c | 13 - + include/linux/bio.h | 4 + + include/linux/blk_types.h | 5 +- + include/linux/blkdev.h | 122 ++-- + include/linux/buffer_head.h | 2 - + include/linux/fs.h | 28 +- + include/linux/genhd.h | 53 ++- + include/linux/kernel.h | 10 + + include/scsi/scsi.h | 6 + + include/scsi/scsi_host.h | 7 + + include/scsi/scsi_tcq.h | 6 +- + init/do_mounts.c | 66 ++ + 91 files changed, 1695 insertions(+), 2388 deletions(-) + delete mode 100644 Documentation/block/barrier.txt + create mode 100644 Documentation/block/writeback_cache_control.txt + delete mode 100644 block/blk-barrier.c + create mode 100644 block/blk-flush.c +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 +Resolved 'drivers/net/pcmcia/smc91c92_cs.c' using previous resolution. +Auto-merging drivers/net/pcmcia/3c574_cs.c +Auto-merging drivers/net/pcmcia/3c589_cs.c +Auto-merging drivers/net/pcmcia/axnet_cs.c +Auto-merging drivers/net/pcmcia/com20020_cs.c +Auto-merging drivers/net/pcmcia/fmvj18x_cs.c +Auto-merging drivers/net/pcmcia/ibmtr_cs.c +Auto-merging drivers/net/pcmcia/nmclan_cs.c +Auto-merging drivers/net/pcmcia/pcnet_cs.c +Auto-merging drivers/net/pcmcia/smc91c92_cs.c +CONFLICT (content): Merge conflict in drivers/net/pcmcia/smc91c92_cs.c +Auto-merging drivers/net/pcmcia/xirc2ps_cs.c +Auto-merging drivers/net/wireless/libertas/if_cs.c +Auto-merging drivers/net/wireless/ray_cs.c +Auto-merging drivers/net/wireless/wl3501_cs.c +Removing include/pcmcia/cs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3133439] Merge remote branch 'pcmcia/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/pcmcia/driver-changes.txt | 25 ++ + drivers/ata/pata_pcmcia.c | 104 ++----- + drivers/bluetooth/bluecard_cs.c | 12 +- + drivers/bluetooth/bt3c_cs.c | 64 ++-- + drivers/bluetooth/btuart_cs.c | 62 ++-- + drivers/bluetooth/dtl1_cs.c | 27 +- + drivers/char/pcmcia/cm4000_cs.c | 31 +-- + drivers/char/pcmcia/cm4040_cs.c | 40 +-- + drivers/char/pcmcia/ipwireless/main.c | 117 +++----- + drivers/char/pcmcia/ipwireless/main.h | 5 - + drivers/char/pcmcia/ipwireless/tty.h | 1 - + drivers/char/pcmcia/synclink_cs.c | 44 +-- + drivers/ide/ide-cs.c | 156 ++------- + drivers/isdn/hardware/avm/avm_cs.c | 83 +----- + drivers/isdn/hisax/avma1_cs.c | 97 +----- + drivers/isdn/hisax/elsa_cs.c | 100 +----- + drivers/isdn/hisax/sedlbauer_cs.c | 168 +--------- + drivers/isdn/hisax/teles_cs.c | 98 +----- + drivers/mmc/host/sdricoh_cs.c | 5 +- + drivers/mtd/maps/pcmciamtd.c | 102 ++---- + drivers/net/pcmcia/3c574_cs.c | 35 +-- + drivers/net/pcmcia/3c589_cs.c | 47 +--- + drivers/net/pcmcia/axnet_cs.c | 87 +---- + drivers/net/pcmcia/com20020_cs.c | 43 +--- + drivers/net/pcmcia/fmvj18x_cs.c | 67 ++--- + drivers/net/pcmcia/ibmtr_cs.c | 89 ++---- + drivers/net/pcmcia/nmclan_cs.c | 42 +-- + drivers/net/pcmcia/pcnet_cs.c | 146 +++------ + drivers/net/pcmcia/smc91c92_cs.c | 114 ++----- + drivers/net/pcmcia/xirc2ps_cs.c | 161 +++------ + drivers/net/wireless/airo_cs.c | 154 +-------- + drivers/net/wireless/atmel_cs.c | 135 +------- + drivers/net/wireless/b43/pcmcia.c | 24 +- + drivers/net/wireless/hostap/hostap_cs.c | 102 +------ + drivers/net/wireless/libertas/if_cs.c | 57 +--- + drivers/net/wireless/orinoco/orinoco_cs.c | 137 +------- + drivers/net/wireless/orinoco/spectrum_cs.c | 134 +------- + drivers/net/wireless/ray_cs.c | 91 ++---- + drivers/net/wireless/ray_cs.h | 2 - + drivers/net/wireless/wl3501_cs.c | 47 +--- + drivers/parport/parport_cs.c | 76 +---- + drivers/pcmcia/au1000_generic.h | 1 - + drivers/pcmcia/au1000_pb1x00.c | 1 - + drivers/pcmcia/cistpl.c | 1 - + drivers/pcmcia/cs.c | 1 - + drivers/pcmcia/cs_internal.h | 9 - + drivers/pcmcia/ds.c | 37 ++- + drivers/pcmcia/i82092.c | 1 - + drivers/pcmcia/i82365.c | 1 - + drivers/pcmcia/m32r_cfc.c | 1 - + drivers/pcmcia/m32r_pcc.c | 1 - + drivers/pcmcia/m8xx_pcmcia.c | 1 - + drivers/pcmcia/pcmcia_cis.c | 117 ++++++- + drivers/pcmcia/pcmcia_resource.c | 381 +++++++++++++--------- + drivers/pcmcia/pd6729.c | 1 - + drivers/pcmcia/rsrc_iodyn.c | 1 - + drivers/pcmcia/rsrc_mgr.c | 1 - + drivers/pcmcia/rsrc_nonstatic.c | 1 - + drivers/pcmcia/sa1100_generic.c | 1 - + drivers/pcmcia/soc_common.h | 1 - + drivers/pcmcia/socket_sysfs.c | 1 - + drivers/pcmcia/tcic.c | 1 - + drivers/pcmcia/xxs1500_ss.c | 1 - + drivers/pcmcia/yenta_socket.c | 1 - + drivers/scsi/pcmcia/aha152x_stub.c | 48 +-- + drivers/scsi/pcmcia/fdomain_stub.c | 24 +- + drivers/scsi/pcmcia/nsp_cs.c | 178 ++--------- + drivers/scsi/pcmcia/qlogic_stub.c | 24 +- + drivers/scsi/pcmcia/sym53c500_cs.c | 22 +- + drivers/serial/serial_cs.c | 200 +++++------- + drivers/ssb/main.c | 1 - + drivers/ssb/pcmcia.c | 1 - + drivers/ssb/scan.c | 1 - + drivers/staging/comedi/drivers/cb_das16_cs.c | 58 +--- + drivers/staging/comedi/drivers/das08_cs.c | 129 +------- + drivers/staging/comedi/drivers/ni_daq_700.c | 130 +------- + drivers/staging/comedi/drivers/ni_daq_dio24.c | 130 +------- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 144 +-------- + drivers/staging/comedi/drivers/ni_mio_cs.c | 23 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 124 +------- + drivers/staging/wlags49_h2/wl_cs.c | 77 +---- + drivers/staging/wlags49_h2/wl_internal.h | 1 - + drivers/staging/wlags49_h2/wl_main.c | 19 - + drivers/telephony/ixj_pcmcia.c | 41 +-- + drivers/usb/host/sl811_cs.c | 68 +---- + include/pcmcia/cs.h | 95 ------ + include/pcmcia/ds.h | 85 ++++-- + include/pcmcia/ss.h | 1 - + sound/pcmcia/pdaudiocf/pdaudiocf.c | 16 +- + sound/pcmcia/pdaudiocf/pdaudiocf.h | 1 - + sound/pcmcia/vx/vxpocket.c | 15 +- + sound/pcmcia/vx/vxpocket.h | 1 - + 92 files changed, 1253 insertions(+), 4098 deletions(-) + delete mode 100644 include/pcmcia/cs.h +Merging battery/master +$ git merge battery/master +Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c +Merge made by recursive. + arch/arm/mach-omap2/board-rx51-peripherals.c | 5 + + drivers/power/Kconfig | 14 + + drivers/power/Makefile | 2 + + drivers/power/bq20z75.c | 385 ++++++++++++++++++++++++++ + drivers/power/isp1704_charger.c | 369 ++++++++++++++++++++++++ + drivers/power/wm831x_power.c | 1 - + 6 files changed, 775 insertions(+), 1 deletions(-) + create mode 100644 drivers/power/bq20z75.c + create mode 100644 drivers/power/isp1704_charger.c +Merging leds/for-mm +$ git merge leds/for-mm +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/leds/leds-gpio.c +Merge made by recursive. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging mmc/mmc-next +$ git merge mmc/mmc-next +Auto-merging MAINTAINERS +Auto-merging drivers/mmc/card/queue.c +Auto-merging drivers/mmc/host/mmci.c +Merge made by recursive. + MAINTAINERS | 8 +- + drivers/mmc/card/block.c | 3 +- + drivers/mmc/card/mmc_test.c | 183 ++++++++++---- + drivers/mmc/card/queue.c | 10 +- + drivers/mmc/core/host.c | 3 +- + drivers/mmc/host/Kconfig | 27 ++ + drivers/mmc/host/Makefile | 2 + + drivers/mmc/host/at91_mci.c | 11 +- + drivers/mmc/host/atmel-mci.c | 5 +- + drivers/mmc/host/au1xmmc.c | 4 +- + drivers/mmc/host/bfin_sdh.c | 2 +- + drivers/mmc/host/davinci_mmc.c | 8 +- + drivers/mmc/host/imxmmc.c | 3 +- + drivers/mmc/host/jz4740_mmc.c | 3 +- + drivers/mmc/host/mmc_spi.c | 3 +- + drivers/mmc/host/mmci.c | 3 +- + drivers/mmc/host/msm_sdcc.c | 3 +- + drivers/mmc/host/mvsdio.c | 3 +- + drivers/mmc/host/mxcmmc.c | 3 +- + drivers/mmc/host/omap.c | 3 +- + drivers/mmc/host/omap_hsmmc.c | 10 +- + drivers/mmc/host/pxamci.c | 2 +- + drivers/mmc/host/s3cmci.c | 3 +- + drivers/mmc/host/sdhci-mv.c | 242 +++++++++++++++++ + drivers/mmc/host/sdhci.c | 43 +++- + drivers/mmc/host/sdhci.h | 6 + + drivers/mmc/host/sh_mmcif.c | 3 +- + drivers/mmc/host/tifm_sd.c | 3 +- + drivers/mmc/host/ushc.c | 566 ++++++++++++++++++++++++++++++++++++++++ + drivers/mmc/host/via-sdmmc.c | 3 +- + drivers/mmc/host/wbsd.c | 3 +- + include/linux/mmc/host.h | 3 +- + 32 files changed, 1059 insertions(+), 118 deletions(-) + create mode 100644 drivers/mmc/host/sdhci-mv.c + create mode 100644 drivers/mmc/host/ushc.c +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merging drivers/char/keyboard.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/radeon/atombios_crtc.c +Auto-merging drivers/gpu/drm/radeon/radeon_display.c +Auto-merging drivers/gpu/drm/radeon/radeon_fb.c +Auto-merging drivers/gpu/drm/radeon/radeon_legacy_crtc.c +Auto-merging drivers/gpu/drm/radeon/radeon_mode.h +Merge made by recursive. + drivers/char/keyboard.c | 37 ++++++++ + drivers/gpu/drm/drm_fb_helper.c | 5 +- + drivers/gpu/drm/i915/intel_display.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 6 ++ + drivers/gpu/drm/nouveau/nv04_crtc.c | 46 +++++++++-- + drivers/gpu/drm/nouveau/nv50_crtc.c | 49 ++++++++--- + drivers/gpu/drm/radeon/atombios_crtc.c | 119 +++++++++++++++++++-------- + drivers/gpu/drm/radeon/radeon_display.c | 32 +++++++ + drivers/gpu/drm/radeon/radeon_fb.c | 2 + + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 50 +++++++++--- + drivers/gpu/drm/radeon/radeon_mode.h | 13 +++- + drivers/serial/kgdboc.c | 13 +++ + include/drm/drm_crtc_helper.h | 3 +- + include/linux/kbd_kern.h | 1 + + 14 files changed, 306 insertions(+), 72 deletions(-) +$ git am -3 ../patches/0001-kgdb-merge-fix-for-mode_set_base_atomic-API-change.patch +Applying: kgdb: merge fix for mode_set_base_atomic API change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/i915/intel_display.c +$ git add . +$ git commit -v -a --amend +[master ca3e14b] Merge remote branch 'kgdb/kgdb-next' +Merging slab/for-next +$ git merge slab/for-next +Merge made by recursive. + include/linux/slub_def.h | 7 +- + mm/slob.c | 4 +- + mm/slub.c | 443 +++++++++++++++++++++++++++------------------- + 3 files changed, 267 insertions(+), 187 deletions(-) +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Auto-merging drivers/md/md.c +Merge made by recursive. + drivers/md/md.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) +Merging mfd/for-next +$ git merge mfd/for-next +Recorded preimage for 'drivers/mfd/sh_mobile_sdhi.c' +Auto-merging arch/arm/mach-shmobile/board-ap4evb.c +Auto-merging drivers/mfd/ab8500-core.c +Auto-merging drivers/mfd/sh_mobile_sdhi.c +CONFLICT (content): Merge conflict in drivers/mfd/sh_mobile_sdhi.c +Auto-merging drivers/mfd/twl-core.c +Auto-merging drivers/mmc/host/sh_mmcif.c +Auto-merging drivers/regulator/ab8500.c +Auto-merging drivers/regulator/max8998.c +Auto-merging drivers/usb/otg/twl4030-usb.c +Auto-merging include/linux/i2c/twl.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/mfd/sh_mobile_sdhi.c'. +[master 9295004] Merge remote branch 'mfd/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-shmobile/board-ap4evb.c | 19 + + drivers/gpio/stmpe-gpio.c | 7 +- + drivers/gpio/wm8994-gpio.c | 1 + + drivers/mfd/88pm860x-core.c | 51 +++- + drivers/mfd/Kconfig | 45 ++- + drivers/mfd/Makefile | 4 +- + drivers/mfd/ab3100-core.c | 143 ++++---- + drivers/mfd/ab8500-core.c | 299 +++++++++------ + drivers/mfd/ab8500-debugfs.c | 652 +++++++++++++++++++++++++++++++++ + drivers/mfd/ab8500-i2c.c | 105 ++++++ + drivers/mfd/ab8500-spi.c | 2 +- + drivers/mfd/da903x.c | 8 +- + drivers/mfd/ezx-pcap.c | 10 +- + drivers/mfd/htc-pasic3.c | 7 - + drivers/mfd/max8925-core.c | 13 +- + drivers/mfd/max8998-irq.c | 255 +++++++++++++ + drivers/mfd/max8998.c | 83 ++++- + drivers/mfd/pcf50633-core.c | 7 - + drivers/mfd/sh_mobile_sdhi.c | 19 + + drivers/mfd/tps6586x.c | 221 +++++++++++- + drivers/mfd/twl-core.c | 21 +- + drivers/mfd/twl4030-power.c | 30 +- + drivers/mfd/wm831x-irq.c | 9 +- + drivers/misc/Kconfig | 9 + + drivers/misc/Makefile | 1 + + drivers/misc/ab8500-pwm.c | 168 +++++++++ + drivers/mmc/host/sh_mmcif.c | 12 + + drivers/mmc/host/tmio_mmc.c | 30 ++- + drivers/regulator/ab8500.c | 86 +++-- + drivers/regulator/max8998.c | 17 +- + drivers/rtc/Kconfig | 10 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-ab8500.c | 103 +++--- + drivers/rtc/rtc-max8998.c | 300 +++++++++++++++ + drivers/usb/otg/twl4030-usb.c | 13 +- + include/linux/i2c/twl.h | 46 +++ + include/linux/mfd/88pm860x.h | 2 +- + include/linux/mfd/ab8500.h | 28 ++- + include/linux/mfd/abx500.h | 3 +- + include/linux/mfd/max8998-private.h | 106 ++++-- + include/linux/mfd/max8998.h | 11 +- + include/linux/mfd/pcf50633/core.h | 7 + + include/linux/mfd/sh_mobile_sdhi.h | 2 + + include/linux/mfd/stmpe.h | 6 + + include/linux/mfd/tmio.h | 6 + + include/linux/mfd/tps6586x.h | 31 ++ + include/linux/mmc/sh_mmcif.h | 1 + + 47 files changed, 2599 insertions(+), 411 deletions(-) + create mode 100644 drivers/mfd/ab8500-debugfs.c + create mode 100644 drivers/mfd/ab8500-i2c.c + create mode 100644 drivers/mfd/max8998-irq.c + create mode 100644 drivers/misc/ab8500-pwm.c + create mode 100644 drivers/rtc/rtc-max8998.c +$ git reset --hard HEAD^ +HEAD is now at edfa25a Merge remote branch 'md/for-next' +Merging refs/next/20100915/mfd +$ git merge refs/next/20100915/mfd +Resolved 'drivers/mfd/sh_mobile_sdhi.c' using previous resolution. +Auto-merging arch/arm/mach-shmobile/board-ap4evb.c +Auto-merging drivers/mfd/ab8500-core.c +Auto-merging drivers/mfd/sh_mobile_sdhi.c +CONFLICT (content): Merge conflict in drivers/mfd/sh_mobile_sdhi.c +Auto-merging drivers/mfd/twl-core.c +Auto-merging drivers/mmc/host/sh_mmcif.c +Auto-merging drivers/regulator/ab8500.c +Auto-merging drivers/regulator/max8998.c +Auto-merging drivers/usb/otg/twl4030-usb.c +Auto-merging include/linux/i2c/twl.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master cb61281] Merge commit 'refs/next/20100915/mfd' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-shmobile/board-ap4evb.c | 19 + + drivers/gpio/stmpe-gpio.c | 7 +- + drivers/gpio/wm8994-gpio.c | 1 + + drivers/mfd/88pm860x-core.c | 51 +++- + drivers/mfd/Kconfig | 41 ++- + drivers/mfd/Makefile | 4 +- + drivers/mfd/ab3100-core.c | 143 ++++---- + drivers/mfd/ab8500-core.c | 299 +++++++++------ + drivers/mfd/ab8500-debugfs.c | 652 +++++++++++++++++++++++++++++++++ + drivers/mfd/ab8500-i2c.c | 105 ++++++ + drivers/mfd/ab8500-spi.c | 2 +- + drivers/mfd/da903x.c | 8 +- + drivers/mfd/ezx-pcap.c | 10 +- + drivers/mfd/htc-pasic3.c | 7 - + drivers/mfd/max8925-core.c | 13 +- + drivers/mfd/max8998-irq.c | 255 +++++++++++++ + drivers/mfd/max8998.c | 83 ++++- + drivers/mfd/pcf50633-core.c | 7 - + drivers/mfd/sh_mobile_sdhi.c | 19 + + drivers/mfd/tps6586x.c | 21 +- + drivers/mfd/twl-core.c | 21 +- + drivers/mfd/twl4030-power.c | 30 +- + drivers/mfd/wm831x-irq.c | 9 +- + drivers/misc/Kconfig | 9 + + drivers/misc/Makefile | 1 + + drivers/misc/ab8500-pwm.c | 168 +++++++++ + drivers/mmc/host/sh_mmcif.c | 12 + + drivers/mmc/host/tmio_mmc.c | 30 ++- + drivers/regulator/ab8500.c | 86 +++-- + drivers/regulator/max8998.c | 17 +- + drivers/rtc/Kconfig | 10 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-ab8500.c | 103 +++--- + drivers/rtc/rtc-max8998.c | 300 +++++++++++++++ + drivers/usb/otg/twl4030-usb.c | 13 +- + include/linux/i2c/twl.h | 46 +++ + include/linux/mfd/88pm860x.h | 2 +- + include/linux/mfd/ab8500.h | 28 ++- + include/linux/mfd/abx500.h | 3 +- + include/linux/mfd/max8998-private.h | 106 ++++-- + include/linux/mfd/max8998.h | 11 +- + include/linux/mfd/pcf50633/core.h | 7 + + include/linux/mfd/sh_mobile_sdhi.h | 2 + + include/linux/mfd/stmpe.h | 6 + + include/linux/mfd/tmio.h | 6 + + include/linux/mmc/sh_mmcif.h | 1 + + 46 files changed, 2366 insertions(+), 409 deletions(-) + create mode 100644 drivers/mfd/ab8500-debugfs.c + create mode 100644 drivers/mfd/ab8500-i2c.c + create mode 100644 drivers/mfd/max8998-irq.c + create mode 100644 drivers/misc/ab8500-pwm.c + create mode 100644 drivers/rtc/rtc-max8998.c +$ git revert 03f582a93ecca6e9584b622570022abf08ed03ec +Finished one revert. +[master 7c11dc8] Revert "misc: Add ab8500 pwm driver" + 4 files changed, 1 insertions(+), 190 deletions(-) + delete mode 100644 drivers/misc/ab8500-pwm.c +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging viafb/viafb-next +$ git merge viafb/viafb-next +Auto-merging drivers/video/via/ioctl.c +Removing drivers/video/via/lcdtbl.h +Merge made by recursive. + drivers/video/via/dvi.c | 172 +++++++++---- + drivers/video/via/dvi.h | 4 +- + drivers/video/via/hw.c | 456 ++++++++++++-------------------- + drivers/video/via/hw.h | 16 +- + drivers/video/via/ioctl.c | 2 + + drivers/video/via/lcd.c | 49 +++- + drivers/video/via/lcd.h | 6 +- + drivers/video/via/lcdtbl.h | 591 ------------------------------------------ + drivers/video/via/viafbdev.c | 8 +- + drivers/video/via/viafbdev.h | 3 + + 10 files changed, 360 insertions(+), 947 deletions(-) + delete mode 100644 drivers/video/via/lcdtbl.h +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. + drivers/regulator/Kconfig | 15 + + drivers/regulator/Makefile | 2 + + drivers/regulator/lp3972.c | 649 +++++++++++++++++++++++++++++++++++++ + drivers/regulator/max8952.c | 360 ++++++++++++++++++++ + include/linux/regulator/lp3972.h | 48 +++ + include/linux/regulator/max8952.h | 135 ++++++++ + 6 files changed, 1209 insertions(+), 0 deletions(-) + create mode 100644 drivers/regulator/lp3972.c + create mode 100644 drivers/regulator/max8952.c + create mode 100644 include/linux/regulator/lp3972.h + create mode 100644 include/linux/regulator/max8952.h +Merging security-testing/next +$ git merge security-testing/next +Removing security/selinux/ss/Makefile +Merge made by recursive. + security/apparmor/.gitignore | 1 + + security/security.c | 12 +--- + security/selinux/Makefile | 19 ++--- + security/selinux/include/security.h | 21 ++++++ + security/selinux/selinuxfs.c | 56 +++++++++++++++ + security/selinux/ss/Makefile | 9 --- + security/selinux/ss/policydb.c | 4 +- + security/selinux/ss/services.c | 3 + + security/selinux/ss/status.c | 129 +++++++++++++++++++++++++++++++++++ + security/tomoyo/common.c | 6 +- + 10 files changed, 225 insertions(+), 35 deletions(-) + delete mode 100644 security/selinux/ss/Makefile + create mode 100644 security/selinux/ss/status.c +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Auto-merging drivers/char/agp/backend.c +Auto-merging drivers/char/agp/hp-agp.c +Merge made by recursive. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Auto-merging include/linux/wlp.h +Merge made by recursive. + drivers/uwb/i1480/i1480u-wlp/lc.c | 16 ++++++------ + drivers/uwb/wlp/messages.c | 40 ++++++++++++++++---------------- + drivers/uwb/wlp/sysfs.c | 46 ++++++++++++++++++------------------ + drivers/uwb/wlp/wlp-lc.c | 12 +++++----- + include/linux/wlp.h | 2 +- + 5 files changed, 58 insertions(+), 58 deletions(-) +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. + drivers/watchdog/iTCO_wdt.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/blackfin/mach-bf527/boards/ezkit.c +Auto-merging arch/blackfin/mach-bf537/boards/stamp.c +Auto-merging block/blk-core.c +Auto-merging drivers/gpu/drm/radeon/radeon_cs.c +Auto-merging drivers/ide/ide-disk.c +Auto-merging drivers/net/igb/igb_main.c +Auto-merging drivers/net/ps3_gelic_net.c +Auto-merging drivers/net/skfp/skfddi.c +Auto-merging drivers/rtc/rtc-nuc900.c +Auto-merging drivers/s390/block/dasd_3990_erp.c +Auto-merging drivers/scsi/lpfc/lpfc_hbadisc.c +Auto-merging drivers/usb/gadget/rndis.c +Auto-merging drivers/usb/serial/ftdi_sio.c +Auto-merging drivers/usb/serial/io_ti.c +Auto-merging drivers/usb/serial/mos7720.c +Auto-merging drivers/usb/serial/mos7840.c +Auto-merging fs/exofs/inode.c +Auto-merging fs/exofs/ios.c +Auto-merging init/Kconfig +Auto-merging kernel/trace/trace_kprobe.c +Auto-merging mm/percpu.c +Auto-merging mm/vmscan.c +Merge made by recursive. + Documentation/arm/SA1100/FreeBird | 4 ++-- + Documentation/kernel-parameters.txt | 2 +- + MAINTAINERS | 2 +- + arch/blackfin/mach-bf527/boards/ezkit.c | 2 +- + arch/blackfin/mach-bf537/boards/stamp.c | 2 +- + arch/xtensa/include/asm/uaccess.h | 2 +- + block/blk-core.c | 2 +- + drivers/ata/pata_bf54x.c | 2 +- + drivers/base/core.c | 2 +- + drivers/gpu/drm/radeon/radeon_cs.c | 2 +- + drivers/ide/ide-disk.c | 3 +-- + drivers/media/video/zoran/videocodec.h | 2 +- + drivers/misc/Kconfig | 2 +- + drivers/net/depca.c | 2 +- + drivers/net/igb/igb_main.c | 2 +- + drivers/net/ps3_gelic_net.c | 4 ++-- + drivers/net/skfp/hwt.c | 2 +- + drivers/net/skfp/skfddi.c | 2 +- + drivers/net/tulip/pnic2.c | 2 +- + drivers/parport/parport_pc.c | 2 +- + drivers/rtc/rtc-nuc900.c | 2 +- + drivers/s390/block/dasd_3990_erp.c | 2 +- + drivers/s390/char/tape_3590.c | 6 +++--- + drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- + drivers/usb/gadget/at91_udc.c | 1 - + drivers/usb/gadget/f_audio.c | 2 -- + drivers/usb/gadget/f_hid.c | 4 ---- + drivers/usb/gadget/fsl_udc_core.c | 6 ------ + drivers/usb/gadget/pxa27x_udc.c | 2 -- + drivers/usb/gadget/rndis.c | 2 -- + drivers/usb/host/ehci-hcd.c | 1 - + drivers/usb/host/imx21-hcd.c | 4 ++-- + drivers/usb/host/ohci-hcd.c | 1 - + drivers/usb/host/oxu210hp-hcd.c | 9 --------- + drivers/usb/host/pci-quirks.c | 2 -- + drivers/usb/host/u132-hcd.c | 8 ++------ + drivers/usb/image/microtek.c | 9 --------- + drivers/usb/misc/ftdi-elan.c | 2 -- + drivers/usb/mon/mon_main.c | 2 -- + drivers/usb/musb/musb_gadget.c | 1 - + drivers/usb/serial/cypress_m8.c | 2 -- + drivers/usb/serial/ftdi_sio.c | 1 - + drivers/usb/serial/garmin_gps.c | 1 - + drivers/usb/serial/io_edgeport.c | 11 ----------- + drivers/usb/serial/io_ti.c | 4 ---- + drivers/usb/serial/iuu_phoenix.c | 1 - + drivers/usb/serial/keyspan_pda.c | 1 - + drivers/usb/serial/mos7720.c | 6 ------ + drivers/usb/serial/mos7840.c | 7 ------- + drivers/usb/serial/omninet.c | 2 -- + drivers/usb/serial/sierra.c | 2 -- + drivers/usb/serial/spcp8x5.c | 1 - + drivers/usb/serial/usb_wwan.c | 1 - + drivers/usb/serial/whiteheat.c | 6 ------ + drivers/video/bf54x-lq043fb.c | 6 +++--- + drivers/video/bfin-t350mcqb-fb.c | 2 +- + drivers/video/vesafb.c | 2 +- + fs/exofs/inode.c | 14 +++++++------- + fs/exofs/ios.c | 10 +++++----- + fs/jfs/jfs_mount.c | 4 ++-- + include/linux/jhash.h | 2 +- + include/video/vga.h | 2 +- + init/Kconfig | 2 +- + kernel/trace/trace_kprobe.c | 2 +- + lib/idr.c | 13 +++++++------ + mm/percpu.c | 2 +- + mm/vmscan.c | 4 ++-- + net/mac80211/mesh.h | 2 +- + net/wanrouter/wanmain.c | 4 ++-- + usr/Kconfig | 2 +- + 70 files changed, 69 insertions(+), 163 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging quilt/aoe +$ git merge quilt/aoe +Auto-merging drivers/block/aoe/aoecmd.c +Merge made by recursive. + drivers/block/aoe/aoecmd.c | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) +Merging suspend/linux-next +$ git merge suspend/linux-next +Auto-merging Documentation/kernel-parameters.txt +Auto-merging kernel/power/hibernate.c +Auto-merging kernel/power/swap.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 5 + + Documentation/power/swsusp.txt | 3 +- + drivers/base/power/generic_ops.c | 4 +- + kernel/power/Kconfig | 3 + + kernel/power/hibernate.c | 13 ++ + kernel/power/power.h | 1 + + kernel/power/swap.c | 290 ++++++++++++++++++++++++++++++++++- + 7 files changed, 309 insertions(+), 10 deletions(-) +Merging bluetooth/master +$ git merge bluetooth/master +Merge made by recursive. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Already up-to-date. +Merging irda/for-next +$ git merge irda/for-next +Resolved 'drivers/net/irda/irda-usb.c' using previous resolution. +Auto-merging drivers/net/irda/irda-usb.c +CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b861423] Merge remote branch 'irda/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/net/irda/irda-usb.c | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) +Merging catalin/for-next +$ git merge catalin/for-next +Resolved 'arch/arm/kernel/Makefile' using previous resolution. +Auto-merging Documentation/arm/00-INDEX +Auto-merging arch/arm/include/asm/assembler.h +Auto-merging arch/arm/include/asm/smp_plat.h +Auto-merging arch/arm/include/asm/tlbflush.h +Auto-merging arch/arm/kernel/Makefile +CONFLICT (content): Merge conflict in arch/arm/kernel/Makefile +Auto-merging arch/arm/kernel/entry-armv.S +Auto-merging arch/arm/mm/mmu.c +Auto-merging arch/arm/mm/proc-v7.S +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master da72c5e] Merge remote branch 'catalin/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm/00-INDEX | 2 + + Documentation/arm/swp_emulation | 27 ++++ + arch/arm/include/asm/assembler.h | 13 +- + arch/arm/include/asm/cacheflush.h | 9 +- + arch/arm/include/asm/domain.h | 31 ++++- + arch/arm/include/asm/futex.h | 9 +- + arch/arm/include/asm/pgtable.h | 30 ++++- + arch/arm/include/asm/smp_plat.h | 4 + + arch/arm/include/asm/tlbflush.h | 12 ++- + arch/arm/include/asm/traps.h | 2 + + arch/arm/include/asm/uaccess.h | 16 +- + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/entry-armv.S | 4 +- + arch/arm/kernel/fiq.c | 5 + + arch/arm/kernel/swp_emulate.c | 263 +++++++++++++++++++++++++++++++++++++ + arch/arm/kernel/traps.c | 14 ++- + arch/arm/lib/getuser.S | 13 +- + arch/arm/lib/putuser.S | 29 ++-- + arch/arm/lib/uaccess.S | 83 ++++++------ + arch/arm/mach-vexpress/ct-ca9x4.c | 2 +- + arch/arm/mm/Kconfig | 43 ++++++ + arch/arm/mm/cache-l2x0.c | 15 ++- + arch/arm/mm/copypage-v4mc.c | 2 +- + arch/arm/mm/copypage-v6.c | 2 +- + arch/arm/mm/copypage-xscale.c | 2 +- + arch/arm/mm/dma-mapping.c | 6 + + arch/arm/mm/fault-armv.c | 8 +- + arch/arm/mm/flush.c | 46 +++++-- + arch/arm/mm/mmu.c | 20 +++- + arch/arm/mm/proc-macros.S | 7 + + arch/arm/mm/proc-v7.S | 9 +- + 31 files changed, 605 insertions(+), 124 deletions(-) + create mode 100644 Documentation/arm/swp_emulation + create mode 100644 arch/arm/kernel/swp_emulate.c +Merging alacrity/linux-next +$ git merge alacrity/linux-next +Resolved 'include/linux/Kbuild' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/Makefile +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging include/linux/Kbuild +CONFLICT (content): Merge conflict in include/linux/Kbuild +Auto-merging lib/Kconfig +Auto-merging lib/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 69f0c30] Merge remote branch 'alacrity/linux-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 25 + + arch/x86/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/net/Kconfig | 14 + + drivers/net/Makefile | 1 + + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ + drivers/vbus/Kconfig | 25 + + drivers/vbus/Makefile | 6 + + drivers/vbus/bus-proxy.c | 248 +++++++ + drivers/vbus/pci-bridge.c | 1016 ++++++++++++++++++++++++++++ + include/linux/Kbuild | 4 + + include/linux/ioq.h | 414 ++++++++++++ + include/linux/shm_signal.h | 189 ++++++ + include/linux/vbus_driver.h | 83 +++ + include/linux/vbus_pci.h | 145 ++++ + include/linux/venet.h | 133 ++++ + lib/Kconfig | 21 + + lib/Makefile | 2 + + lib/ioq.c | 304 +++++++++ + lib/shm_signal.c | 196 ++++++ + 20 files changed, 4389 insertions(+), 0 deletions(-) + create mode 100644 drivers/net/vbus-enet.c + create mode 100644 drivers/vbus/Kconfig + create mode 100644 drivers/vbus/Makefile + create mode 100644 drivers/vbus/bus-proxy.c + create mode 100644 drivers/vbus/pci-bridge.c + create mode 100644 include/linux/ioq.h + create mode 100644 include/linux/shm_signal.h + create mode 100644 include/linux/vbus_driver.h + create mode 100644 include/linux/vbus_pci.h + create mode 100644 include/linux/venet.h + create mode 100644 lib/ioq.c + create mode 100644 lib/shm_signal.c +Merging i7core_edac/linux_next +$ git merge i7core_edac/linux_next +Resolved 'MAINTAINERS' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/edac/i7core_edac.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3248977] Merge remote branch 'i7core_edac/linux_next' +$ git diff -M --stat --summary HEAD^.. +Merging devicetree/next-devicetree +$ git merge devicetree/next-devicetree +Already up-to-date. +Merging spi/next-spi +$ git merge spi/next-spi +Already up-to-date. +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Merge made by recursive. + arch/arm/plat-omap/fb.c | 12 +- + arch/arm/plat-omap/include/plat/vram.h | 1 + + drivers/video/omap2/displays/Kconfig | 2 +- + drivers/video/omap2/dss/dispc.c | 214 +++++++++++++----------------- + drivers/video/omap2/omapfb/omapfb-main.c | 18 ++-- + drivers/video/omap2/vram.c | 10 ++ + 6 files changed, 121 insertions(+), 136 deletions(-) +Merging xen/upstream/xen +$ git merge xen/upstream/xen +Already up-to-date. +Merging rcu/rcu/next +$ git merge rcu/rcu/next +Auto-merging Documentation/DocBook/kernel-locking.tmpl +Auto-merging drivers/input/evdev.c +Auto-merging drivers/vhost/vhost.c +Auto-merging include/linux/cgroup.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/genhd.h +Auto-merging include/linux/input.h +Auto-merging include/linux/kvm_host.h +Auto-merging include/linux/mm_types.h +Auto-merging include/net/cls_cgroup.h +Auto-merging init/Kconfig +Auto-merging kernel/cgroup.c +Auto-merging lib/radix-tree.c +Merge made by recursive. + Documentation/DocBook/kernel-locking.tmpl | 14 +- + Documentation/RCU/checklist.txt | 46 ++- + drivers/input/evdev.c | 2 +- + drivers/vhost/net.c | 16 +- + drivers/vhost/vhost.c | 22 +- + drivers/vhost/vhost.h | 10 +- + include/linux/cgroup.h | 4 +- + include/linux/compiler.h | 4 + + include/linux/cred.h | 2 +- + include/linux/fdtable.h | 6 +- + include/linux/fs.h | 2 +- + include/linux/genhd.h | 6 +- + include/linux/hardirq.h | 2 +- + include/linux/idr.h | 4 +- + include/linux/init_task.h | 14 +- + include/linux/input.h | 2 +- + include/linux/iocontext.h | 2 +- + include/linux/key.h | 3 +- + include/linux/kvm_host.h | 2 +- + include/linux/mm_types.h | 2 +- + include/linux/nfs_fs.h | 2 +- + include/linux/notifier.h | 10 +- + include/linux/radix-tree.h | 4 +- + include/linux/rculist.h | 62 +++- + include/linux/rculist_nulls.h | 16 +- + include/linux/rcupdate.h | 482 ++++++++++++++++-------- + include/linux/rcutiny.h | 104 +++--- + include/linux/rcutree.h | 57 +--- + include/linux/sched.h | 16 +- + include/linux/srcu.h | 34 ++- + include/linux/sunrpc/auth_gss.h | 4 +- + include/net/cls_cgroup.h | 3 +- + include/net/netfilter/nf_conntrack.h | 2 +- + init/Kconfig | 26 ++- + kernel/Makefile | 1 + + kernel/cgroup.c | 2 +- + kernel/pid.c | 3 +- + kernel/rcupdate.c | 6 +- + kernel/rcutiny.c | 33 +- + kernel/rcutiny_plugin.h | 578 ++++++++++++++++++++++++++++- + kernel/rcutorture.c | 6 + + kernel/rcutree.c | 85 +++-- + kernel/rcutree.h | 17 +- + kernel/rcutree_plugin.h | 45 ++- + kernel/rcutree_trace.c | 2 +- + lib/Kconfig.debug | 37 ++ + lib/radix-tree.c | 2 +- + net/ipv4/netfilter/nf_nat_core.c | 2 +- + net/netfilter/core.c | 2 +- + net/netfilter/nf_conntrack_ecache.c | 4 +- + net/netfilter/nf_conntrack_extend.c | 2 +- + net/netfilter/nf_conntrack_proto.c | 4 +- + net/netfilter/nf_log.c | 2 +- + net/netfilter/nf_queue.c | 2 +- + 54 files changed, 1364 insertions(+), 458 deletions(-) +$ git am -3 ../patches/0001-net-include-inetdevice.h-for-rcu_dereference_raw-api.patch +Applying: net: include inetdevice.h for rcu_dereference_raw api change +$ git reset HEAD^ +Unstaged changes after reset: +M net/core/dev.c +$ git add . +$ git commit -v -a --amend +[master bbac3f0] Merge remote branch 'rcu/rcu/next' +Merging tip/auto-latest +$ git merge tip/auto-latest +Resolved 'net/core/dev.c' using previous resolution. +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/arm/plat-omap/fb.c +Auto-merging arch/powerpc/kernel/paca.c +Auto-merging arch/s390/Kconfig +Auto-merging arch/sh/mm/init.c +Auto-merging arch/x86/Kconfig +Removing arch/x86/include/asm/vmi.h +Removing arch/x86/include/asm/vmi_time.h +Removing arch/x86/kernel/vmi_32.c +Removing arch/x86/kernel/vmiclock_32.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging drivers/video/omap2/vram.c +Auto-merging include/asm-generic/pgtable.h +Removing include/linux/early_res.h +Removing kernel/early_res.c +Auto-merging net/core/datagram.c +Auto-merging net/core/dev.c +CONFLICT (content): Merge conflict in net/core/dev.c +Auto-merging net/core/skbuff.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 161835c] Merge remote branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/cputopology.txt | 23 +- + Documentation/feature-removal-schedule.txt | 28 - + Documentation/kernel-parameters.txt | 7 +- + Documentation/x86/x86_64/kernel-stacks | 6 +- + arch/Kconfig | 4 +- + arch/alpha/kernel/perf_event.c | 128 +- + arch/arm/kernel/perf_event.c | 198 +- + arch/arm/mm/init.c | 37 +- + arch/arm/oprofile/common.c | 2 +- + arch/arm/plat-omap/fb.c | 6 +- + arch/microblaze/include/asm/memblock.h | 3 - + arch/microblaze/mm/init.c | 30 +- + arch/powerpc/include/asm/memblock.h | 7 - + arch/powerpc/include/asm/mmu.h | 12 + + arch/powerpc/kernel/head_40x.S | 6 +- + arch/powerpc/kernel/paca.c | 2 +- + arch/powerpc/kernel/perf_callchain.c | 86 +- + arch/powerpc/kernel/perf_event.c | 164 +- + arch/powerpc/kernel/perf_event_fsl_emb.c | 148 +- + arch/powerpc/kernel/prom.c | 15 +- + arch/powerpc/kernel/rtas.c | 2 +- + arch/powerpc/kernel/setup_32.c | 2 +- + arch/powerpc/kernel/setup_64.c | 2 +- + arch/powerpc/mm/40x_mmu.c | 17 +- + arch/powerpc/mm/44x_mmu.c | 14 + + arch/powerpc/mm/fsl_booke_mmu.c | 12 +- + arch/powerpc/mm/hash_utils_64.c | 35 +- + arch/powerpc/mm/init_32.c | 43 +- + arch/powerpc/mm/init_64.c | 1 + + arch/powerpc/mm/mem.c | 94 +- + arch/powerpc/mm/numa.c | 17 +- + arch/powerpc/mm/ppc_mmu_32.c | 18 +- + arch/powerpc/mm/tlb_nohash.c | 16 + + arch/powerpc/platforms/embedded6xx/wii.c | 2 +- + arch/s390/Kconfig | 7 + + arch/s390/include/asm/topology.h | 27 +- + arch/s390/kernel/topology.c | 150 +- + arch/sh/include/asm/memblock.h | 2 - + arch/sh/kernel/perf_callchain.c | 50 +- + arch/sh/kernel/perf_event.c | 141 +- + arch/sh/mm/init.c | 17 +- + arch/sparc/include/asm/memblock.h | 2 - + arch/sparc/kernel/perf_event.c | 233 ++-- + arch/sparc/mm/init_64.c | 46 +- + arch/x86/Kconfig | 73 +- + arch/x86/Kconfig.debug | 10 - + arch/x86/Makefile | 2 +- + arch/x86/include/asm/amd_iommu.h | 4 +- + arch/x86/include/asm/apb_timer.h | 1 - + arch/x86/include/asm/calgary.h | 4 +- + arch/x86/include/asm/cpu.h | 1 - + arch/x86/include/asm/cpufeature.h | 17 +- + arch/x86/include/asm/dwarf2.h | 20 + + arch/x86/include/asm/e820.h | 20 +- + arch/x86/include/asm/efi.h | 2 +- + arch/x86/include/asm/gart.h | 20 +- + arch/x86/include/asm/hpet.h | 1 - + arch/x86/include/asm/i387.h | 195 +-- + arch/x86/include/asm/iommu_table.h | 101 + + arch/x86/include/asm/irq.h | 12 +- + arch/x86/include/asm/irq_remapping.h | 27 + + arch/x86/include/asm/memblock.h | 21 + + arch/x86/include/asm/module.h | 7 +- + arch/x86/include/asm/page_32_types.h | 4 - + arch/x86/include/asm/paravirt.h | 5 - + arch/x86/include/asm/paravirt_types.h | 1 - + arch/x86/include/asm/perf_event_p4.h | 52 +- + arch/x86/include/asm/pgtable.h | 2 + + arch/x86/include/asm/pgtable_64.h | 2 + + arch/x86/include/asm/processor.h | 4 +- + arch/x86/include/asm/swiotlb.h | 13 +- + arch/x86/include/asm/vmi.h | 269 --- + arch/x86/include/asm/vmi_time.h | 98 - + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/acpi/sleep.c | 9 +- + arch/x86/kernel/amd_iommu_init.c | 15 +- + arch/x86/kernel/apb_timer.c | 6 +- + arch/x86/kernel/aperture_64.c | 29 +- + arch/x86/kernel/apic/apic.c | 3 - + arch/x86/kernel/apic/io_apic.c | 37 +- + arch/x86/kernel/apic/numaq_32.c | 3 +- + arch/x86/kernel/apic/probe_64.c | 3 + + arch/x86/kernel/apic/x2apic_uv_x.c | 6 +- + arch/x86/kernel/check.c | 16 +- + arch/x86/kernel/cpu/amd.c | 21 +- + arch/x86/kernel/cpu/common.c | 9 +- + arch/x86/kernel/cpu/intel.c | 2 +- + arch/x86/kernel/cpu/mcheck/therm_throt.c | 2 +- + arch/x86/kernel/cpu/mtrr/generic.c | 128 +- + arch/x86/kernel/cpu/perf_event.c | 259 ++-- + arch/x86/kernel/cpu/perf_event_intel.c | 8 +- + arch/x86/kernel/cpu/perf_event_intel_ds.c | 13 +- + arch/x86/kernel/cpu/perf_event_p4.c | 292 +++- + arch/x86/kernel/cpu/scattered.c | 6 + + arch/x86/kernel/crash_dump_64.c | 2 +- + arch/x86/kernel/e820.c | 191 +-- + arch/x86/kernel/early-quirks.c | 20 - + arch/x86/kernel/efi.c | 5 +- + arch/x86/kernel/entry_32.S | 310 +-- + arch/x86/kernel/entry_64.S | 108 +- + arch/x86/kernel/head.c | 3 +- + arch/x86/kernel/head32.c | 10 +- + arch/x86/kernel/head64.c | 7 +- + arch/x86/kernel/hpet.c | 31 +- + arch/x86/kernel/i387.c | 58 +- + arch/x86/kernel/irq_32.c | 12 +- + arch/x86/kernel/kprobes.c | 11 +- + arch/x86/kernel/mpparse.c | 5 +- + arch/x86/kernel/paravirt.c | 1 - + arch/x86/kernel/pci-calgary_64.c | 18 +- + arch/x86/kernel/pci-dma.c | 44 +- + arch/x86/kernel/pci-gart_64.c | 4 +- + arch/x86/kernel/pci-iommu_table.c | 89 + + arch/x86/kernel/pci-swiotlb.c | 44 +- + arch/x86/kernel/process.c | 1 - + arch/x86/kernel/process_64.c | 2 +- + arch/x86/kernel/quirks.c | 2 + + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/setup.c | 197 +-- + arch/x86/kernel/setup_percpu.c | 8 +- + arch/x86/kernel/smpboot.c | 6 +- + arch/x86/kernel/sys_i386_32.c | 4 +- + arch/x86/kernel/trampoline.c | 10 +- + arch/x86/kernel/traps.c | 35 +- + arch/x86/kernel/tsc.c | 58 - + arch/x86/kernel/vmi_32.c | 893 -------- + arch/x86/kernel/vmiclock_32.c | 317 --- + arch/x86/kernel/vmlinux.lds.S | 30 +- + arch/x86/kvm/x86.c | 7 +- + arch/x86/lib/memcpy_32.c | 36 +- + arch/x86/lib/memcpy_64.S | 158 +- + arch/x86/lib/memmove_64.c | 46 +- + arch/x86/mm/Makefile | 2 + + arch/x86/mm/fault.c | 32 +- + arch/x86/mm/init.c | 10 +- + arch/x86/mm/init_32.c | 66 +- + arch/x86/mm/init_64.c | 107 +- + arch/x86/mm/k8topology_64.c | 10 +- + arch/x86/mm/kmemcheck/opcode.c | 2 +- + arch/x86/mm/memblock.c | 354 ++++ + arch/x86/mm/memtest.c | 7 +- + arch/x86/mm/numa_32.c | 28 +- + arch/x86/mm/numa_64.c | 84 +- + arch/x86/mm/pgtable.c | 4 - + arch/x86/mm/srat_32.c | 3 +- + arch/x86/mm/srat_64.c | 11 +- + arch/x86/oprofile/nmi_int.c | 4 +- + arch/x86/xen/mmu.c | 6 +- + arch/x86/xen/pci-swiotlb-xen.c | 5 + + arch/x86/xen/setup.c | 3 +- + drivers/base/topology.c | 16 +- + drivers/char/agp/amd64-agp.c | 4 +- + drivers/char/agp/generic.c | 4 +- + drivers/pci/dmar.c | 6 +- + drivers/video/omap2/vram.c | 8 +- + include/asm-generic/hardirq.h | 2 +- + include/asm-generic/pgtable.h | 4 + + include/linux/debug_locks.h | 5 - + include/linux/dmar.h | 6 +- + include/linux/early_res.h | 23 - + include/linux/ftrace_event.h | 8 +- + include/linux/interrupt.h | 8 +- + include/linux/irq.h | 2 +- + include/linux/memblock.h | 169 ++- + include/linux/mm.h | 2 + + include/linux/percpu-defs.h | 12 + + include/linux/perf_event.h | 147 +- + include/linux/sched.h | 12 +- + include/linux/topology.h | 6 + + include/trace/events/irq.h | 26 +- + include/trace/events/napi.h | 25 +- + include/trace/events/net.h | 82 + + include/trace/events/skb.h | 17 + + kernel/Makefile | 1 - + kernel/early_res.c | 590 ------ + kernel/exit.c | 4 +- + kernel/hung_task.c | 4 +- + kernel/hw_breakpoint.c | 66 +- + kernel/kprobes.c | 22 +- + kernel/lockdep.c | 8 +- + kernel/perf_event.c | 2252 ++++++++++++--------- + kernel/sched.c | 112 +- + kernel/smp.c | 17 +- + kernel/time/ntp.c | 14 +- + kernel/trace/ftrace.c | 123 +- + kernel/trace/ring_buffer.c | 21 +- + kernel/trace/trace_event_perf.c | 28 +- + kernel/trace/trace_events.c | 55 +- + kernel/trace/trace_functions_graph.c | 126 ++- + kernel/watchdog.c | 43 +- + lib/Kconfig.debug | 8 +- + mm/bootmem.c | 13 +- + mm/memblock.c | 826 +++++--- + mm/memory.c | 2 +- + mm/page_alloc.c | 86 +- + mm/sparse-vmemmap.c | 11 - + net/core/datagram.c | 1 + + net/core/dev.c | 8 + + net/core/net-traces.c | 1 + + net/core/skbuff.c | 1 + + tools/perf/Documentation/perf-annotate.txt | 11 +- + tools/perf/Documentation/perf-report.txt | 7 + + tools/perf/Makefile | 30 +- + tools/perf/builtin-annotate.c | 26 +- + tools/perf/builtin-report.c | 14 +- + tools/perf/feature-tests.mak | 11 + + tools/perf/scripts/python/bin/netdev-times-record | 8 + + tools/perf/scripts/python/bin/netdev-times-report | 5 + + tools/perf/scripts/python/netdev-times.py | 464 +++++ + tools/perf/util/cache.h | 2 + + tools/perf/util/callchain.c | 98 +- + tools/perf/util/callchain.h | 27 +- + tools/perf/util/hist.c | 4 +- + tools/perf/util/path.c | 3 +- + tools/perf/util/sort.h | 2 +- + tools/perf/util/symbol.c | 14 + + tools/perf/util/symbol.h | 1 + + tools/perf/util/ui/browser.c | 117 +- + tools/perf/util/ui/browser.h | 9 +- + tools/perf/util/ui/browsers/annotate.c | 38 +- + tools/perf/util/ui/browsers/hists.c | 327 ++-- + tools/perf/util/ui/browsers/map.c | 32 +- + tools/perf/util/ui/util.c | 4 +- + tools/perf/util/util.h | 13 - + 224 files changed, 6980 insertions(+), 6566 deletions(-) + create mode 100644 arch/x86/include/asm/iommu_table.h + create mode 100644 arch/x86/include/asm/memblock.h + delete mode 100644 arch/x86/include/asm/vmi.h + delete mode 100644 arch/x86/include/asm/vmi_time.h + create mode 100644 arch/x86/kernel/pci-iommu_table.c + delete mode 100644 arch/x86/kernel/vmi_32.c + delete mode 100644 arch/x86/kernel/vmiclock_32.c + create mode 100644 arch/x86/mm/memblock.c + delete mode 100644 include/linux/early_res.h + create mode 100644 include/trace/events/net.h + delete mode 100644 kernel/early_res.c + create mode 100644 tools/perf/scripts/python/bin/netdev-times-record + create mode 100644 tools/perf/scripts/python/bin/netdev-times-report + create mode 100644 tools/perf/scripts/python/netdev-times.py +Merging lost-spurious-irq/lost-spurious-irq +$ git merge lost-spurious-irq/lost-spurious-irq +Resolved 'drivers/ata/libata-core.c' using previous resolution. +Resolved 'include/linux/libata.h' using previous resolution. +Auto-merging arch/arm/mach-bcmring/core.c +Auto-merging arch/arm/mach-ep93xx/core.c +Auto-merging arch/arm/mach-integrator/integrator_ap.c +Auto-merging arch/arm/mach-mmp/time.c +Auto-merging arch/arm/mach-u300/timer.c +Auto-merging arch/arm/plat-iop/time.c +Auto-merging arch/ia64/kernel/time.c +Auto-merging drivers/ata/libata-core.c +CONFLICT (content): Merge conflict in drivers/ata/libata-core.c +Auto-merging drivers/ata/libata-eh.c +Auto-merging drivers/ata/libata-sff.c +Auto-merging drivers/ata/sata_fsl.c +Auto-merging drivers/ata/sata_mv.c +Auto-merging drivers/clocksource/sh_cmt.c +Auto-merging drivers/usb/core/hcd.c +Auto-merging include/linux/interrupt.h +Auto-merging include/linux/irq.h +Auto-merging include/linux/libata.h +CONFLICT (content): Merge conflict in include/linux/libata.h +Auto-merging kernel/irq/manage.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c28478f] Merge remote branch 'lost-spurious-irq/lost-spurious-irq' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-aaec2000/core.c | 2 +- + arch/arm/mach-at91/at91rm9200_time.c | 2 +- + arch/arm/mach-at91/at91sam926x_time.c | 2 +- + arch/arm/mach-bcmring/core.c | 2 +- + arch/arm/mach-clps711x/time.c | 2 +- + arch/arm/mach-cns3xxx/core.c | 2 +- + arch/arm/mach-ebsa110/core.c | 2 +- + arch/arm/mach-ep93xx/core.c | 2 +- + arch/arm/mach-footbridge/dc21285-timer.c | 2 +- + arch/arm/mach-footbridge/isa-timer.c | 2 +- + arch/arm/mach-h720x/cpu-h7201.c | 2 +- + arch/arm/mach-h720x/cpu-h7202.c | 2 +- + arch/arm/mach-integrator/integrator_ap.c | 2 +- + arch/arm/mach-ixp2000/core.c | 2 +- + arch/arm/mach-ixp23xx/core.c | 2 +- + arch/arm/mach-ixp4xx/common.c | 2 +- + arch/arm/mach-lh7a40x/time.c | 2 +- + arch/arm/mach-mmp/time.c | 2 +- + arch/arm/mach-netx/time.c | 2 +- + arch/arm/mach-ns9xxx/irq.c | 3 - + arch/arm/mach-ns9xxx/time-ns9360.c | 2 +- + arch/arm/mach-nuc93x/time.c | 2 +- + arch/arm/mach-omap1/time.c | 2 +- + arch/arm/mach-omap1/timer32k.c | 2 +- + arch/arm/mach-omap2/timer-gp.c | 2 +- + arch/arm/mach-pnx4008/time.c | 2 +- + arch/arm/mach-pxa/time.c | 2 +- + arch/arm/mach-sa1100/time.c | 2 +- + arch/arm/mach-shark/core.c | 2 +- + arch/arm/mach-u300/timer.c | 2 +- + arch/arm/mach-w90x900/time.c | 2 +- + arch/arm/plat-iop/time.c | 2 +- + arch/arm/plat-mxc/time.c | 2 +- + arch/arm/plat-samsung/time.c | 2 +- + arch/arm/plat-versatile/timer-sp.c | 2 +- + arch/blackfin/kernel/time-ts.c | 6 +- + arch/ia64/kernel/time.c | 2 +- + arch/parisc/kernel/irq.c | 2 +- + arch/powerpc/platforms/cell/interrupt.c | 5 +- + arch/x86/kernel/time.c | 2 +- + drivers/ata/libata-core.c | 55 ++- + drivers/ata/libata-eh.c | 4 +- + drivers/ata/libata-sff.c | 37 +- + drivers/clocksource/sh_cmt.c | 3 +- + drivers/clocksource/sh_mtu2.c | 3 +- + drivers/clocksource/sh_tmu.c | 3 +- + drivers/usb/core/hcd.c | 1 + + include/linux/interrupt.h | 43 +- + include/linux/irq.h | 40 +- + include/linux/libata.h | 2 + + kernel/irq/chip.c | 20 +- + kernel/irq/handle.c | 7 +- + kernel/irq/internals.h | 10 +- + kernel/irq/manage.c | 18 +- + kernel/irq/proc.c | 5 +- + kernel/irq/spurious.c | 978 +++++++++++++++++++++++++----- + 56 files changed, 1031 insertions(+), 286 deletions(-) +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Already up-to-date. +Merging oprofile/for-next +$ git merge oprofile/for-next +Auto-merging arch/arm/oprofile/common.c +Merge made by recursive. + arch/arm/oprofile/common.c | 49 ++++++++++++++++++++++++------------------- + drivers/oprofile/oprof.c | 11 +-------- + 2 files changed, 29 insertions(+), 31 deletions(-) +Merging percpu/for-next +$ git merge percpu/for-next +Auto-merging mm/Kconfig +Auto-merging mm/percpu.c +Removing mm/percpu_up.c +Merge made by recursive. + arch/x86/include/asm/percpu.h | 14 ++ + include/asm-generic/percpu.h | 14 +- + include/linux/percpu.h | 31 +--- + include/linux/vmalloc.h | 2 + + mm/Kconfig | 8 + + mm/Makefile | 7 +- + mm/percpu-km.c | 8 +- + mm/percpu.c | 401 ++++++++++++++++++++++++----------------- + mm/percpu_up.c | 30 --- + mm/vmalloc.c | 2 + + 10 files changed, 281 insertions(+), 236 deletions(-) + delete mode 100644 mm/percpu_up.c +Merging workqueues/for-next +$ git merge workqueues/for-next +Already up-to-date. +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging drivers-x86/linux-next +$ git merge drivers-x86/linux-next +Merge made by recursive. + drivers/platform/x86/Kconfig | 6 + + drivers/platform/x86/dell-wmi.c | 256 ++++++++++++------------------- + drivers/platform/x86/hp-wmi.c | 172 ++++++--------------- + drivers/platform/x86/panasonic-laptop.c | 172 ++++++++------------- + drivers/platform/x86/topstar-laptop.c | 161 +++++++------------- + drivers/platform/x86/toshiba_acpi.c | 191 ++++++++--------------- + 6 files changed, 332 insertions(+), 626 deletions(-) +$ git am -3 ../patches/0001-Fix-Kconfig-mistaken-update.patch +Applying: Fix Kconfig mistaken update +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/platform/x86/Kconfig +$ git add . +$ git commit -v -a --amend +[master ed58e61] Merge remote branch 'drivers-x86/linux-next' +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merging Documentation/kernel-parameters.txt +Auto-merging drivers/base/core.c +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/scsi/hosts.c +Auto-merging init/Kconfig +Auto-merging sound/core/init.c +Merge made by recursive. + Documentation/ABI/testing/sysfs-module | 12 + + Documentation/dynamic-debug-howto.txt | 22 +- + Documentation/kernel-parameters.txt | 7 +- + drivers/base/bus.c | 22 - + drivers/base/class.c | 19 - + drivers/base/core.c | 194 ++-------- + drivers/base/platform.c | 39 ++- + drivers/misc/Kconfig | 12 + + drivers/misc/Makefile | 1 + + drivers/misc/pch_phub.c | 717 ++++++++++++++++++++++++++++++++ + drivers/scsi/hosts.c | 2 - + drivers/scsi/scsi_scan.c | 2 - + drivers/uio/uio_pci_generic.c | 13 +- + include/linux/platform_device.h | 3 + + include/sound/core.h | 6 - + init/Kconfig | 46 +-- + lib/dynamic_debug.c | 98 ++++-- + sound/core/init.c | 11 +- + 18 files changed, 932 insertions(+), 294 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-module + create mode 100644 drivers/misc/pch_phub.c +Merging quilt/tty +$ git merge quilt/tty +Merge made by recursive. + Documentation/devices.txt | 1 + + arch/arm/include/asm/ioctls.h | 83 +-------------- + arch/avr32/include/asm/ioctls.h | 86 +-------------- + arch/cris/include/asm/ioctls.h | 84 +-------------- + arch/frv/include/asm/ioctls.h | 80 +------------- + arch/h8300/include/asm/ioctls.h | 81 +------------- + arch/ia64/include/asm/ioctls.h | 89 +-------------- + arch/m32r/include/asm/ioctls.h | 83 +-------------- + arch/mn10300/include/asm/ioctls.h | 84 +-------------- + arch/s390/include/asm/ioctls.h | 88 +-------------- + drivers/char/Kconfig | 15 +++ + drivers/char/Makefile | 1 + + drivers/char/mxser.c | 47 ++++---- + drivers/char/pty.c | 4 +- + drivers/char/tty_io.c | 56 ++++++++- + drivers/char/ttyprintk.c | 225 +++++++++++++++++++++++++++++++++++++ + drivers/input/serio/serport.c | 1 + + drivers/serial/mfd.c | 6 + + drivers/serial/serial_core.c | 14 ++- + include/asm-generic/ioctls.h | 2 + + include/linux/tty.h | 3 +- + 21 files changed, 350 insertions(+), 783 deletions(-) + create mode 100644 drivers/char/ttyprintk.c +Merging quilt/usb +$ git merge quilt/usb +Resolved 'drivers/usb/gadget/rndis.c' using previous resolution. +Auto-merging drivers/usb/gadget/at91_udc.c +Auto-merging drivers/usb/gadget/fsl_udc_core.c +Auto-merging drivers/usb/gadget/pxa27x_udc.c +Auto-merging drivers/usb/gadget/rndis.c +CONFLICT (content): Merge conflict in drivers/usb/gadget/rndis.c +Auto-merging drivers/usb/host/ehci-hcd.c +Auto-merging drivers/usb/misc/ftdi-elan.c +Auto-merging drivers/usb/musb/musb_gadget.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ceb668d] Merge branch 'quilt/usb' +$ git diff -M --stat --summary HEAD^.. + drivers/usb/core/hub.c | 2 +- + drivers/usb/core/urb.c | 5 +- + drivers/usb/gadget/Kconfig | 10 +- + drivers/usb/gadget/amd5536udc.c | 11 +- + drivers/usb/gadget/at91_udc.c | 11 +- + drivers/usb/gadget/atmel_usba_udc.c | 7 +- + drivers/usb/gadget/audio.c | 10 +- + drivers/usb/gadget/cdc2.c | 10 +- + drivers/usb/gadget/ci13xxx_udc.c | 18 +- + drivers/usb/gadget/composite.c | 136 ++- + drivers/usb/gadget/dbgp.c | 19 +- + drivers/usb/gadget/dummy_hcd.c | 10 +- + drivers/usb/gadget/ether.c | 16 +- + drivers/usb/gadget/f_loopback.c | 7 +- + drivers/usb/gadget/f_mass_storage.c | 16 +- + drivers/usb/gadget/f_sourcesink.c | 5 +- + drivers/usb/gadget/file_storage.c | 54 +- + drivers/usb/gadget/fsl_qe_udc.c | 12 +- + drivers/usb/gadget/fsl_udc_core.c | 10 +- + drivers/usb/gadget/g_ffs.c | 91 +- + drivers/usb/gadget/gmidi.c | 5 +- + drivers/usb/gadget/goku_udc.c | 9 +- + drivers/usb/gadget/hid.c | 10 +- + drivers/usb/gadget/imx_udc.c | 9 +- + drivers/usb/gadget/inode.c | 6 +- + drivers/usb/gadget/langwell_udc.c | 1047 +++++++++------ + drivers/usb/gadget/langwell_udc.h | 15 +- + drivers/usb/gadget/lh7a40x_udc.c | 10 +- + drivers/usb/gadget/m66592-udc.c | 9 +- + drivers/usb/gadget/mass_storage.c | 82 +-- + drivers/usb/gadget/multi.c | 36 +- + drivers/usb/gadget/net2280.c | 10 +- + drivers/usb/gadget/nokia.c | 11 +- + drivers/usb/gadget/omap_udc.c | 10 +- + drivers/usb/gadget/printer.c | 7 +- + drivers/usb/gadget/pxa25x_udc.c | 9 +- + drivers/usb/gadget/pxa27x_udc.c | 12 +- + drivers/usb/gadget/r8a66597-udc.c | 9 +- + drivers/usb/gadget/rndis.c | 492 ++++---- + drivers/usb/gadget/s3c-hsotg.c | 9 +- + drivers/usb/gadget/s3c2410_udc.c | 17 +- + drivers/usb/gadget/serial.c | 11 +- + drivers/usb/gadget/storage_common.c | 3 +- + drivers/usb/gadget/webcam.c | 11 +- + drivers/usb/gadget/zero.c | 5 +- + drivers/usb/host/ehci-fsl.c | 6 +- + drivers/usb/host/ehci-fsl.h | 1 - + drivers/usb/host/ehci-hcd.c | 15 + + drivers/usb/host/ehci-mxc.c | 13 +- + drivers/usb/misc/ftdi-elan.c | 2 +- + drivers/usb/musb/musb_gadget.c | 9 +- + drivers/usb/otg/Kconfig | 14 + + drivers/usb/otg/Makefile | 1 + + drivers/usb/otg/langwell_otg.c | 2408 +++++++++++++++++++++++++++++++++++ + drivers/usb/serial/Kconfig | 9 + + drivers/usb/serial/Makefile | 1 + + drivers/usb/serial/sam-ba.c | 206 +++ + include/linux/init.h | 13 +- + include/linux/usb/ch9.h | 10 + + include/linux/usb/composite.h | 40 +- + include/linux/usb/gadget.h | 20 +- + include/linux/usb/langwell_otg.h | 139 ++ + 62 files changed, 4072 insertions(+), 1149 deletions(-) + create mode 100644 drivers/usb/otg/langwell_otg.c + create mode 100644 drivers/usb/serial/sam-ba.c + create mode 100644 include/linux/usb/langwell_otg.h +Merging staging-next/staging-next +$ git merge staging-next/staging-next +Auto-merging MAINTAINERS +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/staging/Makefile +CONFLICT (content): Merge conflict in drivers/staging/Makefile +Removing drivers/staging/batman-adv/CHANGELOG +Auto-merging drivers/staging/batman-adv/hard-interface.c +CONFLICT (content): Merge conflict in drivers/staging/batman-adv/hard-interface.c +Auto-merging drivers/staging/batman-adv/send.c +CONFLICT (delete/modify): drivers/staging/mrst-touchscreen/Makefile deleted in HEAD and modified in staging-next/staging-next. Version staging-next/staging-next of drivers/staging/mrst-touchscreen/Makefile left in tree. +CONFLICT (delete/modify): drivers/staging/mrst-touchscreen/intel-mid-touch.c deleted in HEAD and modified in staging-next/staging-next. Version staging-next/staging-next of drivers/staging/mrst-touchscreen/intel-mid-touch.c left in tree. +Removing drivers/staging/rtl8192su/Kconfig +Removing drivers/staging/rtl8192su/Makefile +Removing drivers/staging/rtl8192su/TODO +Removing drivers/staging/rtl8192su/authors +Removing drivers/staging/rtl8192su/ieee80211/Makefile +Removing drivers/staging/rtl8192su/ieee80211/dot11d.c +Removing drivers/staging/rtl8192su/ieee80211/dot11d.h +Removing drivers/staging/rtl8192su/ieee80211/ieee80211.h +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_crypt.c +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_crypt.h +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_ccmp.c +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_wep.c +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_module.c +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_r8192s.h +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c +Removing drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c +Removing drivers/staging/rtl8192su/ieee80211/readme +Removing drivers/staging/rtl8192su/ieee80211/rtl819x_BA.h +Removing drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c +Removing drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h +Removing drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c +Removing drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h +Removing drivers/staging/rtl8192su/ieee80211/rtl819x_TS.h +Removing drivers/staging/rtl8192su/ieee80211/rtl819x_TSProc.c +Removing drivers/staging/rtl8192su/r8192SU_HWImg.c +Removing drivers/staging/rtl8192su/r8192SU_HWImg.h +Removing drivers/staging/rtl8192su/r8192SU_led.c +Removing drivers/staging/rtl8192su/r8192SU_led.h +Removing drivers/staging/rtl8192su/r8192S_Efuse.c +Removing drivers/staging/rtl8192su/r8192S_Efuse.h +Removing drivers/staging/rtl8192su/r8192S_firmware.c +Removing drivers/staging/rtl8192su/r8192S_firmware.h +Removing drivers/staging/rtl8192su/r8192S_hw.h +Removing drivers/staging/rtl8192su/r8192S_phy.c +Removing drivers/staging/rtl8192su/r8192S_phy.h +Removing drivers/staging/rtl8192su/r8192S_phyreg.h +Removing drivers/staging/rtl8192su/r8192S_rtl6052.c +Removing drivers/staging/rtl8192su/r8192S_rtl6052.h +Removing drivers/staging/rtl8192su/r8192S_rtl8225.c +Removing drivers/staging/rtl8192su/r8192S_rtl8225.h +Removing drivers/staging/rtl8192su/r8192U.h +Removing drivers/staging/rtl8192su/r8192U_core.c +Removing drivers/staging/rtl8192su/r8192U_dm.c +Removing drivers/staging/rtl8192su/r8192U_dm.h +Removing drivers/staging/rtl8192su/r8192U_pm.c +Removing drivers/staging/rtl8192su/r8192U_pm.h +Removing drivers/staging/rtl8192su/r8192U_wx.c +Removing drivers/staging/rtl8192su/r8192U_wx.h +Removing drivers/staging/rtl8192su/r819xU_HTGen.h +Removing drivers/staging/rtl8192su/r819xU_HTType.h +Removing drivers/staging/rtl8192su/r819xU_cmdpkt.c +Removing drivers/staging/rtl8192su/r819xU_cmdpkt.h +Auto-merging drivers/staging/spectra/Kconfig +Removing drivers/staging/tidspbridge/include/dspbridge/cfg.h +Removing drivers/staging/tidspbridge/include/dspbridge/services.h +Removing drivers/staging/tidspbridge/services/cfg.c +RemResolved 'drivers/staging/Makefile' using previous resolution. +Resolved 'drivers/staging/batman-adv/hard-interface.c' using previous resolution. +oving drivers/staging/tidspbridge/services/ntfy.c +Removing drivers/staging/tidspbridge/services/services.c +Auto-merging drivers/staging/wlags49_h2/wl_main.c +Auto-merging drivers/staging/zram/zram_drv.c +Removing drivers/staging/zram/zram_ioctl.h +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/mrst-touchscreen/Makefile drivers/staging/mrst-touchscreen/intel-mid-touch.c +drivers/staging/Makefile: needs merge +drivers/staging/batman-adv/hard-interface.c: needs merge +drivers/staging/mrst-touchscreen/Makefile: needs merge +drivers/staging/mrst-touchscreen/intel-mid-touch.c: needs merge +rm 'drivers/staging/mrst-touchscreen/Makefile' +rm 'drivers/staging/mrst-touchscreen/intel-mid-touch.c' +$ git commit -v -a +[master c266bd9] Merge remote branch 'staging-next/staging-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-block-zram | 99 + + MAINTAINERS | 8 + + drivers/staging/Kconfig | 16 +- + drivers/staging/Makefile | 8 +- + drivers/staging/adis16255/adis16255.c | 4 +- + drivers/staging/ath6kl/Kconfig | 163 + + drivers/staging/ath6kl/Makefile | 159 + + drivers/staging/ath6kl/TODO | 8 + + drivers/staging/ath6kl/bmi/include/bmi_internal.h | 55 + + drivers/staging/ath6kl/bmi/src/bmi.c | 1010 + + .../staging/ath6kl/hif/common/hif_sdio_common.h | 87 + + .../hif/sdio/linux_sdio/include/hif_internal.h | 134 + + .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 1298 + + .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | 393 + + drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 1471 + + drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 398 + + drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c | 784 + + drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c | 756 + + .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | 1280 + + drivers/staging/ath6kl/htc2/htc.c | 579 + + drivers/staging/ath6kl/htc2/htc_debug.h | 38 + + drivers/staging/ath6kl/htc2/htc_internal.h | 220 + + drivers/staging/ath6kl/htc2/htc_recv.c | 1578 ++ + drivers/staging/ath6kl/htc2/htc_send.c | 1023 + + drivers/staging/ath6kl/htc2/htc_services.c | 450 + + drivers/staging/ath6kl/include/a_config.h | 53 + + drivers/staging/ath6kl/include/a_debug.h | 224 + + drivers/staging/ath6kl/include/a_drv.h | 54 + + drivers/staging/ath6kl/include/a_drv_api.h | 232 + + drivers/staging/ath6kl/include/a_osapi.h | 61 + + drivers/staging/ath6kl/include/a_types.h | 58 + + drivers/staging/ath6kl/include/aggr_recv_api.h | 140 + + drivers/staging/ath6kl/include/ar3kconfig.h | 65 + + drivers/staging/ath6kl/include/ar6000_api.h | 54 + + drivers/staging/ath6kl/include/ar6000_diag.h | 48 + + drivers/staging/ath6kl/include/ar6kap_common.h | 44 + + drivers/staging/ath6kl/include/athbtfilter.h | 135 + + drivers/staging/ath6kl/include/athendpack.h | 52 + + drivers/staging/ath6kl/include/athstartpack.h | 55 + + drivers/staging/ath6kl/include/bmi.h | 135 + + .../ath6kl/include/common/AR6002/AR6002_regdump.h | 60 + + .../ath6kl/include/common/AR6002/AR6K_version.h | 52 + + .../staging/ath6kl/include/common/AR6002/addrs.h | 90 + + .../common/AR6002/hw2.0/hw/analog_intf_reg.h | 64 + + .../include/common/AR6002/hw2.0/hw/analog_reg.h | 1932 ++ + .../include/common/AR6002/hw2.0/hw/apb_map.h | 13 + + .../include/common/AR6002/hw2.0/hw/gpio_reg.h | 977 + + .../include/common/AR6002/hw2.0/hw/mbox_host_reg.h | 386 + + .../include/common/AR6002/hw2.0/hw/mbox_reg.h | 481 + + .../include/common/AR6002/hw2.0/hw/rtc_reg.h | 1163 + + .../ath6kl/include/common/AR6002/hw2.0/hw/si_reg.h | 186 + + .../include/common/AR6002/hw2.0/hw/uart_reg.h | 327 + + .../include/common/AR6002/hw2.0/hw/vmc_reg.h | 76 + + .../common/AR6002/hw4.0/hw/analog_intf_ares_reg.h | 3291 +++ + .../AR6002/hw4.0/hw/analog_intf_athr_wlan_reg.h | 3674 +++ + .../common/AR6002/hw4.0/hw/analog_intf_reg.h | 37 + + .../common/AR6002/hw4.0/hw/apb_athr_wlan_map.h | 40 + + .../include/common/AR6002/hw4.0/hw/apb_map.h | 48 + + .../include/common/AR6002/hw4.0/hw/bb_lc_reg.h | 7076 +++++ + .../include/common/AR6002/hw4.0/hw/efuse_reg.h | 108 + + .../common/AR6002/hw4.0/hw/gpio_athr_wlan_reg.h | 1253 + + .../include/common/AR6002/hw4.0/hw/gpio_reg.h | 1094 + + .../include/common/AR6002/hw4.0/hw/mac_dma_reg.h | 605 + + .../include/common/AR6002/hw4.0/hw/mac_pcu_reg.h | 3065 ++ + .../include/common/AR6002/hw4.0/hw/mbox_host_reg.h | 37 + + .../include/common/AR6002/hw4.0/hw/mbox_reg.h | 560 + + .../common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h | 522 + + .../include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h | 638 + + .../include/common/AR6002/hw4.0/hw/rdma_reg.h | 564 + + .../include/common/AR6002/hw4.0/hw/rtc_reg.h | 975 + + .../include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h | 2065 ++ + .../ath6kl/include/common/AR6002/hw4.0/hw/si_reg.h | 209 + + .../include/common/AR6002/hw4.0/hw/uart_reg.h | 260 + + .../include/common/AR6002/hw4.0/hw/umbox_reg.h | 37 + + .../common/AR6002/hw4.0/hw/umbox_wlan_reg.h | 322 + + .../include/common/AR6002/hw4.0/hw/vmc_reg.h | 167 + + .../include/common/AR6002/hw4.0/hw/vmc_wlan_reg.h | 195 + + drivers/staging/ath6kl/include/common/a_hci.h | 682 + + drivers/staging/ath6kl/include/common/athdefs.h | 84 + + drivers/staging/ath6kl/include/common/bmi_msg.h | 241 + + drivers/staging/ath6kl/include/common/btcoexGpio.h | 86 + + drivers/staging/ath6kl/include/common/cnxmgmt.h | 36 + + drivers/staging/ath6kl/include/common/dbglog.h | 134 + + drivers/staging/ath6kl/include/common/dbglog_id.h | 558 + + drivers/staging/ath6kl/include/common/discovery.h | 75 + + .../staging/ath6kl/include/common/dset_internal.h | 63 + + drivers/staging/ath6kl/include/common/dsetid.h | 134 + + .../staging/ath6kl/include/common/epping_test.h | 120 + + drivers/staging/ath6kl/include/common/gmboxif.h | 78 + + drivers/staging/ath6kl/include/common/gpio.h | 45 + + drivers/staging/ath6kl/include/common/htc.h | 236 + + .../staging/ath6kl/include/common/htc_services.h | 52 + + drivers/staging/ath6kl/include/common/ini_dset.h | 82 + + drivers/staging/ath6kl/include/common/pkt_log.h | 45 + + drivers/staging/ath6kl/include/common/regDb.h | 29 + + drivers/staging/ath6kl/include/common/regdump.h | 59 + + .../include/common/regulatory/reg_dbschema.h | 237 + + .../include/common/regulatory/reg_dbvalues.h | 504 + + drivers/staging/ath6kl/include/common/roaming.h | 41 + + drivers/staging/ath6kl/include/common/targaddrs.h | 245 + + drivers/staging/ath6kl/include/common/testcmd.h | 185 + + drivers/staging/ath6kl/include/common/tlpm.h | 38 + + drivers/staging/ath6kl/include/common/wlan_defs.h | 79 + + drivers/staging/ath6kl/include/common/wlan_dset.h | 33 + + drivers/staging/ath6kl/include/common/wmi.h | 3119 +++ + drivers/staging/ath6kl/include/common/wmi_thin.h | 347 + + drivers/staging/ath6kl/include/common/wmix.h | 279 + + drivers/staging/ath6kl/include/common_drv.h | 108 + + drivers/staging/ath6kl/include/dbglog_api.h | 52 + + drivers/staging/ath6kl/include/dl_list.h | 153 + + drivers/staging/ath6kl/include/dset_api.h | 65 + + drivers/staging/ath6kl/include/gpio_api.h | 59 + + drivers/staging/ath6kl/include/hci_transport_api.h | 259 + + drivers/staging/ath6kl/include/hif.h | 458 + + drivers/staging/ath6kl/include/host_version.h | 52 + + drivers/staging/ath6kl/include/htc_api.h | 575 + + drivers/staging/ath6kl/include/htc_packet.h | 227 + + drivers/staging/ath6kl/include/target_reg_table.h | 244 + + drivers/staging/ath6kl/include/wlan_api.h | 128 + + drivers/staging/ath6kl/include/wmi_api.h | 441 + + drivers/staging/ath6kl/miscdrv/ar3kconfig.c | 566 + + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 572 + + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h | 79 + + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c | 969 + + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h | 127 + + drivers/staging/ath6kl/miscdrv/common_drv.c | 1027 + + drivers/staging/ath6kl/miscdrv/credit_dist.c | 418 + + drivers/staging/ath6kl/miscdrv/miscdrv.h | 42 + + drivers/staging/ath6kl/os/linux/ar6000_android.c | 413 + + drivers/staging/ath6kl/os/linux/ar6000_drv.c | 6449 +++++ + drivers/staging/ath6kl/os/linux/ar6000_pm.c | 731 + + drivers/staging/ath6kl/os/linux/ar6000_raw_if.c | 455 + + drivers/staging/ath6kl/os/linux/ar6k_pal.c | 481 + + drivers/staging/ath6kl/os/linux/cfg80211.c | 1472 + + drivers/staging/ath6kl/os/linux/eeprom.c | 574 + + .../staging/ath6kl/os/linux/export_hci_transport.c | 125 + + drivers/staging/ath6kl/os/linux/hci_bridge.c | 1144 + + .../staging/ath6kl/os/linux/include/ar6000_drv.h | 770 + + drivers/staging/ath6kl/os/linux/include/ar6k_pal.h | 36 + + .../ath6kl/os/linux/include/ar6xapi_linux.h | 197 + + .../staging/ath6kl/os/linux/include/athdrv_linux.h | 1219 + + .../ath6kl/os/linux/include/athtypes_linux.h | 53 + + drivers/staging/ath6kl/os/linux/include/cfg80211.h | 50 + + .../staging/ath6kl/os/linux/include/config_linux.h | 60 + + .../staging/ath6kl/os/linux/include/debug_linux.h | 50 + + .../ath6kl/os/linux/include/export_hci_transport.h | 76 + + .../ath6kl/os/linux/include/ieee80211_ioctl.h | 179 + + .../staging/ath6kl/os/linux/include/osapi_linux.h | 387 + + .../staging/ath6kl/os/linux/include/wlan_config.h | 111 + + .../ath6kl/os/linux/include/wmi_filter_linux.h | 293 + + drivers/staging/ath6kl/os/linux/ioctl.c | 4733 ++++ + drivers/staging/ath6kl/os/linux/netbuf.c | 236 + + drivers/staging/ath6kl/os/linux/wireless_ext.c | 2725 ++ + drivers/staging/ath6kl/reorder/aggr_rx_internal.h | 116 + + drivers/staging/ath6kl/reorder/rcv_aggr.c | 666 + + drivers/staging/ath6kl/wlan/include/ieee80211.h | 401 + + .../staging/ath6kl/wlan/include/ieee80211_node.h | 93 + + drivers/staging/ath6kl/wlan/src/wlan_node.c | 636 + + drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c | 200 + + drivers/staging/ath6kl/wlan/src/wlan_utils.c | 61 + + drivers/staging/ath6kl/wmi/wmi.c | 6670 +++++ + drivers/staging/ath6kl/wmi/wmi_host.h | 102 + + drivers/staging/batman-adv/CHANGELOG | 63 - + drivers/staging/batman-adv/Makefile | 2 +- + drivers/staging/batman-adv/README | 45 +- + drivers/staging/batman-adv/TODO | 8 +- + drivers/staging/batman-adv/aggregation.c | 57 +- + drivers/staging/batman-adv/bat_sysfs.c | 106 +- + drivers/staging/batman-adv/bitarray.c | 22 +- + drivers/staging/batman-adv/bitarray.h | 7 +- + drivers/staging/batman-adv/hard-interface.c | 224 +- + drivers/staging/batman-adv/hard-interface.h | 6 +- + drivers/staging/batman-adv/hash.c | 6 +- + drivers/staging/batman-adv/hash.h | 4 +- + drivers/staging/batman-adv/icmp_socket.c | 70 +- + drivers/staging/batman-adv/main.c | 141 +- + drivers/staging/batman-adv/main.h | 28 +- + drivers/staging/batman-adv/originator.c | 166 +- + drivers/staging/batman-adv/originator.h | 8 +- + drivers/staging/batman-adv/packet.h | 26 +- + drivers/staging/batman-adv/routing.c | 444 +- + drivers/staging/batman-adv/routing.h | 16 +- + drivers/staging/batman-adv/send.c | 166 +- + drivers/staging/batman-adv/send.h | 7 +- + drivers/staging/batman-adv/soft-interface.c | 241 +- + drivers/staging/batman-adv/soft-interface.h | 13 +- + drivers/staging/batman-adv/translation-table.c | 266 +- + drivers/staging/batman-adv/translation-table.h | 30 +- + drivers/staging/batman-adv/types.h | 95 +- + drivers/staging/batman-adv/unicast.c | 269 + + drivers/staging/batman-adv/unicast.h | 39 + + drivers/staging/batman-adv/vis.c | 500 +- + drivers/staging/batman-adv/vis.h | 27 +- + drivers/staging/bcm/Adapter.h | 714 + + drivers/staging/bcm/Arp.c | 94 + + drivers/staging/bcm/Bcmchar.c | 2420 ++ + drivers/staging/bcm/Bcmnet.c | 266 + + drivers/staging/bcm/CmHost.c | 2443 ++ + drivers/staging/bcm/CmHost.h | 166 + + drivers/staging/bcm/DDRInit.c | 1302 + + drivers/staging/bcm/DDRInit.h | 9 + + drivers/staging/bcm/Debug.c | 41 + + drivers/staging/bcm/Debug.h | 297 + + drivers/staging/bcm/HandleControlPacket.c | 247 + + drivers/staging/bcm/HostMIBSInterface.h | 230 + + drivers/staging/bcm/HostMibs.h | 7 + + drivers/staging/bcm/IPv6Protocol.c | 400 + + drivers/staging/bcm/IPv6ProtocolHdr.h | 119 + + drivers/staging/bcm/InterfaceAdapter.h | 97 + + drivers/staging/bcm/InterfaceDld.c | 509 + + drivers/staging/bcm/InterfaceIdleMode.c | 318 + + drivers/staging/bcm/InterfaceIdleMode.h | 16 + + drivers/staging/bcm/InterfaceInit.c | 870 + + drivers/staging/bcm/InterfaceInit.h | 51 + + drivers/staging/bcm/InterfaceIsr.c | 203 + + drivers/staging/bcm/InterfaceIsr.h | 15 + + drivers/staging/bcm/InterfaceMacros.h | 18 + + drivers/staging/bcm/InterfaceMisc.c | 290 + + drivers/staging/bcm/InterfaceMisc.h | 45 + + drivers/staging/bcm/InterfaceRx.c | 256 + + drivers/staging/bcm/InterfaceRx.h | 7 + + drivers/staging/bcm/InterfaceTx.c | 259 + + drivers/staging/bcm/InterfaceTx.h | 13 + + drivers/staging/bcm/Interfacemain.h | 10 + + drivers/staging/bcm/Ioctl.h | 360 + + drivers/staging/bcm/Kconfig | 7 + + drivers/staging/bcm/LeakyBucket.c | 399 + + drivers/staging/bcm/Macros.h | 399 + + drivers/staging/bcm/Makefile | 12 + + drivers/staging/bcm/Misc.c | 2239 ++ + drivers/staging/bcm/Osal_Misc.c | 27 + + drivers/staging/bcm/PHSDefines.h | 125 + + drivers/staging/bcm/PHSModule.c | 1641 ++ + drivers/staging/bcm/PHSModule.h | 95 + + drivers/staging/bcm/Protocol.h | 151 + + drivers/staging/bcm/Prototypes.h | 323 + + drivers/staging/bcm/Qos.c | 893 + + drivers/staging/bcm/Queue.h | 31 + + drivers/staging/bcm/TODO | 15 + + drivers/staging/bcm/Transmit.c | 553 + + drivers/staging/bcm/Typedefs.h | 47 + + drivers/staging/bcm/Version.h | 35 + + drivers/staging/bcm/cntrl_SignalingInterface.h | 677 + + drivers/staging/bcm/headers.h | 109 + + drivers/staging/bcm/hostmibs.c | 164 + + drivers/staging/bcm/led_control.c | 1006 + + drivers/staging/bcm/led_control.h | 106 + + drivers/staging/bcm/nvm.c | 5614 ++++ + drivers/staging/bcm/nvm.h | 489 + + drivers/staging/bcm/osal_misc.h | 49 + + drivers/staging/bcm/sort.c | 63 + + drivers/staging/bcm/target_params.h | 81 + + drivers/staging/bcm/vendorspecificextn.c | 146 + + drivers/staging/bcm/vendorspecificextn.h | 18 + + drivers/staging/brcm80211/Kconfig | 14 + + drivers/staging/brcm80211/Makefile | 65 + + drivers/staging/brcm80211/README | 94 + + drivers/staging/brcm80211/TODO | 47 + + drivers/staging/brcm80211/include/aidmp.h | 374 + + drivers/staging/brcm80211/include/bcm_rpc.h | 80 + + drivers/staging/brcm80211/include/bcm_rpc_tp.h | 137 + + drivers/staging/brcm80211/include/bcm_xdr.h | 60 + + drivers/staging/brcm80211/include/bcmdefs.h | 224 + + drivers/staging/brcm80211/include/bcmdevs.h | 187 + + drivers/staging/brcm80211/include/bcmendian.h | 305 + + drivers/staging/brcm80211/include/bcmnvram.h | 173 + + drivers/staging/brcm80211/include/bcmotp.h | 44 + + drivers/staging/brcm80211/include/bcmsdbus.h | 113 + + drivers/staging/brcm80211/include/bcmsdh.h | 198 + + drivers/staging/brcm80211/include/bcmsdh_sdmmc.h | 108 + + drivers/staging/brcm80211/include/bcmsdpcm.h | 255 + + drivers/staging/brcm80211/include/bcmsrom.h | 34 + + drivers/staging/brcm80211/include/bcmsrom_fmt.h | 367 + + drivers/staging/brcm80211/include/bcmsrom_tbl.h | 583 + + drivers/staging/brcm80211/include/bcmutils.h | 566 + + drivers/staging/brcm80211/include/bcmwifi.h | 207 + + drivers/staging/brcm80211/include/bcmwpa.h | 86 + + drivers/staging/brcm80211/include/bitfuncs.h | 86 + + drivers/staging/brcm80211/include/d11.h | 1778 ++ + drivers/staging/brcm80211/include/dbus.h | 355 + + drivers/staging/brcm80211/include/epivers.h | 44 + + drivers/staging/brcm80211/include/hnddma.h | 243 + + drivers/staging/brcm80211/include/hndpmu.h | 71 + + drivers/staging/brcm80211/include/hndsoc.h | 199 + + drivers/staging/brcm80211/include/hndtcam.h | 48 + + drivers/staging/brcm80211/include/linux_osl.h | 385 + + drivers/staging/brcm80211/include/linuxver.h | 109 + + drivers/staging/brcm80211/include/nicpci.h | 79 + + drivers/staging/brcm80211/include/osl.h | 59 + + .../staging/brcm80211/include/packed_section_end.h | 32 + + .../brcm80211/include/packed_section_start.h | 36 + + drivers/staging/brcm80211/include/pci_core.h | 122 + + drivers/staging/brcm80211/include/pcicfg.h | 524 + + drivers/staging/brcm80211/include/pcie_core.h | 299 + + drivers/staging/brcm80211/include/proto/802.11.h | 1436 + + drivers/staging/brcm80211/include/proto/802.11e.h | 110 + + drivers/staging/brcm80211/include/proto/802.1d.h | 37 + + drivers/staging/brcm80211/include/proto/bcmevent.h | 214 + + drivers/staging/brcm80211/include/proto/ethernet.h | 113 + + drivers/staging/brcm80211/include/proto/wpa.h | 128 + + drivers/staging/brcm80211/include/qmath.h | 80 + + drivers/staging/brcm80211/include/rpc_osl.h | 33 + + drivers/staging/brcm80211/include/sbchipc.h | 1588 ++ + drivers/staging/brcm80211/include/sbconfig.h | 272 + + drivers/staging/brcm80211/include/sbhnddma.h | 315 + + drivers/staging/brcm80211/include/sbhndpio.h | 52 + + drivers/staging/brcm80211/include/sbpcmcia.h | 217 + + drivers/staging/brcm80211/include/sbsdio.h | 152 + + drivers/staging/brcm80211/include/sbsdpcmdev.h | 281 + + drivers/staging/brcm80211/include/sbsocram.h | 175 + + drivers/staging/brcm80211/include/sdio.h | 552 + + drivers/staging/brcm80211/include/sdioh.h | 63 + + drivers/staging/brcm80211/include/sdiovar.h | 46 + + drivers/staging/brcm80211/include/siutils.h | 455 + + drivers/staging/brcm80211/include/spid.h | 155 + + drivers/staging/brcm80211/include/typedefs.h | 214 + + drivers/staging/brcm80211/include/wlioctl.h | 2007 ++ + drivers/staging/brcm80211/phy/phy_version.h | 36 + + drivers/staging/brcm80211/phy/wlc_phy_cmn.c | 3455 +++ + drivers/staging/brcm80211/phy/wlc_phy_hal.h | 263 + + drivers/staging/brcm80211/phy/wlc_phy_int.h | 1229 + + drivers/staging/brcm80211/phy/wlc_phy_lcn.c | 5329 ++++ + drivers/staging/brcm80211/phy/wlc_phy_lcn.h | 121 + + drivers/staging/brcm80211/phy/wlc_phy_n.c |29231 ++++++++++++++++++++ + drivers/staging/brcm80211/phy/wlc_phy_radio.h | 1533 + + drivers/staging/brcm80211/phy/wlc_phyreg_n.h | 167 + + drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c | 3639 +++ + drivers/staging/brcm80211/phy/wlc_phytbl_lcn.h | 49 + + drivers/staging/brcm80211/phy/wlc_phytbl_n.c |10631 +++++++ + drivers/staging/brcm80211/phy/wlc_phytbl_n.h | 39 + + drivers/staging/brcm80211/sys/d11ucode_ext.h | 35 + + drivers/staging/brcm80211/sys/wl_dbg.h | 82 + + drivers/staging/brcm80211/sys/wl_export.h | 63 + + drivers/staging/brcm80211/sys/wl_mac80211.c | 2552 ++ + drivers/staging/brcm80211/sys/wl_mac80211.h | 171 + + drivers/staging/brcm80211/sys/wl_ucode.h | 38 + + drivers/staging/brcm80211/sys/wl_ucode_loader.c | 89 + + drivers/staging/brcm80211/sys/wlc_alloc.c | 394 + + drivers/staging/brcm80211/sys/wlc_alloc.h | 25 + + drivers/staging/brcm80211/sys/wlc_ampdu.c | 1421 + + drivers/staging/brcm80211/sys/wlc_ampdu.h | 40 + + drivers/staging/brcm80211/sys/wlc_antsel.c | 329 + + drivers/staging/brcm80211/sys/wlc_antsel.h | 28 + + drivers/staging/brcm80211/sys/wlc_bmac.c | 4212 +++ + drivers/staging/brcm80211/sys/wlc_bmac.h | 277 + + drivers/staging/brcm80211/sys/wlc_bsscfg.h | 152 + + drivers/staging/brcm80211/sys/wlc_cfg.h | 310 + + drivers/staging/brcm80211/sys/wlc_channel.c | 1599 ++ + drivers/staging/brcm80211/sys/wlc_channel.h | 159 + + drivers/staging/brcm80211/sys/wlc_event.c | 229 + + drivers/staging/brcm80211/sys/wlc_event.h | 51 + + drivers/staging/brcm80211/sys/wlc_key.h | 143 + + drivers/staging/brcm80211/sys/wlc_mac80211.c | 9144 ++++++ + drivers/staging/brcm80211/sys/wlc_mac80211.h | 1039 + + drivers/staging/brcm80211/sys/wlc_phy_shim.c | 251 + + drivers/staging/brcm80211/sys/wlc_phy_shim.h | 115 + + drivers/staging/brcm80211/sys/wlc_pub.h | 714 + + drivers/staging/brcm80211/sys/wlc_rate.c | 498 + + drivers/staging/brcm80211/sys/wlc_rate.h | 170 + + drivers/staging/brcm80211/sys/wlc_rpc.h | 527 + + drivers/staging/brcm80211/sys/wlc_rpctx.h | 71 + + drivers/staging/brcm80211/sys/wlc_scb.h | 211 + + drivers/staging/brcm80211/sys/wlc_stf.c | 593 + + drivers/staging/brcm80211/sys/wlc_stf.h | 42 + + drivers/staging/brcm80211/sys/wlc_types.h | 52 + + drivers/staging/brcm80211/util/aiutils.c | 796 + + drivers/staging/brcm80211/util/bcmotp.c | 963 + + drivers/staging/brcm80211/util/bcmsrom.c | 2093 ++ + drivers/staging/brcm80211/util/bcmutils.c | 1487 + + drivers/staging/brcm80211/util/bcmwifi.c | 318 + + drivers/staging/brcm80211/util/bcmwpa.c | 52 + + drivers/staging/brcm80211/util/hnddma.c | 2699 ++ + drivers/staging/brcm80211/util/hndpmu.c | 2684 ++ + drivers/staging/brcm80211/util/linux_osl.c | 519 + + drivers/staging/brcm80211/util/nicpci.c | 883 + + drivers/staging/brcm80211/util/nvram/nvram_ro.c | 211 + + drivers/staging/brcm80211/util/qmath.c | 680 + + drivers/staging/brcm80211/util/siutils.c | 2961 ++ + drivers/staging/brcm80211/util/siutils_priv.h | 32 + + drivers/staging/comedi/comedi_fops.c | 3 +- + .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 4 +- + .../comedi/drivers/addi-data/hwdrv_apci035.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1032.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1516.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci2016.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci2032.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci2200.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3501.c | 2 +- + drivers/staging/comedi/drivers/adl_pci6208.c | 5 +- + drivers/staging/comedi/drivers/adl_pci9111.c | 202 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 7 +- + drivers/staging/comedi/drivers/adv_pci1710.c | 13 +- + drivers/staging/comedi/drivers/adv_pci1723.c | 5 +- + drivers/staging/comedi/drivers/adv_pci_dio.c | 29 +- + drivers/staging/comedi/drivers/aio_aio12_8.c | 6 +- + drivers/staging/comedi/drivers/aio_iiro_16.c | 6 +- + drivers/staging/comedi/drivers/cb_pcidas.c | 19 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 62 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 15 +- + drivers/staging/comedi/drivers/cb_pcidio.c | 9 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 6 +- + drivers/staging/comedi/drivers/dt2817.c | 14 +- + drivers/staging/comedi/drivers/dt3000.c | 17 +- + drivers/staging/comedi/drivers/dt9812.c | 2 +- + drivers/staging/comedi/drivers/me4000.c | 29 +- + drivers/staging/comedi/drivers/ni_labpc.c | 6 +- + drivers/staging/comedi/drivers/rtd520.c | 7 +- + drivers/staging/comedi/drivers/skel.c | 7 +- + drivers/staging/comedi/drivers/usbdux.c | 2 +- + drivers/staging/crystalhd/crystalhd_lnx.c | 1 + + drivers/staging/crystalhd/crystalhd_lnx.h | 2 +- + drivers/staging/cx25821/cx25821-audio-upstream.c | 15 +- + drivers/staging/cx25821/cx25821-audio.h | 16 +- + drivers/staging/cx25821/cx25821-core.c | 13 +- + drivers/staging/cxt1e1/Kconfig | 2 +- + drivers/staging/cxt1e1/functions.c | 4 +- + drivers/staging/cxt1e1/sbeproc.c | 5 +- + drivers/staging/dream/pmem.c | 2 +- + drivers/staging/et131x/et131x_initpci.c | 2 +- + drivers/staging/frontier/alphatrack.c | 2 +- + drivers/staging/frontier/tranzport.c | 2 +- + drivers/staging/hv/TODO | 2 - + drivers/staging/hv/channel_interface.c | 29 +- + drivers/staging/hv/channel_interface.h | 2 - + drivers/staging/hv/vmbus.c | 9 - + drivers/staging/hv/vmbus_api.h | 4 +- + drivers/staging/hv/vmbus_drv.c | 4 +- + .../iio/Documentation/lis3l02dqbuffersimple.c | 4 +- + drivers/staging/iio/Documentation/overview.txt | 17 +- + drivers/staging/iio/Documentation/ring.txt | 6 +- + .../{sysfs-class-iio => sysfs-bus-iio} | 72 +- + drivers/staging/iio/Documentation/userspace.txt | 56 +- + drivers/staging/iio/accel/accel.h | 42 +- + drivers/staging/iio/accel/adis16209_core.c | 34 +- + drivers/staging/iio/accel/adis16209_ring.c | 49 +- + drivers/staging/iio/accel/adis16209_trigger.c | 2 +- + drivers/staging/iio/accel/adis16220_core.c | 14 +- + drivers/staging/iio/accel/adis16240_core.c | 27 +- + drivers/staging/iio/accel/adis16240_ring.c | 41 +- + drivers/staging/iio/accel/adis16240_trigger.c | 2 +- + drivers/staging/iio/accel/inclinometer.h | 2 + + drivers/staging/iio/accel/lis3l02dq_core.c | 2 +- + drivers/staging/iio/accel/lis3l02dq_ring.c | 65 +- + drivers/staging/iio/accel/sca3000.h | 2 +- + drivers/staging/iio/accel/sca3000_core.c | 4 +- + drivers/staging/iio/accel/sca3000_ring.c | 34 +- + drivers/staging/iio/adc/adc.h | 7 + + drivers/staging/iio/adc/max1363_core.c | 1 - + drivers/staging/iio/adc/max1363_ring.c | 18 +- + drivers/staging/iio/chrdev.h | 2 - + drivers/staging/iio/gyro/adis16260_core.c | 22 +- + drivers/staging/iio/gyro/adis16260_ring.c | 39 +- + drivers/staging/iio/gyro/adis16260_trigger.c | 2 +- + drivers/staging/iio/gyro/gyro.h | 46 +- + drivers/staging/iio/iio.h | 106 +- + drivers/staging/iio/imu/adis16300_core.c | 36 +- + drivers/staging/iio/imu/adis16300_ring.c | 51 +- + drivers/staging/iio/imu/adis16300_trigger.c | 2 +- + drivers/staging/iio/imu/adis16350_core.c | 45 +- + drivers/staging/iio/imu/adis16350_ring.c | 55 +- + drivers/staging/iio/imu/adis16350_trigger.c | 2 +- + drivers/staging/iio/imu/adis16400_core.c | 51 +- + drivers/staging/iio/imu/adis16400_ring.c | 57 +- + drivers/staging/iio/imu/adis16400_trigger.c | 2 +- + drivers/staging/iio/industrialio-core.c | 88 +- + drivers/staging/iio/industrialio-ring.c | 57 +- + drivers/staging/iio/magnetometer/Kconfig | 10 + + drivers/staging/iio/magnetometer/Makefile | 1 + + drivers/staging/iio/magnetometer/ak8975.c | 558 + + drivers/staging/iio/magnetometer/hmc5843.c | 61 +- + drivers/staging/iio/magnetometer/magnet.h | 12 +- + drivers/staging/iio/ring_generic.h | 181 +- + drivers/staging/iio/ring_sw.c | 79 +- + drivers/staging/iio/ring_sw.h | 12 +- + drivers/staging/iio/sysfs.h | 100 +- + drivers/staging/iio/trigger.h | 6 +- + drivers/staging/iio/trigger/iio-trig-gpio.c | 2 +- + .../staging/iio/trigger/iio-trig-periodic-rtc.c | 12 +- + drivers/staging/keucr/Kconfig | 13 + + drivers/staging/keucr/Makefile | 16 + + drivers/staging/keucr/TODO | 14 + + drivers/staging/keucr/common.h | 26 + + drivers/staging/keucr/init.c | 541 + + drivers/staging/keucr/init.h | 2066 ++ + drivers/staging/keucr/ms.c | 956 + + drivers/staging/keucr/ms.h | 381 + + drivers/staging/keucr/msscsi.c | 320 + + drivers/staging/keucr/scsiglue.c | 448 + + drivers/staging/keucr/scsiglue.h | 10 + + drivers/staging/keucr/sdscsi.c | 210 + + drivers/staging/keucr/smcommon.h | 33 + + drivers/staging/keucr/smil.h | 290 + + drivers/staging/keucr/smilecc.c | 201 + + drivers/staging/keucr/smilmain.c | 1852 ++ + drivers/staging/keucr/smilsub.c | 1661 ++ + drivers/staging/keucr/smscsi.c | 189 + + drivers/staging/keucr/transport.c | 788 + + drivers/staging/keucr/transport.h | 144 + + drivers/staging/keucr/usb.c | 709 + + drivers/staging/keucr/usb.h | 238 + + drivers/staging/line6/Kconfig | 67 +- + drivers/staging/line6/audio.c | 16 +- + drivers/staging/line6/audio.h | 7 +- + drivers/staging/line6/capture.c | 231 +- + drivers/staging/line6/capture.h | 25 +- + drivers/staging/line6/control.c | 46 +- + drivers/staging/line6/control.h | 190 +- + drivers/staging/line6/driver.c | 569 +- + drivers/staging/line6/driver.h | 57 +- + drivers/staging/line6/dumprequest.c | 60 +- + drivers/staging/line6/dumprequest.h | 28 +- + drivers/staging/line6/midi.c | 96 +- + drivers/staging/line6/midi.h | 9 +- + drivers/staging/line6/midibuf.c | 90 +- + drivers/staging/line6/midibuf.h | 31 +- + drivers/staging/line6/pcm.c | 320 +- + drivers/staging/line6/pcm.h | 144 +- + drivers/staging/line6/playback.c | 313 +- + drivers/staging/line6/playback.h | 28 +- + drivers/staging/line6/pod.c | 758 +- + drivers/staging/line6/pod.h | 127 +- + drivers/staging/line6/revision.h | 2 +- + drivers/staging/line6/toneport.c | 276 +- + drivers/staging/line6/toneport.h | 33 +- + drivers/staging/line6/usbdefs.h | 42 +- + drivers/staging/line6/variax.c | 356 +- + drivers/staging/line6/variax.h | 84 +- + drivers/staging/lirc/lirc_imon.c | 16 +- + drivers/staging/lirc/lirc_sasem.c | 15 +- + drivers/staging/lirc/lirc_zilog.c | 10 +- + drivers/staging/msm/mddihost.c | 2 +- + drivers/staging/msm/mdp.c | 10 +- + drivers/staging/msm/msm_fb.c | 2 +- + drivers/staging/msm/staging-devices.c | 2 +- + drivers/staging/octeon/cvmx-fpa.c | 2 +- + drivers/staging/octeon/cvmx-fpa.h | 2 +- + drivers/staging/octeon/ethernet.c | 5 +- + drivers/staging/otus/80211core/ratectrl.c | 26 +- + drivers/staging/otus/ioctl.c | 5 +- + drivers/staging/otus/wrap_ev.c | 15 +- + drivers/staging/otus/wwrap.c | 4 +- + drivers/staging/pohmelfs/config.c | 34 +- + drivers/staging/quatech_usb2/quatech_usb2.c | 2 +- + drivers/staging/quickstart/quickstart.c | 7 +- + drivers/staging/rt2860/ap.h | 20 +- + drivers/staging/rt2860/common/ba_action.c | 4 +- + drivers/staging/rt2860/common/cmm_mac_usb.c | 5 +- + drivers/staging/rt2860/common/cmm_wpa.c | 4 +- + drivers/staging/rt2860/common/mlme.c | 7 +- + drivers/staging/rt2860/common/rtmp_init.c | 20 +- + drivers/staging/rt2860/eeprom.h | 4 +- + drivers/staging/rt2860/iface/rtmp_pci.h | 42 +- + drivers/staging/rt2860/iface/rtmp_usb.h | 110 +- + drivers/staging/rt2860/oid.h | 2 +- + drivers/staging/rt2860/rt_linux.c | 7 +- + drivers/staging/rt2860/rt_linux.h | 3 - + drivers/staging/rt2860/rtmp.h | 18 +- + drivers/staging/rt2860/sta/assoc.c | 7 +- + drivers/staging/rt2860/sta/connect.c | 24 +- + drivers/staging/rt2860/sta/rtmp_data.c | 4 +- + drivers/staging/rt2860/sta/sync.c | 12 +- + drivers/staging/rt2860/sta_ioctl.c | 11 +- + drivers/staging/rt2870/common/rtusb_io.c | 11 +- + drivers/staging/rtl8187se/ieee80211/ieee80211.h | 1 - + .../rtl8187se/ieee80211/ieee80211_softmac.c | 4 +- + drivers/staging/rtl8187se/r8180_core.c | 10 +- + drivers/staging/rtl8192e/ieee80211.h | 213 +- + .../staging/rtl8192e/ieee80211/ieee80211_module.c | 71 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 2 +- + .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 18 +- + drivers/staging/rtl8192e/r8180_93cx6.c | 8 +- + drivers/staging/rtl8192e/r8190_rtl8256.c | 2 - + drivers/staging/rtl8192e/r8190_rtl8256.h | 12 +- + drivers/staging/rtl8192e/r8192E.h | 7 +- + drivers/staging/rtl8192e/r8192E_core.c | 162 +- + drivers/staging/rtl8192e/r8192E_dm.c | 480 +- + drivers/staging/rtl8192e/r8192E_dm.h | 2 - + drivers/staging/rtl8192e/r8192E_wx.c | 38 +- + drivers/staging/rtl8192e/r8192E_wx.h | 2 +- + drivers/staging/rtl8192e/r8192_pm.c | 6 +- + drivers/staging/rtl8192e/r819xE_cmdpkt.c | 310 +- + drivers/staging/rtl8192e/r819xE_cmdpkt.h | 2 +- + drivers/staging/rtl8192e/r819xE_firmware.c | 40 +- + drivers/staging/rtl8192e/r819xE_phy.c | 39 +- + drivers/staging/rtl8192e/r819xE_phy.h | 50 +- + drivers/staging/rtl8192su/Kconfig | 9 - + drivers/staging/rtl8192su/Makefile | 39 - + drivers/staging/rtl8192su/TODO | 21 - + drivers/staging/rtl8192su/authors | 1 - + drivers/staging/rtl8192su/ieee80211/Makefile | 30 - + drivers/staging/rtl8192su/ieee80211/dot11d.c | 224 - + drivers/staging/rtl8192su/ieee80211/dot11d.h | 111 - + drivers/staging/rtl8192su/ieee80211/ieee80211.h | 1934 -- + .../staging/rtl8192su/ieee80211/ieee80211_crypt.c | 242 - + .../staging/rtl8192su/ieee80211/ieee80211_crypt.h | 86 - + .../rtl8192su/ieee80211/ieee80211_crypt_ccmp.c | 471 - + .../rtl8192su/ieee80211/ieee80211_crypt_tkip.c | 776 - + .../rtl8192su/ieee80211/ieee80211_crypt_wep.c | 294 - + .../staging/rtl8192su/ieee80211/ieee80211_module.c | 301 - + .../staging/rtl8192su/ieee80211/ieee80211_r8192s.h | 449 - + drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 2580 -- + .../rtl8192su/ieee80211/ieee80211_softmac.c | 3291 --- + .../rtl8192su/ieee80211/ieee80211_softmac_wx.c | 625 - + drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 916 - + drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 772 - + drivers/staging/rtl8192su/ieee80211/readme | 162 - + drivers/staging/rtl8192su/ieee80211/rtl819x_BA.h | 79 - + .../staging/rtl8192su/ieee80211/rtl819x_BAProc.c | 745 - + drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h | 530 - + .../staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 1725 -- + drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h | 540 - + drivers/staging/rtl8192su/ieee80211/rtl819x_TS.h | 71 - + .../staging/rtl8192su/ieee80211/rtl819x_TSProc.c | 631 - + drivers/staging/rtl8192su/r8192SU_HWImg.c | 647 - + drivers/staging/rtl8192su/r8192SU_HWImg.h | 60 - + drivers/staging/rtl8192su/r8192SU_led.c | 2338 -- + drivers/staging/rtl8192su/r8192SU_led.h | 93 - + drivers/staging/rtl8192su/r8192S_Efuse.c | 2199 -- + drivers/staging/rtl8192su/r8192S_Efuse.h | 79 - + drivers/staging/rtl8192su/r8192S_firmware.c | 481 - + drivers/staging/rtl8192su/r8192S_firmware.h | 210 - + drivers/staging/rtl8192su/r8192S_hw.h | 1445 - + drivers/staging/rtl8192su/r8192S_phy.c | 3634 --- + drivers/staging/rtl8192su/r8192S_phy.h | 135 - + drivers/staging/rtl8192su/r8192S_phyreg.h | 1033 - + drivers/staging/rtl8192su/r8192S_rtl6052.c | 842 - + drivers/staging/rtl8192su/r8192S_rtl6052.h | 87 - + drivers/staging/rtl8192su/r8192S_rtl8225.c | 292 - + drivers/staging/rtl8192su/r8192S_rtl8225.h | 30 - + drivers/staging/rtl8192su/r8192U.h | 1519 - + drivers/staging/rtl8192su/r8192U_core.c | 7712 ------ + drivers/staging/rtl8192su/r8192U_dm.c | 3982 --- + drivers/staging/rtl8192su/r8192U_dm.h | 254 - + drivers/staging/rtl8192su/r8192U_pm.c | 72 - + drivers/staging/rtl8192su/r8192U_pm.h | 25 - + drivers/staging/rtl8192su/r8192U_wx.c | 1296 - + drivers/staging/rtl8192su/r8192U_wx.h | 22 - + drivers/staging/rtl8192su/r819xU_HTGen.h | 22 - + drivers/staging/rtl8192su/r819xU_HTType.h | 383 - + drivers/staging/rtl8192su/r819xU_cmdpkt.c | 512 - + drivers/staging/rtl8192su/r819xU_cmdpkt.h | 192 - + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 25 +- + drivers/staging/rtl8192u/r819xU_firmware.c | 2 +- + drivers/staging/rtl8712/Kconfig | 18 + + drivers/staging/rtl8712/Makefile | 34 + + drivers/staging/rtl8712/TODO | 16 + + drivers/staging/rtl8712/basic_types.h | 23 + + drivers/staging/rtl8712/big_endian.h | 69 + + drivers/staging/rtl8712/drv_types.h | 165 + + drivers/staging/rtl8712/ethernet.h | 23 + + drivers/staging/rtl8712/farray.h |10197 +++++++ + drivers/staging/rtl8712/generic.h | 153 + + drivers/staging/rtl8712/hal_init.c | 358 + + drivers/staging/rtl8712/ieee80211.c | 454 + + drivers/staging/rtl8712/ieee80211.h | 770 + + drivers/staging/rtl8712/if_ether.h | 116 + + drivers/staging/rtl8712/ip.h | 137 + + drivers/staging/rtl8712/little_endian.h | 69 + + drivers/staging/rtl8712/mlme_linux.c | 170 + + drivers/staging/rtl8712/mlme_osdep.h | 18 + + drivers/staging/rtl8712/mp_custom_oid.h | 274 + + drivers/staging/rtl8712/os_intfs.c | 464 + + drivers/staging/rtl8712/osdep_intf.h | 19 + + drivers/staging/rtl8712/osdep_service.h | 257 + + drivers/staging/rtl8712/recv_linux.c | 169 + + drivers/staging/rtl8712/recv_osdep.h | 27 + + drivers/staging/rtl8712/rtl8712_bitdef.h | 19 + + drivers/staging/rtl8712/rtl8712_cmd.c | 465 + + drivers/staging/rtl8712/rtl8712_cmd.h | 157 + + drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h | 89 + + drivers/staging/rtl8712/rtl8712_cmdctrl_regdef.h | 15 + + drivers/staging/rtl8712/rtl8712_debugctrl_bitdef.h | 36 + + drivers/staging/rtl8712/rtl8712_debugctrl_regdef.h | 28 + + .../staging/rtl8712/rtl8712_edcasetting_bitdef.h | 52 + + .../staging/rtl8712/rtl8712_edcasetting_regdef.h | 18 + + drivers/staging/rtl8712/rtl8712_efuse.c | 568 + + drivers/staging/rtl8712/rtl8712_efuse.h | 43 + + drivers/staging/rtl8712/rtl8712_event.h | 73 + + drivers/staging/rtl8712/rtl8712_fifoctrl_bitdef.h | 126 + + drivers/staging/rtl8712/rtl8712_fifoctrl_regdef.h | 57 + + drivers/staging/rtl8712/rtl8712_gp_bitdef.h | 54 + + drivers/staging/rtl8712/rtl8712_gp_regdef.h | 17 + + drivers/staging/rtl8712/rtl8712_hal.h | 124 + + drivers/staging/rtl8712/rtl8712_interrupt_bitdef.h | 39 + + drivers/staging/rtl8712/rtl8712_io.c | 151 + + drivers/staging/rtl8712/rtl8712_led.c | 1815 ++ + .../staging/rtl8712/rtl8712_macsetting_bitdef.h | 28 + + .../staging/rtl8712/rtl8712_macsetting_regdef.h | 16 + + drivers/staging/rtl8712/rtl8712_powersave_bitdef.h | 33 + + drivers/staging/rtl8712/rtl8712_powersave_regdef.h | 20 + + drivers/staging/rtl8712/rtl8712_ratectrl_bitdef.h | 30 + + drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h | 31 + + drivers/staging/rtl8712/rtl8712_recv.c | 1131 + + drivers/staging/rtl8712/rtl8712_recv.h | 128 + + drivers/staging/rtl8712/rtl8712_regdef.h | 19 + + drivers/staging/rtl8712/rtl8712_security_bitdef.h | 29 + + drivers/staging/rtl8712/rtl8712_spec.h | 110 + + drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h | 145 + + drivers/staging/rtl8712/rtl8712_syscfg_regdef.h | 31 + + drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h | 44 + + drivers/staging/rtl8712/rtl8712_timectrl_regdef.h | 20 + + drivers/staging/rtl8712/rtl8712_wmac_bitdef.h | 37 + + drivers/staging/rtl8712/rtl8712_wmac_regdef.h | 24 + + drivers/staging/rtl8712/rtl8712_xmit.c | 509 + + drivers/staging/rtl8712/rtl8712_xmit.h | 95 + + drivers/staging/rtl8712/rtl871x_byteorder.h | 13 + + drivers/staging/rtl8712/rtl871x_cmd.c | 926 + + drivers/staging/rtl8712/rtl871x_cmd.h | 719 + + drivers/staging/rtl8712/rtl871x_debug.h | 142 + + drivers/staging/rtl8712/rtl871x_eeprom.c | 233 + + drivers/staging/rtl8712/rtl871x_eeprom.h | 82 + + drivers/staging/rtl8712/rtl871x_event.h | 95 + + drivers/staging/rtl8712/rtl871x_ht.h | 19 + + drivers/staging/rtl8712/rtl871x_io.c | 163 + + drivers/staging/rtl8712/rtl871x_io.h | 233 + + drivers/staging/rtl8712/rtl871x_ioctl.h | 97 + + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 2246 ++ + drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 535 + + drivers/staging/rtl8712/rtl871x_ioctl_rtl.h | 96 + + drivers/staging/rtl8712/rtl871x_ioctl_set.c | 379 + + drivers/staging/rtl8712/rtl871x_ioctl_set.h | 24 + + drivers/staging/rtl8712/rtl871x_led.h | 99 + + drivers/staging/rtl8712/rtl871x_mlme.c | 1840 ++ + drivers/staging/rtl8712/rtl871x_mlme.h | 208 + + drivers/staging/rtl8712/rtl871x_mp.c | 736 + + drivers/staging/rtl8712/rtl871x_mp.h | 318 + + drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 1475 + + drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 457 + + drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h | 1025 + + drivers/staging/rtl8712/rtl871x_pwrctrl.c | 250 + + drivers/staging/rtl8712/rtl871x_pwrctrl.h | 127 + + drivers/staging/rtl8712/rtl871x_recv.c | 693 + + drivers/staging/rtl8712/rtl871x_recv.h | 330 + + drivers/staging/rtl8712/rtl871x_rf.h | 43 + + drivers/staging/rtl8712/rtl871x_security.c | 1389 + + drivers/staging/rtl8712/rtl871x_security.h | 196 + + drivers/staging/rtl8712/rtl871x_sta_mgt.c | 299 + + drivers/staging/rtl8712/rtl871x_wlan_sme.h | 22 + + drivers/staging/rtl8712/rtl871x_xmit.c | 1052 + + drivers/staging/rtl8712/rtl871x_xmit.h | 260 + + drivers/staging/rtl8712/sta_info.h | 125 + + drivers/staging/rtl8712/swab.h | 106 + + drivers/staging/rtl8712/usb_halinit.c | 317 + + drivers/staging/rtl8712/usb_intf.c | 571 + + drivers/staging/rtl8712/usb_ops.c | 201 + + drivers/staging/rtl8712/usb_ops.h | 25 + + drivers/staging/rtl8712/usb_ops_linux.c | 529 + + drivers/staging/rtl8712/usb_osintf.h | 24 + + drivers/staging/rtl8712/usb_vendor_req.h | 33 + + drivers/staging/rtl8712/wifi.h | 622 + + drivers/staging/rtl8712/wlan_bssdef.h | 242 + + drivers/staging/rtl8712/xmit_linux.c | 182 + + drivers/staging/rtl8712/xmit_osdep.h | 38 + + drivers/staging/sbe-2t3e3/2t3e3.h | 894 + + drivers/staging/sbe-2t3e3/Kconfig | 13 + + drivers/staging/sbe-2t3e3/Makefile | 4 + + drivers/staging/sbe-2t3e3/TODO | 6 + + drivers/staging/sbe-2t3e3/cpld.c | 366 + + drivers/staging/sbe-2t3e3/ctrl.c | 362 + + drivers/staging/sbe-2t3e3/ctrl.h | 131 + + drivers/staging/sbe-2t3e3/dc.c | 502 + + drivers/staging/sbe-2t3e3/exar7250.c | 217 + + drivers/staging/sbe-2t3e3/exar7300.c | 182 + + drivers/staging/sbe-2t3e3/intr.c | 635 + + drivers/staging/sbe-2t3e3/io.c | 352 + + drivers/staging/sbe-2t3e3/main.c | 171 + + drivers/staging/sbe-2t3e3/maps.c | 104 + + drivers/staging/sbe-2t3e3/module.c | 210 + + drivers/staging/sbe-2t3e3/netdev.c | 142 + + drivers/staging/slicoss/slic.h | 8 +- + drivers/staging/slicoss/slicoss.c | 42 +- + drivers/staging/sm7xx/smtcfb.c | 13 +- + drivers/staging/solo6x10/solo6010-core.c | 40 +- + drivers/staging/solo6x10/solo6010-g723.c | 2 +- + drivers/staging/solo6x10/solo6010-i2c.c | 2 +- + drivers/staging/solo6x10/solo6010-p2m.c | 2 +- + drivers/staging/solo6x10/solo6010-v4l2-enc.c | 2 +- + drivers/staging/solo6x10/solo6010-v4l2.c | 2 +- + drivers/staging/spectra/Kconfig | 2 +- + drivers/staging/spectra/flash.h | 2 +- + drivers/staging/spectra/lld_nand.c | 7 +- + drivers/staging/ti-st/Kconfig | 2 +- + drivers/staging/ti-st/st.h | 1 - + drivers/staging/ti-st/st_core.c | 14 +- + drivers/staging/ti-st/st_core.h | 2 +- + drivers/staging/ti-st/st_kim.c | 29 +- + drivers/staging/tidspbridge/Makefile | 4 +- + drivers/staging/tidspbridge/core/chnl_sm.c | 1 - + drivers/staging/tidspbridge/core/dsp-clock.c | 1 - + drivers/staging/tidspbridge/core/io_sm.c | 1 - + .../staging/tidspbridge/{services => core}/sync.c | 17 + + drivers/staging/tidspbridge/core/tiomap3430.c | 1 - + drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 4 +- + drivers/staging/tidspbridge/core/tiomap_io.c | 1 - + drivers/staging/tidspbridge/gen/gb.c | 1 - + .../staging/tidspbridge/include/dspbridge/cfg.h | 222 - + .../staging/tidspbridge/include/dspbridge/drv.h | 2 +- + .../staging/tidspbridge/include/dspbridge/mgr.h | 2 +- + .../tidspbridge/include/dspbridge/services.h | 50 - + .../staging/tidspbridge/include/dspbridge/wdt.h | 2 +- + drivers/staging/tidspbridge/pmgr/chnl.c | 1 - + drivers/staging/tidspbridge/pmgr/cmm.c | 1 - + drivers/staging/tidspbridge/pmgr/dbll.c | 2 +- + drivers/staging/tidspbridge/pmgr/dev.c | 69 +- + drivers/staging/tidspbridge/pmgr/dspapi.c | 18 +- + drivers/staging/tidspbridge/pmgr/io.c | 3 - + drivers/staging/tidspbridge/rmgr/dbdcd.c | 8 + + drivers/staging/tidspbridge/rmgr/drv.c | 59 +- + drivers/staging/tidspbridge/rmgr/drv_interface.c | 14 +- + drivers/staging/tidspbridge/rmgr/dspdrv.c | 12 +- + drivers/staging/tidspbridge/rmgr/mgr.c | 52 +- + drivers/staging/tidspbridge/rmgr/node.c | 1 - + drivers/staging/tidspbridge/rmgr/proc.c | 48 +- + drivers/staging/tidspbridge/rmgr/strm.c | 1 - + drivers/staging/tidspbridge/services/cfg.c | 253 - + drivers/staging/tidspbridge/services/ntfy.c | 31 - + drivers/staging/tidspbridge/services/services.c | 70 - + drivers/staging/tm6000/tm6000-alsa.c | 7 +- + drivers/staging/tm6000/tm6000-core.c | 6 +- + drivers/staging/udlfb/udlfb.c | 987 +- + drivers/staging/udlfb/udlfb.h | 39 +- + drivers/staging/udlfb/udlfb.txt | 144 + + drivers/staging/usbip/stub_dev.c | 2 +- + drivers/staging/usbip/usbip_common.c | 2 +- + drivers/staging/vme/devices/vme_user.c | 2 +- + drivers/staging/vt6655/device_main.c | 3 +- + drivers/staging/vt6655/iocmd.h | 4 - + drivers/staging/vt6655/iwctl.c | 6 +- + drivers/staging/vt6655/vntwifi.c | 7 +- + drivers/staging/vt6656/80211mgr.h | 10 +- + drivers/staging/vt6656/baseband.c | 2 - + drivers/staging/vt6656/bssdb.c | 14 +- + drivers/staging/vt6656/card.c | 2 +- + drivers/staging/vt6656/channel.c | 12 +- + drivers/staging/vt6656/device.h | 19 +- + drivers/staging/vt6656/dpc.c | 17 +- + drivers/staging/vt6656/firmware.c | 6 +- + drivers/staging/vt6656/iocmd.h | 4 - + drivers/staging/vt6656/ioctl.c | 2 +- + drivers/staging/vt6656/iwctl.c | 20 +- + drivers/staging/vt6656/iwctl.h | 3 - + drivers/staging/vt6656/key.c | 2 +- + drivers/staging/vt6656/mac.c | 12 +- + drivers/staging/vt6656/main_usb.c | 29 +- + drivers/staging/vt6656/power.c | 6 +- + drivers/staging/vt6656/rxtx.c | 26 +- + drivers/staging/vt6656/tether.h | 32 +- + drivers/staging/vt6656/usbpipe.c | 52 +- + drivers/staging/vt6656/wcmd.c | 4 +- + drivers/staging/vt6656/wmgr.c | 19 +- + drivers/staging/vt6656/wmgr.h | 2 +- + drivers/staging/vt6656/wpa.c | 8 +- + drivers/staging/vt6656/wpactl.c | 6 +- + drivers/staging/westbridge/Kconfig | 53 + + drivers/staging/westbridge/TODO | 7 + + drivers/staging/westbridge/astoria/Kconfig | 9 + + drivers/staging/westbridge/astoria/Makefile | 11 + + drivers/staging/westbridge/astoria/api/Makefile | 14 + + .../staging/westbridge/astoria/api/src/cyasdma.c | 1107 + + .../staging/westbridge/astoria/api/src/cyasintr.c | 143 + + .../westbridge/astoria/api/src/cyaslep2pep.c | 358 + + .../westbridge/astoria/api/src/cyaslowlevel.c | 1264 + + .../staging/westbridge/astoria/api/src/cyasmisc.c | 3474 +++ + .../staging/westbridge/astoria/api/src/cyasmtp.c | 1128 + + .../westbridge/astoria/api/src/cyasstorage.c | 4104 +++ + .../staging/westbridge/astoria/api/src/cyasusb.c | 3718 +++ + .../arch/arm/mach-omap2/cyashalomap_kernel.c | 2450 ++ + .../plat-omap/include/mach/westbridge/cyashaldef.h | 55 + + .../cyashalomap_kernel.h | 319 + + .../westbridge-omap3-pnand-hal/cyasmemmap.h | 558 + + .../cyasomapdev_kernel.h | 72 + + drivers/staging/westbridge/astoria/block/Kconfig | 9 + + drivers/staging/westbridge/astoria/block/Makefile | 11 + + .../westbridge/astoria/block/cyasblkdev_block.c | 1628 ++ + .../westbridge/astoria/block/cyasblkdev_queue.c | 417 + + .../westbridge/astoria/block/cyasblkdev_queue.h | 64 + + drivers/staging/westbridge/astoria/device/Kconfig | 9 + + drivers/staging/westbridge/astoria/device/Makefile | 23 + + .../westbridge/astoria/device/cyandevice_export.h | 132 + + .../staging/westbridge/astoria/device/cyasdevice.c | 394 + + drivers/staging/westbridge/astoria/gadget/Kconfig | 9 + + drivers/staging/westbridge/astoria/gadget/Makefile | 11 + + .../staging/westbridge/astoria/gadget/cyasgadget.c | 2177 ++ + .../staging/westbridge/astoria/gadget/cyasgadget.h | 193 + + .../westbridge/astoria/gadget/cyasgadget_ioctl.h | 99 + + .../astoria/include/linux/westbridge/cyanerr.h | 418 + + .../astoria/include/linux/westbridge/cyanmedia.h | 59 + + .../astoria/include/linux/westbridge/cyanmisc.h | 614 + + .../astoria/include/linux/westbridge/cyanregs.h | 180 + + .../include/linux/westbridge/cyansdkversion.h | 30 + + .../astoria/include/linux/westbridge/cyanstorage.h | 419 + + .../astoria/include/linux/westbridge/cyantioch.h | 35 + + .../astoria/include/linux/westbridge/cyantypes.h | 31 + + .../astoria/include/linux/westbridge/cyanusb.h | 619 + + .../include/linux/westbridge/cyas_cplus_end.h | 11 + + .../include/linux/westbridge/cyas_cplus_start.h | 11 + + .../astoria/include/linux/westbridge/cyascast.h | 35 + + .../astoria/include/linux/westbridge/cyasdevice.h | 1057 + + .../astoria/include/linux/westbridge/cyasdma.h | 375 + + .../astoria/include/linux/westbridge/cyaserr.h | 1094 + + .../astoria/include/linux/westbridge/cyashal.h | 108 + + .../astoria/include/linux/westbridge/cyashalcb.h | 44 + + .../astoria/include/linux/westbridge/cyashaldoc.h | 800 + + .../astoria/include/linux/westbridge/cyasintr.h | 104 + + .../astoria/include/linux/westbridge/cyaslep2pep.h | 36 + + .../include/linux/westbridge/cyaslowlevel.h | 366 + + .../astoria/include/linux/westbridge/cyasmedia.h | 54 + + .../astoria/include/linux/westbridge/cyasmisc.h | 1549 ++ + .../include/linux/westbridge/cyasmisc_dep.h | 53 + + .../astoria/include/linux/westbridge/cyasmtp.h | 646 + + .../include/linux/westbridge/cyasprotocol.h | 3838 +++ + .../astoria/include/linux/westbridge/cyasregs.h | 201 + + .../astoria/include/linux/westbridge/cyasstorage.h | 2759 ++ + .../include/linux/westbridge/cyasstorage_dep.h | 309 + + .../astoria/include/linux/westbridge/cyastoria.h | 36 + + .../include/linux/westbridge/cyastsdkversion.h | 30 + + .../astoria/include/linux/westbridge/cyastypes.h | 71 + + .../astoria/include/linux/westbridge/cyasusb.h | 1862 ++ + .../astoria/include/linux/westbridge/cyasusb_dep.h | 224 + + drivers/staging/wlags49_h2/mdd.h | 2 +- + drivers/staging/wlags49_h2/wl_main.c | 2 +- + drivers/staging/wlags49_h2/wl_util.c | 4 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 2 +- + drivers/staging/xgifb/XGI_accel.h | 3 +- + drivers/staging/xgifb/XGI_main.h | 30 +- + drivers/staging/xgifb/XGI_main_26.c | 3876 ++-- + drivers/staging/xgifb/vb_ext.c | 1737 +- + drivers/staging/xgifb/vb_init.c | 5022 ++-- + drivers/staging/xgifb/vb_setmode.c |17041 ++++++------- + drivers/staging/xgifb/vb_table.h | 620 +- + drivers/staging/xgifb/vb_util.c | 192 +- + drivers/staging/zram/Kconfig | 12 - + drivers/staging/zram/Makefile | 2 +- + drivers/staging/zram/zram.txt | 58 +- + drivers/staging/zram/zram_drv.c | 221 +- + drivers/staging/zram/zram_drv.h | 57 +- + drivers/staging/zram/zram_ioctl.h | 41 - + drivers/staging/zram/zram_sysfs.c | 224 + + 943 files changed, 354972 insertions(+), 69350 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-block-zram + create mode 100644 drivers/staging/ath6kl/Kconfig + create mode 100644 drivers/staging/ath6kl/Makefile + create mode 100644 drivers/staging/ath6kl/TODO + create mode 100644 drivers/staging/ath6kl/bmi/include/bmi_internal.h + create mode 100644 drivers/staging/ath6kl/bmi/src/bmi.c + create mode 100644 drivers/staging/ath6kl/hif/common/hif_sdio_common.h + create mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h + create mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c + create mode 100644 drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c + create mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.c + create mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k.h + create mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c + create mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c + create mode 100644 drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c + create mode 100644 drivers/staging/ath6kl/htc2/htc.c + create mode 100644 drivers/staging/ath6kl/htc2/htc_debug.h + create mode 100644 drivers/staging/ath6kl/htc2/htc_internal.h + create mode 100644 drivers/staging/ath6kl/htc2/htc_recv.c + create mode 100644 drivers/staging/ath6kl/htc2/htc_send.c + create mode 100644 drivers/staging/ath6kl/htc2/htc_services.c + create mode 100644 drivers/staging/ath6kl/include/a_config.h + create mode 100644 drivers/staging/ath6kl/include/a_debug.h + create mode 100644 drivers/staging/ath6kl/include/a_drv.h + create mode 100644 drivers/staging/ath6kl/include/a_drv_api.h + create mode 100644 drivers/staging/ath6kl/include/a_osapi.h + create mode 100644 drivers/staging/ath6kl/include/a_types.h + create mode 100644 drivers/staging/ath6kl/include/aggr_recv_api.h + create mode 100644 drivers/staging/ath6kl/include/ar3kconfig.h + create mode 100644 drivers/staging/ath6kl/include/ar6000_api.h + create mode 100644 drivers/staging/ath6kl/include/ar6000_diag.h + create mode 100644 drivers/staging/ath6kl/include/ar6kap_common.h + create mode 100644 drivers/staging/ath6kl/include/athbtfilter.h + create mode 100644 drivers/staging/ath6kl/include/athendpack.h + create mode 100644 drivers/staging/ath6kl/include/athstartpack.h + create mode 100644 drivers/staging/ath6kl/include/bmi.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/AR6002_regdump.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/AR6K_version.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/addrs.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/analog_intf_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/analog_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/apb_map.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/gpio_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/mbox_host_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/mbox_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/rtc_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/si_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/uart_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/vmc_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/analog_intf_ares_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/analog_intf_athr_wlan_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/analog_intf_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_athr_wlan_map.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/apb_map.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/bb_lc_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/efuse_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/gpio_athr_wlan_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/gpio_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mac_dma_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mac_pcu_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_host_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rdma_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/si_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/uart_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/umbox_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/umbox_wlan_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/vmc_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/vmc_wlan_reg.h + create mode 100644 drivers/staging/ath6kl/include/common/a_hci.h + create mode 100644 drivers/staging/ath6kl/include/common/athdefs.h + create mode 100644 drivers/staging/ath6kl/include/common/bmi_msg.h + create mode 100644 drivers/staging/ath6kl/include/common/btcoexGpio.h + create mode 100644 drivers/staging/ath6kl/include/common/cnxmgmt.h + create mode 100644 drivers/staging/ath6kl/include/common/dbglog.h + create mode 100644 drivers/staging/ath6kl/include/common/dbglog_id.h + create mode 100644 drivers/staging/ath6kl/include/common/discovery.h + create mode 100644 drivers/staging/ath6kl/include/common/dset_internal.h + create mode 100644 drivers/staging/ath6kl/include/common/dsetid.h + create mode 100644 drivers/staging/ath6kl/include/common/epping_test.h + create mode 100644 drivers/staging/ath6kl/include/common/gmboxif.h + create mode 100644 drivers/staging/ath6kl/include/common/gpio.h + create mode 100644 drivers/staging/ath6kl/include/common/htc.h + create mode 100644 drivers/staging/ath6kl/include/common/htc_services.h + create mode 100644 drivers/staging/ath6kl/include/common/ini_dset.h + create mode 100644 drivers/staging/ath6kl/include/common/pkt_log.h + create mode 100644 drivers/staging/ath6kl/include/common/regDb.h + create mode 100644 drivers/staging/ath6kl/include/common/regdump.h + create mode 100644 drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h + create mode 100644 drivers/staging/ath6kl/include/common/regulatory/reg_dbvalues.h + create mode 100644 drivers/staging/ath6kl/include/common/roaming.h + create mode 100644 drivers/staging/ath6kl/include/common/targaddrs.h + create mode 100644 drivers/staging/ath6kl/include/common/testcmd.h + create mode 100644 drivers/staging/ath6kl/include/common/tlpm.h + create mode 100644 drivers/staging/ath6kl/include/common/wlan_defs.h + create mode 100644 drivers/staging/ath6kl/include/common/wlan_dset.h + create mode 100644 drivers/staging/ath6kl/include/common/wmi.h + create mode 100644 drivers/staging/ath6kl/include/common/wmi_thin.h + create mode 100644 drivers/staging/ath6kl/include/common/wmix.h + create mode 100644 drivers/staging/ath6kl/include/common_drv.h + create mode 100644 drivers/staging/ath6kl/include/dbglog_api.h + create mode 100644 drivers/staging/ath6kl/include/dl_list.h + create mode 100644 drivers/staging/ath6kl/include/dset_api.h + create mode 100644 drivers/staging/ath6kl/include/gpio_api.h + create mode 100644 drivers/staging/ath6kl/include/hci_transport_api.h + create mode 100644 drivers/staging/ath6kl/include/hif.h + create mode 100644 drivers/staging/ath6kl/include/host_version.h + create mode 100644 drivers/staging/ath6kl/include/htc_api.h + create mode 100644 drivers/staging/ath6kl/include/htc_packet.h + create mode 100644 drivers/staging/ath6kl/include/target_reg_table.h + create mode 100644 drivers/staging/ath6kl/include/wlan_api.h + create mode 100644 drivers/staging/ath6kl/include/wmi_api.h + create mode 100644 drivers/staging/ath6kl/miscdrv/ar3kconfig.c + create mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c + create mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h + create mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c + create mode 100644 drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h + create mode 100644 drivers/staging/ath6kl/miscdrv/common_drv.c + create mode 100644 drivers/staging/ath6kl/miscdrv/credit_dist.c + create mode 100644 drivers/staging/ath6kl/miscdrv/miscdrv.h + create mode 100644 drivers/staging/ath6kl/os/linux/ar6000_android.c + create mode 100644 drivers/staging/ath6kl/os/linux/ar6000_drv.c + create mode 100644 drivers/staging/ath6kl/os/linux/ar6000_pm.c + create mode 100644 drivers/staging/ath6kl/os/linux/ar6000_raw_if.c + create mode 100644 drivers/staging/ath6kl/os/linux/ar6k_pal.c + create mode 100644 drivers/staging/ath6kl/os/linux/cfg80211.c + create mode 100644 drivers/staging/ath6kl/os/linux/eeprom.c + create mode 100644 drivers/staging/ath6kl/os/linux/export_hci_transport.c + create mode 100644 drivers/staging/ath6kl/os/linux/hci_bridge.c + create mode 100644 drivers/staging/ath6kl/os/linux/include/ar6000_drv.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/ar6k_pal.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/ar6xapi_linux.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/athdrv_linux.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/athendpack_linux.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/athstartpack_linux.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/athtypes_linux.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/cfg80211.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/config_linux.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/debug_linux.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/export_hci_transport.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/osapi_linux.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/wlan_config.h + create mode 100644 drivers/staging/ath6kl/os/linux/include/wmi_filter_linux.h + create mode 100644 drivers/staging/ath6kl/os/linux/ioctl.c + create mode 100644 drivers/staging/ath6kl/os/linux/netbuf.c + create mode 100644 drivers/staging/ath6kl/os/linux/wireless_ext.c + create mode 100644 drivers/staging/ath6kl/reorder/aggr_rx_internal.h + create mode 100644 drivers/staging/ath6kl/reorder/rcv_aggr.c + create mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211.h + create mode 100644 drivers/staging/ath6kl/wlan/include/ieee80211_node.h + create mode 100644 drivers/staging/ath6kl/wlan/src/wlan_node.c + create mode 100644 drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c + create mode 100644 drivers/staging/ath6kl/wlan/src/wlan_utils.c + create mode 100644 drivers/staging/ath6kl/wmi/wmi.c + create mode 100644 drivers/staging/ath6kl/wmi/wmi_host.h + delete mode 100644 drivers/staging/batman-adv/CHANGELOG + create mode 100644 drivers/staging/batman-adv/unicast.c + create mode 100644 drivers/staging/batman-adv/unicast.h + create mode 100644 drivers/staging/bcm/Adapter.h + create mode 100644 drivers/staging/bcm/Arp.c + create mode 100644 drivers/staging/bcm/Bcmchar.c + create mode 100644 drivers/staging/bcm/Bcmnet.c + create mode 100644 drivers/staging/bcm/CmHost.c + create mode 100644 drivers/staging/bcm/CmHost.h + create mode 100644 drivers/staging/bcm/DDRInit.c + create mode 100644 drivers/staging/bcm/DDRInit.h + create mode 100644 drivers/staging/bcm/Debug.c + create mode 100644 drivers/staging/bcm/Debug.h + create mode 100644 drivers/staging/bcm/HandleControlPacket.c + create mode 100644 drivers/staging/bcm/HostMIBSInterface.h + create mode 100644 drivers/staging/bcm/HostMibs.h + create mode 100644 drivers/staging/bcm/IPv6Protocol.c + create mode 100644 drivers/staging/bcm/IPv6ProtocolHdr.h + create mode 100644 drivers/staging/bcm/InterfaceAdapter.h + create mode 100644 drivers/staging/bcm/InterfaceDld.c + create mode 100644 drivers/staging/bcm/InterfaceIdleMode.c + create mode 100644 drivers/staging/bcm/InterfaceIdleMode.h + create mode 100644 drivers/staging/bcm/InterfaceInit.c + create mode 100644 drivers/staging/bcm/InterfaceInit.h + create mode 100644 drivers/staging/bcm/InterfaceIsr.c + create mode 100644 drivers/staging/bcm/InterfaceIsr.h + create mode 100644 drivers/staging/bcm/InterfaceMacros.h + create mode 100644 drivers/staging/bcm/InterfaceMisc.c + create mode 100644 drivers/staging/bcm/InterfaceMisc.h + create mode 100644 drivers/staging/bcm/InterfaceRx.c + create mode 100644 drivers/staging/bcm/InterfaceRx.h + create mode 100644 drivers/staging/bcm/InterfaceTx.c + create mode 100644 drivers/staging/bcm/InterfaceTx.h + create mode 100644 drivers/staging/bcm/Interfacemain.h + create mode 100644 drivers/staging/bcm/Ioctl.h + create mode 100644 drivers/staging/bcm/Kconfig + create mode 100644 drivers/staging/bcm/LeakyBucket.c + create mode 100644 drivers/staging/bcm/Macros.h + create mode 100644 drivers/staging/bcm/Makefile + create mode 100644 drivers/staging/bcm/Misc.c + create mode 100644 drivers/staging/bcm/Osal_Misc.c + create mode 100644 drivers/staging/bcm/PHSDefines.h + create mode 100644 drivers/staging/bcm/PHSModule.c + create mode 100644 drivers/staging/bcm/PHSModule.h + create mode 100644 drivers/staging/bcm/Protocol.h + create mode 100644 drivers/staging/bcm/Prototypes.h + create mode 100644 drivers/staging/bcm/Qos.c + create mode 100644 drivers/staging/bcm/Queue.h + create mode 100644 drivers/staging/bcm/TODO + create mode 100644 drivers/staging/bcm/Transmit.c + create mode 100644 drivers/staging/bcm/Typedefs.h + create mode 100644 drivers/staging/bcm/Version.h + create mode 100644 drivers/staging/bcm/cntrl_SignalingInterface.h + create mode 100644 drivers/staging/bcm/headers.h + create mode 100644 drivers/staging/bcm/hostmibs.c + create mode 100644 drivers/staging/bcm/led_control.c + create mode 100644 drivers/staging/bcm/led_control.h + create mode 100644 drivers/staging/bcm/nvm.c + create mode 100644 drivers/staging/bcm/nvm.h + create mode 100644 drivers/staging/bcm/osal_misc.h + create mode 100644 drivers/staging/bcm/sort.c + create mode 100644 drivers/staging/bcm/target_params.h + create mode 100644 drivers/staging/bcm/vendorspecificextn.c + create mode 100644 drivers/staging/bcm/vendorspecificextn.h + create mode 100644 drivers/staging/brcm80211/Kconfig + create mode 100644 drivers/staging/brcm80211/Makefile + create mode 100644 drivers/staging/brcm80211/Module.symvers + create mode 100644 drivers/staging/brcm80211/README + create mode 100644 drivers/staging/brcm80211/TODO + create mode 100644 drivers/staging/brcm80211/include/aidmp.h + create mode 100644 drivers/staging/brcm80211/include/bcm_rpc.h + create mode 100644 drivers/staging/brcm80211/include/bcm_rpc_tp.h + create mode 100644 drivers/staging/brcm80211/include/bcm_xdr.h + create mode 100644 drivers/staging/brcm80211/include/bcmdefs.h + create mode 100644 drivers/staging/brcm80211/include/bcmdevs.h + create mode 100644 drivers/staging/brcm80211/include/bcmendian.h + create mode 100644 drivers/staging/brcm80211/include/bcmnvram.h + create mode 100644 drivers/staging/brcm80211/include/bcmotp.h + create mode 100644 drivers/staging/brcm80211/include/bcmsdbus.h + create mode 100644 drivers/staging/brcm80211/include/bcmsdh.h + create mode 100644 drivers/staging/brcm80211/include/bcmsdh_sdmmc.h + create mode 100644 drivers/staging/brcm80211/include/bcmsdpcm.h + create mode 100644 drivers/staging/brcm80211/include/bcmsrom.h + create mode 100644 drivers/staging/brcm80211/include/bcmsrom_fmt.h + create mode 100644 drivers/staging/brcm80211/include/bcmsrom_tbl.h + create mode 100644 drivers/staging/brcm80211/include/bcmutils.h + create mode 100644 drivers/staging/brcm80211/include/bcmwifi.h + create mode 100644 drivers/staging/brcm80211/include/bcmwpa.h + create mode 100644 drivers/staging/brcm80211/include/bitfuncs.h + create mode 100644 drivers/staging/brcm80211/include/d11.h + create mode 100644 drivers/staging/brcm80211/include/dbus.h + create mode 100644 drivers/staging/brcm80211/include/epivers.h + create mode 100644 drivers/staging/brcm80211/include/hnddma.h + create mode 100644 drivers/staging/brcm80211/include/hndpmu.h + create mode 100644 drivers/staging/brcm80211/include/hndsoc.h + create mode 100644 drivers/staging/brcm80211/include/hndtcam.h + create mode 100644 drivers/staging/brcm80211/include/linux_osl.h + create mode 100644 drivers/staging/brcm80211/include/linuxver.h + create mode 100644 drivers/staging/brcm80211/include/nicpci.h + create mode 100644 drivers/staging/brcm80211/include/osl.h + create mode 100644 drivers/staging/brcm80211/include/packed_section_end.h + create mode 100644 drivers/staging/brcm80211/include/packed_section_start.h + create mode 100644 drivers/staging/brcm80211/include/pci_core.h + create mode 100644 drivers/staging/brcm80211/include/pcicfg.h + create mode 100644 drivers/staging/brcm80211/include/pcie_core.h + create mode 100644 drivers/staging/brcm80211/include/proto/802.11.h + create mode 100644 drivers/staging/brcm80211/include/proto/802.11e.h + create mode 100644 drivers/staging/brcm80211/include/proto/802.1d.h + create mode 100644 drivers/staging/brcm80211/include/proto/bcmevent.h + create mode 100644 drivers/staging/brcm80211/include/proto/ethernet.h + create mode 100644 drivers/staging/brcm80211/include/proto/wpa.h + create mode 100644 drivers/staging/brcm80211/include/qmath.h + create mode 100644 drivers/staging/brcm80211/include/rpc_osl.h + create mode 100644 drivers/staging/brcm80211/include/sbchipc.h + create mode 100644 drivers/staging/brcm80211/include/sbconfig.h + create mode 100644 drivers/staging/brcm80211/include/sbhnddma.h + create mode 100644 drivers/staging/brcm80211/include/sbhndpio.h + create mode 100644 drivers/staging/brcm80211/include/sbpcmcia.h + create mode 100644 drivers/staging/brcm80211/include/sbsdio.h + create mode 100644 drivers/staging/brcm80211/include/sbsdpcmdev.h + create mode 100644 drivers/staging/brcm80211/include/sbsocram.h + create mode 100644 drivers/staging/brcm80211/include/sdio.h + create mode 100644 drivers/staging/brcm80211/include/sdioh.h + create mode 100644 drivers/staging/brcm80211/include/sdiovar.h + create mode 100644 drivers/staging/brcm80211/include/siutils.h + create mode 100644 drivers/staging/brcm80211/include/spid.h + create mode 100644 drivers/staging/brcm80211/include/typedefs.h + create mode 100644 drivers/staging/brcm80211/include/wlioctl.h + create mode 100644 drivers/staging/brcm80211/phy/phy_version.h + create mode 100644 drivers/staging/brcm80211/phy/wlc_phy_cmn.c + create mode 100644 drivers/staging/brcm80211/phy/wlc_phy_hal.h + create mode 100644 drivers/staging/brcm80211/phy/wlc_phy_int.h + create mode 100644 drivers/staging/brcm80211/phy/wlc_phy_lcn.c + create mode 100644 drivers/staging/brcm80211/phy/wlc_phy_lcn.h + create mode 100644 drivers/staging/brcm80211/phy/wlc_phy_n.c + create mode 100644 drivers/staging/brcm80211/phy/wlc_phy_radio.h + create mode 100644 drivers/staging/brcm80211/phy/wlc_phyreg_n.h + create mode 100644 drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c + create mode 100644 drivers/staging/brcm80211/phy/wlc_phytbl_lcn.h + create mode 100644 drivers/staging/brcm80211/phy/wlc_phytbl_n.c + create mode 100644 drivers/staging/brcm80211/phy/wlc_phytbl_n.h + create mode 100644 drivers/staging/brcm80211/sys/d11ucode_ext.h + create mode 100644 drivers/staging/brcm80211/sys/wl_dbg.h + create mode 100644 drivers/staging/brcm80211/sys/wl_export.h + create mode 100644 drivers/staging/brcm80211/sys/wl_mac80211.c + create mode 100644 drivers/staging/brcm80211/sys/wl_mac80211.h + create mode 100644 drivers/staging/brcm80211/sys/wl_ucode.h + create mode 100644 drivers/staging/brcm80211/sys/wl_ucode_loader.c + create mode 100644 drivers/staging/brcm80211/sys/wlc_alloc.c + create mode 100644 drivers/staging/brcm80211/sys/wlc_alloc.h + create mode 100644 drivers/staging/brcm80211/sys/wlc_ampdu.c + create mode 100644 drivers/staging/brcm80211/sys/wlc_ampdu.h + create mode 100644 drivers/staging/brcm80211/sys/wlc_antsel.c + create mode 100644 drivers/staging/brcm80211/sys/wlc_antsel.h + create mode 100644 drivers/staging/brcm80211/sys/wlc_bmac.c + create mode 100644 drivers/staging/brcm80211/sys/wlc_bmac.h + create mode 100644 drivers/staging/brcm80211/sys/wlc_bsscfg.h + create mode 100644 drivers/staging/brcm80211/sys/wlc_cfg.h + create mode 100644 drivers/staging/brcm80211/sys/wlc_channel.c + create mode 100644 drivers/staging/brcm80211/sys/wlc_channel.h + create mode 100644 drivers/staging/brcm80211/sys/wlc_event.c + create mode 100644 drivers/staging/brcm80211/sys/wlc_event.h + create mode 100644 drivers/staging/brcm80211/sys/wlc_key.h + create mode 100644 drivers/staging/brcm80211/sys/wlc_mac80211.c + create mode 100644 drivers/staging/brcm80211/sys/wlc_mac80211.h + create mode 100644 drivers/staging/brcm80211/sys/wlc_phy_shim.c + create mode 100644 drivers/staging/brcm80211/sys/wlc_phy_shim.h + create mode 100644 drivers/staging/brcm80211/sys/wlc_pub.h + create mode 100644 drivers/staging/brcm80211/sys/wlc_rate.c + create mode 100644 drivers/staging/brcm80211/sys/wlc_rate.h + create mode 100644 drivers/staging/brcm80211/sys/wlc_rpc.h + create mode 100644 drivers/staging/brcm80211/sys/wlc_rpctx.h + create mode 100644 drivers/staging/brcm80211/sys/wlc_scb.h + create mode 100644 drivers/staging/brcm80211/sys/wlc_stf.c + create mode 100644 drivers/staging/brcm80211/sys/wlc_stf.h + create mode 100644 drivers/staging/brcm80211/sys/wlc_types.h + create mode 100644 drivers/staging/brcm80211/util/aiutils.c + create mode 100644 drivers/staging/brcm80211/util/bcmotp.c + create mode 100644 drivers/staging/brcm80211/util/bcmsrom.c + create mode 100644 drivers/staging/brcm80211/util/bcmutils.c + create mode 100644 drivers/staging/brcm80211/util/bcmwifi.c + create mode 100644 drivers/staging/brcm80211/util/bcmwpa.c + create mode 100644 drivers/staging/brcm80211/util/hnddma.c + create mode 100644 drivers/staging/brcm80211/util/hndpmu.c + create mode 100644 drivers/staging/brcm80211/util/linux_osl.c + create mode 100644 drivers/staging/brcm80211/util/nicpci.c + create mode 100644 drivers/staging/brcm80211/util/nvram/nvram_ro.c + create mode 100644 drivers/staging/brcm80211/util/qmath.c + create mode 100644 drivers/staging/brcm80211/util/siutils.c + create mode 100644 drivers/staging/brcm80211/util/siutils_priv.h + rename drivers/staging/iio/Documentation/{sysfs-class-iio => sysfs-bus-iio} (95%) + create mode 100644 drivers/staging/iio/magnetometer/ak8975.c + create mode 100644 drivers/staging/keucr/Kconfig + create mode 100644 drivers/staging/keucr/Makefile + create mode 100644 drivers/staging/keucr/Module.symvers + create mode 100644 drivers/staging/keucr/TODO + create mode 100644 drivers/staging/keucr/common.h + create mode 100644 drivers/staging/keucr/init.c + create mode 100644 drivers/staging/keucr/init.h + create mode 100644 drivers/staging/keucr/ms.c + create mode 100644 drivers/staging/keucr/ms.h + create mode 100644 drivers/staging/keucr/msscsi.c + create mode 100644 drivers/staging/keucr/scsiglue.c + create mode 100644 drivers/staging/keucr/scsiglue.h + create mode 100644 drivers/staging/keucr/sdscsi.c + create mode 100644 drivers/staging/keucr/smcommon.h + create mode 100644 drivers/staging/keucr/smil.h + create mode 100644 drivers/staging/keucr/smilecc.c + create mode 100644 drivers/staging/keucr/smilmain.c + create mode 100644 drivers/staging/keucr/smilsub.c + create mode 100644 drivers/staging/keucr/smscsi.c + create mode 100644 drivers/staging/keucr/transport.c + create mode 100644 drivers/staging/keucr/transport.h + create mode 100644 drivers/staging/keucr/usb.c + create mode 100644 drivers/staging/keucr/usb.h + delete mode 100644 drivers/staging/rtl8192su/Kconfig + delete mode 100644 drivers/staging/rtl8192su/Makefile + delete mode 100644 drivers/staging/rtl8192su/TODO + delete mode 100644 drivers/staging/rtl8192su/authors + delete mode 100644 drivers/staging/rtl8192su/ieee80211/Makefile + delete mode 100644 drivers/staging/rtl8192su/ieee80211/dot11d.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/dot11d.h + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211.h + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt.h + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_ccmp.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_wep.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_module.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_r8192s.h + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_softmac_wx.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/readme + delete mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_BA.h + delete mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h + delete mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c + delete mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h + delete mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_TS.h + delete mode 100644 drivers/staging/rtl8192su/ieee80211/rtl819x_TSProc.c + delete mode 100644 drivers/staging/rtl8192su/r8192SU_HWImg.c + delete mode 100644 drivers/staging/rtl8192su/r8192SU_HWImg.h + delete mode 100644 drivers/staging/rtl8192su/r8192SU_led.c + delete mode 100644 drivers/staging/rtl8192su/r8192SU_led.h + delete mode 100644 drivers/staging/rtl8192su/r8192S_Efuse.c + delete mode 100644 drivers/staging/rtl8192su/r8192S_Efuse.h + delete mode 100644 drivers/staging/rtl8192su/r8192S_firmware.c + delete mode 100644 drivers/staging/rtl8192su/r8192S_firmware.h + delete mode 100644 drivers/staging/rtl8192su/r8192S_hw.h + delete mode 100644 drivers/staging/rtl8192su/r8192S_phy.c + delete mode 100644 drivers/staging/rtl8192su/r8192S_phy.h + delete mode 100644 drivers/staging/rtl8192su/r8192S_phyreg.h + delete mode 100644 drivers/staging/rtl8192su/r8192S_rtl6052.c + delete mode 100644 drivers/staging/rtl8192su/r8192S_rtl6052.h + delete mode 100644 drivers/staging/rtl8192su/r8192S_rtl8225.c + delete mode 100644 drivers/staging/rtl8192su/r8192S_rtl8225.h + delete mode 100644 drivers/staging/rtl8192su/r8192U.h + delete mode 100644 drivers/staging/rtl8192su/r8192U_core.c + delete mode 100644 drivers/staging/rtl8192su/r8192U_dm.c + delete mode 100644 drivers/staging/rtl8192su/r8192U_dm.h + delete mode 100644 drivers/staging/rtl8192su/r8192U_pm.c + delete mode 100644 drivers/staging/rtl8192su/r8192U_pm.h + delete mode 100644 drivers/staging/rtl8192su/r8192U_wx.c + delete mode 100644 drivers/staging/rtl8192su/r8192U_wx.h + delete mode 100644 drivers/staging/rtl8192su/r819xU_HTGen.h + delete mode 100644 drivers/staging/rtl8192su/r819xU_HTType.h + delete mode 100644 drivers/staging/rtl8192su/r819xU_cmdpkt.c + delete mode 100644 drivers/staging/rtl8192su/r819xU_cmdpkt.h + create mode 100644 drivers/staging/rtl8712/Kconfig + create mode 100644 drivers/staging/rtl8712/Makefile + create mode 100644 drivers/staging/rtl8712/TODO + create mode 100644 drivers/staging/rtl8712/basic_types.h + create mode 100644 drivers/staging/rtl8712/big_endian.h + create mode 100644 drivers/staging/rtl8712/drv_types.h + create mode 100644 drivers/staging/rtl8712/ethernet.h + create mode 100644 drivers/staging/rtl8712/farray.h + create mode 100644 drivers/staging/rtl8712/generic.h + create mode 100644 drivers/staging/rtl8712/hal_init.c + create mode 100644 drivers/staging/rtl8712/ieee80211.c + create mode 100644 drivers/staging/rtl8712/ieee80211.h + create mode 100644 drivers/staging/rtl8712/if_ether.h + create mode 100644 drivers/staging/rtl8712/ip.h + create mode 100644 drivers/staging/rtl8712/little_endian.h + create mode 100644 drivers/staging/rtl8712/mlme_linux.c + create mode 100644 drivers/staging/rtl8712/mlme_osdep.h + create mode 100644 drivers/staging/rtl8712/mp_custom_oid.h + create mode 100644 drivers/staging/rtl8712/os_intfs.c + create mode 100644 drivers/staging/rtl8712/osdep_intf.h + create mode 100644 drivers/staging/rtl8712/osdep_service.h + create mode 100644 drivers/staging/rtl8712/recv_linux.c + create mode 100644 drivers/staging/rtl8712/recv_osdep.h + create mode 100644 drivers/staging/rtl8712/rtl8712_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_cmd.c + create mode 100644 drivers/staging/rtl8712/rtl8712_cmd.h + create mode 100644 drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_cmdctrl_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_debugctrl_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_debugctrl_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_edcasetting_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_edcasetting_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_efuse.c + create mode 100644 drivers/staging/rtl8712/rtl8712_efuse.h + create mode 100644 drivers/staging/rtl8712/rtl8712_event.h + create mode 100644 drivers/staging/rtl8712/rtl8712_fifoctrl_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_fifoctrl_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_gp_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_gp_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_hal.h + create mode 100644 drivers/staging/rtl8712/rtl8712_interrupt_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_io.c + create mode 100644 drivers/staging/rtl8712/rtl8712_led.c + create mode 100644 drivers/staging/rtl8712/rtl8712_macsetting_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_macsetting_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_powersave_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_powersave_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_ratectrl_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_ratectrl_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_recv.c + create mode 100644 drivers/staging/rtl8712/rtl8712_recv.h + create mode 100644 drivers/staging/rtl8712/rtl8712_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_security_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_spec.h + create mode 100644 drivers/staging/rtl8712/rtl8712_syscfg_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_syscfg_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_timectrl_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_timectrl_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_wmac_bitdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_wmac_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl8712_xmit.c + create mode 100644 drivers/staging/rtl8712/rtl8712_xmit.h + create mode 100644 drivers/staging/rtl8712/rtl871x_byteorder.h + create mode 100644 drivers/staging/rtl8712/rtl871x_cmd.c + create mode 100644 drivers/staging/rtl8712/rtl871x_cmd.h + create mode 100644 drivers/staging/rtl8712/rtl871x_debug.h + create mode 100644 drivers/staging/rtl8712/rtl871x_eeprom.c + create mode 100644 drivers/staging/rtl8712/rtl871x_eeprom.h + create mode 100644 drivers/staging/rtl8712/rtl871x_event.h + create mode 100644 drivers/staging/rtl8712/rtl871x_ht.h + create mode 100644 drivers/staging/rtl8712/rtl871x_io.c + create mode 100644 drivers/staging/rtl8712/rtl871x_io.h + create mode 100644 drivers/staging/rtl8712/rtl871x_ioctl.h + create mode 100644 drivers/staging/rtl8712/rtl871x_ioctl_linux.c + create mode 100644 drivers/staging/rtl8712/rtl871x_ioctl_rtl.c + create mode 100644 drivers/staging/rtl8712/rtl871x_ioctl_rtl.h + create mode 100644 drivers/staging/rtl8712/rtl871x_ioctl_set.c + create mode 100644 drivers/staging/rtl8712/rtl871x_ioctl_set.h + create mode 100644 drivers/staging/rtl8712/rtl871x_led.h + create mode 100644 drivers/staging/rtl8712/rtl871x_mlme.c + create mode 100644 drivers/staging/rtl8712/rtl871x_mlme.h + create mode 100644 drivers/staging/rtl8712/rtl871x_mp.c + create mode 100644 drivers/staging/rtl8712/rtl871x_mp.h + create mode 100644 drivers/staging/rtl8712/rtl871x_mp_ioctl.c + create mode 100644 drivers/staging/rtl8712/rtl871x_mp_ioctl.h + create mode 100644 drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h + create mode 100644 drivers/staging/rtl8712/rtl871x_pwrctrl.c + create mode 100644 drivers/staging/rtl8712/rtl871x_pwrctrl.h + create mode 100644 drivers/staging/rtl8712/rtl871x_recv.c + create mode 100644 drivers/staging/rtl8712/rtl871x_recv.h + create mode 100644 drivers/staging/rtl8712/rtl871x_rf.h + create mode 100644 drivers/staging/rtl8712/rtl871x_security.c + create mode 100644 drivers/staging/rtl8712/rtl871x_security.h + create mode 100644 drivers/staging/rtl8712/rtl871x_sta_mgt.c + create mode 100644 drivers/staging/rtl8712/rtl871x_wlan_sme.h + create mode 100644 drivers/staging/rtl8712/rtl871x_xmit.c + create mode 100644 drivers/staging/rtl8712/rtl871x_xmit.h + create mode 100644 drivers/staging/rtl8712/sta_info.h + create mode 100644 drivers/staging/rtl8712/swab.h + create mode 100644 drivers/staging/rtl8712/usb_halinit.c + create mode 100644 drivers/staging/rtl8712/usb_intf.c + create mode 100644 drivers/staging/rtl8712/usb_ops.c + create mode 100644 drivers/staging/rtl8712/usb_ops.h + create mode 100644 drivers/staging/rtl8712/usb_ops_linux.c + create mode 100644 drivers/staging/rtl8712/usb_osintf.h + create mode 100644 drivers/staging/rtl8712/usb_vendor_req.h + create mode 100644 drivers/staging/rtl8712/wifi.h + create mode 100644 drivers/staging/rtl8712/wlan_bssdef.h + create mode 100644 drivers/staging/rtl8712/xmit_linux.c + create mode 100644 drivers/staging/rtl8712/xmit_osdep.h + create mode 100644 drivers/staging/sbe-2t3e3/2t3e3.h + create mode 100644 drivers/staging/sbe-2t3e3/Kconfig + create mode 100644 drivers/staging/sbe-2t3e3/Makefile + create mode 100644 drivers/staging/sbe-2t3e3/TODO + create mode 100644 drivers/staging/sbe-2t3e3/cpld.c + create mode 100644 drivers/staging/sbe-2t3e3/ctrl.c + create mode 100644 drivers/staging/sbe-2t3e3/ctrl.h + create mode 100644 drivers/staging/sbe-2t3e3/dc.c + create mode 100644 drivers/staging/sbe-2t3e3/exar7250.c + create mode 100644 drivers/staging/sbe-2t3e3/exar7300.c + create mode 100644 drivers/staging/sbe-2t3e3/intr.c + create mode 100644 drivers/staging/sbe-2t3e3/io.c + create mode 100644 drivers/staging/sbe-2t3e3/main.c + create mode 100644 drivers/staging/sbe-2t3e3/maps.c + create mode 100644 drivers/staging/sbe-2t3e3/module.c + create mode 100644 drivers/staging/sbe-2t3e3/netdev.c + rename drivers/staging/tidspbridge/{services => core}/sync.c (85%) + delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/cfg.h + delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/services.h + delete mode 100644 drivers/staging/tidspbridge/services/cfg.c + delete mode 100644 drivers/staging/tidspbridge/services/ntfy.c + delete mode 100644 drivers/staging/tidspbridge/services/services.c + create mode 100644 drivers/staging/udlfb/udlfb.txt + create mode 100644 drivers/staging/westbridge/Kconfig + create mode 100644 drivers/staging/westbridge/TODO + create mode 100644 drivers/staging/westbridge/astoria/Kconfig + create mode 100644 drivers/staging/westbridge/astoria/Makefile + create mode 100644 drivers/staging/westbridge/astoria/api/Makefile + create mode 100644 drivers/staging/westbridge/astoria/api/src/cyasdma.c + create mode 100644 drivers/staging/westbridge/astoria/api/src/cyasintr.c + create mode 100644 drivers/staging/westbridge/astoria/api/src/cyaslep2pep.c + create mode 100644 drivers/staging/westbridge/astoria/api/src/cyaslowlevel.c + create mode 100644 drivers/staging/westbridge/astoria/api/src/cyasmisc.c + create mode 100644 drivers/staging/westbridge/astoria/api/src/cyasmtp.c + create mode 100644 drivers/staging/westbridge/astoria/api/src/cyasstorage.c + create mode 100644 drivers/staging/westbridge/astoria/api/src/cyasusb.c + create mode 100644 drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c + create mode 100644 drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/cyashaldef.h + create mode 100644 drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h + create mode 100644 drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h + create mode 100644 drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasomapdev_kernel.h + create mode 100644 drivers/staging/westbridge/astoria/block/Kconfig + create mode 100644 drivers/staging/westbridge/astoria/block/Makefile + create mode 100644 drivers/staging/westbridge/astoria/block/cyasblkdev_block.c + create mode 100644 drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c + create mode 100644 drivers/staging/westbridge/astoria/block/cyasblkdev_queue.h + create mode 100644 drivers/staging/westbridge/astoria/device/Kconfig + create mode 100644 drivers/staging/westbridge/astoria/device/Makefile + create mode 100644 drivers/staging/westbridge/astoria/device/cyandevice_export.h + create mode 100644 drivers/staging/westbridge/astoria/device/cyasdevice.c + create mode 100644 drivers/staging/westbridge/astoria/gadget/Kconfig + create mode 100644 drivers/staging/westbridge/astoria/gadget/Makefile + create mode 100644 drivers/staging/westbridge/astoria/gadget/cyasgadget.c + create mode 100644 drivers/staging/westbridge/astoria/gadget/cyasgadget.h + create mode 100644 drivers/staging/westbridge/astoria/gadget/cyasgadget_ioctl.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanerr.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanmedia.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanmisc.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanregs.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyansdkversion.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanstorage.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyantioch.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyantypes.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyanusb.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyas_cplus_end.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyas_cplus_start.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyascast.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdevice.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasdma.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyaserr.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyashal.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyashalcb.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyashaldoc.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasintr.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyaslep2pep.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyaslowlevel.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmedia.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmisc.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmisc_dep.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasmtp.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasprotocol.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasregs.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasstorage.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasstorage_dep.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyastoria.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyastsdkversion.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyastypes.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasusb.h + create mode 100644 drivers/staging/westbridge/astoria/include/linux/westbridge/cyasusb_dep.h + delete mode 100644 drivers/staging/zram/zram_ioctl.h + create mode 100644 drivers/staging/zram/zram_sysfs.c +Merging slabh/slabh +$ git merge slabh/slabh +Already up-to-date. +Merging bkl-trivial/trivial +$ git merge bkl-trivial/trivial +Resolved 'drivers/char/pcmcia/cm4000_cs.c' using previous resolution. +Resolved 'drivers/char/pcmcia/cm4040_cs.c' using previous resolution. +Auto-merging block/bsg.c +Auto-merging drivers/block/brd.c +Auto-merging drivers/block/cciss.c +Auto-merging drivers/block/loop.c +Auto-merging drivers/block/pktcdvd.c +Auto-merging drivers/block/xen-blkfront.c +Auto-merging drivers/char/pcmcia/cm4000_cs.c +CONFLICT (content): Merge conflict in drivers/char/pcmcia/cm4000_cs.c +Auto-merging drivers/char/pcmcia/cm4040_cs.c +CONFLICT (content): Merge conflict in drivers/char/pcmcia/cm4040_cs.c +Auto-merging drivers/md/dm.c +Auto-merging drivers/md/md.c +Auto-merging drivers/mmc/card/block.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 36988e9] Merge remote branch 'bkl-trivial/trivial' +$ git diff -M --stat --summary HEAD^.. + block/bsg.c | 3 -- + drivers/block/DAC960.c | 11 ++++--- + drivers/block/amiflop.c | 19 ++++++------ + drivers/block/aoe/aoeblk.c | 9 +++-- + drivers/block/aoe/aoechr.c | 9 +++-- + drivers/block/ataflop.c | 15 +++++---- + drivers/block/brd.c | 7 ++-- + drivers/block/cciss.c | 14 ++++---- + drivers/block/cpqarray.c | 15 +++++---- + drivers/block/drbd/drbd_main.c | 11 ++++--- + drivers/block/floppy.c | 16 +++++----- + drivers/block/loop.c | 11 ++++--- + drivers/block/nbd.c | 7 ++-- + drivers/block/paride/pcd.c | 15 +++++---- + drivers/block/paride/pd.c | 15 +++++---- + drivers/block/paride/pf.c | 17 ++++++----- + drivers/block/paride/pg.c | 7 ++-- + drivers/block/paride/pt.c | 19 ++++++------ + drivers/block/pktcdvd.c | 16 +++++----- + drivers/block/swim.c | 15 +++++---- + drivers/block/swim3.c | 15 +++++---- + drivers/block/ub.c | 15 +++++---- + drivers/block/viodasd.c | 11 ++++--- + drivers/block/xd.c | 7 ++-- + drivers/block/xen-blkfront.c | 11 ++++--- + drivers/block/xsysace.c | 11 ++++--- + drivers/block/z2ram.c | 15 +++++---- + drivers/cdrom/gdrom.c | 15 +++++---- + drivers/cdrom/viocd.c | 15 +++++---- + drivers/char/apm-emulation.c | 11 ++++--- + drivers/char/applicom.c | 9 +++-- + drivers/char/ds1302.c | 15 +++++---- + drivers/char/ds1620.c | 8 ++-- + drivers/char/dsp56k.c | 27 +++++++++-------- + drivers/char/dtlk.c | 8 ++-- + drivers/char/generic_nvram.c | 7 ++-- + drivers/char/genrtc.c | 13 ++++---- + drivers/char/i8k.c | 7 ++-- + drivers/char/ip2/ip2main.c | 8 ++-- + drivers/char/ipmi/ipmi_devintf.c | 14 ++++---- + drivers/char/ipmi/ipmi_watchdog.c | 8 ++-- + drivers/char/lp.c | 15 +++++---- + drivers/char/mbcs.c | 8 ++-- + drivers/char/mmtimer.c | 7 ++-- + drivers/char/mwave/mwavedd.c | 44 ++++++++++++++-------------- + drivers/char/nvram.c | 11 ++++--- + drivers/char/nwflash.c | 12 ++++---- + drivers/char/pcmcia/cm4000_cs.c | 12 ++++--- + drivers/char/pcmcia/cm4040_cs.c | 8 +++-- + drivers/char/ppdev.c | 8 ++-- + drivers/char/rio/rio_linux.c | 7 ++-- + drivers/char/snsc.c | 9 +++-- + drivers/char/toshiba.c | 9 +++-- + drivers/char/viotape.c | 11 ++++--- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 6 ++-- + drivers/hwmon/fschmd.c | 6 ++-- + drivers/hwmon/w83793.c | 6 ++-- + drivers/ide/ide-cd.c | 14 ++++---- + drivers/ide/ide-disk_ioctl.c | 7 ++-- + drivers/ide/ide-floppy_ioctl.c | 7 ++-- + drivers/ide/ide-gd.c | 10 +++--- + drivers/ide/ide-tape.c | 19 ++++++------ + drivers/input/misc/hp_sdc_rtc.c | 7 ++-- + drivers/macintosh/adb.c | 10 +++--- + drivers/macintosh/smu.c | 6 ++-- + drivers/macintosh/via-pmu.c | 11 ++++--- + drivers/md/dm.c | 10 +++--- + drivers/md/md.c | 13 ++++---- + drivers/memstick/core/mspro_block.c | 11 ++++--- + drivers/message/fusion/mptctl.c | 15 +++++---- + drivers/message/i2o/i2o_block.c | 15 +++++---- + drivers/message/i2o/i2o_config.c | 23 +++++++------- + drivers/misc/phantom.c | 11 ++++--- + drivers/mmc/card/block.c | 10 +++--- + drivers/mtd/mtd_blkdevs.c | 14 ++++---- + drivers/mtd/mtdchar.c | 15 +++++---- + drivers/pci/hotplug/cpqphp_sysfs.c | 13 ++++---- + drivers/rtc/rtc-m41t80.c | 13 ++++---- + drivers/s390/char/tape_block.c | 13 ++++---- + drivers/sbus/char/jsflash.c | 24 ++++++++------- + drivers/scsi/3w-9xxx.c | 7 ++-- + drivers/scsi/3w-sas.c | 7 ++-- + drivers/scsi/3w-xxxx.c | 9 ++--- + drivers/scsi/aacraid/linit.c | 15 +++++---- + drivers/scsi/ch.c | 8 ++-- + drivers/scsi/dpt_i2o.c | 18 ++++++------ + drivers/scsi/gdth.c | 11 ++++--- + drivers/scsi/megaraid.c | 8 ++-- + drivers/scsi/megaraid/megaraid_mm.c | 8 ++-- + drivers/scsi/megaraid/megaraid_sas.c | 2 - + drivers/scsi/mpt2sas/mpt2sas_ctl.c | 11 ++++--- + drivers/scsi/osst.c | 15 +++++---- + drivers/scsi/scsi_tgt_if.c | 2 - + drivers/scsi/sg.c | 12 ++++--- + drivers/scsi/sr.c | 14 ++++---- + drivers/scsi/st.c | 12 ++++---- + drivers/staging/hv/blkvsc_drv.c | 11 ++++--- + drivers/staging/spectra/ffsport.c | 7 ++-- + drivers/telephony/ixj.c | 7 ++-- + drivers/watchdog/cpwd.c | 15 +++++---- + fs/hfsplus/ioctl.c | 11 ++++--- + 101 files changed, 620 insertions(+), 561 deletions(-) +Merging bkl-llseek/llseek +$ git merge bkl-llseek/llseek +Auto-merging arch/arm/kernel/etm.c +Auto-merging arch/arm/plat-mxc/audmux-v2.c +Auto-merging arch/powerpc/kernel/lparcfg.c +Auto-merging block/bsg.c +Auto-merging drivers/block/DAC960.c +Auto-merging drivers/block/aoe/aoechr.c +Auto-merging drivers/block/paride/pg.c +Auto-merging drivers/block/paride/pt.c +Auto-merging drivers/block/pktcdvd.c +Auto-merging drivers/char/apm-emulation.c +Auto-merging drivers/char/ds1302.c +Auto-merging drivers/char/ds1620.c +Auto-merging drivers/char/dsp56k.c +Auto-merging drivers/char/dtlk.c +Auto-merging drivers/char/genrtc.c +Auto-merging drivers/char/ip2/ip2main.c +Auto-merging drivers/char/ipmi/ipmi_devintf.c +Auto-merging drivers/char/ipmi/ipmi_watchdog.c +Auto-merging drivers/char/lp.c +Auto-merging drivers/char/mmtimer.c +Auto-merging drivers/char/mwave/mwavedd.c +Auto-merging drivers/char/pcmcia/cm4000_cs.c +Auto-merging drivers/char/pcmcia/cm4040_cs.c +Auto-merging drivers/char/rio/rio_linux.c +Auto-merging drivers/char/snsc.c +Auto-merging drivers/char/toshiba.c +Auto-merging drivers/char/viotape.c +Auto-merging drivers/char/xilinx_hwicap/xilinx_hwicap.c +Auto-merging drivers/hid/hid-debug.c +Auto-merging drivers/hid/usbhid/hiddev.c +Auto-merging drivers/ide/ide-tape.c +Auto-merging drivers/input/evdev.c +Auto-merging drivers/input/input.c +Auto-merging drivers/macintosh/via-pmu.c +Auto-merging drivers/media/IR/ir-lirc-codec.c +Auto-merging drivers/mfd/ab3100-core.c +Auto-merging drivers/misc/phantom.c +Auto-merging drivers/net/cxgb4/cxgb4_main.c +Auto-merging drivers/net/ppp_generic.c +Auto-merging drivers/net/wireless/airo.c +Auto-merging drivers/net/wireless/ath/ath5k/debug.c +Auto-merging drivers/net/wireless/ath/ath9k/debug.c +Auto-merging drivers/net/wireless/ath/ath9k/htc_drv_main.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-3945-rs.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-rs.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-debugfs.c +Auto-merging drivers/net/wireless/ray_cs.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00debug.c +Auto-merging drivers/net/wireless/wl12xx/wl1251_debugfs.c +Auto-merging drivers/rtc/rtc-m41t80.c +Auto-merging drivers/s390/scsi/zfcp_cfdc.c +Auto-merging drivers/scsi/3w-9xxx.c +Auto-merging drivers/scsi/3w-sas.c +Auto-merging drivers/scsi/3w-xxxx.c +Auto-merging drivers/scsi/aacraid/linit.c +Auto-merging drivers/scsi/ch.c +Auto-merging drivers/scsi/dpt_i2o.c +Auto-merging drivers/scsi/gdth.c +Auto-merging drivers/scsi/megaraid.c +Auto-merging drivers/scsi/megaraid/megaraid_mm.c +Auto-merging drivers/scsi/megaraid/megaraid_sas.c +Auto-merging drivers/scsi/mpt2sas/mpt2sas_ctl.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/scsi_tgt_if.c +Auto-merging drivers/scsi/sg.c +Auto-merging drivers/serial/mfd.c +Auto-merging drivers/spi/dw_spi.c +Auto-merging drivers/staging/batman-adv/icmp_socket.c +Auto-merging drivers/staging/comedi/comedi_fops.c +Auto-merging drivers/staging/crystalhd/crystalhd_lnx.c +Auto-merging drivers/staging/dream/pmem.c +Auto-merging drivers/staging/frontier/alphatrack.c +Auto-merging drivers/staging/frontier/tranzport.c +Auto-merging drivers/staging/iio/industrialio-core.c +Auto-merging drivers/staging/iio/industrialio-ring.c +Auto-merging drivers/staging/lirc/lirc_imon.c +Auto-merging drivers/staging/lirc/lirc_sasem.c +Auto-merging drivers/staging/tidspbridge/rmgr/drv_interface.c +Auto-merging drivers/telephony/ixj.c +Auto-merging drivers/usb/gadget/f_hid.c +Auto-merging drivers/usb/gadget/printer.c +Auto-merging drivers/vhost/net.c +Auto-merging drivers/watchdog/cpwd.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/ubifs/debug.c +Auto-merging include/linux/fs.h +Auto-merging kernel/kprobes.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/trace/ring_buffer.c +Auto-merging kernel/trace/trace_events.c +Auto-merging net/mac80211/debugfs.c +Auto-merging net/mac80211/debugfs_key.c +Auto-merging net/mac80211/rate.c +Auto-merging net/mac80211/rc80211_pid_debugfs.c +Auto-merging net/sctp/probe.c +Auto-merging net/socket.c +Auto-merging net/sunrpc/cache.c +Auto-merging sound/oss/msnd_pinnacle.c +Auto-merging sound/oss/sh_dac_audio.c +Auto-merging sound/soc/soc-core.c +Auto-merging sound/soc/soc-dapm.c +Auto-merging virt/kvm/kvm_main.c +Merge made by recursive. + Documentation/DocBook/drm.tmpl | 1 + + arch/arm/kernel/etm.c | 1 + + arch/arm/mach-msm/last_radio_log.c | 3 +- + arch/arm/mach-msm/smd_debug.c | 1 + + arch/arm/plat-mxc/audmux-v2.c | 1 + + arch/arm/plat-omap/iommu-debug.c | 2 + + arch/avr32/boards/mimc200/fram.c | 1 + + arch/blackfin/kernel/kgdb_test.c | 1 + + arch/blackfin/mach-bf561/coreb.c | 1 + + arch/cris/arch-v10/drivers/ds1302.c | 1 + + arch/cris/arch-v10/drivers/gpio.c | 1 + + arch/cris/arch-v10/drivers/i2c.c | 1 + + arch/cris/arch-v10/drivers/pcf8563.c | 1 + + arch/cris/arch-v10/drivers/sync_serial.c | 3 +- + arch/cris/arch-v32/drivers/cryptocop.c | 3 +- + arch/cris/arch-v32/drivers/i2c.c | 1 + + arch/cris/arch-v32/drivers/mach-a3/gpio.c | 1 + + arch/cris/arch-v32/drivers/mach-fs/gpio.c | 1 + + arch/cris/arch-v32/drivers/pcf8563.c | 1 + + arch/cris/arch-v32/drivers/sync_serial.c | 3 +- + arch/cris/kernel/profile.c | 1 + + arch/ia64/kernel/salinfo.c | 2 + + arch/ia64/sn/kernel/sn2/sn_hwperf.c | 1 + + arch/m68k/bvme6000/rtc.c | 1 + + arch/m68k/mvme16x/rtc.c | 1 + + arch/mips/kernel/rtlx.c | 3 +- + arch/mips/kernel/vpe.c | 3 +- + arch/mips/sibyte/common/sb_tbprof.c | 1 + + arch/powerpc/kernel/lparcfg.c | 1 + + arch/powerpc/kernel/rtas_flash.c | 3 ++ + arch/powerpc/kernel/rtasd.c | 1 + + arch/powerpc/platforms/cell/spufs/file.c | 18 ++++++++++++ + arch/powerpc/platforms/iseries/mf.c | 1 + + arch/powerpc/platforms/pseries/reconfig.c | 3 +- + arch/powerpc/platforms/pseries/scanlog.c | 1 + + arch/s390/crypto/prng.c | 1 + + arch/s390/hypfs/hypfs_diag.c | 1 + + arch/s390/hypfs/hypfs_vm.c | 1 + + arch/s390/hypfs/inode.c | 1 + + arch/s390/kernel/debug.c | 1 + + arch/sh/boards/mach-landisk/gio.c | 1 + + arch/sparc/kernel/apc.c | 1 + + arch/sparc/kernel/mdesc.c | 1 + + arch/tile/kernel/hardwall.c | 1 + + arch/um/drivers/harddog_kern.c | 1 + + arch/um/drivers/mconsole_kern.c | 1 + + arch/um/drivers/mmapper_kern.c | 1 + + arch/um/drivers/random.c | 1 + + arch/x86/kernel/apm_32.c | 1 + + arch/x86/kernel/cpu/mcheck/mce-severity.c | 1 + + arch/x86/kernel/cpu/mcheck/mce.c | 1 + + arch/x86/kernel/kdebugfs.c | 1 + + arch/x86/kernel/microcode_core.c | 1 + + arch/x86/kernel/tlb_uv.c | 1 + + arch/x86/xen/debugfs.c | 1 + + block/bsg.c | 1 + + drivers/acpi/ec_sys.c | 1 + + drivers/acpi/event.c | 1 + + drivers/block/DAC960.c | 3 +- + drivers/block/aoe/aoechr.c | 1 + + drivers/block/paride/pg.c | 1 + + drivers/block/paride/pt.c | 1 + + drivers/block/pktcdvd.c | 1 + + drivers/bluetooth/btmrvl_debugfs.c | 10 ++++++ + drivers/bluetooth/hci_vhci.c | 1 + + drivers/char/apm-emulation.c | 1 + + drivers/char/bfin-otp.c | 1 + + drivers/char/briq_panel.c | 1 + + drivers/char/bsr.c | 1 + + drivers/char/cs5535_gpio.c | 3 +- + drivers/char/ds1302.c | 1 + + drivers/char/ds1620.c | 1 + + drivers/char/dsp56k.c | 1 + + drivers/char/dtlk.c | 1 + + drivers/char/genrtc.c | 1 + + drivers/char/hw_random/core.c | 1 + + drivers/char/ip2/ip2main.c | 1 + + drivers/char/ipmi/ipmi_devintf.c | 1 + + drivers/char/ipmi/ipmi_watchdog.c | 1 + + drivers/char/istallion.c | 1 + + drivers/char/lp.c | 1 + + drivers/char/mem.c | 3 ++ + drivers/char/misc.c | 1 + + drivers/char/mmtimer.c | 1 + + drivers/char/mspec.c | 9 ++++-- + drivers/char/mwave/mwavedd.c | 3 +- + drivers/char/nwbutton.c | 1 + + drivers/char/pc8736x_gpio.c | 1 + + drivers/char/pcmcia/cm4000_cs.c | 1 + + drivers/char/pcmcia/cm4040_cs.c | 1 + + drivers/char/random.c | 2 + + drivers/char/raw.c | 2 + + drivers/char/rio/rio_linux.c | 1 + + drivers/char/scx200_gpio.c | 1 + + drivers/char/snsc.c | 1 + + drivers/char/stallion.c | 1 + + drivers/char/sx.c | 1 + + drivers/char/sysrq.c | 1 + + drivers/char/tb0219.c | 1 + + drivers/char/tlclk.c | 1 + + drivers/char/toshiba.c | 1 + + drivers/char/uv_mmtimer.c | 1 + + drivers/char/viotape.c | 1 + + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 1 + + drivers/dma/coh901318.c | 1 + + drivers/firewire/nosy.c | 1 + + drivers/gpu/drm/drm_drv.c | 3 +- + drivers/gpu/drm/i810/i810_dma.c | 1 + + drivers/gpu/drm/i810/i810_drv.c | 1 + + drivers/gpu/drm/i830/i830_dma.c | 1 + + drivers/gpu/drm/i830/i830_drv.c | 1 + + drivers/gpu/drm/i915/i915_debugfs.c | 1 + + drivers/gpu/drm/i915/i915_drv.c | 1 + + drivers/gpu/drm/mga/mga_drv.c | 1 + + drivers/gpu/drm/nouveau/nouveau_drv.c | 1 + + drivers/gpu/drm/r128/r128_drv.c | 1 + + drivers/gpu/drm/radeon/radeon_drv.c | 1 + + drivers/gpu/drm/savage/savage_drv.c | 1 + + drivers/gpu/drm/sis/sis_drv.c | 1 + + drivers/gpu/drm/tdfx/tdfx_drv.c | 1 + + drivers/gpu/drm/via/via_drv.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 + + drivers/gpu/vga/vgaarb.c | 1 + + drivers/hid/hid-debug.c | 1 + + drivers/hid/hid-roccat.c | 1 + + drivers/hid/hidraw.c | 1 + + drivers/hid/usbhid/hiddev.c | 1 + + drivers/hwmon/asus_atk0110.c | 1 + + drivers/ide/ide-tape.c | 1 + + drivers/idle/i7300_idle.c | 1 + + drivers/infiniband/hw/cxgb4/device.c | 1 + + drivers/infiniband/hw/ipath/ipath_diag.c | 4 ++- + drivers/infiniband/hw/ipath/ipath_file_ops.c | 3 +- + drivers/infiniband/hw/ipath/ipath_fs.c | 3 ++ + drivers/infiniband/hw/qib/qib_diag.c | 4 ++- + drivers/infiniband/hw/qib/qib_file_ops.c | 3 +- + drivers/infiniband/hw/qib/qib_fs.c | 1 + + drivers/input/evdev.c | 3 +- + drivers/input/input.c | 1 + + drivers/input/joydev.c | 1 + + drivers/input/misc/uinput.c | 1 + + drivers/input/mousedev.c | 1 + + drivers/input/serio/serio_raw.c | 1 + + drivers/isdn/mISDN/timerdev.c | 1 + + drivers/lguest/lguest_user.c | 1 + + drivers/macintosh/ans-lcd.c | 1 + + drivers/macintosh/via-pmu.c | 1 + + drivers/md/dm-ioctl.c | 1 + + drivers/media/IR/imon.c | 6 ++- + drivers/media/IR/ir-lirc-codec.c | 1 + + drivers/media/IR/lirc_dev.c | 3 ++ + drivers/media/dvb/bt8xx/dst_ca.c | 3 +- + drivers/media/dvb/dvb-core/dmxdev.c | 2 + + drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 1 + + drivers/media/dvb/dvb-core/dvb_frontend.c | 3 +- + drivers/media/dvb/dvb-core/dvb_net.c | 1 + + drivers/media/dvb/dvb-core/dvbdev.c | 1 + + drivers/media/dvb/firewire/firedtv-ci.c | 1 + + drivers/media/dvb/ttpci/av7110.c | 1 + + drivers/media/dvb/ttpci/av7110_av.c | 2 + + drivers/media/dvb/ttpci/av7110_ca.c | 1 + + drivers/media/dvb/ttpci/av7110_ir.c | 1 + + drivers/mfd/ab3100-core.c | 1 + + drivers/misc/hpilo.c | 1 + + drivers/misc/ibmasm/ibmasmfs.c | 4 ++ + drivers/misc/iwmc3200top/debugfs.c | 3 ++ + drivers/misc/lkdtm.c | 9 ++++++ + drivers/misc/phantom.c | 1 + + drivers/misc/sgi-gru/grufile.c | 1 + + drivers/mmc/core/debugfs.c | 1 + + drivers/mtd/ubi/cdev.c | 1 + + drivers/net/caif/caif_spi.c | 6 ++- + drivers/net/cxgb4/cxgb4_main.c | 1 + + drivers/net/ppp_generic.c | 3 +- + drivers/net/wimax/i2400m/debugfs.c | 2 + + drivers/net/wireless/airo.c | 24 ++++++++++----- + drivers/net/wireless/ath/ath5k/debug.c | 7 ++++ + drivers/net/wireless/ath/ath9k/debug.c | 33 ++++++++++++++------- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 9 ++++-- + drivers/net/wireless/b43/debugfs.c | 1 + + drivers/net/wireless/b43legacy/debugfs.c | 1 + + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 1 + + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 3 ++ + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 3 ++ + drivers/net/wireless/iwmc3200wifi/debugfs.c | 4 ++ + drivers/net/wireless/iwmc3200wifi/sdio.c | 1 + + drivers/net/wireless/libertas/debugfs.c | 2 + + drivers/net/wireless/ray_cs.c | 2 + + drivers/net/wireless/rt2x00/rt2x00debug.c | 5 +++ + drivers/net/wireless/wl12xx/wl1251_debugfs.c | 4 ++ + drivers/net/wireless/wl12xx/wl1271_debugfs.c | 6 +++- + drivers/oprofile/oprofile_files.c | 8 ++++- + drivers/oprofile/oprofilefs.c | 3 ++ + drivers/pci/pcie/aer/aer_inject.c | 1 + + drivers/platform/x86/sony-laptop.c | 1 + + drivers/rtc/rtc-m41t80.c | 1 + + drivers/s390/block/dasd_eer.c | 1 + + drivers/s390/char/fs3270.c | 1 + + drivers/s390/char/monreader.c | 1 + + drivers/s390/char/monwriter.c | 1 + + drivers/s390/char/tape_char.c | 1 + + drivers/s390/char/vmcp.c | 1 + + drivers/s390/char/vmlogrdr.c | 1 + + drivers/s390/char/vmwatchdog.c | 1 + + drivers/s390/char/zcore.c | 2 + + drivers/s390/cio/chsc_sch.c | 1 + + drivers/s390/cio/css.c | 1 + + drivers/s390/crypto/zcrypt_api.c | 3 +- + drivers/s390/scsi/zfcp_cfdc.c | 3 +- + drivers/sbus/char/display7seg.c | 1 + + drivers/sbus/char/envctrl.c | 1 + + drivers/scsi/3w-9xxx.c | 3 +- + drivers/scsi/3w-sas.c | 3 +- + drivers/scsi/3w-xxxx.c | 3 +- + drivers/scsi/aacraid/linit.c | 1 + + drivers/scsi/ch.c | 1 + + drivers/scsi/dpt_i2o.c | 1 + + drivers/scsi/gdth.c | 1 + + drivers/scsi/megaraid.c | 1 + + drivers/scsi/megaraid/megaraid_mm.c | 1 + + drivers/scsi/megaraid/megaraid_sas.c | 1 + + drivers/scsi/mpt2sas/mpt2sas_ctl.c | 1 + + drivers/scsi/osd/osd_uld.c | 1 + + drivers/scsi/pmcraid.c | 1 + + drivers/scsi/qla2xxx/qla_os.c | 1 + + drivers/scsi/scsi_tgt_if.c | 1 + + drivers/scsi/sg.c | 1 + + drivers/serial/mfd.c | 2 + + drivers/spi/dw_spi.c | 1 + + drivers/spi/spidev.c | 1 + + drivers/staging/batman-adv/bat_debugfs.c | 1 + + drivers/staging/batman-adv/icmp_socket.c | 1 + + drivers/staging/comedi/comedi_fops.c | 1 + + drivers/staging/crystalhd/crystalhd_lnx.c | 1 + + drivers/staging/dream/camera/msm_camera.c | 3 ++ + drivers/staging/dream/pmem.c | 2 + + drivers/staging/dream/qdsp5/adsp_driver.c | 1 + + drivers/staging/dream/qdsp5/audio_aac.c | 1 + + drivers/staging/dream/qdsp5/audio_amrnb.c | 1 + + drivers/staging/dream/qdsp5/audio_evrc.c | 1 + + drivers/staging/dream/qdsp5/audio_in.c | 2 + + drivers/staging/dream/qdsp5/audio_mp3.c | 1 + + drivers/staging/dream/qdsp5/audio_out.c | 2 + + drivers/staging/dream/qdsp5/audio_qcelp.c | 1 + + drivers/staging/dream/qdsp5/evlog.h | 1 + + drivers/staging/dream/qdsp5/snd.c | 1 + + drivers/staging/frontier/alphatrack.c | 1 + + drivers/staging/frontier/tranzport.c | 1 + + drivers/staging/iio/industrialio-core.c | 1 + + drivers/staging/iio/industrialio-ring.c | 1 + + drivers/staging/lirc/lirc_imon.c | 3 +- + drivers/staging/lirc/lirc_it87.c | 1 + + drivers/staging/lirc/lirc_sasem.c | 1 + + drivers/staging/lirc/lirc_serial.c | 1 + + drivers/staging/lirc/lirc_sir.c | 1 + + drivers/staging/memrar/memrar_handler.c | 1 + + drivers/staging/panel/panel.c | 1 + + drivers/staging/tidspbridge/rmgr/drv_interface.c | 1 + + drivers/telephony/ixj.c | 3 +- + drivers/telephony/phonedev.c | 1 + + drivers/uio/uio.c | 1 + + drivers/usb/class/cdc-wdm.c | 3 +- + drivers/usb/class/usblp.c | 1 + + drivers/usb/class/usbtmc.c | 1 + + drivers/usb/core/file.c | 1 + + drivers/usb/gadget/f_hid.c | 1 + + drivers/usb/gadget/printer.c | 3 +- + drivers/usb/host/ehci-dbg.c | 4 ++ + drivers/usb/host/ohci-dbg.c | 3 ++ + drivers/usb/image/mdc800.c | 1 + + drivers/usb/misc/adutux.c | 1 + + drivers/usb/misc/idmouse.c | 1 + + drivers/usb/misc/iowarrior.c | 1 + + drivers/usb/misc/ldusb.c | 1 + + drivers/usb/misc/rio500.c | 1 + + drivers/usb/misc/usblcd.c | 1 + + drivers/usb/usb-skeleton.c | 1 + + drivers/vhost/net.c | 1 + + drivers/video/fbmem.c | 1 + + drivers/video/mbx/mbxdebugfs.c | 6 ++++ + drivers/watchdog/ar7_wdt.c | 1 + + drivers/watchdog/cpwd.c | 1 + + drivers/watchdog/ep93xx_wdt.c | 1 + + drivers/watchdog/omap_wdt.c | 1 + + drivers/xen/evtchn.c | 1 + + drivers/xen/xenfs/super.c | 1 + + drivers/xen/xenfs/xenbus.c | 1 + + fs/afs/mntpt.c | 1 + + fs/autofs4/dev-ioctl.c | 1 + + fs/binfmt_misc.c | 3 ++ + fs/btrfs/super.c | 1 + + fs/cachefiles/daemon.c | 1 + + fs/char_dev.c | 1 + + fs/coda/pioctl.c | 1 + + fs/coda/psdev.c | 1 + + fs/debugfs/file.c | 3 ++ + fs/dlm/debug_fs.c | 3 +- + fs/dlm/plock.c | 3 +- + fs/dlm/user.c | 3 ++ + fs/ecryptfs/file.c | 1 + + fs/ecryptfs/miscdev.c | 1 + + fs/eventfd.c | 1 + + fs/eventpoll.c | 3 +- + fs/fifo.c | 1 + + fs/fuse/control.c | 4 ++ + fs/fuse/cuse.c | 1 + + fs/gfs2/file.c | 2 + + fs/hppfs/hppfs.c | 1 + + fs/hugetlbfs/inode.c | 1 + + fs/logfs/dir.c | 1 + + fs/nfsd/nfsctl.c | 1 + + fs/no-block.c | 1 + + fs/notify/fanotify/fanotify_user.c | 1 + + fs/notify/inotify/inotify_user.c | 1 + + fs/ntfs/file.c | 3 +- + fs/ocfs2/dlmfs/dlmfs.c | 1 + + fs/ocfs2/stack_user.c | 1 + + fs/proc/base.c | 8 +++++ + fs/proc/proc_sysctl.c | 1 + + fs/proc/root.c | 1 + + fs/proc/task_mmu.c | 1 + + fs/read_write.c | 5 +-- + fs/romfs/super.c | 1 + + fs/signalfd.c | 1 + + fs/squashfs/dir.c | 3 +- + fs/timerfd.c | 1 + + fs/ubifs/debug.c | 1 + + include/linux/fs.h | 1 + + ipc/mqueue.c | 1 + + ipc/shm.c | 2 + + kernel/configs.c | 1 + + kernel/gcov/fs.c | 1 + + kernel/kprobes.c | 1 + + kernel/pm_qos_params.c | 1 + + kernel/profile.c | 1 + + kernel/trace/blktrace.c | 2 + + kernel/trace/ftrace.c | 2 + + kernel/trace/ring_buffer.c | 1 + + kernel/trace/trace_events.c | 6 ++++ + kernel/trace/trace_stack.c | 1 + + lib/dma-debug.c | 1 + + net/atm/proc.c | 1 + + net/dccp/probe.c | 1 + + net/ipv4/tcp_probe.c | 1 + + net/mac80211/debugfs.c | 21 ++++++++++---- + net/mac80211/debugfs_key.c | 2 + + net/mac80211/debugfs_netdev.c | 1 + + net/mac80211/debugfs_sta.c | 2 + + net/mac80211/rate.c | 1 + + net/mac80211/rc80211_minstrel_debugfs.c | 1 + + net/mac80211/rc80211_minstrel_ht_debugfs.c | 3 +- + net/mac80211/rc80211_pid_debugfs.c | 1 + + net/netfilter/xt_recent.c | 1 + + net/nonet.c | 1 + + net/rfkill/core.c | 1 + + net/sctp/probe.c | 1 + + net/socket.c | 1 + + net/sunrpc/cache.c | 2 + + net/wireless/debugfs.c | 2 + + samples/kfifo/bytestream-example.c | 1 + + samples/kfifo/inttype-example.c | 1 + + samples/kfifo/record-example.c | 1 + + samples/tracepoints/tracepoint-sample.c | 1 + + security/apparmor/apparmorfs.c | 9 ++++-- + security/inode.c | 1 + + security/smack/smackfs.c | 5 +++ + sound/core/seq/oss/seq_oss.c | 1 + + sound/core/sound.c | 3 +- + sound/oss/msnd_pinnacle.c | 1 + + sound/oss/sh_dac_audio.c | 1 + + sound/soc/soc-core.c | 1 + + sound/soc/soc-dapm.c | 1 + + sound/sound_core.c | 1 + + virt/kvm/kvm_main.c | 3 ++ + 374 files changed, 623 insertions(+), 78 deletions(-) +Merging bkl-vfs/vfs +$ git merge bkl-vfs/vfs +Resolved 'fs/nilfs2/super.c' using previous resolution. +Auto-merging drivers/usb/gadget/inode.c +Auto-merging fs/ecryptfs/file.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/nfs/super.c +Auto-merging fs/nilfs2/ioctl.c +Auto-merging fs/nilfs2/super.c +CONFLICT (content): Merge conflict in fs/nilfs2/super.c +Auto-merging fs/ocfs2/stack_user.c +Auto-merging fs/ocfs2/super.c +Auto-merging kernel/cgroup.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 19300fb] Merge remote branch 'bkl-vfs/vfs' +$ git diff -M --stat --summary HEAD^.. + drivers/isdn/capi/capifs.c | 2 +- + drivers/usb/core/inode.c | 1 - + drivers/usb/gadget/inode.c | 1 - + fs/adfs/super.c | 8 +++++++- + fs/affs/super.c | 14 ++++---------- + fs/afs/super.c | 5 ----- + fs/autofs4/root.c | 12 +++++++----- + fs/bfs/inode.c | 5 ----- + fs/cifs/cifsfs.c | 9 +++------ + fs/coda/inode.c | 8 +++++++- + fs/ecryptfs/file.c | 3 --- + fs/ext2/super.c | 6 ++++-- + fs/ext3/super.c | 13 ------------- + fs/ext4/super.c | 11 ----------- + fs/fat/inode.c | 5 ----- + fs/fat/namei_msdos.c | 6 +++++- + fs/fat/namei_vfat.c | 6 +++++- + fs/freevxfs/vxfs_super.c | 7 ++++++- + fs/hfs/super.c | 6 +----- + fs/hfsplus/super.c | 5 ----- + fs/hpfs/super.c | 8 +++++++- + fs/isofs/dir.c | 6 +++--- + fs/isofs/inode.c | 16 +++++++++------- + fs/isofs/namei.c | 8 ++++---- + fs/isofs/rock.c | 8 ++++---- + fs/jffs2/fs.c | 4 ---- + fs/jffs2/super.c | 9 +++------ + fs/jfs/super.c | 23 +++++------------------ + fs/namespace.c | 2 -- + fs/ncpfs/inode.c | 8 +++++++- + fs/nfs/super.c | 24 ++++++++++++++++++++++++ + fs/nilfs2/ioctl.c | 1 - + fs/nilfs2/super.c | 9 --------- + fs/ntfs/super.c | 24 ++---------------------- + fs/ocfs2/stack_user.c | 3 --- + fs/ocfs2/super.c | 7 ------- + fs/qnx4/inode.c | 8 +++++++- + fs/reiserfs/super.c | 2 -- + fs/smbfs/inode.c | 5 +++++ + fs/squashfs/super.c | 5 ----- + fs/udf/super.c | 8 +++++++- + fs/ufs/super.c | 5 +++++ + kernel/cgroup.c | 4 ---- + 43 files changed, 142 insertions(+), 188 deletions(-) +Merging bkl-config/config +$ git merge bkl-config/config +Auto-merging arch/cris/arch-v10/drivers/ds1302.c +Auto-merging arch/cris/arch-v10/drivers/pcf8563.c +Auto-merging arch/cris/arch-v10/drivers/sync_serial.c +Auto-merging arch/cris/arch-v32/drivers/cryptocop.c +Auto-merging arch/cris/arch-v32/drivers/mach-a3/gpio.c +Auto-merging arch/cris/arch-v32/drivers/mach-fs/gpio.c +Auto-merging arch/cris/arch-v32/drivers/pcf8563.c +Auto-merging arch/cris/arch-v32/drivers/sync_serial.c +Auto-merging arch/sh/kernel/ptrace_64.c +Auto-merging arch/um/drivers/harddog_kern.c +Auto-merging drivers/char/raw.c +Auto-merging drivers/char/tlclk.c +Auto-merging drivers/media/dvb/bt8xx/dst_ca.c +Auto-merging drivers/media/dvb/dvb-core/dmxdev.c +Auto-merging drivers/media/dvb/dvb-core/dvb_ca_en50221.c +Auto-merging drivers/media/dvb/dvb-core/dvb_net.c +Auto-merging drivers/media/dvb/dvb-core/dvbdev.c +Auto-merging drivers/s390/block/dasd.c +Auto-merging drivers/usb/gadget/Kconfig +Auto-merging fs/nfs/Kconfig +Auto-merging fs/nfsd/Kconfig +Auto-merging init/Kconfig +Auto-merging kernel/trace/Kconfig +Auto-merging lib/Kconfig.debug +Merge made by recursive. + arch/alpha/kernel/osf_sys.c | 5 - + arch/alpha/kernel/traps.c | 3 - + arch/cris/arch-v10/drivers/ds1302.c | 7 +- + arch/cris/arch-v10/drivers/pcf8563.c | 6 +- + arch/cris/arch-v10/drivers/sync_serial.c | 11 +- + arch/cris/arch-v32/drivers/cryptocop.c | 4 +- + arch/cris/arch-v32/drivers/mach-a3/gpio.c | 11 +- + arch/cris/arch-v32/drivers/mach-fs/gpio.c | 11 +- + arch/cris/arch-v32/drivers/pcf8563.c | 6 +- + arch/cris/arch-v32/drivers/sync_serial.c | 11 +- + arch/m68k/kernel/sys_m68k.c | 7 +- + arch/parisc/kernel/perf.c | 4 - + arch/um/drivers/harddog_kern.c | 13 +- + arch/um/drivers/hostaudio_kern.c | 8 +- + arch/um/drivers/ubd_kern.c | 8 +- + arch/um/kernel/exec.c | 2 - + drivers/char/hpet.c | 98 +++++++---- + drivers/char/raw.c | 243 +++++++++++++++----------- + drivers/char/tlclk.c | 6 +- + drivers/gpu/drm/Kconfig | 5 +- + drivers/isdn/capi/Kconfig | 2 +- + drivers/media/Kconfig | 1 + + drivers/media/dvb/bt8xx/dst_ca.c | 7 +- + drivers/media/dvb/dvb-core/dmxdev.c | 17 +-- + drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 8 +- + drivers/media/dvb/dvb-core/dvb_net.c | 9 +- + drivers/media/dvb/dvb-core/dvbdev.c | 17 +- + drivers/net/appletalk/Kconfig | 1 + + drivers/pnp/isapnp/proc.c | 15 +- + drivers/s390/block/dasd.c | 6 - + drivers/s390/block/dasd_ioctl.c | 17 +-- + drivers/s390/block/dcssblk.c | 5 - + drivers/staging/cx25821/Kconfig | 1 + + drivers/staging/easycap/Kconfig | 1 + + drivers/staging/go7007/Kconfig | 1 + + drivers/staging/usbip/Kconfig | 2 +- + drivers/usb/gadget/Kconfig | 2 +- + fs/Kconfig | 1 + + fs/adfs/Kconfig | 1 + + fs/afs/Kconfig | 1 + + fs/autofs/Kconfig | 1 + + fs/autofs4/Kconfig | 1 + + fs/ceph/Kconfig | 1 + + fs/coda/Kconfig | 1 + + fs/compat_ioctl.c | 70 -------- + fs/ecryptfs/Kconfig | 1 + + fs/freevxfs/Kconfig | 1 + + fs/hpfs/Kconfig | 1 + + fs/jffs2/Kconfig | 1 + + fs/ncpfs/Kconfig | 1 + + fs/nfs/Kconfig | 1 + + fs/nfsd/Kconfig | 1 + + fs/ocfs2/Kconfig | 1 + + fs/qnx4/Kconfig | 1 + + fs/reiserfs/Kconfig | 1 + + fs/smbfs/Kconfig | 1 + + fs/squashfs/Kconfig | 1 + + fs/udf/Kconfig | 1 + + fs/ufs/Kconfig | 1 + + include/linux/smp_lock.h | 7 +- + init/Kconfig | 2 +- + kernel/rtmutex-tester.c | 6 + + kernel/trace/Kconfig | 1 + + lib/Kconfig.debug | 9 + + net/ipx/Kconfig | 1 + + net/irda/Kconfig | 1 + + net/irda/irnet/Kconfig | 1 + + net/x25/Kconfig | 1 + + 68 files changed, 346 insertions(+), 355 deletions(-) +Merging irqflags/master +$ git merge irqflags/master +Auto-merging arch/m68k/include/asm/system_mm.h +Auto-merging arch/m68k/include/asm/system_no.h +Auto-merging arch/m68knommu/kernel/asm-offsets.c +Auto-merging arch/powerpc/kernel/exceptions-64s.S +Auto-merging arch/s390/mm/init.c +Auto-merging arch/x86/include/asm/paravirt.h +Auto-merging drivers/net/bfin_mac.c +Auto-merging include/asm-generic/hardirq.h +Auto-merging include/linux/hardirq.h +Merge made by recursive. + arch/alpha/include/asm/irqflags.h | 65 +++++ + arch/alpha/include/asm/system.h | 28 -- + arch/arm/include/asm/irqflags.h | 145 ++++++----- + arch/avr32/include/asm/irqflags.h | 29 +-- + arch/blackfin/include/asm/ipipe.h | 8 +- + arch/blackfin/include/asm/irqflags.h | 273 ++++++++++---------- + arch/blackfin/include/asm/mmu_context.h | 8 +- + arch/blackfin/include/asm/system.h | 4 +- + arch/blackfin/kernel/bfin_gpio.c | 102 ++++---- + arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 8 +- + arch/blackfin/kernel/ipipe.c | 38 ++-- + arch/blackfin/kernel/process.c | 4 +- + arch/blackfin/kernel/trace.c | 1 + + .../mach-bf518/include/mach/cdefBF51x_base.h | 50 ---- + arch/blackfin/mach-bf518/include/mach/pll.h | 63 +++++ + .../mach-bf527/include/mach/cdefBF52x_base.h | 50 ---- + arch/blackfin/mach-bf527/include/mach/pll.h | 63 +++++ + arch/blackfin/mach-bf533/boards/blackstamp.c | 1 + + arch/blackfin/mach-bf533/boards/ip0x.c | 1 + + arch/blackfin/mach-bf533/boards/stamp.c | 1 + + arch/blackfin/mach-bf533/include/mach/cdefBF532.h | 91 ------- + arch/blackfin/mach-bf533/include/mach/fio_flag.h | 55 ++++ + arch/blackfin/mach-bf533/include/mach/pll.h | 57 ++++ + arch/blackfin/mach-bf537/include/mach/cdefBF534.h | 44 ---- + arch/blackfin/mach-bf537/include/mach/pll.h | 57 ++++ + arch/blackfin/mach-bf538/include/mach/cdefBF538.h | 50 ---- + arch/blackfin/mach-bf538/include/mach/pll.h | 63 +++++ + .../mach-bf548/include/mach/cdefBF54x_base.h | 56 ---- + arch/blackfin/mach-bf548/include/mach/pll.h | 69 +++++ + arch/blackfin/mach-bf561/include/mach/cdefBF561.h | 50 ---- + arch/blackfin/mach-bf561/include/mach/pll.h | 63 +++++ + arch/blackfin/mach-common/cpufreq.c | 4 +- + arch/blackfin/mach-common/ints-priority.c | 24 +- + arch/blackfin/mach-common/pm.c | 10 +- + arch/cris/include/arch-v10/arch/irqflags.h | 45 ++++ + arch/cris/include/arch-v10/arch/system.h | 16 -- + arch/cris/include/arch-v32/arch/irqflags.h | 46 ++++ + arch/cris/include/arch-v32/arch/system.h | 22 -- + arch/cris/include/asm/irqflags.h | 1 + + arch/cris/include/asm/system.h | 1 + + arch/frv/include/asm/irqflags.h | 158 +++++++++++ + arch/frv/include/asm/system.h | 136 ---------- + arch/h8300/include/asm/irqflags.h | 43 +++ + arch/h8300/include/asm/system.h | 24 +-- + arch/ia64/include/asm/irqflags.h | 94 +++++++ + arch/ia64/include/asm/system.h | 76 ------ + arch/m32r/include/asm/irqflags.h | 104 ++++++++ + arch/m32r/include/asm/system.h | 66 +----- + arch/m68k/include/asm/entry_no.h | 2 +- + arch/m68k/include/asm/irqflags.h | 76 ++++++ + arch/m68k/include/asm/system_mm.h | 25 +-- + arch/m68k/include/asm/system_no.h | 57 +---- + arch/m68knommu/kernel/asm-offsets.c | 2 - + arch/m68knommu/platform/coldfire/head.S | 1 + + arch/microblaze/include/asm/irqflags.h | 193 ++++++++------- + arch/mips/alchemy/devboards/bcsr.c | 1 + + arch/mips/ar7/irq.c | 1 + + arch/mips/bcm63xx/irq.c | 1 + + arch/mips/cavium-octeon/serial.c | 1 + + arch/mips/dec/setup.c | 1 + + arch/mips/include/asm/irqflags.h | 53 ++-- + arch/mips/include/asm/mach-loongson/loongson.h | 1 + + arch/mips/include/asm/mach-tx49xx/kmalloc.h | 2 +- + arch/mips/jazz/irq.c | 1 + + arch/mips/kernel/cevt-bcm1480.c | 1 + + arch/mips/kernel/cevt-ds1287.c | 1 + + arch/mips/kernel/cevt-gt641xx.c | 1 + + arch/mips/kernel/cevt-r4k.c | 1 + + arch/mips/kernel/cevt-sb1250.c | 1 + + arch/mips/kernel/cevt-smtc.c | 1 + + arch/mips/kernel/cevt-txx9.c | 1 + + arch/mips/kernel/i8253.c | 1 + + arch/mips/kernel/i8259.c | 1 + + arch/mips/kernel/irq-gic.c | 2 +- + arch/mips/kernel/irq-rm7000.c | 1 + + arch/mips/kernel/irq-rm9000.c | 1 + + arch/mips/kernel/irq_cpu.c | 1 + + arch/mips/kernel/irq_txx9.c | 1 + + arch/mips/kernel/smtc.c | 4 +- + arch/mips/kernel/traps.c | 2 +- + arch/mips/mti-malta/malta-platform.c | 1 + + arch/mips/pci/ops-tx3927.c | 1 + + arch/mips/pci/ops-tx4927.c | 1 + + arch/mips/pmc-sierra/msp71xx/msp_irq_cic.c | 1 + + arch/mips/powertv/asic/irq_asic.c | 1 + + arch/mips/rb532/serial.c | 1 + + arch/mips/sni/a20r.c | 1 + + arch/mips/sni/pcimt.c | 1 + + arch/mips/sni/pcit.c | 1 + + arch/mips/sni/rm200.c | 1 + + arch/mips/sni/time.c | 1 + + arch/mips/txx9/generic/irq_tx4927.c | 1 + + arch/mips/txx9/generic/irq_tx4938.c | 1 + + arch/mips/txx9/generic/irq_tx4939.c | 1 + + arch/mips/txx9/generic/setup.c | 1 + + arch/mips/txx9/jmr3927/irq.c | 1 + + arch/mips/txx9/rbtx4927/irq.c | 1 + + arch/mips/txx9/rbtx4938/irq.c | 1 + + arch/mips/txx9/rbtx4939/irq.c | 1 + + arch/mips/vr41xx/common/irq.c | 1 + + arch/mips/vr41xx/common/siu.c | 1 + + arch/mn10300/include/asm/irqflags.h | 119 +++++++++ + arch/mn10300/include/asm/system.h | 109 +-------- + arch/mn10300/kernel/entry.S | 1 + + arch/parisc/include/asm/irqflags.h | 46 ++++ + arch/parisc/include/asm/system.h | 19 +-- + arch/powerpc/include/asm/hw_irq.h | 113 +++++---- + arch/powerpc/include/asm/irqflags.h | 2 +- + arch/powerpc/kernel/exceptions-64s.S | 4 +- + arch/powerpc/kernel/irq.c | 4 +- + arch/s390/include/asm/irqflags.h | 51 ++-- + arch/s390/include/asm/system.h | 2 +- + arch/s390/kernel/mem_detect.c | 4 +- + arch/s390/mm/init.c | 2 +- + arch/s390/mm/maccess.c | 4 +- + arch/score/include/asm/irqflags.h | 187 +++++++------- + arch/sh/include/asm/irqflags.h | 4 +- + arch/sh/kernel/irq_32.c | 12 +- + arch/sparc/include/asm/irqflags_32.h | 35 ++- + arch/sparc/include/asm/irqflags_64.h | 29 +-- + arch/sparc/kernel/irq_32.c | 13 +- + arch/sparc/prom/p1275.c | 2 +- + arch/tile/include/asm/irqflags.h | 36 ++-- + arch/x86/include/asm/irqflags.h | 32 +-- + arch/x86/include/asm/paravirt.h | 16 +- + arch/x86/xen/spinlock.c | 2 +- + arch/xtensa/include/asm/irqflags.h | 58 ++++ + arch/xtensa/include/asm/system.h | 33 +--- + crypto/des_generic.c | 130 +++++----- + drivers/net/bfin_mac.c | 1 + + drivers/net/smc91x.c | 1 + + drivers/s390/char/sclp.c | 2 +- + drivers/vlynq/vlynq.c | 1 + + drivers/watchdog/octeon-wdt-main.c | 1 + + include/asm-generic/atomic.h | 5 +- + include/asm-generic/cmpxchg-local.h | 1 + + include/asm-generic/irqflags.h | 52 ++-- + include/linux/hardirq.h | 1 - + include/linux/irqflags.h | 107 +++++--- + include/linux/list.h | 1 - + include/linux/spinlock.h | 1 + + 141 files changed, 2326 insertions(+), 1844 deletions(-) + create mode 100644 arch/alpha/include/asm/irqflags.h + create mode 100644 arch/blackfin/mach-bf518/include/mach/pll.h + create mode 100644 arch/blackfin/mach-bf527/include/mach/pll.h + create mode 100644 arch/blackfin/mach-bf533/include/mach/fio_flag.h + create mode 100644 arch/blackfin/mach-bf533/include/mach/pll.h + create mode 100644 arch/blackfin/mach-bf537/include/mach/pll.h + create mode 100644 arch/blackfin/mach-bf538/include/mach/pll.h + create mode 100644 arch/blackfin/mach-bf548/include/mach/pll.h + create mode 100644 arch/blackfin/mach-bf561/include/mach/pll.h + create mode 100644 arch/cris/include/arch-v10/arch/irqflags.h + create mode 100644 arch/cris/include/arch-v32/arch/irqflags.h + create mode 100644 arch/cris/include/asm/irqflags.h + create mode 100644 arch/frv/include/asm/irqflags.h + create mode 100644 arch/h8300/include/asm/irqflags.h + create mode 100644 arch/ia64/include/asm/irqflags.h + create mode 100644 arch/m32r/include/asm/irqflags.h + create mode 100644 arch/m68k/include/asm/irqflags.h + create mode 100644 arch/mn10300/include/asm/irqflags.h + create mode 100644 arch/parisc/include/asm/irqflags.h + create mode 100644 arch/xtensa/include/asm/irqflags.h +Merging scsi-post-merge/merge-base:master -- cgit v1.2.3