path: root/Next/merge.log

$ date
Tuesday 11 February  11:17:31 EST 2014
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 9c1db7798141 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Merging origin/master (b28a960c42fc Linux 3.14-rc2)
$ git merge origin/master
Updating 9c1db7798141..b28a960c42fc
Fast-forward
 Makefile                       |  2 +-
 drivers/char/virtio_console.c  |  9 +++------
 fs/cifs/file.c                 |  4 ++--
 fs/ext4/file.c                 |  2 +-
 fs/ntfs/file.c                 |  2 +-
 fs/sync.c                      | 17 -----------------
 fs/xfs/xfs_file.c              |  2 +-
 include/linux/fs.h             |  8 +++++++-
 mm/filemap.c                   |  4 ++--
 security/selinux/nlmsgtab.c    |  2 ++
 security/selinux/ss/services.c |  4 ++++
 11 files changed, 24 insertions(+), 32 deletions(-)
Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator)
$ git merge fixes/master
Already up-to-date.
Merging kbuild-current/rc-fixes (38dbfb59d117 Linus 3.14-rc1)
$ git merge kbuild-current/rc-fixes
Already up-to-date.
Merging arc-current/for-curr (7e22e91102c6 Linux 3.13-rc8)
$ git merge arc-current/for-curr
Already up-to-date.
Merging arm-current/fixes (87f9260bf1fb ARM: dts: fix spdif pinmux configuration)
$ git merge arm-current/fixes
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/imx6dl-hummingboard.dts | 10 +++-------
 arch/arm/boot/dts/imx6qdl-cubox-i.dtsi    | 10 +++-------
 2 files changed, 6 insertions(+), 14 deletions(-)
Merging m68k-current/for-linus (7247f55381d5 m68k: Wire up sched_setattr and sched_getattr)
$ git merge m68k-current/for-linus
Removing arch/m68k/include/asm/barrier.h
Merge made by the 'recursive' strategy.
 arch/m68k/include/asm/Kbuild        | 6 +++---
 arch/m68k/include/asm/barrier.h     | 8 --------
 arch/m68k/include/asm/unistd.h      | 2 +-
 arch/m68k/include/uapi/asm/unistd.h | 2 ++
 arch/m68k/kernel/syscalltable.S     | 2 ++
 5 files changed, 8 insertions(+), 12 deletions(-)
 delete mode 100644 arch/m68k/include/asm/barrier.h
Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2)
$ git merge metag-fixes/fixes
Already up-to-date.
Merging powerpc-merge/merge (b3084f4db3ae powerpc/thp: Fix crash on mremap)
$ git merge powerpc-merge/merge
Already up-to-date.
Merging sparc/master (9b0cd304f26b Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux)
$ git merge sparc/master
Already up-to-date.
Merging net/master (bf06200e732d tcp: tsq: fix nonagle handling)
$ git merge net/master
Removing drivers/net/irda/ep7211-sir.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../bindings/net/allwinner,sun4i-emac.txt          |   5 +-
 .../bindings/net/allwinner,sun4i-mdio.txt          |   5 +-
 Documentation/ptp/testptp.c                        |  11 +-
 MAINTAINERS                                        |   2 +-
 arch/arm/boot/dts/sun4i-a10.dtsi                   |   4 +-
 arch/arm/boot/dts/sun5i-a10s.dtsi                  |   4 +-
 arch/arm/boot/dts/sun7i-a20.dtsi                   |   4 +-
 drivers/isdn/hisax/q931.c                          |   2 +-
 drivers/net/bonding/bond_main.c                    |  25 ++--
 drivers/net/can/Kconfig                            |   2 +-
 drivers/net/can/dev.c                              |  15 +--
 drivers/net/can/flexcan.c                          |   7 +-
 drivers/net/can/janz-ican3.c                       |  20 +--
 drivers/net/can/vcan.c                             |   9 +-
 drivers/net/ethernet/3com/3c59x.c                  |   2 -
 drivers/net/ethernet/allwinner/sun4i-emac.c        |   3 +
 drivers/net/ethernet/broadcom/bnx2.c               |   2 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h    |   2 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   |  12 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c  |   6 +-
 drivers/net/ethernet/broadcom/tg3.c                |  17 +--
 drivers/net/ethernet/ethoc.c                       | 138 ++++++++++++++++++++-
 drivers/net/ethernet/intel/e100.c                  |   2 +-
 drivers/net/ethernet/neterion/vxge/vxge-main.c     |   6 -
 drivers/net/ethernet/sfc/tx.c                      |   2 +
 drivers/net/ethernet/ti/cpsw.c                     |  14 ++-
 drivers/net/irda/Kconfig                           |   7 --
 drivers/net/irda/Makefile                          |   1 -
 drivers/net/irda/ep7211-sir.c                      |  70 -----------
 drivers/net/phy/dp83640.c                          |  19 ++-
 drivers/net/phy/mdio-sun4i.c                       |   3 +
 drivers/net/phy/phy_device.c                       |  38 +++---
 drivers/net/usb/hso.c                              |  32 ++---
 drivers/net/usb/qmi_wwan.c                         |   2 +
 drivers/net/usb/r8152.c                            |  17 ++-
 drivers/net/vxlan.c                                |   3 -
 drivers/net/wan/dlci.c                             |   5 -
 drivers/net/wireless/ath/ar5523/ar5523.c           |   2 +-
 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |   4 +
 drivers/net/wireless/ath/ath9k/htc.h               |   2 +
 drivers/net/wireless/ath/ath9k/htc_drv_init.c      |   8 +-
 drivers/net/wireless/ath/ath9k/htc_drv_main.c      |  63 ++++++----
 drivers/net/wireless/ath/ath9k/hw.c                |   5 +-
 drivers/net/wireless/ath/ath9k/init.c              |   8 +-
 drivers/net/wireless/iwlwifi/iwl-nvm-parse.c       |   5 +
 drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h     |   4 +-
 drivers/net/wireless/iwlwifi/mvm/mac80211.c        |   2 +-
 drivers/net/wireless/iwlwifi/mvm/scan.c            |   5 +-
 drivers/net/wireless/iwlwifi/mvm/sta.c             |   2 +-
 drivers/net/wireless/iwlwifi/mvm/tx.c              |  73 +++++------
 drivers/net/wireless/iwlwifi/mvm/utils.c           |   2 +
 drivers/net/wireless/iwlwifi/pcie/drv.c            |   7 +-
 drivers/net/wireless/rt2x00/rt2500pci.c            |   5 +
 drivers/net/wireless/rt2x00/rt2500usb.c            |   5 +
 drivers/net/wireless/rt2x00/rt2800lib.c            |   5 +-
 drivers/net/wireless/rtl818x/rtl8180/dev.c         |  23 +++-
 drivers/net/xen-netback/common.h                   |   6 +-
 drivers/net/xen-netback/interface.c                |   1 -
 drivers/net/xen-netback/netback.c                  |  16 +--
 drivers/net/xen-netfront.c                         |   5 +-
 include/linux/can/skb.h                            |  38 ++++++
 include/net/datalink.h                             |   2 +
 include/net/dn.h                                   |   2 +
 include/net/dn_route.h                             |   2 +
 include/net/ethoc.h                                |   1 +
 include/net/ipx.h                                  |  11 ++
 include/net/net_namespace.h                        |   8 ++
 include/net/netfilter/nf_conntrack.h               |   2 +
 include/net/netfilter/nf_tables.h                  |   9 +-
 include/net/netfilter/nft_reject.h                 |  25 ++++
 include/uapi/linux/in6.h                           |  23 ++--
 net/9p/client.c                                    |   2 +-
 net/bridge/br_device.c                             |  54 ++++----
 net/bridge/br_fdb.c                                | 137 +++++++++++++-------
 net/bridge/br_if.c                                 |   6 +-
 net/bridge/br_input.c                              |   4 +-
 net/bridge/br_private.h                            |  13 +-
 net/bridge/br_stp_if.c                             |   2 +
 net/bridge/br_vlan.c                               |  27 +++-
 net/caif/caif_dev.c                                |   1 +
 net/caif/cfsrvl.c                                  |   1 +
 net/can/af_can.c                                   |   3 +-
 net/can/bcm.c                                      |   4 +-
 net/can/raw.c                                      |   1 +
 net/core/dev.c                                     |   6 +-
 net/core/fib_rules.c                               |   7 ++
 net/core/netpoll.c                                 |   4 +-
 net/core/rtnetlink.c                               |   2 +-
 net/core/sock.c                                    |   6 +-
 net/decnet/af_decnet.c                             |   5 -
 net/ieee802154/6lowpan.c                           |   3 -
 net/ipv4/devinet.c                                 |   3 +-
 net/ipv4/ip_tunnel.c                               |  29 ++---
 net/ipv4/netfilter/Kconfig                         |   5 +
 net/ipv4/netfilter/Makefile                        |   1 +
 net/ipv4/netfilter/nf_nat_h323.c                   |   5 +-
 net/ipv4/netfilter/nft_reject_ipv4.c               |  75 +++++++++++
 net/ipv4/tcp.c                                     |   2 +-
 net/ipv4/tcp_input.c                               |  18 +--
 net/ipv4/tcp_output.c                              |  15 ++-
 net/ipv4/udp_offload.c                             |  17 +--
 net/ipv6/icmp.c                                    |   2 +-
 net/ipv6/netfilter/Kconfig                         |   5 +
 net/ipv6/netfilter/Makefile                        |   1 +
 net/ipv6/netfilter/nft_reject_ipv6.c               |  76 ++++++++++++
 net/ipx/af_ipx.c                                   |  22 +---
 net/ipx/ipx_route.c                                |   4 -
 net/mac80211/cfg.c                                 |  44 +++----
 net/mac80211/ht.c                                  |   4 +-
 net/mac80211/ibss.c                                |   5 +-
 net/mac80211/iface.c                               |  27 ++--
 net/mac80211/tx.c                                  |   2 +-
 net/netfilter/Kconfig                              |   6 +-
 net/netfilter/Makefile                             |   1 +
 net/netfilter/ipvs/ip_vs_conn.c                    |   8 +-
 net/netfilter/nf_conntrack_core.c                  |  55 ++++++--
 net/netfilter/nf_synproxy_core.c                   |   5 +-
 net/netfilter/nf_tables_api.c                      |  82 +++++++-----
 net/netfilter/nf_tables_core.c                     |   6 +-
 net/netfilter/nft_ct.c                             |  16 ++-
 net/netfilter/nft_log.c                            |   5 +-
 net/netfilter/nft_lookup.c                         |   1 +
 net/netfilter/nft_queue.c                          |   4 +-
 net/netfilter/nft_rbtree.c                         |  16 ++-
 net/netfilter/nft_reject.c                         |  89 ++-----------
 net/netfilter/nft_reject_inet.c                    |  63 ++++++++++
 net/netfilter/xt_CT.c                              |   7 +-
 net/openvswitch/datapath.c                         |  23 ++--
 net/openvswitch/flow_table.c                       |  88 +++++++------
 net/openvswitch/flow_table.h                       |   2 +-
 net/sctp/ipv6.c                                    |   2 +
 net/sunrpc/svc_xprt.c                              |   6 +-
 net/wireless/core.c                                |  17 +--
 net/wireless/core.h                                |   4 +-
 net/wireless/nl80211.c                             |  32 ++---
 net/wireless/nl80211.h                             |   8 +-
 net/wireless/scan.c                                |  40 +++---
 net/wireless/sme.c                                 |   2 +-
 138 files changed, 1340 insertions(+), 797 deletions(-)
 delete mode 100644 drivers/net/irda/ep7211-sir.c
 create mode 100644 include/net/netfilter/nft_reject.h
 create mode 100644 net/ipv4/netfilter/nft_reject_ipv4.c
 create mode 100644 net/ipv6/netfilter/nft_reject_ipv6.c
 create mode 100644 net/netfilter/nft_reject_inet.c
Merging ipsec/master (965cdea82569 dccp: catch failed request_module call in dccp_probe init)
$ git merge ipsec/master
Already up-to-date.
Merging sound-current/for-linus (ef8e39b51f24 ALSA: hda - Fix undefined symbol due to builtin/module mixup)
$ git merge sound-current/for-linus
Merge made by the 'recursive' strategy.
 sound/pci/hda/hda_codec.c       | 34 +++++++++++++++++-----------------
 sound/pci/hda/hda_generic.c     |  8 ++++----
 sound/pci/hda/hda_generic.h     |  1 +
 sound/pci/hda/hda_intel.c       |  2 +-
 sound/pci/hda/patch_conexant.c  |  3 ++-
 sound/pci/hda/patch_realtek.c   | 11 ++++++++---
 sound/pci/hda/patch_sigmatel.c  | 27 +++++++++++++++++----------
 sound/pci/hda/thinkpad_helper.c |  1 +
 8 files changed, 51 insertions(+), 36 deletions(-)
Merging pci-current/for-linus (38dbfb59d117 Linus 3.14-rc1)
$ git merge pci-current/for-linus
Already up-to-date.
Merging wireless/master (348f7d4adee9 rtl8180: Add error check for pci_map_single return value in TX path)
$ git merge wireless/master
Already up-to-date.
Merging driver-core.current/driver-core-linus (9e1ccb4a7700 drivers/base: fix devres handling for master device)
$ git merge driver-core.current/driver-core-linus
Merge made by the 'recursive' strategy.
 drivers/base/component.c | 8 ++++++++
 1 file changed, 8 insertions(+)
Merging tty.current/tty-linus (d8a5dc3033af tty: Set correct tty name in 'active' sysfs attribute)
$ git merge tty.current/tty-linus
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-tty |  3 ++-
 drivers/tty/hvc/hvc_opal.c          |  8 +-------
 drivers/tty/hvc/hvc_rtas.c          | 12 +-----------
 drivers/tty/hvc/hvc_udbg.c          |  9 +--------
 drivers/tty/hvc/hvc_xen.c           | 17 +----------------
 drivers/tty/n_gsm.c                 | 11 +++++++++++
 drivers/tty/tty_io.c                | 25 ++++++++++++++++++-------
 7 files changed, 35 insertions(+), 50 deletions(-)
Merging usb.current/usb-linus (03b56329f9bb Modpost: fixed USB alias generation for ranges including 0x9 and 0xA)
$ git merge usb.current/usb-linus
Merge made by the 'recursive' strategy.
 drivers/usb/core/driver.c              | 24 +++++++++++++++------
 drivers/usb/core/hcd.c                 |  1 -
 drivers/usb/core/hub.c                 |  7 +-----
 drivers/usb/core/usb.h                 |  1 -
 drivers/usb/dwc2/core.c                |  2 +-
 drivers/usb/dwc2/hcd.c                 | 11 ----------
 drivers/usb/dwc2/platform.c            |  3 +++
 drivers/usb/host/xhci-dbg.c            |  6 +++---
 drivers/usb/host/xhci-mem.c            | 14 ++++++------
 drivers/usb/host/xhci-pci.c            |  5 +++++
 drivers/usb/host/xhci-ring.c           | 14 ++++++------
 drivers/usb/host/xhci.c                | 20 ++++++++---------
 drivers/usb/host/xhci.h                | 39 ++++++++++++++++++++++++----------
 drivers/usb/phy/phy.c                  |  8 +++----
 drivers/usb/serial/ftdi_sio.c          |  3 +++
 drivers/usb/serial/ftdi_sio_ids.h      |  7 ++++++
 drivers/usb/serial/qcserial.c          |  3 +++
 drivers/usb/serial/usb-serial-simple.c |  3 ++-
 drivers/usb/storage/Kconfig            |  4 +++-
 drivers/usb/storage/scsiglue.c         |  6 ++++++
 drivers/usb/storage/unusual_cypress.h  |  2 +-
 drivers/usb/storage/unusual_devs.h     |  7 ++++++
 scripts/mod/file2alias.c               |  4 ++--
 23 files changed, 120 insertions(+), 74 deletions(-)
Merging staging.current/staging-linus (a0f452520211 Merge tag 'iio-fixes-for-3.14b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
$ git merge staging.current/staging-linus
Merge made by the 'recursive' strategy.
 drivers/iio/accel/bma180.c                         |  16 +-
 drivers/iio/adc/max1363.c                          |   2 +-
 drivers/iio/imu/adis16400.h                        |   1 +
 drivers/iio/imu/adis16400_core.c                   |  10 +-
 drivers/iio/light/tsl2563.c                        |  16 +-
 drivers/iio/magnetometer/ak8975.c                  |  16 +-
 drivers/iio/magnetometer/mag3110.c                 |   8 +-
 drivers/staging/android/ashmem.c                   |  45 +--
 drivers/staging/android/ion/compat_ion.c           |  26 +-
 drivers/staging/android/ion/ion_dummy_driver.c     |  12 +-
 drivers/staging/android/ion/ion_heap.c             |   2 +-
 drivers/staging/android/ion/ion_priv.h             |   1 +
 drivers/staging/android/ion/ion_system_heap.c      |   6 +-
 drivers/staging/android/sw_sync.h                  |  17 ++
 drivers/staging/android/sync.c                     |  14 +-
 drivers/staging/comedi/drivers.c                   |   2 -
 drivers/staging/comedi/drivers/adv_pci1710.c       |  17 +-
 drivers/staging/comedi/drivers/usbduxsigma.c       |   6 +-
 drivers/staging/dgrp/dgrp_net_ops.c                | 330 ++++++++++-----------
 drivers/staging/gdm72xx/gdm_usb.c                  |   3 +
 drivers/staging/iio/Documentation/iio_utils.h      |   6 +-
 drivers/staging/iio/adc/ad799x_core.c              |  13 +-
 drivers/staging/iio/adc/mxs-lradc.c                |   6 +-
 drivers/staging/iio/impedance-analyzer/ad5933.c    |   2 +-
 drivers/staging/imx-drm/imx-drm-core.c             |  55 ++--
 drivers/staging/imx-drm/imx-hdmi.c                 |  22 +-
 drivers/staging/lustre/TODO                        |   5 +-
 .../include/linux/libcfs/libcfs_kernelcomm.h       |   2 +
 .../lustre/include/linux/libcfs/libcfs_private.h   |   2 +-
 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c |   2 +-
 .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c |   5 +-
 .../lustre/lustre/include/lustre/lustre_user.h     |   3 +-
 drivers/staging/lustre/lustre/llite/dir.c          |   2 +-
 drivers/staging/lustre/lustre/mdc/mdc_request.c    |   6 +-
 drivers/staging/netlogic/xlr_net.c                 |   5 +
 drivers/staging/octeon-usb/octeon-hcd.c            | 273 ++++++++---------
 drivers/staging/ozwpan/ozproto.c                   |   3 +-
 drivers/staging/rtl8188eu/core/rtw_wlan_util.c     |  22 +-
 drivers/staging/rtl8188eu/os_dep/ioctl_linux.c     |  12 +-
 drivers/staging/rtl8188eu/os_dep/usb_intf.c        |   2 +-
 drivers/staging/rtl8821ae/wifi.h                   |   2 +-
 drivers/staging/usbip/userspace/libsrc/names.c     |   8 +-
 drivers/staging/usbip/vhci_sysfs.c                 |   3 +-
 drivers/staging/wlags49_h2/wl_wext.c               |   2 +-
 44 files changed, 505 insertions(+), 508 deletions(-)
Merging char-misc.current/char-misc-linus (3b1cc9b9622a misc: mic: fix possible signed underflow (undefined behavior) in userspace API)
$ git merge char-misc.current/char-misc-linus
Auto-merging arch/arm/boot/dts/sun5i-a10s.dtsi
Auto-merging arch/arm/boot/dts/sun4i-a10.dtsi
Merge made by the 'recursive' strategy.
 .../bindings/misc/allwinner,sunxi-sid.txt          |  5 +-
 Documentation/zh_CN/arm64/booting.txt              | 65 +++++++++++++++-------
 Documentation/zh_CN/arm64/memory.txt               | 46 +++++++++++++--
 Documentation/zh_CN/arm64/tagged-pointers.txt      | 52 +++++++++++++++++
 arch/arm/boot/dts/sun4i-a10.dtsi                   |  2 +-
 arch/arm/boot/dts/sun5i-a10s.dtsi                  |  2 +-
 arch/arm/boot/dts/sun5i-a13.dtsi                   |  2 +-
 drivers/char/Kconfig                               |  1 +
 drivers/char/raw.c                                 |  2 +-
 drivers/hv/connection.c                            | 13 +----
 drivers/misc/eeprom/sunxi_sid.c                    |  5 +-
 drivers/misc/genwqe/card_dev.c                     |  1 +
 drivers/misc/mei/client.c                          | 11 +++-
 drivers/misc/mic/host/mic_virtio.c                 |  3 +-
 drivers/vme/bridges/vme_ca91cx42.c                 |  4 +-
 drivers/vme/bridges/vme_tsi148.c                   |  4 +-
 include/linux/hyperv.h                             |  2 +-
 include/uapi/linux/mic_ioctl.h                     |  2 +-
 18 files changed, 171 insertions(+), 51 deletions(-)
 create mode 100644 Documentation/zh_CN/arm64/tagged-pointers.txt
Merging input-current/for-linus (55df811f2066 Merge branch 'next' into for-linus)
$ 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 (ee97dc7db4cb crypto: s390 - fix des and des3_ede ctr concurrency issue)
$ git merge crypto-current/master
Already up-to-date.
Merging ide/master (9b0cd304f26b Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux)
$ 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 devicetree-current/devicetree/merge (6f041e99fc7b of: Fix NULL dereference in unflatten_and_copy())
$ git merge devicetree-current/devicetree/merge
Already up-to-date.
Merging rr-fixes/fixes (7122c3e9154b scripts/link-vmlinux.sh: only filter kernel symbols for arm)
$ git merge rr-fixes/fixes
Already up-to-date.
Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts before cancelling delayed works)
$ 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
Already up-to-date.
Merging drm-intel-fixes/for-linux-next-fixes (9f77558f8512 drm/i915: Pair va_copy with va_end in i915_error_vprintf)
$ git merge drm-intel-fixes/for-linux-next-fixes
Auto-merging drivers/gpu/drm/i915/intel_opregion.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                           |  2 +-
 drivers/gpu/drm/i915/i915_drv.h       |  8 ++++++++
 drivers/gpu/drm/i915/i915_gpu_error.c |  5 ++++-
 drivers/gpu/drm/i915/i915_irq.c       |  3 +--
 drivers/gpu/drm/i915/intel_dp.c       | 12 +++++++-----
 drivers/gpu/drm/i915/intel_i2c.c      |  7 -------
 drivers/gpu/drm/i915/intel_opregion.c |  9 ++++++---
 include/drm/drmP.h                    |  3 +++
 8 files changed, 30 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 (c61e2aee0c55 ARC: Remove ARC_HAS_COH_RTSC)
