--- /dev/null
+$ date
+Tuesday 10 December 10:17:46 EST 2013
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 374b105797c3 Linux 3.13-rc3
+Merging origin/master (78fd82238d0e Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux)
+$ git merge origin/master
+Updating 374b105797c3..78fd82238d0e
+Fast-forward
+ CREDITS | 5 +
+ Documentation/mic/mpssd/mpssd.c | 18 +-
+ MAINTAINERS | 11 +-
+ arch/arm64/Kconfig | 3 +-
+ arch/arm64/include/asm/io.h | 2 +-
+ arch/arm64/include/asm/pgtable-hwdef.h | 2 +-
+ arch/arm64/kernel/head.S | 3 +-
+ arch/arm64/mm/proc.S | 2 +-
+ drivers/base/power/main.c | 3 -
+ drivers/char/i8k.c | 7 +
+ drivers/cpufreq/cpufreq.c | 46 +--
+ drivers/extcon/extcon-arizona.c | 4 +-
+ drivers/extcon/extcon-class.c | 3 +-
+ drivers/gpu/drm/drm_edid.c | 4 +-
+ drivers/gpu/drm/exynos/exynos_drm_drv.c | 35 +-
+ drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 +-
+ drivers/gpu/drm/i915/i915_drv.c | 2 +
+ drivers/gpu/drm/i915/i915_gem.c | 7 +-
+ drivers/gpu/drm/i915/i915_gem_dmabuf.c | 13 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 60 +--
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +-
+ drivers/gpu/drm/i915/i915_reg.h | 1 +
+ drivers/gpu/drm/i915/intel_ddi.c | 5 +-
+ drivers/gpu/drm/i915/intel_display.c | 14 +-
+ drivers/gpu/drm/i915/intel_dp.c | 34 +-
+ drivers/gpu/drm/i915/intel_drv.h | 2 +-
+ drivers/gpu/drm/i915/intel_pm.c | 15 +-
+ drivers/gpu/drm/nouveau/Makefile | 1 +
+ drivers/gpu/drm/nouveau/core/engine/device/nv50.c | 4 +-
+ drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c | 3 +
+ drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c | 3 +
+ .../gpu/drm/nouveau/core/engine/software/nv50.c | 2 +-
+ .../gpu/drm/nouveau/core/include/subdev/clock.h | 4 +
+ drivers/gpu/drm/nouveau/core/subdev/clock/nv04.c | 7 +-
+ drivers/gpu/drm/nouveau/core/subdev/clock/nvaa.c | 445 +++++++++++++++++++++
+ drivers/gpu/drm/nouveau/dispnv04/overlay.c | 42 +-
+ drivers/gpu/drm/nouveau/nouveau_display.c | 3 +-
+ drivers/gpu/drm/nouveau/nv50_display.c | 2 +-
+ drivers/gpu/drm/radeon/atombios_i2c.c | 15 +-
+ drivers/gpu/drm/radeon/dce6_afmt.c | 12 +-
+ drivers/gpu/drm/radeon/ni_dpm.c | 28 +-
+ drivers/gpu/drm/radeon/r600_hdmi.c | 8 +-
+ drivers/gpu/drm/radeon/radeon.h | 8 +-
+ drivers/gpu/drm/radeon/radeon_atombios.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_cs.c | 4 +-
+ drivers/gpu/drm/radeon/radeon_drv.h | 3 +-
+ drivers/gpu/drm/radeon/radeon_gart.c | 16 +-
+ drivers/gpu/drm/radeon/radeon_pm.c | 49 +--
+ drivers/gpu/drm/radeon/radeon_trace.h | 33 ++
+ drivers/gpu/drm/radeon/reg_srcs/cayman | 4 +-
+ drivers/gpu/drm/radeon/reg_srcs/evergreen | 4 +-
+ drivers/gpu/drm/radeon/si.c | 11 +-
+ drivers/gpu/drm/tegra/drm.c | 34 +-
+ drivers/gpu/drm/tegra/drm.h | 2 +-
+ drivers/gpu/drm/tegra/fb.c | 2 +-
+ drivers/gpu/drm/tegra/rgb.c | 11 +-
+ drivers/gpu/drm/udl/udl_gem.c | 6 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 2 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 1 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +
+ drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 118 ++++--
+ drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 5 +
+ drivers/gpu/host1x/bus.c | 5 +-
+ drivers/gpu/host1x/hw/cdma_hw.c | 4 +-
+ drivers/gpu/host1x/hw/debug_hw.c | 4 +-
+ drivers/hid/hid-sensor-hub.c | 20 +-
+ drivers/iio/common/hid-sensors/Kconfig | 9 -
+ .../iio/common/hid-sensors/hid-sensor-trigger.c | 20 +-
+ drivers/iio/light/Kconfig | 1 +
+ drivers/input/keyboard/adp5588-keys.c | 3 +-
+ drivers/input/keyboard/adp5589-keys.c | 3 +-
+ drivers/input/keyboard/bf54x-keys.c | 3 +-
+ drivers/input/misc/pcf8574_keypad.c | 7 +-
+ drivers/input/mouse/alps.c | 206 +++++++++-
+ drivers/input/mouse/alps.h | 1 +
+ drivers/input/mouse/elantech.c | 1 +
+ drivers/input/touchscreen/sur40.c | 4 +-
+ drivers/input/touchscreen/usbtouchscreen.c | 22 +-
+ drivers/mfd/Kconfig | 2 +-
+ drivers/mfd/lpc_ich.c | 2 +-
+ drivers/mfd/ti-ssp.c | 2 +-
+ drivers/misc/mei/hw-me-regs.h | 5 +-
+ drivers/misc/mei/pci-me.c | 4 +-
+ drivers/misc/mic/card/mic_virtio.c | 33 +-
+ drivers/misc/mic/card/mic_virtio.h | 7 +-
+ drivers/misc/mic/host/mic_boot.c | 2 +-
+ drivers/misc/mic/host/mic_virtio.c | 30 +-
+ drivers/misc/mic/host/mic_x100.c | 4 +-
+ drivers/staging/tidspbridge/rmgr/drv_interface.c | 13 +-
+ drivers/tty/n_tty.c | 6 +-
+ drivers/usb/class/cdc-acm.c | 2 +
+ drivers/usb/core/hub.c | 5 +-
+ drivers/usb/dwc3/ep0.c | 2 +
+ drivers/usb/dwc3/gadget.c | 5 +-
+ drivers/usb/gadget/Kconfig | 1 +
+ drivers/usb/gadget/composite.c | 1 +
+ drivers/usb/gadget/f_fs.c | 2 +-
+ drivers/usb/gadget/f_mass_storage.c | 27 +-
+ drivers/usb/gadget/pxa25x_udc.c | 1 +
+ drivers/usb/gadget/s3c-hsotg.c | 7 +-
+ drivers/usb/gadget/storage_common.h | 4 -
+ drivers/usb/gadget/tcm_usb_gadget.c | 2 +-
+ drivers/usb/gadget/zero.c | 6 +-
+ drivers/usb/host/ohci-pxa27x.c | 1 +
+ drivers/usb/host/xhci-ring.c | 54 ++-
+ drivers/usb/musb/musb_core.c | 9 +-
+ drivers/usb/musb/musb_cppi41.c | 164 ++++++--
+ drivers/usb/musb/musb_gadget.c | 4 +
+ drivers/usb/phy/phy-am335x.c | 5 +-
+ drivers/usb/phy/phy-generic.c | 68 ++--
+ drivers/usb/phy/phy-generic.h | 4 +-
+ drivers/usb/phy/phy-mxs-usb.c | 2 +-
+ drivers/usb/phy/phy-rcar-gen2-usb.c | 4 +-
+ drivers/usb/serial/ftdi_sio.c | 37 +-
+ drivers/usb/serial/generic.c | 12 +-
+ drivers/usb/serial/mos7840.c | 32 +-
+ drivers/usb/serial/option.c | 27 ++
+ drivers/usb/serial/pl2303.c | 30 +-
+ drivers/usb/serial/spcp8x5.c | 30 +-
+ drivers/usb/wusbcore/devconnect.c | 72 ++--
+ drivers/usb/wusbcore/security.c | 98 +++--
+ drivers/usb/wusbcore/wusbhc.h | 6 +-
+ include/crypto/scatterwalk.h | 2 +-
+ include/linux/cpufreq.h | 8 -
+ include/linux/hid-sensor-hub.h | 2 +
+ include/linux/hid-sensor-ids.h | 12 +
+ include/linux/usb.h | 2 +
+ include/linux/usb/wusb.h | 2 +
+ include/uapi/linux/input.h | 3 +
+ include/uapi/linux/mic_common.h | 40 +-
+ tools/usb/Makefile | 5 +-
+ 132 files changed, 1714 insertions(+), 717 deletions(-)
+ create mode 100644 drivers/gpu/drm/nouveau/core/subdev/clock/nvaa.c
+Merging fixes/master (8ae516aa8b81 Merge tag 'trace-fixes-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/rc-fixes (19514fc665ff arm, kbuild: make "make install" not depend on vmlinux)
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arc-current/for-curr (da990a4f2d5a ARC: [perf] Fix a few thinkos)
+$ git merge arc-current/for-curr
+Merge made by the 'recursive' strategy.
+ arch/arc/Kconfig | 1 +
+ arch/arc/include/uapi/asm/unistd.h | 5 +++++
+ arch/arc/kernel/perf_event.c | 4 ++--
+ scripts/sortextable.c | 5 +++++
+ 4 files changed, 13 insertions(+), 2 deletions(-)
+Merging arm-current/fixes (e36056f52000 ARM: another fix for the DMA mapping checks)
+$ git merge arm-current/fixes
+Merge made by the 'recursive' strategy.
+ arch/arm/mm/dma-mapping.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging m68k-current/for-linus (77a42796786c m68k: Remove deprecated IRQF_DISABLED)
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2)
+$ git merge metag-fixes/fixes
+Already up-to-date.
+Merging powerpc-merge/merge (721cb59e9d95 powerpc/windfarm: Fix XServe G5 fan control Makefile issue)
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging sparc/master (1de425c7b271 sparc64: Fix build regression)
+$ git merge sparc/master
+Merge made by the 'recursive' strategy.
+ arch/sparc/kernel/kgdb_64.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging net/master (98bfd23cdb30 virtio-net: free bufs correctly on invalid packet length)
+$ git merge net/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/net/davinci_emac.txt | 2 +-
+ MAINTAINERS | 2 -
+ drivers/net/bonding/bond_main.c | 6 +-
+ drivers/net/bonding/bond_sysfs.c | 4 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 5 +
+ drivers/net/ethernet/broadcom/tg3.c | 26 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 82 +++---
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 278 +++++++++++----------
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 12 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 230 ++++++++++-------
+ drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 14 ++
+ drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 7 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/adapter.h | 1 -
+ .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 15 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h | 24 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 4 +-
+ drivers/net/ethernet/emulex/benet/be_hw.h | 3 +
+ drivers/net/ethernet/emulex/benet/be_main.c | 41 ++-
+ drivers/net/ethernet/freescale/fec_main.c | 9 +-
+ drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +-
+ drivers/net/ethernet/marvell/mvneta.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx4/main.c | 2 +
+ drivers/net/ethernet/nvidia/forcedeth.c | 8 +-
+ drivers/net/ethernet/qlogic/qlge/qlge.h | 2 +-
+ drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | 4 +
+ drivers/net/ethernet/qlogic/qlge/qlge_main.c | 8 -
+ drivers/net/ethernet/tehuti/tehuti.c | 1 -
+ drivers/net/ethernet/ti/cpsw.c | 2 +
+ drivers/net/ethernet/ti/davinci_emac.c | 26 +-
+ drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +-
+ drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +-
+ drivers/net/macvtap.c | 2 +
+ drivers/net/tun.c | 2 +
+ drivers/net/virtio_net.c | 17 +-
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 22 +-
+ drivers/net/wireless/ath/ath9k/hw.c | 7 +-
+ drivers/net/wireless/ath/wcn36xx/smd.c | 19 +-
+ drivers/net/wireless/brcm80211/Kconfig | 2 +
+ .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 2 +
+ drivers/net/wireless/iwlwifi/iwl-7000.c | 29 ++-
+ drivers/net/wireless/iwlwifi/iwl-config.h | 5 +
+ drivers/net/wireless/iwlwifi/iwl-csr.h | 5 +-
+ drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 6 +-
+ drivers/net/wireless/iwlwifi/mvm/d3.c | 5 +-
+ drivers/net/wireless/iwlwifi/mvm/debugfs.c | 4 +
+ drivers/net/wireless/iwlwifi/mvm/time-event.c | 7 +-
+ drivers/net/wireless/iwlwifi/pcie/drv.c | 21 ++
+ drivers/net/wireless/iwlwifi/pcie/internal.h | 8 +
+ drivers/net/wireless/iwlwifi/pcie/rx.c | 7 +-
+ drivers/net/wireless/iwlwifi/pcie/trans.c | 3 -
+ drivers/net/wireless/iwlwifi/pcie/tx.c | 6 +-
+ drivers/net/wireless/mac80211_hwsim.c | 16 +-
+ drivers/net/wireless/mwifiex/sta_ioctl.c | 4 +-
+ drivers/net/xen-netback/interface.c | 20 +-
+ drivers/net/xen-netback/netback.c | 236 +++++++++--------
+ drivers/pci/pci.c | 8 +
+ include/linux/ipv6.h | 1 +
+ include/linux/pci.h | 1 +
+ include/linux/skbuff.h | 39 ++-
+ include/net/ipv6.h | 3 +-
+ include/net/sock.h | 6 +-
+ net/bridge/br_private.h | 10 +
+ net/bridge/br_stp_bpdu.c | 2 +-
+ net/core/skbuff.c | 1 +
+ net/ipv4/tcp_memcontrol.c | 7 -
+ net/ipv6/addrconf.c | 2 +-
+ net/ipv6/ndisc.c | 3 +
+ net/ipv6/route.c | 22 +-
+ net/mac80211/cfg.c | 15 +-
+ net/mac80211/ibss.c | 4 +
+ net/mac80211/ieee80211_i.h | 1 +
+ net/mac80211/iface.c | 1 -
+ net/mac80211/main.c | 3 +
+ net/mac80211/mesh.c | 20 +-
+ net/mac80211/mlme.c | 2 +
+ net/mac80211/rc80211_minstrel_ht.c | 7 +-
+ net/mac80211/rx.c | 3 +-
+ net/mac80211/scan.c | 2 +-
+ net/mac80211/spectmgmt.c | 2 +
+ net/mac80211/util.c | 11 +-
+ net/rds/ib_send.c | 5 +-
+ net/sched/act_api.c | 26 +-
+ net/sched/act_csum.c | 2 -
+ net/sched/act_gact.c | 2 -
+ net/sched/act_ipt.c | 4 -
+ net/sched/act_mirred.c | 2 -
+ net/sched/act_nat.c | 2 -
+ net/sched/act_pedit.c | 2 -
+ net/sched/act_police.c | 1 -
+ net/sched/act_simple.c | 1 -
+ net/sched/act_skbedit.c | 1 -
+ net/sctp/transport.c | 2 +-
+ net/wireless/core.c | 9 +
+ net/wireless/ibss.c | 18 +-
+ net/wireless/nl80211.c | 60 +++--
+ 96 files changed, 979 insertions(+), 619 deletions(-)
+Merging ipsec/master (239c78db9c41 net: clear local_df when passing skb between namespaces)
+$ git merge ipsec/master
+Already up-to-date.
+Merging sound-current/for-linus (31660e9084df ALSA: hda - Remove quirk for Dell Vostro 131)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ sound/pci/hda/patch_conexant.c | 1 -
+ sound/pci/hda/patch_realtek.c | 8 ++++++++
+ sound/usb/mixer_quirks.c | 2 +-
+ 3 files changed, 9 insertions(+), 2 deletions(-)
+Merging pci-current/for-linus (4fc9bbf98fd6 PCI: Disable Bus Master only on kexec reboot)
+$ git merge pci-current/for-linus
+Auto-merging kernel/workqueue.c
+Auto-merging include/linux/pci.h
+Merge made by the 'recursive' strategy.
+ drivers/pci/host/pci-mvebu.c | 5 +++++
+ drivers/pci/pci-driver.c | 38 ++++++++++++++++++++++++++++++--------
+ drivers/pci/remove.c | 4 +++-
+ include/linux/kexec.h | 3 +++
+ include/linux/pci.h | 30 +++++++++++++++---------------
+ kernel/kexec.c | 4 ++++
+ kernel/workqueue.c | 32 ++++++++++----------------------
+ 7 files changed, 70 insertions(+), 46 deletions(-)
+Merging wireless/master (bbf807bc0697 ath9k: fix duration calculation for non-aggregated packets)
+$ git merge wireless/master
+Merge made by the 'recursive' strategy.
+ drivers/net/wireless/ath/ath9k/xmit.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+Merging driver-core.current/driver-core-linus (a8b14744429f sysfs: give different locking key to regular and bin files)
+$ git merge driver-core.current/driver-core-linus
+Merge made by the 'recursive' strategy.
+ fs/sysfs/file.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+Merging tty.current/tty-linus (39434abd942c n_tty: Fix missing newline echo)
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (5a1e1456fc63 usb: chipidea: fix nobody cared IRQ when booting with host role)
+$ git merge usb.current/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/usb/chipidea/core.c | 4 ++++
+ drivers/usb/chipidea/host.c | 3 ++-
+ drivers/usb/chipidea/udc.c | 3 ---
+ drivers/usb/class/cdc-wdm.c | 8 +++-----
+ drivers/usb/dwc3/core.c | 8 +++++---
+ drivers/usb/phy/phy-tegra-usb.c | 2 +-
+ drivers/usb/phy/phy-twl6030-usb.c | 3 ++-
+ drivers/usb/serial/option.c | 2 ++
+ drivers/usb/serial/zte_ev.c | 3 +--
+ 9 files changed, 20 insertions(+), 16 deletions(-)
+Merging staging.current/staging-linus (55ef003e4ae6 Merge tag 'iio-fixes-for-3.13b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging char-misc.current/char-misc-linus (76a9635979e5 mei: add 9 series PCH mei device ids)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (95f75e91588a Input: ALPS - add support for DualPoint device on Dell XT2 model)
+$ git merge input-current/for-linus
+Already up-to-date.
+Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
+$ git merge md-current/for-linus
+Already up-to-date.
+Merging crypto-current/master (389a5390583a crypto: scatterwalk - Use sg_chain_ptr on chain entries)
+$ git merge crypto-current/master
+Already up-to-date.
+Merging ide/master (c2f7d1e103ef ide: pmac: remove unnecessary pci_set_drvdata())
+$ git merge ide/master
+Already up-to-date.
+Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
+$ git merge dwmw2/master
+Already up-to-date.
+Merging sh-current/sh-fixes-for-linus (44033109e99c SH: Convert out[bwl] macros to inline functions)
+$ git merge sh-current/sh-fixes-for-linus
+Already up-to-date.
+Merging devicetree-current/devicetree/merge (1931ee143b0a Revert "drivers: of: add initialization code for dma reserved memory")
+$ git merge devicetree-current/devicetree/merge
+Already up-to-date.
+Merging rr-fixes/fixes (3459f11a8b16 virtio_balloon: update_balloon_size(): update correct field)
+$ git merge rr-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/virtio/virtio_balloon.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging mfd-fixes/master (88ec6a4d8369 Merge tag 'mfd-lee-3.13-fixes-1' of git://git.linaro.org/people/ljones/mfd)
+$ git merge mfd-fixes/master
+Already up-to-date.
+Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus)
+$ git merge vfio-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/iommu/arm-smmu.c | 66 ++++++++++++++++++++----------------------------
+ 1 file changed, 28 insertions(+), 38 deletions(-)
+Merging drm-intel-fixes/for-linux-next-fixes (acc240d41ea1 drm/i915: Fix use-after-free in do_switch)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/i915_dma.c | 12 +++---------
+ drivers/gpu/drm/i915/i915_drv.c | 1 +
+ drivers/gpu/drm/i915/i915_drv.h | 2 --
+ drivers/gpu/drm/i915/i915_gem_context.c | 16 ++++++++++++----
+ drivers/gpu/drm/i915/intel_display.c | 7 ++++---
+ drivers/gpu/drm/i915/intel_drv.h | 1 +
+ drivers/gpu/drm/i915/intel_pm.c | 11 ++++++++++-
+ 7 files changed, 31 insertions(+), 19 deletions(-)
+Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu)
+$ git merge asm-generic/master
+Already up-to-date.
+Merging arc/for-next (035a20627b46 ARC: [SMP] optimize IPI send and receive)
+$ git merge arc/for-next
+Merge made by the 'recursive' strategy.
+ arch/arc/include/asm/smp.h | 8 +--
+ arch/arc/kernel/smp.c | 124 +++++++++++++++++++++++++-------------------
+ arch/arc/plat-arcfpga/smp.c | 12 ++---
+ 3 files changed, 78 insertions(+), 66 deletions(-)
+Merging arm/for-next (4599b2b118c3 Merge branches 'fixes', 'kees' and 'misc' into for-next)
+$ git merge arm/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig.debug | 23 +++
+ arch/arm/include/asm/cacheflush.h | 5 +
+ arch/arm/include/asm/io.h | 2 +-
+ arch/arm/include/asm/mach/map.h | 27 +--
+ arch/arm/include/asm/pgtable-2level.h | 1 +
+ arch/arm/include/asm/pgtable-3level.h | 1 +
+ arch/arm/include/asm/pgtable.h | 2 +
+ arch/arm/include/asm/xen/page.h | 2 +-
+ arch/arm/kernel/entry-v7m.S | 2 -
+ arch/arm/kernel/etm.c | 6 -
+ arch/arm/kernel/tcm.c | 4 +-
+ arch/arm/kernel/traps.c | 2 +-
+ arch/arm/lib/backtrace.S | 20 +-
+ arch/arm/mach-at91/setup.c | 2 +-
+ arch/arm/mach-omap2/io.c | 4 +-
+ arch/arm/mach-omap2/omap4-common.c | 2 +-
+ arch/arm/mach-ux500/setup.h | 2 +-
+ arch/arm/mm/Makefile | 1 +
+ arch/arm/mm/dma-mapping.c | 6 +-
+ arch/arm/mm/dump.c | 345 ++++++++++++++++++++++++++++++++++
+ arch/arm/mm/ioremap.c | 4 +-
+ arch/arm/mm/mmu.c | 126 ++++++++++---
+ drivers/input/serio/ambakmi.c | 2 -
+ drivers/mmc/host/mmci.c | 2 -
+ drivers/mtd/maps/pxa2xx-flash.c | 2 +-
+ 25 files changed, 524 insertions(+), 71 deletions(-)
+ create mode 100644 arch/arm/mm/dump.c
+Merging arm-perf/for-next/perf (6ce4eac1f600 Linux 3.13-rc1)
+$ git merge arm-perf/for-next/perf
+Already up-to-date.
+Merging arm-soc/for-next (883139c998a2 Merge branch 'next/soc' into for-next)
+$ git merge arm-soc/for-next
+Removing include/linux/platform_data/pinctrl-nomadik.h
+Removing include/linux/platform_data/clocksource-nomadik-mtu.h
+Auto-merging include/linux/clk/at91_pmc.h
+Auto-merging arch/arm/mach-ux500/setup.h
+Removing arch/arm/mach-ux500/devices.h
+Removing arch/arm/mach-ux500/devices.c
+Removing arch/arm/mach-ux500/devices-db8500.h
+Removing arch/arm/mach-ux500/devices-db8500.c
+Removing arch/arm/mach-ux500/board-mop500.c
+Removing arch/arm/mach-s3c64xx/dma.c
+Auto-merging arch/arm/mach-at91/setup.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/at91-clock.txt | 339 +++++++++
+ .../devicetree/bindings/dma/ste-dma40.txt | 3 +
+ arch/arm/Kconfig | 1 +
+ arch/arm/arm-soc-for-next-contents.txt | 39 +
+ arch/arm/boot/dts/armada-370-mirabox.dts | 25 +-
+ arch/arm/boot/dts/armada-370-netgear-rn102.dts | 2 +-
+ arch/arm/boot/dts/armada-370-netgear-rn104.dts | 32 +
+ arch/arm/boot/dts/armada-370-xp.dtsi | 9 +
+ arch/arm/boot/dts/armada-xp-gp.dts | 8 +
+ arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 3 +-
+ arch/arm/boot/dts/dove-cubox.dts | 2 +-
+ arch/arm/boot/dts/dove.dtsi | 13 +-
+ arch/arm/boot/dts/kirkwood-6281.dtsi | 2 +
+ arch/arm/boot/dts/kirkwood-6282.dtsi | 2 +
+ arch/arm/boot/dts/kirkwood-dns320.dts | 2 +-
+ arch/arm/boot/dts/kirkwood-dns325.dts | 2 +-
+ arch/arm/boot/dts/kirkwood-dockstar.dts | 2 +-
+ arch/arm/boot/dts/kirkwood-goflexnet.dts | 2 +-
+ .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 4 +-
+ arch/arm/boot/dts/kirkwood-ib62x0.dts | 2 +-
+ arch/arm/boot/dts/kirkwood-iconnect.dts | 4 +-
+ arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 2 +-
+ arch/arm/boot/dts/kirkwood-lsxl.dtsi | 2 +-
+ .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 14 +-
+ arch/arm/boot/dts/kirkwood-ns2lite.dts | 2 +-
+ arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | 2 +-
+ arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts | 2 +-
+ arch/arm/boot/dts/kirkwood-sheevaplug.dts | 4 +-
+ .../dts/orion5x-lacie-ethernet-disk-mini-v2.dts | 2 +-
+ arch/arm/boot/dts/sama5d3.dtsi | 379 +++++++++-
+ arch/arm/boot/dts/sama5d3_can.dtsi | 20 +
+ arch/arm/boot/dts/sama5d3_emac.dtsi | 11 +
+ arch/arm/boot/dts/sama5d3_gmac.dtsi | 11 +
+ arch/arm/boot/dts/sama5d3_lcd.dtsi | 17 +
+ arch/arm/boot/dts/sama5d3_mci2.dtsi | 12 +
+ arch/arm/boot/dts/sama5d3_tcb1.dtsi | 12 +
+ arch/arm/boot/dts/sama5d3_uart.dtsi | 21 +
+ arch/arm/boot/dts/sama5d3xcm.dtsi | 17 +-
+ arch/arm/boot/dts/st-pincfg.h | 2 +-
+ arch/arm/boot/dts/ste-dbx5x0.dtsi | 32 +
+ arch/arm/boot/dts/ste-href-family-pinctrl.dtsi | 745 +++++++++++++++++++
+ arch/arm/boot/dts/ste-href-stuib.dtsi | 41 ++
+ arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 90 ++-
+ arch/arm/boot/dts/ste-href.dtsi | 78 +-
+ arch/arm/boot/dts/ste-hrefprev60.dtsi | 73 +-
+ arch/arm/boot/dts/ste-hrefv60plus.dtsi | 217 +++++-
+ arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi | 80 ++
+ arch/arm/boot/dts/ste-snowball.dts | 225 ++++++
+ arch/arm/boot/dts/stih415-pinctrl.dtsi | 36 +
+ arch/arm/boot/dts/stih415.dtsi | 53 ++
+ arch/arm/boot/dts/stih416-pinctrl.dtsi | 35 +
+ arch/arm/boot/dts/stih416.dtsi | 53 ++
+ arch/arm/boot/dts/stih41x-b2000.dtsi | 9 +
+ arch/arm/boot/dts/stih41x-b2020.dtsi | 22 +
+ arch/arm/common/timer-sp.c | 4 +-
+ arch/arm/configs/bockw_defconfig | 10 +-
+ arch/arm/configs/genmai_defconfig | 116 +++
+ arch/arm/configs/kirkwood_defconfig | 1 +
+ arch/arm/configs/kzm9d_defconfig | 1 +
+ arch/arm/configs/marzen_defconfig | 10 +-
+ arch/arm/configs/multi_v7_defconfig | 3 +
+ arch/arm/configs/mvebu_defconfig | 1 +
+ arch/arm/mach-at91/Kconfig | 43 ++
+ arch/arm/mach-at91/Kconfig.non_dt | 6 +
+ arch/arm/mach-at91/Makefile | 2 +-
+ arch/arm/mach-at91/at91rm9200.c | 2 +-
+ arch/arm/mach-at91/at91sam9260.c | 2 +-
+ arch/arm/mach-at91/at91sam9261.c | 2 +-
+ arch/arm/mach-at91/at91sam9263.c | 2 +-
+ arch/arm/mach-at91/at91sam926x_time.c | 14 +-
+ arch/arm/mach-at91/at91sam9g45.c | 2 +-
+ arch/arm/mach-at91/at91sam9n12.c | 2 +-
+ arch/arm/mach-at91/at91sam9rl.c | 2 +-
+ arch/arm/mach-at91/at91sam9x5.c | 2 +-
+ arch/arm/mach-at91/board-dt-sama5.c | 10 +-
+ arch/arm/mach-at91/clock.c | 7 +-
+ arch/arm/mach-at91/generic.h | 3 +-
+ arch/arm/mach-at91/pm.c | 2 +-
+ arch/arm/mach-at91/pm_slowclock.S | 2 +-
+ arch/arm/mach-at91/sama5d3.c | 344 +--------
+ arch/arm/mach-at91/setup.c | 8 +-
+ arch/arm/mach-clps711x/common.c | 4 +-
+ arch/arm/mach-davinci/devices-da8xx.c | 4 +-
+ arch/arm/mach-davinci/dm355.c | 3 +-
+ arch/arm/mach-davinci/dm365.c | 3 +-
+ arch/arm/mach-davinci/dm644x.c | 3 +-
+ arch/arm/mach-davinci/dm646x.c | 6 +-
+ arch/arm/mach-davinci/time.c | 4 +-
+ arch/arm/mach-dove/common.c | 15 +-
+ arch/arm/mach-ep93xx/Kconfig | 1 +
+ arch/arm/mach-ep93xx/core.c | 110 ++-
+ arch/arm/mach-ep93xx/include/mach/platform.h | 3 +-
+ arch/arm/mach-highbank/highbank.c | 23 +
+ arch/arm/mach-imx/time.c | 4 +-
+ arch/arm/mach-integrator/integrator_ap.c | 4 +-
+ arch/arm/mach-ixp4xx/common.c | 4 +-
+ arch/arm/mach-kirkwood/board-dt.c | 40 +-
+ arch/arm/mach-mmp/time.c | 4 +-
+ arch/arm/mach-msm/timer.c | 4 +-
+ arch/arm/mach-mvebu/coherency.c | 1 +
+ arch/arm/mach-mvebu/coherency.h | 4 +-
+ arch/arm/mach-mvebu/common.h | 1 -
+ arch/arm/mach-mvebu/hotplug.c | 1 +
+ arch/arm/mach-mvebu/platsmp.c | 4 +-
+ arch/arm/mach-mvebu/pmsu.c | 3 +-
+ arch/arm/mach-mvebu/system-controller.c | 5 +-
+ arch/arm/mach-omap1/time.c | 4 +-
+ arch/arm/mach-omap2/timer.c | 4 +-
+ arch/arm/mach-orion5x/board-dt.c | 2 +-
+ arch/arm/mach-orion5x/common.c | 7 +-
+ arch/arm/mach-orion5x/db88f5281-setup.c | 2 +-
+ arch/arm/mach-orion5x/irq.c | 1 +
+ arch/arm/mach-orion5x/pci.c | 4 +-
+ arch/arm/mach-orion5x/rd88f5182-setup.c | 2 +-
+ arch/arm/mach-orion5x/terastation_pro2-setup.c | 2 +-
+ arch/arm/mach-orion5x/ts209-setup.c | 2 +-
+ arch/arm/mach-orion5x/ts78xx-setup.c | 2 +-
+ arch/arm/mach-pxa/time.c | 4 +-
+ arch/arm/mach-s3c64xx/Kconfig | 7 +-
+ arch/arm/mach-s3c64xx/Makefile | 2 +-
+ arch/arm/mach-s3c64xx/common.h | 5 +
+ arch/arm/mach-s3c64xx/dma.c | 762 -------------------
+ arch/arm/mach-s3c64xx/include/mach/dma.h | 144 ++--
+ arch/arm/mach-s3c64xx/pl080.c | 244 +++++++
+ arch/arm/mach-sa1100/time.c | 4 +-
+ arch/arm/mach-shmobile/board-ape6evm.c | 6 +-
+ arch/arm/mach-shmobile/board-bockw-reference.c | 1 -
+ arch/arm/mach-shmobile/board-lager-reference.c | 5 +-
+ arch/arm/mach-shmobile/board-lager.c | 2 +-
+ arch/arm/mach-shmobile/board-marzen.c | 25 +-
+ arch/arm/mach-shmobile/clock-r7s72100.c | 3 +
+ arch/arm/mach-shmobile/clock-r8a7790.c | 2 +-
+ arch/arm/mach-shmobile/clock-sh7372.c | 9 +-
+ arch/arm/mach-shmobile/clock-sh73a0.c | 14 +-
+ arch/arm/mach-shmobile/include/mach/r8a7779.h | 5 -
+ arch/arm/mach-shmobile/setup-r8a7779.c | 57 --
+ arch/arm/mach-shmobile/setup-r8a7790.c | 7 +-
+ arch/arm/mach-shmobile/setup-sh73a0.c | 16 +-
+ arch/arm/mach-u300/timer.c | 4 +-
+ arch/arm/mach-ux500/Makefile | 6 +-
+ arch/arm/mach-ux500/board-mop500-audio.c | 3 -
+ arch/arm/mach-ux500/board-mop500-pins.c | 804 ---------------------
+ arch/arm/mach-ux500/board-mop500-sdi.c | 2 -
+ arch/arm/mach-ux500/board-mop500.c | 78 --
+ arch/arm/mach-ux500/board-mop500.h | 1 -
+ arch/arm/mach-ux500/cpu-db8500.c | 22 +-
+ arch/arm/mach-ux500/cpu.c | 23 +-
+ arch/arm/mach-ux500/devices-db8500.c | 28 -
+ arch/arm/mach-ux500/devices-db8500.h | 19 -
+ arch/arm/mach-ux500/devices.c | 26 -
+ arch/arm/mach-ux500/devices.h | 15 -
+ arch/arm/mach-ux500/setup.h | 6 -
+ arch/arm/mach-ux500/timer.c | 76 +-
+ arch/arm/plat-iop/time.c | 4 +-
+ arch/arm/plat-omap/counter_32k.c | 4 +-
+ arch/arm/plat-orion/common.c | 9 +-
+ arch/arm/plat-orion/time.c | 7 +-
+ arch/arm/plat-samsung/devs.c | 10 +-
+ arch/arm/plat-samsung/dma-ops.c | 8 +-
+ arch/arm/plat-versatile/sched-clock.c | 4 +-
+ drivers/bus/mvebu-mbus.c | 10 +-
+ drivers/clk/Makefile | 1 +
+ drivers/clk/at91/Makefile | 12 +
+ drivers/clk/at91/clk-main.c | 187 +++++
+ drivers/clk/at91/clk-master.c | 270 +++++++
+ drivers/clk/at91/clk-peripheral.c | 410 +++++++++++
+ drivers/clk/at91/clk-pll.c | 531 ++++++++++++++
+ drivers/clk/at91/clk-plldiv.c | 135 ++++
+ drivers/clk/at91/clk-programmable.c | 366 ++++++++++
+ drivers/clk/at91/clk-smd.c | 171 +++++
+ drivers/clk/at91/clk-system.c | 135 ++++
+ drivers/clk/at91/clk-usb.c | 398 ++++++++++
+ drivers/clk/at91/clk-utmi.c | 159 ++++
+ drivers/clk/at91/pmc.c | 397 ++++++++++
+ drivers/clk/at91/pmc.h | 116 +++
+ drivers/clk/samsung/clk-s3c64xx.c | 4 +-
+ drivers/clocksource/nomadik-mtu.c | 23 +-
+ drivers/dma/ste_dma40.c | 4 +
+ drivers/gpio/gpio-davinci.c | 4 +-
+ drivers/pinctrl/pinctrl-nomadik.c | 296 ++++++--
+ drivers/pinctrl/pinctrl-nomadik.h | 14 +-
+ drivers/spi/Kconfig | 2 +-
+ drivers/usb/gadget/atmel_usba_udc.c | 2 +-
+ include/dt-bindings/clk/at91.h | 22 +
+ .../include/mach => include/linux/clk}/at91_pmc.h | 4 +-
+ .../linux/platform_data/clocksource-nomadik-mtu.h | 9 -
+ include/linux/platform_data/pinctrl-nomadik.h | 242 -------
+ 187 files changed, 7181 insertions(+), 2938 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/at91-clock.txt
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm/boot/dts/ste-href-family-pinctrl.dtsi
+ create mode 100644 arch/arm/configs/genmai_defconfig
+ delete mode 100644 arch/arm/mach-s3c64xx/dma.c
+ create mode 100644 arch/arm/mach-s3c64xx/pl080.c
+ delete mode 100644 arch/arm/mach-ux500/board-mop500.c
+ delete mode 100644 arch/arm/mach-ux500/devices-db8500.c
+ delete mode 100644 arch/arm/mach-ux500/devices-db8500.h
+ delete mode 100644 arch/arm/mach-ux500/devices.c
+ delete mode 100644 arch/arm/mach-ux500/devices.h
+ create mode 100644 drivers/clk/at91/Makefile
+ create mode 100644 drivers/clk/at91/clk-main.c
+ create mode 100644 drivers/clk/at91/clk-master.c
+ create mode 100644 drivers/clk/at91/clk-peripheral.c
+ create mode 100644 drivers/clk/at91/clk-pll.c
+ create mode 100644 drivers/clk/at91/clk-plldiv.c
+ create mode 100644 drivers/clk/at91/clk-programmable.c
+ create mode 100644 drivers/clk/at91/clk-smd.c
+ create mode 100644 drivers/clk/at91/clk-system.c
+ create mode 100644 drivers/clk/at91/clk-usb.c
+ create mode 100644 drivers/clk/at91/clk-utmi.c
+ create mode 100644 drivers/clk/at91/pmc.c
+ create mode 100644 drivers/clk/at91/pmc.h
+ create mode 100644 include/dt-bindings/clk/at91.h
+ rename {arch/arm/mach-at91/include/mach => include/linux/clk}/at91_pmc.h (98%)
+ delete mode 100644 include/linux/platform_data/clocksource-nomadik-mtu.h
+ delete mode 100644 include/linux/platform_data/pinctrl-nomadik.h
+Merging arm-v7-cache-opt/v7-cache-opt (e11d68fee368 arm: mm: refactor v7 cache cleaning ops to use way/index sequence)
+$ git merge arm-v7-cache-opt/v7-cache-opt
+Merge made by the 'recursive' strategy.
+ arch/arm/mm/cache-v7.S | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+Merging bcm2835/for-next (5cc686267845 Merge branch 'for-3.14/defconfig' into for-next)
+$ git merge bcm2835/for-next
+Auto-merging arch/arm/boot/dts/bcm2835.dtsi
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/bcm2835-rpi-b.dts | 9 +++++++--
+ arch/arm/boot/dts/bcm2835.dtsi | 6 ++++++
+ arch/arm/configs/bcm2835_defconfig | 37 +++++++++++++++++++++++--------------
+ arch/arm/mach-bcm2835/Kconfig | 2 +-
+ 4 files changed, 37 insertions(+), 17 deletions(-)
+Merging cortex-m/for-next (9c031a483646 ARM: v7-M: drop using mach/entry-macro.S)
+$ git merge cortex-m/for-next
+Merge made by the 'recursive' strategy.
+Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
+$ git merge ep93xx/ep93xx-for-next
+Merge made by the 'recursive' strategy.
+Merging imx-mxs/for-next (683b9655e939 Merge branches 'imx/soc' and 'imx/dt' into for-next)
+$ git merge imx-mxs/for-next
+Auto-merging drivers/pinctrl/pinctrl-nomadik.c
+Auto-merging arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
+Auto-merging arch/arm/Kconfig.debug
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/imx5-clock.txt | 195 +----
+ .../bindings/pinctrl/fsl,imx27-pinctrl.txt | 22 +
+ .../devicetree/bindings/vendor-prefixes.txt | 3 +
+ arch/arm/Kconfig.debug | 9 +
+ arch/arm/boot/dts/Makefile | 19 +-
+ arch/arm/boot/dts/imx23-evk.dts | 8 +-
+ arch/arm/boot/dts/imx23-olinuxino.dts | 5 +-
+ arch/arm/boot/dts/imx23-stmp378x_devb.dts | 5 +-
+ arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi | 60 ++
+ .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 119 +++
+ arch/arm/boot/dts/imx25-pinfunc.h | 494 +++++++++++
+ arch/arm/boot/dts/imx25-pingrp.h | 81 ++
+ arch/arm/boot/dts/imx25.dtsi | 18 +-
+ arch/arm/boot/dts/imx27-apf27.dts | 16 +
+ arch/arm/boot/dts/imx27-apf27dev.dts | 98 ++-
+ arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 50 +-
+ arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts | 20 +-
+ arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 56 +-
+ ...ycore-som.dts => imx27-phytec-phycore-som.dtsi} | 56 +-
+ arch/arm/boot/dts/imx27-pinfunc.h | 526 ++++++++++++
+ arch/arm/boot/dts/imx27-pingrp.h | 142 ++++
+ arch/arm/boot/dts/imx27.dtsi | 127 +--
+ arch/arm/boot/dts/imx28-apf28dev.dts | 18 +-
+ arch/arm/boot/dts/imx28-apx4devkit.dts | 5 +-
+ arch/arm/boot/dts/imx28-cfa10036.dts | 2 +
+ arch/arm/boot/dts/imx28-cfa10037.dts | 7 +-
+ arch/arm/boot/dts/imx28-cfa10049.dts | 31 +-
+ arch/arm/boot/dts/imx28-cfa10057.dts | 7 +-
+ arch/arm/boot/dts/imx28-cfa10058.dts | 7 +-
+ arch/arm/boot/dts/imx28-duckbill.dts | 121 +++
+ arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts | 71 ++
+ arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts | 50 ++
+ arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi | 326 ++++++++
+ arch/arm/boot/dts/imx28-evk.dts | 24 +-
+ arch/arm/boot/dts/imx28-m28cu3.dts | 16 +-
+ arch/arm/boot/dts/imx28-m28evk.dts | 18 +-
+ arch/arm/boot/dts/imx28-sps1.dts | 7 +-
+ arch/arm/boot/dts/imx28-tx28.dts | 23 +-
+ arch/arm/boot/dts/imx28.dtsi | 58 +-
+ arch/arm/boot/dts/imx50-evk.dts | 97 +++
+ arch/arm/boot/dts/imx50-pinfunc.h | 923 +++++++++++++++++++++
+ arch/arm/boot/dts/imx50-pingrp.h | 146 ++++
+ arch/arm/boot/dts/imx50.dtsi | 475 +++++++++++
+ arch/arm/boot/dts/imx51-apf51.dts | 18 +-
+ arch/arm/boot/dts/imx51-apf51dev.dts | 50 +-
+ arch/arm/boot/dts/imx51-babbage.dts | 100 ++-
+ arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi | 71 ++
+ .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 144 ++++
+ arch/arm/boot/dts/imx51-pingrp.h | 249 ++++++
+ arch/arm/boot/dts/imx51.dtsi | 456 ++--------
+ arch/arm/boot/dts/imx53-ard.dts | 19 +-
+ arch/arm/boot/dts/imx53-evk.dts | 38 +-
+ arch/arm/boot/dts/imx53-m53evk.dts | 133 ++-
+ arch/arm/boot/dts/imx53-mba53.dts | 40 +-
+ arch/arm/boot/dts/imx53-pingrp.h | 352 ++++++++
+ arch/arm/boot/dts/imx53-qsb.dts | 65 +-
+ arch/arm/boot/dts/imx53-smd.dts | 62 +-
+ arch/arm/boot/dts/imx53-tqma53.dtsi | 112 ++-
+ arch/arm/boot/dts/imx53-tx53.dtsi | 5 +-
+ arch/arm/boot/dts/imx53-voipac-bsb.dts | 144 ++++
+ arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 240 ++++++
+ arch/arm/boot/dts/imx53.dtsi | 649 +++------------
+ arch/arm/boot/dts/imx6dl-gw51xx.dts | 19 +
+ arch/arm/boot/dts/imx6dl-gw52xx.dts | 19 +
+ arch/arm/boot/dts/imx6dl-gw53xx.dts | 19 +
+ arch/arm/boot/dts/imx6dl-gw54xx.dts | 19 +
+ arch/arm/boot/dts/imx6dl-pinfunc.h | 1 +
+ arch/arm/boot/dts/imx6dl.dtsi | 10 +-
+ arch/arm/boot/dts/imx6q-arm2.dts | 71 +-
+ arch/arm/boot/dts/imx6q-cm-fx6.dts | 69 ++
+ arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 178 ++++
+ arch/arm/boot/dts/imx6q-gw51xx.dts | 19 +
+ arch/arm/boot/dts/imx6q-gw52xx.dts | 23 +
+ arch/arm/boot/dts/imx6q-gw53xx.dts | 23 +
+ arch/arm/boot/dts/imx6q-gw5400-a.dts | 493 +++++++++++
+ arch/arm/boot/dts/imx6q-gw54xx.dts | 23 +
+ arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi | 44 +-
+ arch/arm/boot/dts/imx6q-pinfunc.h | 1 +
+ arch/arm/boot/dts/imx6q-sabrelite.dts | 68 +-
+ arch/arm/boot/dts/imx6q-sbc6x.dts | 29 +-
+ arch/arm/boot/dts/imx6q-udoo.dts | 27 +-
+ arch/arm/boot/dts/imx6q.dtsi | 9 +-
+ arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 317 +++++++
+ arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 424 ++++++++++
+ arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 484 +++++++++++
+ arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 511 ++++++++++++
+ arch/arm/boot/dts/imx6qdl-pingrp.h | 526 ++++++++++++
+ arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 58 +-
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 73 +-
+ arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 70 +-
+ arch/arm/boot/dts/imx6qdl.dtsi | 904 +++-----------------
+ arch/arm/boot/dts/imx6sl-evk.dts | 88 +-
+ arch/arm/boot/dts/imx6sl-pingrp.h | 148 ++++
+ arch/arm/boot/dts/imx6sl.dtsi | 339 ++------
+ arch/arm/configs/imx_v4_v5_defconfig | 2 +
+ arch/arm/configs/imx_v6_v7_defconfig | 4 +
+ arch/arm/include/debug/imx-uart.h | 10 +
+ arch/arm/mach-imx/Kconfig | 27 +-
+ arch/arm/mach-imx/Makefile | 1 +
+ arch/arm/mach-imx/avic.c | 25 -
+ arch/arm/mach-imx/clk-imx51-imx53.c | 804 +++++++++---------
+ arch/arm/mach-imx/clk-imx6q.c | 2 +-
+ arch/arm/mach-imx/clk-imx6sl.c | 2 +-
+ arch/arm/mach-imx/clk-pllv1.c | 23 +-
+ arch/arm/mach-imx/clk-vf610.c | 5 +
+ arch/arm/mach-imx/common.h | 1 +
+ arch/arm/mach-imx/irq-common.h | 1 -
+ arch/arm/mach-imx/mach-imx50.c | 38 +
+ arch/arm/mach-imx/mach-imx6q.c | 30 +
+ arch/arm/mach-imx/mm-imx5.c | 8 -
+ arch/arm/mach-mxs/mach-mxs.c | 33 +
+ drivers/pinctrl/Kconfig | 8 -
+ drivers/pinctrl/pinctrl-imx1-core.c | 7 +
+ drivers/pinctrl/pinctrl-nomadik.c | 6 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 36 +-
+ include/dt-bindings/clock/imx5-clock.h | 203 +++++
+ include/dt-bindings/clock/imx6sl-clock.h | 2 +-
+ include/dt-bindings/clock/vf610-clock.h | 6 +-
+ 118 files changed, 10857 insertions(+), 3041 deletions(-)
+ create mode 100644 arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi
+ create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
+ create mode 100644 arch/arm/boot/dts/imx25-pinfunc.h
+ create mode 100644 arch/arm/boot/dts/imx25-pingrp.h
+ rename arch/arm/boot/dts/{imx27-phytec-phycore-som.dts => imx27-phytec-phycore-som.dtsi} (77%)
+ create mode 100644 arch/arm/boot/dts/imx27-pinfunc.h
+ create mode 100644 arch/arm/boot/dts/imx27-pingrp.h
+ create mode 100644 arch/arm/boot/dts/imx28-duckbill.dts
+ create mode 100644 arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts
+ create mode 100644 arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts
+ create mode 100644 arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi
+ create mode 100644 arch/arm/boot/dts/imx50-evk.dts
+ create mode 100644 arch/arm/boot/dts/imx50-pinfunc.h
+ create mode 100644 arch/arm/boot/dts/imx50-pingrp.h
+ create mode 100644 arch/arm/boot/dts/imx50.dtsi
+ create mode 100644 arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi
+ create mode 100644 arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
+ create mode 100644 arch/arm/boot/dts/imx51-pingrp.h
+ create mode 100644 arch/arm/boot/dts/imx53-pingrp.h
+ create mode 100644 arch/arm/boot/dts/imx53-voipac-bsb.dts
+ create mode 100644 arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6dl-gw51xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-gw52xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-gw53xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-gw54xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-cm-fx6.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-gw51xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-gw52xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-gw53xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-gw5400-a.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-gw54xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-pingrp.h
+ create mode 100644 arch/arm/boot/dts/imx6sl-pingrp.h
+ create mode 100644 arch/arm/mach-imx/mach-imx50.c
+ create mode 100644 include/dt-bindings/clock/imx5-clock.h
+Merging ixp4xx/next (19f949f52599 Linux 3.8)
+$ git merge ixp4xx/next
+Already up-to-date.
+Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
+$ git merge msm/for-next
+Already up-to-date.
+Merging mvebu/for-next (3054cde59b01 Merge branch 'mvebu/dt' into for-next)
+$ git merge mvebu/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ .../interrupt-controller/marvell,dove-pmu-intc.txt | 17 ++
+ arch/arm/boot/dts/Makefile | 2 +
+ arch/arm/boot/dts/armada-370-netgear-rn102.dts | 118 +++++---
+ arch/arm/boot/dts/armada-370-netgear-rn104.dts | 104 ++++---
+ arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 322 +++++++++++++++++++++
+ arch/arm/boot/dts/kirkwood-cloudbox.dts | 10 +-
+ arch/arm/boot/dts/kirkwood-db.dtsi | 4 +-
+ arch/arm/boot/dts/kirkwood-dns320.dts | 10 +-
+ arch/arm/boot/dts/kirkwood-dns325.dts | 10 +-
+ arch/arm/boot/dts/kirkwood-dnskw.dtsi | 18 +-
+ arch/arm/boot/dts/kirkwood-dockstar.dts | 4 +-
+ arch/arm/boot/dts/kirkwood-dreamplug.dts | 6 +-
+ arch/arm/boot/dts/kirkwood-goflexnet.dts | 22 +-
+ .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 8 +-
+ arch/arm/boot/dts/kirkwood-ib62x0.dts | 16 +-
+ arch/arm/boot/dts/kirkwood-iconnect.dts | 24 +-
+ arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 20 +-
+ arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 4 +-
+ arch/arm/boot/dts/kirkwood-lsxl.dtsi | 28 +-
+ arch/arm/boot/dts/kirkwood-mplcec4.dts | 14 +-
+ arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 14 +-
+ .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 99 ++++---
+ .../boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | 268 +++++++++++++++++
+ arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 8 +-
+ arch/arm/boot/dts/kirkwood-ns2lite.dts | 2 +-
+ arch/arm/boot/dts/kirkwood-ns2max.dts | 10 +-
+ arch/arm/boot/dts/kirkwood-ns2mini.dts | 10 +-
+ arch/arm/boot/dts/kirkwood-nsa310-common.dtsi | 4 +-
+ arch/arm/boot/dts/kirkwood-nsa310.dts | 32 +-
+ arch/arm/boot/dts/kirkwood-nsa310a.dts | 30 +-
+ arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 10 +-
+ arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 10 +-
+ arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts | 6 +-
+ arch/arm/boot/dts/kirkwood-sheevaplug.dts | 4 +-
+ arch/arm/boot/dts/kirkwood-topkick.dts | 10 +-
+ arch/arm/boot/dts/kirkwood-ts219-6281.dts | 8 +-
+ arch/arm/boot/dts/kirkwood-ts219-6282.dts | 8 +-
+ arch/arm/boot/dts/kirkwood.dtsi | 2 +
+ drivers/clk/mvebu/Kconfig | 5 +
+ drivers/clk/mvebu/Makefile | 1 +
+ drivers/clk/mvebu/clk-corediv.c | 223 ++++++++++++++
+ drivers/clk/mvebu/clk-cpu.c | 2 +-
+ drivers/irqchip/Makefile | 1 +
+ drivers/irqchip/irq-dove.c | 126 ++++++++
+ 44 files changed, 1362 insertions(+), 292 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,dove-pmu-intc.txt
+ create mode 100644 arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
+ create mode 100644 drivers/clk/mvebu/clk-corediv.c
+ create mode 100644 drivers/irqchip/irq-dove.c
+Merging renesas/next (e715696ab1b7 Merge branch 'heads/usb-r8a66597-hcd' into next)
+$ git merge renesas/next
+Removing arch/arm/mach-shmobile/board-kzm9d.c
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig | 14 +-
+ arch/arm/Makefile | 1 -
+ arch/arm/boot/compressed/Makefile | 2 +-
+ arch/arm/boot/dts/Makefile | 8 +-
+ arch/arm/boot/dts/emev2-kzm9d.dts | 39 ++++-
+ arch/arm/boot/dts/emev2.dtsi | 86 ++++++++++-
+ arch/arm/boot/dts/r7s72100-genmai-reference.dts | 31 ++++
+ arch/arm/boot/dts/r7s72100-genmai.dts | 2 +-
+ arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 15 +-
+ arch/arm/boot/dts/r8a73a4-ape6evm.dts | 10 +-
+ arch/arm/boot/dts/r8a73a4.dtsi | 118 +++++++++-----
+ .../boot/dts/r8a7740-armadillo800eva-reference.dts | 13 +-
+ arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +-
+ arch/arm/boot/dts/r8a7740.dtsi | 118 +++++++-------
+ arch/arm/boot/dts/r8a7778-bockw-reference.dts | 57 ++++++-
+ arch/arm/boot/dts/r8a7778-bockw.dts | 2 +-
+ arch/arm/boot/dts/r8a7778.dtsi | 170 +++++++++++++++++++--
+ arch/arm/boot/dts/r8a7779-marzen-reference.dts | 25 ++-
+ arch/arm/boot/dts/r8a7779-marzen.dts | 2 +-
+ arch/arm/boot/dts/r8a7779.dtsi | 82 +++++++---
+ arch/arm/boot/dts/r8a7790-lager-reference.dts | 46 +++++-
+ arch/arm/boot/dts/r8a7790-lager.dts | 7 +-
+ arch/arm/boot/dts/r8a7790.dtsi | 97 +++++++-----
+ arch/arm/boot/dts/r8a7791-koelsch-reference.dts | 61 ++++++++
+ arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +-
+ arch/arm/boot/dts/r8a7791.dtsi | 144 +++++++++++++++--
+ arch/arm/boot/dts/sh7372-mackerel.dts | 2 +-
+ arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 70 ++++++++-
+ arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +-
+ arch/arm/boot/dts/sh73a0.dtsi | 142 ++++++++---------
+ arch/arm/configs/ape6evm_defconfig | 2 +-
+ arch/arm/configs/armadillo800eva_defconfig | 2 +-
+ arch/arm/configs/bockw_defconfig | 2 +-
+ arch/arm/configs/genmai_defconfig | 2 +-
+ arch/arm/configs/koelsch_defconfig | 2 +-
+ arch/arm/configs/kzm9d_defconfig | 2 +-
+ arch/arm/configs/kzm9g_defconfig | 2 +-
+ arch/arm/configs/lager_defconfig | 2 +-
+ arch/arm/configs/mackerel_defconfig | 2 +-
+ arch/arm/configs/marzen_defconfig | 2 +-
+ arch/arm/mach-shmobile/Kconfig | 51 ++++++-
+ arch/arm/mach-shmobile/Makefile | 5 +-
+ arch/arm/mach-shmobile/Makefile.boot | 5 +-
+ arch/arm/mach-shmobile/board-bockw-reference.c | 31 ++--
+ arch/arm/mach-shmobile/board-bockw.c | 13 +-
+ arch/arm/mach-shmobile/board-genmai-reference.c | 49 ++++++
+ arch/arm/mach-shmobile/board-koelsch-reference.c | 53 +++++++
+ arch/arm/mach-shmobile/board-koelsch.c | 73 ++++++++-
+ arch/arm/mach-shmobile/board-kzm9d.c | 92 -----------
+ arch/arm/mach-shmobile/board-lager-reference.c | 2 +
+ arch/arm/mach-shmobile/board-lager.c | 72 ++++++++-
+ arch/arm/mach-shmobile/board-mackerel.c | 4 +-
+ arch/arm/mach-shmobile/board-marzen.c | 2 -
+ arch/arm/mach-shmobile/clock-r7s72100.c | 1 +
+ arch/arm/mach-shmobile/clock-r8a73a4.c | 10 +-
+ arch/arm/mach-shmobile/clock-r8a7740.c | 8 +-
+ arch/arm/mach-shmobile/clock-r8a7778.c | 11 ++
+ arch/arm/mach-shmobile/clock-r8a7779.c | 8 +
+ arch/arm/mach-shmobile/clock-r8a7790.c | 45 +++---
+ arch/arm/mach-shmobile/clock-r8a7791.c | 14 +-
+ arch/arm/mach-shmobile/clock-sh73a0.c | 8 +-
+ arch/arm/mach-shmobile/include/mach/emev2.h | 5 -
+ arch/arm/mach-shmobile/include/mach/r8a7791.h | 1 +
+ arch/arm/mach-shmobile/setup-emev2.c | 163 ++------------------
+ arch/arm/mach-shmobile/setup-r7s72100.c | 22 +++
+ arch/arm/mach-shmobile/setup-r8a73a4.c | 2 +-
+ arch/arm/mach-shmobile/setup-r8a7791.c | 65 ++++++++
+ drivers/Makefile | 2 +-
+ drivers/irqchip/irq-renesas-intc-irqpin.c | 8 +-
+ drivers/usb/host/r8a66597-hcd.c | 4 +-
+ 70 files changed, 1594 insertions(+), 625 deletions(-)
+ create mode 100644 arch/arm/boot/dts/r7s72100-genmai-reference.dts
+ create mode 100644 arch/arm/boot/dts/r8a7791-koelsch-reference.dts
+ create mode 100644 arch/arm/mach-shmobile/board-genmai-reference.c
+ create mode 100644 arch/arm/mach-shmobile/board-koelsch-reference.c
+ delete mode 100644 arch/arm/mach-shmobile/board-kzm9d.c
+Merging samsung/for-next (8465d57097ce Merge branch 'v3.14-next/samsung-defconfig' into for-next)
+$ git merge samsung/for-next
+Auto-merging arch/arm/boot/dts/cros5250-common.dtsi
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mmc/exynos-dw-mshc.txt | 2 +
+ arch/arm/Kconfig | 1 +
+ arch/arm/boot/dts/cros5250-common.dtsi | 8 +-
+ arch/arm/boot/dts/exynos5.dtsi | 21 -----
+ arch/arm/boot/dts/exynos5250-arndale.dts | 16 +---
+ arch/arm/boot/dts/exynos5250-smdk5250.dts | 16 +---
+ arch/arm/boot/dts/exynos5250-snow.dts | 2 +-
+ arch/arm/boot/dts/exynos5250.dtsi | 36 ++++++--
+ arch/arm/boot/dts/exynos5420-smdk5420.dts | 33 ++++++++
+ arch/arm/boot/dts/exynos5420.dtsi | 96 +++++++++++++++++++++-
+ arch/arm/configs/exynos_defconfig | 2 +-
+ arch/arm/plat-samsung/include/plat/uncompress.h | 2 +
+ arch/arm/plat-samsung/s5p-irq-eint.c | 4 +
+ drivers/clocksource/exynos_mct.c | 4 +
+ drivers/irqchip/exynos-combiner.c | 15 +---
+ 15 files changed, 185 insertions(+), 73 deletions(-)
+Merging tegra/for-next (850500ad1edd Merge branch for-3.14/dt into for-next)
+$ git merge tegra/for-next
+Auto-merging arch/arm/mach-tegra/fuse.c
+Merge made by the 'recursive' strategy.
+ arch/arm/include/debug/tegra.S | 34 +++++------------------------
+ arch/arm/mach-tegra/fuse.c | 41 ++++++++++++++++++++++++++++++++++-
+ arch/arm/mach-tegra/iomap.h | 14 ++++++------
+ arch/arm/mach-tegra/tegra.c | 4 +---
+ include/dt-bindings/gpio/tegra-gpio.h | 1 +
+ 5 files changed, 54 insertions(+), 40 deletions(-)
+Merging arm64/upstream (db4ed53cfe9f arm64: mm: Fix PMD_SECT_PROT_NONE definition)
+$ git merge arm64/upstream
+Already up-to-date.
+Merging blackfin/for-linus (36855dcfc980 blackfin: fix build warning for unused variable)
+$ git merge blackfin/for-linus
+Already up-to-date.
+Merging c6x/for-linux-next (546153d75a48 c6x: fix build failure caused by cache.h)
+$ git merge c6x/for-linux-next
+Merge made by the 'recursive' strategy.
+ arch/c6x/include/asm/cache.h | 1 +
+ 1 file changed, 1 insertion(+)
+Merging cris/for-next (be8cb7f42ab9 CRIS: drop unused Kconfig symbols)
+$ git merge cris/for-next
+Already up-to-date.
+Merging hexagon/linux-next (de44443a45e3 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD)
+$ git merge hexagon/linux-next
+Already up-to-date.
+Merging ia64/next (959f58544b7f Linux 3.12-rc7)
+$ git merge ia64/next
+Already up-to-date.
+Merging m68k/for-next (27d632d27c4f m68k/atari: Hide RTC_PORT() macro from rtc-cmos)
+$ git merge m68k/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/zorro.txt | 5 +-
+ arch/m68k/Kconfig | 24 ++
+ arch/m68k/amiga/chipram.c | 2 +-
+ arch/m68k/amiga/config.c | 63 +++--
+ arch/m68k/amiga/platform.c | 9 +-
+ arch/m68k/apollo/config.c | 26 +-
+ arch/m68k/atari/config.c | 10 +-
+ arch/m68k/atari/debug.c | 5 +-
+ arch/m68k/bvme6000/config.c | 6 +-
+ arch/m68k/configs/amiga_defconfig | 6 +-
+ arch/m68k/configs/apollo_defconfig | 6 +-
+ arch/m68k/configs/atari_defconfig | 6 +-
+ arch/m68k/configs/bvme6000_defconfig | 6 +-
+ arch/m68k/configs/hp300_defconfig | 6 +-
+ arch/m68k/configs/mac_defconfig | 6 +-
+ arch/m68k/configs/multi_defconfig | 6 +-
+ arch/m68k/configs/mvme147_defconfig | 6 +-
+ arch/m68k/configs/mvme16x_defconfig | 6 +-
+ arch/m68k/configs/q40_defconfig | 6 +-
+ arch/m68k/configs/sun3_defconfig | 6 +-
+ arch/m68k/configs/sun3x_defconfig | 6 +-
+ arch/m68k/emu/natfeat.c | 3 +-
+ arch/m68k/hp300/config.c | 10 +-
+ arch/m68k/include/asm/amigahw.h | 28 +--
+ arch/m68k/include/asm/apollohw.h | 11 +-
+ arch/m68k/include/asm/atarihw.h | 2 +-
+ arch/m68k/include/asm/bootinfo.h | 360 +--------------------------
+ arch/m68k/include/asm/hp300hw.h | 20 +-
+ arch/m68k/include/asm/kexec.h | 29 +++
+ arch/m68k/include/asm/macintosh.h | 83 ++----
+ arch/m68k/include/asm/mc146818rtc.h | 10 +-
+ arch/m68k/include/asm/mvme16xhw.h | 17 --
+ arch/m68k/include/asm/setup.h | 5 +-
+ arch/m68k/include/asm/timex.h | 10 +
+ arch/m68k/include/uapi/asm/Kbuild | 8 +
+ arch/m68k/include/uapi/asm/bootinfo-amiga.h | 63 +++++
+ arch/m68k/include/uapi/asm/bootinfo-apollo.h | 28 +++
+ arch/m68k/include/uapi/asm/bootinfo-atari.h | 44 ++++
+ arch/m68k/include/uapi/asm/bootinfo-hp300.h | 50 ++++
+ arch/m68k/include/uapi/asm/bootinfo-mac.h | 119 +++++++++
+ arch/m68k/include/uapi/asm/bootinfo-q40.h | 16 ++
+ arch/m68k/include/uapi/asm/bootinfo-vme.h | 70 ++++++
+ arch/m68k/include/uapi/asm/bootinfo.h | 174 +++++++++++++
+ arch/m68k/include/uapi/asm/setup.h | 87 -------
+ arch/m68k/kernel/Makefile | 3 +
+ arch/m68k/kernel/asm-offsets.c | 3 +
+ arch/m68k/kernel/bootinfo_proc.c | 80 ++++++
+ arch/m68k/kernel/head.S | 12 +-
+ arch/m68k/kernel/machine_kexec.c | 58 +++++
+ arch/m68k/kernel/relocate_kernel.S | 159 ++++++++++++
+ arch/m68k/kernel/setup_mm.c | 62 +++--
+ arch/m68k/kernel/time.c | 4 +
+ arch/m68k/mac/config.c | 34 +--
+ arch/m68k/mac/iop.c | 5 +-
+ arch/m68k/mac/misc.c | 2 -
+ arch/m68k/mac/oss.c | 1 -
+ arch/m68k/mac/psc.c | 3 +-
+ arch/m68k/mac/via.c | 1 -
+ arch/m68k/mm/init.c | 2 +-
+ arch/m68k/mm/motorola.c | 2 +-
+ arch/m68k/mvme147/config.c | 7 +-
+ arch/m68k/mvme16x/config.c | 30 ++-
+ arch/m68k/q40/config.c | 4 +-
+ arch/m68k/sun3/dvma.c | 6 +-
+ arch/m68k/sun3/mmu_emu.c | 3 +-
+ arch/m68k/sun3/sun3dvma.c | 8 +-
+ arch/m68k/sun3x/prom.c | 1 -
+ drivers/block/z2ram.c | 7 +-
+ drivers/ide/buddha.c | 2 +-
+ drivers/macintosh/Kconfig | 2 +-
+ drivers/net/ethernet/8390/hydra.c | 2 +-
+ drivers/net/ethernet/8390/zorro8390.c | 4 +-
+ drivers/net/ethernet/amd/a2065.c | 13 +-
+ drivers/net/ethernet/amd/ariadne.c | 13 +-
+ drivers/net/ethernet/natsemi/macsonic.c | 1 -
+ drivers/parport/parport_mfc3.c | 2 +-
+ drivers/scsi/a2091.c | 2 +-
+ drivers/scsi/a3000.c | 2 +-
+ drivers/scsi/a4000t.c | 2 +-
+ drivers/scsi/gvp11.c | 2 +-
+ drivers/scsi/zorro7xx.c | 2 +-
+ drivers/video/amifb.c | 2 +-
+ drivers/video/cirrusfb.c | 4 +-
+ drivers/video/macfb.c | 1 -
+ drivers/video/valkyriefb.c | 1 -
+ drivers/zorro/Makefile | 3 +-
+ drivers/zorro/names.c | 11 -
+ drivers/zorro/proc.c | 10 +-
+ drivers/zorro/zorro-driver.c | 11 +-
+ drivers/zorro/zorro-sysfs.c | 22 +-
+ drivers/zorro/zorro.c | 27 +-
+ drivers/zorro/zorro.h | 5 +
+ include/linux/zorro.h | 121 ++-------
+ include/uapi/linux/Kbuild | 2 +
+ include/uapi/linux/kexec.h | 1 +
+ include/uapi/linux/zorro.h | 113 +++++++++
+ include/{ => uapi}/linux/zorro_ids.h | 0
+ 97 files changed, 1412 insertions(+), 937 deletions(-)
+ create mode 100644 arch/m68k/include/asm/kexec.h
+ create mode 100644 arch/m68k/include/uapi/asm/bootinfo-amiga.h
+ create mode 100644 arch/m68k/include/uapi/asm/bootinfo-apollo.h
+ create mode 100644 arch/m68k/include/uapi/asm/bootinfo-atari.h
+ create mode 100644 arch/m68k/include/uapi/asm/bootinfo-hp300.h
+ create mode 100644 arch/m68k/include/uapi/asm/bootinfo-mac.h
+ create mode 100644 arch/m68k/include/uapi/asm/bootinfo-q40.h
+ create mode 100644 arch/m68k/include/uapi/asm/bootinfo-vme.h
+ create mode 100644 arch/m68k/include/uapi/asm/bootinfo.h
+ create mode 100644 arch/m68k/kernel/bootinfo_proc.c
+ create mode 100644 arch/m68k/kernel/machine_kexec.c
+ create mode 100644 arch/m68k/kernel/relocate_kernel.S
+ create mode 100644 include/uapi/linux/zorro.h
+ rename include/{ => uapi}/linux/zorro_ids.h (100%)
+Merging m68knommu/for-next (d4d80b54a862 m68k : Kill CONFIG_MTD_PARTITIONS)
+$ git merge m68knommu/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/configs/m5208evb_defconfig | 1 -
+ arch/m68k/configs/m5249evb_defconfig | 1 -
+ arch/m68k/configs/m5272c3_defconfig | 1 -
+ arch/m68k/configs/m5275evb_defconfig | 1 -
+ arch/m68k/configs/m5307c3_defconfig | 1 -
+ arch/m68k/configs/m5407c3_defconfig | 1 -
+ 6 files changed, 6 deletions(-)
+Merging metag/for-next (1d61cf121d7d smp, metag: kill SMP single function call interrupt)
+$ git merge metag/for-next
+Merge made by the 'recursive' strategy.
+ arch/metag/include/asm/smp.h | 2 --
+ arch/metag/kernel/dma.c | 5 -----
+ arch/metag/kernel/smp.c | 13 +++----------
+ 3 files changed, 3 insertions(+), 17 deletions(-)
+Merging microblaze/next (a1dd107fcafa microblaze: Remove duplicate declarations of _stext[] and _etext[])
+$ git merge microblaze/next
+Merge made by the 'recursive' strategy.
+ arch/microblaze/Makefile | 2 ++
+ arch/microblaze/include/asm/sections.h | 1 -
+ arch/microblaze/kernel/setup.c | 5 ++---
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+Merging mips/mips-for-linux-next (6ca0bf323c14 Merge branch '3.13-fixes' into mips-for-linux-next)
+$ git merge mips/mips-for-linux-next
+Merge made by the 'recursive' strategy.
+ arch/mips/lasat/picvue_proc.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging openrisc/for-upstream (60a9dd5a10a1 openrisc: Use get_signal() signal_setup_done())
+$ git merge openrisc/for-upstream
+Merge made by the 'recursive' strategy.
+ arch/openrisc/kernel/entry.S | 59 ++++++-----
+ arch/openrisc/kernel/signal.c | 233 +++++++++++++++++++++---------------------
+ 2 files changed, 149 insertions(+), 143 deletions(-)
+Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
+$ git merge parisc/for-next
+Already up-to-date.
+Merging parisc-hd/for-next (dc1ccc48159d Linux 3.13-rc2)
+$ git merge parisc-hd/for-next
+Already up-to-date.
+Merging powerpc/next (75eb3d9b60c2 powerpc/powernv: Get FSP memory errors and plumb into memory poison infrastructure.)
+$ git merge powerpc/next
+Merge made by the 'recursive' strategy.
+ arch/powerpc/Kconfig | 6 +
+ arch/powerpc/boot/.gitignore | 1 +
+ arch/powerpc/boot/dts/kilauea.dts | 2 +-
+ arch/powerpc/boot/dts/virtex440-ml507.dts | 2 +
+ arch/powerpc/include/asm/bitops.h | 5 +
+ arch/powerpc/include/asm/cache.h | 14 +-
+ arch/powerpc/include/asm/code-patching.h | 7 +
+ arch/powerpc/include/asm/cputable.h | 12 +
+ arch/powerpc/include/asm/exception-64s.h | 21 +-
+ arch/powerpc/include/asm/hardirq.h | 3 +-
+ arch/powerpc/include/asm/io.h | 16 +
+ arch/powerpc/include/asm/iommu.h | 26 ++
+ arch/powerpc/include/asm/lppaca.h | 2 -
+ arch/powerpc/include/asm/mce.h | 198 ++++++++++++
+ arch/powerpc/include/asm/opal.h | 98 +++++-
+ arch/powerpc/include/asm/paca.h | 9 +
+ arch/powerpc/include/asm/pgtable.h | 66 +++-
+ arch/powerpc/include/asm/pte-hash64.h | 8 +-
+ arch/powerpc/kernel/Makefile | 1 +
+ arch/powerpc/kernel/asm-offsets.c | 4 +
+ arch/powerpc/kernel/cpu_setup_power.S | 38 ++-
+ arch/powerpc/kernel/cputable.c | 16 +
+ arch/powerpc/kernel/eeh.c | 2 +-
+ arch/powerpc/kernel/eeh_driver.c | 2 +-
+ arch/powerpc/kernel/entry_64.S | 5 +
+ arch/powerpc/kernel/exceptions-64s.S | 196 ++++++++++++
+ arch/powerpc/kernel/idle_power7.S | 1 +
+ arch/powerpc/kernel/iommu.c | 48 +--
+ arch/powerpc/kernel/irq.c | 12 +-
+ arch/powerpc/kernel/mce.c | 345 +++++++++++++++++++++
+ arch/powerpc/kernel/mce_power.c | 284 +++++++++++++++++
+ arch/powerpc/kernel/misc_32.S | 4 +-
+ arch/powerpc/kernel/misc_64.S | 6 +
+ arch/powerpc/kernel/paca.c | 32 +-
+ arch/powerpc/kernel/setup_64.c | 16 +-
+ arch/powerpc/kernel/smp.c | 9 +-
+ arch/powerpc/kernel/sysfs.c | 72 +++--
+ arch/powerpc/kernel/time.c | 3 +-
+ arch/powerpc/kernel/traps.c | 15 +
+ arch/powerpc/kvm/book3s_hv_ras.c | 50 ++-
+ arch/powerpc/lib/code-patching.c | 15 +
+ arch/powerpc/mm/hash_low_64.S | 15 +-
+ arch/powerpc/mm/hash_utils_64.c | 7 +-
+ arch/powerpc/mm/hugepage-hash64.c | 6 +-
+ arch/powerpc/mm/hugetlbpage-hash64.c | 4 +
+ arch/powerpc/mm/pgtable.c | 2 +-
+ arch/powerpc/mm/pgtable_64.c | 2 +-
+ arch/powerpc/mm/tlb_nohash.c | 19 --
+ arch/powerpc/platforms/Kconfig.cputype | 1 +
+ arch/powerpc/platforms/cell/beat_htab.c | 4 +-
+ arch/powerpc/platforms/powernv/Kconfig | 5 -
+ arch/powerpc/platforms/powernv/Makefile | 1 +
+ arch/powerpc/platforms/powernv/eeh-ioda.c | 157 +---------
+ arch/powerpc/platforms/powernv/opal-flash.c | 31 +-
+ .../powerpc/platforms/powernv/opal-memory-errors.c | 146 +++++++++
+ arch/powerpc/platforms/powernv/opal-rtc.c | 6 +-
+ arch/powerpc/platforms/powernv/opal-wrappers.S | 2 +
+ arch/powerpc/platforms/powernv/opal.c | 251 ++++++++-------
+ arch/powerpc/platforms/powernv/pci-ioda.c | 8 +-
+ arch/powerpc/platforms/powernv/pci-p5ioc2.c | 2 +-
+ arch/powerpc/platforms/powernv/pci.c | 229 ++++++++++----
+ arch/powerpc/platforms/powernv/pci.h | 3 +
+ arch/powerpc/platforms/ps3/spu.c | 2 +-
+ arch/powerpc/platforms/pseries/Kconfig | 2 +-
+ arch/powerpc/platforms/pseries/iommu.c | 8 +-
+ arch/powerpc/platforms/pseries/lpar.c | 5 +-
+ arch/powerpc/sysdev/Kconfig | 2 +-
+ arch/powerpc/sysdev/fsl_pci.c | 2 +-
+ arch/powerpc/xmon/xmon.c | 4 +
+ drivers/macintosh/windfarm_lm75_sensor.c | 2 +-
+ drivers/macintosh/windfarm_max6690_sensor.c | 2 +-
+ include/linux/mm.h | 2 +-
+ mm/mempolicy.c | 5 +-
+ 73 files changed, 2050 insertions(+), 559 deletions(-)
+ create mode 100644 arch/powerpc/include/asm/mce.h
+ create mode 100644 arch/powerpc/kernel/mce.c
+ create mode 100644 arch/powerpc/kernel/mce_power.c
+ create mode 100644 arch/powerpc/platforms/powernv/opal-memory-errors.c
+$ git am -3 ../patches/powerpc__Fix__attempt_to_move_.org_backwards__error.patch
+Applying: powerpc: Fix "attempt to move .org backwards" error
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/powerpc/kernel/exceptions-64s.S
+$ git add -A .
+$ git commit -v -a --amend
+[master 428bb48d748d] Merge remote-tracking branch 'powerpc/next'
+Merging mpc5xxx/next (17a76e3ca7c9 clk: mpc512x: remove migration support workarounds)
+$ git merge mpc5xxx/next
+Auto-merging drivers/spi/spi-mpc512x-psc.c
+Removing arch/powerpc/platforms/512x/clock.c
+Removing arch/powerpc/kernel/clock.c
+Removing arch/powerpc/include/asm/clk_interface.h
+Auto-merging arch/powerpc/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/powerpc/Kconfig | 5 -
+ arch/powerpc/boot/dts/ac14xx.dts | 7 +
+ arch/powerpc/boot/dts/mpc5121.dtsi | 114 +++-
+ arch/powerpc/include/asm/clk_interface.h | 20 -
+ arch/powerpc/kernel/Makefile | 1 -
+ arch/powerpc/kernel/clock.c | 82 ---
+ arch/powerpc/platforms/512x/Kconfig | 2 +-
+ arch/powerpc/platforms/512x/Makefile | 3 +-
+ arch/powerpc/platforms/512x/clock-commonclk.c | 950 ++++++++++++++++++++++++++
+ arch/powerpc/platforms/512x/clock.c | 754 --------------------
+ arch/powerpc/platforms/512x/mpc512x_shared.c | 169 ++---
+ arch/powerpc/platforms/52xx/Kconfig | 2 +-
+ drivers/media/platform/fsl-viu.c | 2 +-
+ drivers/mtd/nand/mpc5121_nfc.c | 2 +-
+ drivers/net/can/mscan/mpc5xxx_can.c | 270 ++++----
+ drivers/spi/spi-mpc512x-psc.c | 26 +-
+ drivers/tty/serial/mpc52xx_uart.c | 90 ++-
+ drivers/usb/host/fsl-mph-dr-of.c | 13 +-
+ include/dt-bindings/clock/mpc512x-clock.h | 69 ++
+ include/linux/clk-provider.h | 16 +
+ 20 files changed, 1504 insertions(+), 1093 deletions(-)
+ delete mode 100644 arch/powerpc/include/asm/clk_interface.h
+ delete mode 100644 arch/powerpc/kernel/clock.c
+ create mode 100644 arch/powerpc/platforms/512x/clock-commonclk.c
+ delete mode 100644 arch/powerpc/platforms/512x/clock.c
+ create mode 100644 include/dt-bindings/clock/mpc512x-clock.h
+Merging galak/next (9e2ecdbba3b0 powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
+$ git merge galak/next
+Already up-to-date.
+Merging s390/features (c9b851905dba s390/blacklist: Perform subchannel scan only when needed)
+$ git merge s390/features
+Merge made by the 'recursive' strategy.
+ Documentation/kmsg/s390/zcrypt | 20 +++
+ arch/s390/Kconfig | 6 +-
+ arch/s390/include/asm/sclp.h | 3 +-
+ arch/s390/include/uapi/asm/zcrypt.h | 44 ++++++
+ arch/s390/kernel/asm-offsets.c | 1 +
+ arch/s390/kernel/vdso.c | 2 +-
+ arch/s390/kernel/vdso32/clock_gettime.S | 9 +-
+ arch/s390/kernel/vdso64/clock_getres.S | 4 +-
+ arch/s390/kernel/vdso64/clock_gettime.S | 10 +-
+ drivers/s390/block/dasd_genhd.c | 1 -
+ drivers/s390/char/sclp_early.c | 5 +-
+ drivers/s390/cio/blacklist.c | 6 +-
+ drivers/s390/cio/chsc.c | 40 +----
+ drivers/s390/cio/css.c | 26 +++-
+ drivers/s390/cio/css.h | 1 +
+ drivers/s390/crypto/ap_bus.c | 31 +++-
+ drivers/s390/crypto/ap_bus.h | 4 +-
+ drivers/s390/crypto/zcrypt_api.c | 101 ++++++++++++-
+ drivers/s390/crypto/zcrypt_api.h | 2 +
+ drivers/s390/crypto/zcrypt_cex4.c | 20 ++-
+ drivers/s390/crypto/zcrypt_error.h | 18 ++-
+ drivers/s390/crypto/zcrypt_msgtype50.c | 12 ++
+ drivers/s390/crypto/zcrypt_msgtype6.c | 256 ++++++++++++++++++++++++++++++++
+ drivers/s390/crypto/zcrypt_msgtype6.h | 2 +
+ drivers/s390/crypto/zcrypt_pcica.c | 11 ++
+ drivers/s390/crypto/zcrypt_pcicc.c | 12 ++
+ 26 files changed, 565 insertions(+), 82 deletions(-)
+ create mode 100644 Documentation/kmsg/s390/zcrypt
+Merging sh/sh-latest (37284bd93103 Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest)
+$ git merge sh/sh-latest
+Resolved 'arch/sh/kernel/cpu/sh2a/Makefile' using previous resolution.
+Resolved 'drivers/tty/serial/sh-sci.c' using previous resolution.
+Resolved 'include/linux/serial_sci.h' using previous resolution.
+Auto-merging include/linux/serial_sci.h
+CONFLICT (content): Merge conflict in include/linux/serial_sci.h
+Auto-merging drivers/tty/serial/sh-sci.c
+CONFLICT (content): Merge conflict in drivers/tty/serial/sh-sci.c
+Auto-merging arch/sh/kernel/cpu/sh2a/Makefile
+CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5d958f55c3ae] Merge remote-tracking branch 'sh/sh-latest'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/tty/serial/renesas,sci-serial.txt | 53 +++++++
+ arch/sh/include/asm/hw_breakpoint.h | 12 +-
+ arch/sh/include/cpu-common/cpu/ubc.h | 17 +++
+ arch/sh/include/cpu-sh2a/cpu/ubc.h | 14 ++
+ arch/sh/kernel/cpu/sh2a/Makefile | 1 +
+ arch/sh/kernel/cpu/sh2a/ubc.c | 154 +++++++++++++++++++++
+ arch/sh/kernel/hw_breakpoint.c | 8 ++
+ drivers/tty/serial/sh-sci.c | 127 ++++++++++++++++-
+ include/linux/serial_sci.h | 4 +
+ 9 files changed, 375 insertions(+), 15 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/tty/serial/renesas,sci-serial.txt
+ create mode 100644 arch/sh/include/cpu-common/cpu/ubc.h
+ create mode 100644 arch/sh/include/cpu-sh2a/cpu/ubc.h
+ create mode 100644 arch/sh/kernel/cpu/sh2a/ubc.c
+Merging sparc-next/master (049ffa8ab33a Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux)
+$ git merge sparc-next/master
+Already up-to-date.
+Merging tile/master (5e01dc7b26d9 Linux 3.12)
+$ git merge tile/master
+Already up-to-date.
+Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXPERIMENTAL)
+$ git merge unicore32/unicore32
+Already up-to-date.
+Merging xtensa/for_next (3bf4c10bb2e3 xtensa: implement CPU hotplug)
+$ git merge xtensa/for_next
+Auto-merging drivers/irqchip/Makefile
+Merge made by the 'recursive' strategy.
+ arch/xtensa/Kconfig | 47 +-
+ arch/xtensa/boot/dts/xtfpga.dtsi | 2 +-
+ arch/xtensa/include/asm/Kbuild | 1 -
+ arch/xtensa/include/asm/barrier.h | 4 +-
+ arch/xtensa/include/asm/bitops.h | 8 +-
+ arch/xtensa/include/asm/cacheflush.h | 40 +-
+ arch/xtensa/include/asm/delay.h | 9 +-
+ arch/xtensa/include/asm/ftrace.h | 2 +-
+ arch/xtensa/include/asm/futex.h | 147 +++++
+ arch/xtensa/include/asm/irq.h | 9 +
+ arch/xtensa/include/asm/mmu.h | 10 +-
+ arch/xtensa/include/asm/mmu_context.h | 106 ++--
+ arch/xtensa/include/asm/mxregs.h | 46 ++
+ arch/xtensa/include/asm/processor.h | 20 +
+ arch/xtensa/include/asm/ptrace.h | 8 +
+ arch/xtensa/include/asm/smp.h | 38 +-
+ arch/xtensa/include/asm/spinlock.h | 31 +-
+ arch/xtensa/include/asm/spinlock_types.h | 20 +
+ arch/xtensa/include/asm/timex.h | 14 +-
+ arch/xtensa/include/asm/tlbflush.h | 42 +-
+ arch/xtensa/include/asm/traps.h | 1 +
+ arch/xtensa/include/asm/vectors.h | 12 +-
+ arch/xtensa/kernel/Makefile | 1 +
+ arch/xtensa/kernel/head.S | 181 +++++--
+ arch/xtensa/kernel/irq.c | 207 ++++----
+ arch/xtensa/kernel/mxhead.S | 85 +++
+ arch/xtensa/kernel/setup.c | 92 ++--
+ arch/xtensa/kernel/smp.c | 591 +++++++++++++++++++++
+ arch/xtensa/kernel/time.c | 56 +-
+ arch/xtensa/kernel/traps.c | 56 +-
+ arch/xtensa/kernel/vmlinux.lds.S | 26 +
+ arch/xtensa/mm/cache.c | 7 +-
+ arch/xtensa/mm/fault.c | 2 +-
+ arch/xtensa/mm/misc.S | 4 +-
+ arch/xtensa/mm/mmu.c | 4 +-
+ arch/xtensa/mm/tlb.c | 37 +-
+ arch/xtensa/platforms/iss/network.c | 290 ++++------
+ .../platforms/xtfpga/include/platform/hardware.h | 6 +-
+ arch/xtensa/variants/s6000/include/variant/irq.h | 1 -
+ drivers/irqchip/Kconfig | 4 +
+ drivers/irqchip/Makefile | 2 +
+ drivers/irqchip/irq-xtensa-mx.c | 164 ++++++
+ drivers/irqchip/irq-xtensa-pic.c | 108 ++++
+ include/linux/irqchip/xtensa-mx.h | 17 +
+ include/linux/irqchip/xtensa-pic.h | 18 +
+ 45 files changed, 1987 insertions(+), 589 deletions(-)
+ create mode 100644 arch/xtensa/include/asm/futex.h
+ create mode 100644 arch/xtensa/include/asm/mxregs.h
+ create mode 100644 arch/xtensa/include/asm/spinlock_types.h
+ create mode 100644 arch/xtensa/kernel/mxhead.S
+ create mode 100644 arch/xtensa/kernel/smp.c
+ create mode 100644 drivers/irqchip/irq-xtensa-mx.c
+ create mode 100644 drivers/irqchip/irq-xtensa-pic.c
+ create mode 100644 include/linux/irqchip/xtensa-mx.h
+ create mode 100644 include/linux/irqchip/xtensa-pic.h
+Merging btrfs/next (91aef86f3b8a Btrfs: rename btrfs_start_all_delalloc_inodes)
+$ git merge btrfs/next
+Already up-to-date.
+Merging ceph/master (9fb9d5b2ace4 ceph: implement readv/preadv for sync operation)
+$ git merge ceph/master
+Merge made by the 'recursive' strategy.
+ fs/ceph/file.c | 435 ++++++++++++++++++++++++++++++++++++++++----------------
+ fs/ceph/inode.c | 10 ++
+ fs/ceph/super.c | 1 +
+ fs/ceph/super.h | 1 +
+ 4 files changed, 321 insertions(+), 126 deletions(-)
+Merging cifs/for-next (7f07d4db6ad9 cifs: We do not drop reference to tlink in CIFSCheckMFSymlink())
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifsproto.h | 7 ++++---
+ fs/cifs/cifssmb.c | 6 +++---
+ fs/cifs/inode.c | 6 ++++--
+ fs/cifs/link.c | 26 +++++++++++---------------
+ 4 files changed, 22 insertions(+), 23 deletions(-)
+Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
+$ git merge configfs/linux-next
+Already up-to-date.
+Merging ecryptfs/next (2000f5beabc9 eCryptfs: file->private_data is always valid)
+$ git merge ecryptfs/next
+Already up-to-date.
+Merging ext3/for_next (df4e7ac0bb70 ext2: Fix oops in ext2_get_block() called from ext2_quota_write())
+$ git merge ext3/for_next
+Merge made by the 'recursive' strategy.
+ fs/ext2/super.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging ext4/dev (c25625a1b6a5 ext4: enable punch hole for bigalloc)
+$ git merge ext4/dev
+Merge made by the 'recursive' strategy.
+ fs/ext4/ext4_jbd2.c | 9 +++++++++
+ fs/ext4/extents.c | 19 ++++++++++++++++++-
+ fs/ext4/inode.c | 5 -----
+ fs/ext4/mballoc.c | 11 ++++++++---
+ fs/ext4/super.c | 21 +++++++++++++++------
+ fs/jbd2/journal.c | 18 ++++++++----------
+ fs/jbd2/recovery.c | 2 +-
+ fs/jbd2/transaction.c | 16 +++++++++-------
+ 8 files changed, 68 insertions(+), 33 deletions(-)
+Merging f2fs/dev (0491fe20cb11 f2fs: replace the debugfs_root with f2fs_debugfs_root)
+$ git merge f2fs/dev
+Merge made by the 'recursive' strategy.
+ fs/f2fs/checkpoint.c | 83 +++----
+ fs/f2fs/data.c | 347 +++++++++++++++++++++--------
+ fs/f2fs/debug.c | 32 ++-
+ fs/f2fs/f2fs.h | 104 ++++++---
+ fs/f2fs/file.c | 48 +---
+ fs/f2fs/gc.c | 4 +-
+ fs/f2fs/node.c | 128 ++++++-----
+ fs/f2fs/recovery.c | 4 +-
+ fs/f2fs/segment.c | 524 ++++++++++++++++++++++++++++----------------
+ fs/f2fs/segment.h | 22 +-
+ fs/f2fs/super.c | 32 ++-
+ include/linux/f2fs_fs.h | 8 +
+ include/trace/events/f2fs.h | 107 ++++++---
+ 13 files changed, 943 insertions(+), 500 deletions(-)
+Merging fscache/fscache (7c604e5d6e56 FS-Cache: Fix handling of an attempt to store a page that is now beyond EOF)
+$ git merge fscache/fscache
+Merge made by the 'recursive' strategy.
+ fs/fscache/page.c | 37 ++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 36 insertions(+), 1 deletion(-)
+Merging fuse/for-next (ce128de6260f fuse: writepages: protect secondary requests from fuse file release)
+$ git merge fuse/for-next
+Already up-to-date.
+Merging gfs2/master (3ecb91bd8fac GFS2: Use only a single address space for rgrps)
+$ git merge gfs2/master
+Merge made by the 'recursive' strategy.
+ fs/gfs2/aops.c | 18 +++------
+ fs/gfs2/glops.c | 20 +++++-----
+ fs/gfs2/incore.h | 13 ++++++-
+ fs/gfs2/lops.c | 5 +++
+ fs/gfs2/meta_io.c | 3 ++
+ fs/gfs2/ops_fstype.c | 24 +++++++++++-
+ fs/gfs2/quota.c | 37 ++++++------------
+ fs/gfs2/rgrp.c | 106 +++++++++++++++++++++++++++++++++++++++------------
+ 8 files changed, 153 insertions(+), 73 deletions(-)
+Merging jfs/jfs-next (8660998608cf jfs: fix error path in ialloc)
+$ git merge jfs/jfs-next
+Already up-to-date.
+Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found)
+$ git merge logfs/master
+Auto-merging fs/logfs/super.c
+Merge made by the 'recursive' strategy.
+ fs/logfs/dev_mtd.c | 2 +-
+ fs/logfs/super.c | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+Merging nfs/linux-next (e2f0c83a9de3 sunrpc: add an "info" file for the dummy gssd pipe)
+$ git merge nfs/linux-next
+Merge made by the 'recursive' strategy.
+ fs/nfs/nfs4client.c | 7 +-
+ fs/nfs/nfs4xdr.c | 47 +++++++----
+ include/linux/sunrpc/rpc_pipe_fs.h | 5 +-
+ net/sunrpc/auth_gss/auth_gss.c | 17 ++--
+ net/sunrpc/netns.h | 3 +-
+ net/sunrpc/rpc_pipe.c | 157 +++++++++++++++++++++++++++++++++++--
+ net/sunrpc/sunrpc_syms.c | 8 +-
+ 7 files changed, 206 insertions(+), 38 deletions(-)
+Merging nfsd/nfsd-next (d2c2ad54c485 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
+$ git merge nfsd/nfsd-next
+Already up-to-date.
+Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
+$ git merge omfs/for-next
+Already up-to-date.
+Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error)
+$ git merge squashfs/master
+Already up-to-date.
+Merging v9fs/for-next (f94741fd2832 net/9p: remove virtio default hack and set appropriate bits instead)
+$ git merge v9fs/for-next
+Merge made by the 'recursive' strategy.
+ fs/9p/cache.c | 3 +--
+ fs/9p/vfs_file.c | 2 --
+ fs/9p/vfs_inode.c | 4 +---
+ fs/9p/vfs_inode_dotl.c | 8 --------
+ fs/9p/xattr.c | 10 ++++++----
+ net/9p/client.c | 3 ---
+ net/9p/trans_fd.c | 2 +-
+ net/9p/trans_virtio.c | 2 +-
+ 8 files changed, 10 insertions(+), 24 deletions(-)
+Merging ubifs/linux-next (58a4e23703b2 UBIFS: correct data corruption range)
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/for-next (c91c46c12768 xfs: add xfs_setattr_time)
+$ git merge xfs/for-next
+Removing fs/xfs/xfs_quota_priv.h
+Auto-merging fs/ext4/inode.c
+Merge made by the 'recursive' strategy.
+ fs/attr.c | 5 ----
+ fs/btrfs/inode.c | 8 +++--
+ fs/ext4/inode.c | 4 +++
+ fs/xfs/xfs_buf.c | 26 +++++------------
+ fs/xfs/xfs_dir2_node.c | 26 ++++++++---------
+ fs/xfs/xfs_discard.c | 5 ++--
+ fs/xfs/xfs_fsops.c | 6 +++-
+ fs/xfs/xfs_ioctl.c | 3 +-
+ fs/xfs/xfs_ioctl32.c | 3 +-
+ fs/xfs/xfs_iops.c | 76 ++++++++++++++++++++++--------------------------
+ fs/xfs/xfs_log_recover.c | 17 +++++++++--
+ fs/xfs/xfs_qm.c | 9 ++----
+ fs/xfs/xfs_qm.h | 18 +++++++++++-
+ fs/xfs/xfs_qm_syscalls.c | 18 ++++++++----
+ fs/xfs/xfs_quota_priv.h | 42 --------------------------
+ fs/xfs/xfs_trans_dquot.c | 4 +--
+ fs/xfs/xfs_vnode.h | 9 ------
+ 17 files changed, 125 insertions(+), 154 deletions(-)
+ delete mode 100644 fs/xfs/xfs_quota_priv.h
+Merging vfs/for-next (27ac0ffeac80 locks: break delegations on any attribute modification)
+$ git merge vfs/for-next
+Already up-to-date.
+Merging pci/next (6ce4eac1f600 Linux 3.13-rc1)
+$ git merge pci/next
+Already up-to-date.
+Merging hid/for-next (074fb898390b Merge branch 'for-3.14/upstream' into for-next)
+$ git merge hid/for-next
+Auto-merging drivers/hid/i2c-hid/i2c-hid.c
+Auto-merging drivers/hid/hid-multitouch.c
+Auto-merging drivers/hid/hid-ids.h
+Auto-merging drivers/hid/hid-core.c
+Auto-merging drivers/hid/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/hid/Kconfig | 1 +
+ drivers/hid/hid-core.c | 4 +-
+ drivers/hid/hid-ids.h | 8 +-
+ drivers/hid/hid-lg.c | 2 +
+ drivers/hid/hid-multitouch.c | 4 +-
+ drivers/hid/hid-sony.c | 194 ++++++++++++++++++++--------------------
+ drivers/hid/i2c-hid/i2c-hid.c | 2 +
+ drivers/hid/usbhid/hid-quirks.c | 8 +-
+ drivers/hid/usbhid/usbkbd.c | 2 +-
+ 9 files changed, 117 insertions(+), 108 deletions(-)
+Merging i2c/i2c/for-next (af91706d5dde ima: store address of template_fmt_copy in a pointer before calling strsep)
+$ git merge i2c/i2c/for-next
+Already up-to-date.
+Merging jdelvare-hwmon/master (024cd034d0e6 hwmon: (it87) Print proper names for the IT8771E and IT8772E)
+$ git merge jdelvare-hwmon/master
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/it87 | 27 ++++++++----
+ drivers/hwmon/Kconfig | 4 +-
+ drivers/hwmon/it87.c | 104 ++++++++++++++++++++++++++++++++++++++--------
+ drivers/hwmon/lm78.c | 2 +
+ drivers/hwmon/lm90.c | 4 +-
+ drivers/hwmon/sis5595.c | 2 +
+ drivers/hwmon/vt8231.c | 2 +-
+ drivers/hwmon/w83l786ng.c | 10 +++--
+ 8 files changed, 121 insertions(+), 34 deletions(-)
+Merging hwmon-staging/hwmon-next (7f438058ec86 hwmon: remove DEFINE_PCI_DEVICE_TABLE macro)
+$ git merge hwmon-staging/hwmon-next
+Auto-merging drivers/hwmon/vt8231.c
+Auto-merging drivers/hwmon/sis5595.c
+Merge made by the 'recursive' strategy.
+ drivers/hwmon/fam15h_power.c | 2 +-
+ drivers/hwmon/k10temp.c | 2 +-
+ drivers/hwmon/k8temp.c | 2 +-
+ drivers/hwmon/sis5595.c | 2 +-
+ drivers/hwmon/via686a.c | 2 +-
+ drivers/hwmon/vt8231.c | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+Merging v4l-dvb/master (9c3d6c25d373 Merge branch 'v4l_for_linus' into to_next)
+$ git merge v4l-dvb/master
+Merge made by the 'recursive' strategy.
+ .../DocBook/media/v4l/media-ioc-enum-links.xml | 9 +
+ Documentation/DocBook/media/v4l/vidioc-expbuf.xml | 8 +-
+ Documentation/video4linux/omap4_camera.txt | 60 +
+ drivers/media/common/siano/smscoreapi.h | 4 +-
+ drivers/media/common/siano/smsdvb.h | 2 +-
+ drivers/media/dvb-core/dvb_demux.c | 9 +-
+ drivers/media/dvb-frontends/af9033.c | 12 +-
+ drivers/media/dvb-frontends/cxd2820r_c.c | 2 +-
+ drivers/media/dvb-frontends/dib8000.c | 4 +-
+ drivers/media/dvb-frontends/drxk_hard.c | 18 +-
+ drivers/media/dvb-frontends/rtl2830.c | 1 +
+ drivers/media/i2c/adv7183_regs.h | 6 +-
+ drivers/media/i2c/adv7604.c | 2 +-
+ drivers/media/i2c/adv7842.c | 2 +-
+ drivers/media/i2c/ir-kbd-i2c.c | 2 +-
+ drivers/media/i2c/m5mols/m5mols_controls.c | 2 +-
+ drivers/media/i2c/mt9p031.c | 1 +
+ drivers/media/i2c/s5c73m3/s5c73m3-core.c | 2 +-
+ drivers/media/i2c/s5c73m3/s5c73m3.h | 2 +-
+ drivers/media/i2c/saa7115.c | 2 +-
+ drivers/media/i2c/soc_camera/ov5642.c | 2 +-
+ drivers/media/i2c/ths7303.c | 3 +-
+ drivers/media/i2c/wm8775.c | 4 +-
+ drivers/media/media-entity.c | 41 +-
+ drivers/media/pci/bt8xx/bttv-driver.c | 3 +-
+ drivers/media/pci/cx18/cx18-driver.h | 2 +-
+ drivers/media/pci/cx23885/cx23885-417.c | 2 +-
+ drivers/media/pci/pluto2/pluto2.c | 2 +-
+ drivers/media/pci/saa7164/saa7164-core.c | 4 +-
+ drivers/media/platform/coda.c | 2 +-
+ drivers/media/platform/exynos4-is/fimc-core.c | 2 +-
+ drivers/media/platform/exynos4-is/fimc-core.h | 2 -
+ drivers/media/platform/exynos4-is/fimc-is-regs.c | 36 +-
+ drivers/media/platform/exynos4-is/fimc-is-regs.h | 1 -
+ drivers/media/platform/exynos4-is/fimc-lite-reg.c | 4 +-
+ drivers/media/platform/exynos4-is/fimc-m2m.c | 148 +-
+ drivers/media/platform/exynos4-is/media-dev.c | 2 +-
+ drivers/media/platform/exynos4-is/mipi-csis.c | 2 +-
+ drivers/media/platform/marvell-ccic/mmp-driver.c | 45 +-
+ drivers/media/platform/mem2mem_testdev.c | 152 +-
+ drivers/media/platform/omap3isp/isp.c | 2 +-
+ drivers/media/platform/omap3isp/ispccdc.c | 3 +-
+ drivers/media/platform/omap3isp/ispccp2.c | 3 +-
+ drivers/media/platform/omap3isp/ispcsi2.c | 3 +-
+ drivers/media/platform/omap3isp/isppreview.c | 3 +-
+ drivers/media/platform/omap3isp/ispresizer.c | 18 +-
+ drivers/media/platform/omap3isp/ispstat.c | 2 +-
+ drivers/media/platform/omap3isp/ispvideo.c | 67 +-
+ drivers/media/platform/s5p-g2d/g2d.c | 124 +-
+ drivers/media/platform/s5p-g2d/g2d.h | 1 -
+ drivers/media/platform/s5p-jpeg/jpeg-core.c | 134 +-
+ drivers/media/platform/s5p-jpeg/jpeg-core.h | 2 -
+ drivers/media/platform/s5p-mfc/regs-mfc.h | 2 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc.c | 12 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 2 +-
+ drivers/media/platform/s5p-tv/mixer.h | 2 +-
+ drivers/media/platform/s5p-tv/mixer_drv.c | 34 +-
+ drivers/media/platform/s5p-tv/mixer_video.c | 4 +-
+ drivers/media/platform/s5p-tv/sdo_drv.c | 39 +-
+ drivers/media/platform/soc_camera/omap1_camera.c | 2 +-
+ drivers/media/platform/vivi.c | 4 +-
+ drivers/media/platform/vsp1/vsp1_drv.c | 2 +-
+ drivers/media/platform/vsp1/vsp1_video.c | 4 +-
+ drivers/media/radio/radio-shark.c | 4 +-
+ drivers/media/radio/radio-shark2.c | 4 +-
+ drivers/media/radio/radio-si476x.c | 4 +-
+ drivers/media/radio/radio-tea5764.c | 2 +-
+ drivers/media/radio/tef6862.c | 2 +-
+ drivers/media/rc/imon.c | 2 +-
+ drivers/media/rc/redrat3.c | 2 +-
+ drivers/media/tuners/mt2063.c | 4 +-
+ drivers/media/tuners/tuner-xc2028-types.h | 2 +-
+ drivers/media/usb/cx231xx/cx231xx-cards.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/af9035.c | 17 +-
+ drivers/media/usb/dvb-usb-v2/mxl111sf.c | 4 +-
+ drivers/media/usb/dvb-usb/technisat-usb2.c | 2 +-
+ drivers/media/usb/em28xx/em28xx-video.c | 2 +-
+ drivers/media/usb/gspca/gl860/gl860.c | 2 +-
+ drivers/media/usb/gspca/pac207.c | 2 +-
+ drivers/media/usb/gspca/pac7302.c | 2 +-
+ drivers/media/usb/gspca/stk1135.c | 3 +
+ drivers/media/usb/gspca/stv0680.c | 2 +-
+ drivers/media/usb/gspca/sunplus.c | 1 +
+ drivers/media/usb/gspca/zc3xx.c | 2 +-
+ drivers/media/usb/pwc/pwc-if.c | 2 +-
+ drivers/media/usb/usbtv/usbtv.c | 174 ++-
+ drivers/media/usb/uvc/uvc_video.c | 2 +-
+ drivers/media/v4l2-core/v4l2-ctrls.c | 2 +-
+ drivers/media/v4l2-core/v4l2-mem2mem.c | 126 ++
+ drivers/media/v4l2-core/videobuf2-core.c | 8 +-
+ drivers/media/v4l2-core/videobuf2-dma-contig.c | 4 +-
+ drivers/staging/media/Kconfig | 2 +
+ drivers/staging/media/Makefile | 1 +
+ drivers/staging/media/omap4iss/Kconfig | 12 +
+ drivers/staging/media/omap4iss/Makefile | 6 +
+ drivers/staging/media/omap4iss/TODO | 4 +
+ drivers/staging/media/omap4iss/iss.c | 1462 ++++++++++++++++++++
+ drivers/staging/media/omap4iss/iss.h | 153 ++
+ drivers/staging/media/omap4iss/iss_csi2.c | 1368 ++++++++++++++++++
+ drivers/staging/media/omap4iss/iss_csi2.h | 156 +++
+ drivers/staging/media/omap4iss/iss_csiphy.c | 278 ++++
+ drivers/staging/media/omap4iss/iss_csiphy.h | 51 +
+ drivers/staging/media/omap4iss/iss_ipipe.c | 581 ++++++++
+ drivers/staging/media/omap4iss/iss_ipipe.h | 67 +
+ drivers/staging/media/omap4iss/iss_ipipeif.c | 847 ++++++++++++
+ drivers/staging/media/omap4iss/iss_ipipeif.h | 92 ++
+ drivers/staging/media/omap4iss/iss_regs.h | 883 ++++++++++++
+ drivers/staging/media/omap4iss/iss_resizer.c | 905 ++++++++++++
+ drivers/staging/media/omap4iss/iss_resizer.h | 75 +
+ drivers/staging/media/omap4iss/iss_video.c | 1128 +++++++++++++++
+ drivers/staging/media/omap4iss/iss_video.h | 198 +++
+ include/media/omap4iss.h | 65 +
+ include/media/v4l2-fh.h | 4 +
+ include/media/v4l2-mem2mem.h | 24 +
+ include/media/videobuf2-core.h | 2 +-
+ include/uapi/linux/media.h | 1 +
+ 116 files changed, 9060 insertions(+), 768 deletions(-)
+ create mode 100644 Documentation/video4linux/omap4_camera.txt
+ create mode 100644 drivers/staging/media/omap4iss/Kconfig
+ create mode 100644 drivers/staging/media/omap4iss/Makefile
+ create mode 100644 drivers/staging/media/omap4iss/TODO
+ create mode 100644 drivers/staging/media/omap4iss/iss.c
+ create mode 100644 drivers/staging/media/omap4iss/iss.h
+ create mode 100644 drivers/staging/media/omap4iss/iss_csi2.c
+ create mode 100644 drivers/staging/media/omap4iss/iss_csi2.h
+ create mode 100644 drivers/staging/media/omap4iss/iss_csiphy.c
+ create mode 100644 drivers/staging/media/omap4iss/iss_csiphy.h
+ create mode 100644 drivers/staging/media/omap4iss/iss_ipipe.c
+ create mode 100644 drivers/staging/media/omap4iss/iss_ipipe.h
+ create mode 100644 drivers/staging/media/omap4iss/iss_ipipeif.c
+ create mode 100644 drivers/staging/media/omap4iss/iss_ipipeif.h
+ create mode 100644 drivers/staging/media/omap4iss/iss_regs.h
+ create mode 100644 drivers/staging/media/omap4iss/iss_resizer.c
+ create mode 100644 drivers/staging/media/omap4iss/iss_resizer.h
+ create mode 100644 drivers/staging/media/omap4iss/iss_video.c
+ create mode 100644 drivers/staging/media/omap4iss/iss_video.h
+ create mode 100644 include/media/omap4iss.h
+Merging kbuild/for-next (e6483a58eca6 Merge branch 'kbuild/misc' into kbuild/for-next)
+$ git merge kbuild/for-next
+Merge made by the 'recursive' strategy.
+ scripts/package/builddeb | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+Merging kconfig/for-next (4eae518d4b01 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
+$ git merge kconfig/for-next
+Already up-to-date.
+Merging libata/for-next (c5fd0781fbae Merge branch 'for-3.14' into for-next)
+$ git merge libata/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/ata/sata_rcar.txt | 18 ++
+ drivers/ata/ahci.c | 60 +++++-
+ drivers/ata/ahci_imx.c | 240 +++++++++++++--------
+ drivers/ata/ata_generic.c | 7 -
+ drivers/ata/libata-core.c | 3 +
+ drivers/ata/libata-eh.c | 5 +-
+ drivers/ata/sata_rcar.c | 118 ++++++++--
+ 7 files changed, 332 insertions(+), 119 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/ata/sata_rcar.txt
+Merging pstore/master (bd08ec33b5c2 pstore/ram: Restore ecc information block)
+$ git merge pstore/master
+Already up-to-date.
+Merging pm/linux-next (efef6dba5277 Merge branch 'master' into linux-next)
+$ git merge pm/linux-next
+Merge made by the 'recursive' strategy.
+ Documentation/acpi/namespace.txt | 9 +-
+ arch/ia64/hp/common/aml_nfw.c | 3 +-
+ arch/x86/kernel/apic/apic_flat_64.c | 4 +-
+ arch/x86/kernel/apic/io_apic.c | 3 -
+ arch/x86/pci/mmconfig_32.c | 1 -
+ arch/x86/platform/olpc/olpc-xo15-sci.c | 3 +-
+ drivers/acpi/ac.c | 3 +-
+ drivers/acpi/acpi_extlog.c | 1 -
+ drivers/acpi/acpi_lpss.c | 1 +
+ drivers/acpi/acpi_memhotplug.c | 15 +-
+ drivers/acpi/acpi_pad.c | 3 +-
+ drivers/acpi/acpi_processor.c | 2 +-
+ drivers/acpi/apei/einj.c | 1 -
+ drivers/acpi/battery.c | 3 +-
+ drivers/acpi/blacklist.c | 1 -
+ drivers/acpi/bus.c | 77 +---
+ drivers/acpi/button.c | 3 +-
+ drivers/acpi/container.c | 11 +-
+ drivers/acpi/custom_method.c | 2 +-
+ drivers/acpi/debugfs.c | 2 +-
+ drivers/acpi/device_pm.c | 22 +-
+ drivers/acpi/dock.c | 11 +-
+ drivers/acpi/ec.c | 5 +-
+ drivers/acpi/event.c | 2 +-
+ drivers/acpi/fan.c | 3 +-
+ drivers/acpi/glue.c | 165 +++----
+ drivers/acpi/hed.c | 2 -
+ drivers/acpi/internal.h | 9 +-
+ drivers/acpi/numa.c | 1 -
+ drivers/acpi/osl.c | 9 +-
+ drivers/acpi/pci_irq.c | 2 -
+ drivers/acpi/pci_link.c | 4 +-
+ drivers/acpi/pci_root.c | 126 +-----
+ drivers/acpi/power.c | 3 +-
+ drivers/acpi/proc.c | 4 +-
+ drivers/acpi/processor_core.c | 3 +-
+ drivers/acpi/processor_idle.c | 4 +-
+ drivers/acpi/processor_perflib.c | 7 +-
+ drivers/acpi/processor_thermal.c | 7 +-
+ drivers/acpi/processor_throttling.c | 7 +-
+ drivers/acpi/sbshc.c | 3 +-
+ drivers/acpi/scan.c | 482 +++++++++++----------
+ drivers/acpi/sleep.c | 4 -
+ drivers/acpi/sysfs.c | 2 +-
+ drivers/acpi/thermal.c | 5 +-
+ drivers/acpi/utils.c | 2 -
+ drivers/acpi/video.c | 5 +-
+ drivers/acpi/wakeup.c | 1 -
+ drivers/ata/libata-acpi.c | 28 +-
+ drivers/ata/pata_acpi.c | 5 +-
+ drivers/char/hpet.c | 7 +-
+ drivers/char/tpm/tpm_acpi.c | 2 +-
+ drivers/char/tpm/tpm_ppi.c | 1 -
+ drivers/cpufreq/cpufreq-cpu0.c | 2 +-
+ drivers/cpufreq/spear-cpufreq.c | 2 +-
+ drivers/gpu/drm/i915/intel_acpi.c | 2 -
+ drivers/gpu/drm/nouveau/nouveau_acpi.c | 7 +-
+ drivers/gpu/drm/radeon/radeon_acpi.c | 6 +-
+ drivers/hv/vmbus_drv.c | 2 -
+ drivers/hwmon/acpi_power_meter.c | 3 +-
+ drivers/hwmon/asus_atk0110.c | 6 +-
+ drivers/ide/ide-acpi.c | 12 +-
+ drivers/input/misc/atlas_btns.c | 2 +-
+ drivers/iommu/amd_iommu_init.c | 1 -
+ drivers/iommu/intel_irq_remapping.c | 4 +-
+ drivers/mmc/core/sdio_bus.c | 2 +-
+ drivers/pci/hotplug/acpiphp_glue.c | 6 +-
+ drivers/pci/hotplug/acpiphp_ibm.c | 3 +-
+ drivers/pci/hotplug/pciehp.h | 2 -
+ drivers/pci/ioapic.c | 1 -
+ drivers/pci/pci-acpi.c | 17 +-
+ drivers/pci/pci-label.c | 1 -
+ drivers/pinctrl/pinctrl-baytrail.c | 1 +
+ drivers/platform/x86/acer-wmi.c | 2 -
+ drivers/platform/x86/asus-laptop.c | 3 +-
+ drivers/platform/x86/asus-wmi.c | 3 +-
+ drivers/platform/x86/classmate-laptop.c | 3 +-
+ drivers/platform/x86/dell-wmi-aio.c | 1 -
+ drivers/platform/x86/dell-wmi.c | 1 -
+ drivers/platform/x86/eeepc-laptop.c | 3 +-
+ drivers/platform/x86/eeepc-wmi.c | 2 +-
+ drivers/platform/x86/hp_accel.c | 2 +-
+ drivers/platform/x86/ideapad-laptop.c | 3 +-
+ drivers/platform/x86/intel-rst.c | 2 +-
+ drivers/platform/x86/intel-smartconnect.c | 2 +-
+ drivers/platform/x86/intel_menlow.c | 4 +-
+ drivers/platform/x86/intel_oaktrail.c | 3 -
+ drivers/platform/x86/mxm-wmi.c | 3 +-
+ drivers/platform/x86/panasonic-laptop.c | 4 +-
+ drivers/platform/x86/pvpanic.c | 3 +-
+ drivers/platform/x86/samsung-q10.c | 2 +-
+ drivers/platform/x86/sony-laptop.c | 4 +-
+ drivers/platform/x86/tc1100-wmi.c | 4 +-
+ drivers/platform/x86/thinkpad_acpi.c | 14 +-
+ drivers/platform/x86/toshiba_acpi.c | 4 +-
+ drivers/platform/x86/toshiba_bluetooth.c | 4 +-
+ drivers/platform/x86/wmi.c | 2 -
+ drivers/platform/x86/xo15-ebook.c | 3 +-
+ drivers/pnp/pnpacpi/core.c | 22 +-
+ drivers/pnp/pnpacpi/pnpacpi.h | 1 -
+ drivers/sfi/sfi_acpi.c | 2 +-
+ drivers/staging/quickstart/quickstart.c | 2 +-
+ drivers/usb/core/usb-acpi.c | 41 +-
+ drivers/xen/xen-acpi-cpuhotplug.c | 11 +-
+ drivers/xen/xen-acpi-memhotplug.c | 8 +-
+ drivers/xen/xen-acpi-pad.c | 5 +-
+ drivers/xen/xen-acpi-processor.c | 4 +-
+ include/acpi/acpi_bus.h | 37 +-
+ include/acpi/acpi_drivers.h | 3 -
+ include/linux/acpi.h | 6 +
+ include/linux/acpi_io.h | 2 +-
+ include/linux/ide.h | 8 +-
+ include/linux/iscsi_ibft.h | 2 +-
+ include/linux/pci_hotplug.h | 3 +-
+ include/linux/sfi_acpi.h | 2 +-
+ include/linux/tboot.h | 2 +-
+ kernel/power/hibernate.c | 1 +
+ .../power/cpupower/debug/kernel/cpufreq-test_tsc.c | 5 +-
+ 118 files changed, 564 insertions(+), 857 deletions(-)
+Merging idle/next (1ae2a8af4228 tools/power turbostat: run on HSX)
+$ git merge idle/next
+Merge made by the 'recursive' strategy.
+ tools/power/x86/turbostat/turbostat.c | 42 ++++++++++++++++++++++++++---------
+ 1 file changed, 31 insertions(+), 11 deletions(-)
+Merging apm/for-next (fb9d78aca709 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
+$ git merge apm/for-next
+Already up-to-date.
+Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
+$ git merge cpupowerutils/master
+Already up-to-date.
+Merging thermal/next (86e0a0bdf81c Merge branches 'intel_powerclamp', 'tmon' and 'misc' of .git into next)
+$ git merge thermal/next
+Already up-to-date.
+Merging ieee1394/for-next (db9ae8fec7b1 firewire: ohci: Fix deadlock at bus reset)
+$ git merge ieee1394/for-next
+Already up-to-date.
+Merging ubi/linux-next (ae0d14695566 UBI: Add some asserts to ubi_attach_fastmap())
+$ git merge ubi/linux-next
+Already up-to-date.
+Merging dlm/next (a97f4a66d8ee dlm: Avoid that dlm_release_lockspace() incorrectly returns -EBUSY)
+$ git merge dlm/next
+Already up-to-date.
+Merging swiotlb/linux-next (af51a9f1848f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
+$ git merge swiotlb/linux-next
+Already up-to-date.
+Merging slave-dma/next (29732357a296 Merge branch 'for-linus' into next)
+$ git merge slave-dma/next
+Resolved 'arch/arm/boot/dts/imx51.dtsi' using previous resolution.
+Resolved 'arch/arm/boot/dts/imx53.dtsi' using previous resolution.
+Auto-merging arch/arm/boot/dts/imx6sl.dtsi
+Auto-merging arch/arm/boot/dts/imx6qdl.dtsi
+Auto-merging arch/arm/boot/dts/imx53.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx53.dtsi
+Auto-merging arch/arm/boot/dts/imx51.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx51.dtsi
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5db3fc00e796] Merge remote-tracking branch 'slave-dma/next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/dma/fsl-imx-sdma.txt | 1 +
+ arch/arm/boot/dts/imx51.dtsi | 4 +-
+ arch/arm/boot/dts/imx53.dtsi | 4 +-
+ arch/arm/boot/dts/imx6qdl.dtsi | 12 +-
+ arch/arm/boot/dts/imx6sl.dtsi | 12 +-
+ drivers/dma/amba-pl08x.c | 2 +-
+ drivers/dma/imx-sdma.c | 19 +-
+ drivers/dma/mmp_pdma.c | 205 +++++++++++----------
+ drivers/dma/mmp_tdma.c | 6 +-
+ drivers/dma/pl330.c | 6 +
+ drivers/dma/s3c24xx-dma.c | 33 +---
+ drivers/dma/sh/rcar-hpbdma.c | 11 +-
+ include/linux/platform_data/dma-imx-sdma.h | 5 +
+ include/linux/platform_data/dma-imx.h | 1 +
+ sound/soc/fsl/fsl_ssi.c | 27 ++-
+ 15 files changed, 195 insertions(+), 153 deletions(-)
+Merging dmaengine/next (9e70a236fc69 dmaengine: fix enable for high order unmap pools)
+$ git merge dmaengine/next
+Merge made by the 'recursive' strategy.
+ drivers/dma/Kconfig | 6 ++++++
+ drivers/dma/at_hdmac_regs.h | 4 ----
+ drivers/dma/dmaengine.c | 2 +-
+ drivers/dma/dmatest.c | 8 ++++----
+ drivers/dma/fsldma.c | 31 +------------------------------
+ drivers/dma/mv_xor.c | 6 ------
+ drivers/dma/ppc4xx/adma.c | 27 +--------------------------
+ drivers/dma/txx9dmac.c | 1 -
+ 8 files changed, 13 insertions(+), 72 deletions(-)
+Merging net-next/master (0d74c42f788c ether_addr_equal: Optimize implementation, remove unused compare_ether_addr)
+$ git merge net-next/master
+Auto-merging net/sctp/transport.c
+Auto-merging net/sched/act_skbedit.c
+Removing drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h
+Removing drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
+Auto-merging drivers/net/wireless/ath/ath9k/xmit.c
+Auto-merging drivers/net/virtio_net.c
+Auto-merging drivers/net/tun.c
+Auto-merging drivers/net/macvtap.c
+Auto-merging drivers/net/ethernet/nvidia/forcedeth.c
+Auto-merging drivers/net/bonding/bond_sysfs.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/net/phy.txt | 1 +
+ Documentation/networking/ip-sysctl.txt | 10 +
+ Documentation/networking/regulatory.txt | 4 +-
+ Documentation/networking/timestamping.txt | 9 +-
+ Documentation/networking/timestamping/.gitignore | 1 +
+ Documentation/networking/timestamping/Makefile | 5 +-
+ .../networking/timestamping/hwtstamp_config.c | 134 ++
+ Documentation/unaligned-memory-access.txt | 28 +-
+ MAINTAINERS | 19 +-
+ drivers/bcma/host_pci.c | 1 -
+ drivers/net/bonding/bond_alb.c | 3 +-
+ drivers/net/bonding/bond_alb.h | 3 +-
+ drivers/net/bonding/bond_sysfs.c | 3 +-
+ drivers/net/ethernet/3com/3c59x.c | 2 +-
+ drivers/net/ethernet/adi/bfin_mac.c | 21 +-
+ drivers/net/ethernet/amd/amd8111e.c | 4 +-
+ drivers/net/ethernet/amd/amd8111e.h | 4 +-
+ drivers/net/ethernet/amd/au1000_eth.c | 3 +-
+ drivers/net/ethernet/amd/au1000_eth.h | 3 +-
+ drivers/net/ethernet/arc/emac.h | 2 -
+ drivers/net/ethernet/arc/emac_main.c | 20 +-
+ drivers/net/ethernet/broadcom/sb1250-mac.c | 3 +-
+ drivers/net/ethernet/broadcom/tg3.c | 108 +-
+ drivers/net/ethernet/broadcom/tg3.h | 6 +-
+ drivers/net/ethernet/chelsio/cxgb/common.h | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/cphy.h | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/elmer0.h | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/espi.c | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/espi.h | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/gmac.h | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/mv88x201x.c | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/pm3393.c | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/regs.h | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/sge.c | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/sge.h | 3 +-
+ drivers/net/ethernet/chelsio/cxgb/subr.c | 3 +-
+ .../net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h | 3 +-
+ drivers/net/ethernet/freescale/fec.h | 3 +-
+ drivers/net/ethernet/freescale/fec_main.c | 8 +-
+ drivers/net/ethernet/freescale/fec_ptp.c | 16 +-
+ drivers/net/ethernet/freescale/gianfar.c | 22 +-
+ drivers/net/ethernet/ibm/ibmveth.c | 3 +-
+ drivers/net/ethernet/ibm/ibmveth.h | 3 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 14 +-
+ drivers/net/ethernet/intel/i40e/i40e.h | 19 +-
+ drivers/net/ethernet/intel/i40e/i40e_adminq.c | 66 +-
+ drivers/net/ethernet/intel/i40e/i40e_adminq.h | 1 +
+ drivers/net/ethernet/intel/i40e/i40e_common.c | 6 +-
+ drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 4 +
+ drivers/net/ethernet/intel/i40e/i40e_diag.c | 8 +-
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 10 +-
+ drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h | 4 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 37 +-
+ drivers/net/ethernet/intel/i40e/i40e_register.h | 134 +-
+ drivers/net/ethernet/intel/i40e/i40e_type.h | 11 +-
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 8 +-
+ drivers/net/ethernet/lantiq_etop.c | 3 +-
+ drivers/net/ethernet/marvell/mv643xx_eth.c | 3 +-
+ drivers/net/ethernet/marvell/pxa168_eth.c | 3 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 14 +-
+ drivers/net/ethernet/natsemi/ns83820.c | 3 +-
+ drivers/net/ethernet/neterion/vxge/vxge-main.c | 27 +-
+ drivers/net/ethernet/netx-eth.c | 3 +-
+ drivers/net/ethernet/nvidia/forcedeth.c | 3 +-
+ drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 3 +-
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c | 3 +-
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_api.h | 3 +-
+ .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 3 +-
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 3 +-
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c | 3 +-
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c | 3 +-
+ .../net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.h | 3 +-
+ drivers/net/ethernet/pasemi/pasemi_mac.c | 3 +-
+ drivers/net/ethernet/pasemi/pasemi_mac.h | 3 +-
+ drivers/net/ethernet/pasemi/pasemi_mac_ethtool.c | 3 +-
+ drivers/net/ethernet/qlogic/netxen/Makefile | 4 +-
+ drivers/net/ethernet/qlogic/netxen/netxen_nic.h | 4 +-
+ .../net/ethernet/qlogic/netxen/netxen_nic_ctx.c | 4 +-
+ .../ethernet/qlogic/netxen/netxen_nic_ethtool.c | 4 +-
+ .../net/ethernet/qlogic/netxen/netxen_nic_hdr.h | 4 +-
+ drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 4 +-
+ drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.h | 4 +-
+ .../net/ethernet/qlogic/netxen/netxen_nic_init.c | 4 +-
+ .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 4 +-
+ drivers/net/ethernet/sfc/efx.c | 4 +-
+ drivers/net/ethernet/sfc/nic.h | 3 +-
+ drivers/net/ethernet/sfc/ptp.c | 11 +-
+ drivers/net/ethernet/smsc/smc911x.c | 3 +-
+ drivers/net/ethernet/smsc/smc911x.h | 3 +-
+ drivers/net/ethernet/smsc/smc91x.c | 3 +-
+ drivers/net/ethernet/smsc/smc91x.h | 3 +-
+ drivers/net/ethernet/smsc/smsc911x.c | 3 +-
+ drivers/net/ethernet/smsc/smsc911x.h | 3 +-
+ drivers/net/ethernet/smsc/smsc9420.c | 3 +-
+ drivers/net/ethernet/smsc/smsc9420.h | 3 +-
+ drivers/net/ethernet/sun/cassini.c | 4 +-
+ drivers/net/ethernet/sun/cassini.h | 4 +-
+ drivers/net/ethernet/ti/cpsw.c | 24 +-
+ drivers/net/ethernet/tile/tilegx.c | 22 +-
+ drivers/net/ethernet/tundra/tsi108_eth.h | 4 +-
+ drivers/net/ethernet/xircom/xirc2ps_cs.c | 3 +-
+ drivers/net/ethernet/xscale/ixp4xx_eth.c | 36 +-
+ drivers/net/fddi/defxx.c | 20 +-
+ drivers/net/hamradio/mkiss.c | 3 +-
+ drivers/net/hyperv/hyperv_net.h | 3 +-
+ drivers/net/hyperv/netvsc.c | 3 +-
+ drivers/net/hyperv/netvsc_drv.c | 3 +-
+ drivers/net/hyperv/rndis_filter.c | 3 +-
+ drivers/net/irda/au1k_ir.c | 3 +-
+ drivers/net/irda/esi-sir.c | 4 +-
+ drivers/net/irda/litelink-sir.c | 4 +-
+ drivers/net/irda/ma600-sir.c | 4 +-
+ drivers/net/irda/old_belkin-sir.c | 4 +-
+ drivers/net/irda/smsc-ircc2.c | 4 +-
+ drivers/net/irda/smsc-ircc2.h | 4 +-
+ drivers/net/irda/via-ircc.c | 3 +-
+ drivers/net/irda/via-ircc.h | 3 +-
+ drivers/net/irda/vlsi_ir.c | 4 +-
+ drivers/net/irda/vlsi_ir.h | 4 +-
+ drivers/net/macvlan.c | 8 +-
+ drivers/net/macvtap.c | 14 +-
+ drivers/net/ppp/ppp_mppe.c | 3 +-
+ drivers/net/tun.c | 19 +-
+ drivers/net/usb/asix.h | 3 +-
+ drivers/net/usb/asix_common.c | 3 +-
+ drivers/net/usb/asix_devices.c | 3 +-
+ drivers/net/usb/ax88172a.c | 3 +-
+ drivers/net/usb/ax88179_178a.c | 3 +-
+ drivers/net/usb/catc.c | 3 +-
+ drivers/net/usb/cdc_eem.c | 3 +-
+ drivers/net/usb/cdc_ether.c | 3 +-
+ drivers/net/usb/cdc_subset.c | 3 +-
+ drivers/net/usb/cx82310_eth.c | 3 +-
+ drivers/net/usb/gl620a.c | 3 +-
+ drivers/net/usb/int51x1.c | 3 +-
+ drivers/net/usb/kaweth.c | 3 +-
+ drivers/net/usb/lg-vl600.c | 3 +-
+ drivers/net/usb/mcs7830.c | 3 +-
+ drivers/net/usb/net1080.c | 3 +-
+ drivers/net/usb/plusb.c | 3 +-
+ drivers/net/usb/rndis_host.c | 3 +-
+ drivers/net/usb/sierra_net.c | 3 +-
+ drivers/net/usb/smsc75xx.c | 3 +-
+ drivers/net/usb/smsc75xx.h | 3 +-
+ drivers/net/usb/smsc95xx.c | 3 +-
+ drivers/net/usb/smsc95xx.h | 3 +-
+ drivers/net/usb/usbnet.c | 3 +-
+ drivers/net/usb/zaurus.c | 3 +-
+ drivers/net/virtio_net.c | 3 +-
+ drivers/net/wireless/ath/ath10k/mac.c | 4 +-
+ drivers/net/wireless/ath/ath6kl/cfg80211.c | 11 +-
+ drivers/net/wireless/ath/ath9k/Kconfig | 10 +-
+ drivers/net/wireless/ath/ath9k/Makefile | 8 +-
+ .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 31 +-
+ drivers/net/wireless/ath/ath9k/ar9003_calib.c | 114 +-
+ drivers/net/wireless/ath/ath9k/ar9003_hw.c | 122 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.c | 9 +-
+ drivers/net/wireless/ath/ath9k/ar9003_wow.c | 422 ++++++
+ drivers/net/wireless/ath/ath9k/ar9340_initvals.h | 390 ++---
+ .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 32 +-
+ .../net/wireless/ath/ath9k/ar9462_2p1_initvals.h | 1559 +-------------------
+ .../net/wireless/ath/ath9k/ar9565_1p1_initvals.h | 64 +
+ .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 559 ++++---
+ drivers/net/wireless/ath/ath9k/ath9k.h | 56 +-
+ drivers/net/wireless/ath/ath9k/debug.c | 115 +-
+ drivers/net/wireless/ath/ath9k/hw.c | 24 +-
+ drivers/net/wireless/ath/ath9k/hw.h | 5 +-
+ drivers/net/wireless/ath/ath9k/init.c | 26 +-
+ drivers/net/wireless/ath/ath9k/main.c | 541 +------
+ drivers/net/wireless/ath/ath9k/pci.c | 45 +
+ drivers/net/wireless/ath/ath9k/reg.h | 12 +-
+ drivers/net/wireless/ath/ath9k/tx99.c | 264 ++++
+ drivers/net/wireless/ath/ath9k/wow.c | 589 ++++----
+ drivers/net/wireless/ath/ath9k/xmit.c | 7 +
+ drivers/net/wireless/ath/regd.c | 378 ++---
+ drivers/net/wireless/ath/wcn36xx/hal.h | 2 +-
+ drivers/net/wireless/ath/wcn36xx/main.c | 3 +-
+ drivers/net/wireless/ath/wcn36xx/smd.c | 21 +-
+ drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 2 +-
+ drivers/net/wireless/brcm80211/Kconfig | 5 +-
+ drivers/net/wireless/brcm80211/brcmfmac/Makefile | 3 +-
+ drivers/net/wireless/brcm80211/brcmfmac/bcdc.c | 384 +++++
+ drivers/net/wireless/brcm80211/brcmfmac/bcdc.h | 24 +
+ drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 3 -
+ .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 51 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 482 +-----
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 15 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 392 -----
+ .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 22 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c | 36 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 2 +-
+ .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 194 +--
+ .../net/wireless/brcm80211/brcmfmac/dhd_proto.h | 42 -
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 462 +++---
+ drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 54 +
+ drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 7 +-
+ drivers/net/wireless/brcm80211/brcmfmac/fwil.h | 61 +
+ .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 304 ++++
+ drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 173 ++-
+ drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 2 +-
+ drivers/net/wireless/brcm80211/brcmfmac/proto.c | 62 +
+ drivers/net/wireless/brcm80211/brcmfmac/proto.h | 57 +
+ .../net/wireless/brcm80211/brcmfmac/tracepoint.h | 33 +-
+ drivers/net/wireless/brcm80211/brcmfmac/usb.c | 4 +-
+ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 29 +-
+ drivers/net/wireless/brcm80211/brcmsmac/channel.c | 38 +-
+ .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 66 +-
+ drivers/net/wireless/cw1200/cw1200_sdio.c | 4 +-
+ drivers/net/wireless/cw1200/scan.c | 15 +-
+ drivers/net/wireless/ipw2x00/ipw2100.c | 5 +-
+ drivers/net/wireless/ipw2x00/ipw2200.c | 8 +-
+ drivers/net/wireless/iwlegacy/3945-mac.c | 11 +-
+ drivers/net/wireless/iwlegacy/4965-mac.c | 8 +-
+ drivers/net/wireless/iwlegacy/common.c | 4 +-
+ drivers/net/wireless/iwlegacy/debug.c | 8 +-
+ drivers/net/wireless/iwlwifi/dvm/debugfs.c | 8 +-
+ drivers/net/wireless/iwlwifi/dvm/mac80211.c | 6 +-
+ drivers/net/wireless/iwlwifi/dvm/scan.c | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 4 +-
+ drivers/net/wireless/iwlwifi/mvm/mac80211.c | 6 +-
+ drivers/net/wireless/iwlwifi/mvm/scan.c | 4 +-
+ drivers/net/wireless/libertas/if_sdio.c | 6 +-
+ drivers/net/wireless/libertas/if_spi.c | 1 -
+ drivers/net/wireless/mac80211_hwsim.c | 101 +-
+ drivers/net/wireless/mwifiex/cfg80211.c | 25 +-
+ drivers/net/wireless/mwifiex/scan.c | 4 +-
+ drivers/net/wireless/mwifiex/sta_cmdresp.c | 35 +-
+ drivers/net/wireless/prism54/islpci_dev.c | 1 -
+ drivers/net/wireless/prism54/islpci_hotplug.c | 2 -
+ drivers/net/wireless/rt2x00/rt2800lib.c | 37 +-
+ drivers/net/wireless/rt2x00/rt2x00pci.c | 3 -
+ drivers/net/wireless/rtl818x/rtl8187/dev.c | 2 +-
+ drivers/net/wireless/rtlwifi/base.c | 3 +-
+ drivers/net/wireless/rtlwifi/core.c | 11 +
+ drivers/net/wireless/rtlwifi/pci.c | 2 -
+ drivers/net/wireless/rtlwifi/regd.c | 61 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/dm.c | 2 +-
+ drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 327 ++--
+ drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h | 14 +
+ drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 39 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/dm.c | 9 +
+ drivers/net/wireless/rtlwifi/rtl8192cu/dm.h | 3 +
+ drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 2 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | 6 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 29 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 16 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/table.c | 40 +-
+ drivers/net/wireless/rtlwifi/stats.c | 14 +
+ drivers/net/wireless/rtlwifi/usb.c | 8 +-
+ drivers/net/wireless/rtlwifi/wifi.h | 33 +-
+ drivers/net/wireless/ti/wl1251/acx.c | 209 +--
+ drivers/net/wireless/ti/wl12xx/scan.c | 2 +-
+ drivers/net/wireless/ti/wlcore/cmd.c | 2 +-
+ drivers/net/wireless/ti/wlcore/main.c | 3 +-
+ drivers/net/wireless/ti/wlcore/scan.c | 12 +-
+ drivers/net/xen-netback/xenbus.c | 3 +-
+ drivers/of/of_mdio.c | 135 +-
+ drivers/vhost/net.c | 9 +-
+ drivers/vhost/scsi.c | 7 +-
+ drivers/vhost/test.c | 8 +-
+ drivers/vhost/vhost.c | 4 +-
+ drivers/vhost/vhost.h | 2 +-
+ include/linux/etherdevice.h | 51 +-
+ include/linux/ieee80211.h | 8 +-
+ include/linux/netdevice.h | 53 +-
+ include/linux/phy.h | 23 +-
+ include/linux/sctp.h | 5 +-
+ include/net/addrconf.h | 4 +-
+ include/net/cfg80211.h | 76 +-
+ include/net/cipso_ipv4.h | 3 +-
+ include/net/dcbevent.h | 3 +-
+ include/net/dcbnl.h | 3 +-
+ include/net/if_inet6.h | 2 +-
+ include/net/irda/discovery.h | 4 +-
+ include/net/irda/ircomm_core.h | 4 +-
+ include/net/irda/ircomm_event.h | 4 +-
+ include/net/irda/ircomm_lmp.h | 4 +-
+ include/net/irda/ircomm_param.h | 4 +-
+ include/net/irda/ircomm_ttp.h | 4 +-
+ include/net/irda/ircomm_tty.h | 4 +-
+ include/net/irda/ircomm_tty_attach.h | 4 +-
+ include/net/irda/irda_device.h | 4 +-
+ include/net/irda/irlap_event.h | 4 +-
+ include/net/irda/irlap_frame.h | 4 +-
+ include/net/irda/parameters.h | 4 +-
+ include/net/irda/qos.h | 4 +-
+ include/net/mac80211.h | 40 +
+ include/net/mip6.h | 3 +-
+ include/net/netlabel.h | 3 +-
+ include/net/nfc/hci.h | 4 +-
+ include/net/nfc/llc.h | 4 +-
+ include/net/nfc/nci.h | 3 +-
+ include/net/nfc/nci_core.h | 3 +-
+ include/net/nfc/nfc.h | 4 +-
+ include/net/regulatory.h | 80 +-
+ include/net/sctp/auth.h | 5 +-
+ include/net/sctp/checksum.h | 5 +-
+ include/net/sctp/command.h | 5 +-
+ include/net/sctp/constants.h | 5 +-
+ include/net/sctp/sctp.h | 5 +-
+ include/net/sctp/sm.h | 5 +-
+ include/net/sctp/structs.h | 5 +-
+ include/net/sctp/tsnmap.h | 5 +-
+ include/net/sctp/ulpevent.h | 5 +-
+ include/net/sctp/ulpqueue.h | 5 +-
+ include/net/tc_act/tc_skbedit.h | 3 +-
+ include/net/tcp.h | 1 +
+ include/uapi/linux/if_addr.h | 5 +
+ include/uapi/linux/net_tstamp.h | 16 +-
+ include/uapi/linux/netfilter/xt_osf.h | 3 +-
+ include/uapi/linux/nl80211.h | 47 +-
+ include/uapi/linux/sctp.h | 5 +-
+ include/uapi/linux/snmp.h | 1 +
+ include/uapi/linux/sockios.h | 3 +-
+ net/bluetooth/bnep/bnep.h | 3 +-
+ net/bridge/netfilter/ebt_vlan.c | 3 +-
+ net/core/dev.c | 48 +-
+ net/core/dev_ioctl.c | 2 +
+ net/dcb/dcbevent.c | 3 +-
+ net/dcb/dcbnl.c | 3 +-
+ net/dns_resolver/dns_key.c | 3 +-
+ net/dns_resolver/dns_query.c | 3 +-
+ net/dns_resolver/internal.h | 3 +-
+ net/ipv4/cipso_ipv4.c | 3 +-
+ net/ipv4/netfilter/nf_nat_snmp_basic.c | 3 +-
+ net/ipv4/proc.c | 1 +
+ net/ipv4/sysctl_net_ipv4.c | 9 +
+ net/ipv4/tcp.c | 63 +-
+ net/ipv4/tcp_output.c | 36 +-
+ net/ipv6/addrconf.c | 201 +--
+ net/ipv6/ah6.c | 3 +-
+ net/ipv6/esp6.c | 3 +-
+ net/ipv6/ip6_output.c | 25 +-
+ net/ipv6/ipcomp6.c | 3 +-
+ net/ipv6/mip6.c | 3 +-
+ net/ipv6/tunnel6.c | 3 +-
+ net/ipv6/xfrm6_mode_ro.c | 3 +-
+ net/ipv6/xfrm6_tunnel.c | 3 +-
+ net/irda/af_irda.c | 4 +-
+ net/irda/discovery.c | 4 +-
+ net/irda/ircomm/ircomm_core.c | 4 +-
+ net/irda/ircomm/ircomm_event.c | 4 +-
+ net/irda/ircomm/ircomm_lmp.c | 4 +-
+ net/irda/ircomm/ircomm_param.c | 4 +-
+ net/irda/ircomm/ircomm_ttp.c | 4 +-
+ net/irda/ircomm/ircomm_tty.c | 4 +-
+ net/irda/ircomm/ircomm_tty_attach.c | 4 +-
+ net/irda/ircomm/ircomm_tty_ioctl.c | 4 +-
+ net/irda/irda_device.c | 4 +-
+ net/irda/irlap.c | 4 +-
+ net/irda/parameters.c | 4 +-
+ net/irda/qos.c | 4 +-
+ net/mac80211/cfg.c | 123 +-
+ net/mac80211/chan.c | 141 +-
+ net/mac80211/debugfs.c | 168 +++
+ net/mac80211/debugfs_sta.c | 134 ++
+ net/mac80211/ibss.c | 6 +-
+ net/mac80211/ieee80211_i.h | 43 +-
+ net/mac80211/iface.c | 14 +-
+ net/mac80211/key.c | 62 +-
+ net/mac80211/key.h | 13 +-
+ net/mac80211/main.c | 147 +-
+ net/mac80211/mesh.c | 7 +-
+ net/mac80211/mesh.h | 6 +-
+ net/mac80211/mesh_hwmp.c | 91 +-
+ net/mac80211/mesh_pathtbl.c | 7 +-
+ net/mac80211/mesh_plink.c | 708 ++++-----
+ net/mac80211/mesh_ps.c | 3 +-
+ net/mac80211/mesh_sync.c | 28 +-
+ net/mac80211/mlme.c | 43 +-
+ net/mac80211/rate.h | 4 +-
+ net/mac80211/rc80211_minstrel.c | 3 +-
+ net/mac80211/rc80211_minstrel_ht.c | 22 +-
+ net/mac80211/rc80211_minstrel_ht_debugfs.c | 3 +-
+ net/mac80211/rx.c | 88 +-
+ net/mac80211/scan.c | 10 +-
+ net/mac80211/sta_info.c | 40 +-
+ net/mac80211/sta_info.h | 38 +-
+ net/mac80211/status.c | 78 +
+ net/mac80211/trace.h | 21 +-
+ net/mac80211/tx.c | 41 +-
+ net/mac80211/util.c | 95 +-
+ net/mac80211/vht.c | 7 +-
+ net/mac80211/wpa.c | 116 ++
+ net/mac80211/wpa.h | 2 +
+ net/netfilter/ipvs/ip_vs_nfct.c | 3 +-
+ net/netfilter/xt_connmark.c | 3 +-
+ net/netfilter/xt_osf.c | 3 +-
+ net/netlabel/netlabel_addrlist.c | 3 +-
+ net/netlabel/netlabel_addrlist.h | 3 +-
+ net/netlabel/netlabel_cipso_v4.c | 3 +-
+ net/netlabel/netlabel_cipso_v4.h | 3 +-
+ net/netlabel/netlabel_domainhash.c | 3 +-
+ net/netlabel/netlabel_domainhash.h | 3 +-
+ net/netlabel/netlabel_kapi.c | 3 +-
+ net/netlabel/netlabel_mgmt.c | 3 +-
+ net/netlabel/netlabel_mgmt.h | 3 +-
+ net/netlabel/netlabel_unlabeled.c | 3 +-
+ net/netlabel/netlabel_unlabeled.h | 3 +-
+ net/netlabel/netlabel_user.c | 3 +-
+ net/netlabel/netlabel_user.h | 3 +-
+ net/packet/af_packet.c | 10 +-
+ net/sched/act_skbedit.c | 3 +-
+ net/sched/sch_multiq.c | 3 +-
+ net/sctp/associola.c | 70 +-
+ net/sctp/auth.c | 5 +-
+ net/sctp/bind_addr.c | 5 +-
+ net/sctp/chunk.c | 5 +-
+ net/sctp/command.c | 5 +-
+ net/sctp/debug.c | 5 +-
+ net/sctp/endpointola.c | 5 +-
+ net/sctp/input.c | 5 +-
+ net/sctp/inqueue.c | 5 +-
+ net/sctp/ipv6.c | 5 +-
+ net/sctp/objcnt.c | 5 +-
+ net/sctp/output.c | 5 +-
+ net/sctp/outqueue.c | 5 +-
+ net/sctp/primitive.c | 5 +-
+ net/sctp/proc.c | 5 +-
+ net/sctp/protocol.c | 5 +-
+ net/sctp/sm_make_chunk.c | 5 +-
+ net/sctp/sm_sideeffect.c | 5 +-
+ net/sctp/sm_statefuns.c | 5 +-
+ net/sctp/sm_statetable.c | 5 +-
+ net/sctp/socket.c | 5 +-
+ net/sctp/ssnmap.c | 5 +-
+ net/sctp/sysctl.c | 5 +-
+ net/sctp/transport.c | 5 +-
+ net/sctp/tsnmap.c | 5 +-
+ net/sctp/ulpevent.c | 5 +-
+ net/sctp/ulpqueue.c | 5 +-
+ net/socket.c | 57 +-
+ net/unix/af_unix.c | 9 +-
+ net/wireless/chan.c | 203 ++-
+ net/wireless/core.c | 6 +-
+ net/wireless/core.h | 18 +-
+ net/wireless/genregdb.awk | 45 +-
+ net/wireless/ibss.c | 4 +-
+ net/wireless/mesh.c | 3 +-
+ net/wireless/mlme.c | 20 +-
+ net/wireless/nl80211.c | 107 +-
+ net/wireless/nl80211.h | 2 +-
+ net/wireless/rdev-ops.h | 12 +-
+ net/wireless/reg.c | 802 ++++++----
+ net/wireless/reg.h | 3 +-
+ net/wireless/trace.h | 15 +-
+ 449 files changed, 8515 insertions(+), 7462 deletions(-)
+ create mode 100644 Documentation/networking/timestamping/hwtstamp_config.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_wow.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9565_1p1_initvals.h
+ create mode 100644 drivers/net/wireless/ath/ath9k/tx99.c
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcdc.c
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcdc.h
+ delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
+ delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/proto.c
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/proto.h
+Merging ipsec-next/master (0e0d44ab4275 net: Remove FLOWI_FLAG_CAN_SLEEP)
+$ git merge ipsec-next/master
+Auto-merging net/sctp/ipv6.c
+Auto-merging net/ipv6/ip6_output.c
+Auto-merging include/net/ipv6.h
+Merge made by the 'recursive' strategy.
+ include/net/flow.h | 3 +-
+ include/net/ipv6.h | 6 +-
+ include/net/netns/xfrm.h | 6 +-
+ include/net/route.h | 8 +--
+ include/net/xfrm.h | 13 ++--
+ net/dccp/ipv4.c | 2 +-
+ net/dccp/ipv6.c | 8 +--
+ net/decnet/dn_route.c | 2 -
+ net/ipv4/af_inet.c | 2 +-
+ net/ipv4/datagram.c | 2 +-
+ net/ipv4/raw.c | 2 +-
+ net/ipv4/tcp_ipv4.c | 2 +-
+ net/ipv4/udp.c | 2 +-
+ net/ipv6/af_inet6.c | 2 +-
+ net/ipv6/datagram.c | 2 +-
+ net/ipv6/inet6_connection_sock.c | 4 +-
+ net/ipv6/ip6_output.c | 12 +---
+ net/ipv6/ping.c | 2 +-
+ net/ipv6/raw.c | 2 +-
+ net/ipv6/syncookies.c | 2 +-
+ net/ipv6/tcp_ipv6.c | 4 +-
+ net/ipv6/udp.c | 2 +-
+ net/key/af_key.c | 23 +++---
+ net/l2tp/l2tp_ip6.c | 2 +-
+ net/sctp/ipv6.c | 4 +-
+ net/xfrm/xfrm_policy.c | 151 +++++++++++++++++++--------------------
+ net/xfrm/xfrm_state.c | 125 ++++++++++++++------------------
+ net/xfrm/xfrm_user.c | 27 +++++--
+ 28 files changed, 204 insertions(+), 218 deletions(-)
+Merging wireless-next/master (d6b5075d73ad ath9k: Apply tuning caps for AR9330 and AR9485)
+$ git merge wireless-next/master
+Merge made by the 'recursive' strategy.
+ drivers/bcma/host_pci.c | 2 +-
+ drivers/bluetooth/ath3k.c | 4 +
+ drivers/bluetooth/btmrvl_drv.h | 25 +-
+ drivers/bluetooth/btmrvl_main.c | 130 +---
+ drivers/bluetooth/btmrvl_sdio.c | 9 +-
+ drivers/bluetooth/btmrvl_sdio.h | 2 -
+ drivers/bluetooth/btusb.c | 7 +-
+ drivers/net/wireless/ath/ath10k/ce.c | 53 +-
+ drivers/net/wireless/ath/ath10k/ce.h | 2 +-
+ drivers/net/wireless/ath/ath10k/core.c | 43 +-
+ drivers/net/wireless/ath/ath10k/core.h | 23 +-
+ drivers/net/wireless/ath/ath10k/debug.c | 94 +++
+ drivers/net/wireless/ath/ath10k/debug.h | 6 +
+ drivers/net/wireless/ath/ath10k/htc.c | 31 +-
+ drivers/net/wireless/ath/ath10k/htt.c | 4 +-
+ drivers/net/wireless/ath/ath10k/htt.h | 1 +
+ drivers/net/wireless/ath/ath10k/htt_rx.c | 25 +-
+ drivers/net/wireless/ath/ath10k/htt_tx.c | 11 +-
+ drivers/net/wireless/ath/ath10k/hw.h | 1 +
+ drivers/net/wireless/ath/ath10k/mac.c | 316 +++++++-
+ drivers/net/wireless/ath/ath10k/pci.c | 791 ++++++++++++++-------
+ drivers/net/wireless/ath/ath10k/pci.h | 14 +-
+ drivers/net/wireless/ath/ath10k/txrx.c | 6 +-
+ drivers/net/wireless/ath/ath10k/wmi.c | 302 +++++++-
+ drivers/net/wireless/ath/ath10k/wmi.h | 96 ++-
+ .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 191 ++---
+ .../wireless/ath/ath9k/ar9003_buffalo_initvals.h | 126 ++++
+ drivers/net/wireless/ath/ath9k/ar9003_calib.c | 29 +-
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 4 +-
+ drivers/net/wireless/ath/ath9k/ar9003_hw.c | 18 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.c | 6 +
+ drivers/net/wireless/ath/ath9k/ar9003_phy.h | 5 +-
+ .../net/wireless/ath/ath9k/ar9330_1p1_initvals.h | 128 +---
+ .../net/wireless/ath/ath9k/ar9330_1p2_initvals.h | 401 +++++++++--
+ drivers/net/wireless/ath/ath9k/ar9340_initvals.h | 2 +
+ .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 697 +++---------------
+ drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 117 +--
+ .../net/wireless/ath/ath9k/ar955x_1p0_initvals.h | 540 +-------------
+ .../net/wireless/ath/ath9k/ar9565_1p0_initvals.h | 85 +--
+ .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 13 +-
+ drivers/net/wireless/ath/ath9k/hw.c | 6 +-
+ drivers/net/wireless/ath/ath9k/hw.h | 2 +
+ drivers/net/wireless/ath/ath9k/init.c | 39 +-
+ drivers/net/wireless/ath/ath9k/reg.h | 3 -
+ drivers/net/wireless/ath/wcn36xx/smd.c | 12 +-
+ drivers/net/wireless/mwifiex/11n_aggr.c | 6 +-
+ drivers/net/wireless/mwifiex/cfg80211.c | 1 +
+ drivers/net/wireless/mwifiex/cmdevt.c | 4 +-
+ drivers/net/wireless/mwifiex/decl.h | 1 +
+ drivers/net/wireless/mwifiex/fw.h | 30 +-
+ drivers/net/wireless/mwifiex/init.c | 3 +-
+ drivers/net/wireless/mwifiex/main.c | 9 +-
+ drivers/net/wireless/mwifiex/main.h | 2 +-
+ drivers/net/wireless/mwifiex/sta_cmd.c | 2 +-
+ drivers/net/wireless/mwifiex/sta_rx.c | 44 +-
+ drivers/net/wireless/mwifiex/sta_tx.c | 1 +
+ drivers/net/wireless/mwifiex/txrx.c | 15 +-
+ drivers/net/wireless/mwifiex/uap_txrx.c | 39 +-
+ drivers/net/wireless/mwifiex/usb.c | 4 +-
+ drivers/net/wireless/mwifiex/util.c | 5 +-
+ drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 2 +-
+ include/linux/ath9k_platform.h | 2 +
+ net/bluetooth/hci_core.c | 20 +-
+ net/bluetooth/hci_event.c | 72 +-
+ net/bluetooth/mgmt.c | 17 +-
+ net/bluetooth/smp.c | 40 +-
+ 66 files changed, 2413 insertions(+), 2328 deletions(-)
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_buffalo_initvals.h
+Merging bluetooth/master (53b834d2333a Bluetooth: Use macros for connectionless slave broadcast features)
+$ git merge bluetooth/master
+Merge made by the 'recursive' strategy.
+ include/net/bluetooth/bluetooth.h | 3 +
+ include/net/bluetooth/hci.h | 6 +
+ include/net/bluetooth/hci_core.h | 6 +
+ include/net/bluetooth/l2cap.h | 45 +++
+ net/bluetooth/af_bluetooth.c | 2 +-
+ net/bluetooth/hci_core.c | 6 +-
+ net/bluetooth/l2cap_core.c | 718 +++++++++++++++++++++++++++++++++++---
+ net/bluetooth/l2cap_sock.c | 181 +++++++++-
+ net/bluetooth/smp.c | 16 +-
+ net/bluetooth/smp.h | 1 +
+ 10 files changed, 911 insertions(+), 73 deletions(-)
+Merging infiniband/for-next (b4fdf52b3fc8 Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', 'qib' and 'srp' into for-next)
+$ git merge infiniband/for-next
+Already up-to-date.
+Merging mtd/master (6ce4eac1f600 Linux 3.13-rc1)
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master (924a213383a9 mtd: sh_flctl: use devm_* managed allocators)
+$ git merge l2-mtd/master
+Auto-merging drivers/mtd/nand/mpc5121_nfc.c
+Auto-merging drivers/mtd/maps/pxa2xx-flash.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mtd/gpmi-nand.txt | 8 +
+ .../devicetree/bindings/mtd/pxa3xx-nand.txt | 6 +-
+ Documentation/mtd/nand/pxa3xx-nand.txt | 113 ++++
+ drivers/mtd/afs.c | 3 +-
+ drivers/mtd/ar7part.c | 3 +-
+ drivers/mtd/bcm47xxpart.c | 3 +-
+ drivers/mtd/bcm63xxpart.c | 3 +-
+ drivers/mtd/cmdlinepart.c | 3 +-
+ drivers/mtd/devices/m25p80.c | 211 ++++++-
+ drivers/mtd/devices/ms02-nv.c | 2 +-
+ drivers/mtd/devices/mtd_dataflash.c | 5 +-
+ drivers/mtd/maps/pxa2xx-flash.c | 2 +-
+ drivers/mtd/maps/sun_uflash.c | 2 +-
+ drivers/mtd/mtdcore.c | 10 +-
+ drivers/mtd/mtdpart.c | 9 +-
+ drivers/mtd/nand/Kconfig | 8 +-
+ drivers/mtd/nand/diskonchip.c | 10 +-
+ drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 127 ++--
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 165 ++---
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 2 -
+ drivers/mtd/nand/mpc5121_nfc.c | 6 -
+ drivers/mtd/nand/mxc_nand.c | 5 +-
+ drivers/mtd/nand/nand_base.c | 26 +-
+ drivers/mtd/nand/pasemi_nand.c | 2 +-
+ drivers/mtd/nand/pxa3xx_nand.c | 688 ++++++++++++++++-----
+ drivers/mtd/nand/sh_flctl.c | 40 +-
+ drivers/mtd/ofpart.c | 19 +-
+ drivers/mtd/redboot.c | 3 +-
+ drivers/mtd/tests/mtd_nandecctest.c | 2 +-
+ fs/jffs2/malloc.c | 4 +
+ include/linux/mtd/nand.h | 2 +-
+ include/linux/mtd/partitions.h | 8 +-
+ include/linux/of_mtd.h | 2 +-
+ include/linux/platform_data/mtd-nand-pxa3xx.h | 3 +
+ 34 files changed, 1062 insertions(+), 443 deletions(-)
+ create mode 100644 Documentation/mtd/nand/pxa3xx-nand.txt
+Merging crypto/master (e37b94ebffdd crypto: memneq - fix for archs without efficient unaligned access)
+$ git merge crypto/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 7 +
+ crypto/Makefile | 5 -
+ crypto/memneq.c | 80 +-
+ crypto/pcrypt.c | 2 +-
+ drivers/crypto/Kconfig | 12 +
+ drivers/crypto/Makefile | 1 +
+ drivers/crypto/ccp/Kconfig | 23 +
+ drivers/crypto/ccp/Makefile | 10 +
+ drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 355 ++++++
+ drivers/crypto/ccp/ccp-crypto-aes-xts.c | 285 +++++
+ drivers/crypto/ccp/ccp-crypto-aes.c | 375 ++++++
+ drivers/crypto/ccp/ccp-crypto-main.c | 432 +++++++
+ drivers/crypto/ccp/ccp-crypto-sha.c | 497 ++++++++
+ drivers/crypto/ccp/ccp-crypto.h | 191 +++
+ drivers/crypto/ccp/ccp-dev.c | 582 +++++++++
+ drivers/crypto/ccp/ccp-dev.h | 272 ++++
+ drivers/crypto/ccp/ccp-ops.c | 2020 ++++++++++++++++++++++++++++++
+ drivers/crypto/ccp/ccp-pci.c | 360 ++++++
+ drivers/crypto/omap-aes.c | 16 +-
+ drivers/crypto/omap-sham.c | 7 +-
+ drivers/crypto/talitos.c | 21 +-
+ include/linux/ccp.h | 525 ++++++++
+ include/linux/compiler-gcc.h | 3 +
+ include/linux/compiler-intel.h | 7 +
+ include/linux/compiler.h | 4 +
+ kernel/padata.c | 2 +-
+ 26 files changed, 6052 insertions(+), 42 deletions(-)
+ create mode 100644 drivers/crypto/ccp/Kconfig
+ create mode 100644 drivers/crypto/ccp/Makefile
+ create mode 100644 drivers/crypto/ccp/ccp-crypto-aes-cmac.c
+ create mode 100644 drivers/crypto/ccp/ccp-crypto-aes-xts.c
+ create mode 100644 drivers/crypto/ccp/ccp-crypto-aes.c
+ create mode 100644 drivers/crypto/ccp/ccp-crypto-main.c
+ create mode 100644 drivers/crypto/ccp/ccp-crypto-sha.c
+ create mode 100644 drivers/crypto/ccp/ccp-crypto.h
+ create mode 100644 drivers/crypto/ccp/ccp-dev.c
+ create mode 100644 drivers/crypto/ccp/ccp-dev.h
+ create mode 100644 drivers/crypto/ccp/ccp-ops.c
+ create mode 100644 drivers/crypto/ccp/ccp-pci.c
+ create mode 100644 include/linux/ccp.h
+Merging drm/drm-next (a3483353ca4e drm: check for !kdev in drm_unplug_minor())
+$ git merge drm/drm-next
+Already up-to-date.
+Merging drm-intel/for-linux-next (c461562e84d1 drm/i915: Remove duplicate intel_uncore_forcewake_reset.)
+$ git merge drm-intel/for-linux-next
+Recorded preimage for 'drivers/gpu/drm/i915/intel_display.c'
+Auto-merging drivers/gpu/drm/i915/intel_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_drv.h
+Auto-merging drivers/gpu/drm/i915/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/intel_ddi.c
+Auto-merging drivers/gpu/drm/i915/i915_reg.h
+Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_context.c
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/i915/i915_drv.c
+Auto-merging drivers/gpu/drm/i915/i915_dma.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/gpu/drm/i915/intel_display.c'.
+[master 3655530128cd] Merge remote-tracking branch 'drm-intel/for-linux-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/char/Makefile | 2 +-
+ drivers/char/agp/Kconfig | 5 +
+ drivers/char/agp/Makefile | 2 +-
+ drivers/char/agp/intel-agp.c | 5 -
+ drivers/char/agp/intel-gtt.c | 18 +
+ drivers/gpu/drm/i915/Kconfig | 32 +-
+ drivers/gpu/drm/i915/dvo_ns2501.c | 73 +--
+ drivers/gpu/drm/i915/i915_debugfs.c | 163 ++++--
+ drivers/gpu/drm/i915/i915_dma.c | 32 +-
+ drivers/gpu/drm/i915/i915_drv.c | 42 +-
+ drivers/gpu/drm/i915/i915_drv.h | 143 +++--
+ drivers/gpu/drm/i915/i915_gem.c | 16 +-
+ drivers/gpu/drm/i915/i915_gem_context.c | 45 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 49 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 26 +-
+ drivers/gpu/drm/i915/i915_irq.c | 31 +-
+ drivers/gpu/drm/i915/i915_reg.h | 221 ++++----
+ drivers/gpu/drm/i915/i915_suspend.c | 45 --
+ drivers/gpu/drm/i915/i915_sysfs.c | 35 +-
+ drivers/gpu/drm/i915/i915_ums.c | 27 +
+ drivers/gpu/drm/i915/intel_bios.h | 48 +-
+ drivers/gpu/drm/i915/intel_crt.c | 5 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 39 +-
+ drivers/gpu/drm/i915/intel_display.c | 334 ++++++++---
+ drivers/gpu/drm/i915/intel_dp.c | 58 +-
+ drivers/gpu/drm/i915/intel_drv.h | 25 +-
+ drivers/gpu/drm/i915/intel_dsi.c | 5 +-
+ drivers/gpu/drm/i915/intel_dvo.c | 5 +-
+ drivers/gpu/drm/i915/intel_fbdev.c | 63 ++-
+ drivers/gpu/drm/i915/intel_hdmi.c | 67 +--
+ drivers/gpu/drm/i915/intel_i2c.c | 15 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 21 +-
+ drivers/gpu/drm/i915/intel_opregion.c | 51 +-
+ drivers/gpu/drm/i915/intel_panel.c | 882 +++++++++++++++++++----------
+ drivers/gpu/drm/i915/intel_pm.c | 418 ++++++++------
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 22 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 60 +-
+ drivers/gpu/drm/i915/intel_sdvo_regs.h | 40 +-
+ drivers/gpu/drm/i915/intel_sideband.c | 29 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 18 +
+ drivers/gpu/drm/i915/intel_uncore.c | 298 +++++++---
+ include/uapi/drm/i915_drm.h | 19 +
+ 42 files changed, 2238 insertions(+), 1296 deletions(-)
+Merging drm-tegra/drm/for-next (977386a04bae drm/tegra: Reserve syncpoint base for gr3d)
+$ git merge drm-tegra/drm/for-next
+Already up-to-date.
+Merging sound/for-next (e8648e5e33e4 ALSA: hda - Ignore small negative LPIB delay correction)
+$ git merge sound/for-next
+Auto-merging sound/pci/hda/patch_realtek.c
+Auto-merging sound/pci/hda/patch_hdmi.c
+Removing sound/pci/cs46xx/imgs/cwcsnoop.h
+Removing sound/pci/cs46xx/imgs/cwcdma.h
+Removing sound/pci/cs46xx/imgs/cwcdma.asp
+Removing sound/pci/cs46xx/imgs/cwcbinhack.h
+Removing sound/pci/cs46xx/imgs/cwcasync.h
+Removing sound/pci/cs46xx/imgs/cwc4630.h
+Removing sound/pci/cs46xx/cs46xx_image.h
+Merge made by the 'recursive' strategy.
+ sound/arm/aaci.c | 23 +-
+ sound/pci/Kconfig | 1 +
+ sound/pci/cs46xx/cs46xx.h | 5 +
+ sound/pci/cs46xx/cs46xx_image.h | 3468 ------------------------------------
+ sound/pci/cs46xx/cs46xx_lib.c | 265 ++-
+ sound/pci/cs46xx/imgs/cwc4630.h | 320 ----
+ sound/pci/cs46xx/imgs/cwcasync.h | 176 --
+ sound/pci/cs46xx/imgs/cwcbinhack.h | 48 -
+ sound/pci/cs46xx/imgs/cwcdma.asp | 170 --
+ sound/pci/cs46xx/imgs/cwcdma.h | 68 -
+ sound/pci/cs46xx/imgs/cwcsnoop.h | 46 -
+ sound/pci/hda/Makefile | 5 +-
+ sound/pci/hda/hda_codec.c | 185 +-
+ sound/pci/hda/hda_codec.h | 6 +-
+ sound/pci/hda/hda_generic.c | 25 +-
+ sound/pci/hda/hda_intel.c | 49 +-
+ sound/pci/hda/hda_local.h | 8 +-
+ sound/pci/hda/patch_hdmi.c | 28 +-
+ sound/pci/hda/patch_realtek.c | 63 +-
+ 19 files changed, 504 insertions(+), 4455 deletions(-)
+ delete mode 100644 sound/pci/cs46xx/cs46xx_image.h
+ delete mode 100644 sound/pci/cs46xx/imgs/cwc4630.h
+ delete mode 100644 sound/pci/cs46xx/imgs/cwcasync.h
+ delete mode 100644 sound/pci/cs46xx/imgs/cwcbinhack.h
+ delete mode 100644 sound/pci/cs46xx/imgs/cwcdma.asp
+ delete mode 100644 sound/pci/cs46xx/imgs/cwcdma.h
+ delete mode 100644 sound/pci/cs46xx/imgs/cwcsnoop.h
+Merging sound-asoc/for-next (620eb36b980b Merge remote-tracking branches 'asoc/topic/ad193x', 'asoc/topic/adav80x', 'asoc/topic/adsp', 'asoc/topic/ak4641', 'asoc/topic/ak4642', 'asoc/topic/arizona', 'asoc/topic/axi', 'asoc/topic/bcm2835', 'asoc/topic/cs4271', 'asoc/topic/cs42l52', 'asoc/topic/da7210', 'asoc/topic/ep93xx', 'asoc/topic/fsl', 'asoc/topic/hdmi', 'asoc/topic/jack', 'asoc/topic/jz4740', 'asoc/topic/max98090', 'asoc/topic/mxs', 'asoc/topic/omap', 'asoc/topic/rcar', 'asoc/topic/samsung', 'asoc/topic/spear', 'asoc/topic/ssm2602', 'asoc/topic/tegra', 'asoc/topic/tlv320aic3x', 'asoc/topic/uda1380', 'asoc/topic/wm8510', 'asoc/topic/wm8523', 'asoc/topic/wm8580', 'asoc/topic/wm8711', 'asoc/topic/wm8728', 'asoc/topic/wm8731', 'asoc/topic/wm8741', 'asoc/topic/wm8750', 'asoc/topic/wm8753', 'asoc/topic/wm8776', 'asoc/topic/wm8804', 'asoc/topic/wm8900', 'asoc/topic/wm8901', 'asoc/topic/wm8940', 'asoc/topic/wm8962', 'asoc/topic/wm8974', 'asoc/topic/wm8985', 'asoc/topic/wm8988', 'asoc/topic/wm8990', 'asoc/topic/wm8991', 'asoc/topic/wm8994', 'asoc/topic/wm8995', 'asoc/topic/wm9081' and 'asoc/topic/x86' into asoc-next)
+$ git merge sound-asoc/for-next
+Resolved 'sound/soc/fsl/fsl_ssi.c' using previous resolution.
+Removing sound/soc/jz4740/jz4740-pcm.h
+Removing sound/soc/jz4740/jz4740-pcm.c
+Auto-merging sound/soc/fsl/fsl_ssi.c
+CONFLICT (content): Merge conflict in sound/soc/fsl/fsl_ssi.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master ffa174ee6214] Merge remote-tracking branch 'sound-asoc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/sound/adi,axi-i2s.txt | 31 +
+ .../devicetree/bindings/sound/adi,axi-spdif-tx.txt | 30 +
+ .../devicetree/bindings/sound/bcm2835-i2s.txt | 25 +
+ .../devicetree/bindings/sound/cs42l52.txt | 46 ++
+ .../devicetree/bindings/sound/eukrea-tlv320.txt | 21 +
+ .../devicetree/bindings/sound/max98090.txt | 43 +
+ .../bindings/sound/nvidia,tegra-audio-max98090.txt | 51 ++
+ .../devicetree/bindings/sound/simple-card.txt | 68 ++
+ drivers/mfd/wm5110-tables.c | 137 +++-
+ include/linux/mfd/arizona/registers.h | 158 ++++
+ include/sound/cs42l52.h | 14 +-
+ include/sound/dmaengine_pcm.h | 10 +
+ include/sound/rcar_snd.h | 2 +-
+ include/sound/soc-dai.h | 6 +
+ include/sound/soc.h | 17 +-
+ sound/soc/Kconfig | 4 +-
+ sound/soc/Makefile | 4 +-
+ sound/soc/adi/Kconfig | 21 +
+ sound/soc/adi/Makefile | 5 +
+ sound/soc/adi/axi-i2s.c | 277 +++++++
+ sound/soc/adi/axi-spdif.c | 272 +++++++
+ sound/soc/atmel/atmel_ssc_dai.c | 30 +-
+ sound/soc/atmel/sam9x5_wm8731.c | 2 +-
+ sound/soc/bcm/Kconfig | 10 +
+ sound/soc/bcm/Makefile | 5 +
+ sound/soc/bcm/bcm2835-i2s.c | 879 +++++++++++++++++++++
+ sound/soc/cirrus/ep93xx-pcm.c | 9 +-
+ sound/soc/codecs/Kconfig | 2 +
+ sound/soc/codecs/ad193x.c | 6 +-
+ sound/soc/codecs/adav80x.c | 6 +-
+ sound/soc/codecs/ak4641.c | 38 +-
+ sound/soc/codecs/ak4642.c | 138 ++--
+ sound/soc/codecs/arizona.c | 18 +
+ sound/soc/codecs/arizona.h | 3 +-
+ sound/soc/codecs/cs4271.c | 8 +-
+ sound/soc/codecs/cs42l52.c | 105 ++-
+ sound/soc/codecs/da7210.c | 6 +-
+ sound/soc/codecs/hdmi.c | 2 +-
+ sound/soc/codecs/ssm2602.c | 56 +-
+ sound/soc/codecs/tlv320aic3x.c | 126 ++-
+ sound/soc/codecs/uda1380.c | 6 +-
+ sound/soc/codecs/wm5110.c | 364 ++++++++-
+ sound/soc/codecs/wm8510.c | 6 +-
+ sound/soc/codecs/wm8523.c | 6 +-
+ sound/soc/codecs/wm8580.c | 6 +-
+ sound/soc/codecs/wm8711.c | 6 +-
+ sound/soc/codecs/wm8728.c | 6 +-
+ sound/soc/codecs/wm8731.c | 6 +-
+ sound/soc/codecs/wm8741.c | 6 +-
+ sound/soc/codecs/wm8750.c | 6 +-
+ sound/soc/codecs/wm8753.c | 6 +-
+ sound/soc/codecs/wm8776.c | 6 +-
+ sound/soc/codecs/wm8804.c | 6 +-
+ sound/soc/codecs/wm8900.c | 6 +-
+ sound/soc/codecs/wm8940.c | 221 +++---
+ sound/soc/codecs/wm8962.c | 17 +-
+ sound/soc/codecs/wm8974.c | 54 +-
+ sound/soc/codecs/wm8985.c | 6 +-
+ sound/soc/codecs/wm8988.c | 6 +-
+ sound/soc/codecs/wm8990.c | 258 +++---
+ sound/soc/codecs/wm8990.h | 9 -
+ sound/soc/codecs/wm8991.c | 293 +++----
+ sound/soc/codecs/wm8991.h | 9 -
+ sound/soc/codecs/wm8994.c | 11 +-
+ sound/soc/codecs/wm8995.c | 6 +-
+ sound/soc/codecs/wm9081.c | 2 +-
+ sound/soc/codecs/wm_adsp.c | 19 +-
+ sound/soc/fsl/Kconfig | 5 +-
+ sound/soc/fsl/eukrea-tlv320.c | 108 ++-
+ sound/soc/fsl/fsl_spdif.c | 8 -
+ sound/soc/fsl/fsl_ssi.c | 159 ++--
+ sound/soc/fsl/imx-pcm-dma.c | 9 +-
+ sound/soc/fsl/imx-pcm.h | 5 -
+ sound/soc/fsl/imx-spdif.c | 1 -
+ sound/soc/fsl/imx-ssi.c | 12 +-
+ sound/soc/fsl/imx-ssi.h | 1 -
+ sound/soc/fsl/imx-wm8962.c | 2 -
+ sound/soc/generic/simple-card.c | 156 +++-
+ sound/soc/{mid-x86 => intel}/Kconfig | 0
+ sound/soc/{mid-x86 => intel}/Makefile | 0
+ sound/soc/{mid-x86 => intel}/mfld_machine.c | 0
+ sound/soc/{mid-x86 => intel}/sst_dsp.h | 0
+ sound/soc/{mid-x86 => intel}/sst_platform.c | 0
+ sound/soc/{mid-x86 => intel}/sst_platform.h | 0
+ sound/soc/jz4740/Kconfig | 1 +
+ sound/soc/jz4740/jz4740-i2s.c | 135 +---
+ sound/soc/jz4740/jz4740-pcm.c | 358 ---------
+ sound/soc/jz4740/jz4740-pcm.h | 20 -
+ sound/soc/jz4740/qi_lb60.c | 2 +-
+ sound/soc/mxs/mxs-pcm.c | 8 +-
+ sound/soc/mxs/mxs-pcm.h | 1 -
+ sound/soc/mxs/mxs-saif.c | 8 -
+ sound/soc/omap/mcbsp.c | 12 +-
+ sound/soc/omap/omap-dmic.c | 4 +-
+ sound/soc/omap/omap-mcpdm.c | 4 +-
+ sound/soc/sh/rcar/gen.c | 248 +++---
+ sound/soc/sh/rcar/rsnd.h | 16 +-
+ sound/soc/sh/rcar/ssi.c | 6 +-
+ sound/soc/soc-devres.c | 41 +
+ sound/soc/soc-generic-dmaengine-pcm.c | 78 +-
+ sound/soc/soc-io.c | 4 +-
+ sound/soc/soc-pcm.c | 161 +++-
+ sound/soc/spear/spear_pcm.c | 9 +-
+ sound/soc/tegra/Kconfig | 10 +
+ sound/soc/tegra/Makefile | 2 +
+ sound/soc/tegra/tegra20_i2s.c | 6 +-
+ sound/soc/tegra/tegra20_spdif.c | 10 +-
+ sound/soc/tegra/tegra30_i2s.c | 6 +-
+ sound/soc/tegra/tegra_max98090.c | 275 +++++++
+ 109 files changed, 4349 insertions(+), 1586 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/adi,axi-i2s.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/adi,axi-spdif-tx.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/bcm2835-i2s.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/cs42l52.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/eukrea-tlv320.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/max98090.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/simple-card.txt
+ create mode 100644 sound/soc/adi/Kconfig
+ create mode 100644 sound/soc/adi/Makefile
+ create mode 100644 sound/soc/adi/axi-i2s.c
+ create mode 100644 sound/soc/adi/axi-spdif.c
+ create mode 100644 sound/soc/bcm/Kconfig
+ create mode 100644 sound/soc/bcm/Makefile
+ create mode 100644 sound/soc/bcm/bcm2835-i2s.c
+ rename sound/soc/{mid-x86 => intel}/Kconfig (100%)
+ rename sound/soc/{mid-x86 => intel}/Makefile (100%)
+ rename sound/soc/{mid-x86 => intel}/mfld_machine.c (100%)
+ rename sound/soc/{mid-x86 => intel}/sst_dsp.h (100%)
+ rename sound/soc/{mid-x86 => intel}/sst_platform.c (100%)
+ rename sound/soc/{mid-x86 => intel}/sst_platform.h (100%)
+ delete mode 100644 sound/soc/jz4740/jz4740-pcm.c
+ delete mode 100644 sound/soc/jz4740/jz4740-pcm.h
+ create mode 100644 sound/soc/tegra/tegra_max98090.c
+Merging modules/modules-next (74e22fac8858 module.h: Remove unnecessary semicolon)
+$ git merge modules/modules-next
+Merge made by the 'recursive' strategy.
+ Documentation/module-signing.txt | 240 +++++++++++++++++++++++++++++++++++++++
+ include/linux/module.h | 2 +-
+ kernel/params.c | 25 ++--
+ 3 files changed, 250 insertions(+), 17 deletions(-)
+ create mode 100644 Documentation/module-signing.txt
+Merging virtio/virtio-next (7d2dddda5c92 virtio: pci: remove unnecessary pci_set_drvdata())
+$ git merge virtio/virtio-next
+Merge made by the 'recursive' strategy.
+ drivers/virtio/virtio_pci.c | 2 --
+ 1 file changed, 2 deletions(-)
+Merging input/next (c838cb3d477f Input: use dev_get_platdata())
+$ git merge input/next
+Auto-merging drivers/input/touchscreen/cyttsp_core.c
+Auto-merging drivers/input/tablet/wacom_wac.c
+Auto-merging drivers/input/tablet/wacom_sys.c
+Auto-merging drivers/input/keyboard/bf54x-keys.c
+Auto-merging drivers/input/keyboard/adp5589-keys.c
+Auto-merging drivers/input/keyboard/adp5588-keys.c
+Auto-merging arch/sh/boards/mach-ecovec24/setup.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/input/gpio-beeper.txt | 13 ++
+ .../bindings/input/touchscreen/tsc2007.txt | 41 ++++
+ .../bindings/input/twl4030-pwrbutton.txt | 21 ++
+ arch/arm/mach-imx/mach-cpuimx35.c | 2 +-
+ arch/arm/mach-imx/mach-cpuimx51sd.c | 2 +-
+ arch/sh/boards/mach-ecovec24/setup.c | 2 +-
+ drivers/input/keyboard/Kconfig | 2 +-
+ drivers/input/keyboard/adp5520-keys.c | 2 +-
+ drivers/input/keyboard/adp5588-keys.c | 10 +-
+ drivers/input/keyboard/adp5589-keys.c | 8 +-
+ drivers/input/keyboard/bf54x-keys.c | 4 +-
+ drivers/input/keyboard/davinci_keyscan.c | 2 +-
+ drivers/input/keyboard/ep93xx_keypad.c | 2 +-
+ drivers/input/keyboard/imx_keypad.c | 3 +-
+ drivers/input/keyboard/lm8323.c | 2 +-
+ drivers/input/keyboard/lm8333.c | 3 +-
+ drivers/input/keyboard/max7359_keypad.c | 3 +-
+ drivers/input/keyboard/mcs_touchkey.c | 2 +-
+ drivers/input/keyboard/mpr121_touchkey.c | 3 +-
+ drivers/input/keyboard/nomadik-ske-keypad.c | 3 +-
+ drivers/input/keyboard/omap-keypad.c | 2 +-
+ drivers/input/keyboard/pxa930_rotary.c | 3 +-
+ drivers/input/keyboard/samsung-keypad.c | 2 +-
+ drivers/input/keyboard/sh_keysc.c | 4 +-
+ drivers/input/keyboard/tca6416-keypad.c | 2 +-
+ drivers/input/keyboard/tnetv107x-keypad.c | 2 +-
+ drivers/input/keyboard/twl4030_keypad.c | 2 +-
+ drivers/input/keyboard/w90p910_keypad.c | 2 +-
+ drivers/input/misc/Kconfig | 9 +
+ drivers/input/misc/Makefile | 1 +
+ drivers/input/misc/ad714x.c | 4 +-
+ drivers/input/misc/adxl34x.c | 2 +-
+ drivers/input/misc/bfin_rotary.c | 2 +-
+ drivers/input/misc/bma150.c | 3 +-
+ drivers/input/misc/cma3000_d0x.c | 2 +-
+ drivers/input/misc/gp2ap002a00f.c | 2 +-
+ drivers/input/misc/gpio-beeper.c | 127 ++++++++++++
+ drivers/input/misc/gpio_tilt_polled.c | 3 +-
+ drivers/input/misc/kxtj9.c | 3 +-
+ drivers/input/misc/pwm-beeper.c | 2 +-
+ drivers/input/misc/twl4030-pwrbutton.c | 46 ++---
+ drivers/input/misc/twl4030-vibra.c | 2 +-
+ drivers/input/mouse/gpio_mouse.c | 2 +-
+ drivers/input/mouse/pxa930_trkball.c | 2 +-
+ drivers/input/serio/pcips2.c | 1 -
+ drivers/input/tablet/wacom_sys.c | 13 +-
+ drivers/input/tablet/wacom_wac.c | 65 ++++--
+ drivers/input/tablet/wacom_wac.h | 2 +
+ drivers/input/touchscreen/88pm860x-ts.c | 2 +-
+ drivers/input/touchscreen/ad7877.c | 2 +-
+ drivers/input/touchscreen/ad7879.c | 4 +-
+ drivers/input/touchscreen/ads7846.c | 4 +-
+ drivers/input/touchscreen/atmel_mxt_ts.c | 2 +-
+ drivers/input/touchscreen/atmel_tsadcc.c | 2 +-
+ drivers/input/touchscreen/cy8ctmg110_ts.c | 2 +-
+ drivers/input/touchscreen/cyttsp_core.c | 4 +-
+ drivers/input/touchscreen/da9034-ts.c | 2 +-
+ drivers/input/touchscreen/edt-ft5x06.c | 2 +-
+ drivers/input/touchscreen/eeti_ts.c | 2 +-
+ drivers/input/touchscreen/ili210x.c | 2 +-
+ drivers/input/touchscreen/mcs5000_ts.c | 4 +-
+ drivers/input/touchscreen/pixcir_i2c_ts.c | 3 +-
+ drivers/input/touchscreen/s3c2410_ts.c | 4 +-
+ drivers/input/touchscreen/st1232.c | 2 +-
+ drivers/input/touchscreen/tsc2005.c | 2 +-
+ drivers/input/touchscreen/tsc2007.c | 230 ++++++++++++++-------
+ drivers/input/touchscreen/ucb1400_ts.c | 8 +-
+ drivers/input/touchscreen/wm97xx-core.c | 2 +-
+ include/linux/i2c/tsc2007.h | 8 +-
+ 69 files changed, 537 insertions(+), 198 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/gpio-beeper.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/tsc2007.txt
+ create mode 100644 Documentation/devicetree/bindings/input/twl4030-pwrbutton.txt
+ create mode 100644 drivers/input/misc/gpio-beeper.c
+Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
+$ git merge input-mt/for-next
+Already up-to-date.
+Merging cgroup/for-next (4d75ee4f3e9c Merge branch 'for-3.14' into for-next)
+$ git merge cgroup/for-next
+Auto-merging kernel/sched/core.c
+Merge made by the 'recursive' strategy.
+ Documentation/cgroups/cgroups.txt | 20 -
+ block/blk-throttle.c | 35 +-
+ block/cfq-iosched.c | 131 ++---
+ include/linux/cgroup.h | 109 ++--
+ include/linux/vmpressure.h | 8 +-
+ init/Kconfig | 3 +-
+ kernel/cgroup.c | 1173 +++++++++++++++----------------------
+ kernel/cgroup_freezer.c | 7 +-
+ kernel/cpuset.c | 71 +--
+ kernel/sched/core.c | 13 +-
+ kernel/sched/cpuacct.c | 18 +-
+ mm/hugetlb_cgroup.c | 22 +-
+ mm/memcontrol.c | 426 +++++++++++---
+ mm/vmpressure.c | 26 +-
+ net/core/netprio_cgroup.c | 8 +-
+ security/device_cgroup.c | 7 +-
+ 16 files changed, 1004 insertions(+), 1073 deletions(-)
+Merging block/for-next (391b7a7bfb52 Merge branch 'for-3.14/drivers' into for-next)
+$ git merge block/for-next
+Resolved 'block/blk-flush.c' using previous resolution.
+Resolved 'fs/btrfs/check-integrity.c' using previous resolution.
+Resolved 'fs/btrfs/extent_io.c' using previous resolution.
+Resolved 'fs/btrfs/scrub.c' using previous resolution.
+Resolved 'fs/f2fs/data.c' using previous resolution.
+Resolved 'fs/f2fs/segment.c' using previous resolution.
+Resolved 'fs/logfs/dev_bdev.c' using previous resolution.
+Resolved 'include/trace/events/f2fs.h' using previous resolution.
+Auto-merging include/trace/events/f2fs.h
+CONFLICT (content): Merge conflict in include/trace/events/f2fs.h
+Auto-merging fs/xfs/xfs_buf.c
+Auto-merging fs/logfs/dev_bdev.c
+CONFLICT (content): Merge conflict in fs/logfs/dev_bdev.c
+Auto-merging fs/hfsplus/wrapper.c
+Auto-merging fs/gfs2/ops_fstype.c
+Auto-merging fs/gfs2/lops.c
+Auto-merging fs/f2fs/segment.c
+CONFLICT (content): Merge conflict in fs/f2fs/segment.c
+Auto-merging fs/f2fs/data.c
+CONFLICT (content): Merge conflict in fs/f2fs/data.c
+Auto-merging fs/btrfs/scrub.c
+CONFLICT (content): Merge conflict in fs/btrfs/scrub.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/btrfs/extent_io.c
+CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
+Auto-merging fs/btrfs/check-integrity.c
+CONFLICT (content): Merge conflict in fs/btrfs/check-integrity.c
+Auto-merging drivers/staging/zram/zram_drv.c
+Auto-merging drivers/scsi/sd.c
+Auto-merging drivers/s390/block/dasd_eckd.c
+Auto-merging drivers/md/raid5.c
+Auto-merging drivers/md/md.c
+Auto-merging drivers/block/xen-blkfront.c
+Auto-merging block/blk-throttle.c
+Auto-merging block/blk-mq.c
+Auto-merging block/blk-flush.c
+CONFLICT (content): Merge conflict in block/blk-flush.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 81559dea9411] Merge remote-tracking branch 'block/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/block/biodoc.txt | 7 +-
+ Documentation/block/biovecs.txt | 111 ++++++
+ arch/m68k/emu/nfblock.c | 13 +-
+ arch/powerpc/sysdev/axonram.c | 21 +-
+ block/blk-core.c | 40 +--
+ block/blk-flush.c | 2 +-
+ block/blk-integrity.c | 40 ++-
+ block/blk-lib.c | 12 +-
+ block/blk-map.c | 6 +-
+ block/blk-merge.c | 66 ++--
+ block/blk-mq.c | 2 +-
+ block/blk-throttle.c | 14 +-
+ block/elevator.c | 2 +-
+ drivers/block/aoe/aoe.h | 10 +-
+ drivers/block/aoe/aoecmd.c | 153 ++++-----
+ drivers/block/brd.c | 16 +-
+ drivers/block/drbd/drbd_actlog.c | 2 +-
+ drivers/block/drbd/drbd_bitmap.c | 2 +-
+ drivers/block/drbd/drbd_main.c | 27 +-
+ drivers/block/drbd/drbd_receiver.c | 19 +-
+ drivers/block/drbd/drbd_req.c | 6 +-
+ drivers/block/drbd/drbd_req.h | 2 +-
+ drivers/block/drbd/drbd_worker.c | 8 +-
+ drivers/block/floppy.c | 16 +-
+ drivers/block/loop.c | 27 +-
+ drivers/block/mtip32xx/mtip32xx.c | 20 +-
+ drivers/block/nbd.c | 14 +-
+ drivers/block/nvme-core.c | 142 ++------
+ drivers/block/pktcdvd.c | 182 +++++-----
+ drivers/block/ps3disk.c | 17 +-
+ drivers/block/ps3vram.c | 12 +-
+ drivers/block/rbd.c | 91 +----
+ drivers/block/rsxx/dev.c | 6 +-
+ drivers/block/rsxx/dma.c | 15 +-
+ drivers/block/umem.c | 53 ++-
+ drivers/block/xen-blkback/blkback.c | 2 +-
+ drivers/block/xen-blkfront.c | 2 +-
+ drivers/cdrom/gdrom.c | 4 +-
+ drivers/md/bcache/bcache.h | 2 -
+ drivers/md/bcache/btree.c | 8 +-
+ drivers/md/bcache/debug.c | 21 +-
+ drivers/md/bcache/io.c | 196 ++---------
+ drivers/md/bcache/journal.c | 12 +-
+ drivers/md/bcache/movinggc.c | 4 +-
+ drivers/md/bcache/request.c | 131 +++-----
+ drivers/md/bcache/super.c | 20 +-
+ drivers/md/bcache/util.c | 4 +-
+ drivers/md/bcache/writeback.c | 6 +-
+ drivers/md/bcache/writeback.h | 2 +-
+ drivers/md/dm-bio-record.h | 37 +-
+ drivers/md/dm-bufio.c | 2 +-
+ drivers/md/dm-cache-policy-mq.c | 4 +-
+ drivers/md/dm-cache-target.c | 28 +-
+ drivers/md/dm-crypt.c | 64 ++--
+ drivers/md/dm-delay.c | 7 +-
+ drivers/md/dm-flakey.c | 7 +-
+ drivers/md/dm-io.c | 37 +-
+ drivers/md/dm-linear.c | 3 +-
+ drivers/md/dm-raid1.c | 20 +-
+ drivers/md/dm-region-hash.c | 3 +-
+ drivers/md/dm-snap.c | 19 +-
+ drivers/md/dm-stripe.c | 13 +-
+ drivers/md/dm-switch.c | 4 +-
+ drivers/md/dm-thin.c | 30 +-
+ drivers/md/dm-verity.c | 62 ++--
+ drivers/md/dm.c | 189 ++---------
+ drivers/md/faulty.c | 19 +-
+ drivers/md/linear.c | 96 +++---
+ drivers/md/md.c | 12 +-
+ drivers/md/multipath.c | 13 +-
+ drivers/md/raid0.c | 79 ++---
+ drivers/md/raid1.c | 75 +++--
+ drivers/md/raid10.c | 194 +++++------
+ drivers/md/raid5.c | 84 ++---
+ drivers/message/fusion/mptsas.c | 8 +-
+ drivers/s390/block/dasd_diag.c | 10 +-
+ drivers/s390/block/dasd_eckd.c | 48 +--
+ drivers/s390/block/dasd_fba.c | 26 +-
+ drivers/s390/block/dcssblk.c | 21 +-
+ drivers/s390/block/scm_blk.c | 8 +-
+ drivers/s390/block/scm_blk_cluster.c | 4 +-
+ drivers/s390/block/xpram.c | 19 +-
+ drivers/scsi/libsas/sas_expander.c | 8 +-
+ drivers/scsi/mpt2sas/mpt2sas_transport.c | 41 +--
+ drivers/scsi/mpt3sas/mpt3sas_transport.c | 39 +--
+ drivers/scsi/osd/osd_initiator.c | 2 +-
+ drivers/scsi/sd.c | 2 +-
+ drivers/scsi/sd_dif.c | 30 +-
+ drivers/staging/lustre/lustre/llite/lloop.c | 26 +-
+ drivers/staging/zram/zram_drv.c | 33 +-
+ drivers/target/target_core_iblock.c | 2 +-
+ fs/bio-integrity.c | 179 +++-------
+ fs/bio.c | 502 +++++++++++++---------------
+ fs/btrfs/check-integrity.c | 8 +-
+ fs/btrfs/compression.c | 27 +-
+ fs/btrfs/disk-io.c | 13 +-
+ fs/btrfs/extent_io.c | 49 ++-
+ fs/btrfs/file-item.c | 19 +-
+ fs/btrfs/inode.c | 37 +-
+ fs/btrfs/raid56.c | 22 +-
+ fs/btrfs/scrub.c | 12 +-
+ fs/btrfs/volumes.c | 14 +-
+ fs/buffer.c | 14 +-
+ fs/direct-io.c | 4 +-
+ fs/ext4/page-io.c | 8 +-
+ fs/f2fs/data.c | 34 +-
+ fs/gfs2/lops.c | 2 +-
+ fs/gfs2/ops_fstype.c | 2 +-
+ fs/hfsplus/wrapper.c | 2 +-
+ fs/jfs/jfs_logmgr.c | 12 +-
+ fs/jfs/jfs_metapage.c | 9 +-
+ fs/logfs/dev_bdev.c | 38 +--
+ fs/mpage.c | 19 +-
+ fs/nfs/blocklayout/blocklayout.c | 43 +--
+ fs/nilfs2/segbuf.c | 3 +-
+ fs/ocfs2/cluster/heartbeat.c | 2 +-
+ fs/xfs/xfs_aops.c | 2 +-
+ fs/xfs/xfs_buf.c | 4 +-
+ include/linux/bio.h | 283 ++++++++++------
+ include/linux/blk_types.h | 24 +-
+ include/linux/blkdev.h | 9 +-
+ include/linux/ceph/messenger.h | 4 +-
+ include/linux/dm-io.h | 4 +-
+ include/trace/events/bcache.h | 26 +-
+ include/trace/events/block.h | 26 +-
+ include/trace/events/f2fs.h | 4 +-
+ kernel/power/block_io.c | 2 +-
+ kernel/trace/blktrace.c | 15 +-
+ mm/bounce.c | 44 ++-
+ mm/page_io.c | 10 +-
+ net/ceph/messenger.c | 43 +--
+ 131 files changed, 2047 insertions(+), 2545 deletions(-)
+ create mode 100644 Documentation/block/biovecs.txt
+Merging device-mapper/for-next (27cafc612c3b dm snapshot: avoid snapshot space leak on crash)
+$ git merge device-mapper/for-next
+Auto-merging drivers/md/dm-thin.c
+Auto-merging drivers/md/dm-snap.c
+Auto-merging drivers/md/dm-delay.c
+Auto-merging drivers/md/dm-cache-target.c
+Auto-merging drivers/md/dm-cache-policy-mq.c
+Merge made by the 'recursive' strategy.
+ Documentation/device-mapper/cache.txt | 10 +--
+ drivers/md/dm-cache-policy-mq.c | 16 ++---
+ drivers/md/dm-cache-target.c | 2 +-
+ drivers/md/dm-delay.c | 52 +++++-----------
+ drivers/md/dm-snap.c | 71 +++++++++++++++++++---
+ drivers/md/dm-table.c | 27 +++-----
+ drivers/md/dm-thin.c | 16 ++++-
+ drivers/md/persistent-data/dm-space-map-metadata.c | 8 ++-
+ 8 files changed, 121 insertions(+), 81 deletions(-)
+Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence)
+$ git merge embedded/master
+Already up-to-date.
+Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3)
+$ git merge firmware/master
+Already up-to-date.
+Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage)
+$ git merge pcmcia/master
+Already up-to-date.
+Merging mmc/mmc-next (e395c4387c74 mmc: wbsd: Silence compiler warning)
+$ git merge mmc/mmc-next
+Already up-to-date.
+Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command)
+$ git merge kgdb/kgdb-next
+Resolved 'kernel/debug/debug_core.h' using previous resolution.
+Auto-merging kernel/debug/debug_core.h
+CONFLICT (content): Merge conflict in kernel/debug/debug_core.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master b66c3d88322e] Merge remote-tracking branch 'kgdb/kgdb-next'
+$ git diff -M --stat --summary HEAD^..
+Merging slab/for-next (a8c0b0837359 Merge branch 'slab/next' into for-next)
+$ git merge slab/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next (6d183de40771 md/raid5: fix newly-broken locking in get_active_stripe.)
+$ git merge md/for-next
+Already up-to-date.
+Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.linaro.org/people/ljones/mfd)
+$ git merge mfd/master
+Already up-to-date.
+Merging mfd-lj/for-mfd-next (15eb2cd74221 mfd: cros ec: spi: Depend on OF)
+$ git merge mfd-lj/for-mfd-next
+Removing include/linux/mfd/abx500/ab8500-gpio.h
+Auto-merging drivers/staging/nvec/nvec.c
+Auto-merging drivers/pinctrl/pinctrl-abx500.h
+Auto-merging drivers/pinctrl/pinctrl-abx500.c
+Auto-merging drivers/mfd/wm5110-tables.c
+Auto-merging drivers/mfd/lpc_ich.c
+Auto-merging drivers/mfd/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/gpio/gpio-lp3943.txt | 37 +++
+ Documentation/devicetree/bindings/mfd/lp3943.txt | 33 +++
+ .../devicetree/bindings/pwm/pwm-lp3943.txt | 58 ++++
+ arch/arm/boot/dts/tegra20-colibri-512.dtsi | 4 +-
+ drivers/gpio/Kconfig | 8 +
+ drivers/gpio/Makefile | 1 +
+ drivers/gpio/gpio-lp3943.c | 242 +++++++++++++++
+ drivers/mfd/88pm800.c | 4 +-
+ drivers/mfd/88pm805.c | 2 +-
+ drivers/mfd/Kconfig | 26 +-
+ drivers/mfd/Makefile | 2 +
+ drivers/mfd/ab8500-core.c | 16 +-
+ drivers/mfd/ab8500-debugfs.c | 5 +-
+ drivers/mfd/arizona-core.c | 8 +-
+ drivers/mfd/as3722.c | 5 +-
+ drivers/mfd/asic3.c | 4 +-
+ drivers/mfd/cros_ec.c | 2 +-
+ drivers/mfd/cros_ec_i2c.c | 8 +-
+ drivers/mfd/cros_ec_spi.c | 21 +-
+ drivers/mfd/cs5535-mfd.c | 2 +-
+ drivers/mfd/da9052-core.c | 2 +-
+ drivers/mfd/da9055-core.c | 2 +-
+ drivers/mfd/da9063-core.c | 2 +-
+ drivers/mfd/db8500-prcmu.c | 4 +-
+ drivers/mfd/htc-pasic3.c | 2 +-
+ drivers/mfd/intel_msic.c | 2 +-
+ drivers/mfd/janz-cmodio.c | 2 +-
+ drivers/mfd/jz4740-adc.c | 2 +-
+ drivers/mfd/lp3943.c | 167 +++++++++++
+ drivers/mfd/lp8788.c | 2 +-
+ drivers/mfd/lpc_ich.c | 2 +-
+ drivers/mfd/lpc_sch.c | 2 +-
+ drivers/mfd/max14577.c | 245 +++++++++++++++
+ drivers/mfd/max77686.c | 2 +-
+ drivers/mfd/max77693.c | 2 +-
+ drivers/mfd/max8907.c | 2 +-
+ drivers/mfd/max8925-core.c | 8 +-
+ drivers/mfd/max8997.c | 2 +-
+ drivers/mfd/max8998.c | 4 +-
+ drivers/mfd/mc13xxx-core.c | 5 +-
+ drivers/mfd/mc13xxx-spi.c | 1 -
+ drivers/mfd/omap-usb-host.c | 8 +-
+ drivers/mfd/omap-usb-tll.c | 8 +-
+ drivers/mfd/rc5t583.c | 2 +-
+ drivers/mfd/rdc321x-southbridge.c | 4 +-
+ drivers/mfd/retu-mfd.c | 6 +-
+ drivers/mfd/rtl8411.c | 6 +-
+ drivers/mfd/rtsx_pcr.c | 2 +-
+ drivers/mfd/sec-core.c | 58 +++-
+ drivers/mfd/sec-irq.c | 12 +-
+ drivers/mfd/sm501.c | 2 +-
+ drivers/mfd/sta2x11-mfd.c | 4 +-
+ drivers/mfd/stmpe.c | 10 +-
+ drivers/mfd/stmpe.h | 2 +-
+ drivers/mfd/tc3589x.c | 4 +-
+ drivers/mfd/tc6387xb.c | 2 +-
+ drivers/mfd/timberdale.c | 14 +-
+ drivers/mfd/tps6507x.c | 2 +-
+ drivers/mfd/tps65090.c | 2 +-
+ drivers/mfd/tps65217.c | 2 +-
+ drivers/mfd/tps6586x.c | 52 +++-
+ drivers/mfd/tps65910.c | 2 +-
+ drivers/mfd/tps65912-core.c | 2 +-
+ drivers/mfd/tps80031.c | 2 +-
+ drivers/mfd/twl-core.c | 213 +------------
+ drivers/mfd/viperboard.c | 2 +-
+ drivers/mfd/vx855.c | 4 +-
+ drivers/mfd/wm5110-tables.c | 2 +-
+ drivers/mfd/wm831x-core.c | 14 +-
+ drivers/mfd/wm831x-i2c.c | 8 +-
+ drivers/mfd/wm831x-spi.c | 8 +-
+ drivers/mfd/wm8994-core.c | 4 +-
+ drivers/pinctrl/pinctrl-abx500.c | 37 +--
+ drivers/pinctrl/pinctrl-abx500.h | 12 +
+ drivers/pwm/Kconfig | 10 +
+ drivers/pwm/Makefile | 1 +
+ drivers/pwm/pwm-lp3943.c | 314 ++++++++++++++++++++
+ drivers/regulator/tps6586x-regulator.c | 93 ++++--
+ drivers/staging/nvec/nvec.c | 2 +-
+ include/linux/mfd/abx500/ab8500-gpio.h | 33 ---
+ include/linux/mfd/abx500/ab8500.h | 2 -
+ include/linux/mfd/lp3943.h | 114 +++++++
+ include/linux/mfd/max14577-private.h | 330 +++++++++++++++++++++
+ include/linux/mfd/max14577.h | 69 +++++
+ include/linux/mfd/tps6586x.h | 7 +
+ 85 files changed, 2002 insertions(+), 435 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-lp3943.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/lp3943.txt
+ create mode 100644 Documentation/devicetree/bindings/pwm/pwm-lp3943.txt
+ create mode 100644 drivers/gpio/gpio-lp3943.c
+ create mode 100644 drivers/mfd/lp3943.c
+ create mode 100644 drivers/mfd/max14577.c
+ create mode 100644 drivers/pwm/pwm-lp3943.c
+ delete mode 100644 include/linux/mfd/abx500/ab8500-gpio.h
+ create mode 100644 include/linux/mfd/lp3943.h
+ create mode 100644 include/linux/mfd/max14577-private.h
+ create mode 100644 include/linux/mfd/max14577.h
+Merging battery/master (d36240d26025 power_supply: Add power_supply notifier)
+$ git merge battery/master
+Merge made by the 'recursive' strategy.
+ drivers/power/Kconfig | 1 +
+ drivers/power/power_supply_core.c | 30 ++++++++++++++++++++++++------
+ include/linux/power_supply.h | 8 ++++++++
+ 3 files changed, 33 insertions(+), 6 deletions(-)
+Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path)
+$ git merge fbdev/for-next
+Already up-to-date.
+Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par)
+$ git merge viafb/viafb-next
+Already up-to-date.
+Merging omap_dss2/for-next (46ac29568e63 video: vt8500: fix error handling in probe())
+$ git merge omap_dss2/for-next
+Already up-to-date.
+Merging regulator/for-next (3d8165b1cea0 Merge remote-tracking branches 'regulator/topic/ab8500', 'regulator/topic/arizona', 'regulator/topic/db8500', 'regulator/topic/gpio', 'regulator/topic/lp3971', 'regulator/topic/lp3972', 'regulator/topic/pcf50633', 'regulator/topic/pfuze100', 'regulator/topic/stw481x-vmmc' and 'regulator/topic/tps51632' into regulator-next)
+$ git merge regulator/for-next
+Merge made by the 'recursive' strategy.
+ drivers/mfd/pcf50633-core.c | 2 +-
+ drivers/regulator/ab8500.c | 126 ++++-----------------------------
+ drivers/regulator/arizona-micsupp.c | 52 +++-----------
+ drivers/regulator/as3722-regulator.c | 2 +-
+ drivers/regulator/core.c | 11 ++-
+ drivers/regulator/db8500-prcmu.c | 20 +-----
+ drivers/regulator/gpio-regulator.c | 17 ++---
+ drivers/regulator/lp3971.c | 43 ++---------
+ drivers/regulator/lp3972.c | 41 ++---------
+ drivers/regulator/pcf50633-regulator.c | 2 +-
+ drivers/regulator/pfuze100-regulator.c | 22 ++----
+ drivers/regulator/stw481x-vmmc.c | 12 +---
+ drivers/regulator/tps51632-regulator.c | 2 +-
+ 13 files changed, 63 insertions(+), 289 deletions(-)
+Merging security/next (217091dd7a7a ima: define '_ima' as a builtin 'trusted' keyring)
+$ git merge security/next
+Already up-to-date.
+Merging selinux/master (0b1f24e6db9a selinux: pull address family directly from the request_sock struct)
+$ git merge selinux/master
+Auto-merging security/selinux/hooks.c
+Merge made by the 'recursive' strategy.
+ security/selinux/hooks.c | 99 ++++++++++++++++++++++++++++---------
+ security/selinux/include/security.h | 3 +-
+ security/selinux/netlabel.c | 31 +++++++++++-
+ security/selinux/ss/constraint.h | 1 +
+ security/selinux/ss/policydb.c | 96 +++++++++++++++++++++++++++++++----
+ security/selinux/ss/policydb.h | 11 +++++
+ security/selinux/ss/services.c | 54 +++++++++++---------
+ security/selinux/xfrm.c | 11 +++--
+ 8 files changed, 247 insertions(+), 59 deletions(-)
+Merging lblnet/master (07bc9dc1b01b Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc)
+$ git merge lblnet/master
+Already up-to-date.
+Merging watchdog/master (0a9cc5eca904 sc1200_wdt: Fix oops)
+$ git merge watchdog/master
+Resolved 'drivers/watchdog/rt2880_wdt.c' using previous resolution.
+Auto-merging drivers/watchdog/ux500_wdt.c
+Auto-merging drivers/watchdog/txx9wdt.c
+Auto-merging drivers/watchdog/stmp3xxx_rtc_wdt.c
+Auto-merging drivers/watchdog/softdog.c
+Auto-merging drivers/watchdog/shwdt.c
+Auto-merging drivers/watchdog/sc1200wdt.c
+Auto-merging drivers/watchdog/rt2880_wdt.c
+CONFLICT (add/add): Merge conflict in drivers/watchdog/rt2880_wdt.c
+Auto-merging drivers/watchdog/pnx4008_wdt.c
+Auto-merging drivers/watchdog/orion_wdt.c
+Auto-merging drivers/watchdog/max63xx_wdt.c
+Auto-merging drivers/watchdog/kempld_wdt.c
+Auto-merging drivers/watchdog/jz4740_wdt.c
+Auto-merging drivers/watchdog/ie6xx_wdt.c
+Auto-merging drivers/watchdog/ep93xx_wdt.c
+Auto-merging drivers/watchdog/bcm2835_wdt.c
+Auto-merging arch/arm/boot/dts/sama5d3.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9x5.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9n12.dtsi
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 0c1536233fd1] Merge remote-tracking branch 'watchdog/master'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/watchdog/atmel-wdt.txt | 30 +-
+ arch/arm/boot/dts/at91sam9260.dtsi | 5 +
+ arch/arm/boot/dts/at91sam9263.dtsi | 5 +
+ arch/arm/boot/dts/at91sam9g45.dtsi | 5 +
+ arch/arm/boot/dts/at91sam9n12.dtsi | 5 +
+ arch/arm/boot/dts/at91sam9x5.dtsi | 5 +
+ arch/arm/boot/dts/kizbox.dts | 6 +
+ arch/arm/boot/dts/sama5d3.dtsi | 5 +
+ drivers/watchdog/at91sam9_wdt.c | 309 +++++++++++++++------
+ drivers/watchdog/bcm2835_wdt.c | 1 -
+ drivers/watchdog/ep93xx_wdt.c | 1 -
+ drivers/watchdog/ie6xx_wdt.c | 1 -
+ drivers/watchdog/jz4740_wdt.c | 1 -
+ drivers/watchdog/kempld_wdt.c | 1 -
+ drivers/watchdog/max63xx_wdt.c | 1 -
+ drivers/watchdog/orion_wdt.c | 1 -
+ drivers/watchdog/pnx4008_wdt.c | 1 -
+ drivers/watchdog/rt2880_wdt.c | 1 -
+ drivers/watchdog/sc1200wdt.c | 3 +-
+ drivers/watchdog/shwdt.c | 1 -
+ drivers/watchdog/softdog.c | 1 -
+ drivers/watchdog/stmp3xxx_rtc_wdt.c | 1 -
+ drivers/watchdog/txx9wdt.c | 1 -
+ drivers/watchdog/ux500_wdt.c | 1 -
+ 24 files changed, 289 insertions(+), 103 deletions(-)
+Merging dwmw2-iommu/master (e5d0c874391a Merge tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging iommu/next (e6ca48d995e4 Merge branches 'iommu/fixes', 'tracing', 'core', 'arm/tegra' and 'x86/vt-d' into next)
+$ git merge iommu/next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging vfio/next (15c03dd4859a Linux 3.12-rc3)
+$ git merge vfio/next
+Already up-to-date.
+Merging osd/linux-next (861d66601acd exofs: don't leak io_state and pages on read error)
+$ git merge osd/linux-next
+Already up-to-date.
+Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document)
+$ git merge jc_docs/docs-next
+Already up-to-date.
+Merging trivial/for-next (6bbdc3984efb vio: remove dangly makefile bits)
+$ git merge trivial/for-next
+Auto-merging net/netfilter/ipset/Kconfig
+Auto-merging net/core/dev.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/tracepoint.h
+Auto-merging drivers/xen/Kconfig
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_gem.h
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_gem.c
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_g2d.c
+Auto-merging drivers/devfreq/exynos/exynos4_bus.c
+Auto-merging drivers/char/Makefile
+Auto-merging drivers/block/Makefile
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/arm/mach-at91/Kconfig.non_dt
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/.gitignore | 1 +
+ Documentation/DocBook/Makefile | 5 +++--
+ Documentation/DocBook/kernel-api.tmpl | 1 +
+ Documentation/IRQ-domain.txt | 2 +-
+ Documentation/email-clients.txt | 2 +-
+ Documentation/io-mapping.txt | 2 +-
+ Documentation/kernel-parameters.txt | 9 ++++++++-
+ Documentation/md.txt | 2 +-
+ Documentation/rfkill.txt | 2 +-
+ Documentation/rt-mutex-design.txt | 2 +-
+ Documentation/static-keys.txt | 4 ++--
+ Documentation/x86/x86_64/boot-options.txt | 23 -----------------------
+ arch/arm/mach-at91/Kconfig.non_dt | 2 +-
+ arch/x86/Kconfig | 2 +-
+ drivers/block/Makefile | 1 -
+ drivers/cdrom/Makefile | 1 -
+ drivers/char/Makefile | 1 -
+ drivers/devfreq/exynos/exynos4_bus.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_crtc.c | 4 ++--
+ drivers/gpu/drm/exynos/exynos_drm_g2d.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_gem.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_gem.h | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_ipp.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_ipp.h | 4 ++--
+ drivers/isdn/mISDN/Kconfig | 2 +-
+ drivers/scsi/Kconfig | 4 ++--
+ drivers/xen/Kconfig | 2 +-
+ include/linux/tracepoint.h | 2 +-
+ init/Kconfig | 2 +-
+ net/core/dev.c | 2 +-
+ net/netfilter/ipset/Kconfig | 2 +-
+ 31 files changed, 40 insertions(+), 56 deletions(-)
+Merging audit/master (fc582aef7dcc Merge tag 'v3.12')
+$ git merge audit/master
+Merge made by the 'recursive' strategy.
+Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
+$ git merge fsnotify/for-next
+Already up-to-date.
+Merging devicetree/devicetree/next (355e62f5ad12 of/irq: Fix potential buffer overflow)
+$ git merge devicetree/devicetree/next
+Already up-to-date.
+Merging dt-rh/for-next (1b50b0c3330e Merge branch 'for-3.14' into for-next)
+$ git merge dt-rh/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/gic.txt | 1 +
+ MAINTAINERS | 4 +-
+ drivers/of/base.c | 53 +++++++++++++++++++--------
+ drivers/of/irq.c | 6 ++-
+ 4 files changed, 45 insertions(+), 19 deletions(-)
+Merging spi/for-next (633e9b8e9370 Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/bcm63xx-hsspi', 'spi/topic/coldfire', 'spi/topic/davinci', 'spi/topic/falcon', 'spi/topic/gpio', 'spi/topic/msiof', 'spi/topic/omap', 'spi/topic/orion', 'spi/topic/pci', 'spi/topic/rcar', 'spi/topic/s3c64xx', 'spi/topic/sc18is602', 'spi/topic/tegra114', 'spi/topic/tegra20-sflash', 'spi/topic/tegra20-slink' and 'spi/topic/xcomm' into spi-next)
+$ git merge spi/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/spi/spi-bus.txt | 2 +-
+ Documentation/spi/spi-summary | 8 +-
+ drivers/spi/Kconfig | 11 +-
+ drivers/spi/Makefile | 1 +
+ drivers/spi/spi-atmel.c | 18 +-
+ drivers/spi/spi-bcm63xx-hsspi.c | 484 ++++++++++++++++++++++
+ drivers/spi/spi-coldfire-qspi.c | 53 +--
+ drivers/spi/spi-davinci.c | 4 +-
+ drivers/spi/spi-dw-pci.c | 2 +-
+ drivers/spi/spi-falcon.c | 12 +-
+ drivers/spi/spi-gpio.c | 8 +-
+ drivers/spi/spi-omap-100k.c | 20 -
+ drivers/spi/spi-omap2-mcspi.c | 38 +-
+ drivers/spi/spi-orion.c | 4 +-
+ drivers/spi/spi-pxa2xx-pci.c | 2 +-
+ drivers/spi/spi-rspi.c | 43 +-
+ drivers/spi/spi-sc18is602.c | 13 +-
+ drivers/spi/spi-sh-msiof.c | 62 +--
+ drivers/spi/spi-tegra114.c | 98 ++---
+ drivers/spi/spi-tegra20-sflash.c | 22 +-
+ drivers/spi/spi-tegra20-slink.c | 97 ++---
+ drivers/spi/spi-topcliff-pch.c | 2 +-
+ drivers/spi/spi-xcomm.c | 12 +-
+ drivers/spi/spi.c | 26 +-
+ 24 files changed, 705 insertions(+), 337 deletions(-)
+ create mode 100644 drivers/spi/spi-bcm63xx-hsspi.c
+Merging tip/auto-latest (c4372b1b29f2 Merge branch 'x86/urgent')
+$ git merge tip/auto-latest
+Auto-merging tools/perf/perf-completion.sh
+Auto-merging kernel/sched/core.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/powerpc/kernel/setup_64.c
+Auto-merging arch/powerpc/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/kernel-parameters.txt | 10 +
+ Documentation/memory-barriers.txt | 42 +-
+ Documentation/robust-futex-ABI.txt | 4 +-
+ Documentation/x86/x86_64/mm.txt | 7 +
+ MAINTAINERS | 5 +
+ arch/mips/ar7/setup.c | 1 -
+ arch/mips/emma/markeins/setup.c | 3 -
+ arch/mips/netlogic/xlp/setup.c | 1 -
+ arch/mips/netlogic/xlr/setup.c | 1 -
+ arch/mips/sibyte/swarm/setup.c | 2 -
+ arch/powerpc/Kconfig | 4 +
+ arch/powerpc/include/asm/setup.h | 1 +
+ arch/powerpc/include/asm/uprobes.h | 5 +-
+ arch/powerpc/kernel/setup_32.c | 3 -
+ arch/powerpc/kernel/setup_64.c | 3 -
+ arch/powerpc/kernel/uprobes.c | 2 +-
+ arch/powerpc/platforms/pseries/setup.c | 2 +-
+ arch/x86/Kconfig | 52 +-
+ arch/x86/boot/Makefile | 2 +-
+ arch/x86/boot/boot.h | 10 +-
+ arch/x86/boot/compressed/Makefile | 2 +-
+ arch/x86/boot/compressed/aslr.c | 317 ++++++++++
+ arch/x86/boot/compressed/cmdline.c | 2 +-
+ arch/x86/boot/compressed/cpuflags.c | 12 +
+ arch/x86/boot/compressed/head_32.S | 10 +-
+ arch/x86/boot/compressed/head_64.S | 16 +-
+ arch/x86/boot/compressed/misc.c | 18 +-
+ arch/x86/boot/compressed/misc.h | 37 +-
+ arch/x86/boot/cpucheck.c | 100 +---
+ arch/x86/boot/cpuflags.c | 104 ++++
+ arch/x86/boot/cpuflags.h | 19 +
+ arch/x86/include/asm/archrandom.h | 21 +
+ arch/x86/include/asm/efi.h | 64 +-
+ arch/x86/include/asm/page.h | 1 +
+ arch/x86/include/asm/page_32.h | 4 -
+ arch/x86/include/asm/page_64_types.h | 15 +-
+ arch/x86/include/asm/pgtable-2level.h | 100 ++--
+ arch/x86/include/asm/pgtable_64_types.h | 2 +-
+ arch/x86/include/asm/pgtable_types.h | 3 +-
+ arch/x86/kernel/cpu/Makefile | 2 +-
+ arch/x86/kernel/cpu/perf_event_intel_rapl.c | 661 +++++++++++++++++++++
+ arch/x86/kernel/cpu/rdrand.c | 14 -
+ arch/x86/kernel/setup.c | 26 +
+ arch/x86/lib/copy_user_64.S | 12 +-
+ arch/x86/mm/hugetlbpage.c | 9 +-
+ arch/x86/mm/init_32.c | 3 +
+ arch/x86/mm/pageattr.c | 461 +++++++++++++-
+ arch/x86/platform/efi/efi.c | 111 ++--
+ arch/x86/platform/efi/efi_32.c | 9 +-
+ arch/x86/platform/efi/efi_64.c | 109 ++++
+ arch/x86/platform/efi/efi_stub_64.S | 54 ++
+ arch/x86/tools/relocs.c | 20 +-
+ include/linux/efi.h | 1 +
+ include/linux/kernel.h | 9 +
+ include/linux/perf_event.h | 5 +-
+ include/linux/sched.h | 1 -
+ include/linux/uprobes.h | 52 +-
+ kernel/events/core.c | 1 +
+ kernel/events/uprobes.c | 60 +-
+ kernel/fork.c | 4 +-
+ kernel/locking/lockdep.c | 4 +
+ kernel/panic.c | 2 +-
+ kernel/sched/core.c | 11 +-
+ kernel/sched/fair.c | 17 +-
+ kernel/sched/sched.h | 1 +
+ kernel/softirq.c | 49 +-
+ lib/Kconfig.debug | 9 +
+ tools/lib/lockdep/Makefile | 251 ++++++++
+ tools/lib/lockdep/common.c | 33 +
+ tools/lib/lockdep/include/liblockdep/common.h | 50 ++
+ tools/lib/lockdep/include/liblockdep/mutex.h | 70 +++
+ tools/lib/lockdep/include/liblockdep/rwlock.h | 86 +++
+ tools/lib/lockdep/lockdep | 3 +
+ tools/lib/lockdep/lockdep.c | 2 +
+ tools/lib/lockdep/lockdep_internals.h | 1 +
+ tools/lib/lockdep/lockdep_states.h | 1 +
+ tools/lib/lockdep/preload.c | 447 ++++++++++++++
+ tools/lib/lockdep/rbtree.c | 1 +
+ tools/lib/lockdep/run_tests.sh | 27 +
+ tools/lib/lockdep/tests/AA.c | 13 +
+ tools/lib/lockdep/tests/ABBA.c | 13 +
+ tools/lib/lockdep/tests/ABBCCA.c | 15 +
+ tools/lib/lockdep/tests/ABBCCDDA.c | 17 +
+ tools/lib/lockdep/tests/ABCABC.c | 15 +
+ tools/lib/lockdep/tests/ABCDBCDA.c | 17 +
+ tools/lib/lockdep/tests/ABCDBDDA.c | 17 +
+ tools/lib/lockdep/tests/WW.c | 13 +
+ tools/lib/lockdep/tests/common.h | 12 +
+ tools/lib/lockdep/tests/unlock_balance.c | 12 +
+ tools/lib/lockdep/uinclude/asm/hweight.h | 3 +
+ tools/lib/lockdep/uinclude/asm/sections.h | 3 +
+ tools/lib/lockdep/uinclude/linux/bitops.h | 3 +
+ tools/lib/lockdep/uinclude/linux/compiler.h | 7 +
+ tools/lib/lockdep/uinclude/linux/debug_locks.h | 12 +
+ tools/lib/lockdep/uinclude/linux/delay.h | 3 +
+ tools/lib/lockdep/uinclude/linux/export.h | 7 +
+ tools/lib/lockdep/uinclude/linux/ftrace.h | 3 +
+ tools/lib/lockdep/uinclude/linux/gfp.h | 3 +
+ tools/lib/lockdep/uinclude/linux/hardirq.h | 11 +
+ tools/lib/lockdep/uinclude/linux/hash.h | 1 +
+ tools/lib/lockdep/uinclude/linux/interrupt.h | 3 +
+ tools/lib/lockdep/uinclude/linux/irqflags.h | 38 ++
+ tools/lib/lockdep/uinclude/linux/kallsyms.h | 32 +
+ tools/lib/lockdep/uinclude/linux/kern_levels.h | 25 +
+ tools/lib/lockdep/uinclude/linux/kernel.h | 44 ++
+ tools/lib/lockdep/uinclude/linux/kmemcheck.h | 8 +
+ tools/lib/lockdep/uinclude/linux/linkage.h | 3 +
+ tools/lib/lockdep/uinclude/linux/list.h | 1 +
+ tools/lib/lockdep/uinclude/linux/lockdep.h | 55 ++
+ tools/lib/lockdep/uinclude/linux/module.h | 6 +
+ tools/lib/lockdep/uinclude/linux/mutex.h | 3 +
+ tools/lib/lockdep/uinclude/linux/poison.h | 1 +
+ tools/lib/lockdep/uinclude/linux/prefetch.h | 6 +
+ tools/lib/lockdep/uinclude/linux/proc_fs.h | 3 +
+ tools/lib/lockdep/uinclude/linux/rbtree.h | 1 +
+ .../lib/lockdep/uinclude/linux/rbtree_augmented.h | 2 +
+ tools/lib/lockdep/uinclude/linux/rcu.h | 16 +
+ tools/lib/lockdep/uinclude/linux/seq_file.h | 3 +
+ tools/lib/lockdep/uinclude/linux/spinlock.h | 25 +
+ tools/lib/lockdep/uinclude/linux/stacktrace.h | 32 +
+ tools/lib/lockdep/uinclude/linux/stringify.h | 7 +
+ tools/lib/lockdep/uinclude/linux/types.h | 58 ++
+ tools/lib/lockdep/uinclude/trace/events/lock.h | 3 +
+ tools/lib/traceevent/event-parse.c | 7 +-
+ tools/perf/Documentation/perf-record.txt | 12 +-
+ tools/perf/Documentation/perf-script.txt | 6 +
+ tools/perf/Documentation/perf-timechart.txt | 26 +-
+ tools/perf/Documentation/perf-top.txt | 5 +-
+ tools/perf/Makefile | 7 +-
+ tools/perf/Makefile.perf | 4 +-
+ tools/perf/builtin-record.c | 13 +-
+ tools/perf/builtin-script.c | 209 ++++++-
+ tools/perf/builtin-stat.c | 114 +++-
+ tools/perf/builtin-timechart.c | 418 ++++++++-----
+ tools/perf/builtin-top.c | 29 +-
+ tools/perf/builtin-trace.c | 13 +-
+ tools/perf/{bash_completion => perf-completion.sh} | 100 +++-
+ tools/perf/perf.h | 1 +
+ tools/perf/tests/attr/test-record-no-inherit | 2 +-
+ tools/perf/util/event.c | 3 +-
+ tools/perf/util/evlist.c | 6 +-
+ tools/perf/util/evsel.c | 7 +-
+ tools/perf/util/evsel.h | 3 +
+ tools/perf/util/parse-events.c | 28 +-
+ tools/perf/util/parse-options.c | 21 +
+ tools/perf/util/parse-options.h | 8 +
+ tools/perf/util/pmu.c | 138 ++++-
+ tools/perf/util/pmu.h | 3 +-
+ tools/perf/util/session.c | 10 +-
+ tools/perf/util/svghelper.c | 77 ++-
+ tools/perf/util/svghelper.h | 11 +-
+ tools/perf/util/symbol.c | 41 +-
+ tools/perf/util/symbol.h | 4 +
+ tools/perf/util/target.c | 11 +-
+ tools/perf/util/target.h | 4 +-
+ tools/perf/util/thread.h | 12 +
+ 156 files changed, 4938 insertions(+), 686 deletions(-)
+ create mode 100644 arch/x86/boot/compressed/aslr.c
+ create mode 100644 arch/x86/boot/compressed/cpuflags.c
+ create mode 100644 arch/x86/boot/cpuflags.c
+ create mode 100644 arch/x86/boot/cpuflags.h
+ create mode 100644 arch/x86/kernel/cpu/perf_event_intel_rapl.c
+ create mode 100644 tools/lib/lockdep/Makefile
+ create mode 100644 tools/lib/lockdep/common.c
+ create mode 100644 tools/lib/lockdep/include/liblockdep/common.h
+ create mode 100644 tools/lib/lockdep/include/liblockdep/mutex.h
+ create mode 100644 tools/lib/lockdep/include/liblockdep/rwlock.h
+ create mode 100755 tools/lib/lockdep/lockdep
+ create mode 100644 tools/lib/lockdep/lockdep.c
+ create mode 100644 tools/lib/lockdep/lockdep_internals.h
+ create mode 100644 tools/lib/lockdep/lockdep_states.h
+ create mode 100644 tools/lib/lockdep/preload.c
+ create mode 100644 tools/lib/lockdep/rbtree.c
+ create mode 100644 tools/lib/lockdep/run_tests.sh
+ create mode 100644 tools/lib/lockdep/tests/AA.c
+ create mode 100644 tools/lib/lockdep/tests/ABBA.c
+ create mode 100644 tools/lib/lockdep/tests/ABBCCA.c
+ create mode 100644 tools/lib/lockdep/tests/ABBCCDDA.c
+ create mode 100644 tools/lib/lockdep/tests/ABCABC.c
+ create mode 100644 tools/lib/lockdep/tests/ABCDBCDA.c
+ create mode 100644 tools/lib/lockdep/tests/ABCDBDDA.c
+ create mode 100644 tools/lib/lockdep/tests/WW.c
+ create mode 100644 tools/lib/lockdep/tests/common.h
+ create mode 100644 tools/lib/lockdep/tests/unlock_balance.c
+ create mode 100644 tools/lib/lockdep/uinclude/asm/hweight.h
+ create mode 100644 tools/lib/lockdep/uinclude/asm/sections.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/bitops.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/compiler.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/debug_locks.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/delay.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/export.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/ftrace.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/gfp.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/hardirq.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/hash.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/interrupt.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/irqflags.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/kallsyms.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/kern_levels.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/kernel.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/kmemcheck.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/linkage.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/list.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/lockdep.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/module.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/mutex.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/poison.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/prefetch.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/proc_fs.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/rbtree.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/rbtree_augmented.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/rcu.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/seq_file.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/spinlock.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/stacktrace.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/stringify.h
+ create mode 100644 tools/lib/lockdep/uinclude/linux/types.h
+ create mode 100644 tools/lib/lockdep/uinclude/trace/events/lock.h
+ rename tools/perf/{bash_completion => perf-completion.sh} (65%)
+Merging edac/linux_next (3e45588825c1 cell_edac: fix missing of_node_put)
+$ git merge edac/linux_next
+Already up-to-date.
+Merging edac-amd/for-next (c97986837cc6 Merge branch 'ras-fixes' into for-next)
+$ git merge edac-amd/for-next
+Merge made by the 'recursive' strategy.
+ arch/x86/kernel/cpu/mcheck/mce.c | 4 +-
+ drivers/edac/amd64_edac.c | 4 +-
+ drivers/edac/amd76x_edac.c | 2 +-
+ drivers/edac/e752x_edac.c | 2 +-
+ drivers/edac/e7xxx_edac.c | 2 +-
+ drivers/edac/i3000_edac.c | 2 +-
+ drivers/edac/i3200_edac.c | 2 +-
+ drivers/edac/i5000_edac.c | 2 +-
+ drivers/edac/i5100_edac.c | 2 +-
+ drivers/edac/i5400_edac.c | 2 +-
+ drivers/edac/i7300_edac.c | 2 +-
+ drivers/edac/i7core_edac.c | 2 +-
+ drivers/edac/i82443bxgx_edac.c | 2 +-
+ drivers/edac/i82860_edac.c | 2 +-
+ drivers/edac/i82875p_edac.c | 2 +-
+ drivers/edac/i82975x_edac.c | 2 +-
+ drivers/edac/mpc85xx_edac.c | 98 +++++++++++++++++++++++++++++++++++-----
+ drivers/edac/mpc85xx_edac.h | 7 +++
+ drivers/edac/r82600_edac.c | 2 +-
+ drivers/edac/sb_edac.c | 2 +-
+ drivers/edac/x38_edac.c | 2 +-
+ 21 files changed, 116 insertions(+), 31 deletions(-)
+Merging ftrace/for-next (3ccb01239201 tracing: Only run synchronize_sched() at instance deletion time)
+$ git merge ftrace/for-next
+Already up-to-date.
+Merging rcu/rcu/next (9dd97744fb2f Merge branches 'doc.2013.12.03a', 'fixes.2013.12.03a', 'rcutorture.2013.12.03a' and 'sparse.2013.12.03a' into HEAD)
+$ git merge rcu/rcu/next
+Auto-merging kernel/rcu/tree_plugin.h
+Auto-merging MAINTAINERS
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/RCU/trace.txt | 22 ++-
+ Documentation/circular-buffers.txt | 45 +++--
+ Documentation/kernel-parameters.txt | 9 +-
+ MAINTAINERS | 6 +
+ include/linux/rculist.h | 4 +-
+ include/linux/rcupdate.h | 153 ++++++++-------
+ include/linux/rcutiny.h | 2 +-
+ include/linux/rcutree.h | 36 ++--
+ kernel/rcu/rcu.h | 5 +-
+ kernel/rcu/srcu.c | 57 +++++-
+ kernel/rcu/torture.c | 75 ++++----
+ kernel/rcu/tree.c | 79 ++++++--
+ kernel/rcu/tree.h | 12 +-
+ kernel/rcu/tree_plugin.h | 89 +++++++--
+ kernel/rcu/tree_trace.c | 3 +-
+ kernel/rcu/update.c | 5 +
+ tools/testing/selftests/rcutorture/.gitignore | 6 +
+ .../selftests/rcutorture/bin/config2frag.sh | 25 +++
+ .../selftests/rcutorture/bin/configNR_CPUS.sh | 45 +++++
+ .../selftests/rcutorture/bin/configcheck.sh | 54 ++++++
+ .../testing/selftests/rcutorture/bin/configinit.sh | 74 ++++++++
+ tools/testing/selftests/rcutorture/bin/cpus2use.sh | 41 ++++
+ .../testing/selftests/rcutorture/bin/functions.sh | 198 +++++++++++++++++++
+ .../testing/selftests/rcutorture/bin/kvm-build.sh | 71 +++++++
+ .../selftests/rcutorture/bin/kvm-recheck.sh | 44 +++++
+ .../selftests/rcutorture/bin/kvm-test-1-rcu.sh | 192 +++++++++++++++++++
+ tools/testing/selftests/rcutorture/bin/kvm.sh | 210 +++++++++++++++++++++
+ .../selftests/rcutorture/bin/parse-build.sh | 57 ++++++
+ .../selftests/rcutorture/bin/parse-console.sh | 41 ++++
+ .../selftests/rcutorture/bin/parse-rcutorture.sh | 106 +++++++++++
+ tools/testing/selftests/rcutorture/configs/CFLIST | 13 ++
+ tools/testing/selftests/rcutorture/configs/SRCU-N | 8 +
+ .../selftests/rcutorture/configs/SRCU-N.boot | 1 +
+ tools/testing/selftests/rcutorture/configs/SRCU-P | 8 +
+ .../selftests/rcutorture/configs/SRCU-P.boot | 1 +
+ tools/testing/selftests/rcutorture/configs/TINY01 | 13 ++
+ tools/testing/selftests/rcutorture/configs/TINY02 | 13 ++
+ tools/testing/selftests/rcutorture/configs/TREE01 | 23 +++
+ .../selftests/rcutorture/configs/TREE01.boot | 1 +
+ tools/testing/selftests/rcutorture/configs/TREE02 | 26 +++
+ tools/testing/selftests/rcutorture/configs/TREE03 | 23 +++
+ tools/testing/selftests/rcutorture/configs/TREE04 | 25 +++
+ .../selftests/rcutorture/configs/TREE04.boot | 1 +
+ tools/testing/selftests/rcutorture/configs/TREE05 | 25 +++
+ .../selftests/rcutorture/configs/TREE05.boot | 1 +
+ tools/testing/selftests/rcutorture/configs/TREE06 | 26 +++
+ tools/testing/selftests/rcutorture/configs/TREE07 | 24 +++
+ tools/testing/selftests/rcutorture/configs/TREE08 | 26 +++
+ .../testing/selftests/rcutorture/configs/TREE08-T | 26 +++
+ tools/testing/selftests/rcutorture/configs/TREE09 | 21 +++
+ .../selftests/rcutorture/configs/v0.0/CFLIST | 14 ++
+ .../rcutorture/configs/v0.0/N1-S-T-NH-SD-SMP-HP | 18 ++
+ .../rcutorture/configs/v0.0/N2-2-t-nh-sd-SMP-hp | 20 ++
+ .../rcutorture/configs/v0.0/N3-3-T-nh-SD-SMP-hp | 22 +++
+ .../rcutorture/configs/v0.0/N4-A-t-NH-sd-SMP-HP | 18 ++
+ .../rcutorture/configs/v0.0/N5-U-T-NH-sd-SMP-hp | 22 +++
+ .../selftests/rcutorture/configs/v0.0/NT1-nh | 23 +++
+ .../selftests/rcutorture/configs/v0.0/NT3-NH | 20 ++
+ .../rcutorture/configs/v0.0/P1-S-T-NH-SD-SMP-HP | 19 ++
+ .../rcutorture/configs/v0.0/P2-2-t-nh-sd-SMP-hp | 20 ++
+ .../rcutorture/configs/v0.0/P3-3-T-nh-SD-SMP-hp | 20 ++
+ .../rcutorture/configs/v0.0/P4-A-t-NH-sd-SMP-HP | 22 +++
+ .../rcutorture/configs/v0.0/P5-U-T-NH-sd-SMP-hp | 28 +++
+ .../selftests/rcutorture/configs/v0.0/PT1-nh | 23 +++
+ .../selftests/rcutorture/configs/v0.0/PT2-NH | 22 +++
+ .../rcutorture/configs/v0.0/ver_functions.sh | 35 ++++
+ .../selftests/rcutorture/configs/v3.12/CFLIST | 17 ++
+ .../rcutorture/configs/v3.12/N1-S-T-NH-SD-SMP-HP | 19 ++
+ .../rcutorture/configs/v3.12/N2-2-t-nh-sd-SMP-hp | 20 ++
+ .../rcutorture/configs/v3.12/N3-3-T-nh-SD-SMP-hp | 22 +++
+ .../rcutorture/configs/v3.12/N4-A-t-NH-sd-SMP-HP | 18 ++
+ .../rcutorture/configs/v3.12/N5-U-T-NH-sd-SMP-hp | 22 +++
+ .../rcutorture/configs/v3.12/N6---t-nh-SD-smp-hp | 19 ++
+ .../rcutorture/configs/v3.12/N7-4-T-NH-SD-SMP-HP | 26 +++
+ .../rcutorture/configs/v3.12/N8-2-T-NH-SD-SMP-HP | 22 +++
+ .../selftests/rcutorture/configs/v3.12/NT1-nh | 23 +++
+ .../selftests/rcutorture/configs/v3.12/NT3-NH | 20 ++
+ .../rcutorture/configs/v3.12/P1-S-T-NH-SD-SMP-HP | 20 ++
+ .../rcutorture/configs/v3.12/P2-2-t-nh-sd-SMP-hp | 20 ++
+ .../rcutorture/configs/v3.12/P3-3-T-nh-SD-SMP-hp | 20 ++
+ .../rcutorture/configs/v3.12/P4-A-t-NH-sd-SMP-HP | 22 +++
+ .../rcutorture/configs/v3.12/P5-U-T-NH-sd-SMP-hp | 28 +++
+ .../rcutorture/configs/v3.12/P6---t-nh-SD-smp-hp | 18 ++
+ .../rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP | 30 +++
+ .../configs/v3.12/P7-4-T-NH-SD-SMP-HP-all | 30 +++
+ .../configs/v3.12/P7-4-T-NH-SD-SMP-HP-none | 30 +++
+ .../rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-hp | 30 +++
+ .../selftests/rcutorture/configs/v3.12/PT1-nh | 23 +++
+ .../selftests/rcutorture/configs/v3.12/PT2-NH | 22 +++
+ .../selftests/rcutorture/configs/v3.3/CFLIST | 14 ++
+ .../rcutorture/configs/v3.3/N1-S-T-NH-SD-SMP-HP | 19 ++
+ .../rcutorture/configs/v3.3/N2-2-t-nh-sd-SMP-hp | 20 ++
+ .../rcutorture/configs/v3.3/N3-3-T-nh-SD-SMP-hp | 22 +++
+ .../rcutorture/configs/v3.3/N4-A-t-NH-sd-SMP-HP | 18 ++
+ .../rcutorture/configs/v3.3/N5-U-T-NH-sd-SMP-hp | 22 +++
+ .../selftests/rcutorture/configs/v3.3/NT1-nh | 23 +++
+ .../selftests/rcutorture/configs/v3.3/NT3-NH | 20 ++
+ .../rcutorture/configs/v3.3/P1-S-T-NH-SD-SMP-HP | 20 ++
+ .../rcutorture/configs/v3.3/P2-2-t-nh-sd-SMP-hp | 20 ++
+ .../rcutorture/configs/v3.3/P3-3-T-nh-SD-SMP-hp | 20 ++
+ .../rcutorture/configs/v3.3/P4-A-t-NH-sd-SMP-HP | 22 +++
+ .../rcutorture/configs/v3.3/P5-U-T-NH-sd-SMP-hp | 28 +++
+ .../selftests/rcutorture/configs/v3.3/PT1-nh | 23 +++
+ .../selftests/rcutorture/configs/v3.3/PT2-NH | 22 +++
+ .../rcutorture/configs/v3.3/ver_functions.sh | 41 ++++
+ .../selftests/rcutorture/configs/v3.5/CFLIST | 14 ++
+ .../rcutorture/configs/v3.5/N1-S-T-NH-SD-SMP-HP | 19 ++
+ .../rcutorture/configs/v3.5/N2-2-t-nh-sd-SMP-hp | 20 ++
+ .../rcutorture/configs/v3.5/N3-3-T-nh-SD-SMP-hp | 22 +++
+ .../rcutorture/configs/v3.5/N4-A-t-NH-sd-SMP-HP | 18 ++
+ .../rcutorture/configs/v3.5/N5-U-T-NH-sd-SMP-hp | 22 +++
+ .../selftests/rcutorture/configs/v3.5/NT1-nh | 23 +++
+ .../selftests/rcutorture/configs/v3.5/NT3-NH | 20 ++
+ .../rcutorture/configs/v3.5/P1-S-T-NH-SD-SMP-HP | 20 ++
+ .../rcutorture/configs/v3.5/P2-2-t-nh-sd-SMP-hp | 20 ++
+ .../rcutorture/configs/v3.5/P3-3-T-nh-SD-SMP-hp | 20 ++
+ .../rcutorture/configs/v3.5/P4-A-t-NH-sd-SMP-HP | 22 +++
+ .../rcutorture/configs/v3.5/P5-U-T-NH-sd-SMP-hp | 28 +++
+ .../selftests/rcutorture/configs/v3.5/PT1-nh | 23 +++
+ .../selftests/rcutorture/configs/v3.5/PT2-NH | 22 +++
+ .../rcutorture/configs/v3.5/ver_functions.sh | 46 +++++
+ .../selftests/rcutorture/configs/ver_functions.sh | 46 +++++
+ .../testing/selftests/rcutorture/doc/TINY_RCU.txt | 40 ++++
+ .../selftests/rcutorture/doc/TREE_RCU-Kconfig.txt | 95 ++++++++++
+ tools/testing/selftests/rcutorture/doc/initrd.txt | 90 +++++++++
+ .../selftests/rcutorture/doc/rcu-test-image.txt | 42 +++++
+ 126 files changed, 3767 insertions(+), 197 deletions(-)
+ create mode 100644 tools/testing/selftests/rcutorture/.gitignore
+ create mode 100644 tools/testing/selftests/rcutorture/bin/config2frag.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/configNR_CPUS.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/configcheck.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/configinit.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/cpus2use.sh
+ create mode 100644 tools/testing/selftests/rcutorture/bin/functions.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-build.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh
+ create mode 100644 tools/testing/selftests/rcutorture/bin/kvm.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/parse-build.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/parse-console.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/parse-rcutorture.sh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/CFLIST
+ create mode 100644 tools/testing/selftests/rcutorture/configs/SRCU-N
+ create mode 100644 tools/testing/selftests/rcutorture/configs/SRCU-N.boot
+ create mode 100644 tools/testing/selftests/rcutorture/configs/SRCU-P
+ create mode 100644 tools/testing/selftests/rcutorture/configs/SRCU-P.boot
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TINY01
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TINY02
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE01
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE01.boot
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE02
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE03
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE04
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE04.boot
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE05
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE05.boot
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE06
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE07
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE08
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE08-T
+ create mode 100644 tools/testing/selftests/rcutorture/configs/TREE09
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/CFLIST
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N1-S-T-NH-SD-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N2-2-t-nh-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N3-3-T-nh-SD-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N4-A-t-NH-sd-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N5-U-T-NH-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/NT1-nh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/NT3-NH
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P1-S-T-NH-SD-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P2-2-t-nh-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P3-3-T-nh-SD-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P4-A-t-NH-sd-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P5-U-T-NH-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/PT1-nh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/PT2-NH
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/ver_functions.sh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/CFLIST
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N1-S-T-NH-SD-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N2-2-t-nh-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N3-3-T-nh-SD-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N4-A-t-NH-sd-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N5-U-T-NH-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N6---t-nh-SD-smp-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N7-4-T-NH-SD-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N8-2-T-NH-SD-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/NT1-nh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/NT3-NH
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P1-S-T-NH-SD-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P2-2-t-nh-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P3-3-T-nh-SD-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P4-A-t-NH-sd-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P5-U-T-NH-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P6---t-nh-SD-smp-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-all
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-none
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/PT1-nh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/PT2-NH
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/CFLIST
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N1-S-T-NH-SD-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N2-2-t-nh-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N3-3-T-nh-SD-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N4-A-t-NH-sd-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N5-U-T-NH-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/NT1-nh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/NT3-NH
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P1-S-T-NH-SD-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P2-2-t-nh-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P3-3-T-nh-SD-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P4-A-t-NH-sd-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P5-U-T-NH-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/PT1-nh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/PT2-NH
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/ver_functions.sh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/CFLIST
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N1-S-T-NH-SD-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N2-2-t-nh-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N3-3-T-nh-SD-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N4-A-t-NH-sd-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N5-U-T-NH-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/NT1-nh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/NT3-NH
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P1-S-T-NH-SD-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P2-2-t-nh-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P3-3-T-nh-SD-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P4-A-t-NH-sd-SMP-HP
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P5-U-T-NH-sd-SMP-hp
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/PT1-nh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/PT2-NH
+ create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/ver_functions.sh
+ create mode 100644 tools/testing/selftests/rcutorture/configs/ver_functions.sh
+ create mode 100644 tools/testing/selftests/rcutorture/doc/TINY_RCU.txt
+ create mode 100644 tools/testing/selftests/rcutorture/doc/TREE_RCU-Kconfig.txt
+ create mode 100644 tools/testing/selftests/rcutorture/doc/initrd.txt
+ create mode 100644 tools/testing/selftests/rcutorture/doc/rcu-test-image.txt
+Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
+$ git merge uprobes/for-next
+Already up-to-date.
+Merging kvm/linux-next (d6d63b51fe3b Merge tag 'kvm-s390-20131128' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-next)
+$ git merge kvm/linux-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 2 +-
+ arch/s390/kvm/diag.c | 2 +-
+ arch/s390/kvm/kvm-s390.c | 53 +++++++++++++++++++++------------------------
+ arch/s390/kvm/kvm-s390.h | 10 ++-------
+ arch/s390/kvm/priv.c | 4 +---
+ arch/s390/kvm/sigp.c | 56 ++++++++++++++++++++++++++++++++++++++++++------
+ arch/s390/kvm/trace.h | 1 +
+ 7 files changed, 79 insertions(+), 49 deletions(-)
+Merging kvm-arm/kvm-arm-next (ede582224231 Merge tag 'kvm-arm64/for-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into kvm-next)
+$ git merge kvm-arm/kvm-arm-next
+Already up-to-date.
+Merging kvm-ppc/kvm-ppc-next (27025a602cb9 powerpc: kvm: optimize "sc 1" as fast return)
+$ git merge kvm-ppc/kvm-ppc-next
+Merge made by the 'recursive' strategy.
+ arch/powerpc/kvm/book3s_hv.c | 10 ++++------
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 19 ++++++++++++++++++-
+ 2 files changed, 22 insertions(+), 7 deletions(-)
+Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1)
+$ git merge oprofile/for-next
+Already up-to-date.
+Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work)
+$ git merge fw-nohz/nohz/next
+Already up-to-date.
+Merging xen-tip/linux-next (7c2a5cd7ee0e Merge remote-tracking branch 'xentip/stable/for-linus-3.13' into linux-next)
+$ git merge xen-tip/linux-next
+Merge made by the 'recursive' strategy.
+ arch/arm/xen/enlighten.c | 4 ++--
+ drivers/xen/grant-table.c | 3 ++-
+ drivers/xen/privcmd.c | 9 +++++++--
+ 3 files changed, 11 insertions(+), 5 deletions(-)
+Merging percpu/for-next (b1a0fbfdde65 percpu: fix spurious sparse warnings from DEFINE_PER_CPU())
+$ git merge percpu/for-next
+Merge made by the 'recursive' strategy.
+ include/linux/percpu-defs.h | 1 +
+ 1 file changed, 1 insertion(+)
+Merging workqueues/for-next (4e8b22bd1a37 workqueue: fix pool ID allocation leakage and remove BUILD_BUG_ON() in init_workqueues)
+$ git merge workqueues/for-next
+Already up-to-date.
+Merging drivers-x86/linux-next (a80e1053aaa3 x86, wmi fix modalias_show return values)
+$ git merge drivers-x86/linux-next
+Already up-to-date.
+Merging chrome-platform/for-next (2b8454a75b90 platform/chrome: unregister platform driver/device when module exit)
+$ git merge chrome-platform/for-next
+Merge made by the 'recursive' strategy.
+ drivers/platform/chrome/Kconfig | 14 ++
+ drivers/platform/chrome/Makefile | 1 +
+ drivers/platform/chrome/chromeos_laptop.c | 298 +++++++++++++++++++++---------
+ drivers/platform/chrome/chromeos_pstore.c | 101 ++++++++++
+ 4 files changed, 323 insertions(+), 91 deletions(-)
+ create mode 100644 drivers/platform/chrome/chromeos_pstore.c
+Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away)
+$ git merge sysctl/master
+Already up-to-date.
+Merging regmap/for-next (d929555edfba Merge remote-tracking branch 'regmap/topic/core' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/regmap-mmio.c | 11 ++++++-----
+ drivers/base/regmap/regmap.c | 12 ++++++++----
+ 2 files changed, 14 insertions(+), 9 deletions(-)
+Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt)
+$ git merge hsi/for-next
+Already up-to-date.
+Merging leds/for-next (4a87d107bfc3 leds: lp5521/5523: Remove duplicate mutex)
+$ git merge leds/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/leds/tca6507.txt | 16 ++
+ Documentation/leds/leds-lp55xx.txt | 10 +-
+ drivers/leds/leds-lp5521.c | 30 ++-
+ drivers/leds/leds-lp5523.c | 32 ++--
+ drivers/leds/leds-lp55xx-common.c | 2 +
+ drivers/leds/leds-tca6507.c | 204 +++++++++++----------
+ 6 files changed, 180 insertions(+), 114 deletions(-)
+Merging driver-core/driver-core-next (bbc780f8bab5 driver core: fix device_create() error path)
+$ git merge driver-core/driver-core-next
+Resolved 'fs/sysfs/file.c' using previous resolution.
+Auto-merging fs/sysfs/file.c
+CONFLICT (content): Merge conflict in fs/sysfs/file.c
+Auto-merging fs/kernfs/inode.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c2fbc96b0661] Merge remote-tracking branch 'driver-core/driver-core-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/kobject.txt | 5 +-
+ arch/x86/kernel/microcode_amd.c | 2 +-
+ arch/x86/kernel/microcode_intel.c | 2 +-
+ drivers/base/core.c | 3 +-
+ drivers/base/firmware_class.c | 86 +++-
+ drivers/firmware/dmi-sysfs.c | 3 +-
+ fs/Makefile | 2 +-
+ fs/kernfs/Makefile | 5 +
+ fs/kernfs/dir.c | 1020 ++++++++++++++++++++++++++++++++++++
+ fs/kernfs/file.c | 813 +++++++++++++++++++++++++++++
+ fs/{sysfs => kernfs}/inode.c | 179 ++++---
+ fs/kernfs/kernfs-internal.h | 122 +++++
+ fs/kernfs/mount.c | 165 ++++++
+ fs/kernfs/symlink.c | 152 ++++++
+ fs/namespace.c | 2 +
+ fs/sysfs/Makefile | 2 +-
+ fs/sysfs/dir.c | 1030 +------------------------------------
+ fs/sysfs/file.c | 929 ++++++---------------------------
+ fs/sysfs/group.c | 59 ++-
+ fs/sysfs/mount.c | 182 +------
+ fs/sysfs/symlink.c | 179 +------
+ fs/sysfs/sysfs.h | 228 +-------
+ include/linux/firmware.h | 7 +
+ include/linux/kernfs.h | 356 +++++++++++++
+ include/linux/sysfs.h | 43 +-
+ lib/kobject.c | 41 +-
+ samples/kobject/kset-example.c | 1 +
+ 27 files changed, 3140 insertions(+), 2478 deletions(-)
+ create mode 100644 fs/kernfs/Makefile
+ create mode 100644 fs/kernfs/dir.c
+ create mode 100644 fs/kernfs/file.c
+ rename fs/{sysfs => kernfs}/inode.c (67%)
+ create mode 100644 fs/kernfs/kernfs-internal.h
+ create mode 100644 fs/kernfs/mount.c
+ create mode 100644 fs/kernfs/symlink.c
+ create mode 100644 include/linux/kernfs.h
+Merging tty/tty-next (acc0f67f307f tty: Halve flip buffer GFP_ATOMIC memory consumption)
+$ git merge tty/tty-next
+Auto-merging drivers/tty/n_tty.c
+Merge made by the 'recursive' strategy.
+ drivers/input/serio/serport.c | 28 +++----
+ drivers/parport/parport_serial.c | 5 --
+ drivers/staging/fwserial/Kconfig | 20 +++++
+ drivers/staging/fwserial/fwserial.c | 151 ++++++++++--------------------------
+ drivers/staging/fwserial/fwserial.h | 24 +-----
+ drivers/tty/n_gsm.c | 44 ++++++++---
+ drivers/tty/n_r3964.c | 2 +-
+ drivers/tty/n_tty.c | 87 ++++++++++-----------
+ drivers/tty/rocket.c | 2 +-
+ drivers/tty/serial/8250/8250_dw.c | 8 --
+ drivers/tty/serial/amba-pl010.c | 15 ++--
+ drivers/tty/serial/amba-pl011.c | 21 +++--
+ drivers/tty/serial/imx.c | 8 ++
+ drivers/tty/serial/mxs-auart.c | 9 ++-
+ drivers/tty/serial/pch_uart.c | 3 +-
+ drivers/tty/serial/rp2.c | 2 +-
+ drivers/tty/serial/serial_core.c | 8 +-
+ drivers/tty/tty_buffer.c | 110 ++++++++++++++------------
+ include/linux/amba/serial.h | 1 -
+ include/linux/tty.h | 7 +-
+ include/linux/tty_flip.h | 11 ++-
+ include/linux/tty_ldisc.h | 6 +-
+ 22 files changed, 271 insertions(+), 301 deletions(-)
+Merging usb/usb-next (756a2eed67e6 usb: wusbcore: set packet count correctly on isoc transfers)
+$ git merge usb/usb-next
+Auto-merging drivers/usb/wusbcore/security.c
+Auto-merging drivers/usb/host/xhci-ring.c
+Auto-merging drivers/usb/host/r8a66597-hcd.c
+Auto-merging drivers/usb/host/ohci-pxa27x.c
+Auto-merging drivers/usb/core/hub.c
+Auto-merging drivers/usb/class/cdc-acm.c
+Auto-merging drivers/usb/chipidea/core.c
+Merge made by the 'recursive' strategy.
+ drivers/staging/dwc2/hcd.c | 2 +
+ drivers/staging/octeon-usb/octeon-hcd.c | 1 +
+ drivers/staging/ozwpan/ozhcd.c | 2 +
+ drivers/usb/atm/usbatm.c | 8 +-
+ drivers/usb/c67x00/c67x00-hcd.c | 2 +
+ drivers/usb/chipidea/Makefile | 2 +-
+ drivers/usb/chipidea/ci_hdrc_pci.c | 2 +-
+ drivers/usb/chipidea/core.c | 3 +-
+ drivers/usb/chipidea/usbmisc_imx.c | 46 +++++++
+ drivers/usb/class/cdc-acm.c | 116 ++++++++++++++++--
+ drivers/usb/class/cdc-acm.h | 3 +
+ drivers/usb/core/config.c | 7 --
+ drivers/usb/core/driver.c | 4 +-
+ drivers/usb/core/hcd-pci.c | 1 +
+ drivers/usb/core/hcd.c | 38 ++++--
+ drivers/usb/core/hub.c | 39 ++----
+ drivers/usb/core/quirks.c | 3 -
+ drivers/usb/core/urb.c | 4 +-
+ drivers/usb/dwc3/dwc3-pci.c | 2 +-
+ drivers/usb/gadget/amd5536udc.c | 2 +-
+ drivers/usb/gadget/fsl_qe_udc.c | 2 +-
+ drivers/usb/gadget/fsl_udc_core.c | 2 +-
+ drivers/usb/gadget/pch_udc.c | 2 +-
+ drivers/usb/host/Makefile | 2 -
+ drivers/usb/host/ehci-atmel.c | 1 +
+ drivers/usb/host/ehci-dbg.c | 10 +-
+ drivers/usb/host/ehci-exynos.c | 1 +
+ drivers/usb/host/ehci-fsl.c | 3 +-
+ drivers/usb/host/ehci-grlib.c | 1 +
+ drivers/usb/host/ehci-hcd.c | 14 +--
+ drivers/usb/host/ehci-hub.c | 6 +-
+ drivers/usb/host/ehci-mv.c | 3 +-
+ drivers/usb/host/ehci-mxc.c | 1 +
+ drivers/usb/host/ehci-octeon.c | 1 +
+ drivers/usb/host/ehci-omap.c | 1 +
+ drivers/usb/host/ehci-orion.c | 1 +
+ drivers/usb/host/ehci-platform.c | 1 +
+ drivers/usb/host/ehci-pmcmsp.c | 4 +-
+ drivers/usb/host/ehci-ppc-of.c | 1 +
+ drivers/usb/host/ehci-ps3.c | 1 +
+ drivers/usb/host/ehci-q.c | 4 +-
+ drivers/usb/host/ehci-sead3.c | 1 +
+ drivers/usb/host/ehci-sh.c | 1 +
+ drivers/usb/host/ehci-spear.c | 1 +
+ drivers/usb/host/ehci-tegra.c | 1 +
+ drivers/usb/host/ehci-tilegx.c | 1 +
+ drivers/usb/host/ehci-w90x900.c | 1 +
+ drivers/usb/host/ehci-xilinx-of.c | 4 +-
+ drivers/usb/host/ehci.h | 8 +-
+ drivers/usb/host/fhci-hcd.c | 2 +
+ drivers/usb/host/fotg210-hcd.c | 96 +++------------
+ drivers/usb/host/fotg210.h | 8 --
+ drivers/usb/host/fusbh200-hcd.c | 98 ++-------------
+ drivers/usb/host/fusbh200.h | 12 --
+ drivers/usb/host/hwa-hc.c | 23 ++--
+ drivers/usb/host/imx21-dbg.c | 4 +
+ drivers/usb/host/imx21-hcd.c | 7 +-
+ drivers/usb/host/imx21-hcd.h | 4 +
+ drivers/usb/host/isp116x-hcd.c | 4 +-
+ drivers/usb/host/isp1362-hcd.c | 4 +-
+ drivers/usb/host/isp1760-hcd.c | 1 +
+ drivers/usb/host/ohci-at91.c | 15 ++-
+ drivers/usb/host/ohci-da8xx.c | 18 ++-
+ drivers/usb/host/ohci-dbg.c | 69 -----------
+ drivers/usb/host/ohci-exynos.c | 23 ++--
+ drivers/usb/host/ohci-hcd.c | 29 ++---
+ drivers/usb/host/ohci-hub.c | 6 +-
+ drivers/usb/host/ohci-jz4740.c | 1 +
+ drivers/usb/host/ohci-nxp.c | 4 +-
+ drivers/usb/host/ohci-octeon.c | 2 +
+ drivers/usb/host/ohci-omap.c | 1 +
+ drivers/usb/host/ohci-omap3.c | 1 +
+ drivers/usb/host/ohci-platform.c | 2 +
+ drivers/usb/host/ohci-ppc-of.c | 4 +-
+ drivers/usb/host/ohci-ps3.c | 1 +
+ drivers/usb/host/ohci-pxa27x.c | 4 +-
+ drivers/usb/host/ohci-q.c | 12 +-
+ drivers/usb/host/ohci-s3c2410.c | 22 +---
+ drivers/usb/host/ohci-sa1111.c | 4 +-
+ drivers/usb/host/ohci-sm501.c | 1 +
+ drivers/usb/host/ohci-spear.c | 16 ++-
+ drivers/usb/host/ohci-tilegx.c | 1 +
+ drivers/usb/host/ohci-tmio.c | 1 +
+ drivers/usb/host/ohci.h | 13 +-
+ drivers/usb/host/oxu210hp-hcd.c | 5 +
+ drivers/usb/host/r8a66597-hcd.c | 3 +-
+ drivers/usb/host/sl811-hcd.c | 2 +
+ drivers/usb/host/u132-hcd.c | 3 +-
+ drivers/usb/host/uhci-debug.c | 4 +-
+ drivers/usb/host/uhci-grlib.c | 1 +
+ drivers/usb/host/uhci-hcd.c | 44 ++++---
+ drivers/usb/host/uhci-pci.c | 2 +-
+ drivers/usb/host/uhci-platform.c | 1 +
+ drivers/usb/host/whci/hcd.c | 1 +
+ drivers/usb/host/xhci-dbg.c | 42 +++----
+ drivers/usb/host/xhci-hub.c | 106 ++++++++--------
+ drivers/usb/host/xhci-mem.c | 68 +++++------
+ drivers/usb/host/xhci-plat.c | 1 +
+ drivers/usb/host/xhci-ring.c | 36 +++---
+ drivers/usb/host/xhci-trace.h | 6 +-
+ drivers/usb/host/xhci.c | 173 +++++++++++++-------------
+ drivers/usb/host/xhci.h | 54 ++-------
+ drivers/usb/misc/usbtest.c | 17 ++-
+ drivers/usb/musb/musb_host.c | 1 +
+ drivers/usb/phy/phy-msm-usb.c | 1 +
+ drivers/usb/phy/phy-mv-usb.c | 6 +-
+ drivers/usb/renesas_usbhs/mod_host.c | 1 +
+ drivers/usb/storage/protocol.c | 80 ++++--------
+ drivers/usb/wusbcore/cbaf.c | 8 +-
+ drivers/usb/wusbcore/security.c | 22 ++--
+ drivers/usb/wusbcore/wa-hc.h | 7 +-
+ drivers/usb/wusbcore/wa-rpipe.c | 10 +-
+ drivers/usb/wusbcore/wa-xfer.c | 209 ++++++++++++++++++++------------
+ drivers/uwb/umc-bus.c | 2 +-
+ include/linux/scatterlist.h | 1 +
+ include/linux/usb/hcd.h | 1 +
+ include/linux/uwb/umc.h | 2 +-
+ lib/scatterlist.c | 3 +-
+ 118 files changed, 878 insertions(+), 925 deletions(-)
+Merging usb-gadget/next (c6d7641470fe usb: dwc3: omap: remove unnecessary lock)
+$ git merge usb-gadget/next
+Auto-merging include/linux/usb/otg-fsm.h
+Auto-merging drivers/usb/phy/phy-mxs-usb.c
+Auto-merging drivers/usb/musb/musb_host.c
+Auto-merging drivers/usb/musb/musb_core.c
+Auto-merging drivers/usb/gadget/zero.c
+Auto-merging drivers/usb/gadget/composite.c
+Auto-merging drivers/usb/gadget/Kconfig
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/configfs-usb-gadget-loopback | 8 +
+ .../ABI/testing/configfs-usb-gadget-sourcesink | 12 +
+ Documentation/ABI/testing/sysfs-platform-tahvo-usb | 16 +
+ arch/arm/mach-omap1/include/mach/usb.h | 38 +-
+ drivers/usb/dwc3/dwc3-omap.c | 12 +-
+ drivers/usb/gadget/Kconfig | 13 +
+ drivers/usb/gadget/Makefile | 2 +-
+ drivers/usb/gadget/composite.c | 16 +-
+ drivers/usb/gadget/epautoconf.c | 2 +-
+ drivers/usb/gadget/f_hid.c | 18 +-
+ drivers/usb/gadget/f_loopback.c | 140 ++++++-
+ drivers/usb/gadget/f_midi.c | 22 +-
+ drivers/usb/gadget/f_sourcesink.c | 341 ++++++++++++++-
+ drivers/usb/gadget/g_zero.h | 24 +-
+ drivers/usb/gadget/goku_udc.c | 12 +-
+ drivers/usb/gadget/r8a66597-udc.c | 6 +-
+ drivers/usb/gadget/u_ether.c | 2 +-
+ drivers/usb/gadget/u_ether.h | 2 +-
+ drivers/usb/gadget/u_f.c | 32 ++
+ drivers/usb/gadget/u_f.h | 26 ++
+ drivers/usb/gadget/zero.c | 8 +-
+ drivers/usb/musb/musb_core.c | 25 +-
+ drivers/usb/musb/musb_dsps.c | 117 +++++-
+ drivers/usb/musb/musb_host.c | 9 +-
+ drivers/usb/musb/musb_host.h | 4 +
+ drivers/usb/musb/musb_virthub.c | 4 +-
+ drivers/usb/phy/Kconfig | 35 +-
+ drivers/usb/phy/Makefile | 6 +-
+ drivers/usb/phy/phy-fsl-usb.c | 7 +-
+ drivers/usb/phy/phy-fsl-usb.h | 2 +-
+ drivers/usb/phy/phy-fsm-usb.c | 10 +-
+ drivers/usb/phy/phy-mxs-usb.c | 11 +-
+ drivers/usb/phy/phy-omap-otg.c | 169 ++++++++
+ drivers/usb/phy/phy-tahvo.c | 463 +++++++++++++++++++++
+ include/linux/platform_data/usb-omap1.h | 53 +++
+ include/linux/usb/musb.h | 3 +
+ .../phy-fsm-usb.h => include/linux/usb/otg-fsm.h | 10 +-
+ 37 files changed, 1540 insertions(+), 140 deletions(-)
+ create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-loopback
+ create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-sourcesink
+ create mode 100644 Documentation/ABI/testing/sysfs-platform-tahvo-usb
+ create mode 100644 drivers/usb/gadget/u_f.c
+ create mode 100644 drivers/usb/gadget/u_f.h
+ create mode 100644 drivers/usb/phy/phy-omap-otg.c
+ create mode 100644 drivers/usb/phy/phy-tahvo.c
+ create mode 100644 include/linux/platform_data/usb-omap1.h
+ rename drivers/usb/phy/phy-fsm-usb.h => include/linux/usb/otg-fsm.h (96%)
+$ git reset --hard HEAD^
+HEAD is now at a6adf507bfb8 Merge remote-tracking branch 'usb/usb-next'
+Merging next-20131206 version of usb-gadget
+$ git merge -m next-20131206/usb-gadget 989c78dd56307c85f710533130a2a464f6f3c5ae
+Merge made by the 'recursive' strategy.
+ drivers/usb/gadget/r8a66597-udc.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+Merging staging/staging-next (99ec297ad6d2 staging: btmtk_usb: remove driver)
+$ git merge staging/staging-next
+Resolved 'include/linux/hid-sensor-ids.h' using previous resolution.
+Auto-merging include/linux/hid-sensor-ids.h
+CONFLICT (content): Merge conflict in include/linux/hid-sensor-ids.h
+Removing drivers/staging/lustre/lustre/ptlrpc/wirehdr.c
+Removing drivers/staging/lustre/lustre/ptlrpc/llog_server.c
+Removing drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c
+Auto-merging drivers/staging/lustre/lustre/llite/lloop.c
+Removing drivers/staging/lustre/lustre/libcfs/lwt.c
+Removing drivers/staging/lustre/lustre/include/lustre/lustreapi.h
+Removing drivers/staging/lustre/lustre/include/lustre/liblustreapi.h
+Removing drivers/staging/lustre/lustre/include/lu_target.h
+Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h
+Auto-merging drivers/staging/dwc2/hcd.c
+Removing drivers/staging/btmtk_usb/btmtk_usb.h
+Removing drivers/staging/btmtk_usb/btmtk_usb.c
+Removing drivers/staging/btmtk_usb/TODO
+Removing drivers/staging/btmtk_usb/README
+Removing drivers/staging/btmtk_usb/Makefile
+Removing drivers/staging/btmtk_usb/Kconfig
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 9eb3b46188c1] Merge remote-tracking branch 'staging/staging-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/iio/light/tsl2563.txt | 19 +
+ .../bindings/iio/magnetometer/hmc5843.txt | 17 +
+ Documentation/devicetree/bindings/staging/dwc2.txt | 4 +-
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ Documentation/driver-model/devres.txt | 2 +
+ Documentation/vme_api.txt | 12 +-
+ drivers/iio/accel/hid-sensor-accel-3d.c | 12 +
+ drivers/iio/adc/mcp3422.c | 9 +-
+ drivers/iio/adc/viperboard_adc.c | 20 +-
+ drivers/iio/dac/ad5421.c | 12 +-
+ drivers/iio/dac/ad5755.c | 12 +-
+ drivers/iio/gyro/adis16130.c | 9 +-
+ drivers/iio/gyro/adxrs450.c | 14 +-
+ drivers/iio/gyro/hid-sensor-gyro-3d.c | 11 +
+ drivers/iio/industrialio-core.c | 101 +
+ drivers/iio/industrialio-event.c | 6 +
+ drivers/iio/industrialio-trigger.c | 28 +-
+ drivers/iio/light/hid-sensor-als.c | 11 +
+ drivers/iio/light/tsl2563.c | 4 +
+ drivers/iio/light/vcnl4000.c | 9 +-
+ drivers/iio/magnetometer/hid-sensor-magn-3d.c | 12 +
+ drivers/iio/pressure/Kconfig | 12 +
+ drivers/iio/pressure/Makefile | 1 +
+ drivers/iio/pressure/mpl3115.c | 329 ++
+ drivers/staging/Kconfig | 4 +-
+ drivers/staging/Makefile | 2 +-
+ drivers/staging/android/alarm-dev.c | 8 +-
+ drivers/staging/android/sync.h | 50 +-
+ drivers/staging/bcm/Bcmchar.c | 136 +-
+ drivers/staging/bcm/DDRInit.c | 1501 ++++---
+ drivers/staging/btmtk_usb/Kconfig | 11 -
+ drivers/staging/btmtk_usb/Makefile | 1 -
+ drivers/staging/btmtk_usb/README | 14 -
+ drivers/staging/btmtk_usb/TODO | 10 -
+ drivers/staging/btmtk_usb/btmtk_usb.c | 1810 --------
+ drivers/staging/btmtk_usb/btmtk_usb.h | 138 -
+ drivers/staging/ced1401/ced_ioc.c | 2 +-
+ drivers/staging/comedi/Makefile | 2 +
+ drivers/staging/comedi/comedi_buf.c | 99 +-
+ drivers/staging/comedi/comedi_fops.c | 488 ++-
+ drivers/staging/comedi/comedi_internal.h | 4 +
+ drivers/staging/comedi/comedidev.h | 39 +-
+ drivers/staging/comedi/drivers.c | 14 +-
+ drivers/staging/comedi/drivers/8255_pci.c | 2 +-
+ drivers/staging/comedi/drivers/Makefile | 1 +
+ .../comedi/drivers/addi-data/hwdrv_apci3120.c | 6 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_035.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_1032.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_1500.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_1516.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_1564.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_16xx.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_2032.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_2200.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_3120.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_3200.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_3501.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_3xxx.c | 2 +-
+ drivers/staging/comedi/drivers/adl_pci6208.c | 2 +-
+ drivers/staging/comedi/drivers/adl_pci7x3x.c | 2 +-
+ drivers/staging/comedi/drivers/adl_pci8164.c | 2 +-
+ drivers/staging/comedi/drivers/adl_pci9111.c | 33 +-
+ drivers/staging/comedi/drivers/adl_pci9118.c | 47 +-
+ drivers/staging/comedi/drivers/adq12b.c | 2 -
+ drivers/staging/comedi/drivers/adv_pci1710.c | 39 +-
+ drivers/staging/comedi/drivers/adv_pci1723.c | 2 +-
+ drivers/staging/comedi/drivers/adv_pci1724.c | 2 +-
+ drivers/staging/comedi/drivers/adv_pci_dio.c | 2 +-
+ .../staging/comedi/drivers/amplc_dio200_common.c | 2 +-
+ drivers/staging/comedi/drivers/amplc_dio200_pci.c | 2 +-
+ drivers/staging/comedi/drivers/amplc_pc236.c | 4 +-
+ drivers/staging/comedi/drivers/amplc_pci224.c | 18 +-
+ drivers/staging/comedi/drivers/amplc_pci230.c | 81 +-
+ drivers/staging/comedi/drivers/amplc_pci263.c | 2 +-
+ drivers/staging/comedi/drivers/c6xdigio.c | 54 -
+ drivers/staging/comedi/drivers/cb_pcidas.c | 2 +-
+ drivers/staging/comedi/drivers/cb_pcidas64.c | 128 +-
+ drivers/staging/comedi/drivers/cb_pcidda.c | 2 +-
+ drivers/staging/comedi/drivers/cb_pcimdas.c | 19 +-
+ drivers/staging/comedi/drivers/cb_pcimdda.c | 2 +-
+ drivers/staging/comedi/drivers/contec_pci_dio.c | 2 +-
+ drivers/staging/comedi/drivers/daqboard2000.c | 2 +-
+ drivers/staging/comedi/drivers/das08_pci.c | 2 +-
+ drivers/staging/comedi/drivers/das16m1.c | 83 +-
+ drivers/staging/comedi/drivers/das1800.c | 88 +-
+ drivers/staging/comedi/drivers/das6402.c | 9 -
+ drivers/staging/comedi/drivers/dmm32at.c | 68 +-
+ drivers/staging/comedi/drivers/dt2801.c | 37 +-
+ drivers/staging/comedi/drivers/dt2811.c | 101 +-
+ drivers/staging/comedi/drivers/dt2814.c | 70 +-
+ drivers/staging/comedi/drivers/dt2815.c | 19 +-
+ drivers/staging/comedi/drivers/dt282x.c | 140 +-
+ drivers/staging/comedi/drivers/dt3000.c | 54 +-
+ drivers/staging/comedi/drivers/dyna_pci10xx.c | 5 +-
+ drivers/staging/comedi/drivers/fl512.c | 2 -
+ drivers/staging/comedi/drivers/gsc_hpdi.c | 80 +-
+ drivers/staging/comedi/drivers/icp_multi.c | 2 +-
+ drivers/staging/comedi/drivers/jr3_pci.c | 2 +-
+ drivers/staging/comedi/drivers/ke_counter.c | 2 +-
+ drivers/staging/comedi/drivers/me4000.c | 39 +-
+ drivers/staging/comedi/drivers/me_daq.c | 2 +-
+ drivers/staging/comedi/drivers/mite.c | 145 +-
+ drivers/staging/comedi/drivers/mite.h | 12 -
+ drivers/staging/comedi/drivers/mpc624.c | 19 +-
+ drivers/staging/comedi/drivers/ni_6527.c | 2 +-
+ drivers/staging/comedi/drivers/ni_65xx.c | 7 +-
+ drivers/staging/comedi/drivers/ni_660x.c | 2 +-
+ drivers/staging/comedi/drivers/ni_670x.c | 2 +-
+ drivers/staging/comedi/drivers/ni_at_a2150.c | 104 +-
+ drivers/staging/comedi/drivers/ni_atmio.c | 15 -
+ drivers/staging/comedi/drivers/ni_atmio16d.c | 44 +-
+ drivers/staging/comedi/drivers/ni_labpc_pci.c | 2 +-
+ drivers/staging/comedi/drivers/ni_mio_common.c | 157 +-
+ drivers/staging/comedi/drivers/ni_mio_cs.c | 2 -
+ drivers/staging/comedi/drivers/ni_pcidio.c | 179 +-
+ drivers/staging/comedi/drivers/ni_pcimio.c | 29 +-
+ drivers/staging/comedi/drivers/ni_tio.c | 1 -
+ drivers/staging/comedi/drivers/pcl812.c | 82 +-
+ drivers/staging/comedi/drivers/pcl816.c | 174 +-
+ drivers/staging/comedi/drivers/pcl818.c | 145 +-
+ drivers/staging/comedi/drivers/pcm3724.c | 6 -
+ drivers/staging/comedi/drivers/pcmmio.c | 40 +-
+ drivers/staging/comedi/drivers/pcmuio.c | 428 +-
+ drivers/staging/comedi/drivers/plx9080.h | 13 +-
+ drivers/staging/comedi/drivers/rtd520.c | 7 +-
+ drivers/staging/comedi/drivers/s626.c | 19 +-
+ drivers/staging/comedi/drivers/skel.c | 2 +-
+ drivers/staging/comedi/drivers/unioxx5.c | 68 +-
+ drivers/staging/comedi/kcomedilib/Makefile | 2 +
+ .../staging/comedi/kcomedilib/kcomedilib_main.c | 74 +-
+ drivers/staging/comedi/proc.c | 6 +-
+ drivers/staging/comedi/range.c | 9 +-
+ drivers/staging/crystalhd/bc_dts_glob_lnx.h | 2 +-
+ drivers/staging/crystalhd/crystalhd_cmds.c | 4 +-
+ drivers/staging/crystalhd/crystalhd_cmds.h | 2 +-
+ drivers/staging/crystalhd/crystalhd_fw_if.h | 2 +-
+ drivers/staging/crystalhd/crystalhd_hw.c | 2 +-
+ drivers/staging/crystalhd/crystalhd_hw.h | 6 +-
+ drivers/staging/crystalhd/crystalhd_lnx.c | 2 +-
+ drivers/staging/crystalhd/crystalhd_lnx.h | 2 +-
+ drivers/staging/crystalhd/crystalhd_misc.c | 4 +-
+ drivers/staging/crystalhd/crystalhd_misc.h | 2 +-
+ drivers/staging/cxt1e1/comet.c | 60 +-
+ drivers/staging/cxt1e1/comet.h | 601 +--
+ drivers/staging/cxt1e1/functions.c | 2 +-
+ drivers/staging/cxt1e1/musycc.c | 4 +-
+ drivers/staging/cxt1e1/pmcc4_drv.c | 10 +-
+ drivers/staging/cxt1e1/pmcc4_private.h | 2 +-
+ drivers/staging/cxt1e1/sbeid.c | 323 +-
+ drivers/staging/dgnc/dgnc_trace.c | 18 +-
+ drivers/staging/dgrp/dgrp_net_ops.c | 330 +-
+ drivers/staging/dwc2/core.c | 378 +-
+ drivers/staging/dwc2/core.h | 62 +-
+ drivers/staging/dwc2/core_intr.c | 10 +-
+ drivers/staging/dwc2/hcd.c | 22 +-
+ drivers/staging/dwc2/hcd.h | 4 +-
+ drivers/staging/dwc2/hcd_ddma.c | 8 +-
+ drivers/staging/dwc2/hcd_intr.c | 6 +-
+ drivers/staging/dwc2/hcd_queue.c | 195 +-
+ drivers/staging/dwc2/pci.c | 2 +-
+ drivers/staging/dwc2/platform.c | 60 +-
+ drivers/staging/et131x/et131x.c | 449 +-
+ drivers/staging/et131x/et131x.h | 40 -
+ drivers/staging/ft1000/ft1000-pcmcia/boot.h | 304 +-
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 766 ++--
+ drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 2 +
+ .../staging/ft1000/ft1000-usb/ft1000_download.c | 132 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 1308 +++---
+ drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 14 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 4 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 5 -
+ drivers/staging/gdm724x/gdm_lte.c | 44 +-
+ drivers/staging/gdm724x/gdm_mux.c | 8 +-
+ drivers/staging/gdm724x/gdm_usb.c | 40 +-
+ drivers/staging/iio/accel/adis16220_core.c | 7 +-
+ drivers/staging/iio/adc/ad7816.c | 12 +-
+ drivers/staging/iio/adc/lpc32xx_adc.c | 12 +-
+ drivers/staging/iio/addac/adt7316-i2c.c | 6 -
+ drivers/staging/iio/addac/adt7316-spi.c | 6 -
+ drivers/staging/iio/addac/adt7316.c | 12 +-
+ drivers/staging/iio/addac/adt7316.h | 1 -
+ drivers/staging/iio/gyro/adis16060_core.c | 10 +-
+ drivers/staging/iio/light/isl29018.c | 13 +-
+ drivers/staging/iio/magnetometer/hmc5843.c | 7 +
+ drivers/staging/iio/resolver/ad2s1200.c | 10 +-
+ drivers/staging/imx-drm/Kconfig | 6 +
+ drivers/staging/imx-drm/Makefile | 1 +
+ drivers/staging/imx-drm/imx-drm-core.c | 4 +-
+ drivers/staging/imx-drm/imx-hdmi.c | 1916 +++++++++
+ drivers/staging/imx-drm/imx-hdmi.h | 1032 +++++
+ drivers/staging/imx-drm/imx-ldb.c | 5 +-
+ drivers/staging/keucr/smil.h | 6 -
+ drivers/staging/keucr/smilmain.c | 99 +-
+ drivers/staging/keucr/smilsub.c | 37 +-
+ drivers/staging/keucr/smscsi.c | 28 +-
+ .../staging/lustre/include/linux/libcfs/curproc.h | 1 -
+ .../staging/lustre/include/linux/libcfs/libcfs.h | 2 -
+ .../lustre/include/linux/libcfs/libcfs_ioctl.h | 63 +-
+ .../lustre/include/linux/libcfs/linux/kp30.h | 149 +-
+ .../lustre/include/linux/libcfs/linux/libcfs.h | 1 -
+ .../lustre/include/linux/libcfs/linux/linux-fs.h | 92 -
+ drivers/staging/lustre/include/linux/lnet/types.h | 11 -
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 1 -
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 3 -
+ .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 358 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 1 -
+ .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 6 -
+ .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.c | 307 --
+ .../lustre/lnet/klnds/socklnd/socklnd_modparams.c | 124 +-
+ drivers/staging/lustre/lnet/lnet/acceptor.c | 16 +-
+ drivers/staging/lustre/lnet/lnet/api-ni.c | 16 +-
+ drivers/staging/lustre/lnet/lnet/lib-move.c | 4 +-
+ drivers/staging/lustre/lnet/lnet/lib-msg.c | 8 +-
+ drivers/staging/lustre/lnet/lnet/lib-ptl.c | 4 +-
+ drivers/staging/lustre/lnet/lnet/module.c | 4 +-
+ drivers/staging/lustre/lnet/lnet/router.c | 44 +-
+ drivers/staging/lustre/lnet/lnet/router_proc.c | 14 -
+ drivers/staging/lustre/lnet/selftest/brw_test.c | 7 +-
+ drivers/staging/lustre/lnet/selftest/conctl.c | 56 +-
+ drivers/staging/lustre/lnet/selftest/conrpc.c | 2 +-
+ drivers/staging/lustre/lnet/selftest/console.c | 103 +-
+ drivers/staging/lustre/lnet/selftest/console.h | 6 +-
+ drivers/staging/lustre/lnet/selftest/framework.c | 8 +-
+ drivers/staging/lustre/lnet/selftest/ping_test.c | 3 +-
+ drivers/staging/lustre/lnet/selftest/rpc.c | 2 -
+ drivers/staging/lustre/lnet/selftest/selftest.h | 3 -
+ drivers/staging/lustre/lnet/selftest/timer.c | 11 +-
+ drivers/staging/lustre/lustre/fid/Makefile | 3 +-
+ drivers/staging/lustre/lustre/fid/lproc_fid.c | 2 -
+ drivers/staging/lustre/lustre/fld/Makefile | 3 +-
+ drivers/staging/lustre/lustre/fld/fld_internal.h | 1 -
+ drivers/staging/lustre/lustre/fld/fld_request.c | 7 +-
+ drivers/staging/lustre/lustre/fld/lproc_fld.c | 3 -
+ drivers/staging/lustre/lustre/include/cl_object.h | 6 +-
+ drivers/staging/lustre/lustre/include/dt_object.h | 2 +-
+ .../lustre/lustre/include/linux/lustre_acl.h | 18 +-
+ .../lustre/lustre/include/linux/lustre_intent.h | 2 +-
+ .../lustre/lustre/include/linux/lustre_lite.h | 1 +
+ .../staging/lustre/lustre/include/lprocfs_status.h | 8 +-
+ drivers/staging/lustre/lustre/include/lu_object.h | 19 -
+ drivers/staging/lustre/lustre/include/lu_target.h | 91 -
+ .../lustre/lustre/include/lustre/liblustreapi.h | 43 -
+ .../lustre/lustre/include/lustre/lustre_idl.h | 72 +-
+ .../lustre/lustre/include/lustre/lustre_user.h | 27 +-
+ .../lustre/lustre/include/lustre/lustreapi.h | 310 --
+ .../staging/lustre/lustre/include/lustre_disk.h | 1 +
+ drivers/staging/lustre/lustre/include/lustre_dlm.h | 3 +-
+ .../lustre/lustre/include/lustre_dlm_flags.h | 90 +-
+ drivers/staging/lustre/lustre/include/lustre_ha.h | 3 -
+ drivers/staging/lustre/lustre/include/lustre_lib.h | 11 +-
+ drivers/staging/lustre/lustre/include/lustre_log.h | 13 +-
+ drivers/staging/lustre/lustre/include/lustre_mdc.h | 9 +-
+ drivers/staging/lustre/lustre/include/lustre_net.h | 11 -
+ .../lustre/lustre/include/lustre_req_layout.h | 7 +
+ drivers/staging/lustre/lustre/include/lustre_sec.h | 17 +-
+ drivers/staging/lustre/lustre/include/md_object.h | 4 +-
+ drivers/staging/lustre/lustre/include/obd.h | 15 +-
+ .../staging/lustre/lustre/include/obd_support.h | 12 +-
+ drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 6 +
+ .../staging/lustre/lustre/lclient/lcommon_misc.c | 4 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 45 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 7 +
+ drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 57 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 9 +
+ drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 43 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 19 +-
+ drivers/staging/lustre/lustre/libcfs/debug.c | 42 +-
+ drivers/staging/lustre/lustre/libcfs/hash.c | 4 +-
+ .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 6 +-
+ .../lustre/lustre/libcfs/linux/linux-curproc.c | 13 -
+ .../lustre/lustre/libcfs/linux/linux-proc.c | 36 +-
+ drivers/staging/lustre/lustre/libcfs/lwt.c | 266 --
+ drivers/staging/lustre/lustre/libcfs/module.c | 53 +-
+ drivers/staging/lustre/lustre/libcfs/nidstrings.c | 34 +-
+ drivers/staging/lustre/lustre/libcfs/tracefile.c | 22 +-
+ drivers/staging/lustre/lustre/llite/Makefile | 5 +-
+ drivers/staging/lustre/lustre/llite/dcache.c | 34 +-
+ drivers/staging/lustre/lustre/llite/dir.c | 24 +-
+ drivers/staging/lustre/lustre/llite/file.c | 539 ++-
+ .../staging/lustre/lustre/llite/llite_internal.h | 74 +-
+ drivers/staging/lustre/lustre/llite/llite_lib.c | 60 +-
+ drivers/staging/lustre/lustre/llite/lloop.c | 3 +-
+ drivers/staging/lustre/lustre/llite/lproc_llite.c | 41 +-
+ drivers/staging/lustre/lustre/llite/namei.c | 14 +-
+ drivers/staging/lustre/lustre/llite/super25.c | 4 +
+ drivers/staging/lustre/lustre/llite/vvp_io.c | 54 +-
+ drivers/staging/lustre/lustre/llite/vvp_object.c | 2 +-
+ drivers/staging/lustre/lustre/llite/xattr.c | 104 +-
+ drivers/staging/lustre/lustre/llite/xattr_cache.c | 617 +++
+ drivers/staging/lustre/lustre/lmv/Makefile | 4 +-
+ drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 5 -
+ drivers/staging/lustre/lustre/lov/Makefile | 3 +-
+ .../staging/lustre/lustre/lov/lov_cl_internal.h | 16 +
+ drivers/staging/lustre/lustre/lov/lov_internal.h | 2 +-
+ drivers/staging/lustre/lustre/lov/lov_io.c | 15 +-
+ drivers/staging/lustre/lustre/lov/lov_object.c | 35 +-
+ drivers/staging/lustre/lustre/lov/lov_pack.c | 20 +-
+ drivers/staging/lustre/lustre/lov/lproc_lov.c | 40 +-
+ drivers/staging/lustre/lustre/lvfs/Makefile | 3 +-
+ drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c | 760 ----
+ drivers/staging/lustre/lustre/lvfs/lvfs_lib.c | 2 -
+ drivers/staging/lustre/lustre/mdc/Makefile | 3 +-
+ drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 3 -
+ drivers/staging/lustre/lustre/mdc/mdc_internal.h | 3 +-
+ drivers/staging/lustre/lustre/mdc/mdc_lib.c | 31 +-
+ drivers/staging/lustre/lustre/mdc/mdc_locks.c | 112 +-
+ drivers/staging/lustre/lustre/mdc/mdc_request.c | 54 +-
+ drivers/staging/lustre/lustre/mgc/Makefile | 3 +-
+ drivers/staging/lustre/lustre/mgc/libmgc.c | 3 -
+ drivers/staging/lustre/lustre/mgc/lproc_mgc.c | 3 -
+ drivers/staging/lustre/lustre/mgc/mgc_internal.h | 2 +-
+ drivers/staging/lustre/lustre/mgc/mgc_request.c | 400 +-
+ drivers/staging/lustre/lustre/obdclass/class_obd.c | 20 +-
+ drivers/staging/lustre/lustre/obdclass/genops.c | 3 +-
+ .../lustre/lustre/obdclass/linux/linux-module.c | 5 +-
+ .../lustre/lustre/obdclass/linux/linux-sysctl.c | 21 +-
+ drivers/staging/lustre/lustre/obdclass/llog.c | 214 +-
+ drivers/staging/lustre/lustre/obdclass/llog_test.c | 6 +-
+ .../staging/lustre/lustre/obdclass/local_storage.c | 11 +-
+ .../staging/lustre/lustre/obdclass/local_storage.h | 3 +
+ .../lustre/lustre/obdclass/lprocfs_status.c | 356 +-
+ drivers/staging/lustre/lustre/obdclass/lu_object.c | 30 +-
+ drivers/staging/lustre/lustre/obdclass/obd_mount.c | 3 +
+ .../staging/lustre/lustre/obdecho/echo_client.c | 2 +-
+ drivers/staging/lustre/lustre/osc/Makefile | 3 +-
+ drivers/staging/lustre/lustre/osc/lproc_osc.c | 2 -
+ drivers/staging/lustre/lustre/osc/osc_request.c | 4 -
+ drivers/staging/lustre/lustre/ptlrpc/Makefile | 5 +-
+ drivers/staging/lustre/lustre/ptlrpc/client.c | 25 +-
+ drivers/staging/lustre/lustre/ptlrpc/events.c | 75 +-
+ .../staging/lustre/lustre/ptlrpc/gss/gss_asn1.h | 6 +-
+ drivers/staging/lustre/lustre/ptlrpc/gss/gss_err.h | 10 +-
+ .../staging/lustre/lustre/ptlrpc/gss/gss_keyring.c | 2 +-
+ .../lustre/lustre/ptlrpc/gss/gss_krb5_mech.c | 2 +-
+ drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c | 14 +-
+ drivers/staging/lustre/lustre/ptlrpc/import.c | 40 +-
+ drivers/staging/lustre/lustre/ptlrpc/layout.c | 73 +-
+ drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 6 +-
+ drivers/staging/lustre/lustre/ptlrpc/llog_server.c | 450 --
+ .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 14 +-
+ drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 81 +-
+ .../staging/lustre/lustre/ptlrpc/pack_generic.c | 375 +-
+ drivers/staging/lustre/lustre/ptlrpc/pinger.c | 70 +-
+ .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 16 +-
+ .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 2 +-
+ drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 50 +-
+ drivers/staging/lustre/lustre/ptlrpc/service.c | 77 +-
+ drivers/staging/lustre/lustre/ptlrpc/wirehdr.c | 47 -
+ drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 28 +-
+ drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 2 +-
+ .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 4 +-
+ drivers/staging/media/dt3155v4l/dt3155v4l.c | 2 +-
+ drivers/staging/media/go7007/go7007-fw.c | 3 +-
+ drivers/staging/media/go7007/saa7134-go7007.c | 2 +-
+ drivers/staging/media/lirc/lirc_igorplugusb.c | 4 +-
+ drivers/staging/media/lirc/lirc_imon.c | 11 +-
+ drivers/staging/media/lirc/lirc_serial.c | 6 +-
+ drivers/staging/media/lirc/lirc_zilog.c | 4 +-
+ drivers/staging/media/solo6x10/solo6x10-core.c | 2 +-
+ drivers/staging/olpc_dcon/olpc_dcon.c | 6 +-
+ drivers/staging/ozwpan/ozeltbuf.c | 2 +-
+ drivers/staging/ozwpan/ozproto.c | 2 +-
+ drivers/staging/phison/phison.c | 2 +-
+ drivers/staging/rtl8187se/ieee80211/dot11d.c | 132 +-
+ drivers/staging/rtl8187se/ieee80211/dot11d.h | 66 +-
+ drivers/staging/rtl8187se/ieee80211/ieee80211.h | 125 +-
+ .../staging/rtl8187se/ieee80211/ieee80211_crypt.c | 3 +-
+ .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 12 +-
+ .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 52 +-
+ drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 39 +-
+ .../rtl8187se/ieee80211/ieee80211_softmac.c | 134 +-
+ .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 64 +-
+ drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 13 +-
+ drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 8 +-
+ drivers/staging/rtl8187se/r8180.h | 32 +-
+ drivers/staging/rtl8187se/r8180_core.c | 29 +-
+ drivers/staging/rtl8187se/r8180_dm.h | 2 +-
+ drivers/staging/rtl8187se/r8180_rtl8225.h | 3 +-
+ drivers/staging/rtl8187se/r8180_wx.c | 202 +-
+ drivers/staging/rtl8187se/r8185b_init.c | 17 +-
+ drivers/staging/rtl8188eu/core/rtw_io.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_xmit.c | 2 +-
+ drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 2 +-
+ drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 2 +-
+ drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 34 +-
+ drivers/staging/rtl8188eu/os_dep/osdep_service.c | 2 +-
+ drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +-
+ drivers/staging/rtl8192e/dot11d.c | 2 +-
+ drivers/staging/rtl8192e/dot11d.h | 5 +-
+ drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 13 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 1 -
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 24 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 +
+ drivers/staging/rtl8192e/rtl819x_BAProc.c | 10 +-
+ drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 4 +-
+ drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 6 +-
+ drivers/staging/rtl8192e/rtllib_crypt_wep.c | 4 +-
+ drivers/staging/rtl8192e/rtllib_module.c | 4 +-
+ drivers/staging/rtl8192e/rtllib_rx.c | 74 +-
+ drivers/staging/rtl8192e/rtllib_softmac.c | 28 +-
+ drivers/staging/rtl8192e/rtllib_tx.c | 16 +-
+ drivers/staging/rtl8712/rtl871x_mlme.c | 3 -
+ drivers/staging/rts5208/Kconfig | 15 +
+ drivers/staging/rts5208/Makefile | 6 +
+ drivers/staging/rts5208/TODO | 7 +
+ drivers/staging/rts5208/debug.h | 43 +
+ drivers/staging/rts5208/general.c | 35 +
+ drivers/staging/rts5208/general.h | 31 +
+ drivers/staging/rts5208/ms.c | 4208 ++++++++++++++++++
+ drivers/staging/rts5208/ms.h | 227 +
+ drivers/staging/rts5208/rtsx.c | 1071 +++++
+ drivers/staging/rts5208/rtsx.h | 186 +
+ drivers/staging/rts5208/rtsx_card.c | 1126 +++++
+ drivers/staging/rts5208/rtsx_card.h | 1098 +++++
+ drivers/staging/rts5208/rtsx_chip.c | 1979 +++++++++
+ drivers/staging/rts5208/rtsx_chip.h | 1002 +++++
+ drivers/staging/rts5208/rtsx_scsi.c | 3370 +++++++++++++++
+ drivers/staging/rts5208/rtsx_scsi.h | 143 +
+ drivers/staging/rts5208/rtsx_sys.h | 50 +
+ drivers/staging/rts5208/rtsx_transport.c | 769 ++++
+ drivers/staging/rts5208/rtsx_transport.h | 66 +
+ drivers/staging/rts5208/sd.c | 4525 ++++++++++++++++++++
+ drivers/staging/rts5208/sd.h | 301 ++
+ drivers/staging/rts5208/spi.c | 877 ++++
+ drivers/staging/rts5208/spi.h | 65 +
+ drivers/staging/rts5208/trace.h | 93 +
+ drivers/staging/rts5208/xd.c | 2088 +++++++++
+ drivers/staging/rts5208/xd.h | 188 +
+ drivers/staging/sb105x/sb_mp_register.h | 8 +-
+ drivers/staging/sb105x/sb_pci_mp.c | 4 +-
+ drivers/staging/sep/sep_main.c | 2 +-
+ drivers/staging/silicom/bpctl_mod.c | 2 -
+ drivers/staging/silicom/bypasslib/bypass.c | 14 +-
+ drivers/staging/slicoss/README | 1 -
+ drivers/staging/slicoss/slicoss.c | 23 +-
+ drivers/staging/sm7xxfb/sm7xxfb.c | 2 +-
+ drivers/staging/speakup/main.c | 2 -
+ drivers/staging/speakup/serialio.c | 4 +
+ drivers/staging/speakup/serialio.h | 26 -
+ drivers/staging/tidspbridge/pmgr/cmm.c | 7 +-
+ drivers/staging/tidspbridge/pmgr/dbll.c | 21 +-
+ drivers/staging/tidspbridge/pmgr/dev.c | 6 +-
+ drivers/staging/tidspbridge/pmgr/dmm.c | 20 +-
+ drivers/staging/tidspbridge/pmgr/dspapi.c | 12 +-
+ drivers/staging/usbip/stub_rx.c | 20 +-
+ drivers/staging/usbip/usbip_common.c | 5 +-
+ drivers/staging/usbip/vhci_hcd.c | 15 +-
+ drivers/staging/vme/devices/vme_user.c | 13 +-
+ drivers/staging/vt6655/baseband.c | 4 +-
+ drivers/staging/vt6655/bssdb.c | 354 +-
+ drivers/staging/vt6655/card.c | 10 +-
+ drivers/staging/vt6655/channel.c | 16 +-
+ drivers/staging/vt6655/datarate.c | 8 +-
+ drivers/staging/vt6655/device_main.c | 62 +-
+ drivers/staging/vt6655/dpc.c | 40 +-
+ drivers/staging/vt6655/hostap.c | 12 +-
+ drivers/staging/vt6655/iwctl.c | 2 +-
+ drivers/staging/vt6655/key.c | 44 +-
+ drivers/staging/vt6655/mac.c | 4 +-
+ drivers/staging/vt6655/power.c | 9 +-
+ drivers/staging/vt6655/rf.c | 2 +-
+ drivers/staging/vt6655/rxtx.c | 12 +-
+ drivers/staging/vt6655/vntwifi.c | 6 +-
+ drivers/staging/vt6655/wcmd.c | 22 +-
+ drivers/staging/vt6655/wctl.c | 6 +-
+ drivers/staging/vt6655/wmgr.c | 125 +-
+ drivers/staging/vt6655/wpa.c | 2 +-
+ drivers/staging/vt6655/wpa2.c | 18 +-
+ drivers/staging/vt6655/wpactl.c | 12 +-
+ drivers/staging/vt6656/aes_ccmp.c | 16 +-
+ drivers/staging/vt6656/baseband.c | 332 +-
+ drivers/staging/vt6656/bssdb.c | 4 +-
+ drivers/staging/vt6656/card.c | 4 +-
+ drivers/staging/vt6656/channel.c | 3 +-
+ drivers/staging/vt6656/datarate.c | 2 +-
+ drivers/staging/vt6656/desc.h | 8 -
+ drivers/staging/vt6656/device.h | 16 +-
+ drivers/staging/vt6656/dpc.c | 2 +-
+ drivers/staging/vt6656/main_usb.c | 543 ++-
+ drivers/staging/vt6656/rf.c | 7 +-
+ drivers/staging/vt6656/rndis.h | 30 +-
+ drivers/staging/vt6656/rxtx.c | 222 +-
+ drivers/staging/vt6656/rxtx.h | 12 +-
+ drivers/staging/vt6656/tkip.c | 4 +-
+ drivers/staging/vt6656/wcmd.c | 1712 ++++----
+ drivers/staging/vt6656/wmgr.c | 10 +-
+ drivers/staging/vt6656/wpa.c | 12 +-
+ drivers/staging/vt6656/wpa2.c | 16 +-
+ drivers/staging/winbond/mds.c | 101 +-
+ drivers/staging/wlags49_h2/sta_h25.c | 6 +-
+ drivers/staging/wlan-ng/cfg80211.c | 18 +-
+ drivers/staging/wlan-ng/hfa384x.h | 4 +-
+ drivers/staging/wlan-ng/prism2mgmt.c | 4 +-
+ drivers/staging/wlan-ng/prism2mgmt.h | 6 +-
+ drivers/staging/wlan-ng/prism2mib.c | 6 +-
+ drivers/staging/wlan-ng/prism2sta.c | 6 +-
+ drivers/staging/xgifb/XGI_main.h | 2 +-
+ drivers/staging/xillybus/xillybus_pcie.c | 2 +-
+ drivers/vme/boards/vme_vmivme7805.c | 2 +-
+ drivers/vme/bridges/vme_ca91cx42.c | 2 +-
+ drivers/vme/bridges/vme_tsi148.c | 2 +-
+ drivers/vme/vme.c | 19 +-
+ include/linux/hid-sensor-ids.h | 8 +
+ include/linux/iio/iio.h | 81 +-
+ include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 1 +
+ include/linux/vme.h | 3 +-
+ 508 files changed, 37681 insertions(+), 16041 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/iio/light/tsl2563.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/hmc5843.txt
+ create mode 100644 drivers/iio/pressure/mpl3115.c
+ delete mode 100644 drivers/staging/btmtk_usb/Kconfig
+ delete mode 100644 drivers/staging/btmtk_usb/Makefile
+ delete mode 100644 drivers/staging/btmtk_usb/README
+ delete mode 100644 drivers/staging/btmtk_usb/TODO
+ delete mode 100644 drivers/staging/btmtk_usb/btmtk_usb.c
+ delete mode 100644 drivers/staging/btmtk_usb/btmtk_usb.h
+ create mode 100644 drivers/staging/imx-drm/imx-hdmi.c
+ create mode 100644 drivers/staging/imx-drm/imx-hdmi.h
+ delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/lu_target.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/lustre/liblustreapi.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/lustre/lustreapi.h
+ delete mode 100644 drivers/staging/lustre/lustre/libcfs/lwt.c
+ create mode 100644 drivers/staging/lustre/lustre/llite/xattr_cache.c
+ delete mode 100644 drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c
+ delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/llog_server.c
+ delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/wirehdr.c
+ create mode 100644 drivers/staging/rts5208/Kconfig
+ create mode 100644 drivers/staging/rts5208/Makefile
+ create mode 100644 drivers/staging/rts5208/TODO
+ create mode 100644 drivers/staging/rts5208/debug.h
+ create mode 100644 drivers/staging/rts5208/general.c
+ create mode 100644 drivers/staging/rts5208/general.h
+ create mode 100644 drivers/staging/rts5208/ms.c
+ create mode 100644 drivers/staging/rts5208/ms.h
+ create mode 100644 drivers/staging/rts5208/rtsx.c
+ create mode 100644 drivers/staging/rts5208/rtsx.h
+ create mode 100644 drivers/staging/rts5208/rtsx_card.c
+ create mode 100644 drivers/staging/rts5208/rtsx_card.h
+ create mode 100644 drivers/staging/rts5208/rtsx_chip.c
+ create mode 100644 drivers/staging/rts5208/rtsx_chip.h
+ create mode 100644 drivers/staging/rts5208/rtsx_scsi.c
+ create mode 100644 drivers/staging/rts5208/rtsx_scsi.h
+ create mode 100644 drivers/staging/rts5208/rtsx_sys.h
+ create mode 100644 drivers/staging/rts5208/rtsx_transport.c
+ create mode 100644 drivers/staging/rts5208/rtsx_transport.h
+ create mode 100644 drivers/staging/rts5208/sd.c
+ create mode 100644 drivers/staging/rts5208/sd.h
+ create mode 100644 drivers/staging/rts5208/spi.c
+ create mode 100644 drivers/staging/rts5208/spi.h
+ create mode 100644 drivers/staging/rts5208/trace.h
+ create mode 100644 drivers/staging/rts5208/xd.c
+ create mode 100644 drivers/staging/rts5208/xd.h
+Merging char-misc/char-misc-next (4455d9fd4809 pcmcia: Remove superfluous name casts)
+$ git merge char-misc/char-misc-next
+Auto-merging drivers/misc/mei/pci-me.c
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/misc/bmp085.txt | 4 ++
+ drivers/char/agp/amd64-agp.c | 2 +-
+ drivers/misc/bmp085-i2c.c | 2 +-
+ drivers/misc/bmp085-spi.c | 2 +-
+ drivers/misc/bmp085.c | 39 +++++++++--
+ drivers/misc/bmp085.h | 2 +-
+ drivers/misc/eeprom/eeprom_93xx46.c | 1 -
+ drivers/misc/lkdtm.c | 5 +-
+ drivers/misc/mei/client.c | 2 -
+ drivers/misc/mei/init.c | 17 +++--
+ drivers/misc/mei/interrupt.c | 79 ++++++++++++-----------
+ drivers/misc/mei/mei_dev.h | 13 +++-
+ drivers/misc/mei/nfc.c | 6 +-
+ drivers/misc/mei/pci-me.c | 2 +-
+ drivers/misc/ti-st/st_core.c | 2 +-
+ drivers/misc/ti-st/st_kim.c | 1 -
+ drivers/pcmcia/bfin_cf_pcmcia.c | 2 +-
+ drivers/pcmcia/electra_cf.c | 2 +-
+ drivers/uio/uio_mf624.c | 2 +-
+ drivers/w1/masters/mxc_w1.c | 31 ++++++---
+ tools/hv/hv_kvp_daemon.c | 1 -
+ tools/hv/hv_vss_daemon.c | 1 -
+ 22 files changed, 142 insertions(+), 76 deletions(-)
+Merging scsi/for-next (ef5cb624a9b2 Merge branch 'fixes' into for-next)
+$ git merge scsi/for-next
+Auto-merging drivers/scsi/sd.c
+Removing drivers/scsi/aic7xxx_old/sequencer.h
+Removing drivers/scsi/aic7xxx_old/scsi_message.h
+Removing drivers/scsi/aic7xxx_old/aic7xxx_seq.c
+Removing drivers/scsi/aic7xxx_old/aic7xxx_reg.h
+Removing drivers/scsi/aic7xxx_old/aic7xxx_proc.c
+Removing drivers/scsi/aic7xxx_old/aic7xxx.seq
+Removing drivers/scsi/aic7xxx_old/aic7xxx.reg
+Removing drivers/scsi/aic7xxx_old/aic7xxx.h
+Removing drivers/scsi/aic7xxx_old.c
+Auto-merging drivers/scsi/Kconfig
+Auto-merging MAINTAINERS
+Removing Documentation/scsi/aic7xxx_old.txt
+Merge made by the 'recursive' strategy.
+ Documentation/scsi/00-INDEX | 2 -
+ Documentation/scsi/aic7xxx_old.txt | 511 --
+ Documentation/scsi/scsi_eh.txt | 69 +-
+ Documentation/scsi/scsi_mid_low_api.txt | 9 +-
+ MAINTAINERS | 7 +-
+ drivers/scsi/Kconfig | 41 -
+ drivers/scsi/Makefile | 1 -
+ drivers/scsi/aic7xxx_old.c | 11149 ----------------------------
+ drivers/scsi/aic7xxx_old/aic7xxx.h | 28 -
+ drivers/scsi/aic7xxx_old/aic7xxx.reg | 1401 ----
+ drivers/scsi/aic7xxx_old/aic7xxx.seq | 1539 ----
+ drivers/scsi/aic7xxx_old/aic7xxx_proc.c | 270 -
+ drivers/scsi/aic7xxx_old/aic7xxx_reg.h | 629 --
+ drivers/scsi/aic7xxx_old/aic7xxx_seq.c | 817 --
+ drivers/scsi/aic7xxx_old/scsi_message.h | 49 -
+ drivers/scsi/aic7xxx_old/sequencer.h | 135 -
+ drivers/scsi/be2iscsi/be_iscsi.c | 8 +-
+ drivers/scsi/hosts.c | 30 +-
+ drivers/scsi/hpsa.c | 308 +-
+ drivers/scsi/hpsa.h | 20 +
+ drivers/scsi/ipr.c | 2 +-
+ drivers/scsi/ipr.h | 2 +-
+ drivers/scsi/lpfc/lpfc_debugfs.c | 2 +-
+ drivers/scsi/megaraid/megaraid_sas.h | 1 -
+ drivers/scsi/megaraid/megaraid_sas_base.c | 5 +-
+ drivers/scsi/qla2xxx/qla_attr.c | 116 +-
+ drivers/scsi/qla2xxx/qla_bsg.c | 44 +
+ drivers/scsi/qla2xxx/qla_bsg.h | 13 +
+ drivers/scsi/qla2xxx/qla_dbg.c | 7 +-
+ drivers/scsi/qla2xxx/qla_def.h | 22 +-
+ drivers/scsi/qla2xxx/qla_gbl.h | 15 +-
+ drivers/scsi/qla2xxx/qla_init.c | 2 +
+ drivers/scsi/qla2xxx/qla_inline.h | 19 -
+ drivers/scsi/qla2xxx/qla_isr.c | 82 +-
+ drivers/scsi/qla2xxx/qla_mbx.c | 73 +-
+ drivers/scsi/qla2xxx/qla_mr.c | 39 +-
+ drivers/scsi/qla2xxx/qla_mr.h | 12 +-
+ drivers/scsi/qla2xxx/qla_nx.c | 22 +-
+ drivers/scsi/qla2xxx/qla_nx2.c | 33 +-
+ drivers/scsi/qla2xxx/qla_os.c | 368 +-
+ drivers/scsi/qla2xxx/qla_version.h | 2 +-
+ drivers/scsi/qla4xxx/ql4_def.h | 32 +
+ drivers/scsi/qla4xxx/ql4_fw.h | 43 +-
+ drivers/scsi/qla4xxx/ql4_glbl.h | 1 +
+ drivers/scsi/qla4xxx/ql4_isr.c | 32 +
+ drivers/scsi/qla4xxx/ql4_mbx.c | 111 +-
+ drivers/scsi/qla4xxx/ql4_os.c | 1137 ++-
+ drivers/scsi/qla4xxx/ql4_version.h | 2 +-
+ drivers/scsi/scsi.c | 9 +-
+ drivers/scsi/scsi_debug.c | 266 +-
+ drivers/scsi/scsi_error.c | 229 +-
+ drivers/scsi/scsi_pm.c | 62 +-
+ drivers/scsi/scsi_priv.h | 2 +
+ drivers/scsi/scsi_sysfs.c | 36 +-
+ drivers/scsi/scsi_transport_iscsi.c | 340 +-
+ drivers/scsi/sd.c | 28 +-
+ drivers/scsi/sr.c | 37 +-
+ include/scsi/iscsi_if.h | 117 +-
+ include/scsi/scsi_cmnd.h | 1 +
+ include/scsi/scsi_driver.h | 2 +-
+ include/scsi/scsi_host.h | 10 +
+ include/scsi/scsi_transport_iscsi.h | 3 +
+ 62 files changed, 2949 insertions(+), 17455 deletions(-)
+ delete mode 100644 Documentation/scsi/aic7xxx_old.txt
+ delete mode 100644 drivers/scsi/aic7xxx_old.c
+ delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx.h
+ delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx.reg
+ delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx.seq
+ delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx_proc.c
+ delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx_reg.h
+ delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx_seq.c
+ delete mode 100644 drivers/scsi/aic7xxx_old/scsi_message.h
+ delete mode 100644 drivers/scsi/aic7xxx_old/sequencer.h
+Merging target-updates/for-next (86784c6bdeee iscsi-target: chap auth shouldn't match username with trailing garbage)
+$ git merge target-updates/for-next
+Already up-to-date.
+Merging target-merge/for-next-merge (15c03dd4859a Linux 3.12-rc3)
+$ git merge target-merge/for-next-merge
+Already up-to-date.
+Merging writeback/writeback-for-next (a8855990e382 writeback: Do not sort b_io list only because of block device inode)
+$ git merge writeback/writeback-for-next
+Already up-to-date.
+Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries)
+$ git merge hwspinlock/linux-next
+Already up-to-date.
+Merging pinctrl/for-next (6bca8471566c pinctrl: select dependency on OF for MSM driver)
+$ git merge pinctrl/for-next
+Auto-merging drivers/pinctrl/pinctrl-baytrail.c
+Merge made by the 'recursive' strategy.
+ .../bindings/pinctrl/fsl,imx25-pinctrl.txt | 23 +
+ .../bindings/pinctrl/qcom,msm8x74-pinctrl.txt | 92 ++
+ drivers/pinctrl/Kconfig | 21 +
+ drivers/pinctrl/Makefile | 3 +
+ drivers/pinctrl/pinctrl-baytrail.c | 30 +-
+ drivers/pinctrl/pinctrl-imx25.c | 351 +++++++
+ drivers/pinctrl/pinctrl-msm.c | 1028 ++++++++++++++++++++
+ drivers/pinctrl/pinctrl-msm.h | 122 +++
+ drivers/pinctrl/pinctrl-msm8x74.c | 636 ++++++++++++
+ include/linux/pinctrl/pinconf-generic.h | 6 +-
+ 10 files changed, 2309 insertions(+), 3 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx25-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8x74-pinctrl.txt
+ create mode 100644 drivers/pinctrl/pinctrl-imx25.c
+ create mode 100644 drivers/pinctrl/pinctrl-msm.c
+ create mode 100644 drivers/pinctrl/pinctrl-msm.h
+ create mode 100644 drivers/pinctrl/pinctrl-msm8x74.c
+$ git reset --hard HEAD^
+HEAD is now at 45f506d3f835 Merge remote-tracking branch 'scsi/for-next'
+Merging next-20131206 version of pinctrl
+$ git merge -m next-20131206/pinctrl a8b2d7c89dc86232f4d00513a3d9f585dd447c8e
+Auto-merging drivers/pinctrl/pinctrl-baytrail.c
+Merge made by the 'recursive' strategy.
+ .../bindings/pinctrl/fsl,imx25-pinctrl.txt | 23 ++
+ drivers/pinctrl/Kconfig | 9 +
+ drivers/pinctrl/Makefile | 1 +
+ drivers/pinctrl/pinctrl-baytrail.c | 30 +-
+ drivers/pinctrl/pinctrl-imx25.c | 351 +++++++++++++++++++++
+ include/linux/pinctrl/pinconf-generic.h | 6 +-
+ 6 files changed, 417 insertions(+), 3 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx25-pinctrl.txt
+ create mode 100644 drivers/pinctrl/pinctrl-imx25.c
+Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak)
+$ git merge vhost/linux-next
+Already up-to-date.
+Merging remoteproc/for-next (b9777859ec01 remoteproc: fix kconfig dependencies for VIRTIO)
+$ git merge remoteproc/for-next
+Already up-to-date.
+Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO)
+$ git merge rpmsg/for-next
+Already up-to-date.
+Merging gpio/for-next (fdd6a5fe8988 gpiolib: update inline documentation of gpiod_get_index())
+$ git merge gpio/for-next
+Auto-merging drivers/pinctrl/pinctrl-nomadik.c
+Auto-merging drivers/pinctrl/pinctrl-baytrail.c
+Auto-merging drivers/gpio/Makefile
+Auto-merging drivers/gpio/Kconfig
+Removing arch/arm/mach-mv78xx0/include/mach/gpio.h
+Removing arch/arm/mach-lpc32xx/include/mach/gpio.h
+Removing arch/arm/mach-ks8695/include/mach/gpio.h
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/gpio/moxa,moxart-gpio.txt | 19 ++
+ .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 3 +-
+ Documentation/gpio/board.txt | 28 ++-
+ arch/arm/mach-ks8695/include/mach/gpio.h | 19 --
+ arch/arm/mach-lpc32xx/include/mach/gpio.h | 6 -
+ arch/arm/mach-lpc32xx/phy3250.c | 2 +-
+ arch/arm/mach-mv78xx0/include/mach/gpio.h | 9 -
+ drivers/gpio/Kconfig | 9 +-
+ drivers/gpio/Makefile | 1 +
+ drivers/gpio/gpio-74x164.c | 2 +-
+ drivers/gpio/gpio-adnp.c | 25 ++-
+ drivers/gpio/gpio-adp5520.c | 2 +-
+ drivers/gpio/gpio-adp5588.c | 2 +-
+ drivers/gpio/gpio-amd8111.c | 2 +-
+ drivers/gpio/gpio-arizona.c | 2 +-
+ drivers/gpio/gpio-bcm-kona.c | 22 ++
+ drivers/gpio/gpio-bt8xx.c | 4 +-
+ drivers/gpio/gpio-da9052.c | 2 +-
+ drivers/gpio/gpio-da9055.c | 2 +-
+ drivers/gpio/gpio-em.c | 28 ++-
+ drivers/gpio/gpio-ich.c | 2 +-
+ drivers/gpio/gpio-intel-mid.c | 30 ++-
+ drivers/gpio/gpio-kempld.c | 2 +-
+ drivers/gpio/gpio-ks8695.c | 2 +-
+ drivers/gpio/gpio-lpc32xx.c | 14 +-
+ drivers/gpio/gpio-lynxpoint.c | 39 +++-
+ drivers/gpio/gpio-max730x.c | 2 +-
+ drivers/gpio/gpio-max732x.c | 2 +-
+ drivers/gpio/gpio-mc33880.c | 2 +-
+ drivers/gpio/gpio-mc9s08dz60.c | 2 +-
+ drivers/gpio/gpio-mcp23s08.c | 2 +-
+ drivers/gpio/gpio-ml-ioh.c | 4 +-
+ drivers/gpio/gpio-moxart.c | 158 ++++++++++++++
+ drivers/gpio/gpio-msic.c | 9 +-
+ drivers/gpio/gpio-mvebu.c | 2 +-
+ drivers/gpio/gpio-octeon.c | 2 +-
+ drivers/gpio/gpio-omap.c | 188 ++++++++---------
+ drivers/gpio/gpio-palmas.c | 2 +-
+ drivers/gpio/gpio-pca953x.c | 2 +-
+ drivers/gpio/gpio-pcf857x.c | 2 +-
+ drivers/gpio/gpio-pch.c | 4 +-
+ drivers/gpio/gpio-rc5t583.c | 2 +-
+ drivers/gpio/gpio-rcar.c | 61 ++++--
+ drivers/gpio/gpio-sodaville.c | 2 +-
+ drivers/gpio/gpio-sta2x11.c | 2 +-
+ drivers/gpio/gpio-stmpe.c | 2 +-
+ drivers/gpio/gpio-sx150x.c | 2 +-
+ drivers/gpio/gpio-tb10x.c | 2 +-
+ drivers/gpio/gpio-tc3589x.c | 2 +-
+ drivers/gpio/gpio-timberdale.c | 6 +-
+ drivers/gpio/gpio-tnetv107x.c | 2 +-
+ drivers/gpio/gpio-tps6586x.c | 2 +-
+ drivers/gpio/gpio-tps65910.c | 2 +-
+ drivers/gpio/gpio-tps65912.c | 2 +-
+ drivers/gpio/gpio-twl4030.c | 2 +-
+ drivers/gpio/gpio-twl6040.c | 2 +-
+ drivers/gpio/gpio-ucb1400.c | 2 +-
+ drivers/gpio/gpio-viperboard.c | 4 +-
+ drivers/gpio/gpio-vx855.c | 2 +-
+ drivers/gpio/gpio-wm831x.c | 2 +-
+ drivers/gpio/gpio-wm8350.c | 2 +-
+ drivers/gpio/gpio-wm8994.c | 2 +-
+ drivers/gpio/gpiolib.c | 232 +++++++++++----------
+ drivers/pinctrl/pinctrl-as3722.c | 2 +-
+ drivers/pinctrl/pinctrl-at91.c | 2 +-
+ drivers/pinctrl/pinctrl-baytrail.c | 2 +-
+ drivers/pinctrl/pinctrl-bcm2835.c | 2 +-
+ drivers/pinctrl/pinctrl-nomadik.c | 2 +-
+ drivers/pinctrl/pinctrl-sunxi.c | 2 +-
+ drivers/pinctrl/vt8500/pinctrl-wmt.c | 2 +-
+ include/linux/gpio.h | 1 -
+ include/linux/gpio/driver.h | 56 +++--
+ .../linux/platform_data}/gpio-lpc32xx.h | 0
+ 73 files changed, 695 insertions(+), 376 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpio/moxa,moxart-gpio.txt
+ delete mode 100644 arch/arm/mach-ks8695/include/mach/gpio.h
+ delete mode 100644 arch/arm/mach-lpc32xx/include/mach/gpio.h
+ delete mode 100644 arch/arm/mach-mv78xx0/include/mach/gpio.h
+ create mode 100644 drivers/gpio/gpio-moxart.c
+ rename {arch/arm/mach-lpc32xx/include/mach => include/linux/platform_data}/gpio-lpc32xx.h (100%)
+Merging dma-mapping/dma-mapping-next (5e01dc7b26d9 Linux 3.12)
+$ git merge dma-mapping/dma-mapping-next
+Already up-to-date.
+Merging pwm/for-next (6ca142ad0d1b pwm: sysfs: Convert to use ATTRIBUTE_GROUPS macro)
+$ git merge pwm/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/pwm/pxa-pwm.txt | 30 +++++++++++++
+ drivers/pwm/pwm-pxa.c | 53 +++++++++++++++++++++++
+ drivers/pwm/sysfs.c | 12 +----
+ 3 files changed, 85 insertions(+), 10 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pwm/pxa-pwm.txt
+Merging dma-buf/for-next (19e8697ba45e dma-buf: Expose buffer size to userspace (v2))
+$ git merge dma-buf/for-next
+Already up-to-date.
+Merging userns/for-next (41301ae78a99 vfs: Fix a regression in mounting proc)
+$ git merge userns/for-next
+Auto-merging kernel/fork.c
+Auto-merging fs/namespace.c
+Merge made by the 'recursive' strategy.
+ fs/dcache.c | 7 ++++++-
+ fs/namespace.c | 2 +-
+ kernel/fork.c | 2 +-
+ 3 files changed, 8 insertions(+), 3 deletions(-)
+Merging ktest/for-next (298a0d1d5750 ktest: Add documentation of CLOSE_CONSOLE_SIGNAL)
+$ git merge ktest/for-next
+Auto-merging tools/testing/ktest/ktest.pl
+Merge made by the 'recursive' strategy.
+ tools/testing/ktest/ktest.pl | 5 ++++-
+ tools/testing/ktest/sample.conf | 7 +++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
+$ git merge signal/for-next
+Already up-to-date.
+Merging clk/clk-next (cdf64eeeb0d7 clk: exynos5420: fix cpll clock register offsets)
+$ git merge clk/clk-next
+Merge made by the 'recursive' strategy.
+ .../bindings/clock/fixed-factor-clock.txt | 4 +-
+ .../bindings/clock/nvidia,tegra124-car.txt | 59 +
+ drivers/clk/clk-composite.c | 28 +
+ drivers/clk/clk.c | 3 +-
+ drivers/clk/samsung/clk-exynos5420.c | 4 +-
+ drivers/clk/socfpga/clk.c | 4 +-
+ drivers/clk/sunxi/clk-factors.c | 4 +-
+ drivers/clk/sunxi/clk-sunxi.c | 58 +-
+ drivers/clk/tegra/Makefile | 7 +-
+ drivers/clk/tegra/clk-id.h | 235 +++
+ drivers/clk/tegra/clk-periph-gate.c | 8 +-
+ drivers/clk/tegra/clk-periph.c | 32 +-
+ drivers/clk/tegra/clk-pll.c | 407 +++--
+ drivers/clk/tegra/clk-tegra-audio.c | 215 +++
+ drivers/clk/tegra/clk-tegra-fixed.c | 111 ++
+ drivers/clk/tegra/clk-tegra-periph.c | 674 ++++++++
+ drivers/clk/tegra/clk-tegra-pmc.c | 132 ++
+ drivers/clk/tegra/clk-tegra-super-gen4.c | 149 ++
+ drivers/clk/tegra/clk-tegra114.c | 1687 +++++---------------
+ drivers/clk/tegra/clk-tegra124.c | 1424 +++++++++++++++++
+ drivers/clk/tegra/clk-tegra20.c | 818 ++++------
+ drivers/clk/tegra/clk-tegra30.c | 1506 ++++++-----------
+ drivers/clk/tegra/clk.c | 166 ++
+ drivers/clk/tegra/clk.h | 115 +-
+ include/dt-bindings/clock/tegra114-car.h | 8 +-
+ include/dt-bindings/clock/tegra124-car.h | 341 ++++
+ include/dt-bindings/clock/tegra30-car.h | 10 +-
+ 27 files changed, 5174 insertions(+), 3035 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra124-car.txt
+ create mode 100644 drivers/clk/tegra/clk-id.h
+ create mode 100644 drivers/clk/tegra/clk-tegra-audio.c
+ create mode 100644 drivers/clk/tegra/clk-tegra-fixed.c
+ create mode 100644 drivers/clk/tegra/clk-tegra-periph.c
+ create mode 100644 drivers/clk/tegra/clk-tegra-pmc.c
+ create mode 100644 drivers/clk/tegra/clk-tegra-super-gen4.c
+ create mode 100644 drivers/clk/tegra/clk-tegra124.c
+ create mode 100644 include/dt-bindings/clock/tegra124-car.h
+Merging random/dev (8ea43ef26598 random: clarify bits/bytes in wakeup thresholds)
+$ git merge random/dev
+Merge made by the 'recursive' strategy.
+ drivers/char/random.c | 176 ++++++++++++++++++++++----------------------------
+ 1 file changed, 76 insertions(+), 100 deletions(-)
+Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
+$ git merge lzo-update/lzo-update
+Merge made by the 'recursive' strategy.
+ lib/lzo/lzo1x_decompress_safe.c | 4 ++++
+ lib/lzo/lzodefs.h | 6 ++++++
+ 2 files changed, 10 insertions(+)
+Merging arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP support.)
+$ git merge arm64-hugepages/for-next/hugepages
+Already up-to-date.
+Merging aio/master (374b105797c3 Linux 3.13-rc3)
+$ git merge aio/master
+Already up-to-date.
+Merging akpm-current/current (6e7ebeb1cb49 lib/decompress_unlz4.c: always set an error return code on failures)
+$ git merge --no-ff akpm-current/current
+Resolved 'arch/um/kernel/sysrq.c' using previous resolution.
+Resolved 'kernel/params.c' using previous resolution.
+Auto-merging mm/memcontrol.c
+Auto-merging kernel/params.c
+CONFLICT (content): Merge conflict in kernel/params.c
+Auto-merging kernel/kexec.c
+Auto-merging kernel/fork.c
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/blkdev.h
+Removing include/asm-generic/int-l64.h
+Removing fs/coredump.h
+Auto-merging drivers/misc/ti-st/st_core.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_acpi.c
+Auto-merging block/blk-mq.c
+Auto-merging arch/um/kernel/sysrq.c
+CONFLICT (content): Merge conflict in arch/um/kernel/sysrq.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 714c128e9f60] Merge branch 'akpm-current/current'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/dynamic-debug-howto.txt | 9 +
+ Documentation/filesystems/proc.txt | 9 +
+ Documentation/filesystems/sysfs.txt | 6 +-
+ Documentation/leds/leds-class.txt | 3 -
+ MAINTAINERS | 6 +
+ arch/ia64/include/asm/processor.h | 1 +
+ arch/sh/kernel/dwarf.c | 18 +-
+ block/blk-mq-cpu.c | 37 +---
+ block/blk-mq.c | 68 +-----
+ block/blk-mq.h | 1 -
+ block/cmdline-parser.c | 107 ++++++---
+ block/genhd.c | 2 +-
+ drivers/block/cciss.c | 4 +-
+ drivers/block/paride/pg.c | 2 +-
+ drivers/block/sx8.c | 16 +-
+ drivers/gpu/drm/cirrus/cirrus_mode.c | 4 +-
+ drivers/gpu/drm/drm_edid_load.c | 4 +-
+ drivers/gpu/drm/drm_fb_helper.c | 8 +
+ drivers/gpu/drm/nouveau/nouveau_acpi.c | 6 +
+ drivers/input/Kconfig | 9 +
+ drivers/input/Makefile | 3 +
+ drivers/input/input.c | 6 +
+ drivers/input/leds.c | 247 +++++++++++++++++++++
+ drivers/leds/Kconfig | 3 -
+ drivers/mailbox/omap-mbox.h | 2 +-
+ drivers/memstick/host/rtsx_pci_ms.c | 30 ++-
+ drivers/misc/ti-st/st_core.c | 2 +-
+ drivers/mtd/ubi/attach.c | 49 +----
+ drivers/mtd/ubi/wl.c | 25 +--
+ drivers/net/irda/donauboe.c | 15 +-
+ drivers/pps/pps.c | 57 ++---
+ drivers/rtc/rtc-as3722.c | 19 +-
+ drivers/rtc/rtc-at91rm9200.c | 2 +
+ drivers/rtc/rtc-at91sam9.c | 2 +-
+ drivers/rtc/rtc-s5m.c | 54 ++---
+ drivers/scsi/megaraid/megaraid_mm.c | 2 +
+ drivers/tty/Kconfig | 4 +
+ drivers/tty/vt/keyboard.c | 110 +++++++---
+ drivers/w1/masters/w1-gpio.c | 22 ++
+ drivers/w1/w1_int.c | 12 -
+ fs/autofs4/autofs_i.h | 4 +-
+ fs/autofs4/dev-ioctl.c | 16 +-
+ fs/autofs4/inode.c | 36 ++-
+ fs/autofs4/waitq.c | 16 +-
+ fs/binfmt_elf.c | 21 +-
+ fs/coredump.c | 1 -
+ fs/coredump.h | 6 -
+ fs/exec.c | 115 ++--------
+ fs/ext3/dir.c | 36 +--
+ fs/ext4/block_validity.c | 33 +--
+ fs/ext4/dir.c | 35 +--
+ fs/fat/cache.c | 25 ++-
+ fs/fat/fat.h | 3 +-
+ fs/fat/file.c | 91 +++++++-
+ fs/fat/inode.c | 35 ++-
+ fs/jffs2/nodelist.c | 28 +--
+ fs/jffs2/readinode.c | 26 +--
+ fs/ocfs2/alloc.c | 40 +++-
+ fs/ocfs2/cluster/tcp.c | 13 +-
+ fs/ocfs2/file.c | 60 +++--
+ fs/ocfs2/localalloc.c | 40 ++++
+ fs/ocfs2/localalloc.h | 6 +
+ fs/ocfs2/namei.c | 12 +-
+ fs/posix_acl.c | 84 ++++++-
+ fs/proc/array.c | 18 +-
+ fs/proc/base.c | 69 +++---
+ fs/proc/meminfo.c | 37 ++++
+ fs/ramfs/file-mmu.c | 7 -
+ fs/ramfs/file-nommu.c | 17 +-
+ fs/ramfs/inode.c | 7 +
+ fs/ramfs/internal.h | 1 -
+ fs/ubifs/debug.c | 22 +-
+ fs/ubifs/log.c | 21 +-
+ fs/ubifs/orphan.c | 21 +-
+ fs/ubifs/recovery.c | 21 +-
+ fs/ubifs/super.c | 24 +-
+ fs/ubifs/tnc.c | 22 +-
+ include/asm-generic/int-l64.h | 49 -----
+ include/linux/blkdev.h | 5 +-
+ include/linux/cache.h | 4 +-
+ include/linux/cmdline-parser.h | 8 +-
+ include/linux/crc64_ecma.h | 56 +++++
+ include/linux/huge_mm.h | 23 ++
+ include/linux/hugetlb.h | 12 +-
+ include/linux/input.h | 21 ++
+ include/linux/kthread.h | 1 +
+ include/linux/mm.h | 41 +++-
+ include/linux/mmzone.h | 6 +
+ include/linux/page-flags.h | 4 +-
+ include/linux/parser.h | 1 +
+ include/linux/posix_acl.h | 78 +------
+ include/linux/printk.h | 19 +-
+ include/linux/ramfs.h | 7 -
+ include/linux/reboot.h | 1 +
+ include/linux/sched.h | 28 ++-
+ include/linux/smp.h | 6 +-
+ include/linux/w1-gpio.h | 1 +
+ include/uapi/asm-generic/types.h | 3 +-
+ init/main.c | 6 +-
+ kernel/fork.c | 1 -
+ kernel/kexec.c | 3 +-
+ kernel/kmod.c | 11 +-
+ kernel/kthread.c | 9 +
+ kernel/params.c | 2 +-
+ kernel/reboot.c | 2 +-
+ kernel/signal.c | 7 +-
+ kernel/smp.c | 51 ++---
+ kernel/sys.c | 8 +-
+ kernel/time/sched_clock.c | 4 +
+ kernel/watchdog.c | 10 +-
+ lib/Kconfig | 10 +-
+ lib/Makefile | 1 +
+ lib/cmdline.c | 14 +-
+ lib/crc64_ecma.c | 341 +++++++++++++++++++++++++++++
+ lib/decompress_unlz4.c | 1 +
+ lib/dma-debug.c | 7 +
+ lib/dynamic_debug.c | 15 +-
+ lib/kstrtox.c | 1 -
+ lib/parser.c | 62 +++++-
+ lib/rbtree_test.c | 13 +-
+ mm/hugetlb.c | 36 +--
+ mm/internal.h | 3 +-
+ mm/memcontrol.c | 23 +-
+ mm/memory-failure.c | 2 +-
+ mm/memory.c | 11 +-
+ mm/page_alloc.c | 13 ++
+ mm/swap.c | 278 ++++++++++++-----------
+ mm/swap_state.c | 63 +++++-
+ mm/swapfile.c | 20 +-
+ net/netfilter/ipset/ip_set_hash_netiface.c | 27 +--
+ scripts/checkpatch.pl | 9 +
+ scripts/get_maintainer.pl | 91 +++++++-
+ 132 files changed, 2291 insertions(+), 1293 deletions(-)
+ create mode 100644 drivers/input/leds.c
+ delete mode 100644 fs/coredump.h
+ delete mode 100644 include/asm-generic/int-l64.h
+ create mode 100644 include/linux/crc64_ecma.h
+ create mode 100644 lib/crc64_ecma.c
+$ git clone -s -l -n -q . ../rebase-tmp
+$ cd ../rebase-tmp
+$ git checkout -b akpm remotes/origin/akpm/master
+Switched to a new branch 'akpm'
+$ git rebase --onto master remotes/origin/akpm/master-base
+First, rewinding head to replay your work on top of it...
+Applying: mm: add strictlimit knob
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + a78073fc717c...6b44e45c97e1 akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (6b44e45c97e1 mm: add strictlimit knob)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-bdi | 8 +++++++
+ mm/backing-dev.c | 35 +++++++++++++++++++++++++++++++
+ 2 files changed, 43 insertions(+)
+$ git revert 436aa86f0414
+[master 66f8a5ea7bc9] Revert "ASoC: eukrea-tlv320: Add DT support."
+ 3 files changed, 13 insertions(+), 121 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/sound/eukrea-tlv320.txt
projects / karo-tx-linux.git / commitdiff