$ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 9ee4747 Merge branch 'radix-tree' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/xfsdev Merging origin/master $ git merge origin/master Updating 9ee4747..502adf5 Fast-forward Documentation/kernel-parameters.txt | 6 +- MAINTAINERS | 11 + Makefile | 4 +- arch/arm/mach-imx/mach-cpuimx27.c | 4 +- arch/arm/mach-imx/mach-pca100.c | 4 +- arch/arm/mach-mx25/mach-cpuimx25.c | 2 +- arch/arm/mach-mx3/mach-cpuimx35.c | 2 +- arch/blackfin/include/asm/bitops.h | 17 +- arch/blackfin/include/asm/unistd.h | 5 +- arch/blackfin/mach-common/entry.S | 3 + arch/mn10300/mm/dma-alloc.c | 3 +- arch/powerpc/Makefile | 2 +- arch/powerpc/boot/dts/canyonlands.dts | 8 + arch/powerpc/include/asm/mmu-hash64.h | 2 +- arch/powerpc/include/asm/reg.h | 9 +- arch/powerpc/include/asm/rwsem.h | 64 +- arch/powerpc/include/asm/systbl.h | 3 + arch/powerpc/include/asm/unistd.h | 5 +- arch/powerpc/kernel/cputable.c | 1 - arch/powerpc/kernel/crash.c | 24 +- arch/powerpc/kernel/head_44x.S | 4 + arch/powerpc/kernel/head_64.S | 6 +- arch/powerpc/kernel/idle.c | 2 +- arch/powerpc/kernel/irq.c | 16 +- arch/powerpc/kernel/pci_of_scan.c | 2 +- arch/powerpc/kernel/process.c | 20 +- arch/powerpc/kernel/setup_32.c | 9 +- arch/powerpc/kernel/setup_64.c | 63 +- arch/powerpc/kernel/smp.c | 4 +- arch/powerpc/kernel/sys_ppc32.c | 8 + arch/powerpc/kernel/vio.c | 3 +- arch/powerpc/mm/init_64.c | 2 + arch/powerpc/mm/tlb_nohash_low.S | 1 + arch/powerpc/platforms/Kconfig | 3 +- arch/powerpc/platforms/cell/iommu.c | 2 +- arch/powerpc/platforms/iseries/iommu.c | 2 +- arch/powerpc/platforms/powermac/feature.c | 3 +- arch/powerpc/platforms/powermac/pci.c | 2 - arch/powerpc/platforms/pseries/iommu.c | 8 +- arch/powerpc/platforms/pseries/smp.c | 11 +- arch/powerpc/platforms/pseries/xics.c | 6 +- arch/s390/include/asm/hugetlb.h | 4 +- arch/s390/include/asm/mmu.h | 2 + arch/s390/include/asm/mmu_context.h | 9 + arch/s390/include/asm/pgtable.h | 6 +- arch/s390/include/asm/tlb.h | 3 +- arch/s390/include/asm/tlbflush.h | 6 +- arch/s390/kernel/entry.h | 4 +- arch/s390/kernel/smp.c | 2 + arch/s390/mm/init.c | 2 + arch/sparc/include/asm/atomic_64.h | 8 +- arch/sparc/include/asm/backoff.h | 11 +- arch/sparc/include/asm/oplib_64.h | 27 +- arch/sparc/include/asm/rwsem-const.h | 12 - arch/sparc/include/asm/rwsem.h | 120 +- arch/sparc/include/asm/system_64.h | 1 + arch/sparc/lib/Makefile | 2 +- arch/sparc/lib/atomic_64.S | 36 +- arch/sparc/lib/bitops.S | 12 +- arch/sparc/lib/rwsem_64.S | 163 -- arch/sparc/prom/cif.S | 16 +- arch/sparc/prom/console_64.c | 48 +- arch/sparc/prom/devops_64.c | 36 +- arch/sparc/prom/misc_64.c | 314 ++- arch/sparc/prom/p1275.c | 102 +- arch/sparc/prom/tree_64.c | 210 ++- arch/x86/xen/platform-pci-unplug.c | 18 +- drivers/base/firmware_class.c | 2 +- drivers/block/xen-blkfront.c | 2 +- drivers/char/ip2/ip2main.c | 4 +- drivers/char/rocket.c | 1 + drivers/char/synclink_gt.c | 4 +- drivers/gpu/drm/drm_drv.c | 25 +- drivers/gpu/drm/drm_fb_helper.c | 3 +- drivers/gpu/drm/drm_vm.c | 2 +- drivers/gpu/drm/i810/i810_dma.c | 30 +- drivers/gpu/drm/i830/i830_dma.c | 28 +- drivers/gpu/drm/i915/i915_dma.c | 80 +- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/mga/mga_state.c | 26 +- drivers/gpu/drm/nouveau/nouveau_bios.c | 42 +- drivers/gpu/drm/nouveau/nouveau_bo.c | 15 + drivers/gpu/drm/nouveau/nouveau_channel.c | 24 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 6 +- drivers/gpu/drm/nouveau/nouveau_drv.h | 1 + drivers/gpu/drm/nouveau/nouveau_gem.c | 36 +- drivers/gpu/drm/nouveau/nouveau_i2c.c | 2 +- drivers/gpu/drm/nouveau/nouveau_sgdma.c | 12 +- drivers/gpu/drm/nouveau/nv17_tv.c | 8 + drivers/gpu/drm/nouveau/nv50_instmem.c | 2 +- drivers/gpu/drm/nouveau/nvc0_instmem.c | 13 +- drivers/gpu/drm/r128/r128_state.c | 35 +- drivers/gpu/drm/radeon/atombios_crtc.c | 51 +- drivers/gpu/drm/radeon/atombios_dp.c | 2 +- drivers/gpu/drm/radeon/radeon_agp.c | 8 +- drivers/gpu/drm/radeon/radeon_asic.c | 1 + drivers/gpu/drm/radeon/radeon_atombios.c | 39 +- drivers/gpu/drm/radeon/radeon_combios.c | 104 +- drivers/gpu/drm/radeon/radeon_connectors.c | 26 +- drivers/gpu/drm/radeon/radeon_device.c | 2 +- drivers/gpu/drm/radeon/radeon_display.c | 15 +- drivers/gpu/drm/radeon/radeon_encoders.c | 223 +- drivers/gpu/drm/radeon/radeon_fb.c | 2 +- drivers/gpu/drm/radeon/radeon_i2c.c | 7 + drivers/gpu/drm/radeon/radeon_irq_kms.c | 5 +- drivers/gpu/drm/radeon/radeon_kms.c | 79 +- drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 2 +- drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 7 +- drivers/gpu/drm/radeon/radeon_mode.h | 3 +- drivers/gpu/drm/radeon/radeon_pm.c | 5 + drivers/gpu/drm/radeon/radeon_state.c | 56 +- drivers/gpu/drm/savage/savage_bci.c | 8 +- drivers/gpu/drm/sis/sis_mm.c | 12 +- drivers/gpu/drm/via/via_dma.c | 28 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 34 +- drivers/isdn/hardware/avm/Kconfig | 3 +- drivers/macintosh/via-pmu.c | 42 + drivers/media/dvb/mantis/Kconfig | 2 +- drivers/net/Kconfig | 10 + drivers/net/Makefile | 1 + drivers/net/bnx2x/bnx2x.h | 4 +- drivers/net/bnx2x/bnx2x_main.c | 9 +- drivers/net/e1000e/82571.c | 31 +- drivers/net/e1000e/defines.h | 4 + drivers/net/e1000e/lib.c | 10 + drivers/net/ehea/ehea.h | 3 +- drivers/net/ehea/ehea_main.c | 60 +- drivers/net/ibmveth.c | 32 +- drivers/net/ll_temac_main.c | 4 +- drivers/net/netxen/netxen_nic.h | 4 +- drivers/net/netxen/netxen_nic_init.c | 4 - drivers/net/netxen/netxen_nic_main.c | 2 - drivers/net/pxa168_eth.c | 1666 ++++++++++++++ drivers/net/qlcnic/qlcnic_main.c | 2 - drivers/net/sh_eth.c | 2 +- drivers/net/usb/ipheth.c | 5 + drivers/net/wireless/adm8211.c | 8 +- drivers/net/wireless/at76c50x-usb.c | 22 +- drivers/net/wireless/ath/ar9170/main.c | 4 +- drivers/net/wireless/ipw2x00/ipw2100.c | 8 - drivers/net/wireless/iwlwifi/iwl-1000.c | 4 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 4 +- drivers/net/wireless/iwlwifi/iwl-4965.c | 2 +- drivers/net/wireless/iwlwifi/iwl-5000.c | 14 +- drivers/net/wireless/iwlwifi/iwl-6000.c | 32 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 45 +- drivers/net/wireless/iwlwifi/iwl-core.c | 45 - drivers/net/wireless/iwlwifi/iwl-core.h | 3 - drivers/net/wireless/iwlwifi/iwl-dev.h | 3 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 51 +- drivers/net/wireless/mac80211_hwsim.c | 2 +- drivers/net/wireless/mwl8k.c | 34 +- drivers/net/wireless/p54/eeprom.c | 6 +- drivers/net/wireless/p54/fwio.c | 2 +- drivers/net/wireless/p54/led.c | 4 +- drivers/net/wireless/p54/p54pci.c | 2 +- drivers/net/wireless/p54/txrx.c | 2 +- drivers/net/wireless/rtl818x/rtl8180_dev.c | 6 +- drivers/net/wireless/rtl818x/rtl8187_dev.c | 4 +- drivers/net/wireless/rtl818x/rtl8187_rtl8225.c | 4 +- drivers/platform/x86/Kconfig | 4 +- drivers/platform/x86/hp-wmi.c | 64 +- drivers/platform/x86/intel_rar_register.c | 2 +- drivers/platform/x86/intel_scu_ipc.c | 2 +- drivers/serial/68328serial.c | 29 +- drivers/serial/8250_early.c | 4 +- drivers/staging/Kconfig | 2 - drivers/staging/Makefile | 1 - drivers/staging/batman-adv/bat_sysfs.c | 4 + drivers/staging/batman-adv/hard-interface.c | 29 +- drivers/staging/batman-adv/icmp_socket.c | 12 +- drivers/staging/batman-adv/main.c | 7 +- drivers/staging/batman-adv/originator.c | 14 +- drivers/staging/batman-adv/routing.c | 16 +- drivers/staging/batman-adv/types.h | 1 + drivers/staging/sep/Kconfig | 10 - drivers/staging/sep/Makefile | 2 - drivers/staging/sep/TODO | 8 - drivers/staging/sep/sep_dev.h | 110 - drivers/staging/sep/sep_driver.c | 2742 ----------------------- drivers/staging/sep/sep_driver_api.h | 425 ---- drivers/staging/sep/sep_driver_config.h | 225 -- drivers/staging/sep/sep_driver_hw_defs.h | 232 -- drivers/staging/spectra/ffsport.c | 29 +- drivers/staging/spectra/flash.c | 420 +---- drivers/usb/gadget/composite.c | 4 +- drivers/usb/gadget/m66592-udc.c | 1 + drivers/usb/gadget/r8a66597-udc.c | 1 + drivers/usb/gadget/uvc_v4l2.c | 2 +- drivers/usb/host/isp1760-hcd.c | 2 + drivers/usb/host/xhci-ring.c | 6 +- drivers/usb/misc/adutux.c | 2 +- drivers/usb/misc/iowarrior.c | 4 +- drivers/usb/otg/twl4030-usb.c | 6 +- drivers/usb/serial/cp210x.c | 4 +- drivers/usb/serial/ftdi_sio.c | 5 +- drivers/usb/serial/ftdi_sio_ids.h | 9 + drivers/usb/serial/generic.c | 1 + drivers/usb/serial/io_ti.c | 4 +- drivers/usb/serial/navman.c | 1 + drivers/usb/serial/option.c | 7 +- drivers/usb/serial/pl2303.c | 1 + drivers/usb/serial/pl2303.h | 4 + drivers/usb/serial/ssu100.c | 254 ++- drivers/usb/serial/usb-serial.c | 23 +- firmware/Makefile | 2 +- include/drm/drmP.h | 6 +- include/drm/i830_drm.h | 28 +- include/drm/i915_drm.h | 1 + include/drm/mga_drm.h | 2 +- include/drm/nouveau_drm.h | 13 + include/drm/radeon_drm.h | 4 +- include/drm/savage_drm.h | 8 +- include/linux/if_ether.h | 2 +- include/linux/if_fddi.h | 8 +- include/linux/if_hippi.h | 8 +- include/linux/if_pppox.h | 10 +- include/linux/ipv6.h | 4 +- include/linux/kobject.h | 35 +- include/linux/kobject_ns.h | 56 + include/linux/mm.h | 8 +- include/linux/nbd.h | 2 +- include/linux/ncp.h | 10 +- include/linux/netfilter/xt_IDLETIMER.h | 2 +- include/linux/netfilter/xt_ipvs.h | 2 + include/linux/phonet.h | 4 +- include/linux/pxa168_eth.h | 30 + include/linux/rfkill.h | 2 +- include/linux/sysfs.h | 1 + include/linux/usb/composite.h | 1 + include/trace/events/timer.h | 8 +- include/xen/platform_pci.h | 14 +- kernel/sched.c | 10 +- kernel/watchdog.c | 3 + lib/kobject_uevent.c | 4 +- mm/memory.c | 15 +- mm/mmap.c | 3 - net/8021q/vlan_dev.c | 3 +- net/ipv4/netfilter/arp_tables.c | 3 + net/ipv4/netfilter/ip_tables.c | 3 + net/ipv6/netfilter/ip6_tables.c | 3 + net/irda/irlan/irlan_eth.c | 4 +- net/netlink/af_netlink.c | 46 +- net/rds/recv.c | 2 +- scripts/kconfig/confdata.c | 6 +- scripts/kconfig/symbol.c | 2 + scripts/mkmakefile | 4 +- scripts/setlocalversion | 4 +- sound/pci/hda/hda_codec.c | 33 +- sound/pci/hda/hda_codec.h | 2 +- sound/pci/hda/hda_eld.c | 4 +- sound/pci/hda/patch_conexant.c | 1 + sound/pci/hda/patch_hdmi.c | 21 +- sound/pci/hda/patch_intelhdmi.c | 8 - sound/pci/hda/patch_nvhdmi.c | 8 - sound/pci/hda/patch_sigmatel.c | 15 + sound/pci/intel8x0.c | 6 + sound/soc/imx/imx-ssi.c | 3 + 258 files changed, 4155 insertions(+), 5932 deletions(-) delete mode 100644 arch/sparc/include/asm/rwsem-const.h delete mode 100644 arch/sparc/lib/rwsem_64.S create mode 100644 drivers/net/pxa168_eth.c delete mode 100644 drivers/staging/sep/Kconfig delete mode 100644 drivers/staging/sep/Makefile delete mode 100644 drivers/staging/sep/TODO delete mode 100644 drivers/staging/sep/sep_dev.h delete mode 100644 drivers/staging/sep/sep_driver.c delete mode 100644 drivers/staging/sep/sep_driver_api.h delete mode 100644 drivers/staging/sep/sep_driver_config.h delete mode 100644 drivers/staging/sep/sep_driver_hw_defs.h create mode 100644 include/linux/kobject_ns.h create mode 100644 include/linux/pxa168_eth.h 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 Merge made by recursive. arch/m68k/include/asm/unistd.h | 5 ++++- arch/m68k/kernel/entry.S | 3 +++ arch/m68knommu/kernel/syscalltable.S | 3 +++ 3 files changed, 10 insertions(+), 1 deletions(-) Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging sparc-current/master $ git merge sparc-current/master Already up-to-date. Merging scsi-rc-fixes/master $ git merge scsi-rc-fixes/master Already up-to-date. Merging net-current/master $ git merge net-current/master Already up-to-date. Merging sound-current/for-linus $ git merge sound-current/for-linus Already up-to-date. Merging pci-current/for-linus $ git merge pci-current/for-linus Auto-merging Documentation/kernel-parameters.txt Removing drivers/pci/pcie/pme/Makefile Removing drivers/pci/pcie/pme/pcie_pme.h Removing drivers/pci/pcie/pme/pcie_pme_acpi.c Merge made by recursive. Documentation/kernel-parameters.txt | 17 +++-- arch/x86/include/asm/pci.h | 6 +- drivers/acpi/pci_root.c | 97 ++++++++++++++++------------ drivers/pci/hotplug/acpi_pcihp.c | 6 +- drivers/pci/hotplug/pciehp.h | 12 ---- drivers/pci/hotplug/pciehp_acpi.c | 4 +- drivers/pci/hotplug/pciehp_core.c | 4 +- drivers/pci/pci.h | 2 + drivers/pci/pcie/Makefile | 3 +- drivers/pci/pcie/aer/aerdrv.c | 9 ++- drivers/pci/pcie/aer/aerdrv_acpi.c | 36 ---------- drivers/pci/pcie/aer/aerdrv_core.c | 14 +---- drivers/pci/pcie/{pme/pcie_pme.c => pme.c} | 66 ++----------------- drivers/pci/pcie/pme/Makefile | 8 -- drivers/pci/pcie/pme/pcie_pme.h | 28 -------- drivers/pci/pcie/pme/pcie_pme_acpi.c | 54 --------------- drivers/pci/pcie/portdrv.h | 22 ++++++ drivers/pci/pcie/portdrv_acpi.c | 77 ++++++++++++++++++++++ drivers/pci/pcie/portdrv_core.c | 53 ++++++++++++++- drivers/pci/pcie/portdrv_pci.c | 38 +++++++++-- include/acpi/acpi_bus.h | 3 - include/linux/acpi.h | 4 +- include/linux/pci.h | 3 + 23 files changed, 276 insertions(+), 290 deletions(-) rename drivers/pci/pcie/{pme/pcie_pme.c => pme.c} (83%) delete mode 100644 drivers/pci/pcie/pme/Makefile delete mode 100644 drivers/pci/pcie/pme/pcie_pme.h delete mode 100644 drivers/pci/pcie/pme/pcie_pme_acpi.c create mode 100644 drivers/pci/pcie/portdrv_acpi.c 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 Merge made by recursive. Merging quilt/tty.current $ git merge quilt/tty.current Merge made by recursive. Merging quilt/usb.current $ git merge quilt/usb.current Merge made by recursive. Merging quilt/staging.current $ git merge quilt/staging.current Merge made by recursive. 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 Auto-merging drivers/char/hw_random/n2-drv.c Merge made by recursive. crypto/Kconfig | 8 ++++---- crypto/ahash.c | 7 +++++-- crypto/algboss.c | 8 ++++---- crypto/testmgr.c | 4 ++-- drivers/char/hw_random/n2-drv.c | 2 +- 5 files changed, 16 insertions(+), 13 deletions(-) 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 Already up-to-date. Merging davinci/davinci-next $ git merge davinci/davinci-next Auto-merging arch/arm/mach-davinci/board-da830-evm.c Auto-merging arch/arm/mach-davinci/board-da850-evm.c Auto-merging arch/arm/mach-davinci/board-dm646x-evm.c Merge made by recursive. Merging i.MX/for-next $ git merge i.MX/for-next 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 Already uptodate! Merge made by recursive. Merging omap/for-next $ git merge omap/for-next Merge made by recursive. arch/arm/configs/omap_4430sdp_defconfig | 3 + arch/arm/mach-omap2/Makefile | 1 + arch/arm/mach-omap2/board-n8x0.c | 49 ++++++++++++++++-------- arch/arm/mach-omap2/board-omap4panda.c | 2 - arch/arm/mach-omap2/clock3xxx_data.c | 14 +++--- arch/arm/mach-omap2/id.c | 2 +- arch/arm/mach-omap2/include/mach/entry-macro.S | 6 ++- arch/arm/mach-omap2/mux.c | 2 +- arch/arm/mach-omap2/omap-iommu.c | 2 - arch/arm/mach-omap2/omap-smp.c | 3 +- arch/arm/mach-omap2/pm34xx.c | 4 +- arch/arm/plat-omap/gpio.c | 4 +- arch/arm/plat-omap/include/plat/smp.h | 7 --- 13 files changed, 56 insertions(+), 43 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 f4f28e3] 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 Already up-to-date. Merging tegra/for-next $ git merge tegra/for-next Already up-to-date. Merging avr32/avr32-arch $ git merge avr32/avr32-arch Already up-to-date. Merging blackfin/for-linus $ git merge blackfin/for-linus Already up-to-date. Merging cris/for-next $ git merge cris/for-next Already up-to-date. Merging ia64/test $ git merge ia64/test Already up-to-date. Merging m68k/for-next $ git merge m68k/for-next Already up-to-date. Merging m68knommu/for-next $ git merge m68knommu/for-next Merge made by recursive. arch/m68k/include/asm/system_mm.h | 2 - arch/m68k/include/asm/system_no.h | 9 -------- arch/m68k/kernel/time.c | 2 - arch/m68k/sun3/sun3ints.c | 8 ++---- arch/m68knommu/kernel/ptrace.c | 18 ----------------- arch/m68knommu/kernel/setup.c | 3 -- arch/m68knommu/kernel/time.c | 16 ++++++++------ arch/m68knommu/kernel/traps.c | 13 ------------ arch/m68knommu/platform/68328/entry.S | 16 +++++++------- arch/m68knommu/platform/68328/head-de2.S | 6 ----- arch/m68knommu/platform/68328/head-ram.S | 27 -------------------------- arch/m68knommu/platform/68360/entry.S | 7 +++++- arch/m68knommu/platform/68VZ328/config.c | 5 ---- arch/m68knommu/platform/coldfire/intc-2.c | 6 ++++- arch/m68knommu/platform/coldfire/intc-simr.c | 2 + drivers/serial/68328serial.h | 5 ---- 16 files changed, 33 insertions(+), 112 deletions(-) Merging microblaze/next $ git merge microblaze/next Auto-merging arch/microblaze/include/asm/page.h Auto-merging drivers/serial/uartlite.c Merge made by recursive. arch/microblaze/Kconfig | 17 +++++++++++++++++ arch/microblaze/include/asm/page.h | 3 --- arch/microblaze/include/asm/prom.h | 1 + arch/microblaze/include/asm/seccomp.h | 16 ++++++++++++++++ arch/microblaze/include/asm/setup.h | 6 ++++++ arch/microblaze/include/asm/thread_info.h | 20 ++++++++------------ arch/microblaze/kernel/entry.S | 23 +++++++---------------- arch/microblaze/kernel/exceptions.c | 8 +------- arch/microblaze/kernel/kgdb.c | 3 +-- arch/microblaze/kernel/setup.c | 6 ------ arch/microblaze/kernel/timer.c | 2 +- arch/microblaze/platform/generic/system.dts | 1 + drivers/serial/uartlite.c | 26 +++++++++++++++++++++++++- 13 files changed, 84 insertions(+), 48 deletions(-) create mode 100644 arch/microblaze/include/asm/seccomp.h Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Already up-to-date. Merging parisc/next $ git merge parisc/next Already up-to-date. Merging powerpc/next $ git merge powerpc/next Already up-to-date. Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging 52xx-and-virtex/next $ git merge 52xx-and-virtex/next Already up-to-date. Merging galak/next $ git merge galak/next Already up-to-date. Merging s390/features $ git merge s390/features Already up-to-date. Merging sh/master $ git merge sh/master 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/sh2007_defconfig | 213 ++++ arch/sh/configs/sh7757lcr_defconfig | 85 ++ 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 | 32 +- 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 | 5 +- 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 | 79 ++ arch/sh/kernel/reboot.c | 4 + arch/sh/kernel/syscalls_32.S | 3 + 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/serial/sh-sci.h | 17 +- drivers/sh/clk.c | 9 +- sound/soc/sh/siu_pcm.c | 2 + 54 files changed, 2919 insertions(+), 1209 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/Makefile | 2 +- arch/arm/mach-shmobile/board-ap4evb.c | 56 ++++++++--- arch/arm/mach-shmobile/clock-sh7372.c | 9 +- arch/arm/mach-shmobile/clock.c | 4 +- arch/arm/mach-shmobile/pm_runtime.c | 169 +++++++++++++++++++++++++++++++++ 5 files changed, 220 insertions(+), 20 deletions(-) create mode 100644 arch/arm/mach-shmobile/pm_runtime.c 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 b213bf2] 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 Resolved 'net/Makefile' using previous resolution. Auto-merging MAINTAINERS Removing fs/ceph/README Removing fs/ceph/ceph_strings.c Auto-merging mm/page-writeback.c Auto-merging net/Kconfig Auto-merging net/Makefile CONFLICT (content): Merge conflict in net/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 0fd25df] Merge remote branch 'ceph/for-next' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 11 + drivers/block/Kconfig | 16 + drivers/block/Makefile | 1 + drivers/block/rbd.c | 1843 +++++++++++++++++++++++++++++ drivers/block/rbd_types.h | 73 ++ fs/ceph/Kconfig | 14 +- fs/ceph/Makefile | 11 +- fs/ceph/README | 20 - fs/ceph/addr.c | 73 +- fs/ceph/caps.c | 35 +- fs/ceph/ceph_frag.c | 3 +- fs/ceph/ceph_strings.c | 193 --- fs/ceph/debugfs.c | 407 ++----- fs/ceph/dir.c | 55 +- fs/ceph/export.c | 5 +- fs/ceph/file.c | 207 +--- fs/ceph/inode.c | 19 +- fs/ceph/ioctl.c | 11 +- fs/ceph/locks.c | 6 +- fs/ceph/mds_client.c | 111 ++- fs/ceph/mds_client.h | 20 +- fs/ceph/mdsmap.c | 11 +- fs/ceph/snap.c | 70 +- fs/ceph/strings.c | 117 ++ fs/ceph/super.c | 1154 ++++++++----------- fs/ceph/super.h | 397 +++---- fs/ceph/xattr.c | 15 +- {fs => include/linux}/ceph/auth.h | 4 +- {fs => include/linux}/ceph/buffer.h | 0 {fs => include/linux}/ceph/ceph_debug.h | 5 +- {fs => include/linux}/ceph/ceph_frag.h | 0 {fs => include/linux}/ceph/ceph_fs.h | 0 {fs => include/linux}/ceph/ceph_hash.h | 0 {fs => include/linux}/ceph/crush/crush.h | 0 {fs => include/linux}/ceph/crush/hash.h | 0 {fs => include/linux}/ceph/crush/mapper.h | 0 include/linux/ceph/debugfs.h | 33 + {fs => include/linux}/ceph/decode.h | 5 + include/linux/ceph/libceph.h | 249 ++++ {fs => include/linux}/ceph/mdsmap.h | 0 {fs => include/linux}/ceph/messenger.h | 12 +- {fs => include/linux}/ceph/mon_client.h | 1 + {fs => include/linux}/ceph/msgpool.h | 0 {fs => include/linux}/ceph/msgr.h | 0 {fs => include/linux}/ceph/osd_client.h | 67 ++ {fs => include/linux}/ceph/osdmap.h | 2 + {fs => include/linux}/ceph/pagelist.h | 2 +- {fs => include/linux}/ceph/rados.h | 0 {fs => include/linux}/ceph/types.h | 0 mm/page-writeback.c | 1 + net/Kconfig | 1 + net/Makefile | 1 + net/ceph/Kconfig | 27 + net/ceph/Makefile | 37 + {fs => net}/ceph/armor.c | 0 {fs => net}/ceph/auth.c | 10 +- {fs => net}/ceph/auth_none.c | 7 +- {fs => net}/ceph/auth_none.h | 3 +- {fs => net}/ceph/auth_x.c | 9 +- {fs => net}/ceph/auth_x.h | 3 +- {fs => net}/ceph/auth_x_protocol.h | 0 {fs => net}/ceph/buffer.c | 9 +- net/ceph/ceph_common.c | 529 +++++++++ {fs => net}/ceph/ceph_fs.c | 5 +- {fs => net}/ceph/ceph_hash.c | 2 +- net/ceph/ceph_strings.c | 84 ++ {fs => net}/ceph/crush/crush.c | 2 +- {fs => net}/ceph/crush/hash.c | 2 +- {fs => net}/ceph/crush/mapper.c | 4 +- {fs => net}/ceph/crypto.c | 4 +- {fs => net}/ceph/crypto.h | 4 +- net/ceph/debugfs.c | 267 +++++ {fs => net}/ceph/messenger.c | 296 ++++- {fs => net}/ceph/mon_client.c | 73 +- {fs => net}/ceph/msgpool.c | 4 +- {fs => net}/ceph/osd_client.c | 400 +++++-- {fs => net}/ceph/osdmap.c | 30 +- {fs => net}/ceph/pagelist.c | 8 +- net/ceph/pagevec.c | 223 ++++ 79 files changed, 5250 insertions(+), 2073 deletions(-) create mode 100644 drivers/block/rbd.c create mode 100644 drivers/block/rbd_types.h delete mode 100644 fs/ceph/README delete mode 100644 fs/ceph/ceph_strings.c create mode 100644 fs/ceph/strings.c rename {fs => include/linux}/ceph/auth.h (97%) rename {fs => include/linux}/ceph/buffer.h (100%) rename {fs => include/linux}/ceph/ceph_debug.h (86%) rename {fs => include/linux}/ceph/ceph_frag.h (100%) rename {fs => include/linux}/ceph/ceph_fs.h (100%) rename {fs => include/linux}/ceph/ceph_hash.h (100%) rename {fs => include/linux}/ceph/crush/crush.h (100%) rename {fs => include/linux}/ceph/crush/hash.h (100%) rename {fs => include/linux}/ceph/crush/mapper.h (100%) create mode 100644 include/linux/ceph/debugfs.h rename {fs => include/linux}/ceph/decode.h (96%) create mode 100644 include/linux/ceph/libceph.h rename {fs => include/linux}/ceph/mdsmap.h (100%) rename {fs => include/linux}/ceph/messenger.h (95%) rename {fs => include/linux}/ceph/mon_client.h (99%) rename {fs => include/linux}/ceph/msgpool.h (100%) rename {fs => include/linux}/ceph/msgr.h (100%) rename {fs => include/linux}/ceph/osd_client.h (76%) rename {fs => include/linux}/ceph/osdmap.h (97%) rename {fs => include/linux}/ceph/pagelist.h (93%) rename {fs => include/linux}/ceph/rados.h (100%) rename {fs => include/linux}/ceph/types.h (100%) create mode 100644 net/ceph/Kconfig create mode 100644 net/ceph/Makefile rename {fs => net}/ceph/armor.c (100%) rename {fs => net}/ceph/auth.c (97%) rename {fs => net}/ceph/auth_none.c (96%) rename {fs => net}/ceph/auth_none.h (94%) rename {fs => net}/ceph/auth_x.c (99%) rename {fs => net}/ceph/auth_x.h (96%) rename {fs => net}/ceph/auth_x_protocol.h (100%) rename {fs => net}/ceph/buffer.c (86%) create mode 100644 net/ceph/ceph_common.c rename {fs => net}/ceph/ceph_fs.c (92%) rename {fs => net}/ceph/ceph_hash.c (98%) create mode 100644 net/ceph/ceph_strings.c rename {fs => net}/ceph/crush/crush.c (98%) rename {fs => net}/ceph/crush/hash.c (98%) rename {fs => net}/ceph/crush/mapper.c (99%) rename {fs => net}/ceph/crypto.c (99%) rename {fs => net}/ceph/crypto.h (95%) create mode 100644 net/ceph/debugfs.c rename {fs => net}/ceph/messenger.c (89%) rename {fs => net}/ceph/mon_client.c (94%) rename {fs => net}/ceph/msgpool.c (95%) rename {fs => net}/ceph/osd_client.c (84%) rename {fs => net}/ceph/osdmap.c (97%) rename {fs => net}/ceph/pagelist.c (83%) create mode 100644 net/ceph/pagevec.c Merging cifs/master $ git merge cifs/master Merge made by recursive. fs/cifs/Kconfig | 2 + fs/cifs/asn1.c | 6 +- fs/cifs/cifs_unicode.h | 18 +- fs/cifs/cifs_uniupr.h | 16 +- fs/cifs/cifsencrypt.c | 475 +++++++++++++++++++++++++++++++++++------------- fs/cifs/cifsglob.h | 25 +++- fs/cifs/cifspdu.h | 7 +- fs/cifs/cifsproto.h | 12 +- fs/cifs/cifssmb.c | 13 +- fs/cifs/connect.c | 17 ++- fs/cifs/dir.c | 161 ++++++++--------- fs/cifs/file.c | 3 +- fs/cifs/ntlmssp.h | 13 ++ fs/cifs/sess.c | 131 ++++++++++---- fs/cifs/transport.c | 6 +- 15 files changed, 624 insertions(+), 281 deletions(-) Merging configfs/linux-next $ git merge configfs/linux-next Already up-to-date. Merging ecryptfs/next $ git merge ecryptfs/next Merge made by recursive. fs/ecryptfs/crypto.c | 2 +- fs/ecryptfs/keystore.c | 2 ++ fs/ecryptfs/kthread.c | 2 +- fs/ecryptfs/messaging.c | 2 +- fs/ecryptfs/miscdev.c | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) 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 Already up-to-date. Merging fatfs/master $ git merge fatfs/master Already up-to-date. Merging fuse/for-next $ git merge fuse/for-next Already up-to-date. Merging gfs2/master $ git merge gfs2/master 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/glops.c | 5 +- fs/gfs2/incore.h | 2 +- fs/gfs2/inode.c | 9 +- fs/gfs2/inode.h | 15 +++ 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/trans.h | 1 + 16 files changed, 475 insertions(+), 228 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 7b13700] Merge remote branch 'logfs/master' $ git diff -M --stat --summary HEAD^.. Merging nfs/linux-next $ git merge nfs/linux-next Already up-to-date. Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Already up-to-date. Merging nilfs2/for-next $ git merge nilfs2/for-next Merge made by recursive. fs/nilfs2/the_nilfs.c | 4 ++-- include/linux/nilfs2_fs.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) Merging ocfs2/linux-next $ git merge ocfs2/linux-next Auto-merging fs/jbd2/journal.c Auto-merging fs/ocfs2/refcounttree.c Auto-merging include/linux/fs.h 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/blockcheck.c | 4 +- fs/ocfs2/file.c | 49 +++---- fs/ocfs2/inode.c | 6 +- fs/ocfs2/inode.h | 11 +- fs/ocfs2/ioctl.c | 356 +++++++++++++++++++++++++++++++++++++++++++++++ fs/ocfs2/journal.c | 9 +- fs/ocfs2/journal.h | 3 +- fs/ocfs2/mmap.c | 7 +- fs/ocfs2/ocfs2.h | 23 ++- fs/ocfs2/ocfs2_ioctl.h | 95 +++++++++++++ fs/ocfs2/refcounttree.c | 43 ++++++- fs/ocfs2/refcounttree.h | 7 +- fs/ocfs2/super.c | 51 ++++++- include/linux/fs.h | 2 + 20 files changed, 645 insertions(+), 78 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 Merge made by recursive. fs/9p/fid.c | 3 ++- fs/9p/vfs_dir.c | 3 ++- fs/9p/vfs_file.c | 23 +++++++++++++++++++---- fs/9p/vfs_inode.c | 15 ++------------- include/net/9p/9p.h | 4 ++++ net/9p/client.c | 45 ++++++++++++++++++++++++++++----------------- 6 files changed, 57 insertions(+), 36 deletions(-) Merging ubifs/linux-next $ git merge ubifs/linux-next Already up-to-date. Merging xfs/master $ git merge xfs/master Already up-to-date. Merging vfs/for-next $ git merge vfs/for-next Already up-to-date. Merging pci/linux-next $ git merge pci/linux-next Merge made by recursive. drivers/pci/pci.c | 2 +- drivers/pci/pcie/aer/aerdrv_core.c | 2 +- drivers/pci/proc.c | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) Merging hid/for-next $ git merge hid/for-next Merge made by recursive. drivers/hid/Kconfig | 12 + drivers/hid/Makefile | 2 + drivers/hid/hid-apple.c | 7 +- drivers/hid/hid-cherry.c | 7 +- drivers/hid/hid-core.c | 8 +- drivers/hid/hid-cypress.c | 9 +- drivers/hid/hid-elecom.c | 7 +- drivers/hid/hid-ids.h | 7 + drivers/hid/hid-input.c | 4 + drivers/hid/hid-kye.c | 7 +- drivers/hid/hid-lg.c | 9 +- drivers/hid/hid-microsoft.c | 7 +- drivers/hid/hid-monterey.c | 7 +- drivers/hid/hid-ortek.c | 7 +- drivers/hid/hid-petalynx.c | 7 +- drivers/hid/hid-prodikeys.c | 7 +- drivers/hid/hid-samsung.c | 20 +- drivers/hid/hid-sony.c | 7 +- drivers/hid/hid-sunplus.c | 7 +- drivers/hid/hid-uclogic.c | 623 +++++++++++++++++++++++++++++++++++++++ drivers/hid/hid-waltop.c | 558 +++++++++++++++++++++++++++++++++++ drivers/hid/hid-zydacron.c | 7 +- drivers/hid/usbhid/hid-quirks.c | 6 +- include/linux/hid.h | 4 +- 24 files changed, 1289 insertions(+), 57 deletions(-) create mode 100644 drivers/hid/hid-uclogic.c create mode 100644 drivers/hid/hid-waltop.c Merging quilt/i2c $ git merge quilt/i2c Merge made by recursive. drivers/i2c/i2c-core.c | 30 ++++++++++++++++++------------ 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(+), 29 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. MAINTAINERS | 3 +- drivers/hwmon/ads7871.c | 38 ++++++++++---------- drivers/hwmon/coretemp.c | 1 - drivers/hwmon/k8temp.c | 84 +++++++++++++++++++++++++++++----------------- 4 files changed, 73 insertions(+), 53 deletions(-) Merging quilt/kernel-doc $ git merge quilt/kernel-doc Already up-to-date. Merging v4l-dvb/master $ git merge v4l-dvb/master Recorded preimage for 'drivers/media/IR/ir-raw-event.c' Recorded preimage for 'drivers/media/video/s5p-fimc/fimc-core.c' Auto-merging MAINTAINERS 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/video/cx23885/cx23885-i2c.c Auto-merging drivers/media/video/cx88/Kconfig 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/s5p-fimc/fimc-core.c CONFLICT (add/add): Merge conflict in drivers/media/video/s5p-fimc/fimc-core.c Auto-merging drivers/media/video/v4l2-common.c Auto-merging drivers/media/video/v4l2-dev.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/media/IR/ir-raw-event.c'. Recorded resolution for 'drivers/media/video/s5p-fimc/fimc-core.c'. [master 8944a88] Merge remote branch 'v4l-dvb/master' $ git diff -M --stat --summary HEAD^.. drivers/media/IR/ir-raw-event.c | 4 +++- drivers/media/dvb/dvb-usb/opera1.c | 4 +--- drivers/media/video/cx88/Kconfig | 2 +- drivers/media/video/pvrusb2/pvrusb2-ctrl.c | 6 +++--- drivers/media/video/s5p-fimc/fimc-core.c | 3 ++- drivers/media/video/saa7134/saa7134-cards.c | 10 +++++----- drivers/media/video/saa7164/saa7164-buffer.c | 5 +++-- drivers/staging/tm6000/Kconfig | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) Merging kbuild/for-next $ git merge kbuild/for-next Merge made by recursive. scripts/kconfig/Makefile | 5 +- scripts/kconfig/confdata.c | 1 + scripts/kconfig/nconf.c | 365 +++++++++++++++++++++++-------------------- scripts/kconfig/nconf.gui.c | 22 ++-- scripts/kconfig/nconf.h | 3 +- 5 files changed, 213 insertions(+), 183 deletions(-) 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 Removing drivers/ata/pata_winbond.c Merge made by recursive. Documentation/ABI/testing/sysfs-ata | 99 +++++ drivers/ata/Kconfig | 1 + drivers/ata/Makefile | 3 +- drivers/ata/ahci.c | 11 + drivers/ata/ahci.h | 1 + drivers/ata/libahci.c | 16 +- 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-transport.c | 774 +++++++++++++++++++++++++++++++++++ drivers/ata/libata-transport.h | 18 + drivers/ata/libata.h | 7 + drivers/ata/pata_cmd64x.c | 6 - drivers/ata/pata_legacy.c | 15 +- drivers/ata/pata_winbond.c | 282 ------------- 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 + 21 files changed, 1171 insertions(+), 435 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 delete mode 100644 drivers/ata/pata_winbond.c Merging infiniband/for-next $ git merge infiniband/for-next Merge made by recursive. 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 ++++++------ 5 files changed, 13 insertions(+), 13 deletions(-) Merging acpi/test $ git merge acpi/test Already up-to-date. Merging idle-test/idle-test $ git merge idle-test/idle-test Already up-to-date. Merging ieee1394/for-next $ git merge ieee1394/for-next Merge made by recursive. drivers/firewire/core-transaction.c | 13 ++++++++++--- drivers/firewire/net.c | 28 +++++++++++++++------------- drivers/firewire/sbp2.c | 23 +++++++++++++++-------- drivers/ieee1394/ohci1394.c | 2 +- 4 files changed, 41 insertions(+), 25 deletions(-) Merging ubi/linux-next $ git merge ubi/linux-next Already up-to-date. Merging kvm/linux-next $ git merge kvm/linux-next Already up-to-date. Merging dlm/next $ git merge dlm/next Already up-to-date. 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 Already up-to-date. 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 Auto-merging MAINTAINERS Auto-merging drivers/firewire/net.c Merge made by recursive. Documentation/networking/timestamping.txt | 22 +- MAINTAINERS | 21 + drivers/atm/iphase.c | 2 +- drivers/firewire/net.c | 13 - drivers/ieee1394/eth1394.c | 16 - drivers/isdn/hisax/hfc_sx.c | 13 +- drivers/isdn/mISDN/dsp_cmx.c | 1 + drivers/isdn/mISDN/l1oip_core.c | 2 +- drivers/net/Kconfig | 25 + drivers/net/Makefile | 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_main.c | 6 +- drivers/net/bcm63xx_enet.c | 60 +- drivers/net/bcm63xx_enet.h | 1 - drivers/net/benet/be_main.c | 6 - drivers/net/bfin_mac.c | 10 +- drivers/net/bmac.c | 7 - drivers/net/bna/Makefile | 11 + drivers/net/bna/bfa_cee.c | 407 +++ drivers/net/bna/bfa_cee.h | 72 + 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 | 1839 +++++++++++++ drivers/net/bna/bfa_ioc.h | 343 +++ drivers/net/bna/bfa_ioc_ct.c | 391 +++ 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 | 3626 +++++++++++++++++++++++++ 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 | 3270 ++++++++++++++++++++++ drivers/net/bna/bnad.h | 334 +++ drivers/net/bna/bnad_ethtool.c | 1280 +++++++++ drivers/net/bna/cna.h | 81 + drivers/net/bna/cna_fwimg.c | 64 + drivers/net/bnx2.c | 44 +- drivers/net/bnx2x/bnx2x_cmn.c | 20 + drivers/net/bnx2x/bnx2x_cmn.h | 9 + drivers/net/bnx2x/bnx2x_link.c | 10 +- drivers/net/bnx2x/bnx2x_main.c | 26 +- drivers/net/cnic.c | 2 +- drivers/net/cpmac.c | 35 +- drivers/net/cxgb4/cxgb4.h | 2 + drivers/net/cxgb4/cxgb4_main.c | 94 +- drivers/net/cxgb4/sge.c | 17 +- drivers/net/cxgb4/t4_hw.h | 1 + drivers/net/cxgb4/t4fw_api.h | 5 + drivers/net/eepro.c | 8 +- drivers/net/ehea/ehea_main.c | 4 +- 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/ethoc.c | 6 - drivers/net/fec_mpc52xx.c | 6 - drivers/net/gianfar.c | 17 +- drivers/net/greth.c | 4 +- drivers/net/hamradio/scc.c | 3 +- drivers/net/igb/igb.h | 2 +- drivers/net/igb/igb_main.c | 11 +- drivers/net/irda/mcs7780.c | 2 +- drivers/net/ixgbe/ixgbe.h | 30 +- drivers/net/ixgbe/ixgbe_ethtool.c | 385 +-- drivers/net/ixgbe/ixgbe_fcoe.c | 2 +- drivers/net/ixgbe/ixgbe_main.c | 925 ++++--- drivers/net/ixgbe/ixgbe_type.h | 2 + drivers/net/macvtap.c | 99 +- drivers/net/mlx4/Makefile | 2 +- drivers/net/mlx4/alloc.c | 2 +- drivers/net/mlx4/en_ethtool.c | 175 +- 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 | 102 +- 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 | 37 +- drivers/net/mlx4/profile.c | 2 +- drivers/net/myri10ge/myri10ge.c | 4 +- drivers/net/niu.c | 4 +- drivers/net/pasemi_mac_ethtool.c | 16 - drivers/net/pcmcia/3c574_cs.c | 86 +- drivers/net/pcmcia/3c589_cs.c | 13 +- drivers/net/pcmcia/axnet_cs.c | 177 +- 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 | 100 +- drivers/net/pcmcia/smc91c92_cs.c | 99 +- drivers/net/pcmcia/xirc2ps_cs.c | 104 +- drivers/net/pptp.c | 726 +++++ drivers/net/qlcnic/qlcnic.h | 65 +- drivers/net/qlcnic/qlcnic_ctx.c | 265 ++- drivers/net/qlcnic/qlcnic_ethtool.c | 58 +- drivers/net/qlcnic/qlcnic_hdr.h | 17 +- drivers/net/qlcnic/qlcnic_hw.c | 5 +- drivers/net/qlcnic/qlcnic_init.c | 154 +- drivers/net/qlcnic/qlcnic_main.c | 635 +++-- drivers/net/qlge/qlge_main.c | 5 +- drivers/net/r6040.c | 34 +- drivers/net/s2io.c | 4 +- drivers/net/s2io.h | 8 - drivers/net/sc92031.c | 11 - drivers/net/slip.c | 50 +- drivers/net/sungem.c | 211 +- drivers/net/sungem_phy.c | 3 +- drivers/net/sunhme.c | 6 +- drivers/net/sunvnet.c | 50 +- drivers/net/tehuti.c | 21 +- drivers/net/tehuti.h | 1 - drivers/net/tokenring/tms380tr.c | 6 +- drivers/net/tulip/xircom_cb.c | 15 - drivers/net/usb/hso.c | 9 - drivers/net/usb/kaweth.c | 9 - drivers/net/virtio_net.c | 14 - drivers/net/vxge/vxge-main.c | 32 +- drivers/net/vxge/vxge-main.h | 1 - drivers/net/wan/c101.c | 2 +- drivers/net/wan/n2.c | 2 +- drivers/net/wan/pci200syn.c | 2 +- drivers/net/wireless/airo.c | 5 +- drivers/net/wireless/b43/phy_n.c | 2 +- drivers/net/wireless/ipw2x00/ipw2100.c | 6 +- drivers/net/wireless/ipw2x00/ipw2200.c | 12 +- drivers/net/wireless/ray_cs.c | 16 - drivers/net/wireless/rt2x00/rt2400pci.c | 2 +- drivers/net/wireless/rt2x00/rt2500pci.c | 2 +- drivers/net/wireless/rt2x00/rt2500usb.c | 2 +- drivers/net/wireless/rt2x00/rt2800lib.c | 2 +- drivers/net/wireless/rt2x00/rt2x00debug.c | 2 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 4 +- drivers/net/wireless/rt2x00/rt61pci.c | 2 +- drivers/net/wireless/rt2x00/rt73usb.c | 2 +- drivers/net/wireless/wl12xx/wl1271_scan.c | 2 +- drivers/net/wireless/wl3501_cs.c | 11 - drivers/net/xen-netfront.c | 8 +- drivers/net/xilinx_emaclite.c | 13 + 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/mlx4/cmd.h | 1 + include/linux/mlx4/device.h | 7 + include/linux/netdevice.h | 4 +- include/linux/pci_ids.h | 3 + include/linux/pkt_cls.h | 1 + include/linux/rds.h | 9 - include/linux/skbuff.h | 57 +- include/linux/tc_act/Kbuild | 1 + include/linux/tc_act/tc_csum.h | 32 + include/linux/tc_ematch/tc_em_meta.h | 1 + include/net/gre.h | 18 + include/net/ip.h | 2 +- include/net/irda/irlan_common.h | 1 - include/net/sock.h | 8 +- include/net/tc_act/tc_csum.h | 15 + net/8021q/vlan_core.c | 3 +- net/atm/common.c | 2 +- net/atm/lec.c | 1 - net/ax25/af_ax25.c | 2 +- net/ax25/ax25_route.c | 4 +- net/bridge/br_input.c | 2 +- net/can/raw.c | 4 +- net/core/dev.c | 141 +- net/core/ethtool.c | 34 +- net/core/rtnetlink.c | 31 +- net/core/skbuff.c | 20 +- net/dccp/ccids/ccid2.c | 246 +- net/dccp/ccids/ccid2.h | 20 +- net/dccp/ccids/ccid3.c | 70 +- net/dccp/ccids/ccid3.h | 19 +- net/decnet/dn_nsp_out.c | 8 +- net/ipv4/Kconfig | 7 + net/ipv4/Makefile | 1 + net/ipv4/af_inet.c | 8 +- net/ipv4/gre.c | 151 + net/ipv4/icmp.c | 4 +- net/ipv4/ip_fragment.c | 2 +- net/ipv4/ip_gre.c | 14 +- net/ipv4/ip_output.c | 15 +- net/ipv4/netfilter/ipt_CLUSTERIP.c | 31 +- net/ipv4/raw.c | 2 +- net/ipv4/route.c | 9 +- net/ipv4/tcp_output.c | 11 + net/ipv4/udp.c | 4 +- net/ipv6/ip6_output.c | 2 +- net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +- net/ipv6/reassembly.c | 2 +- net/irda/irlan/irlan_eth.c | 32 +- net/netfilter/xt_hashlimit.c | 15 +- net/packet/af_packet.c | 4 +- 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/socket.c | 9 +- net/tipc/bcast.c | 39 +- net/tipc/core.c | 6 +- net/tipc/discover.c | 8 + net/tipc/link.c | 25 +- net/tipc/name_table.c | 44 +- net/tipc/node.c | 22 +- net/tipc/node.h | 2 + net/tipc/port.c | 15 +- net/tipc/socket.c | 81 +- 238 files changed, 27289 insertions(+), 3013 deletions(-) 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 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 create mode 100644 net/sched/act_csum.c Merging wireless/master $ git merge wireless/master Resolved 'drivers/net/wireless/libertas/if_sdio.c' using previous resolution. Auto-merging Documentation/DocBook/Makefile Removing Documentation/DocBook/mac80211.tmpl Auto-merging drivers/net/wireless/b43/phy_n.c Auto-merging drivers/net/wireless/ipw2x00/ipw2100.c Auto-merging drivers/net/wireless/libertas/cfg.c Auto-merging drivers/net/wireless/libertas/if_cs.c Auto-merging drivers/net/wireless/libertas/if_sdio.c CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/if_sdio.c Auto-merging drivers/net/wireless/libertas/if_usb.c Auto-merging drivers/net/wireless/libertas_tf/if_usb.c Auto-merging drivers/net/wireless/rt2x00/rt2500usb.c Auto-merging drivers/net/wireless/rt2x00/rt2800lib.c Auto-merging drivers/net/wireless/rt2x00/rt2x00queue.c Auto-merging drivers/net/wireless/rt2x00/rt61pci.c Auto-merging drivers/net/wireless/rt2x00/rt73usb.c Auto-merging include/linux/netdevice.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master bf66729] Merge remote branch 'wireless/master' $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/80211.tmpl | 496 ++++++++++++++++++ Documentation/DocBook/Makefile | 2 +- Documentation/DocBook/mac80211.tmpl | 337 ------------ drivers/net/wireless/at76c50x-usb.c | 7 +- drivers/net/wireless/ath/ar9170/main.c | 31 +- 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 | 90 ++-- drivers/net/wireless/ath/ath5k/dma.c | 4 +- drivers/net/wireless/ath/ath5k/eeprom.c | 4 +- drivers/net/wireless/ath/ath5k/pcu.c | 32 +- drivers/net/wireless/ath/ath5k/phy.c | 15 +- drivers/net/wireless/ath/ath5k/reg.h | 2 +- drivers/net/wireless/ath/ath5k/reset.c | 24 +- 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 | 67 ++- 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 | 17 +- 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/main.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 | 60 ++- drivers/net/wireless/b43legacy/main.c | 5 + drivers/net/wireless/hostap/hostap_ioctl.c | 2 +- drivers/net/wireless/ipw2x00/ipw2100.c | 4 +- drivers/net/wireless/iwlwifi/Kconfig | 10 + drivers/net/wireless/iwlwifi/Makefile | 1 + drivers/net/wireless/iwlwifi/iwl-1000.c | 5 + drivers/net/wireless/iwlwifi/iwl-4965.c | 2 +- drivers/net/wireless/iwlwifi/iwl-5000.c | 12 +- drivers/net/wireless/iwlwifi/iwl-6000.c | 7 +- drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 21 +- drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 2 +- drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 42 ++- drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 696 +++++++++++++++++++++++++ drivers/net/wireless/iwlwifi/iwl-agn-tt.h | 129 +++++ drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 16 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 141 ++++- drivers/net/wireless/iwlwifi/iwl-commands.h | 50 ++- drivers/net/wireless/iwlwifi/iwl-core.c | 154 ++----- drivers/net/wireless/iwlwifi/iwl-core.h | 29 +- drivers/net/wireless/iwlwifi/iwl-debugfs.c | 6 +- drivers/net/wireless/iwlwifi/iwl-dev.h | 20 +- drivers/net/wireless/iwlwifi/iwl-power.c | 638 +---------------------- drivers/net/wireless/iwlwifi/iwl-power.h | 93 ---- drivers/net/wireless/iwlwifi/iwl-scan.c | 18 +- drivers/net/wireless/iwlwifi/iwl-sta.c | 24 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 9 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 69 ++-- 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 | 171 +++---- 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 | 7 +- drivers/net/wireless/p54/Kconfig | 1 + 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_eeprom.h | 2 +- drivers/net/wireless/p54/txrx.c | 17 +- drivers/net/wireless/prism54/isl_ioctl.c | 2 +- drivers/net/wireless/rt2x00/rt2500usb.c | 4 +- drivers/net/wireless/rt2x00/rt2800.h | 27 +- drivers/net/wireless/rt2x00/rt2800lib.c | 130 +++++- drivers/net/wireless/rt2x00/rt2800lib.h | 15 +- drivers/net/wireless/rt2x00/rt2800pci.c | 119 +---- drivers/net/wireless/rt2x00/rt2800usb.c | 54 ++- drivers/net/wireless/rt2x00/rt2x00.h | 16 +- drivers/net/wireless/rt2x00/rt2x00config.c | 12 +- drivers/net/wireless/rt2x00/rt2x00crypto.c | 17 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 63 ++-- drivers/net/wireless/rt2x00/rt2x00firmware.c | 3 + drivers/net/wireless/rt2x00/rt2x00ht.c | 10 + drivers/net/wireless/rt2x00/rt2x00queue.c | 7 +- drivers/net/wireless/rt2x00/rt2x00queue.h | 8 +- drivers/net/wireless/rt2x00/rt2x00usb.c | 135 ++++-- drivers/net/wireless/rt2x00/rt61pci.c | 10 +- drivers/net/wireless/rt2x00/rt73usb.c | 4 +- drivers/net/wireless/rtl818x/rtl8180_dev.c | 143 +++--- drivers/net/wireless/rtl818x/rtl8187_dev.c | 9 +- drivers/net/wireless/wl12xx/wl1251_acx.c | 2 +- drivers/net/wireless/wl12xx/wl1251_acx.h | 8 +- drivers/net/wireless/wl12xx/wl1251_boot.c | 2 +- drivers/net/wireless/wl12xx/wl1251_cmd.c | 2 +- drivers/net/wireless/wl12xx/wl1251_cmd.h | 6 +- drivers/net/wireless/wl12xx/wl1251_event.c | 29 + drivers/net/wireless/wl12xx/wl1251_event.h | 1 + drivers/net/wireless/wl12xx/wl1251_main.c | 37 +- drivers/net/wireless/wl12xx/wl1251_tx.c | 4 +- drivers/net/wireless/wl12xx/wl1271_acx.c | 2 +- drivers/net/wireless/wl12xx/wl1271_main.c | 13 +- drivers/net/wireless/wl12xx/wl1271_tx.c | 4 +- drivers/net/wireless/zd1211rw/zd_chip.c | 5 + include/linux/netdevice.h | 2 + include/linux/nl80211.h | 150 +++++-- include/linux/ssb/ssb_regs.h | 1 + include/net/cfg80211.h | 179 ++++++- include/net/mac80211.h | 60 ++- net/core/net-sysfs.c | 3 +- net/mac80211/aes_ccm.c | 6 +- net/mac80211/aes_cmac.c | 6 +- net/mac80211/agg-rx.c | 22 + net/mac80211/cfg.c | 62 +-- net/mac80211/debugfs_key.c | 55 +-- net/mac80211/driver-trace.h | 4 +- net/mac80211/ht.c | 28 + net/mac80211/ibss.c | 8 +- net/mac80211/ieee80211_i.h | 20 +- net/mac80211/iface.c | 63 ++- net/mac80211/key.c | 59 +-- net/mac80211/key.h | 4 +- net/mac80211/main.c | 81 +++- net/mac80211/mlme.c | 28 +- net/mac80211/rc80211_pid_debugfs.c | 2 +- net/mac80211/rx.c | 503 ++++++++++++------ net/mac80211/scan.c | 32 +- net/mac80211/sta_info.h | 16 +- net/mac80211/status.c | 2 +- net/mac80211/tx.c | 22 +- net/mac80211/util.c | 6 +- net/mac80211/wep.c | 2 +- net/mac80211/work.c | 39 +- net/mac80211/wpa.c | 32 +- net/wireless/core.c | 15 +- net/wireless/core.h | 21 +- net/wireless/mlme.c | 149 ++++-- net/wireless/nl80211.c | 123 ++++- net/wireless/nl80211.h | 14 +- net/wireless/reg.c | 16 +- net/wireless/sysfs.c | 9 + net/wireless/util.c | 4 +- 158 files changed, 4631 insertions(+), 2854 deletions(-) create mode 100644 Documentation/DocBook/80211.tmpl delete mode 100644 Documentation/DocBook/mac80211.tmpl 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 Merging mtd/master $ git merge mtd/master Already up-to-date. Merging crypto/master $ git merge crypto/master Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) Merging sound-asoc/for-next $ git merge sound-asoc/for-next Resolved 'arch/arm/mach-s3c64xx/mach-smdk6410.c' using previous resolution. Auto-merging arch/arm/mach-mx3/clock-imx35.c Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-smdk6410.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 8f799b4] 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 | 13 +- 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 | 13 + 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 | 30 +- arch/arm/plat-samsung/include/plat/devs.h | 2 + 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 +- include/linux/i2c/twl.h | 6 +- include/sound/sh_fsi.h | 4 +- include/sound/soc-dai.h | 98 +- include/sound/soc-dapm.h | 8 +- include/sound/soc-of-simple.h | 25 - include/sound/soc.h | 236 +- include/sound/tlv320aic3x.h | 43 +- include/sound/wm8962.h | 23 + 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 | 37 +- sound/soc/au1x/dbdma2.c | 19 +- sound/soc/au1x/psc-ac97.c | 20 +- sound/soc/au1x/psc-i2s.c | 21 +- sound/soc/au1x/psc.h | 3 - 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 | 12 + sound/soc/codecs/Makefile | 6 + 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 | 107 +- 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 | 175 +- sound/soc/codecs/ak4642.h | 20 - sound/soc/codecs/ak4671.c | 141 +- sound/soc/codecs/ak4671.h | 3 - sound/soc/codecs/cq93vc.c | 132 +- sound/soc/codecs/cq93vc.h | 29 - sound/soc/codecs/cs4270.c | 393 +- sound/soc/codecs/cs4270.h | 28 - sound/soc/codecs/cs42l51.c | 293 +- sound/soc/codecs/cs42l51.h | 2 - sound/soc/codecs/cx20442.c | 173 +- sound/soc/codecs/cx20442.h | 2 - sound/soc/codecs/da7210.c | 157 +- 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 | 219 +- 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 | 303 +- sound/soc/codecs/tlv320aic3x.h | 45 +- sound/soc/codecs/tlv320dac33.c | 249 +- sound/soc/codecs/tlv320dac33.h | 3 - sound/soc/codecs/twl4030.c | 229 +- 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 | 211 +- 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 | 288 +- 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 | 203 +- sound/soc/codecs/wm8741.h | 3 - sound/soc/codecs/wm8750.c | 265 +- sound/soc/codecs/wm8750.h | 9 - sound/soc/codecs/wm8753.c | 403 +- 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/wm8988.c | 262 +- sound/soc/codecs/wm8988.h | 3 - sound/soc/codecs/wm8990.c | 222 +- sound/soc/codecs/wm8990.h | 8 - sound/soc/codecs/wm8993.c | 304 +- sound/soc/codecs/wm8993.h | 3 - sound/soc/codecs/wm8994.c | 241 +- 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 | 590 + 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 | 64 +- sound/soc/kirkwood/kirkwood-dma.h | 17 - sound/soc/kirkwood/kirkwood-i2s.c | 52 +- sound/soc/kirkwood/kirkwood-i2s.h | 17 - sound/soc/kirkwood/kirkwood-openrd.c | 21 +- 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 | 37 +- 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 | 173 +- 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 | 18 + sound/soc/s3c24xx/Makefile | 4 + 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/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 | 42 +- 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 | 66 +- 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/dma-sh7760.c | 53 +- sound/soc/sh/fsi-ak4642.c | 24 +- sound/soc/sh/fsi-da7210.c | 22 +- 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 | 1680 +- 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 +- 352 files changed, 60876 insertions(+), 13485 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 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 Merging sound/for-next $ git merge sound/for-next Removing sound/isa/sgalaxy.c Merge made by recursive. Documentation/sound/alsa/ALSA-Configuration.txt | 82 ++- include/sound/pcm.h | 1 + sound/core/pcm_lib.c | 14 +- sound/core/pcm_native.c | 2 + sound/drivers/Kconfig | 19 + sound/drivers/Makefile | 2 + sound/drivers/aloop.c | 1055 +++++++++++++++++++++++ sound/isa/Kconfig | 36 +- sound/isa/Makefile | 4 +- 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/sgalaxy.c | 369 -------- sound/pci/ice1712/delta.c | 10 + sound/pci/ice1712/delta.h | 4 +- sound/usb/card.c | 31 +- sound/usb/helper.c | 17 +- sound/usb/midi.c | 9 +- sound/usb/pcm.c | 4 +- sound/usb/proc.c | 2 +- sound/usb/urb.c | 2 +- 22 files changed, 2106 insertions(+), 421 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 Already up-to-date. Merging input/next $ git merge input/next Auto-merging arch/sparc/kernel/process_64.c Auto-merging drivers/gpu/drm/drm_fb_helper.c Auto-merging drivers/usb/serial/ftdi_sio.c Auto-merging drivers/usb/serial/generic.c Auto-merging drivers/usb/serial/pl2303.c Auto-merging drivers/usb/serial/ssu100.c Merge made by recursive. arch/arm/kernel/etm.c | 2 +- arch/ia64/hp/sim/simserial.c | 2 +- arch/powerpc/xmon/xmon.c | 5 +-- arch/sparc/kernel/process_64.c | 2 +- arch/um/drivers/mconsole_kern.c | 2 +- drivers/char/hangcheck-timer.c | 2 +- drivers/char/hvc_console.c | 2 +- drivers/char/hvsi.c | 2 +- drivers/char/sysrq.c | 53 ++++++++++++++++++------------------- drivers/gpu/drm/drm_fb_helper.c | 2 +- drivers/input/keyboard/hil_kbd.c | 12 ++++---- drivers/input/misc/uinput.c | 2 + drivers/net/ibm_newemac/debug.c | 2 +- drivers/s390/char/ctrlchar.c | 4 +-- drivers/s390/char/keyboard.c | 2 +- drivers/serial/sn_console.c | 2 +- drivers/usb/serial/ftdi_sio.c | 2 +- drivers/usb/serial/generic.c | 10 +++---- drivers/usb/serial/pl2303.c | 2 +- drivers/usb/serial/ssu100.c | 2 +- drivers/xen/manage.c | 2 +- include/linux/miscdevice.h | 1 + include/linux/serial_core.h | 2 +- include/linux/sysrq.h | 16 ++++++----- include/linux/uinput.h | 1 - include/linux/usb/serial.h | 3 +- kernel/debug/debug_core.c | 2 +- kernel/debug/kdb/kdb_main.c | 2 +- kernel/power/poweroff.c | 2 +- 29 files changed, 71 insertions(+), 74 deletions(-) Merging lsm/for-next $ git merge lsm/for-next Already up-to-date. Merging block/for-next $ git merge block/for-next Merge made by recursive. Documentation/block/cfq-iosched.txt | 45 ++++++++++++ Documentation/cgroups/blkio-controller.txt | 28 ++++++++ block/blk-cgroup.c | 2 +- block/blk-core.c | 6 +- block/blk-sysfs.c | 1 + block/cfq-iosched.c | 103 ++++++++++++++++++++++++---- block/elevator.c | 44 ++++++++---- drivers/block/cciss.c | 9 +++ drivers/block/loop.c | 2 +- drivers/block/mg_disk.c | 3 +- drivers/s390/char/tape_block.c | 3 +- fs/bio-integrity.c | 4 +- include/linux/elevator.h | 1 + 13 files changed, 212 insertions(+), 39 deletions(-) create mode 100644 Documentation/block/cfq-iosched.txt 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 Auto-merging drivers/net/pcmcia/xirc2ps_cs.c Merge made by recursive. 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 | 7 + drivers/power/Makefile | 1 + drivers/power/isp1704_charger.c | 369 ++++++++++++++++++++++++++ 4 files changed, 382 insertions(+), 0 deletions(-) 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 kgdb/kgdb-next $ git merge kgdb/kgdb-next 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(-) 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 | 383 +++++++++++++++++++++++++--------------------- 3 files changed, 214 insertions(+), 180 deletions(-) Merging uclinux/for-next $ git merge uclinux/for-next Already up-to-date. Merging md/for-next $ git merge md/for-next Already up-to-date. Merging mfd/for-next $ git merge mfd/for-next Merge made by recursive. drivers/gpio/stmpe-gpio.c | 5 ++ drivers/gpio/wm8994-gpio.c | 1 + drivers/mfd/Kconfig | 1 + drivers/mfd/ab3100-core.c | 143 +++++++++++++++++++----------------- drivers/mfd/pcf50633-core.c | 7 -- drivers/mfd/wm831x-irq.c | 9 ++- include/linux/mfd/pcf50633/core.h | 7 ++ include/linux/mfd/stmpe.h | 6 ++ 8 files changed, 102 insertions(+), 77 deletions(-) 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 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 | 8 + drivers/regulator/Makefile | 1 + drivers/regulator/ab3100.c | 5 +- drivers/regulator/ab8500.c | 7 +- drivers/regulator/max1586.c | 12 +- drivers/regulator/max8952.c | 360 ++++++++++++++++++++++++++++++++ drivers/regulator/max8998.c | 7 +- drivers/regulator/tps6507x-regulator.c | 6 - include/linux/regulator/max8952.h | 135 ++++++++++++ 9 files changed, 518 insertions(+), 23 deletions(-) create mode 100644 drivers/regulator/max8952.c create mode 100644 include/linux/regulator/max8952.h Merging security-testing/next $ git merge security-testing/next Merge made by recursive. security/selinux/ss/policydb.c | 4 ++-- security/tomoyo/common.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) 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 Already up-to-date. 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 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/net/igb/igb_main.c Auto-merging drivers/rtc/rtc-nuc900.c Auto-merging drivers/scsi/lpfc/lpfc_hbadisc.c Auto-merging drivers/usb/serial/ftdi_sio.c Auto-merging drivers/usb/serial/io_ti.c Auto-merging fs/exofs/inode.c Auto-merging fs/exofs/ios.c Auto-merging init/Kconfig Auto-merging mm/vmscan.c Merge made by recursive. Documentation/arm/SA1100/FreeBird | 4 ++-- Documentation/kernel-parameters.txt | 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/langwell_udc.c | 3 --- 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 +- mm/percpu.c | 2 +- mm/vmscan.c | 4 ++-- net/mac80211/mesh.h | 2 +- net/wanrouter/wanmain.c | 4 ++-- usr/Kconfig | 2 +- 69 files changed, 61 insertions(+), 159 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 Merge made by recursive. kernel/pm_qos_params.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging bluetooth/master $ git merge bluetooth/master Merge made by recursive. Merging fsnotify/for-next $ git merge fsnotify/for-next Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 6 ++++ fs/notify/fanotify/fanotify.c | 3 -- fs/notify/fanotify/fanotify_user.c | 29 +++++++++++++++++++++ fs/notify/fsnotify.c | 48 +++++++++++++++++++++--------------- include/linux/fanotify.h | 27 ++++++++++++++------ include/linux/fsnotify_backend.h | 1 + 6 files changed, 83 insertions(+), 31 deletions(-) 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 9ab609b] 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 Merge made by recursive. 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 | 29 ++++- 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 | 260 +++++++++++++++++++++++++++++++++++++ arch/arm/kernel/traps.c | 14 ++- arch/arm/lib/getuser.S | 13 +- arch/arm/lib/putuser.S | 29 ++-- arch/arm/lib/uaccess.S | 83 ++++++------ arch/arm/mm/Kconfig | 45 ++++++- 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 +- 30 files changed, 601 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 3d06c78] 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 5d8d071] 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 Merge made by recursive. drivers/spi/amba-pl022.c | 3 ++- drivers/spi/omap2_mcspi.c | 36 +++++++++--------------------------- drivers/spi/orion_spi.c | 4 ++-- 3 files changed, 13 insertions(+), 30 deletions(-) Merging limits/writable_limits $ git merge limits/writable_limits Already up-to-date. Merging omap_dss2/for-next $ git merge omap_dss2/for-next Already up-to-date. Merging xen/upstream/xen $ git merge xen/upstream/xen Already up-to-date. Merging tip/auto-latest $ git merge tip/auto-latest Auto-merging Documentation/kernel-parameters.txt 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 include/linux/fs.h Auto-merging init/Kconfig Auto-merging mm/memory.c Merge made by recursive. Documentation/DocBook/kernel-locking.tmpl | 14 +- Documentation/RCU/checklist.txt | 46 ++- Documentation/feature-removal-schedule.txt | 28 - Documentation/kernel-parameters.txt | 2 +- Documentation/x86/x86_64/kernel-stacks | 6 +- arch/arm/kernel/perf_event.c | 62 +-- arch/powerpc/kernel/perf_callchain.c | 86 +-- arch/sh/kernel/perf_callchain.c | 50 +-- arch/sparc/kernel/perf_event.c | 69 +-- arch/x86/Kconfig | 19 - arch/x86/Kconfig.debug | 10 - arch/x86/include/asm/apb_timer.h | 1 - arch/x86/include/asm/cpu.h | 1 - arch/x86/include/asm/irq.h | 12 +- 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/pgtable.h | 2 + arch/x86/include/asm/tsc.h | 2 + arch/x86/include/asm/vmi.h | 269 --------- arch/x86/include/asm/vmi_time.h | 98 --- arch/x86/kernel/Makefile | 1 - arch/x86/kernel/apb_timer.c | 2 +- arch/x86/kernel/apic/io_apic.c | 12 +- arch/x86/kernel/cpu/amd.c | 2 +- arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/cpu/intel.c | 2 +- arch/x86/kernel/cpu/mcheck/therm_throt.c | 9 +- arch/x86/kernel/cpu/perf_event.c | 82 +-- arch/x86/kernel/i387.c | 6 + arch/x86/kernel/irq_32.c | 8 +- arch/x86/kernel/paravirt.c | 1 - arch/x86/kernel/process.c | 1 - arch/x86/kernel/reboot.c | 2 +- arch/x86/kernel/setup.c | 13 +- arch/x86/kernel/setup_percpu.c | 2 +- arch/x86/kernel/smpboot.c | 2 - arch/x86/kernel/tsc.c | 38 ++ arch/x86/kernel/vmi_32.c | 893 ---------------------------- arch/x86/kernel/vmiclock_32.c | 317 ---------- arch/x86/lib/memcpy_32.c | 36 +- arch/x86/lib/memcpy_64.S | 158 ++++-- arch/x86/lib/memmove_64.c | 46 ++- arch/x86/mm/k8topology_64.c | 6 +- arch/x86/mm/pgtable.c | 4 - arch/x86/power/cpu.c | 2 + arch/x86/xen/mmu.c | 1 - drivers/input/evdev.c | 2 +- drivers/vhost/net.c | 16 +- drivers/vhost/vhost.c | 22 +- drivers/vhost/vhost.h | 10 +- include/asm-generic/pgtable.h | 4 + include/linux/cgroup.h | 4 +- include/linux/compiler.h | 4 + include/linux/cred.h | 2 +- include/linux/debug_locks.h | 5 - include/linux/fdtable.h | 6 +- include/linux/fs.h | 2 +- include/linux/ftrace_event.h | 4 +- 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/irq.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/perf_event.h | 30 +- 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/hung_task.c | 4 +- kernel/lockdep.c | 8 +- kernel/perf_event.c | 259 +++++++- 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 +- kernel/sched_fair.c | 2 + kernel/trace/trace_event_perf.c | 21 +- kernel/trace/trace_events.c | 55 +-- kernel/trace/trace_functions_graph.c | 2 +- kernel/watchdog.c | 2 +- lib/Kconfig.debug | 37 ++ lib/radix-tree.c | 2 +- mm/memory.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 +- tools/perf/Documentation/perf-annotate.txt | 11 +- tools/perf/Documentation/perf-report.txt | 7 + tools/perf/Makefile | 9 + tools/perf/builtin-annotate.c | 26 +- tools/perf/builtin-report.c | 14 +- tools/perf/feature-tests.mak | 11 + tools/perf/util/cache.h | 2 + tools/perf/util/callchain.c | 98 +++- tools/perf/util/callchain.h | 25 +- tools/perf/util/hist.c | 4 +- tools/perf/util/path.c | 3 +- tools/perf/util/sort.h | 2 +- tools/perf/util/ui/browser.c | 93 ++-- tools/perf/util/ui/browser.h | 9 +- tools/perf/util/ui/browsers/annotate.c | 38 +- tools/perf/util/ui/browsers/hists.c | 157 ++--- tools/perf/util/ui/browsers/map.c | 23 +- tools/perf/util/ui/util.c | 4 +- tools/perf/util/util.h | 13 - 133 files changed, 2309 insertions(+), 2844 deletions(-) delete mode 100644 arch/x86/include/asm/vmi.h delete mode 100644 arch/x86/include/asm/vmi_time.h delete mode 100644 arch/x86/kernel/vmi_32.c delete mode 100644 arch/x86/kernel/vmiclock_32.c 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/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 d745108] 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 Already up-to-date. Merging percpu/for-next $ git merge percpu/for-next Already up-to-date. Merging workqueues/for-next $ git merge workqueues/for-next Already up-to-date. Merging sfi/sfi-test $ git merge sfi/sfi-test Already up-to-date. Merging asm-generic/next $ git merge asm-generic/next Already up-to-date. Merging drivers-x86/linux-next $ git merge drivers-x86/linux-next Recorded preimage for 'drivers/platform/x86/Kconfig' Auto-merging drivers/platform/x86/Kconfig CONFLICT (content): Merge conflict in drivers/platform/x86/Kconfig Auto-merging drivers/platform/x86/hp-wmi.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/platform/x86/Kconfig'. [master a225070] Merge remote branch 'drivers-x86/linux-next' $ git diff -M --stat --summary HEAD^.. 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, 331 insertions(+), 627 deletions(-) Merging hwpoison/hwpoison $ git merge hwpoison/hwpoison Already up-to-date. Merging sysctl/master $ git merge sysctl/master Already up-to-date. Merging bkl-core/bkl/core $ git merge bkl-core/bkl/core Already up-to-date. Merging bkl-procfs/bkl/procfs $ git merge bkl-procfs/bkl/procfs Already up-to-date. Merging bkl-ioctl/bkl/ioctl $ git merge bkl-ioctl/bkl/ioctl Already up-to-date. Merging quilt/driver-core $ git merge quilt/driver-core Already up-to-date. Merging quilt/tty $ git merge quilt/tty Already up-to-date. Merging quilt/usb $ git merge quilt/usb Already up-to-date. Merging staging-next/staging-next $ git merge staging-next/staging-next Already up-to-date. Merging slabh/slabh $ git merge slabh/slabh Already up-to-date. Merging scsi-post-merge/merge-base:master $ git clone -s -l -n -q . ../rebase-tmp $ cd ../rebase-tmp $ git fetch --no-tags ../next refs/remotes/scsi-post-merge/master:scsi-post-merge/master From ../next * [new branch] scsi-post-merge/master -> scsi-post-merge/master $ git fetch --no-tags ../next refs/remotes/scsi-post-merge/merge-base:scsi-post-merge/merge-base From ../next * [new branch] scsi-post-merge/merge-base -> scsi-post-merge/merge-base $ git checkout scsi-post-merge/master Switched to branch 'scsi-post-merge/master' $ git rebase --onto master scsi-post-merge/merge-base First, rewinding head to replay your work on top of it... Fast-forwarded scsi-post-merge/master to master. $ cd ../next $ git pull -f ../rebase-tmp scsi-post-merge/master From ../rebase-tmp * branch scsi-post-merge/master -> FETCH_HEAD Already up-to-date. $ rm -r ../rebase-tmp $ git revert 271fb719cc472af3b1e96d8c527bb0da7060a172 Finished one revert. [master 77d057a] Revert "PCI: PCIe: Move PCIe PME code to the pcie directory" 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 drivers/pci/pcie/pme/Makefile rename drivers/pci/pcie/{pme.c => pme/pcie_pme.c} (99%) $ git revert 2bd50dd800b52245294cfceb56be62020cdc7515 Finished one revert. [master 286cdec] Revert "PCI: PCIe: Disable PCIe port services during port initialization" 1 files changed, 3 insertions(+), 26 deletions(-) $ git revert 28eb5f274a305bf3a13b2c80c4804d4515d05c64 Finished one revert. [master 6bfa55f] Revert "PCI: PCIe: Ask BIOS for control of all native services at once" 17 files changed, 237 insertions(+), 155 deletions(-) create mode 100644 drivers/pci/pcie/pme/pcie_pme.h create mode 100644 drivers/pci/pcie/pme/pcie_pme_acpi.c delete mode 100644 drivers/pci/pcie/portdrv_acpi.c $ git revert f04b4dd2b1f533cef0507e0410ffc6732d21a272 Finished one revert. [master 68a5f94] Revert "bna: Delete get_flags and set_flags ethtool methods." 1 files changed, 2 insertions(+), 0 deletions(-) $ git revert 8b230ed8ec96c933047dd0625cf95f739e4939a6 Finished one revert. [master b665a7e] Revert "bna: Brocade 10Gb Ethernet device driver" 30 files changed, 0 insertions(+), 21976 deletions(-) delete mode 100644 drivers/net/bna/Makefile delete mode 100644 drivers/net/bna/bfa_cee.c delete mode 100644 drivers/net/bna/bfa_cee.h delete mode 100644 drivers/net/bna/bfa_defs.h delete mode 100644 drivers/net/bna/bfa_defs_cna.h delete mode 100644 drivers/net/bna/bfa_defs_mfg_comm.h delete mode 100644 drivers/net/bna/bfa_defs_status.h delete mode 100644 drivers/net/bna/bfa_ioc.c delete mode 100644 drivers/net/bna/bfa_ioc.h delete mode 100644 drivers/net/bna/bfa_ioc_ct.c delete mode 100644 drivers/net/bna/bfa_sm.h delete mode 100644 drivers/net/bna/bfa_wc.h delete mode 100644 drivers/net/bna/bfi.h delete mode 100644 drivers/net/bna/bfi_cna.h delete mode 100644 drivers/net/bna/bfi_ctreg.h delete mode 100644 drivers/net/bna/bfi_ll.h delete mode 100644 drivers/net/bna/bna.h delete mode 100644 drivers/net/bna/bna_ctrl.c delete mode 100644 drivers/net/bna/bna_hw.h delete mode 100644 drivers/net/bna/bna_txrx.c delete mode 100644 drivers/net/bna/bna_types.h delete mode 100644 drivers/net/bna/bnad.c delete mode 100644 drivers/net/bna/bnad.h delete mode 100644 drivers/net/bna/bnad_ethtool.c delete mode 100644 drivers/net/bna/cna.h delete mode 100644 drivers/net/bna/cna_fwimg.c