$ git merge arc/for-next
Merge made by the 'recursive' strategy.
 arch/arc/boot/.gitignore         |  1 +
 arch/arc/include/asm/linkage.h   | 14 -----------
 arch/arc/kernel/ctx_sw_asm.S     |  2 +-
 arch/arc/kernel/entry.S          | 52 ++++++++++++++++++++--------------------
 arch/arc/lib/memcmp.S            |  6 ++---
 arch/arc/lib/memcpy-700.S        |  6 ++---
 arch/arc/lib/memset.S            | 10 ++++----
 arch/arc/lib/strchr-700.S        |  6 ++---
 arch/arc/lib/strcmp.S            |  6 ++---
 arch/arc/lib/strcpy-700.S        |  6 ++---
 arch/arc/lib/strlen.S            |  6 ++---
 arch/arc/mm/init.c               | 27 +++++++++++++++++++++
 arch/arc/mm/tlbex.S              | 10 ++++----
 arch/arc/plat-arcfpga/Kconfig    |  1 -
 arch/arc/plat-arcfpga/platform.c |  6 ++---
 15 files changed, 85 insertions(+), 74 deletions(-)
Merging arm/for-next (58b9ef24dc72 Merge branch 'cubox-i-init' into for-next)
$ git merge arm/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging arm-perf/for-next/perf (38dbfb59d117 Linus 3.14-rc1)
$ git merge arm-perf/for-next/perf
Already up-to-date.
Merging arm-soc/for-next (c7052babf81d Merge branch 'fixes' into for-next)
$ git merge arm-soc/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/mmc/atmel-hsmci.txt        |   5 +
 .../devicetree/bindings/spi/spi_atmel.txt          |   5 +
 Documentation/phy.txt                              |  26 ++-
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/at91-sama5d3_xplained.dts        | 229 +++++++++++++++++++++
 arch/arm/boot/dts/at91sam9263.dtsi                 |   2 +-
 arch/arm/boot/dts/at91sam9n12ek.dts                |   4 +
 arch/arm/boot/dts/sama5d3.dtsi                     |   2 +-
 arch/arm/configs/multi_v7_defconfig                |   1 +
 arch/arm/mach-hisi/Kconfig                         |   2 +-
 arch/arm/mach-imx/clk-imx6q.c                      |   3 +
 arch/arm/mach-imx/clk-imx6sl.c                     |   3 +
 arch/arm/mach-imx/pm-imx6q.c                       |   2 -
 arch/arm/mach-moxart/Kconfig                       |   1 -
 arch/arm/mach-omap2/Kconfig                        |   2 +-
 arch/arm/mach-pxa/am300epd.c                       |   1 +
 arch/arm/mach-pxa/include/mach/balloon3.h          |   2 +
 arch/arm/mach-pxa/include/mach/corgi.h             |   1 +
 arch/arm/mach-pxa/include/mach/csb726.h            |   2 +
 arch/arm/mach-pxa/include/mach/gumstix.h           |   1 +
 arch/arm/mach-pxa/include/mach/idp.h               |   1 +
 arch/arm/mach-pxa/include/mach/palmld.h            |   2 +
 arch/arm/mach-pxa/include/mach/palmt5.h            |   2 +
 arch/arm/mach-pxa/include/mach/palmtc.h            |   2 +
 arch/arm/mach-pxa/include/mach/palmtx.h            |   2 +
 arch/arm/mach-pxa/include/mach/pcm027.h            |   2 +
 arch/arm/mach-pxa/include/mach/pcm990_baseboard.h  |   1 +
 arch/arm/mach-pxa/include/mach/poodle.h            |   2 +
 arch/arm/mach-pxa/include/mach/spitz.h             |   2 +-
 arch/arm/mach-pxa/include/mach/tosa.h              |   2 +
 arch/arm/mach-pxa/include/mach/trizeps4.h          |   2 +
 arch/arm/mach-shmobile/Kconfig                     |   2 +-
 arch/arm/mach-zynq/common.c                        |  14 ++
 drivers/ata/sata_mv.c                              |   8 +-
 drivers/dma/Kconfig                                |   1 +
 drivers/phy/phy-core.c                             |  62 +++++-
 include/linux/phy/phy.h                            |  14 ++
 37 files changed, 396 insertions(+), 20 deletions(-)
 create mode 100644 arch/arm/boot/dts/at91-sama5d3_xplained.dts
Merging bcm2835/for-next (413541dd66d5 Linux 3.13-rc5)
$ git merge bcm2835/for-next
Already up-to-date.
Merging cortex-m/for-next (f41bfc9423aa Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
$ git merge cortex-m/for-next
Already up-to-date.
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 (6e5dad1f97b2 Merge branch 'imx/dt' into for-next)
$ git merge imx-mxs/for-next
Auto-merging arch/arm/mach-imx/pm-imx6q.c
Removing arch/arm/mach-imx/devices/platform-mxc_pwm.c
Auto-merging arch/arm/mach-imx/clk-imx6sl.c
Auto-merging arch/arm/mach-imx/clk-imx6q.c
Removing arch/arm/boot/dts/imx53-evk.dts
Auto-merging arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/vendor-prefixes.txt        |   3 +
 arch/arm/boot/dts/Makefile                         |  30 +-
 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/imx23.dtsi                       |   8 +-
 arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi       |  73 ++
 .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts  | 174 ++++
 arch/arm/boot/dts/imx25-pinfunc.h                  | 494 +++++++++++
 arch/arm/boot/dts/imx25.dtsi                       |  18 +-
 arch/arm/boot/dts/imx27-apf27.dts                  |  38 +
 arch/arm/boot/dts/imx27-apf27dev.dts               | 149 +++-
 arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts   |  75 +-
 arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts   |  63 +-
 arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts     |  97 ++-
 ...ycore-som.dts => imx27-phytec-phycore-som.dtsi} |  95 ++-
 arch/arm/boot/dts/imx27-pinfunc.h                  | 526 ++++++++++++
 arch/arm/boot/dts/imx27.dtsi                       | 151 ++--
 arch/arm/boot/dts/imx28-apf28dev.dts               |  29 +-
 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                 |  17 +-
 arch/arm/boot/dts/imx28-m28evk.dts                 |  18 +-
 arch/arm/boot/dts/imx28-sps1.dts                   |   7 +-
 arch/arm/boot/dts/imx28-tx28.dts                   |  24 +-
 arch/arm/boot/dts/imx28.dtsi                       |  65 +-
 arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi       |  81 ++
 .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts  | 143 ++++
 arch/arm/boot/dts/imx35.dtsi                       | 359 ++++++++
 arch/arm/boot/dts/imx50-evk.dts                    | 119 +++
 arch/arm/boot/dts/imx50-pinfunc.h                  | 923 ++++++++++++++++++++
 arch/arm/boot/dts/imx50.dtsi                       | 478 +++++++++++
 arch/arm/boot/dts/imx51-apf51.dts                  |  40 +-
 arch/arm/boot/dts/imx51-apf51dev.dts               | 102 ++-
 arch/arm/boot/dts/imx51-babbage.dts                | 255 +++++-
 arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi       |  93 ++
 .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts  | 175 ++++
 arch/arm/boot/dts/imx51.dtsi                       | 459 ++--------
 arch/arm/boot/dts/imx53-ard.dts                    |  33 +-
 arch/arm/boot/dts/imx53-evk.dts                    | 126 ---
 arch/arm/boot/dts/imx53-m53evk.dts                 | 232 ++++-
 arch/arm/boot/dts/imx53-mba53.dts                  |  39 +-
 arch/arm/boot/dts/imx53-qsb-common.dtsi            | 336 ++++++++
 arch/arm/boot/dts/imx53-qsb.dts                    | 210 +----
 arch/arm/boot/dts/imx53-qsrb.dts                   | 158 ++++
 arch/arm/boot/dts/imx53-smd.dts                    | 119 ++-
 arch/arm/boot/dts/imx53-tqma53.dtsi                | 175 +++-
 arch/arm/boot/dts/imx53-tx53-x03x.dts              | 315 +++++++
 arch/arm/boot/dts/imx53-tx53-x13x.dts              | 243 ++++++
 arch/arm/boot/dts/imx53-tx53.dtsi                  | 510 ++++++++++-
 arch/arm/boot/dts/imx53-voipac-bsb.dts             | 159 ++++
 arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi        | 277 ++++++
 arch/arm/boot/dts/imx53.dtsi                       | 663 +++------------
 arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts         |  23 +
 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-nitrogen6x.dts            |  21 +
 arch/arm/boot/dts/imx6dl-pinfunc.h                 |   2 +
 arch/arm/boot/dts/imx6dl-sabrelite.dts             |  20 +
 arch/arm/boot/dts/imx6dl.dtsi                      |  29 +-
 arch/arm/boot/dts/imx6q-arm2.dts                   | 140 ++-
 arch/arm/boot/dts/imx6q-cm-fx6.dts                 | 107 +++
 arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts          |  23 +
 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts            | 372 ++++++++
 arch/arm/boot/dts/imx6q-gk802.dts                  | 171 ++++
 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               | 546 ++++++++++++
 arch/arm/boot/dts/imx6q-gw54xx.dts                 |  23 +
 arch/arm/boot/dts/imx6q-nitrogen6x.dts             |  25 +
 arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi         |  85 +-
 arch/arm/boot/dts/imx6q-pinfunc.h                  |   2 +
 arch/arm/boot/dts/imx6q-sabrelite.dts              | 178 +---
 arch/arm/boot/dts/imx6q-sbc6x.dts                  |  58 +-
 arch/arm/boot/dts/imx6q-udoo.dts                   |  54 +-
 arch/arm/boot/dts/imx6q.dtsi                       |  21 +-
 arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi       | 199 +++++
 arch/arm/boot/dts/imx6qdl-gw51xx.dtsi              | 374 ++++++++
 arch/arm/boot/dts/imx6qdl-gw52xx.dtsi              | 490 +++++++++++
 arch/arm/boot/dts/imx6qdl-gw53xx.dtsi              | 553 ++++++++++++
 arch/arm/boot/dts/imx6qdl-gw54xx.dtsi              | 580 +++++++++++++
 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi          | 422 +++++++++
 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi           | 359 +++++++-
 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi           | 423 ++++++++++
 arch/arm/boot/dts/imx6qdl-sabresd.dtsi             | 277 +++++-
 arch/arm/boot/dts/imx6qdl-wandboard.dtsi           | 131 ++-
 arch/arm/boot/dts/imx6qdl.dtsi                     | 938 +++------------------
 arch/arm/boot/dts/imx6sl-evk.dts                   | 426 +++++++++-
 arch/arm/boot/dts/imx6sl.dtsi                      | 385 +++------
 arch/arm/boot/dts/vf610-cosmic.dts                 |  29 +-
 arch/arm/boot/dts/vf610-twr.dts                    |  66 +-
 arch/arm/boot/dts/vf610.dtsi                       | 207 +----
 arch/arm/configs/imx_v4_v5_defconfig               |   1 +
 arch/arm/configs/imx_v6_v7_defconfig               |   6 +
 arch/arm/mach-imx/Kconfig                          |   8 +-
 arch/arm/mach-imx/Makefile                         |   6 +-
 arch/arm/mach-imx/clk-imx21.c                      |   1 -
 arch/arm/mach-imx/clk-imx25.c                      |   8 -
 arch/arm/mach-imx/clk-imx27.c                      |   1 -
 arch/arm/mach-imx/clk-imx51-imx53.c                |   2 -
 arch/arm/mach-imx/clk-imx6q.c                      |   7 +-
 arch/arm/mach-imx/clk-imx6sl.c                     |  88 +-
 arch/arm/mach-imx/clk-vf610.c                      |  36 +-
 arch/arm/mach-imx/common.h                         |  11 +-
 arch/arm/mach-imx/cpuidle-imx6q.c                  |   4 +-
 arch/arm/mach-imx/cpuidle-imx6sl.c                 |  57 ++
 arch/arm/mach-imx/cpuidle.h                        |   5 +
 arch/arm/mach-imx/devices-imx25.h                  |   4 -
 arch/arm/mach-imx/devices-imx51.h                  |   4 -
 arch/arm/mach-imx/devices/Kconfig                  |   3 -
 arch/arm/mach-imx/devices/Makefile                 |   1 -
 arch/arm/mach-imx/devices/devices-common.h         |   9 -
 arch/arm/mach-imx/devices/platform-mxc_pwm.c       |  69 --
 arch/arm/mach-imx/hardware.h                       |   4 +-
 arch/arm/mach-imx/mach-imx6q.c                     |  38 +-
 arch/arm/mach-imx/mach-imx6sl.c                    |   6 +-
 arch/arm/mach-imx/pm-imx6q.c                       | 327 ++++++-
 arch/arm/mach-imx/suspend-imx6.S                   | 328 +++++++
 arch/arm/mach-imx/time.c                           |  12 +
 arch/arm/mach-mxs/mach-mxs.c                       |  33 +
 132 files changed, 15323 insertions(+), 3301 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
 rename arch/arm/boot/dts/{imx27-phytec-phycore-som.dts => imx27-phytec-phycore-som.dtsi} (61%)
 create mode 100644 arch/arm/boot/dts/imx27-pinfunc.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/imx35-eukrea-cpuimx35.dtsi
 create mode 100644 arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts
 create mode 100644 arch/arm/boot/dts/imx35.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.dtsi
 create mode 100644 arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi
 create mode 100644 arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
 delete mode 100644 arch/arm/boot/dts/imx53-evk.dts
 create mode 100644 arch/arm/boot/dts/imx53-qsb-common.dtsi
 create mode 100644 arch/arm/boot/dts/imx53-qsrb.dts
 create mode 100644 arch/arm/boot/dts/imx53-tx53-x03x.dts
 create mode 100644 arch/arm/boot/dts/imx53-tx53-x13x.dts
 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-dfi-fs700-m60.dts
 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/imx6dl-nitrogen6x.dts
 create mode 100644 arch/arm/boot/dts/imx6dl-sabrelite.dts
 create mode 100644 arch/arm/boot/dts/imx6q-cm-fx6.dts
 create mode 100644 arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts
 create mode 100644 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
 create mode 100644 arch/arm/boot/dts/imx6q-gk802.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/imx6q-nitrogen6x.dts
 create mode 100644 arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi
 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-nitrogen6x.dtsi
 create mode 100644 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
 create mode 100644 arch/arm/mach-imx/cpuidle-imx6sl.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mxc_pwm.c
 create mode 100644 arch/arm/mach-imx/suspend-imx6.S
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 (fb78c32fdc99 Merge branch 'old/mvebu/irqchip' into for-next)
$ git merge mvebu/for-next
Auto-merging drivers/irqchip/Makefile
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                         |   7 +-
 arch/arm/boot/dts/armada-xp-mv78260.dtsi           |   3 +-
 arch/arm/boot/dts/kirkwood-b3.dts                  | 204 +++++++++++++++++++++
 arch/arm/boot/dts/kirkwood-ts419-6281.dts          |  20 ++
 arch/arm/boot/dts/kirkwood-ts419-6282.dts          |  32 ++++
 arch/arm/boot/dts/kirkwood-ts419.dtsi              |  75 ++++++++
 arch/arm/configs/dove_defconfig                    |   1 -
 arch/arm/mach-mvebu/Makefile                       |   3 +-
 drivers/clk/mvebu/armada-370.c                     |  21 +--
 drivers/clk/mvebu/armada-xp.c                      |  20 +-
 drivers/clk/mvebu/dove.c                           |  19 +-
 drivers/clk/mvebu/kirkwood.c                       |  34 ++--
 drivers/irqchip/Makefile                           |   1 +
 drivers/irqchip/irq-dove.c                         | 126 +++++++++++++
 drivers/irqchip/irq-orion.c                        |  22 ++-
 16 files changed, 546 insertions(+), 59 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,dove-pmu-intc.txt
 create mode 100644 arch/arm/boot/dts/kirkwood-b3.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ts419-6281.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ts419-6282.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-ts419.dtsi
 create mode 100644 drivers/irqchip/irq-dove.c
Merging renesas/next (9554b6651c23 Merge branches 'heads/soc-for-v3.15' and 'heads/boards-for-v3.15' into devel)
$ git merge renesas/next
Auto-merging arch/arm/mach-shmobile/Kconfig
Removing arch/arm/boot/dts/r8a7791-koelsch-reference.dts
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/r7s72100-genmai-reference.dts    |   2 +-
 arch/arm/boot/dts/r7s72100.dtsi                    |  75 ++++
 arch/arm/boot/dts/r8a7778-bockw-reference.dts      |   4 +-
 arch/arm/boot/dts/r8a7790-lager.dts                |   4 +
 arch/arm/boot/dts/r8a7790.dtsi                     | 154 +++++++-
 arch/arm/boot/dts/r8a7791-koelsch-reference.dts    | 115 ------
 arch/arm/boot/dts/r8a7791-koelsch.dts              | 101 ++++-
 arch/arm/boot/dts/r8a7791.dtsi                     | 222 ++++++++++-
 arch/arm/configs/ape6evm_defconfig                 |   2 +
 arch/arm/configs/armadillo800eva_defconfig         |   2 +
 arch/arm/configs/bockw_defconfig                   |   2 +
 arch/arm/configs/genmai_defconfig                  |   4 +
 arch/arm/configs/koelsch_defconfig                 |  12 +-
 arch/arm/configs/kzm9d_defconfig                   |   2 +
 arch/arm/configs/kzm9g_defconfig                   |   2 +
 arch/arm/configs/lager_defconfig                   |  17 +
 arch/arm/configs/mackerel_defconfig                |   2 +
 arch/arm/configs/marzen_defconfig                  |   2 +
 arch/arm/mach-shmobile/Kconfig                     |  17 +-
 arch/arm/mach-shmobile/Makefile                    |   3 +-
 arch/arm/mach-shmobile/board-bockw.c               |  24 +-
 arch/arm/mach-shmobile/board-genmai.c              |  64 ++++
 arch/arm/mach-shmobile/board-koelsch-reference.c   |   4 +-
 arch/arm/mach-shmobile/board-koelsch.c             | 131 +++++++
 arch/arm/mach-shmobile/board-kzm9d-reference.c     |   5 +-
 arch/arm/mach-shmobile/board-lager-reference.c     |   4 +-
 arch/arm/mach-shmobile/board-lager.c               | 354 +++++++++++++++++-
 arch/arm/mach-shmobile/clock-r7s72100.c            |  34 +-
 arch/arm/mach-shmobile/clock-r8a7778.c             |   4 +
 arch/arm/mach-shmobile/clock-r8a7779.c             |  27 +-
 arch/arm/mach-shmobile/clock-r8a7790.c             | 160 +++++---
 arch/arm/mach-shmobile/clock-r8a7791.c             |  92 +++--
 arch/arm/mach-shmobile/include/mach/common.h       |   1 -
 arch/arm/mach-shmobile/include/mach/head-kzm9g.txt | 410 +++++++++++++++++++++
 arch/arm/mach-shmobile/include/mach/pm-rcar.h      |  15 +
 arch/arm/mach-shmobile/include/mach/r8a7779.h      |  13 +-
 arch/arm/mach-shmobile/include/mach/r8a7790.h      |  26 ++
 arch/arm/mach-shmobile/include/mach/zboot.h        |   3 +
 arch/arm/mach-shmobile/include/mach/zboot_macros.h |  43 +++
 arch/arm/mach-shmobile/pm-r8a7779.c                | 131 +------
 arch/arm/mach-shmobile/pm-r8a7790.c                |  45 +++
 arch/arm/mach-shmobile/pm-rcar.c                   | 142 +++++++
 arch/arm/mach-shmobile/setup-emev2.c               |   2 +-
 arch/arm/mach-shmobile/setup-r8a7790.c             |  90 +++++
 arch/arm/mach-shmobile/smp-r8a7779.c               |  17 +-
 arch/arm/mach-shmobile/smp-r8a7790.c               |  17 +
 drivers/sh/clk/cpg.c                               |  38 ++
 include/dt-bindings/clock/r8a7790-clock.h          |   4 +-
 include/linux/sh_clk.h                             |  19 +-
 49 files changed, 2271 insertions(+), 392 deletions(-)
 delete mode 100644 arch/arm/boot/dts/r8a7791-koelsch-reference.dts
 create mode 100644 arch/arm/mach-shmobile/include/mach/head-kzm9g.txt
 create mode 100644 arch/arm/mach-shmobile/include/mach/pm-rcar.h
 create mode 100644 arch/arm/mach-shmobile/pm-r8a7790.c
 create mode 100644 arch/arm/mach-shmobile/pm-rcar.c
Merging samsung/for-next (38dbfb59d117 Linus 3.14-rc1)
$ git merge samsung/for-next
Already up-to-date.
Merging tegra/for-next (02a2aa6f9a90 Merge branch for-3.15/defconfig into for-next)
$ git merge tegra/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/tegra114-dalmore.dts |  5 ++++
 arch/arm/boot/dts/tegra124-venice2.dts |  2 ++
 arch/arm/boot/dts/tegra20-paz00.dts    | 46 +++++++++++++++++++++++++++-
 arch/arm/boot/dts/tegra20-seaboard.dts | 55 +++++++++++++++++++++++++++++++++-
 arch/arm/boot/dts/tegra20-ventana.dts  | 39 ++++++++++++++++++++++--
 arch/arm/boot/dts/tegra30.dtsi         |  2 +-
 arch/arm/configs/tegra_defconfig       |  1 +
 drivers/amba/tegra-ahb.c               |  2 --
 8 files changed, 144 insertions(+), 8 deletions(-)
Merging arm64/for-next/core (38dbfb59d117 Linus 3.14-rc1)
$ git merge arm64/for-next/core
Already up-to-date.
Merging blackfin/for-linus (58095fdaaf1c From: Eunbong Song <eunb.song@samsung.com>)
$ 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 (cd065a010a97 CRISv10: Readd missing header)
$ git merge cris/for-next
Already up-to-date.
Merging hexagon/linux-next (44eb66c228fe Hexagon: update CR year for elf.h)
$ git merge hexagon/linux-next
Merge made by the 'recursive' strategy.
 arch/hexagon/Kconfig                      |  1 +
 arch/hexagon/include/asm/Kbuild           |  4 +-
 arch/hexagon/include/asm/atomic.h         | 15 ++++++-
 arch/hexagon/include/asm/delay.h          |  1 +
 arch/hexagon/include/asm/dma-mapping.h    |  1 -
 arch/hexagon/include/asm/elf.h            |  4 +-
 arch/hexagon/include/asm/hexagon_vm.h     | 72 +++++++++++++++----------------
 arch/hexagon/include/asm/io.h             |  2 +
 arch/hexagon/include/asm/kgdb.h           |  5 ++-
 arch/hexagon/include/asm/pgalloc.h        |  2 +-
 arch/hexagon/include/asm/smp.h            |  1 -
 arch/hexagon/include/uapi/asm/registers.h |  4 +-
 arch/hexagon/include/uapi/asm/setup.h     |  5 +++
 arch/hexagon/kernel/Makefile              |  2 +
 arch/hexagon/kernel/hexagon_ksyms.c       | 24 +++++++++--
 arch/hexagon/kernel/kgdb.c                |  2 +
 arch/hexagon/kernel/ptrace.c              |  1 +
 arch/hexagon/kernel/reset.c               |  5 +--
 arch/hexagon/kernel/screen_info.c         |  3 ++
 arch/hexagon/kernel/smp.c                 |  6 +--
 arch/hexagon/kernel/time.c                | 12 ++++--
 21 files changed, 109 insertions(+), 63 deletions(-)
 create mode 100644 arch/hexagon/kernel/screen_info.c
Merging ia64/next (d52eefb47d4e ia64/xen: Remove Xen support for ia64)
$ git merge ia64/next
Already up-to-date.
Merging m68k/for-next (7247f55381d5 m68k: Wire up sched_setattr and sched_getattr)
$ git merge m68k/for-next
Already up-to-date.
Merging m68knommu/for-next (72a8ab3cb2a5 m68knommu: fix arg types for outs* functions)
$ 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 -
 arch/m68k/include/asm/io_no.h        | 6 +++---
 7 files changed, 3 insertions(+), 9 deletions(-)
Merging metag/for-next (e9a1d0165bbd metag/smp: Make boot_secondary() static)
$ git merge metag/for-next
Already up-to-date.
Merging microblaze/next (a49f56eec54d microblaze: Fix a typo when disabling stack protection)
$ git merge microblaze/next
Merge made by the 'recursive' strategy.
 arch/microblaze/include/asm/delay.h | 2 ++
 arch/microblaze/include/asm/io.h    | 6 ++++++
 arch/microblaze/kernel/head.S       | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)
Merging mips/mips-for-linux-next (fbf4766a3ae2 Merge branch '3.14-fixes' into mips-for-linux-next)
$ git merge mips/mips-for-linux-next
Removing arch/mips/include/asm/gcmpregs.h
Merge made by the 'recursive' strategy.
 arch/mips/Kconfig                         |  49 ++-
 arch/mips/bcm47xx/setup.c                 |   2 +-
 arch/mips/include/asm/asmmacro.h          |  11 +
 arch/mips/include/asm/cpu.h               |   2 +-
 arch/mips/include/asm/gcmpregs.h          | 125 -------
 arch/mips/include/asm/gic.h               |   3 +
 arch/mips/include/asm/idle.h              |  14 +
 arch/mips/include/asm/mips-boards/malta.h |   5 +
 arch/mips/include/asm/mips-cm.h           | 322 ++++++++++++++++++
 arch/mips/include/asm/mips-cpc.h          | 150 ++++++++
 arch/mips/include/asm/mipsregs.h          |  21 ++
 arch/mips/include/asm/ptrace.h            |   2 +-
 arch/mips/include/asm/smp-cps.h           |  33 ++
 arch/mips/include/asm/smp-ops.h           |  17 +
 arch/mips/include/asm/syscall.h           |  38 ++-
 arch/mips/include/asm/thread_info.h       |   3 +-
 arch/mips/include/asm/uasm.h              |   7 +
 arch/mips/include/uapi/asm/inst.h         |  15 +-
 arch/mips/kernel/Makefile                 |   5 +
 arch/mips/kernel/asm-offsets.c            |  13 +
 arch/mips/kernel/cps-vec.S                | 191 +++++++++++
 arch/mips/kernel/cpu-probe.c              |   4 +-
 arch/mips/kernel/idle.c                   |  21 +-
 arch/mips/kernel/irq-gic.c                |   1 -
 arch/mips/kernel/mips-cm.c                | 121 +++++++
 arch/mips/kernel/mips-cpc.c               |  52 +++
 arch/mips/kernel/perf_event_mipsxx.c      |   6 +
 arch/mips/kernel/ptrace.c                 |  11 +-
 arch/mips/kernel/scall32-o32.S            |  15 +-
 arch/mips/kernel/scall64-64.S             |   5 +-
 arch/mips/kernel/scall64-n32.S            |   5 +-
 arch/mips/kernel/scall64-o32.S            |  17 +-
 arch/mips/kernel/smp-cmp.c                |  52 +--
 arch/mips/kernel/smp-cps.c                | 329 ++++++++++++++++++
 arch/mips/kernel/smp-gic.c                |  53 +++
 arch/mips/kernel/spram.c                  |   1 +
 arch/mips/kernel/traps.c                  |   1 +
 arch/mips/mm/c-r4k.c                      |  16 +-
 arch/mips/mm/sc-mips.c                    |   1 +
 arch/mips/mm/tlbex.c                      |   1 +
 arch/mips/mm/uasm-micromips.c             |   3 +
 arch/mips/mm/uasm-mips.c                  |   5 +
 arch/mips/mm/uasm.c                       |  25 +-
 arch/mips/mti-malta/malta-init.c          |  17 +-
 arch/mips/mti-malta/malta-int.c           |  70 +---
 arch/mips/mti-malta/malta-setup.c         |   4 +-
 arch/mips/oprofile/common.c               |   1 +
 arch/mips/oprofile/op_model_mipsxx.c      |   1 +
 arch/mips/pci/pci-malta.c                 |  22 +-
 drivers/cpuidle/Kconfig                   |   5 +
 drivers/cpuidle/Kconfig.mips              |  14 +
 drivers/cpuidle/Makefile                  |   4 +
 drivers/cpuidle/cpuidle-mips-cps.c        | 545 ++++++++++++++++++++++++++++++
 include/linux/cpuidle.h                   |   1 +
 54 files changed, 2169 insertions(+), 288 deletions(-)
 delete mode 100644 arch/mips/include/asm/gcmpregs.h
 create mode 100644 arch/mips/include/asm/mips-cm.h
 create mode 100644 arch/mips/include/asm/mips-cpc.h
 create mode 100644 arch/mips/include/asm/smp-cps.h
 create mode 100644 arch/mips/kernel/cps-vec.S
 create mode 100644 arch/mips/kernel/mips-cm.c
 create mode 100644 arch/mips/kernel/mips-cpc.c
 create mode 100644 arch/mips/kernel/smp-cps.c
 create mode 100644 arch/mips/kernel/smp-gic.c
 create mode 100644 drivers/cpuidle/Kconfig.mips
 create mode 100644 drivers/cpuidle/cpuidle-mips-cps.c
Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done())
$ git merge openrisc/for-upstream
Already up-to-date.
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 (38dbfb59d117 Linus 3.14-rc1)
$ git merge parisc-hd/for-next
Already up-to-date.
Merging powerpc/next (f878f84373ae powerpc: Wire up sched_setattr and sched_getattr syscalls)
$ git merge powerpc/next
Already up-to-date.
Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs)
$ git merge mpc5xxx/next
Already up-to-date.
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 (e309a9da2dd5 s390/kvm: set guest page states to stable on re-ipl)
$ git merge s390/features
Merge made by the 'recursive' strategy.
 arch/s390/include/asm/ccwdev.h      |   4 +-
 arch/s390/include/asm/futex.h       |  13 ++-
 arch/s390/include/asm/kvm_host.h    |   5 +-
 arch/s390/include/asm/mmu_context.h |  39 ++++++--
 arch/s390/include/asm/pgalloc.h     |   1 +
 arch/s390/include/asm/pgtable.h     |  86 +++++++++++++-----
 arch/s390/include/asm/setup.h       |   3 -
 arch/s390/include/asm/thread_info.h |   2 +
 arch/s390/include/asm/uaccess.h     | 172 +++++++++++++++---------------------
 arch/s390/kernel/early.c            |   2 -
 arch/s390/kernel/entry.S            |   9 +-
 arch/s390/kernel/entry64.S          |   9 +-
 arch/s390/kernel/setup.c            |  17 ----
 arch/s390/kvm/diag.c                |   3 +
 arch/s390/kvm/kvm-s390.c            |  25 ++++++
 arch/s390/kvm/kvm-s390.h            |   2 +
 arch/s390/kvm/priv.c                |  41 +++++++++
 arch/s390/lib/Makefile              |   3 +-
 arch/s390/lib/uaccess.h             |   8 +-
 arch/s390/lib/uaccess_mvcos.c       | 116 ++++++++++++++++++------
 arch/s390/lib/uaccess_pt.c          |  69 ++++++---------
 arch/s390/mm/maccess.c              |   4 +-
 arch/s390/mm/pgtable.c              | 149 +++++++++++++++++++++++++++++++
 drivers/s390/char/con3215.c         |   8 +-
 drivers/s390/char/con3270.c         |   6 +-
 drivers/s390/char/raw3270.c         |  17 +++-
 drivers/s390/char/raw3270.h         |   2 +-
 drivers/s390/cio/device.c           |  52 ++++++-----
 include/asm-generic/pgtable.h       |  13 +++
 kernel/sched/core.c                 |   4 +-
 mm/mmu_context.c                    |   3 +
 mm/rmap.c                           |  10 +++
 32 files changed, 631 insertions(+), 266 deletions(-)
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 uml/next (989e59fa41c5 um: Include generic barrier.h)
$ git merge uml/next
Resolved 'arch/um/include/asm/Kbuild' using previous resolution.
Removing arch/x86/um/shared/sysdep/skas_ptrace.h
Removing arch/um/sys-ppc/shared/sysdep/skas_ptrace.h
Removing arch/um/sys-ia64/sysdep/skas_ptrace.h
Removing arch/um/include/shared/skas_ptrace.h
Removing arch/um/include/shared/skas/proc_mm.h
Auto-merging arch/um/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 49c5ef857960] Merge remote-tracking branch 'uml/next'
$ git diff -M --stat --summary HEAD^..
 arch/um/include/shared/os.h                 |   2 -
 arch/um/include/shared/skas/proc_mm.h       |  44 ------
 arch/um/include/shared/skas/skas.h          |   3 -
 arch/um/include/shared/skas_ptrace.h        |  14 --
 arch/um/kernel/ptrace.c                     |  32 ----
 arch/um/kernel/reboot.c                     |  35 ++---
 arch/um/kernel/skas/mmu.c                   |  68 +++------
 arch/um/kernel/skas/process.c               |  27 ----
 arch/um/kernel/trap.c                       |   2 +-
 arch/um/kernel/um_arch.c                    |  10 --
 arch/um/os-Linux/process.c                  |  16 --
 arch/um/os-Linux/skas/mem.c                 | 100 ++----------
 arch/um/os-Linux/skas/process.c             | 200 ++++++------------------
 arch/um/os-Linux/start_up.c                 | 154 -------------------
 arch/um/sys-ia64/sysdep/skas_ptrace.h       |  22 ---
 arch/um/sys-ppc/shared/sysdep/skas_ptrace.h |  22 ---
 arch/x86/um/ldt.c                           | 227 ++++++----------------------
 arch/x86/um/shared/sysdep/faultinfo_32.h    |   3 -
 arch/x86/um/shared/sysdep/faultinfo_64.h    |   3 -
 arch/x86/um/shared/sysdep/skas_ptrace.h     |  22 ---
 20 files changed, 148 insertions(+), 858 deletions(-)
 delete mode 100644 arch/um/include/shared/skas/proc_mm.h
 delete mode 100644 arch/um/include/shared/skas_ptrace.h
 delete mode 100644 arch/um/sys-ia64/sysdep/skas_ptrace.h
 delete mode 100644 arch/um/sys-ppc/shared/sysdep/skas_ptrace.h
 delete mode 100644 arch/x86/um/shared/sysdep/skas_ptrace.h
Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXPERIMENTAL)
$ git merge unicore32/unicore32
Already up-to-date.
Merging xtensa/for_next (c0e50d41126e xtensa: fix fast_syscall_spill_registers)
$ git merge xtensa/for_next
Merge made by the 'recursive' strategy.
 arch/xtensa/include/asm/io.h      |   2 +-
 arch/xtensa/include/asm/traps.h   |  44 ++--
 arch/xtensa/include/asm/vectors.h |   2 +-
 arch/xtensa/kernel/entry.S        | 449 ++++++++++++++++++++------------------
 arch/xtensa/kernel/time.c         |   1 +
 arch/xtensa/kernel/vectors.S      |   2 +-
 arch/xtensa/kernel/xtensa_ksyms.c |   2 -
 arch/xtensa/mm/mmu.c              |   2 +-
 8 files changed, 264 insertions(+), 240 deletions(-)
Merging btrfs/next (cf93da7bcf45 Btrfs: fix spin_unlock in check_ref_cleanup)
$ git merge btrfs/next
Already up-to-date.
Merging ceph/master (125d725c9235 ceph: cast PAGE_SIZE to size_t in ceph_sync_write())
$ git merge ceph/master
Already up-to-date.
Merging cifs/for-next (4a5c80d7b561 [CIFS] clean up page array when uncached write send fails)
$ git merge cifs/for-next
Auto-merging fs/cifs/file.c
Merge made by the 'recursive' strategy.
 fs/cifs/cifsacl.c   | 28 ++++++++++++++++++++++++----
 fs/cifs/cifsglob.h  |  9 +++++++--
 fs/cifs/cifsproto.h |  3 ++-
 fs/cifs/cifssmb.c   | 15 +++++----------
 fs/cifs/file.c      | 31 ++++++++++++++++++++-----------
 fs/cifs/inode.c     | 13 +++++++++----
 fs/cifs/smb1ops.c   |  8 ++++++++
 fs/cifs/smb2pdu.c   |  5 +++--
 fs/cifs/smb2proto.h |  3 ++-
 fs/cifs/xattr.c     | 15 +++++++++++----
 10 files changed, 91 insertions(+), 39 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 (9e78d14a9f64 Use %pd in eCryptFS)
$ git merge ecryptfs/next
Auto-merging fs/ecryptfs/inode.c
Merge made by the 'recursive' strategy.
 fs/ecryptfs/file.c  |  4 ++--
 fs/ecryptfs/inode.c | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)
Merging ext3/for_next (4ea7772f828a udf: Fix lockdep warning from udf_symlink())
$ git merge ext3/for_next
Already up-to-date.
Merging ext4/dev (d7092ae2973f ext4: delete "set but not used" variables)
$ git merge ext4/dev
Already up-to-date.
Merging f2fs/dev (c86f36c6458c f2fs: introduce ra_meta_pages to readahead CP/NAT/SIT pages)
$ git merge f2fs/dev
Merge made by the 'recursive' strategy.
 fs/f2fs/checkpoint.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++-----
 fs/f2fs/data.c       |  25 +++++-------
 fs/f2fs/dir.c        |  15 ++++---
 fs/f2fs/f2fs.h       |  26 ++++++++++++-
 fs/f2fs/file.c       |   5 +++
 fs/f2fs/gc.c         |   9 ++---
 fs/f2fs/inode.c      |  23 ++++++-----
 fs/f2fs/node.c       |  78 +++++++++++++++++++------------------
 fs/f2fs/recovery.c   |  25 ++++++------
 fs/f2fs/segment.c    |  78 +++++++------------------------------
 fs/f2fs/segment.h    |   3 ++
 11 files changed, 236 insertions(+), 159 deletions(-)
Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree)
$ git merge fscache/fscache
Merge made by the 'recursive' strategy.
 fs/fscache/object-list.c | 5 +++++
 fs/fscache/object.c      | 3 +++
 2 files changed, 8 insertions(+)
Merging fuse/for-next (b2ec2778df9d fuse: Turn writeback cache on)
$ git merge fuse/for-next
Auto-merging fs/fuse/file.c
Merge made by the 'recursive' strategy.
 fs/fuse/cuse.c            |   5 +-
 fs/fuse/dir.c             | 119 +++++++++++++++++----
 fs/fuse/file.c            | 257 ++++++++++++++++++++++++++++++++++++----------
 fs/fuse/fuse_i.h          |  22 +++-
 fs/fuse/inode.c           |  29 ++++--
 include/uapi/linux/fuse.h |   5 +
 6 files changed, 355 insertions(+), 82 deletions(-)
Merging gfs2/master (c2b0b30eddf6 GFS2: Mark functions as static in gfs2/rgrp.c)
$ git merge gfs2/master
Merge made by the 'recursive' strategy.
 fs/fs-writeback.c                |   2 +
 fs/gfs2/aops.c                   | 132 ++++++++++++++++++++++++++++-----------
 fs/gfs2/dir.c                    |   9 +++
 fs/gfs2/file.c                   |  13 ++--
 fs/gfs2/inode.c                  |  50 ++++++++++++---
 fs/gfs2/log.c                    |   4 ++
 fs/gfs2/rgrp.c                   |   6 +-
 include/trace/events/writeback.h |   1 +
 include/uapi/linux/gfs2_ondisk.h |  12 +++-
 9 files changed, 176 insertions(+), 53 deletions(-)
Merging jfs/jfs-next (c18f7b51200c jfs: fix generic posix ACL regression)
$ 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 (b28a960c42fc Linux 3.14-rc2)
$ git merge nfs/linux-next
Already up-to-date.
Merging nfsd/nfsd-next (ed47b062ce95 nfsd: consider CLAIM_FH when handing out delegation)
$ 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 (38dbfb59d117 Linus 3.14-rc1)
$ git merge v9fs/for-next
Already up-to-date.
Merging ubifs/linux-next (5547fec74a56 UBI: fix some use after free bugs)
$ git merge ubifs/linux-next
Merge made by the 'recursive' strategy.
 drivers/mtd/ubi/fastmap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Merging xfs/for-next (39f30ca7eaa4 Merge branch 'xfs-async-aio-extend' into for-next)
$ git merge xfs/for-next
Auto-merging include/linux/fs.h
Merge made by the 'recursive' strategy.
 fs/direct-io.c          | 18 ++++++++++++------
 fs/xfs/xfs_acl.c        |  2 +-
 fs/xfs/xfs_aops.c       |  3 ++-
 fs/xfs/xfs_buf_item.c   | 19 -------------------
 fs/xfs/xfs_dquot.c      |  2 +-
 fs/xfs/xfs_iomap.c      | 10 +++-------
 fs/xfs/xfs_iops.c       | 16 ++++++++--------
 fs/xfs/xfs_log.h        |  2 +-
 fs/xfs/xfs_log_cil.c    | 22 ++++++++++++++++------
 fs/xfs/xfs_rtalloc.c    |  2 +-
 fs/xfs/xfs_sb.c         |  1 +
 fs/xfs/xfs_trans.c      | 12 ++----------
 fs/xfs/xfs_trans_resv.c |  6 ++----
 fs/xfs/xfs_trans_resv.h |  1 -
 include/linux/fs.h      |  3 +++
 15 files changed, 53 insertions(+), 66 deletions(-)
Merging file-private-locks/linux-next (1ed1950c412f locks: add new fcntl cmd values for handling file private locks)
$ git merge file-private-locks/linux-next
Auto-merging include/linux/fs.h
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                       |   2 +
 arch/arm/kernel/sys_oabi-compat.c |   3 +
 fs/compat.c                       |  35 +++-
 fs/fcntl.c                        |  37 ++--
 fs/file_table.c                   |   2 +-
 fs/locks.c                        | 349 +++++++++++++++++++++++---------------
 include/linux/fs.h                |  21 ++-
 include/uapi/asm-generic/fcntl.h  |  19 ++-
 security/selinux/hooks.c          |   3 +
 9 files changed, 303 insertions(+), 168 deletions(-)
Merging vfs/for-next (527d1511310a Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc)
$ git merge vfs/for-next
Already up-to-date.
Merging pci/next (17f2d86f5d53 Merge branch 'pci/numa-cleanup' into next)
$ git merge pci/next
Merge made by the 'recursive' strategy.
 arch/ia64/hp/common/sba_iommu.c |  32 ++++------
 arch/ia64/include/asm/pci.h     |   2 +-
 arch/ia64/kernel/acpi.c         |  28 +++------
 arch/ia64/pci/pci.c             |  10 +---
 arch/x86/include/asm/pci.h      |   7 +--
 arch/x86/include/asm/topology.h |  14 +----
 arch/x86/pci/acpi.c             |  29 ++-------
 arch/x86/pci/amd_bus.c          |  10 ----
 arch/x86/pci/bus_numa.c         |  13 +++-
 arch/x86/pci/common.c           | 128 +++++-----------------------------------
 arch/x86/pci/fixup.c            |   6 +-
 arch/x86/pci/irq.c              |   6 +-
 arch/x86/pci/legacy.c           |   4 +-
 arch/x86/pci/numaq_32.c         |   6 +-
 arch/x86/pci/visws.c            |   4 +-
 drivers/acpi/numa.c             |  16 ++---
 include/acpi/acpi_numa.h        |   1 -
 include/linux/acpi.h            |   9 +--
 18 files changed, 75 insertions(+), 250 deletions(-)
Merging hid/for-next (f1523dbb7e90 Merge branch 'for-3.15/sony' into for-next)
$ git merge hid/for-next
Auto-merging drivers/hid/i2c-hid/i2c-hid.c
Auto-merging drivers/hid/hid-ids.h
Auto-merging drivers/hid/hid-core.c
Merge made by the 'recursive' strategy.
 drivers/hid/Kconfig           |  10 +-
 drivers/hid/hid-core.c        |   1 +
 drivers/hid/hid-ids.h         |   1 +
 drivers/hid/hid-input.c       |   3 +
 drivers/hid/hid-microsoft.c   |  74 ++++++++++++-
 drivers/hid/hid-sony.c        | 249 ++++++++++++++++++++++++++++++++++++++++--
 drivers/hid/i2c-hid/i2c-hid.c |  68 ++++++++++--
 drivers/hid/uhid.c            |  27 +++++
 drivers/hid/usbhid/hid-core.c |  78 +++++++++++++
 include/linux/hid.h           |   8 +-
 net/bluetooth/hidp/core.c     |  90 +++++++++++++++
 11 files changed, 582 insertions(+), 27 deletions(-)
Merging i2c/i2c/for-next (9b0cd304f26b Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux)
$ git merge i2c/i2c/for-next
Already up-to-date.
Merging jdelvare-hwmon/master (691cb804d7b3 hwmon: (lm80) Convert to use devm_hwmon_device_register_with_groups)
$ git merge jdelvare-hwmon/master
Merge made by the 'recursive' strategy.
 drivers/hwmon/adm1021.c |  70 +++++++---------------
 drivers/hwmon/f71805f.c |   2 +-
 drivers/hwmon/lm63.c    | 156 +++++++++++++++++++-----------------------------
 drivers/hwmon/lm80.c    |  70 +++++++---------------
 4 files changed, 108 insertions(+), 190 deletions(-)
Merging hwmon-staging/hwmon-next (2b9afabd73ac hwmon: (lm95245) Convert to use devm_hwmon_device_register_with_groups)
$ git merge hwmon-staging/hwmon-next
Merge made by the 'recursive' strategy.
 Documentation/hwmon/ltc2945 |  84 +++++++
 Documentation/hwmon/ltc4260 |  56 +++++
 drivers/hwmon/Kconfig       |  36 +++
 drivers/hwmon/Makefile      |   3 +
 drivers/hwmon/iio_hwmon.c   |  37 +---
 drivers/hwmon/lm95241.c     |  91 +++-----
 drivers/hwmon/lm95245.c     | 110 ++++------
 drivers/hwmon/ltc2945.c     | 519 ++++++++++++++++++++++++++++++++++++++++++++
 drivers/hwmon/ltc4222.c     | 237 ++++++++++++++++++++
 drivers/hwmon/ltc4260.c     | 200 +++++++++++++++++
 10 files changed, 1224 insertions(+), 149 deletions(-)
 create mode 100644 Documentation/hwmon/ltc2945
 create mode 100644 Documentation/hwmon/ltc4260
 create mode 100644 drivers/hwmon/ltc2945.c
 create mode 100644 drivers/hwmon/ltc4222.c
 create mode 100644 drivers/hwmon/ltc4260.c
Merging v4l-dvb/master (b215621049bd Merge branch 'v4l_for_linus' into to_next)
$ git merge v4l-dvb/master
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging kbuild/for-next (ff6b9bdb6263 Merge branch 'kbuild/misc' into kbuild/for-next)
$ git merge kbuild/for-next
Auto-merging Makefile
Merge made by the 'recursive' strategy.
 Makefile        | 5 +++--
 scripts/tags.sh | 9 ++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)
Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings)
$ git merge kconfig/for-next
Already up-to-date.
Merging libata/for-next (efb9e0f4f437 ata: enable quirk from jmicron JMB350 for JMB394)
$ git merge libata/for-next
Merge made by the 'recursive' strategy.
 drivers/ata/Kconfig      | 1 +
 drivers/ata/libata-pmp.c | 7 +++++--
 drivers/ata/pata_imx.c   | 8 ++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)
Merging pm/linux-next (611f30d47980 Merge branch 'acpi-dock')
$ git merge pm/linux-next
Merge made by the 'recursive' strategy.
 drivers/acpi/Kconfig               |  13 ++
 drivers/acpi/acpica/nsxfeval.c     |  33 ++-
 drivers/acpi/bus.c                 |  61 ++++--
 drivers/acpi/dock.c                |   5 +-
 drivers/acpi/internal.h            |   1 +
 drivers/acpi/pci_root.c            |   2 +-
 drivers/acpi/scan.c                | 181 +++++++++--------
 drivers/base/power/main.c          | 245 ++++++++++++++++++-----
 drivers/pci/hotplug/acpiphp.h      |  16 +-
 drivers/pci/hotplug/acpiphp_glue.c | 399 +++++++++++--------------------------
 include/acpi/acpi_bus.h            |  27 ++-
 include/acpi/acpixf.h              |   4 +
 include/acpi/platform/aclinux.h    |   6 +
 include/linux/pci-acpi.h           |   4 +-
 include/linux/pm.h                 |   2 +
 15 files changed, 549 insertions(+), 450 deletions(-)
Merging idle/next (2d6e532279dd tools/power turbostat: simplify output, add Avg_MHz)
$ git merge idle/next
Merge made by the 'recursive' strategy.
 tools/power/x86/turbostat/turbostat.8 | 127 +++++++------------
 tools/power/x86/turbostat/turbostat.c | 228 ++++++++++++++++------------------
 2 files changed, 152 insertions(+), 203 deletions(-)
Merging apm/for-next (158204397034 apm-emulation: add hibernation APM events to support suspend2disk)
$ 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 (262afa97587b Merge branches 'soc-eduardo', 'soc', 'misc' and 'int3404-thermal' of .git into next)
$ git merge thermal/next
Resolved 'drivers/thermal/Kconfig' using previous resolution.
Auto-merging drivers/thermal/Kconfig
CONFLICT (content): Merge conflict in drivers/thermal/Kconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 8b0639eb8a86] Merge remote-tracking branch 'thermal/next'
$ git diff -M --stat --summary HEAD^..
 drivers/thermal/Kconfig | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
Merging ieee1394/for-next (fcd46b34425d firewire: Enable remote DMA above 4 GB)
$ git merge ieee1394/for-next
Already up-to-date.
Merging dlm/next (ece35848c184 dlm: set zero linger time on sctp socket)
$ git merge dlm/next
Already up-to-date.
Merging swiotlb/linux-next (0cb637bff80d swiotlb: Don't DoS us with 'swiotlb buffer is full' (v2))
$ git merge swiotlb/linux-next
Already up-to-date.
Merging slave-dma/next (38dbfb59d117 Linus 3.14-rc1)
$ git merge slave-dma/next
Already up-to-date.
Merging dmaengine/next (77873803363c net_dma: mark broken)
$ git merge dmaengine/next
Already up-to-date.
Merging net-next/master (77d143de7581 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml)
$ git merge net-next/master
Already up-to-date.
Merging ipsec-next/master (abfce3ef58b6 sctp: remove the unnecessary assignment)
$ git merge ipsec-next/master
Already up-to-date.
Merging wireless-next/master (38dbfb59d117 Linus 3.14-rc1)
$ git merge wireless-next/master
Already up-to-date.
Merging bluetooth/master (e3719086ff57 Bluetooth: Use connection parameters if any)
$ git merge bluetooth/master
Auto-merging net/bluetooth/l2cap_sock.c
Auto-merging drivers/bluetooth/btusb.c
Auto-merging drivers/bluetooth/ath3k.c
Merge made by the 'recursive' strategy.
 drivers/bluetooth/ath3k.c         |   4 +
 drivers/bluetooth/btusb.c         |   2 +
 include/net/bluetooth/bluetooth.h |   1 +
 include/net/bluetooth/hci.h       |  47 +++-
 include/net/bluetooth/hci_core.h  |  67 ++++-
 include/net/bluetooth/l2cap.h     |   6 +-
 include/net/bluetooth/mgmt.h      |  22 +-
 include/net/bluetooth/rfcomm.h    |   1 +
 net/bluetooth/a2mp.c              |   8 +-
 net/bluetooth/hci_conn.c          |  70 +++--
 net/bluetooth/hci_core.c          | 246 ++++++++++++++---
 net/bluetooth/hci_event.c         | 162 ++++++++---
 net/bluetooth/hci_sysfs.c         |  18 +-
 net/bluetooth/l2cap_core.c        | 559 ++++++++++++++++++++------------------
 net/bluetooth/l2cap_sock.c        |  33 ++-
 net/bluetooth/mgmt.c              | 286 ++++++++++++++++---
 net/bluetooth/rfcomm/core.c       |   4 +-
 net/bluetooth/rfcomm/sock.c       |  15 +-
 net/bluetooth/smp.c               |   7 +-
 19 files changed, 1116 insertions(+), 442 deletions(-)
Merging infiniband/for-next (fb1b5034e498 Merge branch 'ip-roce' into for-next)
$ git merge infiniband/for-next
Already up-to-date.
Merging mtd/master (0e47c969c65e Merge tag 'for-linus-20140127' of git://git.infradead.org/linux-mtd)
$ git merge mtd/master
Already up-to-date.
Merging l2-mtd/master (87a8b7ea1e3f mtd: nand: don't use read_buf for 8-bit ONFI transfers)
$ git merge l2-mtd/master
Auto-merging drivers/mtd/nand/mpc5121_nfc.c
Merge made by the 'recursive' strategy.
 drivers/mtd/chips/cfi_cmdset_0001.c |  1 -
 drivers/mtd/chips/cfi_cmdset_0002.c |  1 -
 drivers/mtd/chips/cfi_cmdset_0020.c |  1 -
 drivers/mtd/devices/block2mtd.c     | 13 ++++---
 drivers/mtd/devices/m25p80.c        | 28 +++++++++++----
 drivers/mtd/devices/mtd_dataflash.c |  1 -
 drivers/mtd/devices/phram.c         | 41 ++++++++++++++++++----
 drivers/mtd/devices/sst25l.c        |  1 -
 drivers/mtd/inftlmount.c            |  1 -
 drivers/mtd/maps/bfin-async-flash.c |  1 -
 drivers/mtd/maps/gpio-addr-flash.c  |  1 -
 drivers/mtd/maps/intel_vr_nor.c     |  1 -
 drivers/mtd/maps/ixp4xx.c           |  1 -
 drivers/mtd/maps/lantiq-flash.c     |  1 -
 drivers/mtd/maps/latch-addr-flash.c |  1 -
 drivers/mtd/maps/pci.c              |  1 -
 drivers/mtd/maps/physmap_of.c       |  1 -
 drivers/mtd/maps/plat-ram.c         |  1 -
 drivers/mtd/maps/pxa2xx-flash.c     |  1 -
 drivers/mtd/maps/rbtx4939-flash.c   |  1 -
 drivers/mtd/maps/scb2_flash.c       |  1 -
 drivers/mtd/maps/sun_uflash.c       |  1 -
 drivers/mtd/mtd_blkdevs.c           |  1 -
 drivers/mtd/nand/ams-delta.c        |  1 -
 drivers/mtd/nand/atmel_nand.c       | 11 +++---
 drivers/mtd/nand/au1550nd.c         |  4 +--
 drivers/mtd/nand/bf5xx_nand.c       |  1 -
 drivers/mtd/nand/cafe_nand.c        | 68 +++++++++++++++++++++++++------------
 drivers/mtd/nand/davinci_nand.c     |  1 -
 drivers/mtd/nand/diskonchip.c       |  3 +-
 drivers/mtd/nand/fsl_elbc_nand.c    |  1 -
 drivers/mtd/nand/fsl_ifc_nand.c     |  1 -
 drivers/mtd/nand/gpio.c             |  1 -
 drivers/mtd/nand/mpc5121_nfc.c      |  1 -
 drivers/mtd/nand/nand_base.c        | 39 +++++++++++----------
 drivers/mtd/nand/nand_ids.c         |  3 ++
 drivers/mtd/nand/nuc900_nand.c      |  4 +--
 drivers/mtd/nand/pasemi_nand.c      |  1 -
 drivers/mtd/nand/s3c2410.c          |  1 -
 drivers/mtd/onenand/generic.c       |  1 -
 drivers/mtd/onenand/omap2.c         |  1 -
 drivers/mtd/onenand/onenand_base.c  |  1 -
 drivers/mtd/sm_ftl.c                | 11 +++---
 drivers/mtd/tests/mtd_test.c        |  1 -
 drivers/mtd/ubi/ubi.h               |  1 -
 include/linux/mtd/nand.h            | 30 ++++++++--------
 46 files changed, 166 insertions(+), 123 deletions(-)
Merging crypto/master (883619a931e9 crypto: caam - fix ERA retrieval function)
$ git merge crypto/master
Merge made by the 'recursive' strategy.
 drivers/char/hw_random/core.c        |  10 +-
 drivers/crypto/caam/ctrl.c           |  61 +++--------
 drivers/crypto/caam/ctrl.h           |   2 +-
 drivers/crypto/ccp/ccp-crypto-main.c | 201 +++++++++++++----------------------
 drivers/crypto/ccp/ccp-crypto-sha.c  | 130 +++++-----------------
 drivers/crypto/ccp/ccp-crypto.h      |   8 +-
 drivers/crypto/ccp/ccp-dev.c         |  21 +++-
 drivers/crypto/ccp/ccp-ops.c         | 108 ++++++++++++++++++-
 drivers/crypto/mxs-dcp.c             |  40 +++----
 drivers/crypto/talitos.c             |   4 +-
 include/linux/ccp.h                  |   7 ++
 11 files changed, 275 insertions(+), 317 deletions(-)
Merging drm/drm-next (ef64cf9d0604 Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next)
$ git merge drm/drm-next
Already up-to-date.
Merging drm-intel/for-linux-next (b5c65b6e5b76 drm/i915: split aligned height calculation out v2)
$ git merge drm-intel/for-linux-next
Resolved 'drivers/gpu/drm/i915/intel_dp.c' using previous resolution.
Auto-merging drivers/gpu/drm/i915/intel_dp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c
Auto-merging drivers/gpu/drm/i915/i915_irq.c
Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c
Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/Makefile
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master ec04bc0fdbd0] Merge remote-tracking branch 'drm-intel/for-linux-next'
$ git diff -M --stat --summary HEAD^..
 drivers/gpu/drm/i915/Makefile              |   1 +
 drivers/gpu/drm/i915/i915_debugfs.c        | 301 ++++++++++++-
 drivers/gpu/drm/i915/i915_dma.c            |  71 ++-
 drivers/gpu/drm/i915/i915_drv.c            | 182 +++-----
 drivers/gpu/drm/i915/i915_drv.h            | 437 +++++++++++++------
 drivers/gpu/drm/i915/i915_gem.c            | 448 ++++++++-----------
 drivers/gpu/drm/i915/i915_gem_context.c    | 435 ++++++++++++++-----
 drivers/gpu/drm/i915/i915_gem_evict.c      |  49 ++-
 drivers/gpu/drm/i915/i915_gem_execbuffer.c | 164 +++----
 drivers/gpu/drm/i915/i915_gem_gtt.c        | 675 ++++++++++++++++++++++-------
 drivers/gpu/drm/i915/i915_gem_tiling.c     |   2 +-
 drivers/gpu/drm/i915/i915_gpu_error.c      | 442 +++++++++++++------
 drivers/gpu/drm/i915/i915_irq.c            | 404 ++++++++++-------
 drivers/gpu/drm/i915/i915_params.c         | 159 +++++++
 drivers/gpu/drm/i915/i915_reg.h            | 483 ++++++++++++---------
 drivers/gpu/drm/i915/i915_suspend.c        |  40 +-
 drivers/gpu/drm/i915/i915_sysfs.c          |  10 +
 drivers/gpu/drm/i915/i915_ums.c            |   8 +
 drivers/gpu/drm/i915/intel_bios.c          |   4 +-
 drivers/gpu/drm/i915/intel_crt.c           |   2 +
 drivers/gpu/drm/i915/intel_ddi.c           | 103 ++++-
 drivers/gpu/drm/i915/intel_display.c       | 399 +++++++++++------
 drivers/gpu/drm/i915/intel_dp.c            | 365 +++++++++++-----
 drivers/gpu/drm/i915/intel_drv.h           |  35 +-
 drivers/gpu/drm/i915/intel_fbdev.c         |  29 +-
 drivers/gpu/drm/i915/intel_hdmi.c          |   6 +-
 drivers/gpu/drm/i915/intel_lvds.c          |   6 +-
 drivers/gpu/drm/i915/intel_overlay.c       |   8 +-
 drivers/gpu/drm/i915/intel_panel.c         |  17 +-
 drivers/gpu/drm/i915/intel_pm.c            | 315 ++++++++------
 drivers/gpu/drm/i915/intel_ringbuffer.c    |  37 +-
 drivers/gpu/drm/i915/intel_ringbuffer.h    |   2 +
 drivers/gpu/drm/i915/intel_sprite.c        |  18 +-
 drivers/gpu/drm/i915/intel_tv.c            |   8 +-
 drivers/gpu/drm/i915/intel_uncore.c        |   8 +-
 include/drm/drm_dp_helper.h                |  10 +
 36 files changed, 3779 insertions(+), 1904 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/i915_params.c
Merging drm-tegra/drm/for-next (13411ddd3190 drm/tegra: Obtain head number from DT)
$ git merge drm-tegra/drm/for-next
Already up-to-date.
Merging sound/for-next (a8dca4604a13 ALSA: hda - Make snd_hda_gen_spec_free() static)
$ git merge sound/for-next
Auto-merging sound/pci/hda/patch_realtek.c
Auto-merging sound/pci/hda/patch_conexant.c
Auto-merging sound/pci/hda/hda_intel.c
Auto-merging sound/pci/hda/hda_generic.h
Auto-merging sound/pci/hda/hda_generic.c
Merge made by the 'recursive' strategy.
 sound/core/control.c            |   2 +-
 sound/core/info.c               |   4 +-
 sound/core/init.c               |   8 +-
 sound/core/pcm.c                |  10 +-
 sound/core/pcm_native.c         |   4 +-
 sound/core/rawmidi.c            |   2 +-
 sound/core/rtctimer.c           |   4 +-
 sound/core/sound_oss.c          |   2 +-
 sound/core/timer.c              |   4 +-
 sound/drivers/opl3/opl3_synth.c |   2 +-
 sound/drivers/pcsp/pcsp_input.c |   1 +
 sound/oss/pas2.h                |   3 +
 sound/oss/pas2_card.c           |   2 -
 sound/pci/hda/hda_generic.c     |   6 +-
 sound/pci/hda/hda_generic.h     |   1 -
 sound/pci/hda/hda_intel.c       |  25 +-
 sound/pci/hda/patch_cmedia.c    |  31 +-
 sound/pci/hda/patch_conexant.c  | 810 +++++++++++++++++++---------------------
 sound/pci/hda/patch_realtek.c   |  78 +++-
 sound/pci/hda/patch_via.c       |   8 +-
 sound/pci/lx6464es/lx_core.c    |  84 -----
 sound/usb/card.c                |  18 +-
 sound/usb/mixer.c               |  99 ++++-
 sound/usb/mixer.h               |   7 +-
 24 files changed, 608 insertions(+), 607 deletions(-)
Merging sound-asoc/for-next (6e9b9efcf499 Merge remote-tracking branches 'asoc/topic/wm8741', 'asoc/topic/wm8962', 'asoc/topic/wm8988' and 'asoc/topic/wm8991' into asoc-next)
$ git merge sound-asoc/for-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/sound/da9055.txt |  22 +
 .../bindings/sound/davinci-evm-audio.txt           |   9 +-
 .../devicetree/bindings/sound/pcm512x.txt          |  30 +
 .../devicetree/bindings/sound/simple-card.txt      |  12 +-
 .../devicetree/bindings/sound/tlv320aic32x4.txt    |  18 +
 .../devicetree/bindings/sound/widgets.txt          |  20 +
 MAINTAINERS                                        |   7 +
 drivers/mfd/da9055-i2c.c                           |  12 +-
 include/linux/platform_data/davinci_asp.h          |   4 +-
 include/sound/rcar_snd.h                           |   7 +
 include/sound/simple_card.h                        |   4 -
 include/sound/soc.h                                |  17 +
 sound/soc/codecs/Kconfig                           | 106 ++-
 sound/soc/codecs/Makefile                          |   2 +
 sound/soc/codecs/cs4271.c                          |   1 -
 sound/soc/codecs/cs42l73.c                         |  19 +-
 sound/soc/codecs/da9055.c                          |  19 +-
 sound/soc/codecs/pcm1681.c                         |  15 +-
 sound/soc/codecs/pcm1792a.c                        |  33 +-
 sound/soc/codecs/pcm512x.c                         | 707 +++++++++++++++++++++
 sound/soc/codecs/pcm512x.h                         | 162 +++++
 sound/soc/codecs/rt5640.c                          |   1 +
 sound/soc/codecs/ssm2602.c                         |   6 +-
 sound/soc/codecs/tlv320aic32x4.c                   |  55 +-
 sound/soc/codecs/twl6040.c                         |   6 +-
 sound/soc/codecs/wm5102.c                          |  17 +-
 sound/soc/codecs/wm5110.c                          |  17 +-
 sound/soc/codecs/wm8741.c                          |  34 +-
 sound/soc/codecs/wm8962.c                          |  31 +-
 sound/soc/codecs/wm8988.c                          |  14 +-
 sound/soc/codecs/wm8991.c                          |   3 -
 sound/soc/codecs/wm8997.c                          |  17 +-
 sound/soc/codecs/wm_adsp.c                         |   2 +
 sound/soc/davinci/davinci-evm.c                    |  59 +-
 sound/soc/davinci/davinci-mcasp.c                  | 233 +++----
 sound/soc/fsl/fsl_esai.c                           |   4 +-
 sound/soc/fsl/fsl_esai.h                           |   2 +-
 sound/soc/fsl/fsl_spdif.c                          |   4 +-
 sound/soc/fsl/imx-mc13783.c                        |   1 -
 sound/soc/fsl/imx-sgtl5000.c                       |  10 +-
 sound/soc/fsl/imx-wm8962.c                         |  11 +-
 sound/soc/generic/simple-card.c                    | 216 ++++---
 sound/soc/samsung/Kconfig                          |   6 +-
 sound/soc/samsung/h1940_uda1380.c                  |   7 +-
 sound/soc/samsung/rx1950_uda1380.c                 |   5 -
 sound/soc/sh/rcar/adg.c                            | 198 +++++-
 sound/soc/sh/rcar/core.c                           |  70 +-
 sound/soc/sh/rcar/gen.c                            |  38 +-
 sound/soc/sh/rcar/rsnd.h                           |  66 +-
 sound/soc/sh/rcar/scu.c                            | 605 +++++++++++++-----
 sound/soc/sh/rcar/ssi.c                            | 222 ++-----
 sound/soc/soc-core.c                               | 157 ++++-
 52 files changed, 2557 insertions(+), 786 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/sound/da9055.txt
 create mode 100644 Documentation/devicetree/bindings/sound/pcm512x.txt
 create mode 100644 Documentation/devicetree/bindings/sound/tlv320aic32x4.txt
 create mode 100644 Documentation/devicetree/bindings/sound/widgets.txt
 create mode 100644 sound/soc/codecs/pcm512x.c
 create mode 100644 sound/soc/codecs/pcm512x.h
Merging modules/modules-next (22e669568d51 module: Add missing newline in printk call.)
$ git merge modules/modules-next
Already up-to-date.
Merging virtio/virtio-next (05c54de8c88c drivers: virtio: Mark function virtballoon_migratepage() as static in virtio_balloon.c)
$ git merge virtio/virtio-next
Already up-to-date.
Merging input/next (50fe03da82b4 Input: uinput - add UI_GET_SYSNAME ioctl to retrieve the sysfs path)
$ git merge input/next
Auto-merging drivers/input/touchscreen/zforce_ts.c
Merge made by the 'recursive' strategy.
 .../bindings/input/touchscreen/zforce_ts.txt       | 30 +++++++
 drivers/input/misc/uinput.c                        | 96 +++++++++++++++-------
 drivers/input/misc/wistron_btns.c                  | 19 +++++
 drivers/input/tablet/gtco.c                        |  2 +-
 drivers/input/touchscreen/zforce_ts.c              | 95 +++++++++++++++++----
 include/linux/uinput.h                             |  2 +
 include/uapi/linux/uinput.h                        | 13 ++-
 7 files changed, 209 insertions(+), 48 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
$ git merge input-mt/for-next
Already up-to-date.
Merging block/for-next (2a53fee6859b Merge branch 'for-3.14/core' into for-next)
$ git merge block/for-next
Auto-merging lib/percpu_ida.c
Merge made by the 'recursive' strategy.
 block/blk-flush.c      |  8 +++++---
 block/blk-mq.c         | 46 ++++++++++++++++++++++++++++++----------------
 include/linux/blk-mq.h |  3 +++
 lib/percpu_ida.c       |  7 ++-----
 4 files changed, 40 insertions(+), 24 deletions(-)
Merging device-mapper/for-next (d3cd022521ed dm thin: avoid metadata commit if a pool's thin devices haven't changed)
$ git merge device-mapper/for-next
Auto-merging drivers/md/dm-thin.c
Auto-merging drivers/md/dm-cache-target.c
Merge made by the 'recursive' strategy.
 drivers/md/dm-cache-target.c  |  8 +++++---
 drivers/md/dm-thin-metadata.c | 17 +++++++++++++++++
 drivers/md/dm-thin-metadata.h |  2 ++
 drivers/md/dm-thin.c          |  3 ++-
 4 files changed, 26 insertions(+), 4 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 (38dbfb59d117 Linus 3.14-rc1)
$ git merge mmc/mmc-next
Already up-to-date.
Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command)
$ git merge kgdb/kgdb-next
Merge made by the 'recursive' strategy.
Merging slab/for-next (26e4f2057516 slub: Fix possible format string bug.)
$ git merge slab/for-next
Already up-to-date.
Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
$ git merge uclinux/for-next
Already up-to-date.
Merging md/for-next (1877db75589a md/raid1: restore ability for check and repair to fix read errors.)
$ git merge md/for-next
Merge made by the 'recursive' strategy.
 drivers/md/raid1.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
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 (86351d035461 mfd: Delete non-required instances of include <linux/init.h>)
$ git merge mfd-lj/for-mfd-next
Merge made by the 'recursive' strategy.
 drivers/mfd/Kconfig                   |  31 +-
 drivers/mfd/Makefile                  |   2 +
 drivers/mfd/adp5520.c                 |   1 -
 drivers/mfd/cs5535-mfd.c              |   1 -
 drivers/mfd/janz-cmodio.c             |   1 -
 drivers/mfd/lpc_ich.c                 |   1 -
 drivers/mfd/lpc_sch.c                 |   1 -
 drivers/mfd/max14577.c                |   5 +-
 drivers/mfd/mcp-sa11x0.c              |   1 -
 drivers/mfd/pcf50633-adc.c            |   1 -
 drivers/mfd/rc5t583-irq.c             |   1 -
 drivers/mfd/rdc321x-southbridge.c     |   1 -
 drivers/mfd/retu-mfd.c                |   1 -
 drivers/mfd/rtsx_usb.c                | 760 ++++++++++++++++++++++++++++++++++
 drivers/mfd/smsc-ece1099.c            |   1 -
 drivers/mfd/stmpe.c                   |   2 +-
 drivers/mfd/tc3589x.c                 |  84 ++--
 drivers/mfd/ti-ssp.c                  |   1 -
 drivers/mfd/ti_am335x_tscadc.c        |   1 -
 drivers/mfd/tps65218.c                | 281 +++++++++++++
 drivers/mfd/tps65912-core.c           |   1 -
 drivers/mfd/tps65912-irq.c            |   1 -
 drivers/mfd/twl4030-irq.c             |   1 -
 drivers/mfd/twl4030-madc.c            |   1 -
 drivers/mfd/twl6030-irq.c             |   1 -
 drivers/mfd/vexpress-config.c         |   1 -
 drivers/mfd/wm5102-tables.c           |  35 ++
 drivers/mfd/wm5110-tables.c           | 168 ++++++++
 drivers/mfd/wm8350-core.c             |   1 -
 drivers/mfd/wm8350-irq.c              |   1 -
 include/linux/mfd/arizona/registers.h |  84 ++++
 include/linux/mfd/max14577-private.h  |   8 -
 include/linux/mfd/max14577.h          |   5 -
 include/linux/mfd/rtsx_usb.h          | 628 ++++++++++++++++++++++++++++
 include/linux/mfd/tps65218.h          | 284 +++++++++++++
 35 files changed, 2334 insertions(+), 64 deletions(-)
 create mode 100644 drivers/mfd/rtsx_usb.c
 create mode 100644 drivers/mfd/tps65218.c
 create mode 100644 include/linux/mfd/rtsx_usb.h
 create mode 100644 include/linux/mfd/tps65218.h
$ git reset --hard HEAD^
HEAD is now at a7d0092e84ad Merge remote-tracking branch 'md/for-next'
Merging next-20140210 version of mfd-lj
$ git merge -m next-20140210/mfd-lj 4d0621451ff2b8ce8a4aed66b98d66121a048fc3
Merge made by the 'recursive' strategy.
 drivers/mfd/Kconfig                   |   6 +-
 drivers/mfd/max14577.c                |   5 +-
 drivers/mfd/wm5102-tables.c           |  35 +++++++
 drivers/mfd/wm5110-tables.c           | 168 ++++++++++++++++++++++++++++++++++
 include/linux/mfd/arizona/registers.h |  84 +++++++++++++++++
 include/linux/mfd/max14577-private.h  |   8 --
 include/linux/mfd/max14577.h          |   5 -
 7 files changed, 294 insertions(+), 17 deletions(-)
Merging battery/master (ac323d8d8070 power: max17040: Fix NULL pointer dereference when there is no platform_data)
$ git merge battery/master
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/power/bq2415x.txt          | 47 ++++++++++++++++++++++
 drivers/power/ds2782_battery.c                     |  2 +-
 drivers/power/isp1704_charger.c                    |  2 -
 drivers/power/max17040_battery.c                   |  5 ++-
 4 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/power/bq2415x.txt
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 (cb1fbad7ec25 Merge branches '3.14/fbdev', '3.14/dss-misc' and '3.14/dss-fclk' into for-next)
$ git merge omap_dss2/for-next
Already up-to-date.
Merging regulator/for-next (83172d6be4c4 Merge remote-tracking branches 'regulator/topic/da9055', 'regulator/topic/doc', 'regulator/topic/gpio', 'regulator/topic/max14577', 'regulator/topic/s5m8767', 'regulator/topic/ti-abb' and 'regulator/topic/tps6507x' into regulator-next)
$ git merge regulator/for-next
Merge made by the 'recursive' strategy.
 .../bindings/regulator/gpio-regulator.txt          |  3 +
 .../bindings/regulator/s5m8767-regulator.txt       | 13 +++-
 .../bindings/regulator/ti-abb-regulator.txt        |  6 +-
 drivers/regulator/core.c                           | 14 ++++
 drivers/regulator/da9055-regulator.c               | 73 ++++++++++++++++--
 drivers/regulator/gpio-regulator.c                 | 15 +++-
 drivers/regulator/max14577.c                       | 13 +---
 drivers/regulator/pfuze100-regulator.c             |  2 +-
 drivers/regulator/s2mps11.c                        |  4 +-
 drivers/regulator/s5m8767.c                        | 87 +++++++++++++++++++++-
 drivers/regulator/ti-abb-regulator.c               | 86 +++++++++++++--------
 drivers/regulator/tps6507x-regulator.c             | 18 ++---
 include/linux/mfd/samsung/core.h                   |  3 +-
 include/linux/mfd/samsung/s5m8767.h                |  7 ++
 14 files changed, 276 insertions(+), 68 deletions(-)
Merging security/next (e0238b4ced90 selinux: fix the output of ./scripts/get_maintainer.pl for SELinux)
$ git merge security/next
Auto-merging security/selinux/hooks.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                              | 5 ++---
 security/apparmor/lsm.c                  | 2 +-
 security/integrity/ima/ima_policy.c      | 6 +++---
 security/integrity/integrity_audit.c     | 2 +-
 security/keys/encrypted-keys/encrypted.c | 2 +-
 security/keys/trusted.c                  | 6 +++---
 security/selinux/hooks.c                 | 4 ++--
 security/selinux/selinuxfs.c             | 2 +-
 8 files changed, 14 insertions(+), 15 deletions(-)
Merging selinux/next (81c94e76ce8e selinux: fix the output of ./scripts/get_maintainer.pl for SELinux)
$ git merge selinux/next
Merge made by the 'recursive' strategy.
Merging lblnet/next (d8ec26d7f828 Linux 3.13)
$ git merge lblnet/next
Already up-to-date.
Merging watchdog/master (41c91d637e86 watchdog: w83697hf_wdt: return ENODEV if no device was found)
$ git merge watchdog/master
Merge made by the 'recursive' strategy.
 drivers/watchdog/w83697hf_wdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
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 (dd1a175695ed Merge branches 'arm/smmu', 'core', 'x86/vt-d', 'arm/shmobile', 'x86/amd', 'ppc/pamu', 'iommu/fixes' and 'arm/msm' into next)
$ git merge iommu/next
Already up-to-date.
Merging vfio/next (3be3a074cf5b vfio-pci: Don't use device_lock around AER interrupt setup)
$ git merge vfio/next
Already up-to-date.
Merging osd/linux-next (19350e7627a6 exofs: Print less in r4w)
$ 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 (8cc7212a0361 idr: remove unused prototype of idr_free())
$ git merge trivial/for-next
Merge made by the 'recursive' strategy.
 include/linux/idr.h | 1 -
 1 file changed, 1 deletion(-)
Merging audit/master (f3411cb2b2e3 audit: whitespace fix in kernel-parameters.txt)
$ git merge audit/master
Already up-to-date.
Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
$ git merge fsnotify/for-next
Already up-to-date.
Merging devicetree/devicetree/next (b66548e2a9ba of: Increase MAX_PHANDLE_ARGS)
$ git merge devicetree/devicetree/next
Merge made by the 'recursive' strategy.
 drivers/of/base.c                    |  75 +++---
 drivers/of/of_net.c                  |  11 +-
 include/linux/of.h                   |  22 +-
 scripts/dtc/dtc-parser.tab.c_shipped | 469 +++++++++++++++--------------------
 scripts/dtc/dtc-parser.tab.h_shipped |  36 ++-
 scripts/dtc/dtc.c                    | 119 +++++----
 scripts/dtc/dtc.h                    |   1 -
 scripts/dtc/srcpos.c                 |   6 +-
 scripts/dtc/update-dtc-source.sh     |  54 ++++
 scripts/dtc/util.c                   | 141 ++++++++++-
 scripts/dtc/util.h                   | 107 +++++++-
 scripts/dtc/version_gen.h            |   2 +-
 12 files changed, 637 insertions(+), 406 deletions(-)
 create mode 100755 scripts/dtc/update-dtc-source.sh
Merging dt-rh/for-next (860a445c25aa DT: Add vendor prefix for Spansion Inc.)
$ git merge dt-rh/for-next
Auto-merging include/linux/of.h
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/vendor-prefixes.txt        |   6 +-
 drivers/of/address.c                               |   5 +-
 include/linux/of.h                                 | 153 +++++++++++----------
 include/linux/of_device.h                          |   4 +-
 4 files changed, 95 insertions(+), 73 deletions(-)
Merging spi/for-next (ed425ccdbe47 Merge remote-tracking branches 'spi/topic/sunxi', 'spi/topic/tegra114' and 'spi/topic/xfer' into spi-next)
$ git merge spi/for-next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/spi/spi-rspi.txt |  59 ++
 .../devicetree/bindings/spi/spi-sun6i.txt          |  24 +
 Documentation/spi/spi-summary                      |  17 +-
 drivers/spi/Kconfig                                |  15 +-
 drivers/spi/Makefile                               |   1 +
 drivers/spi/spi-altera.c                           |   1 -
 drivers/spi/spi-ath79.c                            |   1 -
 drivers/spi/spi-atmel.c                            |   1 -
 drivers/spi/spi-bcm63xx-hsspi.c                    |   3 +-
 drivers/spi/spi-bcm63xx.c                          |   4 +-
 drivers/spi/spi-bfin-sport.c                       |   1 -
 drivers/spi/spi-bfin-v3.c                          |   3 +-
 drivers/spi/spi-bitbang.c                          |   1 -
 drivers/spi/spi-clps711x.c                         |  82 +-
 drivers/spi/spi-davinci.c                          |  14 +-
 drivers/spi/spi-dw-mmio.c                          |   2 +-
 drivers/spi/spi-efm32.c                            |   3 +-
 drivers/spi/spi-fsl-spi.c                          |  20 +-
 drivers/spi/spi-gpio.c                             |   3 +-
 drivers/spi/spi-imx.c                              |   3 +-
 drivers/spi/spi-mpc512x-psc.c                      |   1 -
 drivers/spi/spi-mpc52xx-psc.c                      |   1 -
 drivers/spi/spi-mpc52xx.c                          |   1 -
 drivers/spi/spi-mxs.c                              |   5 +-
 drivers/spi/spi-nuc900.c                           |   3 +-
 drivers/spi/spi-oc-tiny.c                          |   1 -
 drivers/spi/spi-octeon.c                           |   4 +-
 drivers/spi/spi-omap-100k.c                        |  16 -
 drivers/spi/spi-omap2-mcspi.c                      |  51 +-
 drivers/spi/spi-orion.c                            |  42 +-
 drivers/spi/spi-pl022.c                            |  21 +-
 drivers/spi/spi-ppc4xx.c                           |   1 -
 drivers/spi/spi-pxa2xx-dma.c                       |   1 -
 drivers/spi/spi-pxa2xx-pxadma.c                    |   1 -
 drivers/spi/spi-rspi.c                             | 845 ++++++++++++++-------
 drivers/spi/spi-s3c24xx.c                          |   1 -
 drivers/spi/spi-s3c64xx.c                          | 417 +++-------
 drivers/spi/spi-sc18is602.c                        |   9 -
 drivers/spi/spi-sh-msiof.c                         |   1 -
 drivers/spi/spi-sh-sci.c                           |   1 -
 drivers/spi/spi-sirf.c                             |  21 +-
 drivers/spi/spi-sun6i.c                            | 483 ++++++++++++
 drivers/spi/spi-tegra114.c                         |   5 +-
 drivers/spi/spi-tegra20-sflash.c                   |   1 -
 drivers/spi/spi-tegra20-slink.c                    |   1 -
 drivers/spi/spi-ti-qspi.c                          |   3 +-
 drivers/spi/spi-xcomm.c                            |   1 -
 drivers/spi/spi-xilinx.c                           |   1 -
 drivers/spi/spi.c                                  | 199 ++++-
 include/linux/spi/spi.h                            |  38 +-
 50 files changed, 1620 insertions(+), 814 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/spi/spi-rspi.txt
 create mode 100644 Documentation/devicetree/bindings/spi/spi-sun6i.txt
 create mode 100644 drivers/spi/spi-sun6i.c
Merging tip/auto-latest (bad95cfc18a4 Merge branch 'x86/x32')
$ git merge tip/auto-latest
Auto-merging kernel/sched/core.c
Auto-merging fs/compat.c
Auto-merging arch/m68k/include/asm/Kbuild
Auto-merging arch/hexagon/include/asm/Kbuild
Merge made by the 'recursive' strategy.
 Documentation/sysctl/kernel.txt               |  15 +-
 arch/alpha/include/asm/Kbuild                 |   7 +-
 arch/arc/include/asm/Kbuild                   |   7 +-
 arch/arm/include/asm/Kbuild                   |   5 +-
 arch/arm64/include/asm/Kbuild                 |   7 +-
 arch/avr32/include/asm/Kbuild                 |  41 ++--
 arch/blackfin/include/asm/Kbuild              |   7 +-
 arch/c6x/include/asm/Kbuild                   |   5 +-
 arch/cris/include/asm/Kbuild                  |   3 +-
 arch/frv/include/asm/Kbuild                   |   5 +-
 arch/hexagon/include/asm/Kbuild               |   5 +-
 arch/ia64/include/asm/Kbuild                  |   5 +-
 arch/m32r/include/asm/Kbuild                  |   5 +-
 arch/m68k/include/asm/Kbuild                  |   3 +-
 arch/metag/include/asm/Kbuild                 |   5 +-
 arch/microblaze/include/asm/Kbuild            |   5 +-
 arch/mips/include/asm/Kbuild                  |   5 +-
 arch/mn10300/include/asm/Kbuild               |   3 +-
 arch/openrisc/include/asm/Kbuild              |  11 +-
 arch/parisc/include/asm/Kbuild                |  32 +++-
 arch/powerpc/include/asm/Kbuild               |   5 +-
 arch/s390/include/asm/Kbuild                  |   5 +-
 arch/score/include/asm/Kbuild                 |   5 +-
 arch/sh/include/asm/Kbuild                    |   9 +-
 arch/sparc/include/asm/Kbuild                 |  11 +-
 arch/tile/include/asm/Kbuild                  |   5 +-
 arch/um/include/asm/Kbuild                    |  34 +++-
 arch/unicore32/include/asm/Kbuild             |   5 +-
 arch/x86/Kconfig.debug                        |   5 +
 arch/x86/Makefile                             |   4 +-
 arch/x86/include/asm/Kbuild                   |   1 +
 arch/x86/include/asm/apic.h                   |  14 +-
 arch/x86/include/asm/nmi.h                    |   3 +
 arch/x86/kernel/apic/apic.c                   |   9 +-
 arch/x86/kernel/apic/apic_flat_64.c           |   4 +-
 arch/x86/kernel/apic/apic_noop.c              |   3 +-
 arch/x86/kernel/apic/apic_numachip.c          |   2 +-
 arch/x86/kernel/apic/bigsmp_32.c              |   3 +-
 arch/x86/kernel/apic/es7000_32.c              |  12 +-
 arch/x86/kernel/apic/numaq_32.c               |   3 +-
 arch/x86/kernel/apic/probe_32.c               |   3 +-
 arch/x86/kernel/apic/summit_32.c              |   3 +-
 arch/x86/kernel/apic/x2apic_cluster.c         |   2 +-
 arch/x86/kernel/apic/x2apic_phys.c            |   2 +-
 arch/x86/kernel/apic/x2apic_uv_x.c            |   2 +-
 arch/x86/kernel/cpu/perf_event.c              |   8 +-
 arch/x86/kernel/cpu/perf_event.h              |   1 +
 arch/x86/kernel/cpu/perf_event_p4.c           |  34 +++-
 arch/x86/kernel/cpu/perf_event_p6.c           |  48 +++--
 arch/x86/kernel/early-quirks.c                | 211 +++++++++++++++++---
 arch/x86/kernel/nmi.c                         |  37 ++--
 arch/x86/kernel/smpboot.c                     |   5 +-
 arch/x86/kernel/tsc.c                         |   4 +-
 arch/x86/mm/srat.c                            |  12 +-
 arch/xtensa/include/asm/Kbuild                |   5 +-
 drivers/clocksource/bcm_kona_timer.c          |  54 +++---
 drivers/cpuidle/cpuidle.c                     |  14 +-
 drivers/media/v4l2-core/v4l2-compat-ioctl32.c |   2 +-
 drivers/tty/tty_ldsem.c                       |  15 +-
 fs/compat.c                                   |   6 +-
 include/asm-generic/bitops/const_hweight.h    |  17 +-
 include/asm-generic/mcs_spinlock.h            |  13 ++
 include/drm/i915_drm.h                        |  20 ++
 include/linux/clockchips.h                    |  16 +-
 include/linux/compat.h                        |  23 +--
 include/linux/interrupt.h                     |   5 +
 include/linux/irq_work.h                      |   2 +
 include/linux/lockdep.h                       |  27 +--
 include/linux/mcs_spinlock.h                  | 114 +++++++++++
 include/linux/mutex.h                         |   5 +-
 include/linux/rcupdate.h                      |   2 +-
 include/linux/sched.h                         |  40 +++-
 include/linux/sched/prio.h                    |  40 ++++
 include/linux/sched/rt.h                      |  19 +-
 include/linux/wait.h                          |   6 +-
 ipc/compat.c                                  |  12 +-
 ipc/compat_mq.c                               |  19 +-
 kernel/compat.c                               | 112 +++++------
 kernel/events/core.c                          |  28 ++-
 kernel/futex_compat.c                         |   2 +-
 kernel/irq/devres.c                           |  45 +++++
 kernel/locking/lockdep.c                      |  17 +-
 kernel/locking/mutex.c                        |  60 +-----
 kernel/sched/core.c                           |  32 ++--
 kernel/sched/cputime.c                        |   4 +-
 kernel/sched/deadline.c                       |   2 +-
 kernel/sched/debug.c                          |   6 +-
 kernel/sched/fair.c                           | 264 +++++++++++++++++++++-----
 kernel/sched/sched.h                          |  18 --
 kernel/sysctl.c                               |   7 -
 kernel/time/Makefile                          |   5 +-
 kernel/time/clockevents.c                     |  40 +++-
 kernel/time/jiffies.c                         |   6 +
 kernel/time/ntp.c                             |   5 +-
 kernel/time/tick-broadcast-hrtimer.c          | 106 +++++++++++
 kernel/time/tick-broadcast.c                  |  85 +++++++--
 kernel/time/tick-internal.h                   |  11 +-
 mm/mempolicy.c                                |  74 +-------
 98 files changed, 1417 insertions(+), 683 deletions(-)
 create mode 100644 include/asm-generic/mcs_spinlock.h
 create mode 100644 include/linux/mcs_spinlock.h
 create mode 100644 include/linux/sched/prio.h
 create mode 100644 kernel/time/tick-broadcast-hrtimer.c
$ git reset --hard HEAD^
HEAD is now at 3c77baf14b53 Merge remote-tracking branch 'spi/for-next'
Merging next-20140210 version of tip
$ git merge -m next-20140210/tip 96c7b29d3cf6d673028a1d75620ff62571a7541c
Auto-merging kernel/sched/core.c
Auto-merging include/linux/sched.h
Auto-merging fs/compat.c
Merge made by the 'recursive' strategy.
 Documentation/sysctl/kernel.txt               |  15 +-
 drivers/media/v4l2-core/v4l2-compat-ioctl32.c |   2 +-
 fs/compat.c                                   |   6 +-
 include/linux/compat.h                        |  23 +--
 include/linux/mcs_spinlock.h                  | 112 +++++++++++
 include/linux/mutex.h                         |   5 +-
 include/linux/sched.h                         |  27 ++-
 ipc/compat.c                                  |  12 +-
 ipc/compat_mq.c                               |  19 +-
 kernel/compat.c                               | 112 +++++------
 kernel/futex_compat.c                         |   2 +-
 kernel/locking/mutex.c                        |  60 +-----
 kernel/sched/core.c                           |   6 +-
 kernel/sched/debug.c                          |   6 +-
 kernel/sched/fair.c                           | 264 +++++++++++++++++++++-----
 kernel/sysctl.c                               |   7 -
 mm/mempolicy.c                                |  74 +-------
 17 files changed, 450 insertions(+), 302 deletions(-)
 create mode 100644 include/linux/mcs_spinlock.h
Merging clockevents/clockevents/next (00e2bcd6d35f clocksource: Timer-sun5i: Switch to sched_clock_register())
$ git merge clockevents/clockevents/next
Already up-to-date.
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 (9d0e8d8348d5 amd64_edac: Fix logic to determine channel for F15 M30h processors)
$ git merge edac-amd/for-next
Merge made by the 'recursive' strategy.
 drivers/edac/amd64_edac.c   | 14 +++++++++++---
 drivers/edac/e752x_edac.c   |  2 +-
 drivers/edac/i3200_edac.c   |  2 ++
 drivers/edac/i5400_edac.c   |  2 ++
 drivers/edac/mpc85xx_edac.c |  6 +++---
 5 files changed, 19 insertions(+), 7 deletions(-)
Merging ftrace/for-next (3132e107d608 tracing: Check if tracing is enabled in trace_puts())
$ git merge ftrace/for-next
Already up-to-date.
Merging rcu/rcu/next (a9b5bb435cce locktorture: Add kvm-recheck.sh plug-in for locktorture)
$ git merge rcu/rcu/next
Auto-merging tools/testing/selftests/rcutorture/configs/rcu/ver_functions.sh
Auto-merging tools/testing/selftests/rcutorture/configs/rcu/v3.5/ver_functions.sh
Auto-merging tools/testing/selftests/rcutorture/configs/rcu/v3.3/ver_functions.sh
Auto-merging tools/testing/selftests/rcutorture/configs/rcu/v0.0/ver_functions.sh
Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE09
Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE08-T
Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE08
Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE07
Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE06
Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE05
Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE04
Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE03
Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE02
Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TREE01
Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TINY02
Auto-merging tools/testing/selftests/rcutorture/configs/rcu/TINY01
Auto-merging tools/testing/selftests/rcutorture/configs/rcu/SRCU-P
Auto-merging tools/testing/selftests/rcutorture/configs/rcu/SRCU-N
Auto-merging tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
Auto-merging lib/Kconfig.debug
Auto-merging kernel/rcu/rcutorture.c
Merge made by the 'recursive' strategy.
 Documentation/RCU/checklist.txt                    |  19 +-
 Documentation/memory-barriers.txt                  |  17 +
 include/linux/rculist.h                            |  17 +-
 include/linux/rcupdate.h                           |  92 +-
 include/linux/rcutiny.h                            |  10 +-
 include/linux/rcutree.h                            |   6 +-
 include/linux/srcu.h                               |   4 +-
 include/linux/torture.h                            | 100 +++
 kernel/Makefile                                    |   1 +
 kernel/locking/Makefile                            |   1 +
 kernel/locking/locktorture.c                       | 421 +++++++++
 kernel/rcu/Makefile                                |   2 +-
 kernel/rcu/rcu.h                                   |   4 +-
 kernel/rcu/{torture.c => rcutorture.c}             | 986 +++++----------------
 kernel/rcu/srcu.c                                  |   4 +-
 kernel/rcu/tiny.c                                  |   4 +-
 kernel/rcu/tiny_plugin.h                           |   4 +-
 kernel/rcu/tree.c                                  |  16 +-
 kernel/rcu/tree.h                                  |   4 +-
 kernel/rcu/tree_plugin.h                           |  17 +-
 kernel/rcu/tree_trace.c                            |   6 +-
 kernel/rcu/update.c                                |   4 +-
 kernel/torture.c                                   | 719 +++++++++++++++
 lib/Kconfig.debug                                  |  25 +
 mm/slub.c                                          |   3 +-
 .../testing/selftests/rcutorture/bin/functions.sh  |   1 +
 .../selftests/rcutorture/bin/kvm-recheck-lock.sh   |  51 ++
 .../selftests/rcutorture/bin/kvm-recheck-rcu.sh    |  51 ++
 .../selftests/rcutorture/bin/kvm-recheck.sh        |  13 +-
 .../bin/{kvm-test-1-rcu.sh => kvm-test-1-run.sh}   |  53 +-
 tools/testing/selftests/rcutorture/bin/kvm.sh      | 268 +++++-
 .../selftests/rcutorture/configs/lock/BUSTED       |   6 +
 .../selftests/rcutorture/configs/lock/BUSTED.boot  |   1 +
 .../selftests/rcutorture/configs/lock/CFLIST       |   1 +
 .../selftests/rcutorture/configs/lock/CFcommon     |   2 +
 .../selftests/rcutorture/configs/lock/LOCK01       |   6 +
 .../rcutorture/configs/lock/ver_functions.sh       |  43 +
 .../selftests/rcutorture/configs/rcu/BUSTED        |   7 +
 .../selftests/rcutorture/configs/rcu/BUSTED.boot   |   1 +
 .../selftests/rcutorture/configs/{ => rcu}/CFLIST  |   0
 .../selftests/rcutorture/configs/rcu/CFcommon      |   2 +
 .../selftests/rcutorture/configs/{ => rcu}/SRCU-N  |   3 +-
 .../rcutorture/configs/{ => rcu}/SRCU-N.boot       |   0
 .../selftests/rcutorture/configs/{ => rcu}/SRCU-P  |   1 -
 .../rcutorture/configs/{ => rcu}/SRCU-P.boot       |   0
 .../selftests/rcutorture/configs/{ => rcu}/TINY01  |   1 -
 .../selftests/rcutorture/configs/{ => rcu}/TINY02  |   1 -
 .../selftests/rcutorture/configs/{ => rcu}/TREE01  |   1 -
 .../rcutorture/configs/{ => rcu}/TREE01.boot       |   0
 .../selftests/rcutorture/configs/{ => rcu}/TREE02  |   3 +-
 .../selftests/rcutorture/configs/{ => rcu}/TREE03  |   1 -
 .../selftests/rcutorture/configs/{ => rcu}/TREE04  |   1 -
 .../rcutorture/configs/{ => rcu}/TREE04.boot       |   0
 .../selftests/rcutorture/configs/{ => rcu}/TREE05  |   1 -
 .../rcutorture/configs/{ => rcu}/TREE05.boot       |   0
 .../selftests/rcutorture/configs/{ => rcu}/TREE06  |   1 -
 .../selftests/rcutorture/configs/{ => rcu}/TREE07  |   1 -
 .../selftests/rcutorture/configs/{ => rcu}/TREE08  |   1 -
 .../rcutorture/configs/{ => rcu}/TREE08-T          |   1 -
 .../selftests/rcutorture/configs/{ => rcu}/TREE09  |   1 -
 .../rcutorture/configs/{ => rcu}/v0.0/CFLIST       |   0
 .../configs/{ => rcu}/v0.0/N1-S-T-NH-SD-SMP-HP     |   0
 .../configs/{ => rcu}/v0.0/N2-2-t-nh-sd-SMP-hp     |   0
 .../configs/{ => rcu}/v0.0/N3-3-T-nh-SD-SMP-hp     |   0
 .../configs/{ => rcu}/v0.0/N4-A-t-NH-sd-SMP-HP     |   0
 .../configs/{ => rcu}/v0.0/N5-U-T-NH-sd-SMP-hp     |   0
 .../rcutorture/configs/{ => rcu}/v0.0/NT1-nh       |   0
 .../rcutorture/configs/{ => rcu}/v0.0/NT3-NH       |   0
 .../configs/{ => rcu}/v0.0/P1-S-T-NH-SD-SMP-HP     |   0
 .../configs/{ => rcu}/v0.0/P2-2-t-nh-sd-SMP-hp     |   0
 .../configs/{ => rcu}/v0.0/P3-3-T-nh-SD-SMP-hp     |   0
 .../configs/{ => rcu}/v0.0/P4-A-t-NH-sd-SMP-HP     |   0
 .../configs/{ => rcu}/v0.0/P5-U-T-NH-sd-SMP-hp     |   0
 .../rcutorture/configs/{ => rcu}/v0.0/PT1-nh       |   0
 .../rcutorture/configs/{ => rcu}/v0.0/PT2-NH       |   0
 .../configs/{ => rcu}/v0.0/ver_functions.sh        |  22 +-
 .../rcutorture/configs/{ => rcu}/v3.12/CFLIST      |   0
 .../configs/{ => rcu}/v3.12/N1-S-T-NH-SD-SMP-HP    |   0
 .../configs/{ => rcu}/v3.12/N2-2-t-nh-sd-SMP-hp    |   0
 .../configs/{ => rcu}/v3.12/N3-3-T-nh-SD-SMP-hp    |   0
 .../configs/{ => rcu}/v3.12/N4-A-t-NH-sd-SMP-HP    |   0
 .../configs/{ => rcu}/v3.12/N5-U-T-NH-sd-SMP-hp    |   0
 .../configs/{ => rcu}/v3.12/N6---t-nh-SD-smp-hp    |   0
 .../configs/{ => rcu}/v3.12/N7-4-T-NH-SD-SMP-HP    |   0
 .../configs/{ => rcu}/v3.12/N8-2-T-NH-SD-SMP-HP    |   0
 .../rcutorture/configs/{ => rcu}/v3.12/NT1-nh      |   0
 .../rcutorture/configs/{ => rcu}/v3.12/NT3-NH      |   0
 .../configs/{ => rcu}/v3.12/P1-S-T-NH-SD-SMP-HP    |   0
 .../configs/{ => rcu}/v3.12/P2-2-t-nh-sd-SMP-hp    |   0
 .../configs/{ => rcu}/v3.12/P3-3-T-nh-SD-SMP-hp    |   0
 .../configs/{ => rcu}/v3.12/P4-A-t-NH-sd-SMP-HP    |   0
 .../configs/{ => rcu}/v3.12/P5-U-T-NH-sd-SMP-hp    |   0
 .../configs/{ => rcu}/v3.12/P6---t-nh-SD-smp-hp    |   0
 .../configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP    |   0
 .../{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP-all        |   0
 .../{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP-none       |   0
 .../configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-hp    |   0
 .../rcutorture/configs/{ => rcu}/v3.12/PT1-nh      |   0
 .../rcutorture/configs/{ => rcu}/v3.12/PT2-NH      |   0
 .../rcutorture/configs/{ => rcu}/v3.3/CFLIST       |   0
 .../configs/{ => rcu}/v3.3/N1-S-T-NH-SD-SMP-HP     |   0
 .../configs/{ => rcu}/v3.3/N2-2-t-nh-sd-SMP-hp     |   0
 .../configs/{ => rcu}/v3.3/N3-3-T-nh-SD-SMP-hp     |   0
 .../configs/{ => rcu}/v3.3/N4-A-t-NH-sd-SMP-HP     |   0
 .../configs/{ => rcu}/v3.3/N5-U-T-NH-sd-SMP-hp     |   0
 .../rcutorture/configs/{ => rcu}/v3.3/NT1-nh       |   0
 .../rcutorture/configs/{ => rcu}/v3.3/NT3-NH       |   0
 .../configs/{ => rcu}/v3.3/P1-S-T-NH-SD-SMP-HP     |   0
 .../configs/{ => rcu}/v3.3/P2-2-t-nh-sd-SMP-hp     |   0
 .../configs/{ => rcu}/v3.3/P3-3-T-nh-SD-SMP-hp     |   0
 .../configs/{ => rcu}/v3.3/P4-A-t-NH-sd-SMP-HP     |   0
 .../configs/{ => rcu}/v3.3/P5-U-T-NH-sd-SMP-hp     |   0
 .../rcutorture/configs/{ => rcu}/v3.3/PT1-nh       |   0
 .../rcutorture/configs/{ => rcu}/v3.3/PT2-NH       |   0
 .../configs/{ => rcu/v3.3}/ver_functions.sh        |  28 +-
 .../rcutorture/configs/{ => rcu}/v3.5/CFLIST       |   0
 .../configs/{ => rcu}/v3.5/N1-S-T-NH-SD-SMP-HP     |   0
 .../configs/{ => rcu}/v3.5/N2-2-t-nh-sd-SMP-hp     |   0
 .../configs/{ => rcu}/v3.5/N3-3-T-nh-SD-SMP-hp     |   0
 .../configs/{ => rcu}/v3.5/N4-A-t-NH-sd-SMP-HP     |   0
 .../configs/{ => rcu}/v3.5/N5-U-T-NH-sd-SMP-hp     |   0
 .../rcutorture/configs/{ => rcu}/v3.5/NT1-nh       |   0
 .../rcutorture/configs/{ => rcu}/v3.5/NT3-NH       |   0
 .../configs/{ => rcu}/v3.5/P1-S-T-NH-SD-SMP-HP     |   0
 .../configs/{ => rcu}/v3.5/P2-2-t-nh-sd-SMP-hp     |   0
 .../configs/{ => rcu}/v3.5/P3-3-T-nh-SD-SMP-hp     |   0
 .../configs/{ => rcu}/v3.5/P4-A-t-NH-sd-SMP-HP     |   0
 .../configs/{ => rcu}/v3.5/P5-U-T-NH-sd-SMP-hp     |   0
 .../rcutorture/configs/{ => rcu}/v3.5/PT1-nh       |   0
 .../rcutorture/configs/{ => rcu}/v3.5/PT2-NH       |   0
 .../configs/{ => rcu}/v3.5/ver_functions.sh        |  23 +-
 .../configs/{v3.3 => rcu}/ver_functions.sh         |  26 +-
 132 files changed, 2119 insertions(+), 990 deletions(-)
 create mode 100644 include/linux/torture.h
 create mode 100644 kernel/locking/locktorture.c
 rename kernel/rcu/{torture.c => rcutorture.c} (59%)
 create mode 100644 kernel/torture.c
 create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-lock.sh
 create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh
 rename tools/testing/selftests/rcutorture/bin/{kvm-test-1-rcu.sh => kvm-test-1-run.sh} (79%)
 create mode 100644 tools/testing/selftests/rcutorture/configs/lock/BUSTED
 create mode 100644 tools/testing/selftests/rcutorture/configs/lock/BUSTED.boot
 create mode 100644 tools/testing/selftests/rcutorture/configs/lock/CFLIST
 create mode 100644 tools/testing/selftests/rcutorture/configs/lock/CFcommon
 create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK01
 create mode 100644 tools/testing/selftests/rcutorture/configs/lock/ver_functions.sh
 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/BUSTED
 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/BUSTED.boot
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/CFLIST (100%)
 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/CFcommon
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/SRCU-N (75%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/SRCU-N.boot (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/SRCU-P (86%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/SRCU-P.boot (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TINY01 (92%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TINY02 (92%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE01 (96%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE01.boot (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE02 (92%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE03 (96%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE04 (96%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE04.boot (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE05 (96%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE05.boot (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE06 (96%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE07 (96%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE08 (96%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE08-T (96%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/TREE09 (95%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/CFLIST (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/N1-S-T-NH-SD-SMP-HP (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/N2-2-t-nh-sd-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/N3-3-T-nh-SD-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/N4-A-t-NH-sd-SMP-HP (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/N5-U-T-NH-sd-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/NT1-nh (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/NT3-NH (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/P1-S-T-NH-SD-SMP-HP (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/P2-2-t-nh-sd-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/P3-3-T-nh-SD-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/P4-A-t-NH-sd-SMP-HP (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/P5-U-T-NH-sd-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/PT1-nh (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/PT2-NH (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v0.0/ver_functions.sh (70%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/CFLIST (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N1-S-T-NH-SD-SMP-HP (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N2-2-t-nh-sd-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N3-3-T-nh-SD-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N4-A-t-NH-sd-SMP-HP (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N5-U-T-NH-sd-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N6---t-nh-SD-smp-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N7-4-T-NH-SD-SMP-HP (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/N8-2-T-NH-SD-SMP-HP (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/NT1-nh (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/NT3-NH (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P1-S-T-NH-SD-SMP-HP (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P2-2-t-nh-sd-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P3-3-T-nh-SD-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P4-A-t-NH-sd-SMP-HP (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P5-U-T-NH-sd-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P6---t-nh-SD-smp-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP-all (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-HP-none (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/P7-4-T-NH-SD-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/PT1-nh (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.12/PT2-NH (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/CFLIST (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/N1-S-T-NH-SD-SMP-HP (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/N2-2-t-nh-sd-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/N3-3-T-nh-SD-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/N4-A-t-NH-sd-SMP-HP (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/N5-U-T-NH-sd-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/NT1-nh (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/NT3-NH (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/P1-S-T-NH-SD-SMP-HP (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/P2-2-t-nh-sd-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/P3-3-T-nh-SD-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/P4-A-t-NH-sd-SMP-HP (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/P5-U-T-NH-sd-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/PT1-nh (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.3/PT2-NH (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu/v3.3}/ver_functions.sh (72%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/CFLIST (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/N1-S-T-NH-SD-SMP-HP (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/N2-2-t-nh-sd-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/N3-3-T-nh-SD-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/N4-A-t-NH-sd-SMP-HP (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/N5-U-T-NH-sd-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/NT1-nh (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/NT3-NH (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/P1-S-T-NH-SD-SMP-HP (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/P2-2-t-nh-sd-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/P3-3-T-nh-SD-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/P4-A-t-NH-sd-SMP-HP (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/P5-U-T-NH-sd-SMP-hp (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/PT1-nh (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/PT2-NH (100%)
 rename tools/testing/selftests/rcutorture/configs/{ => rcu}/v3.5/ver_functions.sh (69%)
 rename tools/testing/selftests/rcutorture/configs/{v3.3 => rcu}/ver_functions.sh (66%)
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 (b73117c49364 Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue)
$ git merge kvm/linux-next
Already up-to-date.
Merging kvm-arm/kvm-arm-next (b73117c49364 Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue)
$ git merge kvm-arm/kvm-arm-next
Already up-to-date.
Merging kvm-ppc/kvm-ppc-next (b73117c49364 Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue)
$ git merge kvm-ppc/kvm-ppc-next
Already up-to-date.
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 (62d33bf5f056 Merge branch 'stable/for-linus-3.14' into linux-next)
$ git merge xen-tip/linux-next
Removing include/xen/xencomm.h
Removing include/xen/interface/xencomm.h
Removing drivers/xen/xencomm.c
Merge made by the 'recursive' strategy.
 arch/arm/include/asm/xen/page.h     |  20 +++-
 arch/x86/include/asm/pgtable.h      |  14 ++-
 arch/x86/include/asm/xen/page.h     |   7 +-
 arch/x86/xen/mmu.c                  |  56 ++-------
 arch/x86/xen/p2m.c                  | 206 +++++++++++++++++++++------------
 arch/x86/xen/setup.c                |  15 ++-
 drivers/block/xen-blkback/blkback.c |  15 +--
 drivers/xen/Makefile                |   1 -
 drivers/xen/events/events_base.c    |   2 +
 drivers/xen/gntdev.c                |  13 ++-
 drivers/xen/grant-table.c           |  74 ++++++++++--
 drivers/xen/xencomm.c               | 219 ------------------------------------
 include/uapi/xen/Kbuild             |   2 +
 include/{ => uapi}/xen/gntalloc.h   |   0
 include/{ => uapi}/xen/gntdev.h     |   0
 include/xen/grant_table.h           |   8 +-
 include/xen/interface/xencomm.h     |  41 -------
 include/xen/xencomm.h               |  77 -------------
 18 files changed, 275 insertions(+), 495 deletions(-)
 delete mode 100644 drivers/xen/xencomm.c
 rename include/{ => uapi}/xen/gntalloc.h (100%)
 rename include/{ => uapi}/xen/gntdev.h (100%)
 delete mode 100644 include/xen/interface/xencomm.h
 delete mode 100644 include/xen/xencomm.h
Merging percpu/for-next (d5f2deed588b Merge branch 'for-3.14' into for-next)
$ git merge percpu/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging workqueues/for-next (9af16df84f0c Merge branch 'for-3.14' into for-next)
$ git merge workqueues/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging drivers-x86/linux-next (b4b0b4a9e039 ipc: add intel-mid's pci id macros)
$ 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
Already up-to-date.
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 (f37d0b3b106a Merge remote-tracking branch 'regmap/topic/irq' into regmap-next)
$ git merge regmap/for-next
Merge made by the 'recursive' strategy.
 drivers/base/regmap/regcache.c       | 4 ++--
 drivers/base/regmap/regmap-debugfs.c | 2 +-
 drivers/base/regmap/regmap-irq.c     | 2 +-
 3 files changed, 4 insertions(+), 4 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 (59e35a9e5315 drivers/leds: delete non-required instances of include <linux/init.h>)
$ git merge leds/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/leds/leds-gpio.txt         |  12 ++
 Documentation/devicetree/bindings/mfd/mc13xxx.txt  |  47 +++++
 drivers/leds/Kconfig                               |   2 +-
 drivers/leds/led-core.c                            |   6 +-
 drivers/leds/led-triggers.c                        |   1 -
 drivers/leds/leds-88pm860x.c                       |   1 -
 drivers/leds/leds-adp5520.c                        |   1 -
 drivers/leds/leds-asic3.c                          |   1 -
 drivers/leds/leds-blinkm.c                         |   1 -
 drivers/leds/leds-cobalt-qube.c                    |   1 -
 drivers/leds/leds-da903x.c                         |   1 -
 drivers/leds/leds-da9052.c                         |   1 -
 drivers/leds/leds-fsg.c                            |   1 -
 drivers/leds/leds-gpio.c                           |   4 +-
 drivers/leds/leds-hp6xx.c                          |   1 -
 drivers/leds/leds-lm3533.c                         |   1 -
 drivers/leds/leds-lp5521.c                         |   1 -
 drivers/leds/leds-lp5523.c                         |   1 -
 drivers/leds/leds-lp5562.c                         |   1 -
 drivers/leds/leds-lt3593.c                         |   1 -
 drivers/leds/leds-mc13783.c                        | 223 ++++++++++++++-------
 drivers/leds/leds-netxbig.c                        |   1 -
 drivers/leds/leds-ns2.c                            |   1 -
 drivers/leds/leds-ot200.c                          |   1 -
 drivers/leds/leds-pwm.c                            |   1 -
 drivers/leds/leds-s3c24xx.c                        |   1 -
 drivers/leds/leds-wm831x-status.c                  |   1 -
 drivers/leds/leds-wm8350.c                         |   1 -
 drivers/leds/trigger/ledtrig-cpu.c                 |  24 +++
 include/linux/mfd/mc13xxx.h                        |   6 +
 30 files changed, 243 insertions(+), 103 deletions(-)
Merging driver-core/driver-core-next (9561a8961c70 kernfs: fix hash calculation in kernfs_rename_ns())
$ git merge driver-core/driver-core-next
Resolved 'fs/kernfs/dir.c' using previous resolution.
Auto-merging fs/kernfs/dir.c
CONFLICT (content): Merge conflict in fs/kernfs/dir.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 5de15516dde7] Merge remote-tracking branch 'driver-core/driver-core-next'
$ git diff -M --stat --summary HEAD^..
 arch/s390/include/asm/ccwgroup.h               |   1 +
 arch/s390/pci/pci_sysfs.c                      |  18 +-
 drivers/base/core.c                            |  50 +-
 drivers/base/dma-buf.c                         |  18 +-
 drivers/gpu/drm/drm_prime.c                    |   2 +-
 drivers/gpu/drm/exynos/exynos_drm_dmabuf.c     |   2 +-
 drivers/media/v4l2-core/videobuf2-dma-contig.c |   2 +-
 drivers/pci/pci-sysfs.c                        |  17 +-
 drivers/s390/block/dcssblk.c                   |  14 +-
 drivers/s390/cio/ccwgroup.c                    |  26 +-
 drivers/scsi/scsi_sysfs.c                      |  15 +-
 fs/Kconfig                                     |   1 +
 fs/Makefile                                    |   3 +-
 fs/kernfs/Kconfig                              |   7 +
 fs/kernfs/dir.c                                | 750 ++++++++++++++++++-------
 fs/kernfs/file.c                               |  55 +-
 fs/kernfs/kernfs-internal.h                    |  14 +-
 fs/kernfs/mount.c                              |  37 ++
 fs/kernfs/symlink.c                            |   6 +-
 fs/sysfs/Kconfig                               |   1 +
 fs/sysfs/dir.c                                 |  44 +-
 fs/sysfs/file.c                                | 115 +---
 fs/sysfs/mount.c                               |   2 +-
 include/linux/device.h                         |  13 +-
 include/linux/kernfs.h                         | 108 +++-
 include/linux/sysfs.h                          |  23 +-
 lib/kobject.c                                  |   2 +-
 27 files changed, 843 insertions(+), 503 deletions(-)
 create mode 100644 fs/kernfs/Kconfig
Merging tty/tty-next (38dbfb59d117 Linus 3.14-rc1)
$ git merge tty/tty-next
Already up-to-date.
Merging usb/usb-next (22f6a0f0e354 usb: move hub init and LED blink work to power efficient workqueue)
$ git merge usb/usb-next
Auto-merging drivers/usb/core/driver.c
Removing Documentation/devicetree/bindings/usb/vt8500-ehci.txt
Removing Documentation/devicetree/bindings/usb/via,vt8500-ehci.txt
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/usb/usb-ehci.txt |  25 ++-
 Documentation/devicetree/bindings/usb/usb-ohci.txt |  25 +++
 .../devicetree/bindings/usb/via,vt8500-ehci.txt    |  15 --
 .../devicetree/bindings/usb/vt8500-ehci.txt        |  12 --
 drivers/usb/core/driver.c                          |   4 +-
 drivers/usb/core/hub.c                             |  19 ++-
 drivers/usb/dwc2/core_intr.c                       |  25 ++-
 drivers/usb/host/Kconfig                           |   1 +
 drivers/usb/host/ehci-platform.c                   | 180 +++++++++++++++++---
 drivers/usb/host/ohci-platform.c                   | 189 ++++++++++++++++++---
 drivers/usb/phy/phy-msm-usb.c                      |   3 +-
 11 files changed, 404 insertions(+), 94 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/usb/usb-ohci.txt
 delete mode 100644 Documentation/devicetree/bindings/usb/via,vt8500-ehci.txt
 delete mode 100644 Documentation/devicetree/bindings/usb/vt8500-ehci.txt
Merging usb-gadget/next (836a2164491b usb: phy: keystone: remove redundant return value check of platform_get_resource())
$ git merge usb-gadget/next
Already up-to-date.
Merging staging/staging-next (7ca363f6872b Merge branch 'staging-linus' into staging-work)
$ git merge staging/staging-next
Removing drivers/staging/rtl8192u/r819xU_HTType.h
Removing drivers/staging/rtl8192u/r819xU_HTGen.h
Removing drivers/staging/rtl8192u/ieee80211/scatterwalk.h
Removing drivers/staging/rtl8192u/ieee80211/scatterwalk.c
Removing drivers/staging/rtl8192u/ieee80211/rtl_crypto.h
Removing drivers/staging/rtl8192u/ieee80211/proc.c
Removing drivers/staging/rtl8192u/ieee80211/michael_mic.c
Removing drivers/staging/rtl8192u/ieee80211/internal.h
Removing drivers/staging/rtl8192u/ieee80211/digest.c
Removing drivers/staging/rtl8192u/ieee80211/crypto_compat.h
Removing drivers/staging/rtl8192u/ieee80211/compress.c
Removing drivers/staging/rtl8192u/ieee80211/cipher.c
Removing drivers/staging/rtl8192u/ieee80211/autoload.c
Removing drivers/staging/rtl8192u/ieee80211/arc4.c
Removing drivers/staging/rtl8192u/ieee80211/aes.c
Removing drivers/staging/rtl8192u/ieee80211/EndianFree.h
Merge made by the 'recursive' strategy.
 drivers/staging/Kconfig                            |    4 +
 drivers/staging/Makefile                           |    2 +
 drivers/staging/android/ion/ion.c                  |    5 +-
 drivers/staging/android/ion/ion_dummy_driver.c     |   12 +-
 drivers/staging/android/ion/ion_heap.c             |    2 +-
 drivers/staging/bcm/DDRInit.c                      |   28 +-
 drivers/staging/ced1401/ced_ioc.c                  |  151 +--
 drivers/staging/ced1401/usb1401.c                  |  188 +--
 drivers/staging/comedi/drivers/8255_pci.c          |    3 -
 drivers/staging/comedi/drivers/adl_pci7x3x.c       |    3 -
 drivers/staging/comedi/drivers/adl_pci9111.c       |    2 -
 drivers/staging/comedi/drivers/adl_pci9118.c       |   23 -
 drivers/staging/comedi/drivers/adv_pci1710.c       |    3 -
 drivers/staging/comedi/drivers/adv_pci1723.c       |    2 -
 drivers/staging/comedi/drivers/adv_pci_dio.c       |   10 +-
 drivers/staging/comedi/drivers/aio_aio12_8.c       |    3 -
 drivers/staging/comedi/drivers/aio_iiro_16.c       |    2 +-
 .../staging/comedi/drivers/amplc_dio200_common.c   |    2 +-
 drivers/staging/comedi/drivers/amplc_pc236.c       |   35 +-
 drivers/staging/comedi/drivers/amplc_pc263.c       |    2 -
 drivers/staging/comedi/drivers/amplc_pci224.c      |   17 +-
 drivers/staging/comedi/drivers/amplc_pci230.c      |    8 +-
 drivers/staging/comedi/drivers/amplc_pci263.c      |    2 -
 drivers/staging/comedi/drivers/cb_das16_cs.c       |    4 -
 drivers/staging/comedi/drivers/cb_pcidas.c         |    3 -
 drivers/staging/comedi/drivers/cb_pcidas64.c       |   13 +-
 drivers/staging/comedi/drivers/cb_pcidda.c         |    2 -
 drivers/staging/comedi/drivers/cb_pcimdas.c        |    6 +-
 drivers/staging/comedi/drivers/cb_pcimdda.c        |    4 +-
 drivers/staging/comedi/drivers/contec_pci_dio.c    |    2 -
 drivers/staging/comedi/drivers/daqboard2000.c      |    3 -
 drivers/staging/comedi/drivers/das08.c             |    7 +-
 drivers/staging/comedi/drivers/dt3000.c            |    2 -
 drivers/staging/comedi/drivers/dyna_pci10xx.c      |    2 -
 drivers/staging/comedi/drivers/fl512.c             |    2 +-
 drivers/staging/comedi/drivers/icp_multi.c         |    3 -
 drivers/staging/comedi/drivers/jr3_pci.c           |    2 +-
 drivers/staging/comedi/drivers/ke_counter.c        |    3 -
 drivers/staging/comedi/drivers/me_daq.c            |    3 -
 drivers/staging/comedi/drivers/mpc624.c            |    2 +-
 drivers/staging/comedi/drivers/ni_660x.c           |    2 +-
 drivers/staging/comedi/drivers/ni_670x.c           |    3 -
 drivers/staging/comedi/drivers/ni_atmio16d.c       |    9 +-
 drivers/staging/comedi/drivers/ni_daq_700.c        |    5 -
 drivers/staging/comedi/drivers/ni_mio_common.c     |   23 +-
 drivers/staging/comedi/drivers/ni_pcimio.c         |    2 +-
 drivers/staging/comedi/drivers/pcl711.c            |    5 +-
 drivers/staging/comedi/drivers/pcm3724.c           |    6 +-
 drivers/staging/comedi/drivers/rtd520.c            |    2 -
 drivers/staging/comedi/drivers/s526.c              |    2 +-
 drivers/staging/comedi/drivers/s626.c              |    2 -
 drivers/staging/comedi/drivers/skel.c              |    2 -
 drivers/staging/comedi/drivers/ssv_dnp.c           |    3 +-
 drivers/staging/crystalhd/crystalhd_hw.c           |    8 +-
 drivers/staging/cxt1e1/functions.c                 |    9 -
 drivers/staging/cxt1e1/pmc93x6_eeprom.c            |    6 +-
 drivers/staging/cxt1e1/pmcc4.h                     |    1 -
 drivers/staging/dgap/dgap_downld.h                 |    4 +-
 drivers/staging/dgap/dgap_driver.c                 |   40 +-
 drivers/staging/dgap/dgap_driver.h                 |   27 +-
 drivers/staging/dgap/dgap_fep5.c                   |   37 +-
 drivers/staging/dgap/dgap_fep5.h                   |   46 +-
 drivers/staging/dgap/dgap_parse.c                  |   16 +-
 drivers/staging/dgap/dgap_sysfs.c                  |   14 +-
 drivers/staging/dgap/dgap_sysfs.h                  |    2 +-
 drivers/staging/dgap/dgap_tty.c                    |   26 +-
 drivers/staging/dgap/digi.h                        |   24 +-
 drivers/staging/et131x/et131x.c                    |   10 +-
 drivers/staging/gs_fpgaboot/Kconfig                |    8 +
 drivers/staging/gs_fpgaboot/Makefile               |    4 +
 drivers/staging/gs_fpgaboot/README                 |   71 ++
 drivers/staging/gs_fpgaboot/TODO                   |    7 +
 drivers/staging/gs_fpgaboot/gs_fpgaboot.c          |  425 +++++++
 drivers/staging/gs_fpgaboot/gs_fpgaboot.h          |   56 +
 drivers/staging/gs_fpgaboot/io.c                   |  294 +++++
 drivers/staging/gs_fpgaboot/io.h                   |   90 ++
 drivers/staging/imx-drm/imx-hdmi.c                 |   21 +-
 .../staging/lustre/include/linux/libcfs/curproc.h  |    9 -
 .../lustre/lustre/include/lustre/lustre_idl.h      |   48 +-
 .../lustre/lustre/include/lustre/lustre_user.h     |    6 -
 drivers/staging/lustre/lustre/include/lustre_cfg.h |    2 +
 .../staging/lustre/lustre/include/lustre_disk.h    |    2 +
 .../lustre/lustre/include/lustre_dlm_flags.h       |   14 +-
 drivers/staging/lustre/lustre/include/obd_class.h  |    9 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_flock.c    |   41 +-
 .../lustre/lustre/libcfs/linux/linux-curproc.c     |   57 +-
 .../lustre/lustre/libcfs/linux/linux-module.c      |    4 +-
 drivers/staging/lustre/lustre/llite/dcache.c       |   40 +-
 drivers/staging/lustre/lustre/llite/dir.c          |   31 +-
 drivers/staging/lustre/lustre/llite/file.c         |   10 +-
 .../staging/lustre/lustre/llite/llite_internal.h   |    5 +-
 drivers/staging/lustre/lustre/llite/llite_lib.c    |   22 +-
 drivers/staging/lustre/lustre/llite/llite_nfs.c    |    6 +-
 drivers/staging/lustre/lustre/llite/namei.c        |   33 +-
 drivers/staging/lustre/lustre/llite/statahead.c    |    7 +-
 drivers/staging/lustre/lustre/llite/xattr.c        |    2 +-
 drivers/staging/lustre/lustre/mgc/mgc_request.c    |   90 +-
 .../lustre/lustre/obdclass/linux/linux-module.c    |    2 +-
 .../lustre/lustre/obdclass/lprocfs_status.c        |    1 +
 .../staging/lustre/lustre/obdclass/obd_config.c    |   47 +-
 drivers/staging/lustre/lustre/obdclass/obdo.c      |    4 +-
 .../staging/lustre/lustre/obdecho/echo_client.c    |   16 +-
 drivers/staging/lustre/lustre/osc/osc_cache.c      |    4 +-
 drivers/staging/lustre/lustre/osc/osc_io.c         |    2 +-
 drivers/staging/lustre/lustre/osc/osc_page.c       |    2 +-
 drivers/staging/lustre/lustre/ptlrpc/client.c      |   32 +-
 drivers/staging/lustre/lustre/ptlrpc/events.c      |    2 +-
 .../lustre/lustre/ptlrpc/gss/gss_cli_upcall.c      |    2 +-
 .../staging/lustre/lustre/ptlrpc/gss/gss_keyring.c |    2 +-
 .../staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c  |    4 +-
 .../lustre/lustre/ptlrpc/gss/gss_svc_upcall.c      |    4 +-
 drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c |   14 +-
 drivers/staging/lustre/lustre/ptlrpc/import.c      |    4 +-
 drivers/staging/lustre/lustre/ptlrpc/layout.c      |    2 +-
 .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c    |    4 +-
 drivers/staging/lustre/lustre/ptlrpc/niobuf.c      |    4 +-
 drivers/staging/lustre/lustre/ptlrpc/nrs.c         |    4 +-
 .../staging/lustre/lustre/ptlrpc/pack_generic.c    |   14 +-
 drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c     |    4 +-
 drivers/staging/lustre/lustre/ptlrpc/sec.c         |   14 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c    |    2 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_config.c  |    2 +-
 drivers/staging/lustre/lustre/ptlrpc/service.c     |   12 +-
 drivers/staging/lustre/lustre/ptlrpc/wiretest.c    |    2 +
 drivers/staging/nokia_h4p/Kconfig                  |    9 +
 drivers/staging/nokia_h4p/Makefile                 |    6 +
 drivers/staging/nokia_h4p/TODO                     |  140 +++
 drivers/staging/nokia_h4p/hci_h4p.h                |  228 ++++
 drivers/staging/nokia_h4p/nokia_core.c             | 1205 ++++++++++++++++++++
 drivers/staging/nokia_h4p/nokia_fw-bcm.c           |  147 +++
 drivers/staging/nokia_h4p/nokia_fw-csr.c           |  150 +++
 drivers/staging/nokia_h4p/nokia_fw-ti1273.c        |  110 ++
 drivers/staging/nokia_h4p/nokia_fw.c               |  195 ++++
 drivers/staging/nokia_h4p/nokia_uart.c             |  199 ++++
 drivers/staging/olpc_dcon/olpc_dcon.h              |    2 +-
 drivers/staging/ozwpan/ozproto.c                   |   42 +-
 drivers/staging/rtl8188eu/core/rtw_mlme.c          |    9 +-
 drivers/staging/rtl8188eu/core/rtw_mp.c            |    4 +-
 drivers/staging/rtl8188eu/core/rtw_recv.c          |    4 +-
 drivers/staging/rtl8188eu/core/rtw_sta_mgt.c       |    4 +-
 drivers/staging/rtl8188eu/core/rtw_xmit.c          |   14 +-
 .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c   |   13 +-
 drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c     |   37 +-
 drivers/staging/rtl8188eu/hal/odm.c                |   11 +-
 drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c |    4 +-
 drivers/staging/rtl8188eu/hal/odm_interface.c      |   67 --
 drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c  |    4 +-
 drivers/staging/rtl8188eu/include/odm_interface.h  |   23 -
 drivers/staging/rtl8188eu/include/osdep_service.h  |    6 -
 drivers/staging/rtl8188eu/os_dep/ioctl_linux.c     |    6 +-
 drivers/staging/rtl8188eu/os_dep/osdep_service.c   |   25 +-
 drivers/staging/rtl8188eu/os_dep/usb_intf.c        |    4 +-
 drivers/staging/rtl8192u/ieee80211/EndianFree.h    |  194 ----
 drivers/staging/rtl8192u/ieee80211/aes.c           |  468 --------
 drivers/staging/rtl8192u/ieee80211/arc4.c          |  103 --
 drivers/staging/rtl8192u/ieee80211/autoload.c      |   40 -
 drivers/staging/rtl8192u/ieee80211/cipher.c        |  298 -----
 drivers/staging/rtl8192u/ieee80211/compress.c      |   64 --
 drivers/staging/rtl8192u/ieee80211/crypto_compat.h |   58 -
 drivers/staging/rtl8192u/ieee80211/digest.c        |  108 --
 drivers/staging/rtl8192u/ieee80211/internal.h      |   81 --
 drivers/staging/rtl8192u/ieee80211/michael_mic.c   |  194 ----
 drivers/staging/rtl8192u/ieee80211/proc.c          |  112 --
 drivers/staging/rtl8192u/ieee80211/rtl_crypto.h    |  398 -------
 drivers/staging/rtl8192u/ieee80211/scatterwalk.c   |  117 --
 drivers/staging/rtl8192u/ieee80211/scatterwalk.h   |   51 -
 drivers/staging/rtl8192u/r819xU_HTGen.h            |   12 -
 drivers/staging/rtl8192u/r819xU_HTType.h           |  379 ------
 drivers/staging/rtl8821ae/base.c                   |  140 +--
 drivers/staging/rtl8821ae/pci.c                    |  250 ++--
 drivers/staging/rtl8821ae/regd.h                   |    4 +-
 drivers/staging/silicom/bpctl_mod.c                |  584 ++--------
 drivers/staging/usbip/stub.h                       |    2 +-
 drivers/staging/usbip/stub_dev.c                   |  150 +--
 drivers/staging/usbip/stub_main.c                  |    6 +-
 drivers/staging/usbip/stub_rx.c                    |    2 +-
 drivers/staging/usbip/usbip_common.c               |   22 +-
 .../staging/usbip/userspace/libsrc/usbip_common.c  |    2 +
 .../staging/usbip/userspace/libsrc/usbip_common.h  |    8 +-
 .../usbip/userspace/libsrc/usbip_host_driver.c     |   45 +-
 drivers/staging/usbip/userspace/src/usbip_bind.c   |  142 +--
 drivers/staging/usbip/userspace/src/usbip_list.c   |   19 +-
 drivers/staging/usbip/userspace/src/usbip_unbind.c |   51 +-
 drivers/staging/usbip/userspace/src/usbipd.c       |   15 -
 drivers/staging/usbip/vhci_hcd.c                   |    2 -
 drivers/staging/usbip/vhci_sysfs.c                 |    5 +-
 drivers/staging/vt6656/main_usb.c                  |    2 +-
 drivers/usb/core/generic.c                         |    1 +
 drivers/usb/core/message.c                         |    1 +
 include/linux/platform_data/bt-nokia-h4p.h         |   38 +
 include/linux/usb.h                                |    4 +
 191 files changed, 4661 insertions(+), 4707 deletions(-)
 create mode 100644 drivers/staging/gs_fpgaboot/Kconfig
 create mode 100644 drivers/staging/gs_fpgaboot/Makefile
 create mode 100644 drivers/staging/gs_fpgaboot/README
 create mode 100644 drivers/staging/gs_fpgaboot/TODO
 create mode 100644 drivers/staging/gs_fpgaboot/gs_fpgaboot.c
 create mode 100644 drivers/staging/gs_fpgaboot/gs_fpgaboot.h
 create mode 100644 drivers/staging/gs_fpgaboot/io.c
 create mode 100644 drivers/staging/gs_fpgaboot/io.h
 create mode 100644 drivers/staging/nokia_h4p/Kconfig
 create mode 100644 drivers/staging/nokia_h4p/Makefile
 create mode 100644 drivers/staging/nokia_h4p/TODO
 create mode 100644 drivers/staging/nokia_h4p/hci_h4p.h
 create mode 100644 drivers/staging/nokia_h4p/nokia_core.c
 create mode 100644 drivers/staging/nokia_h4p/nokia_fw-bcm.c
 create mode 100644 drivers/staging/nokia_h4p/nokia_fw-csr.c
 create mode 100644 drivers/staging/nokia_h4p/nokia_fw-ti1273.c
 create mode 100644 drivers/staging/nokia_h4p/nokia_fw.c
 create mode 100644 drivers/staging/nokia_h4p/nokia_uart.c
 delete mode 100644 drivers/staging/rtl8192u/ieee80211/EndianFree.h
 delete mode 100644 drivers/staging/rtl8192u/ieee80211/aes.c
 delete mode 100644 drivers/staging/rtl8192u/ieee80211/arc4.c
 delete mode 100644 drivers/staging/rtl8192u/ieee80211/autoload.c
 delete mode 100644 drivers/staging/rtl8192u/ieee80211/cipher.c
 delete mode 100644 drivers/staging/rtl8192u/ieee80211/compress.c
 delete mode 100644 drivers/staging/rtl8192u/ieee80211/crypto_compat.h
 delete mode 100644 drivers/staging/rtl8192u/ieee80211/digest.c
 delete mode 100644 drivers/staging/rtl8192u/ieee80211/internal.h
 delete mode 100644 drivers/staging/rtl8192u/ieee80211/michael_mic.c
 delete mode 100644 drivers/staging/rtl8192u/ieee80211/proc.c
 delete mode 100644 drivers/staging/rtl8192u/ieee80211/rtl_crypto.h
 delete mode 100644 drivers/staging/rtl8192u/ieee80211/scatterwalk.c
 delete mode 100644 drivers/staging/rtl8192u/ieee80211/scatterwalk.h
 delete mode 100644 drivers/staging/rtl8192u/r819xU_HTGen.h
 delete mode 100644 drivers/staging/rtl8192u/r819xU_HTType.h
 create mode 100644 include/linux/platform_data/bt-nokia-h4p.h
$ git am -3 ../patches/0001-staging-r8188eu-diable-driver-due-to-breakage.patch
Applying: staging: r8188eu: diable driver due to breakage
$ git reset HEAD^
Unstaged changes after reset:
M	drivers/staging/rtl8188eu/Kconfig
$ git add -A .
$ git commit -v -a --amend
[master 5dcf6b901a50] Merge remote-tracking branch 'staging/staging-next'
Merging char-misc/char-misc-next (7841b647b9c1 Revert ds1wm.c from "w1: hold bus_mutex in netlink and search")
$ git merge char-misc/char-misc-next
Auto-merging include/linux/hyperv.h
Auto-merging drivers/misc/eeprom/sunxi_sid.c
Auto-merging drivers/char/hw_random/core.c
Merge made by the 'recursive' strategy.
 Documentation/DocBook/Makefile         |    2 +-
 Documentation/DocBook/w1.tmpl          |  101 +++
 Documentation/connector/cn_test.c      |    2 +-
 Documentation/w1/masters/ds2490        |    2 -
 Documentation/w1/w1.netlink            |    8 +-
 drivers/char/agp/frontend.c            |    1 -
 drivers/char/agp/generic.c             |    1 -
 drivers/char/agp/intel-gtt.c           |    1 -
 drivers/char/agp/sgi-agp.c             |    1 -
 drivers/char/hw_random/bcm2835-rng.c   |    1 -
 drivers/char/hw_random/core.c          |    1 -
 drivers/char/hw_random/exynos-rng.c    |    1 -
 drivers/char/hw_random/n2-drv.c        |    1 -
 drivers/char/hw_random/nomadik-rng.c   |    1 -
 drivers/char/hw_random/octeon-rng.c    |    1 -
 drivers/char/ipmi/ipmi_si_intf.c       |    1 -
 drivers/char/mwave/3780i.c             |    1 -
 drivers/char/tile-srom.c               |    1 -
 drivers/char/tpm/tpm_i2c_infineon.c    |    1 -
 drivers/char/tpm/tpm_i2c_stm_st33.c    |    1 -
 drivers/connector/cn_proc.c            |   18 +-
 drivers/connector/connector.c          |   20 +-
 drivers/hv/channel.c                   |   42 +-
 drivers/hv/hv_kvp.c                    |    4 +-
 drivers/hv/hv_snapshot.c               |    2 +-
 drivers/hv/hyperv_vmbus.h              |    4 +-
 drivers/hv/ring_buffer.c               |   17 +-
 drivers/hv/vmbus_drv.c                 |   45 +-
 drivers/md/dm-log-userspace-transfer.c |    2 +-
 drivers/misc/ad525x_dpot.c             |    1 -
 drivers/misc/apds9802als.c             |    1 -
 drivers/misc/bmp085.c                  |    1 -
 drivers/misc/carma/carma-fpga.c        |    1 -
 drivers/misc/ds1682.c                  |    1 -
 drivers/misc/eeprom/at25.c             |    1 -
 drivers/misc/eeprom/eeprom.c           |    1 -
 drivers/misc/eeprom/eeprom_93xx46.c    |    1 -
 drivers/misc/eeprom/max6875.c          |    1 -
 drivers/misc/eeprom/sunxi_sid.c        |    1 -
 drivers/misc/genwqe/card_debugfs.c     |    1 -
 drivers/misc/hmc6352.c                 |    1 -
 drivers/misc/isl29003.c                |    1 -
 drivers/misc/isl29020.c                |    1 -
 drivers/misc/lattice-ecp3-config.c     |    1 -
 drivers/misc/lis3lv02d/lis3lv02d.c     |    1 -
 drivers/misc/lis3lv02d/lis3lv02d_i2c.c |    1 -
 drivers/misc/lis3lv02d/lis3lv02d_spi.c |    1 -
 drivers/misc/mei/Kconfig               |    9 +
 drivers/misc/mei/Makefile              |    6 +-
 drivers/misc/mei/amthif.c              |    1 -
 drivers/misc/mei/debugfs.c             |   54 ++
 drivers/misc/mei/hbm.c                 |    2 +-
 drivers/misc/mei/hw-me.c               |    2 +-
 drivers/misc/mei/hw-txe-regs.h         |  294 +++++++++
 drivers/misc/mei/hw-txe.c              | 1106 ++++++++++++++++++++++++++++++++
 drivers/misc/mei/hw-txe.h              |   71 ++
 drivers/misc/mei/hw.h                  |    4 +-
 drivers/misc/mei/init.c                |   40 +-
 drivers/misc/mei/pci-me.c              |    1 -
 drivers/misc/mei/pci-txe.c             |  293 +++++++++
 drivers/misc/sram.c                    |    2 -
 drivers/misc/ti-st/st_core.c           |    1 -
 drivers/misc/ti_dac7512.c              |    1 -
 drivers/misc/tsl2550.c                 |    1 -
 drivers/video/uvesafb.c                |    4 +-
 drivers/w1/masters/ds2490.c            |  155 +++--
 drivers/w1/slaves/w1_therm.c           |   21 +-
 drivers/w1/w1.c                        |  269 ++++++--
 drivers/w1/w1.h                        |  186 ++++--
 drivers/w1/w1_family.c                 |    8 +
 drivers/w1/w1_family.h                 |   13 +
 drivers/w1/w1_int.c                    |   25 +-
 drivers/w1/w1_io.c                     |  102 +--
 drivers/w1/w1_netlink.c                |  359 ++++++++---
 drivers/w1/w1_netlink.h                |   33 +-
 include/linux/connector.h              |    2 +-
 include/linux/hyperv.h                 |  340 +---------
 include/uapi/linux/Kbuild              |    1 +
 include/uapi/linux/hyperv.h            |  344 ++++++++++
 79 files changed, 3308 insertions(+), 744 deletions(-)
 create mode 100644 Documentation/DocBook/w1.tmpl
 create mode 100644 drivers/misc/mei/hw-txe-regs.h
 create mode 100644 drivers/misc/mei/hw-txe.c
 create mode 100644 drivers/misc/mei/hw-txe.h
 create mode 100644 drivers/misc/mei/pci-txe.c
 create mode 100644 include/uapi/linux/hyperv.h
Merging cgroup/for-next (f7cef064aa01 Merge branch 'driver-core-next' into cgroup/for-3.15)
$ git merge cgroup/for-next
Auto-merging kernel/sched/core.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                    |   2 +
 arch/arm/mach-tegra/pm.c       |   1 +
 block/blk-cgroup.c             |   9 +-
 block/blk-cgroup.h             |   2 +-
 fs/bio.c                       |   2 +-
 fs/nfs/nfs3proc.c              |   1 +
 include/linux/cgroup.h         |  38 +---
 include/linux/cgroup_subsys.h  |  30 +--
 include/linux/hugetlb_cgroup.h |   2 +-
 include/linux/memcontrol.h     |   2 +-
 include/net/cls_cgroup.h       |   2 +-
 include/net/netprio_cgroup.h   |  17 +-
 kernel/cgroup.c                | 426 ++++++++---------------------------------
 kernel/cgroup_freezer.c        |   8 +-
 kernel/cpuset.c                |  10 +-
 kernel/events/core.c           |   8 +-
 kernel/power/console.c         |   1 +
 kernel/sched/core.c            |   6 +-
 kernel/sched/cpuacct.c         |   6 +-
 mm/hugetlb_cgroup.c            |   9 +-
 mm/memcontrol.c                |  22 +--
 mm/vmpressure.c                |   1 +
 net/Kconfig                    |   2 +-
 net/core/netclassid_cgroup.c   |  13 +-
 net/core/netprio_cgroup.c      |  37 +---
 net/ipv4/tcp_memcontrol.c      |   2 +-
 security/device_cgroup.c       |   8 +-
 27 files changed, 151 insertions(+), 516 deletions(-)
Merging scsi/for-next (3ce438df1068 [SCSI] hpsa: allow SCSI mid layer to handle unit attention)
$ git merge scsi/for-next
Already up-to-date.
Merging target-updates/for-next (5259a06ef970 target: Fix percpu_ref_put race in transport_lun_remove_cmd)
$ git merge target-updates/for-next
Already up-to-date.
Merging target-merge/for-next-merge (374b105797c3 Linux 3.13-rc3)
$ git merge target-merge/for-next-merge
Already up-to-date.
Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS)
$ 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 (f3f527607718 pinctrl: sh-pfc: r8a7790: Break out USB0 OVC/VBUS)
$ git merge pinctrl/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/pinctrl/pinctrl-single.txt |   7 +
 .../devicetree/bindings/pinctrl/pinctrl-st.txt     |  73 ++++-
 .../bindings/pinctrl/samsung-pinctrl.txt           |   1 +
 arch/blackfin/include/asm/irq.h                    |   9 -
 drivers/pinctrl/pinctrl-adi2.c                     |  19 +-
 drivers/pinctrl/pinctrl-at91.c                     |  27 ++
 drivers/pinctrl/pinctrl-exynos.c                   |  82 +++++
 drivers/pinctrl/pinctrl-msm.c                      |  27 ++
 drivers/pinctrl/pinctrl-samsung.c                  |   2 +
 drivers/pinctrl/pinctrl-samsung.h                  |   1 +
 drivers/pinctrl/pinctrl-single.c                   |   3 +
 drivers/pinctrl/pinctrl-st.c                       | 362 ++++++++++++++++++++-
 drivers/pinctrl/sh-pfc/pfc-r8a7790.c               |   9 +
 drivers/pinctrl/sh-pfc/pfc-r8a7791.c               |  63 ++++
 drivers/pinctrl/sirf/pinctrl-atlas6.c              |  43 +++
 15 files changed, 708 insertions(+), 20 deletions(-)
$ git reset --hard HEAD^
HEAD is now at 8ae37cf6b7f8 Merge remote-tracking branch 'cgroup/for-next'
Merging next-20140210 version of pinctrl
$ git merge -m next-20140210/pinctrl 5b232c5addc02980cfce451575f1d1f975bdb04e
Already up-to-date.
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 (a3485d088516 gpio: consumer.h: Move forward declarations outside #ifdef)
$ git merge gpio/for-next
Merge made by the 'recursive' strategy.
 drivers/gpio/Kconfig          |  1 +
 drivers/gpio/gpio-bcm-kona.c  |  4 ++--
 drivers/gpio/gpio-clps711x.c  |  1 +
 drivers/gpio/gpio-intel-mid.c |  4 ++--
 drivers/gpio/gpio-xtensa.c    | 16 ++++++++++++++++
 include/linux/gpio/consumer.h |  4 ++--
 6 files changed, 24 insertions(+), 6 deletions(-)
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 (6691a19966f0 pwm: tiecap: Remove duplicate put_sync call)
$ git merge pwm/for-next
Already up-to-date.
Merging dma-buf/for-next (f546ca46faa1 dma-buf: update debugfs output)
$ git merge dma-buf/for-next
Auto-merging drivers/base/dma-buf.c
Merge made by the 'recursive' strategy.
 drivers/base/dma-buf.c  | 18 ++++++++----------
 include/linux/dma-buf.h |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)
Merging userns/for-next (f58437f1f916 MIPS: VPE: Remove vpe_getuid and vpe_getgid)
$ git merge userns/for-next
Already up-to-date.
Merging ktest/for-next (961d9caceea2 ktest: Add BISECT_TRIES to bisect test)
$ git merge ktest/for-next
Already up-to-date.
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 (fd3fdaf09f26 clk: sort Makefile)
$ git merge clk/clk-next
Already up-to-date.
Merging random/dev (a9f069e38cc3 random: use the architectural HWRNG for the SHA's IV in extract_buf())
$ git merge random/dev
Merge made by the 'recursive' strategy.
 drivers/char/random.c | 192 ++++++++++++++++++++++----------------------------
 1 file changed, 84 insertions(+), 108 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 (8e321fefb0e6 aio/migratepages: make aio migrate pages sane)
$ git merge aio/master
Already up-to-date.
Merging akpm-current/current (1fc69fa0b91f drivers/misc/sgi-gru/grukdump.c: cleanup gru_dump_context() a little)
$ git merge --no-ff akpm-current/current
Recorded preimage for 'arch/x86/include/asm/pgtable.h'
Resolved 'mm/slub.c' using previous resolution.
Auto-merging net/core/rtnetlink.c
Auto-merging mm/vmstat.c
Auto-merging mm/slub.c
CONFLICT (content): Merge conflict in mm/slub.c
Auto-merging mm/mempolicy.c
Auto-merging mm/filemap.c
Auto-merging lib/Makefile
Auto-merging kernel/kmod.c
Auto-merging kernel/cpuset.c
Auto-merging include/linux/vmstat.h
Auto-merging include/linux/fs.h
Auto-merging fs/ocfs2/alloc.c
Auto-merging fs/fuse/inode.c
Auto-merging fs/f2fs/inode.c
Auto-merging fs/btrfs/compression.c
Auto-merging drivers/staging/lustre/lustre/llite/llite_lib.c
Auto-merging drivers/misc/ti-st/st_core.c
Auto-merging drivers/leds/Kconfig
Auto-merging arch/x86/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/pgtable.h
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'arch/x86/include/asm/pgtable.h'.
[master a2bc470e71d1] Merge branch 'akpm-current/current'
$ git diff -M --stat --summary HEAD^..
 Documentation/00-INDEX                          |  24 +-
 Documentation/ABI/testing/sysfs-block-zram      |  24 +-
 Documentation/RCU/00-INDEX                      |   2 +
 Documentation/arm/00-INDEX                      |  14 +
 Documentation/blackfin/00-INDEX                 |   6 +-
 Documentation/block/00-INDEX                    |   2 +
 Documentation/blockdev/zram.txt                 |   8 +-
 Documentation/devicetree/00-INDEX               |   2 +
 Documentation/fb/00-INDEX                       |   6 +
 Documentation/filesystems/00-INDEX              |   2 +
 Documentation/filesystems/nfs/00-INDEX          |   4 +-
 Documentation/filesystems/nilfs2.txt            |   7 +
 Documentation/filesystems/porting               |   6 +-
 Documentation/filesystems/vfat.txt              |  10 +
 Documentation/ide/00-INDEX                      |   2 +
 Documentation/laptops/00-INDEX                  |   6 +-
 Documentation/leds/00-INDEX                     |   8 +
 Documentation/leds/leds-class.txt               |   3 -
 Documentation/m68k/00-INDEX                     |   2 +
 Documentation/networking/00-INDEX               |  30 +-
 Documentation/power/00-INDEX                    |   6 +-
 Documentation/printk-formats.txt                |   6 +
 Documentation/s390/00-INDEX                     |   8 +-
 Documentation/scheduler/00-INDEX                |   2 +
 Documentation/scsi/00-INDEX                     |  16 +
 Documentation/serial/00-INDEX                   |   6 +-
 Documentation/spi/00-INDEX                      |  22 ++
 Documentation/timers/00-INDEX                   |   2 +
 Documentation/virtual/kvm/00-INDEX              |   2 +
 Documentation/vm/00-INDEX                       |   4 +-
 Documentation/w1/masters/00-INDEX               |   4 +-
 Documentation/w1/slaves/00-INDEX                |   2 +
 Documentation/x86/00-INDEX                      |  18 +-
 MAINTAINERS                                     |   4 +-
 arch/arm/include/asm/fixmap.h                   |  29 +-
 arch/arm/kernel/setup.c                         |   2 +-
 arch/arm/mm/init.c                              |   2 +-
 arch/x86/include/asm/pgtable.h                  |   2 +-
 block/genhd.c                                   |   2 +-
 drivers/block/zram/zram_drv.c                   | 175 ++++------
 drivers/block/zram/zram_drv.h                   |  10 +-
 drivers/edac/edac_mc_sysfs.c                    |   2 +-
 drivers/input/Kconfig                           |   9 +
 drivers/input/Makefile                          |   3 +
 drivers/input/input.c                           |   6 +
 drivers/input/leds.c                            | 249 ++++++++++++++
 drivers/leds/Kconfig                            |   3 -
 drivers/md/bcache/btree.c                       |   2 +-
 drivers/md/bcache/extents.c                     |   2 +-
 drivers/message/i2o/i2o_config.c                |   4 +-
 drivers/misc/sgi-gru/grukdump.c                 |  17 +-
 drivers/misc/ti-st/st_core.c                    |   2 +-
 drivers/net/irda/donauboe.c                     |  15 +-
 drivers/pps/pps.c                               |  57 ++--
 drivers/rtc/rtc-imxdi.c                         |   4 +-
 drivers/scsi/megaraid/megaraid_mm.c             |   2 +
 drivers/staging/lustre/lustre/llite/llite_lib.c |   2 +-
 drivers/tty/Kconfig                             |   4 +
 drivers/tty/vt/keyboard.c                       | 110 +++++--
 drivers/video/backlight/backlight.c             |  30 +-
 fs/9p/vfs_inode.c                               |   2 +-
 fs/adfs/super.c                                 |   2 +-
 fs/affs/inode.c                                 |   2 +-
 fs/afs/inode.c                                  |   2 +-
 fs/bfs/inode.c                                  |   2 +-
 fs/binfmt_elf.c                                 |  21 +-
 fs/block_dev.c                                  |   4 +-
 fs/btrfs/compression.c                          |   2 +-
 fs/btrfs/inode.c                                |   2 +-
 fs/cachefiles/rdwr.c                            |  33 +-
 fs/cifs/cifsfs.c                                |   2 +-
 fs/coda/inode.c                                 |   2 +-
 fs/ecryptfs/super.c                             |   2 +-
 fs/exofs/inode.c                                |   2 +-
 fs/ext2/inode.c                                 |   2 +-
 fs/ext3/inode.c                                 |   2 +-
 fs/ext4/inode.c                                 |   4 +-
 fs/f2fs/inode.c                                 |   2 +-
 fs/fat/cache.c                                  |  19 +-
 fs/fat/fat.h                                    |   6 +-
 fs/fat/file.c                                   |  78 ++++-
 fs/fat/inode.c                                  |  59 +++-
 fs/file.c                                       |   2 +-
 fs/freevxfs/vxfs_inode.c                        |   2 +-
 fs/fuse/inode.c                                 |   2 +-
 fs/gfs2/super.c                                 |   2 +-
 fs/hfs/inode.c                                  |   2 +-
 fs/hfsplus/super.c                              |   2 +-
 fs/hostfs/hostfs_kern.c                         |   2 +-
 fs/hpfs/inode.c                                 |   2 +-
 fs/hugetlbfs/inode.c                            |  17 +-
 fs/inode.c                                      |   4 +-
 fs/jffs2/fs.c                                   |  11 +-
 fs/jfs/inode.c                                  |   4 +-
 fs/kernfs/inode.c                               |   2 +-
 fs/logfs/readwrite.c                            |   2 +-
 fs/minix/inode.c                                |   2 +-
 fs/ncpfs/inode.c                                |   2 +-
 fs/nfs/blocklayout/blocklayout.c                |   2 +-
 fs/nfs/inode.c                                  |   2 +-
 fs/nfs/nfs4super.c                              |   2 +-
 fs/nilfs2/inode.c                               |   6 +-
 fs/nilfs2/ioctl.c                               |  92 ++++++
 fs/nilfs2/sufile.c                              | 131 ++++++++
 fs/nilfs2/sufile.h                              |   1 +
 fs/notify/fanotify/fanotify.c                   |  58 +++-
 fs/notify/fanotify/fanotify.h                   |  31 +-
 fs/notify/fanotify/fanotify_user.c              | 190 +++++------
 fs/ntfs/inode.c                                 |   2 +-
 fs/ocfs2/alloc.c                                |   2 +-
 fs/ocfs2/cluster/tcp.c                          |  35 +-
 fs/ocfs2/file.c                                 |  63 +++-
 fs/ocfs2/inode.c                                |   4 +-
 fs/ocfs2/namei.c                                | 122 ++++++-
 fs/omfs/inode.c                                 |   2 +-
 fs/proc/inode.c                                 |   2 +-
 fs/proc/vmcore.c                                |  26 +-
 fs/reiserfs/inode.c                             |   2 +-
 fs/sysv/inode.c                                 |   2 +-
 fs/ubifs/super.c                                |   2 +-
 fs/udf/inode.c                                  |   4 +-
 fs/ufs/balloc.c                                 |  30 +-
 fs/ufs/ialloc.c                                 |  17 +-
 fs/ufs/inode.c                                  |   2 +-
 fs/ufs/super.c                                  |  15 +-
 fs/ufs/ufs.h                                    |   1 -
 fs/xfs/xfs_super.c                              |   2 +-
 include/linux/backlight.h                       |   6 +
 include/linux/cpuset.h                          |  27 +-
 include/linux/crc64_ecma.h                      |  56 ++++
 include/linux/fs.h                              |   1 +
 include/linux/fsnotify_backend.h                |   2 +-
 include/linux/hugetlb.h                         |  10 +
 include/linux/input.h                           |  21 ++
 include/linux/kthread.h                         |   1 +
 include/linux/list_lru.h                        |   2 +
 include/linux/mm.h                              |   9 +
 include/linux/mm_types.h                        |   3 +-
 include/linux/mmzone.h                          |   6 +
 include/linux/nilfs2_fs.h                       |  44 +++
 include/linux/pagemap.h                         |  33 +-
 include/linux/pagevec.h                         |   3 +
 include/linux/radix-tree.h                      |  55 +++-
 include/linux/shmem_fs.h                        |   1 +
 include/linux/string.h                          |   1 +
 include/linux/swap.h                            |  36 ++
 include/linux/vmstat.h                          |  17 +-
 kernel/cpuset.c                                 |  17 +-
 kernel/hung_task.c                              |   3 +-
 kernel/kexec.c                                  |   4 +-
 kernel/kmod.c                                   |  11 +-
 kernel/kthread.c                                |  13 +-
 kernel/profile.c                                |   2 +-
 kernel/sched/stats.c                            |   2 +-
 kernel/time/sched_clock.c                       |   4 +
 kernel/user.c                                   |   3 +-
 kernel/user_namespace.c                         |   2 +-
 kernel/watchdog.c                               |  26 +-
 lib/Kconfig                                     |   7 +
 lib/Makefile                                    |   1 +
 lib/crc64_ecma.c                                | 341 +++++++++++++++++++
 lib/radix-tree.c                                | 383 +++++++++++----------
 lib/vsprintf.c                                  |  65 ++--
 mm/Makefile                                     |   2 +-
 mm/compaction.c                                 |   1 +
 mm/filemap.c                                    | 421 +++++++++++++++++++++---
 mm/hugetlb.c                                    | 294 ++++++++++-------
 mm/list_lru.c                                   |  10 +
 mm/mempolicy.c                                  |  12 +-
 mm/mincore.c                                    |  20 +-
 mm/page_alloc.c                                 |  12 +-
 mm/readahead.c                                  |   6 +-
 mm/shmem.c                                      | 122 ++-----
 mm/slab.c                                       |   8 +-
 mm/slob.c                                       |  10 +-
 mm/slub.c                                       |  23 +-
 mm/swap.c                                       |  50 +++
 mm/truncate.c                                   | 147 ++++++++-
 mm/util.c                                       |  30 ++
 mm/vmscan.c                                     | 122 +++----
 mm/vmstat.c                                     |   3 +
 mm/workingset.c                                 | 396 ++++++++++++++++++++++
 net/core/rtnetlink.c                            |   2 +-
 scripts/checkpatch.pl                           |  15 +-
 scripts/get_maintainer.pl                       |   2 +-
 185 files changed, 3835 insertions(+), 1268 deletions(-)
 create mode 100644 Documentation/spi/00-INDEX
 create mode 100644 drivers/input/leds.c
 create mode 100644 include/linux/crc64_ecma.h
 create mode 100644 lib/crc64_ecma.c
 create mode 100644 mm/workingset.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: fs/udf/super.c: add __init to init_inodecache()
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
Applying: arm: move arm_dma_limit to setup_dma_zone
Applying: mm: add strictlimit knob
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
 + cd23337bcc57...674adcf8f23e akpm       -> akpm/master  (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (674adcf8f23e mm: add strictlimit knob)
$ git merge --no-ff akpm/master
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-class-bdi |  8 +++++++
 arch/arm/mm/init.c                        |  6 ++++--
 arch/arm/mm/mm.h                          |  2 --
 drivers/w1/w1_int.c                       |  5 ++---
 fs/udf/super.c                            |  2 +-
 mm/backing-dev.c                          | 35 +++++++++++++++++++++++++++++++
 6 files changed, 50 insertions(+), 8 deletions(-)