$ date
Monday 14 July  10:32:07 EST 2014
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 4c71842375f5 Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Merging origin/master (1795cd9b3a91 Linux 3.16-rc5)
$ git merge origin/master
Updating 4c71842375f5..1795cd9b3a91
Fast-forward
 Documentation/Changes                              |   9 +-
 Documentation/DocBook/gadget.tmpl                  |   2 +-
 Documentation/DocBook/genericirq.tmpl              |   4 +-
 Documentation/DocBook/kernel-locking.tmpl          |   2 +-
 Documentation/DocBook/libata.tmpl                  |   6 +-
 Documentation/DocBook/media_api.tmpl               |   2 +-
 Documentation/DocBook/mtdnand.tmpl                 |  30 ++--
 Documentation/DocBook/regulator.tmpl               |   2 +-
 Documentation/DocBook/uio-howto.tmpl               |   4 +-
 Documentation/DocBook/usb.tmpl                     |   2 +-
 Documentation/DocBook/writing-an-alsa-driver.tmpl  |   2 +-
 Documentation/cpu-freq/intel-pstate.txt            |   7 +-
 .../bindings/arm/exynos/power_domain.txt           |  20 +++
 .../bindings/serial/renesas,sci-serial.txt         |   7 +
 Documentation/laptops/00-INDEX                     |   4 +-
 Documentation/laptops/{hpfall.c => freefall.c}     |  59 ++++++--
 MAINTAINERS                                        |  14 ++
 Makefile                                           | 101 +++++++------
 arch/arm/boot/dts/am335x-evm.dts                   |   4 +-
 arch/arm/boot/dts/am335x-evmsk.dts                 |   4 +-
 arch/arm/boot/dts/am335x-igep0033.dtsi             |   6 +
 arch/arm/boot/dts/at91sam9x5.dtsi                  |   2 +
 arch/arm/boot/dts/dra7-evm.dts                     |   1 +
 arch/arm/boot/dts/dra7xx-clocks.dtsi               |  10 +-
 arch/arm/boot/dts/exynos4.dtsi                     |   2 +-
 arch/arm/boot/dts/exynos5420.dtsi                  |   5 +-
 arch/arm/kernel/kprobes-test-arm.c                 |  30 ++--
 arch/arm/kernel/kprobes-test.c                     |  10 ++
 arch/arm/kernel/probes-arm.c                       |   6 +-
 arch/arm/mach-exynos/exynos.c                      |   8 +-
 arch/arm/mach-exynos/firmware.c                    |   9 +-
 arch/arm/mach-exynos/pm_domains.c                  |  61 +++++++-
 arch/arm/mach-imx/clk-gate2.c                      |  31 +++-
 arch/arm/mach-omap2/clkt_dpll.c                    |   2 +-
 arch/arm/mach-omap2/cm-regbits-34xx.h              |   3 +
 arch/arm/mach-omap2/common.h                       |   3 +-
 arch/arm/mach-omap2/devices.c                      |  28 ----
 arch/arm/mach-omap2/dsp.c                          |  10 ++
 arch/arm/mach-omap2/gpmc.c                         |   2 +-
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c          |  18 ++-
 arch/arm/mach-omap2/prm-regbits-34xx.h             |   6 +
 arch/arm/mm/cache-l2x0.c                           |   2 +-
 arch/arm64/include/asm/memory.h                    |   2 +
 arch/arm64/mm/copypage.c                           |   2 +
 arch/m68k/kernel/head.S                            |   3 +-
 arch/m68k/kernel/time.c                            |   2 +
 arch/parisc/kernel/hardware.c                      |   3 +-
 arch/parisc/kernel/sys_parisc32.c                  |  46 ++----
 arch/parisc/kernel/syscall_table.S                 |   2 +-
 arch/powerpc/Kconfig                               |   3 +-
 arch/powerpc/include/asm/mmu.h                     |  10 +-
 arch/powerpc/include/asm/perf_event_server.h       |   3 +-
 arch/powerpc/kernel/idle_power7.S                  |   2 +-
 arch/powerpc/kvm/book3s_hv_interrupts.S            |   5 -
 arch/powerpc/mm/mmu_context_nohash.c               |  12 +-
 arch/powerpc/perf/core-book3s.c                    |  26 +++-
 arch/powerpc/perf/power8-pmu.c                     |   2 +-
 arch/powerpc/platforms/cell/spu_syscalls.c         |   2 +
 arch/powerpc/platforms/cell/spufs/Makefile         |   3 +-
 arch/powerpc/platforms/cell/spufs/syscalls.c       |   6 +-
 arch/x86/vdso/vdso2c.h                             |   3 +
 arch/x86/vdso/vma.c                                |   4 +
 drivers/acpi/ac.c                                  | 130 +++++++++++++++-
 drivers/acpi/acpi_pnp.c                            |   2 +
 drivers/acpi/battery.c                             |  41 +++++-
 drivers/acpi/ec.c                                  | 164 +++++++++++----------
 drivers/acpi/resource.c                            |  10 +-
 drivers/acpi/video.c                               |  11 +-
 drivers/acpi/video_detect.c                        |   8 +
 drivers/char/i8k.c                                 |   4 +-
 drivers/clk/clk-s2mps11.c                          |   7 +-
 drivers/clk/qcom/mmcc-msm8960.c                    |   2 +-
 drivers/clk/samsung/clk-exynos4.c                  |  16 +-
 drivers/clk/samsung/clk-exynos5250.c               |   2 +-
 drivers/clk/samsung/clk-exynos5420.c               |  91 ++++++++----
 drivers/clk/samsung/clk-s3c2410.c                  |   9 +-
 drivers/clk/samsung/clk-s3c64xx.c                  |   6 +-
 drivers/clk/spear/spear3xx_clock.c                 |  16 +-
 drivers/clk/sunxi/clk-sun6i-apb0-gates.c           |   2 +-
 drivers/clk/ti/apll.c                              |   8 +-
 drivers/clk/ti/dpll.c                              |   5 +-
 drivers/clk/ti/mux.c                               |   2 +-
 drivers/clocksource/exynos_mct.c                   |  20 ++-
 drivers/cpufreq/Makefile                           |   2 +-
 drivers/cpufreq/intel_pstate.c                     |  35 +++--
 drivers/dma/cppi41.c                               |  13 +-
 drivers/dma/imx-sdma.c                             |  22 ++-
 drivers/gpu/drm/i915/i915_dma.c                    |   5 +-
 drivers/gpu/drm/i915/i915_drv.h                    |   1 +
 drivers/gpu/drm/i915/i915_gem_stolen.c             |  44 ++++++
 drivers/gpu/drm/i915/i915_reg.h                    |   3 +
 drivers/gpu/drm/i915/intel_display.c               |  14 ++
 drivers/gpu/drm/i915/intel_dp.c                    |  42 ++++++
 drivers/gpu/drm/i915/intel_drv.h                   |   2 +
 drivers/gpu/drm/i915/intel_dsi.c                   |  29 ++--
 drivers/gpu/drm/i915/intel_dsi_cmd.c               |   6 -
 drivers/gpu/drm/i915/intel_opregion.c              |   9 ++
 drivers/gpu/drm/i915/intel_panel.c                 |   8 +-
 drivers/gpu/drm/nouveau/core/engine/disp/nv50.c    |   6 +-
 drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c    |   6 +-
 drivers/gpu/drm/nouveau/core/engine/disp/outpdp.c  |   8 +-
 drivers/gpu/drm/nouveau/core/engine/disp/sornv50.c |   1 +
 drivers/gpu/drm/nouveau/core/subdev/fb/ramfuc.h    |   4 +-
 drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c   |   1 +
 drivers/gpu/drm/nouveau/nouveau_drm.c              |  17 ++-
 drivers/gpu/drm/nouveau/nouveau_fbcon.c            |  13 +-
 drivers/gpu/drm/nouveau/nouveau_fbcon.h            |   1 -
 drivers/gpu/drm/nouveau/nv50_display.c             |   3 +-
 drivers/gpu/drm/radeon/atombios_dp.c               |   2 +-
 drivers/gpu/drm/radeon/ci_dpm.c                    |   2 +-
 drivers/gpu/drm/radeon/cik.c                       |   6 +-
 drivers/gpu/drm/radeon/evergreen.c                 |  14 +-
 drivers/gpu/drm/radeon/rv770_dpm.c                 |   6 -
 drivers/gpu/drm/radeon/si.c                        |   6 +-
 drivers/hv/connection.c                            |   8 +-
 drivers/hv/hv_kvp.c                                |  17 ++-
 drivers/hv/hv_util.c                               |   2 +-
 drivers/iio/accel/hid-sensor-accel-3d.c            |   7 +-
 drivers/iio/adc/ti_am335x_adc.c                    |   2 +-
 drivers/iio/gyro/hid-sensor-gyro-3d.c              |   7 +-
 drivers/iio/light/hid-sensor-als.c                 |   7 +-
 drivers/iio/light/hid-sensor-prox.c                |   7 +-
 drivers/iio/light/tcs3472.c                        |  11 +-
 drivers/iio/magnetometer/hid-sensor-magn-3d.c      |   7 +-
 drivers/iio/pressure/hid-sensor-press.c            |   7 +-
 drivers/md/dm-crypt.c                              |   4 +-
 drivers/md/dm-io.c                                 |  22 +--
 drivers/md/dm-mpath.c                              |   5 +-
 drivers/md/dm-zero.c                               |   4 +-
 drivers/md/dm.c                                    |  15 +-
 drivers/phy/Kconfig                                |   1 +
 drivers/phy/phy-core.c                             |   7 +-
 drivers/phy/phy-omap-usb2.c                        |  11 +-
 drivers/phy/phy-samsung-usb2.c                     |   1 +
 drivers/tty/serial/arc_uart.c                      |   2 +-
 drivers/tty/serial/imx.c                           |   3 +
 drivers/tty/serial/ip22zilog.c                     |   2 +
 drivers/tty/serial/m32r_sio.c                      |   8 +-
 drivers/tty/serial/pmac_zilog.c                    |   3 +
 drivers/tty/serial/sunsab.c                        |   3 +
 drivers/tty/serial/sunzilog.c                      |   2 +
 drivers/usb/serial/cp210x.c                        |   1 +
 drivers/usb/serial/ftdi_sio.c                      |   5 +-
 drivers/usb/serial/ftdi_sio_ids.h                  |   9 +-
 drivers/usb/serial/option.c                        |   2 +
 firmware/Makefile                                  |   6 +
 fs/ext4/extents_status.c                           |   4 +-
 fs/ext4/ialloc.c                                   |  16 +-
 fs/ext4/mballoc.c                                  |   4 +-
 fs/ext4/super.c                                    |  60 ++++----
 fs/jbd2/transaction.c                              |   5 +-
 fs/nfsd/nfs4xdr.c                                  |   2 +-
 include/acpi/video.h                               |   2 +
 include/dt-bindings/clock/exynos5420.h             |   3 +-
 scripts/kernel-doc                                 |  15 +-
 sound/soc/fsl/imx-pcm-dma.c                        |   1 -
 156 files changed, 1247 insertions(+), 631 deletions(-)
 rename Documentation/laptops/{hpfall.c => freefall.c} (64%)
Merging fixes/master (1795cd9b3a91 Linux 3.16-rc5)
$ git merge fixes/master
Already up-to-date.
Merging kbuild-current/rc-fixes (dd5a6752ae7d firmware: Create directories for external firmware)
$ git merge kbuild-current/rc-fixes
Already up-to-date.
Merging arc-current/for-curr (89ca3b881987 Linux 3.15-rc4)
$ git merge arc-current/for-curr
Already up-to-date.
Merging arm-current/fixes (cda390bb8f0f Merge branch 'kprobes-test-fixes' of git://git.linaro.org/people/tixy/kernel into fixes)
$ git merge arm-current/fixes
Already up-to-date.
Merging m68k-current/for-linus (5bc8c7cdeb6e m68k: Export mach_random_get_entropy to modules)
$ git merge m68k-current/for-linus
Already up-to-date.
Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX)
$ git merge metag-fixes/fixes
Already up-to-date.
Merging powerpc-merge/merge (f56029410a13 powerpc/perf: Never program book3s PMCs with values >= 0x80000000)
$ git merge powerpc-merge/merge
Already up-to-date.
Merging sparc/master (894e552cfaa3 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security)
$ git merge sparc/master
Already up-to-date.
Merging net/master (999417549c16 tipc: clear 'next'-pointer of message fragments before reassembly)
$ git merge net/master
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                        |   3 +-
 arch/powerpc/net/bpf_jit_comp.c                    |  10 +-
 drivers/bluetooth/ath3k.c                          |   2 -
 drivers/bluetooth/btusb.c                          |   1 -
 drivers/bluetooth/hci_h5.c                         |   1 +
 drivers/isdn/hisax/l3ni1.c                         |  14 ++-
 drivers/net/ethernet/broadcom/bcmsysport.c         |  43 ++------
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c    |   3 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   |   2 +-
 drivers/net/ethernet/broadcom/genet/bcmgenet.c     |  16 ++-
 drivers/net/ethernet/emulex/benet/be_main.c        |   2 +-
 drivers/net/ethernet/freescale/ucc_geth.c          |   4 +-
 drivers/net/ethernet/intel/igb/e1000_82575.c       |   7 ++
 drivers/net/ethernet/intel/igb/e1000_defines.h     |  18 ++--
 drivers/net/ethernet/intel/igb/e1000_hw.h          |   3 +
 drivers/net/ethernet/intel/igb/e1000_i210.c        |  66 ++++++++++++
 drivers/net/ethernet/intel/igb/e1000_i210.h        |  12 +++
 drivers/net/ethernet/intel/igb/e1000_regs.h        |   1 +
 drivers/net/ethernet/intel/igb/igb_main.c          |  16 +++
 drivers/net/ethernet/marvell/mvneta.c              |   4 +-
 drivers/net/ethernet/mellanox/mlx4/cq.c            |   2 -
 drivers/net/ethernet/mellanox/mlx4/en_cq.c         |   7 +-
 drivers/net/ethernet/mellanox/mlx4/en_ethtool.c    |   7 ++
 drivers/net/ethernet/mellanox/mlx4/en_netdev.c     |   3 +-
 drivers/net/ethernet/mellanox/mlx4/en_rx.c         |  16 ++-
 drivers/net/ethernet/mellanox/mlx4/en_tx.c         |  34 +++----
 drivers/net/ethernet/mellanox/mlx4/eq.c            |  69 ++-----------
 drivers/net/ethernet/mellanox/mlx4/mlx4_en.h       |   4 +
 drivers/net/ethernet/realtek/r8169.c               |  25 +++++
 .../net/ethernet/stmicro/stmmac/dwmac1000_core.c   |   5 +-
 drivers/net/ethernet/stmicro/stmmac/enh_desc.c     |   2 +-
 drivers/net/fddi/defxx.c                           |  17 ++--
 drivers/net/phy/dp83640.c                          |   6 +-
 drivers/net/phy/mdio_bus.c                         |  44 ++++++++
 drivers/net/usb/qmi_wwan.c                         |   1 +
 drivers/net/usb/r8152.c                            |   7 +-
 drivers/net/usb/smsc95xx.c                         |  14 ++-
 drivers/net/wan/farsync.c                          | 112 +++++++++++----------
 drivers/net/wireless/ath/ath10k/core.c             |   6 +-
 drivers/net/wireless/ath/ath10k/htt_rx.c           |  18 ----
 drivers/net/wireless/brcm80211/brcmfmac/usb.c      |   5 +-
 drivers/net/wireless/iwlwifi/dvm/rxon.c            |  12 ---
 drivers/net/wireless/iwlwifi/iwl-fw.h              |   1 +
 drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c        |   5 +-
 drivers/net/wireless/iwlwifi/mvm/mac80211.c        |  19 ++--
 drivers/net/wireless/iwlwifi/mvm/scan.c            |  65 ++++--------
 drivers/net/wireless/iwlwifi/pcie/drv.c            |   3 +-
 drivers/net/wireless/mwifiex/11n_aggr.c            |   1 +
 drivers/net/wireless/mwifiex/cfg80211.c            |   1 +
 drivers/net/wireless/mwifiex/cmdevt.c              |   1 +
 drivers/net/wireless/mwifiex/main.c                |   1 +
 drivers/net/wireless/mwifiex/sta_tx.c              |   1 +
 drivers/net/wireless/mwifiex/tdls.c                |   2 +
 drivers/net/wireless/mwifiex/txrx.c                |   1 +
 drivers/net/wireless/mwifiex/uap_txrx.c            |   1 +
 drivers/net/wireless/rt2x00/rt2800usb.c            |  28 ++++--
 drivers/net/xen-netfront.c                         |  27 +++--
 drivers/of/of_mdio.c                               |  34 -------
 include/linux/mlx4/device.h                        |   4 +-
 include/linux/of_mdio.h                            |   8 --
 include/net/netns/ieee802154_6lowpan.h             |   2 +-
 include/net/sock.h                                 |  12 +--
 lib/cpumask.c                                      |   2 +-
 net/8021q/vlan_dev.c                               |  13 ++-
 net/appletalk/ddp.c                                |   3 -
 net/bluetooth/hci_conn.c                           |  12 ++-
 net/bluetooth/smp.c                                |  60 ++++++++---
 net/core/dev.c                                     |  30 +++---
 net/ipv4/gre_demux.c                               |   1 +
 net/ipv4/icmp.c                                    |   2 -
 net/ipv4/igmp.c                                    |  10 +-
 net/ipv4/ip_tunnel.c                               |  12 ++-
 net/ipv4/route.c                                   |  15 +--
 net/ipv4/tcp.c                                     |   3 +-
 net/ipv4/tcp_input.c                               |   8 +-
 net/ipv4/tcp_output.c                              |   6 +-
 net/ipv4/udp.c                                     |   5 +-
 net/ipv6/mcast.c                                   |  13 ++-
 net/ipv6/udp.c                                     |   6 +-
 net/mac80211/util.c                                |   5 +-
 net/netlink/af_netlink.c                           |   4 +-
 net/openvswitch/actions.c                          |   2 +
 net/openvswitch/datapath.c                         |  27 +++--
 net/openvswitch/flow.c                             |   4 +-
 net/openvswitch/flow.h                             |   5 +-
 net/openvswitch/flow_table.c                       |  16 +++
 net/openvswitch/flow_table.h                       |   3 +-
 net/openvswitch/vport-gre.c                        |  17 ++++
 net/tipc/bcast.c                                   |   1 +
 net/tipc/msg.c                                     |  11 +-
 net/wireless/core.h                                |   2 +-
 net/wireless/nl80211.c                             |  11 +-
 net/wireless/reg.c                                 |  22 ++--
 93 files changed, 691 insertions(+), 501 deletions(-)
Merging ipsec/master (a0e5ef53aac8 xfrm: Fix installation of AH IPsec SAs)
$ git merge ipsec/master
Merge made by the 'recursive' strategy.
 net/xfrm/xfrm_policy.c | 2 ++
 net/xfrm/xfrm_user.c   | 7 +++----
 2 files changed, 5 insertions(+), 4 deletions(-)
Merging sound-current/for-linus (91947d8cc553 ALSA: hda - Add new GPU codec ID 0x10de0070 to snd-hda)
$ git merge sound-current/for-linus
Merge made by the 'recursive' strategy.
 sound/pci/hda/hda_tegra.c  | 2 +-
 sound/pci/hda/patch_hdmi.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
Merging pci-current/for-linus (bf177a1eb6d1 MAINTAINERS: Update mx6 PCI driver maintainer's email)
$ git merge pci-current/for-linus
Already up-to-date.
Merging wireless/master (2c4db12ec469 rt2800usb: Don't perform DMA from stack)
$ git merge wireless/master
Already up-to-date.
Merging driver-core.current/driver-core-linus (aff008ad813c platform_get_irq: Revert to platform_get_resource if of_irq_get fails)
$ git merge driver-core.current/driver-core-linus
Merge made by the 'recursive' strategy.
 drivers/base/platform.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
Merging tty.current/tty-linus (1795cd9b3a91 Linux 3.16-rc5)
$ git merge tty.current/tty-linus
Already up-to-date.
Merging usb.current/usb-linus (1795cd9b3a91 Linux 3.16-rc5)
$ git merge usb.current/usb-linus
Already up-to-date.
Merging usb-gadget-fixes/fixes (8035691365b8 usb: musb: dsps: fix the base address for accessing the mode register)
$ git merge usb-gadget-fixes/fixes
Already up-to-date.
Merging usb-serial-fixes/usb-linus (3d28bd840b2d usb: option: Add ID for Telewell TW-LTE 4G v2)
$ git merge usb-serial-fixes/usb-linus
Already up-to-date.
Merging staging.current/staging-linus (9359003385a2 Merge tag 'iio-fixes-for-3.16d' 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/mma8452.c      | 8 +++++++-
 drivers/iio/industrialio-event.c | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)
Merging char-misc.current/char-misc-linus (1795cd9b3a91 Linux 3.16-rc5)
$ git merge char-misc.current/char-misc-linus
Already up-to-date.
Merging input-current/for-linus (31972f6e517d Input: ti_am335x_tsc - warn about incorrect spelling)
$ git merge input-current/for-linus
Merge made by the 'recursive' strategy.
 drivers/input/tablet/wacom_wac.c          | 28 +++++++---------------------
 drivers/input/touchscreen/ti_am335x_tsc.c |  5 ++++-
 2 files changed, 11 insertions(+), 22 deletions(-)
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 (0378c9a855bf crypto: caam - fix memleak in caam_jr module)
$ git merge crypto-current/master
Already up-to-date.
Merging ide/master (5b40dd30bbfa ide: Fix SC1200 dependencies)
$ git merge ide/master
Merge made by the 'recursive' strategy.
 drivers/ide/Kconfig     | 5 ++++-
 drivers/ide/ide-probe.c | 8 +++++---
 2 files changed, 9 insertions(+), 4 deletions(-)
Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
$ git merge dwmw2/master
Already up-to-date.
Merging devicetree-current/devicetree/merge (356facff5275 of/platform: Fix of_platform_device_destroy iteration of devices)
$ git merge devicetree-current/devicetree/merge
Merge made by the 'recursive' strategy.
 drivers/of/platform.c       | 32 +++++++++-----------------------
 include/linux/of.h          |  1 +
 include/linux/of_platform.h |  7 ++-----
 3 files changed, 12 insertions(+), 28 deletions(-)
Merging rr-fixes/fixes (79465d2fd48e module: remove warning about waiting module removal.)
$ 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 (e7067c16c0a1 drm/i915: Ignore VBT backlight presence check on HP Chromebook 14)
$ git merge drm-intel-fixes/for-linux-next-fixes
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/i915/intel_display.c | 3 +++
 drivers/gpu/drm/i915/intel_lvds.c    | 7 +++++++
 drivers/gpu/drm/i915/intel_panel.c   | 8 ++++----
 3 files changed, 14 insertions(+), 4 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 (4c834452aad0 Linux 3.16-rc3)
$ git merge arc/for-next
Already up-to-date.
Merging arm/for-next (368629cb0c2a Merge branch 'devel-stable' into for-next)
$ git merge arm/for-next
Auto-merging arch/arm/boot/compressed/vmlinux.lds.S
Merge made by the 'recursive' strategy.
 arch/arm/Makefile                                  |   3 +
 arch/arm/boot/compressed/Makefile                  |   5 +-
 arch/arm/boot/compressed/head.S                    |   8 +-
 .../compressed/{vmlinux.lds.in => vmlinux.lds.S}   |  17 +-
 arch/arm/common/mcpm_entry.c                       |  52 ++
 arch/arm/crypto/aes-armv4.S                        |   3 +-
 arch/arm/include/asm/assembler.h                   |  29 +-
 arch/arm/include/asm/cputype.h                     |  37 +-
 arch/arm/include/asm/entry-macro-multi.S           |   2 +-
 arch/arm/include/asm/mcpm.h                        |  16 +
 arch/arm/include/asm/perf_event.h                  |   9 -
 arch/arm/include/asm/pmu.h                         |  19 +
 arch/arm/include/asm/ptrace.h                      |   6 +
 arch/arm/include/asm/smp_scu.h                     |   2 +-
 arch/arm/include/asm/stacktrace.h                  |  15 +
 arch/arm/include/asm/thread_info.h                 |   3 +-
 arch/arm/include/asm/uaccess.h                     |  20 +-
 arch/arm/include/asm/unistd.h                      |  10 +
 arch/arm/include/uapi/asm/unistd.h                 |  11 -
 arch/arm/kernel/debug.S                            |  10 +-
 arch/arm/kernel/entry-armv.S                       |  42 +-
 arch/arm/kernel/entry-common.S                     |  13 +-
 arch/arm/kernel/entry-header.S                     |  14 -
 arch/arm/kernel/fiqasm.S                           |   4 +-
 arch/arm/kernel/head-common.S                      |   7 +-
 arch/arm/kernel/head-nommu.S                       |   8 +-
 arch/arm/kernel/head.S                             |  18 +-
 arch/arm/kernel/hyp-stub.S                         |   6 +-
 arch/arm/kernel/iwmmxt.S                           |  10 +-
 arch/arm/kernel/perf_event.c                       |  18 +-
 arch/arm/kernel/perf_event_cpu.c                   |  66 +-
 arch/arm/kernel/perf_event_v6.c                    | 307 ++-----
 arch/arm/kernel/perf_event_v7.c                    | 967 +++++----------------
 arch/arm/kernel/perf_event_xscale.c                | 121 +--
 arch/arm/kernel/relocate_kernel.S                  |   3 +-
 arch/arm/kernel/setup.c                            |  29 +-
 arch/arm/kernel/sleep.S                            |   2 +-
 arch/arm/kernel/swp_emulate.c                      |   4 +
 arch/arm/kernel/time.c                             |   5 +-
 arch/arm/kernel/traps.c                            |   6 +-
 arch/arm/kernel/unwind.c                           |   8 +-
 arch/arm/kernel/vmlinux.lds.S                      |   1 -
 arch/arm/kvm/guest.c                               |   8 +-
 arch/arm/kvm/init.S                                |   3 +-
 arch/arm/lib/ashldi3.S                             |   3 +-
 arch/arm/lib/ashrdi3.S                             |   3 +-
 arch/arm/lib/backtrace.S                           |   2 +-
 arch/arm/lib/bitops.h                              |   5 +-
 arch/arm/lib/bswapsdi2.S                           |   5 +-
 arch/arm/lib/call_with_stack.S                     |   4 +-
 arch/arm/lib/csumpartial.S                         |   2 +-
 arch/arm/lib/csumpartialcopygeneric.S              |   5 +-
 arch/arm/lib/delay-loop.S                          |  18 +-
 arch/arm/lib/div64.S                               |  13 +-
 arch/arm/lib/findbit.S                             |  10 +-
 arch/arm/lib/getuser.S                             |  45 +-
 arch/arm/lib/io-readsb.S                           |   2 +-
 arch/arm/lib/io-readsl.S                           |   6 +-
 arch/arm/lib/io-readsw-armv3.S                     |   4 +-
 arch/arm/lib/io-readsw-armv4.S                     |   2 +-
 arch/arm/lib/io-writesb.S                          |   2 +-
 arch/arm/lib/io-writesl.S                          |  10 +-
 arch/arm/lib/io-writesw-armv3.S                    |   4 +-
 arch/arm/lib/io-writesw-armv4.S                    |   4 +-
 arch/arm/lib/lib1funcs.S                           |  26 +-
 arch/arm/lib/lshrdi3.S                             |   3 +-
 arch/arm/lib/memchr.S                              |   2 +-
 arch/arm/lib/memset.S                              |   2 +-
 arch/arm/lib/memzero.S                             |   2 +-
 arch/arm/lib/muldi3.S                              |   3 +-
 arch/arm/lib/putuser.S                             |  10 +-
 arch/arm/lib/strchr.S                              |   2 +-
 arch/arm/lib/strrchr.S                             |   2 +-
 arch/arm/lib/ucmpdi2.S                             |   5 +-
 arch/arm/mach-davinci/sleep.S                      |   2 +-
 arch/arm/mach-ep93xx/crunch-bits.S                 |   6 +-
 arch/arm/mach-exynos/mcpm-exynos.c                 |  17 +-
 arch/arm/mach-exynos/platsmp.c                     |   4 +-
 arch/arm/mach-exynos/pm.c                          |  11 +-
 arch/arm/mach-imx/suspend-imx6.S                   |   5 +-
 arch/arm/mach-mvebu/coherency_ll.S                 |  10 +-
 arch/arm/mach-mvebu/headsmp-a9.S                   |   3 +-
 arch/arm/mach-omap2/sleep44xx.S                    |   3 +-
 arch/arm/mach-omap2/sram242x.S                     |   6 +-
 arch/arm/mach-omap2/sram243x.S                     |   6 +-
 arch/arm/mach-pxa/mioa701_bootresume.S             |   2 +-
 arch/arm/mach-pxa/standby.S                        |   4 +-
 arch/arm/mach-s3c24xx/sleep-s3c2410.S              |   2 +-
 arch/arm/mach-s3c24xx/sleep-s3c2412.S              |   2 +-
 arch/arm/mach-shmobile/headsmp.S                   |   3 +-
 arch/arm/mach-tegra/sleep-tegra20.S                |  24 +-
 arch/arm/mach-tegra/sleep-tegra30.S                |  14 +-
 arch/arm/mach-tegra/sleep.S                        |   8 +-
 arch/arm/mach-vexpress/tc2_pm.c                    |  19 +-
 arch/arm/mm/Kconfig                                |   9 +-
 arch/arm/mm/alignment.c                            |   4 +-
 arch/arm/mm/cache-fa.S                             |  19 +-
 arch/arm/mm/cache-l2x0.c                           |   2 +-
 arch/arm/mm/cache-nop.S                            |   5 +-
 arch/arm/mm/cache-v4.S                             |  13 +-
 arch/arm/mm/cache-v4wb.S                           |  15 +-
 arch/arm/mm/cache-v4wt.S                           |  13 +-
 arch/arm/mm/cache-v6.S                             |  20 +-
 arch/arm/mm/cache-v7.S                             |  30 +-
 arch/arm/mm/l2c-l2x0-resume.S                      |   7 +-
 arch/arm/mm/proc-arm1020.S                         |  34 +-
 arch/arm/mm/proc-arm1020e.S                        |  34 +-
 arch/arm/mm/proc-arm1022.S                         |  34 +-
 arch/arm/mm/proc-arm1026.S                         |  34 +-
 arch/arm/mm/proc-arm720.S                          |  16 +-
 arch/arm/mm/proc-arm740.S                          |   8 +-
 arch/arm/mm/proc-arm7tdmi.S                        |   8 +-
 arch/arm/mm/proc-arm920.S                          |  34 +-
 arch/arm/mm/proc-arm922.S                          |  34 +-
 arch/arm/mm/proc-arm925.S                          |  34 +-
 arch/arm/mm/proc-arm926.S                          |  34 +-
 arch/arm/mm/proc-arm940.S                          |  24 +-
 arch/arm/mm/proc-arm946.S                          |  30 +-
 arch/arm/mm/proc-arm9tdmi.S                        |   8 +-
 arch/arm/mm/proc-fa526.S                           |  16 +-
 arch/arm/mm/proc-feroceon.S                        |  44 +-
 arch/arm/mm/proc-mohawk.S                          |  34 +-
 arch/arm/mm/proc-sa110.S                           |  16 +-
 arch/arm/mm/proc-sa1100.S                          |  16 +-
 arch/arm/mm/proc-v6.S                              |  16 +-
 arch/arm/mm/proc-v7-2level.S                       |   4 +-
 arch/arm/mm/proc-v7-3level.S                       |   5 +-
 arch/arm/mm/proc-v7.S                              |  26 +-
 arch/arm/mm/proc-v7m.S                             |  18 +-
 arch/arm/mm/proc-xsc3.S                            |  32 +-
 arch/arm/mm/proc-xscale.S                          |  34 +-
 arch/arm/mm/tlb-fa.S                               |   7 +-
 arch/arm/mm/tlb-v4.S                               |   5 +-
 arch/arm/mm/tlb-v4wb.S                             |   7 +-
 arch/arm/mm/tlb-v4wbi.S                            |   7 +-
 arch/arm/mm/tlb-v6.S                               |   5 +-
 arch/arm/mm/tlb-v7.S                               |   4 +-
 arch/arm/nwfpe/entry.S                             |   8 +-
 arch/arm/oprofile/common.c                         |  19 +-
 arch/arm/plat-omap/dma.c                           |   2 +
 arch/arm/vfp/entry.S                               |   4 +-
 arch/arm/vfp/vfphw.S                               |  26 +-
 arch/arm/xen/hypercall.S                           |   6 +-
 drivers/clocksource/arm_global_timer.c             |   2 +-
 144 files changed, 1335 insertions(+), 1835 deletions(-)
 rename arch/arm/boot/compressed/{vmlinux.lds.in => vmlinux.lds.S} (81%)
Merging arm-perf/for-next/perf (4b2974fa6a4a ARM: perf: disable the pagefault handler when reading from user space)
$ git merge arm-perf/for-next/perf
Already up-to-date.
Merging arm-soc/for-next (de5763f46353 arm-soc: document merges)
$ git merge arm-soc/for-next
Resolved 'arch/arm/mach-shmobile/headsmp.S' using previous resolution.
Removing include/linux/atmel_pwm.h
Removing include/linux/atmel-pwm-bl.h
Auto-merging drivers/video/fbdev/amba-clcd-versatile.c
Removing drivers/video/backlight/atmel-pwm-bl.c
Removing drivers/misc/atmel_pwm.c
Removing drivers/leds/leds-atmel-pwm.c
Auto-merging drivers/clk/versatile/clk-versatile.c
Auto-merging arch/arm/mach-shmobile/sh7372.h
Auto-merging arch/arm/mach-shmobile/rcar-gen2.h
Auto-merging arch/arm/mach-shmobile/r8a7791.h
Auto-merging arch/arm/mach-shmobile/r8a7790.h
Auto-merging arch/arm/mach-shmobile/r8a7779.h
Auto-merging arch/arm/mach-shmobile/r8a7740.h
Auto-merging arch/arm/mach-shmobile/r7s72100.h
Auto-merging arch/arm/mach-shmobile/headsmp.S
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/headsmp.S
Auto-merging arch/arm/mach-shmobile/common.h
Removing arch/arm/mach-s5pc100/setup-spi.c
Removing arch/arm/mach-s5pc100/setup-sdhci-gpio.c
Removing arch/arm/mach-s5pc100/setup-keypad.c
Removing arch/arm/mach-s5pc100/setup-ide.c
Removing arch/arm/mach-s5pc100/setup-i2c1.c
Removing arch/arm/mach-s5pc100/setup-i2c0.c
Removing arch/arm/mach-s5pc100/setup-fb-24bpp.c
Removing arch/arm/mach-s5pc100/mach-smdkc100.c
Removing arch/arm/mach-s5pc100/include/mach/regs-irq.h
Removing arch/arm/mach-s5pc100/include/mach/regs-gpio.h
Removing arch/arm/mach-s5pc100/include/mach/regs-clock.h
Removing arch/arm/mach-s5pc100/include/mach/map.h
Removing arch/arm/mach-s5pc100/include/mach/irqs.h
Removing arch/arm/mach-s5pc100/include/mach/hardware.h
Removing arch/arm/mach-s5pc100/include/mach/gpio.h
Removing arch/arm/mach-s5pc100/include/mach/entry-macro.S
Removing arch/arm/mach-s5pc100/include/mach/dma.h
Removing arch/arm/mach-s5pc100/include/mach/debug-macro.S
Removing arch/arm/mach-s5pc100/dma.c
Removing arch/arm/mach-s5pc100/dev-audio.c
Removing arch/arm/mach-s5pc100/common.h
Removing arch/arm/mach-s5pc100/common.c
Removing arch/arm/mach-s5pc100/clock.c
Removing arch/arm/mach-s5pc100/Makefile.boot
Removing arch/arm/mach-s5pc100/Makefile
Removing arch/arm/mach-s5pc100/Kconfig
Removing arch/arm/mach-s5p64x0/setup-spi.c
Removing arch/arm/mach-s5p64x0/setup-sdhci-gpio.c
Removing arch/arm/mach-s5p64x0/setup-i2c1.c
Removing arch/arm/mach-s5p64x0/setup-i2c0.c
Removing arch/arm/mach-s5p64x0/setup-fb-24bpp.c
Removing arch/arm/mach-s5p64x0/pm.c
Removing arch/arm/mach-s5p64x0/mach-smdk6450.c
Removing arch/arm/mach-s5p64x0/mach-smdk6440.c
Removing arch/arm/mach-s5p64x0/irq-pm.c
Removing arch/arm/mach-s5p64x0/include/mach/regs-irq.h
Removing arch/arm/mach-s5p64x0/include/mach/regs-gpio.h
Removing arch/arm/mach-s5p64x0/include/mach/regs-clock.h
Removing arch/arm/mach-s5p64x0/include/mach/pm-core.h
Removing arch/arm/mach-s5p64x0/include/mach/map.h
Removing arch/arm/mach-s5p64x0/include/mach/irqs.h
Removing arch/arm/mach-s5p64x0/include/mach/hardware.h
Removing arch/arm/mach-s5p64x0/include/mach/gpio.h
Removing arch/arm/mach-s5p64x0/include/mach/dma.h
Removing arch/arm/mach-s5p64x0/include/mach/debug-macro.S
Removing arch/arm/mach-s5p64x0/i2c.h
Removing arch/arm/mach-s5p64x0/dma.c
Removing arch/arm/mach-s5p64x0/dev-audio.c
Removing arch/arm/mach-s5p64x0/common.h
Removing arch/arm/mach-s5p64x0/common.c
Removing arch/arm/mach-s5p64x0/clock.h
Removing arch/arm/mach-s5p64x0/clock.c
Removing arch/arm/mach-s5p64x0/clock-s5p6450.c
Removing arch/arm/mach-s5p64x0/clock-s5p6440.c
Removing arch/arm/mach-s5p64x0/Makefile.boot
Removing arch/arm/mach-s5p64x0/Makefile
Removing arch/arm/mach-s5p64x0/Kconfig
Removing arch/arm/mach-mvebu/hotplug.c
Removing arch/arm/mach-integrator/include/mach/memory.h
Removing arch/arm/mach-clps711x/include/mach/debug-macro.S
Removing arch/arm/configs/s5pc100_defconfig
Removing arch/arm/configs/s5p64x0_defconfig
Removing arch/arm/boot/dts/r8a7779-marzen-reference.dts
Auto-merging arch/arm/Makefile
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 7584404944e0] Merge remote-tracking branch 'arm-soc/for-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/arm/Marvell/README                   |    4 +-
 Documentation/arm/Samsung/Overview.txt             |   11 -
 .../arm/Samsung/clksrc-change-registers.awk        |    1 -
 Documentation/devicetree/bindings/arm/arm-boards   |    6 +
 .../devicetree/bindings/arm/atmel-pmc.txt          |    5 +-
 .../arm/cpu-enable-method/marvell,berlin-smp       |   41 +
 .../devicetree/bindings/arm/marvell,berlin.txt     |   16 +
 .../devicetree/bindings/clock/arm-integrator.txt   |    4 +-
 .../devicetree/bindings/spi/spi-samsung.txt        |    1 -
 .../devicetree/bindings/video/samsung-fimd.txt     |    2 -
 arch/arm/Kconfig                                   |   44 +-
 arch/arm/Kconfig.debug                             |    1 +
 arch/arm/Makefile                                  |    2 -
 arch/arm/arm-soc-for-next-contents.txt             |  117 ++
 arch/arm/boot/dts/Makefile                         |    4 +-
 arch/arm/boot/dts/aks-cdu.dts                      |    6 +
 arch/arm/boot/dts/animeo_ip.dts                    |    8 +
 arch/arm/boot/dts/at91-ariag25.dts                 |    8 +
 arch/arm/boot/dts/at91-cosino.dtsi                 |    8 +
 arch/arm/boot/dts/at91-foxg20.dts                  |    8 +
 arch/arm/boot/dts/at91-qil_a9260.dts               |    8 +
 arch/arm/boot/dts/at91-sama5d3_xplained.dts        |   12 +-
 arch/arm/boot/dts/at91rm9200.dtsi                  |  304 +++++
 arch/arm/boot/dts/at91rm9200ek.dts                 |    8 +
 arch/arm/boot/dts/at91sam9260.dtsi                 |  314 ++++-
 arch/arm/boot/dts/at91sam9261.dtsi                 |   20 +-
 arch/arm/boot/dts/at91sam9261ek.dts                |   16 +-
 arch/arm/boot/dts/at91sam9263.dtsi                 |  311 +++++
 arch/arm/boot/dts/at91sam9263ek.dts                |    8 +
 arch/arm/boot/dts/at91sam9g20.dtsi                 |   24 +
 arch/arm/boot/dts/at91sam9g20ek_common.dtsi        |    8 +
 arch/arm/boot/dts/at91sam9g45.dtsi                 |  342 ++++-
 arch/arm/boot/dts/at91sam9m10g45ek.dts             |    8 +
 arch/arm/boot/dts/at91sam9n12.dtsi                 |   20 +-
 arch/arm/boot/dts/at91sam9n12ek.dts                |   18 +-
 arch/arm/boot/dts/at91sam9rl.dtsi                  |   32 +-
 arch/arm/boot/dts/at91sam9rlek.dts                 |   17 +-
 arch/arm/boot/dts/at91sam9x5.dtsi                  |   30 +-
 arch/arm/boot/dts/at91sam9x5cm.dtsi                |   12 +-
 arch/arm/boot/dts/berlin2.dtsi                     |    6 +
 arch/arm/boot/dts/berlin2q-marvell-dmp.dts         |    8 +
 arch/arm/boot/dts/berlin2q.dtsi                    |   80 ++
 arch/arm/boot/dts/emev2.dtsi                       |    2 +
 arch/arm/boot/dts/ethernut5.dts                    |   10 +
 arch/arm/boot/dts/evk-pro3.dts                     |    6 +
 arch/arm/boot/dts/ge863-pro3.dtsi                  |    4 +
 arch/arm/boot/dts/integratorap.dts                 |    1 +
 arch/arm/boot/dts/kizbox.dts                       |    4 +
 arch/arm/boot/dts/mpa1600.dts                      |    8 +
 arch/arm/boot/dts/pm9g45.dts                       |    8 +
 arch/arm/boot/dts/r7s72100.dtsi                    |    1 +
 .../boot/dts/r8a7740-armadillo800eva-reference.dts |   12 +-
 arch/arm/boot/dts/r8a7779-marzen-reference.dts     |  121 --
 arch/arm/boot/dts/r8a7779-marzen.dts               |  116 +-
 arch/arm/boot/dts/r8a7779.dtsi                     |  220 ++++
 arch/arm/boot/dts/r8a7790-lager.dts                |   88 +-
 arch/arm/boot/dts/r8a7790.dtsi                     |  207 ++-
 arch/arm/boot/dts/r8a7791-henninger.dts            |   21 +
 arch/arm/boot/dts/r8a7791-koelsch.dts              |   67 +-
 arch/arm/boot/dts/r8a7791.dtsi                     |  178 ++-
 arch/arm/boot/dts/sama5d3.dtsi                     |   22 +-
 arch/arm/boot/dts/sama5d3xcm.dtsi                  |   12 +-
 arch/arm/boot/dts/sama5d3xmb.dtsi                  |    2 +
 arch/arm/boot/dts/ste-dbx5x0.dtsi                  |   10 +
 arch/arm/boot/dts/ste-href-stuib.dtsi              |    2 +
 arch/arm/boot/dts/ste-href-tvk1281618.dtsi         |   59 +
 arch/arm/boot/dts/ste-hrefv60plus.dtsi             |   24 -
 arch/arm/boot/dts/ste-snowball.dts                 |   38 +-
 arch/arm/boot/dts/tny_a9260_common.dtsi            |    8 +
 arch/arm/boot/dts/tny_a9263.dts                    |    8 +
 arch/arm/boot/dts/usb_a9260_common.dtsi            |    8 +
 arch/arm/boot/dts/usb_a9263.dts                    |    8 +
 arch/arm/boot/dts/versatile-ab.dts                 |   81 +-
 arch/arm/boot/dts/versatile-pb.dts                 |   12 +-
 arch/arm/common/timer-sp.c                         |    4 +-
 arch/arm/configs/armadillo800eva_defconfig         |    4 +
 arch/arm/configs/multi_v5_defconfig                |    2 +
 arch/arm/configs/multi_v7_defconfig                |   11 +-
 arch/arm/configs/mvebu_v5_defconfig                |    2 +
 arch/arm/configs/s5p64x0_defconfig                 |   68 -
 arch/arm/configs/s5pc100_defconfig                 |   49 -
 arch/arm/configs/shmobile_defconfig                |   24 +-
 arch/arm/include/debug/clps711x.S                  |   38 +
 arch/arm/lib/delay.c                               |   26 +-
 arch/arm/mach-at91/Kconfig                         |    4 -
 arch/arm/mach-at91/at91rm9200.c                    |    6 +-
 arch/arm/mach-at91/at91sam9260.c                   |    6 +-
 arch/arm/mach-at91/at91sam9263.c                   |    7 +-
 arch/arm/mach-at91/at91sam9263_devices.c           |   11 +-
 arch/arm/mach-at91/at91sam9g45.c                   |    7 +-
 arch/arm/mach-at91/at91sam9g45_devices.c           |   11 +-
 arch/arm/mach-at91/at91sam9rl.c                    |    1 +
 arch/arm/mach-at91/at91sam9rl_devices.c            |   11 +-
 arch/arm/mach-at91/board-sam9263ek.c               |   55 +-
 arch/arm/mach-at91/board-sam9m10g45ek.c            |   42 +-
 arch/arm/mach-at91/board.h                         |    1 -
 arch/arm/mach-at91/leds.c                          |   37 -
 arch/arm/mach-berlin/Kconfig                       |    3 +
 arch/arm/mach-berlin/Makefile                      |    3 +-
 arch/arm/mach-berlin/headsmp.S                     |   30 +
 arch/arm/mach-berlin/platsmp.c                     |   99 ++
 arch/arm/mach-clps711x/board-autcpu12.c            |    1 -
 arch/arm/mach-clps711x/board-cdb89712.c            |    1 -
 arch/arm/mach-clps711x/board-clep7312.c            |    3 +-
 arch/arm/mach-clps711x/board-edb7211.c             |    8 +-
 arch/arm/mach-clps711x/board-p720t.c               |    1 -
 arch/arm/mach-clps711x/common.c                    |   12 -
 arch/arm/mach-clps711x/common.h                    |    1 -
 arch/arm/mach-clps711x/devices.c                   |   10 +
 arch/arm/mach-clps711x/include/mach/debug-macro.S  |   38 -
 arch/arm/mach-clps711x/include/mach/hardware.h     |    5 +-
 arch/arm/mach-integrator/Kconfig                   |    1 -
 arch/arm/mach-integrator/include/mach/memory.h     |   34 -
 arch/arm/mach-integrator/integrator_ap.c           |   10 +-
 arch/arm/mach-integrator/integrator_cp.c           |   13 +-
 arch/arm/mach-mmp/include/mach/mfp-pxa910.h        |    1 -
 arch/arm/mach-mvebu/Kconfig                        |    7 +
 arch/arm/mach-mvebu/Makefile                       |    2 +-
 arch/arm/mach-mvebu/armada-370-xp.h                |    3 +
 arch/arm/mach-mvebu/board-v7.c                     |   13 +-
 arch/arm/mach-mvebu/board.h                        |    5 +
 arch/arm/mach-mvebu/common.h                       |    3 +-
 arch/arm/mach-mvebu/cpu-reset.c                    |    2 +-
 arch/arm/mach-mvebu/hotplug.c                      |   31 -
 arch/arm/mach-mvebu/kirkwood.c                     |    3 +
 arch/arm/mach-mvebu/mvebu-soc-id.c                 |   21 +-
 arch/arm/mach-mvebu/netxbig.c                      |  191 +++
 arch/arm/mach-mvebu/platsmp-a9.c                   |    5 +-
 arch/arm/mach-mvebu/platsmp.c                      |   48 +
 arch/arm/mach-mvebu/pmsu.c                         |   17 +-
 arch/arm/mach-mvebu/system-controller.c            |   19 +
 arch/arm/mach-pxa/corgi.c                          |    2 +-
 arch/arm/mach-pxa/generic.c                        |   12 +-
 arch/arm/mach-pxa/include/mach/hardware.h          |    4 +-
 arch/arm/mach-pxa/pxa25x.c                         |    7 +-
 arch/arm/mach-pxa/pxa27x.c                         |   10 +-
 arch/arm/mach-pxa/pxa3xx.c                         |    2 +-
 arch/arm/mach-pxa/sleep.S                          |    2 +-
 arch/arm/mach-realview/core.c                      |    2 +-
 arch/arm/mach-s5p64x0/Kconfig                      |  102 --
 arch/arm/mach-s5p64x0/Makefile                     |   36 -
 arch/arm/mach-s5p64x0/Makefile.boot                |    2 -
 arch/arm/mach-s5p64x0/clock-s5p6440.c              |  632 ---------
 arch/arm/mach-s5p64x0/clock-s5p6450.c              |  701 ----------
 arch/arm/mach-s5p64x0/clock.c                      |  236 ----
 arch/arm/mach-s5p64x0/clock.h                      |   38 -
 arch/arm/mach-s5p64x0/common.c                     |  490 -------
 arch/arm/mach-s5p64x0/common.h                     |   56 -
 arch/arm/mach-s5p64x0/dev-audio.c                  |  176 ---
 arch/arm/mach-s5p64x0/dma.c                        |  128 --
 arch/arm/mach-s5p64x0/i2c.h                        |   16 -
 arch/arm/mach-s5p64x0/include/mach/debug-macro.S   |   32 -
 arch/arm/mach-s5p64x0/include/mach/dma.h           |   26 -
 arch/arm/mach-s5p64x0/include/mach/gpio.h          |  132 --
 arch/arm/mach-s5p64x0/include/mach/hardware.h      |   18 -
 arch/arm/mach-s5p64x0/include/mach/irqs.h          |  148 ---
 arch/arm/mach-s5p64x0/include/mach/map.h           |   96 --
 arch/arm/mach-s5p64x0/include/mach/pm-core.h       |  119 --
 arch/arm/mach-s5p64x0/include/mach/regs-clock.h    |   98 --
 arch/arm/mach-s5p64x0/include/mach/regs-gpio.h     |   68 -
 arch/arm/mach-s5p64x0/include/mach/regs-irq.h      |   18 -
 arch/arm/mach-s5p64x0/irq-pm.c                     |   98 --
 arch/arm/mach-s5p64x0/mach-smdk6440.c              |  280 ----
 arch/arm/mach-s5p64x0/mach-smdk6450.c              |  299 -----
 arch/arm/mach-s5p64x0/pm.c                         |  202 ---
 arch/arm/mach-s5p64x0/setup-fb-24bpp.c             |   29 -
 arch/arm/mach-s5p64x0/setup-i2c0.c                 |   38 -
 arch/arm/mach-s5p64x0/setup-i2c1.c                 |   38 -
 arch/arm/mach-s5p64x0/setup-sdhci-gpio.c           |  104 --
 arch/arm/mach-s5p64x0/setup-spi.c                  |   38 -
 arch/arm/mach-s5pc100/Kconfig                      |   81 --
 arch/arm/mach-s5pc100/Makefile                     |   32 -
 arch/arm/mach-s5pc100/Makefile.boot                |    2 -
 arch/arm/mach-s5pc100/clock.c                      | 1361 --------------------
 arch/arm/mach-s5pc100/common.c                     |  255 ----
 arch/arm/mach-s5pc100/common.h                     |   30 -
 arch/arm/mach-s5pc100/dev-audio.c                  |  239 ----
 arch/arm/mach-s5pc100/dma.c                        |  130 --
 arch/arm/mach-s5pc100/include/mach/debug-macro.S   |   39 -
 arch/arm/mach-s5pc100/include/mach/dma.h           |   26 -
 arch/arm/mach-s5pc100/include/mach/entry-macro.S   |   19 -
 arch/arm/mach-s5pc100/include/mach/gpio.h          |  144 ---
 arch/arm/mach-s5pc100/include/mach/hardware.h      |   14 -
 arch/arm/mach-s5pc100/include/mach/irqs.h          |  115 --
 arch/arm/mach-s5pc100/include/mach/map.h           |  137 --
 arch/arm/mach-s5pc100/include/mach/regs-clock.h    |   80 --
 arch/arm/mach-s5pc100/include/mach/regs-gpio.h     |   38 -
 arch/arm/mach-s5pc100/include/mach/regs-irq.h      |   18 -
 arch/arm/mach-s5pc100/mach-smdkc100.c              |  264 ----
 arch/arm/mach-s5pc100/setup-fb-24bpp.c             |   35 -
 arch/arm/mach-s5pc100/setup-i2c0.c                 |   28 -
 arch/arm/mach-s5pc100/setup-i2c1.c                 |   28 -
 arch/arm/mach-s5pc100/setup-ide.c                  |   57 -
 arch/arm/mach-s5pc100/setup-keypad.c               |   23 -
 arch/arm/mach-s5pc100/setup-sdhci-gpio.c           |   70 -
 arch/arm/mach-s5pc100/setup-spi.c                  |   41 -
 arch/arm/mach-shmobile/Kconfig                     |   24 +-
 arch/arm/mach-shmobile/Makefile                    |   23 +-
 arch/arm/mach-shmobile/Makefile.boot               |    1 -
 arch/arm/mach-shmobile/board-ape6evm-reference.c   |    6 +-
 arch/arm/mach-shmobile/board-ape6evm.c             |    8 +-
 .../board-armadillo800eva-reference.c              |   14 +-
 arch/arm/mach-shmobile/board-armadillo800eva.c     |   43 +-
 arch/arm/mach-shmobile/board-bockw-reference.c     |    6 +-
 arch/arm/mach-shmobile/board-bockw.c               |    8 +-
 arch/arm/mach-shmobile/board-genmai-reference.c    |   10 +-
 arch/arm/mach-shmobile/board-genmai.c              |   10 +-
 arch/arm/mach-shmobile/board-koelsch-reference.c   |   28 +-
 arch/arm/mach-shmobile/board-koelsch.c             |   11 +-
 arch/arm/mach-shmobile/board-kzm9g-reference.c     |    6 +-
 arch/arm/mach-shmobile/board-kzm9g.c               |    8 +-
 arch/arm/mach-shmobile/board-lager-reference.c     |   29 +-
 arch/arm/mach-shmobile/board-lager.c               |   22 +-
 arch/arm/mach-shmobile/board-mackerel.c            |   12 +-
 arch/arm/mach-shmobile/board-marzen-reference.c    |   32 +-
 arch/arm/mach-shmobile/board-marzen.c              |    8 +-
 arch/arm/mach-shmobile/clock-r7s72100.c            |    5 +-
 arch/arm/mach-shmobile/clock-r8a73a4.c             |    4 +-
 arch/arm/mach-shmobile/clock-r8a7740.c             |    7 +-
 arch/arm/mach-shmobile/clock-r8a7778.c             |    4 +-
 arch/arm/mach-shmobile/clock-r8a7779.c             |   27 +-
 arch/arm/mach-shmobile/clock-r8a7790.c             |    8 +-
 arch/arm/mach-shmobile/clock-r8a7791.c             |    6 +-
 arch/arm/mach-shmobile/clock-sh7372.c              |    4 +-
 arch/arm/mach-shmobile/clock-sh73a0.c              |    4 +-
 arch/arm/mach-shmobile/clock.c                     |    6 +-
 arch/arm/mach-shmobile/{include/mach => }/clock.h  |    0
 arch/arm/mach-shmobile/{include/mach => }/common.h |    9 +
 arch/arm/mach-shmobile/console.c                   |    2 +-
 arch/arm/mach-shmobile/cpufreq.c                   |   17 +
 .../{include/mach => }/dma-register.h              |    0
 arch/arm/mach-shmobile/headsmp.S                   |   13 +-
 arch/arm/mach-shmobile/include/mach/irqs.h         |   16 +-
 arch/arm/mach-shmobile/intc-sh7372.c               |    5 +-
 arch/arm/mach-shmobile/intc-sh73a0.c               |    9 +-
 arch/arm/mach-shmobile/{include/mach => }/intc.h   |    0
 arch/arm/mach-shmobile/irqs.h                      |   21 +
 arch/arm/mach-shmobile/platsmp-apmu.c              |   71 +-
 arch/arm/mach-shmobile/platsmp-scu.c               |    2 +-
 arch/arm/mach-shmobile/platsmp.c                   |    2 +-
 arch/arm/mach-shmobile/pm-r8a7740.c                |    4 +-
 arch/arm/mach-shmobile/pm-r8a7779.c                |   19 +-
 arch/arm/mach-shmobile/pm-r8a7790.c                |   45 +-
 arch/arm/mach-shmobile/pm-r8a7791.c                |   73 ++
 arch/arm/mach-shmobile/pm-rcar.c                   |    2 +-
 .../arm/mach-shmobile/{include/mach => }/pm-rcar.h |    0
 arch/arm/mach-shmobile/pm-rmobile.c                |    2 +-
 .../mach-shmobile/{include/mach => }/pm-rmobile.h  |    0
 arch/arm/mach-shmobile/pm-sh7372.c                 |    8 +-
 arch/arm/mach-shmobile/pm-sh73a0.c                 |    2 +-
 .../mach-shmobile/{include/mach => }/r7s72100.h    |    1 -
 .../arm/mach-shmobile/{include/mach => }/r8a73a4.h |    0
 .../arm/mach-shmobile/{include/mach => }/r8a7740.h |    2 -
 .../arm/mach-shmobile/{include/mach => }/r8a7778.h |    0
 .../arm/mach-shmobile/{include/mach => }/r8a7779.h |   14 +-
 .../arm/mach-shmobile/{include/mach => }/r8a7790.h |    3 -
 .../arm/mach-shmobile/{include/mach => }/r8a7791.h |    1 +
 .../mach-shmobile/{include/mach => }/rcar-gen2.h   |    1 +
 arch/arm/mach-shmobile/setup-emev2.c               |   19 +-
 arch/arm/mach-shmobile/setup-r7s72100.c            |   15 +-
 arch/arm/mach-shmobile/setup-r8a73a4.c             |   10 +-
 arch/arm/mach-shmobile/setup-r8a7740.c             |   12 +-
 arch/arm/mach-shmobile/setup-r8a7778.c             |    8 +-
 arch/arm/mach-shmobile/setup-r8a7779.c             |   53 +-
 arch/arm/mach-shmobile/setup-r8a7790.c             |   22 +-
 arch/arm/mach-shmobile/setup-r8a7791.c             |   12 +-
 arch/arm/mach-shmobile/setup-rcar-gen2.c           |   76 +-
 arch/arm/mach-shmobile/setup-sh7372.c              |   12 +-
 arch/arm/mach-shmobile/setup-sh73a0.c              |   11 +-
 arch/arm/mach-shmobile/{include/mach => }/sh7372.h |    4 -
 arch/arm/mach-shmobile/{include/mach => }/sh73a0.h |    0
 arch/arm/mach-shmobile/smp-emev2.c                 |    2 +-
 arch/arm/mach-shmobile/smp-r8a7779.c               |    8 +-
 arch/arm/mach-shmobile/smp-r8a7790.c               |   36 +-
 arch/arm/mach-shmobile/smp-r8a7791.c               |   30 +-
 arch/arm/mach-shmobile/smp-sh73a0.c                |    6 +-
 arch/arm/mach-shmobile/timer.c                     |   50 +-
 arch/arm/mach-spear/spear1310.c                    |    2 +-
 arch/arm/mach-spear/spear1340.c                    |    6 +-
 arch/arm/mach-spear/spear13xx.c                    |    2 +-
 arch/arm/mach-sti/platsmp.c                        |    6 +-
 arch/arm/mach-ux500/board-mop500-regulators.c      |    2 +-
 arch/arm/mach-ux500/cache-l2x0.c                   |   18 +-
 arch/arm/mach-ux500/cpu-db8500.c                   |    8 +-
 arch/arm/mach-ux500/cpu.c                          |    2 +-
 arch/arm/mach-ux500/timer.c                        |    2 +-
 arch/arm/mach-versatile/core.c                     |    2 +-
 arch/arm/mach-versatile/versatile_dt.c             |    1 -
 arch/arm/mach-vexpress/ct-ca9x4.c                  |    3 +-
 arch/arm/mach-vt8500/vt8500.c                      |    6 +-
 arch/arm/plat-samsung/Kconfig                      |   14 +-
 arch/arm/plat-samsung/adc.c                        |    2 +-
 arch/arm/plat-samsung/include/plat/cpu.h           |   29 -
 arch/arm/plat-samsung/include/plat/devs.h          |   17 -
 arch/arm/plat-samsung/include/plat/fb.h            |   14 -
 arch/arm/plat-samsung/include/plat/s5p-clock.h     |    2 +-
 arch/arm/plat-samsung/include/plat/sdhci.h         |   77 --
 arch/arm/plat-versatile/Kconfig                    |    3 -
 arch/arm/plat-versatile/Makefile                   |    1 -
 arch/avr32/boards/atngw100/mrmt.c                  |   34 +-
 arch/avr32/boards/favr-32/setup.c                  |   48 +-
 arch/avr32/boards/merisc/setup.c                   |   34 +-
 arch/avr32/configs/atngw100_mrmt_defconfig         |    5 +-
 arch/avr32/configs/atstk1002_defconfig             |    5 +-
 arch/avr32/configs/atstk1003_defconfig             |    5 +-
 arch/avr32/configs/atstk1004_defconfig             |    5 +-
 arch/avr32/configs/atstk1006_defconfig             |    5 +-
 arch/avr32/configs/favr-32_defconfig               |    6 +-
 arch/avr32/configs/merisc_defconfig                |    5 +-
 arch/avr32/mach-at32ap/at32ap700x.c                |    7 +-
 drivers/clk/versatile/Makefile                     |    3 +-
 .../{clk-integrator.c => clk-versatile.c}          |   38 +-
 drivers/clocksource/tegra20_timer.c                |   13 +
 drivers/gpio/gpio-samsung.c                        |  722 -----------
 drivers/irqchip/Kconfig                            |    1 -
 drivers/irqchip/irq-versatile-fpga.c               |   18 +-
 drivers/leds/Kconfig                               |    8 -
 drivers/leds/Makefile                              |    1 -
 drivers/leds/leds-atmel-pwm.c                      |  149 ---
 drivers/misc/Kconfig                               |   10 -
 drivers/misc/Makefile                              |    1 -
 drivers/misc/atmel_pwm.c                           |  402 ------
 drivers/mtd/onenand/Kconfig                        |    4 +-
 drivers/mtd/onenand/samsung.c                      |   25 +-
 drivers/pwm/Kconfig                                |    2 +-
 drivers/spi/spi-s3c64xx.c                          |   22 -
 drivers/video/backlight/Kconfig                    |   11 -
 drivers/video/backlight/Makefile                   |    1 -
 drivers/video/backlight/atmel-pwm-bl.c             |  223 ----
 drivers/video/fbdev/Kconfig                        |   11 +-
 drivers/video/fbdev/Makefile                       |    1 +
 .../video/fbdev/amba-clcd-versatile.c              |    2 +-
 drivers/video/fbdev/s3c-fb.c                       |   65 -
 include/dt-bindings/clock/r8a7790-clock.h          |   27 +
 include/dt-bindings/clock/r8a7791-clock.h          |   27 +
 include/linux/atmel-pwm-bl.h                       |   43 -
 include/linux/atmel_pwm.h                          |   70 -
 .../linux/platform_data/video-clcd-versatile.h     |    0
 include/video/samsung_fimd.h                       |    2 +-
 init/calibrate.c                                   |   11 +
 340 files changed, 4611 insertions(+), 10977 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/cpu-enable-method/marvell,berlin-smp
 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
 delete mode 100644 arch/arm/boot/dts/r8a7779-marzen-reference.dts
 delete mode 100644 arch/arm/configs/s5p64x0_defconfig
 delete mode 100644 arch/arm/configs/s5pc100_defconfig
 create mode 100644 arch/arm/include/debug/clps711x.S
 create mode 100644 arch/arm/mach-berlin/headsmp.S
 create mode 100644 arch/arm/mach-berlin/platsmp.c
 delete mode 100644 arch/arm/mach-clps711x/include/mach/debug-macro.S
 delete mode 100644 arch/arm/mach-integrator/include/mach/memory.h
 delete mode 100644 arch/arm/mach-mvebu/hotplug.c
 create mode 100644 arch/arm/mach-mvebu/netxbig.c
 delete mode 100644 arch/arm/mach-s5p64x0/Kconfig
 delete mode 100644 arch/arm/mach-s5p64x0/Makefile
 delete mode 100644 arch/arm/mach-s5p64x0/Makefile.boot
 delete mode 100644 arch/arm/mach-s5p64x0/clock-s5p6440.c
 delete mode 100644 arch/arm/mach-s5p64x0/clock-s5p6450.c
 delete mode 100644 arch/arm/mach-s5p64x0/clock.c
 delete mode 100644 arch/arm/mach-s5p64x0/clock.h
 delete mode 100644 arch/arm/mach-s5p64x0/common.c
 delete mode 100644 arch/arm/mach-s5p64x0/common.h
 delete mode 100644 arch/arm/mach-s5p64x0/dev-audio.c
 delete mode 100644 arch/arm/mach-s5p64x0/dma.c
 delete mode 100644 arch/arm/mach-s5p64x0/i2c.h
 delete mode 100644 arch/arm/mach-s5p64x0/include/mach/debug-macro.S
 delete mode 100644 arch/arm/mach-s5p64x0/include/mach/dma.h
 delete mode 100644 arch/arm/mach-s5p64x0/include/mach/gpio.h
 delete mode 100644 arch/arm/mach-s5p64x0/include/mach/hardware.h
 delete mode 100644 arch/arm/mach-s5p64x0/include/mach/irqs.h
 delete mode 100644 arch/arm/mach-s5p64x0/include/mach/map.h
 delete mode 100644 arch/arm/mach-s5p64x0/include/mach/pm-core.h
 delete mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-clock.h
 delete mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-gpio.h
 delete mode 100644 arch/arm/mach-s5p64x0/include/mach/regs-irq.h
 delete mode 100644 arch/arm/mach-s5p64x0/irq-pm.c
 delete mode 100644 arch/arm/mach-s5p64x0/mach-smdk6440.c
 delete mode 100644 arch/arm/mach-s5p64x0/mach-smdk6450.c
 delete mode 100644 arch/arm/mach-s5p64x0/pm.c
 delete mode 100644 arch/arm/mach-s5p64x0/setup-fb-24bpp.c
 delete mode 100644 arch/arm/mach-s5p64x0/setup-i2c0.c
 delete mode 100644 arch/arm/mach-s5p64x0/setup-i2c1.c
 delete mode 100644 arch/arm/mach-s5p64x0/setup-sdhci-gpio.c
 delete mode 100644 arch/arm/mach-s5p64x0/setup-spi.c
 delete mode 100644 arch/arm/mach-s5pc100/Kconfig
 delete mode 100644 arch/arm/mach-s5pc100/Makefile
 delete mode 100644 arch/arm/mach-s5pc100/Makefile.boot
 delete mode 100644 arch/arm/mach-s5pc100/clock.c
 delete mode 100644 arch/arm/mach-s5pc100/common.c
 delete mode 100644 arch/arm/mach-s5pc100/common.h
 delete mode 100644 arch/arm/mach-s5pc100/dev-audio.c
 delete mode 100644 arch/arm/mach-s5pc100/dma.c
 delete mode 100644 arch/arm/mach-s5pc100/include/mach/debug-macro.S
 delete mode 100644 arch/arm/mach-s5pc100/include/mach/dma.h
 delete mode 100644 arch/arm/mach-s5pc100/include/mach/entry-macro.S
 delete mode 100644 arch/arm/mach-s5pc100/include/mach/gpio.h
 delete mode 100644 arch/arm/mach-s5pc100/include/mach/hardware.h
 delete mode 100644 arch/arm/mach-s5pc100/include/mach/irqs.h
 delete mode 100644 arch/arm/mach-s5pc100/include/mach/map.h
 delete mode 100644 arch/arm/mach-s5pc100/include/mach/regs-clock.h
 delete mode 100644 arch/arm/mach-s5pc100/include/mach/regs-gpio.h
 delete mode 100644 arch/arm/mach-s5pc100/include/mach/regs-irq.h
 delete mode 100644 arch/arm/mach-s5pc100/mach-smdkc100.c
 delete mode 100644 arch/arm/mach-s5pc100/setup-fb-24bpp.c
 delete mode 100644 arch/arm/mach-s5pc100/setup-i2c0.c
 delete mode 100644 arch/arm/mach-s5pc100/setup-i2c1.c
 delete mode 100644 arch/arm/mach-s5pc100/setup-ide.c
 delete mode 100644 arch/arm/mach-s5pc100/setup-keypad.c
 delete mode 100644 arch/arm/mach-s5pc100/setup-sdhci-gpio.c
 delete mode 100644 arch/arm/mach-s5pc100/setup-spi.c
 rename arch/arm/mach-shmobile/{include/mach => }/clock.h (100%)
 rename arch/arm/mach-shmobile/{include/mach => }/common.h (88%)
 create mode 100644 arch/arm/mach-shmobile/cpufreq.c
 rename arch/arm/mach-shmobile/{include/mach => }/dma-register.h (100%)
 rename arch/arm/mach-shmobile/{include/mach => }/intc.h (100%)
 create mode 100644 arch/arm/mach-shmobile/irqs.h
 create mode 100644 arch/arm/mach-shmobile/pm-r8a7791.c
 rename arch/arm/mach-shmobile/{include/mach => }/pm-rcar.h (100%)
 rename arch/arm/mach-shmobile/{include/mach => }/pm-rmobile.h (100%)
 rename arch/arm/mach-shmobile/{include/mach => }/r7s72100.h (82%)
 rename arch/arm/mach-shmobile/{include/mach => }/r8a73a4.h (100%)
 rename arch/arm/mach-shmobile/{include/mach => }/r8a7740.h (98%)
 rename arch/arm/mach-shmobile/{include/mach => }/r8a7778.h (100%)
 rename arch/arm/mach-shmobile/{include/mach => }/r8a7779.h (74%)
 rename arch/arm/mach-shmobile/{include/mach => }/r8a7790.h (93%)
 rename arch/arm/mach-shmobile/{include/mach => }/r8a7791.h (90%)
 rename arch/arm/mach-shmobile/{include/mach => }/rcar-gen2.h (85%)
 rename arch/arm/mach-shmobile/{include/mach => }/sh7372.h (96%)
 rename arch/arm/mach-shmobile/{include/mach => }/sh73a0.h (100%)
 rename drivers/clk/versatile/{clk-integrator.c => clk-versatile.c} (63%)
 delete mode 100644 drivers/leds/leds-atmel-pwm.c
 delete mode 100644 drivers/misc/atmel_pwm.c
 delete mode 100644 drivers/video/backlight/atmel-pwm-bl.c
 rename arch/arm/plat-versatile/clcd.c => drivers/video/fbdev/amba-clcd-versatile.c (98%)
 delete mode 100644 include/linux/atmel-pwm-bl.h
 delete mode 100644 include/linux/atmel_pwm.h
 rename arch/arm/plat-versatile/include/plat/clcd.h => include/linux/platform_data/video-clcd-versatile.h (100%)
Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6)
$ git merge bcm2835/for-next
Already up-to-date.
Merging berlin/berlin/for-next (251f72d06c59 Merge branch 'berlin/soc' into berlin/for-next)
$ git merge berlin/berlin/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support)
$ 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 (3a426a906aac Merge branch 'imx/dt' into for-next)
$ git merge imx-mxs/for-next
Removing include/linux/platform_data/usb-imx_udc.h
Removing include/linux/platform_data/camera-mx1.h
Removing arch/arm/mach-imx/mx53.h
Removing arch/arm/mach-imx/mx51.h
Removing arch/arm/mach-imx/mx1-camera-fiq.S
Removing arch/arm/mach-imx/mx1-camera-fiq-ksym.c
Removing arch/arm/mach-imx/mm-imx5.c
Auto-merging arch/arm/mach-imx/mach-imx51.c
Removing arch/arm/mach-imx/mach-imx27lite.c
Removing arch/arm/mach-imx/mach-imx27ipcam.c
Removing arch/arm/mach-imx/iomux-mx51.h
Removing arch/arm/mach-imx/ehci-imx5.c
Removing arch/arm/mach-imx/devices/platform-mx1-camera.c
Removing arch/arm/mach-imx/devices/platform-imx_udc.c
Removing arch/arm/mach-imx/devices-imx51.h
Removing arch/arm/mach-imx/crm-regs-imx5.h
Auto-merging arch/arm/configs/multi_v7_defconfig
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/clock/imx1-clock.txt       |   26 +
 .../devicetree/bindings/clock/imx21-clock.txt      |   28 +
 .../devicetree/bindings/clock/imx27-clock.txt      |  127 +-
 .../devicetree/bindings/clock/imx6q-clock.txt      |  220 +--
 arch/arm/boot/dts/Makefile                         |   15 +
 .../imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts  |   73 +
 .../imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts  |   45 +
 .../imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts   |   45 +
 .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts  |    1 -
 arch/arm/boot/dts/imx25-pdk.dts                    |    8 +-
 arch/arm/boot/dts/imx25.dtsi                       |    8 +-
 arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi       |  296 ++++
 .../boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts  |  273 ++++
 arch/arm/boot/dts/imx27-pdk.dts                    |    2 +-
 arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts     |    2 +-
 arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi    |    3 +-
 arch/arm/boot/dts/imx27.dtsi                       |  115 +-
 arch/arm/boot/dts/imx28-cfa10036.dts               |   22 +
 arch/arm/boot/dts/imx28-m28.dtsi                   |   87 ++
 arch/arm/boot/dts/imx28-m28evk.dts                 |   62 +-
 .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts  |    1 -
 arch/arm/boot/dts/imx35.dtsi                       |    8 +
 arch/arm/boot/dts/imx50.dtsi                       |    8 +-
 arch/arm/boot/dts/imx51-babbage.dts                |    2 +-
 .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts  |    1 -
 arch/arm/boot/dts/imx51.dtsi                       |    3 -
 arch/arm/boot/dts/imx53-m53evk.dts                 |    1 -
 arch/arm/boot/dts/imx53-mba53.dts                  |    1 -
 arch/arm/boot/dts/imx53-qsb-common.dtsi            |    1 -
 arch/arm/boot/dts/imx53-tx53.dtsi                  |    1 -
 arch/arm/boot/dts/imx53-voipac-bsb.dts             |    1 -
 arch/arm/boot/dts/imx53.dtsi                       |   13 +-
 arch/arm/boot/dts/imx6dl-aristainetos_4.dts        |   85 ++
 arch/arm/boot/dts/imx6dl-aristainetos_7.dts        |   74 +
 arch/arm/boot/dts/imx6dl-gw51xx.dts                |    2 +-
 arch/arm/boot/dts/imx6dl-gw52xx.dts                |    2 +-
 arch/arm/boot/dts/imx6dl-gw53xx.dts                |    2 +-
 arch/arm/boot/dts/imx6dl-gw54xx.dts                |    2 +-
 arch/arm/boot/dts/imx6dl-riotboard.dts             |    1 -
 arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts          |  103 ++
 arch/arm/boot/dts/imx6dl-tx6u-801x.dts             |  177 +++
 arch/arm/boot/dts/imx6dl-tx6u-811x.dts             |  150 ++
 arch/arm/boot/dts/imx6dl.dtsi                      |   17 +-
 arch/arm/boot/dts/imx6q-cubox-i.dts                |    4 +
 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts            |   54 +
 arch/arm/boot/dts/imx6q-gw51xx.dts                 |    2 +-
 arch/arm/boot/dts/imx6q-gw52xx.dts                 |    2 +-
 arch/arm/boot/dts/imx6q-gw53xx.dts                 |    2 +-
 arch/arm/boot/dts/imx6q-gw5400-a.dts               |    5 +-
 arch/arm/boot/dts/imx6q-gw54xx.dts                 |    2 +-
 arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts       |  103 ++
 arch/arm/boot/dts/imx6q-tx6q-1010.dts              |  177 +++
 arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts       |  136 ++
 arch/arm/boot/dts/imx6q-tx6q-1020.dts              |  210 +++
 arch/arm/boot/dts/imx6q-tx6q-1110.dts              |  154 ++
 arch/arm/boot/dts/imx6q-udoo.dts                   |   32 +
 arch/arm/boot/dts/imx6q.dtsi                       |   35 +-
 arch/arm/boot/dts/imx6qdl-aristainetos.dtsi        |  418 ++++++
 arch/arm/boot/dts/imx6qdl-gw52xx.dtsi              |    5 +-
 arch/arm/boot/dts/imx6qdl-gw53xx.dtsi              |    5 +-
 arch/arm/boot/dts/imx6qdl-gw54xx.dtsi              |    6 +-
 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi          |    1 -
 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi       |    1 +
 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi           |    1 -
 arch/arm/boot/dts/imx6qdl-sabresd.dtsi             |    2 +-
 arch/arm/boot/dts/imx6qdl-tx6.dtsi                 |  696 +++++++++
 arch/arm/boot/dts/imx6qdl-wandboard.dtsi           |    1 -
 arch/arm/boot/dts/imx6qdl.dtsi                     |  161 +-
 arch/arm/boot/dts/imx6sl-evk.dts                   |   17 +-
 arch/arm/boot/dts/imx6sl.dtsi                      |   12 +-
 arch/arm/boot/dts/imx6sx-pinfunc.h                 | 1544 ++++++++++++++++++++
 arch/arm/boot/dts/imx6sx-sdb.dts                   |  479 ++++++
 arch/arm/boot/dts/imx6sx.dtsi                      | 1208 +++++++++++++++
 arch/arm/configs/imx_v4_v5_defconfig               |    5 +-
 arch/arm/configs/imx_v6_v7_defconfig               |    9 +-
 arch/arm/configs/multi_v7_defconfig                |    2 +-
 arch/arm/configs/mxs_defconfig                     |    1 +
 arch/arm/mach-imx/Kconfig                          |   59 +-
 arch/arm/mach-imx/Makefile                         |   11 +-
 arch/arm/mach-imx/clk-imx1.c                       |  157 +-
 arch/arm/mach-imx/clk-imx21.c                      |  301 ++--
 arch/arm/mach-imx/clk-imx25.c                      |   45 +-
 arch/arm/mach-imx/clk-imx27.c                      |  454 +++---
 arch/arm/mach-imx/clk-imx31.c                      |    6 +-
 arch/arm/mach-imx/clk-imx35.c                      |    6 +-
 arch/arm/mach-imx/clk-imx51-imx53.c                |  251 ++--
 arch/arm/mach-imx/clk-imx6q.c                      |  538 ++++---
 arch/arm/mach-imx/clk-imx6sl.c                     |    8 +-
 arch/arm/mach-imx/clk-imx6sx.c                     |   22 +-
 arch/arm/mach-imx/clk-vf610.c                      |    2 +
 arch/arm/mach-imx/clk.c                            |   10 +
 arch/arm/mach-imx/clk.h                            |    9 +
 arch/arm/mach-imx/common.h                         |   31 +-
 arch/arm/mach-imx/cpu-imx5.c                       |   25 +-
 arch/arm/mach-imx/cpu.c                            |   13 +
 arch/arm/mach-imx/cpuidle-imx6q.c                  |    6 +-
 arch/arm/mach-imx/crm-regs-imx5.h                  |  600 --------
 arch/arm/mach-imx/devices-imx51.h                  |   66 -
 arch/arm/mach-imx/devices/Kconfig                  |    9 +-
 arch/arm/mach-imx/devices/Makefile                 |    2 -
 arch/arm/mach-imx/devices/devices-common.h         |   26 -
 arch/arm/mach-imx/devices/platform-fec.c           |   12 -
 arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c  |    5 -
 arch/arm/mach-imx/devices/platform-imx-i2c.c       |   26 -
 arch/arm/mach-imx/devices/platform-imx-keypad.c    |   10 -
 arch/arm/mach-imx/devices/platform-imx-ssi.c       |   20 -
 arch/arm/mach-imx/devices/platform-imx-uart.c      |   22 -
 arch/arm/mach-imx/devices/platform-imx2-wdt.c      |   18 -
 arch/arm/mach-imx/devices/platform-imx_udc.c       |   75 -
 arch/arm/mach-imx/devices/platform-mx1-camera.c    |   42 -
 arch/arm/mach-imx/devices/platform-mxc-ehci.c      |    9 -
 arch/arm/mach-imx/devices/platform-mxc_nand.c      |    5 -
 arch/arm/mach-imx/devices/platform-mxc_rnga.c      |    5 +-
 arch/arm/mach-imx/devices/platform-pata_imx.c      |   10 -
 .../mach-imx/devices/platform-sdhci-esdhc-imx.c    |   24 -
 arch/arm/mach-imx/devices/platform-spi_imx.c       |   27 -
 arch/arm/mach-imx/ehci-imx25.c                     |    1 +
 arch/arm/mach-imx/ehci-imx27.c                     |    1 +
 arch/arm/mach-imx/ehci-imx31.c                     |    1 +
 arch/arm/mach-imx/ehci-imx35.c                     |    1 +
 arch/arm/mach-imx/ehci-imx5.c                      |  171 ---
 arch/arm/mach-imx/ehci.h                           |   43 +
 arch/arm/mach-imx/gpc.c                            |    5 +-
 arch/arm/mach-imx/hardware.h                       |    2 -
 arch/arm/mach-imx/imx25-dt.c                       |    6 -
 arch/arm/mach-imx/imx27-dt.c                       |    6 -
 arch/arm/mach-imx/imx31-dt.c                       |    2 +-
 arch/arm/mach-imx/imx35-dt.c                       |    2 +-
 arch/arm/mach-imx/iomux-mx51.h                     |  827 -----------
 arch/arm/mach-imx/mach-armadillo5x0.c              |    1 +
 arch/arm/mach-imx/mach-cpuimx27.c                  |    1 +
 arch/arm/mach-imx/mach-cpuimx35.c                  |    1 +
 arch/arm/mach-imx/mach-eukrea_cpuimx25.c           |    1 +
 arch/arm/mach-imx/mach-imx27_visstrim_m10.c        |    1 +
 arch/arm/mach-imx/mach-imx27ipcam.c                |   77 -
 arch/arm/mach-imx/mach-imx27lite.c                 |   83 --
 arch/arm/mach-imx/mach-imx50.c                     |    5 +-
 arch/arm/mach-imx/{imx51-dt.c => mach-imx51.c}     |   45 +-
 arch/arm/mach-imx/mach-imx53.c                     |   19 +-
 arch/arm/mach-imx/mach-imx6q.c                     |    4 +-
 arch/arm/mach-imx/mach-imx6sl.c                    |    2 +-
 arch/arm/mach-imx/mach-imx6sx.c                    |   10 +-
 arch/arm/mach-imx/mach-mx25_3ds.c                  |    1 +
 arch/arm/mach-imx/mach-mx27_3ds.c                  |    1 +
 arch/arm/mach-imx/mach-mx31_3ds.c                  |    1 +
 arch/arm/mach-imx/mach-mx31lilly.c                 |    1 +
 arch/arm/mach-imx/mach-mx31lite.c                  |    1 +
 arch/arm/mach-imx/mach-mx31moboard.c               |    5 +-
 arch/arm/mach-imx/mach-mx35_3ds.c                  |    1 +
 arch/arm/mach-imx/mach-pca100.c                    |    1 +
 arch/arm/mach-imx/mach-pcm037.c                    |    1 +
 arch/arm/mach-imx/mach-pcm038.c                    |    1 +
 arch/arm/mach-imx/mach-pcm043.c                    |    1 +
 arch/arm/mach-imx/mach-vf610.c                     |    2 +-
 arch/arm/mach-imx/mach-vpr200.c                    |    1 +
 arch/arm/mach-imx/mm-imx5.c                        |  155 --
 arch/arm/mach-imx/mx1-camera-fiq-ksym.c            |   18 -
 arch/arm/mach-imx/mx1-camera-fiq.S                 |   35 -
 arch/arm/mach-imx/mx31moboard-devboard.c           |    5 +-
 arch/arm/mach-imx/mx31moboard-marxbot.c            |    5 +-
 arch/arm/mach-imx/mx31moboard-smartbot.c           |    5 +-
 arch/arm/mach-imx/mx51.h                           |  346 -----
 arch/arm/mach-imx/mx53.h                           |  342 -----
 arch/arm/mach-imx/mxc.h                            |    7 +
 arch/arm/mach-imx/pm-imx5.c                        |   98 +-
 arch/arm/mach-imx/pm-imx6.c                        |   67 +-
 arch/arm/mach-imx/system.c                         |   24 +-
 arch/arm/mach-imx/time.c                           |   42 +-
 arch/arm/mach-imx/tzic.c                           |    9 +-
 drivers/bus/imx-weim.c                             |    4 +-
 include/dt-bindings/clock/imx1-clock.h             |   40 +
 include/dt-bindings/clock/imx21-clock.h            |   80 +
 include/dt-bindings/clock/imx27-clock.h            |  108 ++
 include/dt-bindings/clock/imx6qdl-clock.h          |  224 +++
 include/linux/platform_data/camera-mx1.h           |   35 -
 include/linux/platform_data/usb-ehci-mxc.h         |   46 -
 include/linux/platform_data/usb-imx_udc.h          |   23 -
 177 files changed, 8744 insertions(+), 4883 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/imx1-clock.txt
 create mode 100644 Documentation/devicetree/bindings/clock/imx21-clock.txt
 create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts
 create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts
 create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts
 create mode 100644 arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi
 create mode 100644 arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts
 create mode 100644 arch/arm/boot/dts/imx28-m28.dtsi
 create mode 100644 arch/arm/boot/dts/imx6dl-aristainetos_4.dts
 create mode 100644 arch/arm/boot/dts/imx6dl-aristainetos_7.dts
 create mode 100644 arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
 create mode 100644 arch/arm/boot/dts/imx6dl-tx6u-801x.dts
 create mode 100644 arch/arm/boot/dts/imx6dl-tx6u-811x.dts
 create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts
 create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1010.dts
 create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts
 create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1020.dts
 create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1110.dts
 create mode 100644 arch/arm/boot/dts/imx6qdl-aristainetos.dtsi
 create mode 100644 arch/arm/boot/dts/imx6qdl-tx6.dtsi
 create mode 100755 arch/arm/boot/dts/imx6sx-pinfunc.h
 create mode 100644 arch/arm/boot/dts/imx6sx-sdb.dts
 create mode 100644 arch/arm/boot/dts/imx6sx.dtsi
 delete mode 100644 arch/arm/mach-imx/crm-regs-imx5.h
 delete mode 100644 arch/arm/mach-imx/devices-imx51.h
 delete mode 100644 arch/arm/mach-imx/devices/platform-imx_udc.c
 delete mode 100644 arch/arm/mach-imx/devices/platform-mx1-camera.c
 delete mode 100644 arch/arm/mach-imx/ehci-imx5.c
 create mode 100644 arch/arm/mach-imx/ehci.h
 delete mode 100644 arch/arm/mach-imx/iomux-mx51.h
 delete mode 100644 arch/arm/mach-imx/mach-imx27ipcam.c
 delete mode 100644 arch/arm/mach-imx/mach-imx27lite.c
 rename arch/arm/mach-imx/{imx51-dt.c => mach-imx51.c} (51%)
 delete mode 100644 arch/arm/mach-imx/mm-imx5.c
 delete mode 100644 arch/arm/mach-imx/mx1-camera-fiq-ksym.c
 delete mode 100644 arch/arm/mach-imx/mx1-camera-fiq.S
 delete mode 100644 arch/arm/mach-imx/mx51.h
 delete mode 100644 arch/arm/mach-imx/mx53.h
 create mode 100644 include/dt-bindings/clock/imx1-clock.h
 create mode 100644 include/dt-bindings/clock/imx21-clock.h
 create mode 100644 include/dt-bindings/clock/imx27-clock.h
 create mode 100644 include/dt-bindings/clock/imx6qdl-clock.h
 delete mode 100644 include/linux/platform_data/camera-mx1.h
 delete mode 100644 include/linux/platform_data/usb-imx_udc.h
Merging ixp4xx/next (19f949f52599 Linux 3.8)
$ git merge ixp4xx/next
Already up-to-date.
Merging keystone/next (c9eaa447e77e Linux 3.15-rc1)
$ git merge keystone/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 (a56608a3a8db Merge branch 'mvebu/dt' into mvebu/for-next)
$ git merge mvebu/for-next
Recorded preimage for 'arch/arm/Kconfig'
Resolved 'arch/arm/mach-mvebu/headsmp-a9.S' using previous resolution.
Auto-merging arch/arm/mm/Kconfig
Auto-merging arch/arm/mach-mvebu/headsmp-a9.S
CONFLICT (content): Merge conflict in arch/arm/mach-mvebu/headsmp-a9.S
Removing arch/arm/mach-kirkwood/tsx1x-common.h
Removing arch/arm/mach-kirkwood/tsx1x-common.c
Removing arch/arm/mach-kirkwood/ts41x-setup.c
Removing arch/arm/mach-kirkwood/ts219-setup.c
Removing arch/arm/mach-kirkwood/t5325-setup.c
Removing arch/arm/mach-kirkwood/rd88f6281-setup.c
Removing arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
Removing arch/arm/mach-kirkwood/pm.h
Removing arch/arm/mach-kirkwood/pm.c
Removing arch/arm/mach-kirkwood/pcie.c
Removing arch/arm/mach-kirkwood/openrd-setup.c
Removing arch/arm/mach-kirkwood/netxbig_v2-setup.c
Removing arch/arm/mach-kirkwood/mpp.h
Removing arch/arm/mach-kirkwood/mpp.c
Removing arch/arm/mach-kirkwood/lacie_v2-common.h
Removing arch/arm/mach-kirkwood/lacie_v2-common.c
Removing arch/arm/mach-kirkwood/irq.c
Removing arch/arm/mach-kirkwood/include/mach/uncompress.h
Removing arch/arm/mach-kirkwood/include/mach/kirkwood.h
Removing arch/arm/mach-kirkwood/include/mach/irqs.h
Removing arch/arm/mach-kirkwood/include/mach/hardware.h
Removing arch/arm/mach-kirkwood/include/mach/entry-macro.S
Removing arch/arm/mach-kirkwood/include/mach/bridge-regs.h
Removing arch/arm/mach-kirkwood/d2net_v2-setup.c
Removing arch/arm/mach-kirkwood/common.h
Removing arch/arm/mach-kirkwood/common.c
Removing arch/arm/mach-kirkwood/board-dt.c
Removing arch/arm/mach-kirkwood/Makefile.boot
Removing arch/arm/mach-kirkwood/Makefile
Removing arch/arm/mach-kirkwood/Kconfig
Auto-merging arch/arm/configs/mvebu_v7_defconfig
Removing arch/arm/configs/kirkwood_defconfig
Auto-merging arch/arm/boot/dts/armada-375-db.dts
Auto-merging arch/arm/boot/dts/Makefile
Auto-merging arch/arm/Makefile
Auto-merging arch/arm/Kconfig.debug
Auto-merging arch/arm/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'arch/arm/Kconfig'.
[master a58c954f44b0] Merge remote-tracking branch 'mvebu/for-next'
$ git diff -M --stat --summary HEAD^..
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arm/Kconfig                                   |  17 -
 arch/arm/Kconfig.debug                             |   5 +-
 arch/arm/Makefile                                  |   1 -
 arch/arm/boot/dts/Makefile                         |   9 +-
 arch/arm/boot/dts/armada-375-db.dts                |  26 +
 arch/arm/boot/dts/armada-375.dtsi                  |  31 +
 arch/arm/boot/dts/dove-cubox-es.dts                |  12 +
 arch/arm/boot/dts/dove-cubox.dts                   |   3 -
 arch/arm/boot/dts/kirkwood-d2net.dts               |  42 ++
 arch/arm/boot/dts/kirkwood-net2big.dts             |  60 ++
 arch/arm/boot/dts/kirkwood-net5big.dts             | 111 +++
 arch/arm/boot/dts/kirkwood-netxbig.dtsi            | 154 +++++
 arch/arm/configs/kirkwood_defconfig                | 181 -----
 arch/arm/configs/mvebu_v5_defconfig                |   4 +
 arch/arm/configs/mvebu_v7_defconfig                |   1 +
 arch/arm/mach-kirkwood/Kconfig                     | 111 ---
 arch/arm/mach-kirkwood/Makefile                    |  14 -
 arch/arm/mach-kirkwood/Makefile.boot               |   3 -
 arch/arm/mach-kirkwood/board-dt.c                  | 223 ------
 arch/arm/mach-kirkwood/common.c                    | 746 ---------------------
 arch/arm/mach-kirkwood/common.h                    |  74 --
 arch/arm/mach-kirkwood/d2net_v2-setup.c            | 231 -------
 arch/arm/mach-kirkwood/include/mach/bridge-regs.h  |  86 ---
 arch/arm/mach-kirkwood/include/mach/entry-macro.S  |  34 -
 arch/arm/mach-kirkwood/include/mach/hardware.h     |  14 -
 arch/arm/mach-kirkwood/include/mach/irqs.h         |  65 --
 arch/arm/mach-kirkwood/include/mach/kirkwood.h     | 142 ----
 arch/arm/mach-kirkwood/include/mach/uncompress.h   |  46 --
 arch/arm/mach-kirkwood/irq.c                       |  82 ---
 arch/arm/mach-kirkwood/lacie_v2-common.c           | 114 ----
 arch/arm/mach-kirkwood/lacie_v2-common.h           |  16 -
 arch/arm/mach-kirkwood/mpp.c                       |  43 --
 arch/arm/mach-kirkwood/mpp.h                       | 348 ----------
 arch/arm/mach-kirkwood/netxbig_v2-setup.c          | 422 ------------
 arch/arm/mach-kirkwood/openrd-setup.c              | 255 -------
 arch/arm/mach-kirkwood/pcie.c                      | 296 --------
 arch/arm/mach-kirkwood/pm.c                        |  76 ---
 arch/arm/mach-kirkwood/pm.h                        |  26 -
 arch/arm/mach-kirkwood/rd88f6192-nas-setup.c       |  89 ---
 arch/arm/mach-kirkwood/rd88f6281-setup.c           | 128 ----
 arch/arm/mach-kirkwood/t5325-setup.c               | 216 ------
 arch/arm/mach-kirkwood/ts219-setup.c               | 142 ----
 arch/arm/mach-kirkwood/ts41x-setup.c               | 186 -----
 arch/arm/mach-kirkwood/tsx1x-common.c              | 113 ----
 arch/arm/mach-kirkwood/tsx1x-common.h              |   7 -
 arch/arm/mach-mvebu/coherency.c                    |   6 +-
 arch/arm/mach-mvebu/headsmp-a9.S                   |   9 +-
 arch/arm/mach-mvebu/pmsu.c                         |  10 +-
 arch/arm/mm/Kconfig                                |   2 +-
 50 files changed, 468 insertions(+), 4565 deletions(-)
 create mode 100644 arch/arm/boot/dts/dove-cubox-es.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-d2net.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-net2big.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-net5big.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-netxbig.dtsi
 delete mode 100644 arch/arm/configs/kirkwood_defconfig
 delete mode 100644 arch/arm/mach-kirkwood/Kconfig
 delete mode 100644 arch/arm/mach-kirkwood/Makefile
 delete mode 100644 arch/arm/mach-kirkwood/Makefile.boot
 delete mode 100644 arch/arm/mach-kirkwood/board-dt.c
 delete mode 100644 arch/arm/mach-kirkwood/common.c
 delete mode 100644 arch/arm/mach-kirkwood/common.h
 delete mode 100644 arch/arm/mach-kirkwood/d2net_v2-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/bridge-regs.h
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/entry-macro.S
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/hardware.h
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/irqs.h
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/kirkwood.h
 delete mode 100644 arch/arm/mach-kirkwood/include/mach/uncompress.h
 delete mode 100644 arch/arm/mach-kirkwood/irq.c
 delete mode 100644 arch/arm/mach-kirkwood/lacie_v2-common.c
 delete mode 100644 arch/arm/mach-kirkwood/lacie_v2-common.h
 delete mode 100644 arch/arm/mach-kirkwood/mpp.c
 delete mode 100644 arch/arm/mach-kirkwood/mpp.h
 delete mode 100644 arch/arm/mach-kirkwood/netxbig_v2-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/openrd-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/pcie.c
 delete mode 100644 arch/arm/mach-kirkwood/pm.c
 delete mode 100644 arch/arm/mach-kirkwood/pm.h
 delete mode 100644 arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/rd88f6281-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/t5325-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/ts219-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/ts41x-setup.c
 delete mode 100644 arch/arm/mach-kirkwood/tsx1x-common.c
 delete mode 100644 arch/arm/mach-kirkwood/tsx1x-common.h
Merging renesas/next (58674d04a794 Merge branch 'heads/dt-for-v3.17' into next)
$ git merge renesas/next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/dma/rcar-audmapp.txt       |  29 ++++++
 arch/arm/boot/dts/r7s72100-genmai.dts              |  10 ++
 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts    |  14 ++-
 arch/arm/boot/dts/r8a73a4.dtsi                     |  42 ++++++++
 .../boot/dts/r8a7740-armadillo800eva-reference.dts |  16 ++-
 arch/arm/boot/dts/r8a7740.dtsi                     |  63 ++++++++++++
 arch/arm/boot/dts/r8a7778-bockw-reference.dts      |  14 ++-
 arch/arm/boot/dts/r8a7778.dtsi                     |  42 ++++++++
 arch/arm/boot/dts/r8a7779.dtsi                     |  14 +--
 arch/arm/boot/dts/r8a7790-lager.dts                |  32 +++---
 arch/arm/boot/dts/r8a7790.dtsi                     |  12 +--
 arch/arm/boot/dts/r8a7791-henninger.dts            |  24 ++++-
 arch/arm/boot/dts/r8a7791-koelsch.dts              |  22 ++++
 arch/arm/boot/dts/r8a7791.dtsi                     |  40 ++++++++
 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts       |  16 ++-
 arch/arm/boot/dts/sh73a0.dtsi                      |  72 +++++++++++++
 arch/arm/mach-shmobile/clock-r8a73a4.c             |   6 ++
 arch/arm/mach-shmobile/clock-r8a7740.c             |  18 ++--
 arch/arm/mach-shmobile/clock-r8a7778.c             |   6 ++
 arch/arm/mach-shmobile/clock-sh73a0.c              |   9 ++
 arch/arm/mach-shmobile/dma-register.h              |   4 +-
 arch/arm/mach-shmobile/setup-r8a73a4.c             |  12 +--
 arch/arm/mach-shmobile/setup-r8a7740.c             |   8 +-
 arch/arm/mach-shmobile/setup-r8a7778.c             |  12 +--
 arch/arm/mach-shmobile/setup-sh73a0.c              |   8 +-
 arch/sh/drivers/dma/dma-sh.c                       |   2 +-
 arch/sh/include/asm/dma-register.h                 |  36 ++++---
 arch/sh/kernel/cpu/sh4a/setup-sh7722.c             |  24 ++---
 arch/sh/kernel/cpu/sh4a/setup-sh7724.c             |  48 ++++-----
 arch/sh/kernel/cpu/sh4a/setup-sh7757.c             |  64 ++++++------
 drivers/dma/sh/Makefile                            |   3 +
 drivers/dma/sh/rcar-audmapp.c                      | 114 +++++++++++++++------
 drivers/dma/sh/shdma-arm.h                         |   4 +-
 drivers/dma/sh/shdmac.c                            |  15 ++-
 include/linux/sh_dma.h                             |  24 +++--
 35 files changed, 667 insertions(+), 212 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/dma/rcar-audmapp.txt
Merging samsung/for-next (1858942aece6 Merge branch 'v3.17-next/mach-exynos' into for-next)
$ git merge samsung/for-next
Auto-merging arch/arm/mach-exynos/pm.c
Auto-merging arch/arm/mach-exynos/platsmp.c
Auto-merging arch/arm/mach-exynos/mcpm-exynos.c
Auto-merging arch/arm/Kconfig.debug
Merge made by the 'recursive' strategy.
 arch/arm/Kconfig.debug                     |  20 +--
 arch/arm/boot/dts/exynos5250-snow.dts      |   1 +
 arch/arm/boot/dts/exynos5410.dtsi          |   4 +
 arch/arm/boot/dts/exynos5420-peach-pit.dts | 237 +++++++++++++++--------------
 arch/arm/boot/dts/exynos5800-peach-pi.dts  | 219 +++++++++++++++-----------
 arch/arm/mach-exynos/common.h              |  13 +-
 arch/arm/mach-exynos/exynos.c              |  48 +++++-
 arch/arm/mach-exynos/headsmp.S             |   1 -
 arch/arm/mach-exynos/hotplug.c             |   3 +-
 arch/arm/mach-exynos/include/mach/map.h    |   3 +-
 arch/arm/mach-exynos/include/mach/memory.h |   3 +-
 arch/arm/mach-exynos/mcpm-exynos.c         | 102 ++++++++-----
 arch/arm/mach-exynos/platsmp.c             |   7 +-
 arch/arm/mach-exynos/pm.c                  |   1 +
 arch/arm/mach-exynos/pm_domains.c          |   9 +-
 arch/arm/mach-exynos/pmu.c                 |   1 -
 arch/arm/mach-exynos/regs-pmu.h            |  15 +-
 arch/arm/mach-exynos/regs-sys.h            |  22 +++
 drivers/clocksource/Kconfig                |   1 +
 drivers/clocksource/exynos_mct.c           |  63 +++++---
 drivers/cpuidle/Kconfig.arm                |   2 +-
 drivers/cpuidle/cpuidle-big_little.c       |  12 +-
 drivers/tty/serial/Kconfig                 |   1 -
 drivers/tty/serial/samsung.c               |   4 +-
 include/linux/platform_data/asoc-s3c.h     |   9 --
 sound/soc/samsung/Kconfig                  |   4 +-
 sound/soc/samsung/smdk_wm8580pcm.c         |   2 +-
 27 files changed, 473 insertions(+), 334 deletions(-)
 create mode 100644 arch/arm/mach-exynos/regs-sys.h
Merging sunxi/sunxi/for-next (a2aa371b1d53 Merge branches 'sunxi/dt-for-3.17' and 'sunxi/clocks-for-3.17' into sunxi/for-next)
$ git merge sunxi/sunxi/for-next
Auto-merging arch/arm/mach-sunxi/sunxi.c
Auto-merging arch/arm/boot/dts/Makefile
Auto-merging arch/arm/Kconfig.debug
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/clock/sunxi.txt |   5 +
 arch/arm/Kconfig.debug                            |  10 +
 arch/arm/boot/dts/Makefile                        |   6 +-
 arch/arm/boot/dts/sun4i-a10-a1000.dts             |  15 ++
 arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts        | 110 +++++++++
 arch/arm/boot/dts/sun4i-a10-cubieboard.dts        |  15 ++
 arch/arm/boot/dts/sun4i-a10-hackberry.dts         |  21 ++
 arch/arm/boot/dts/sun4i-a10-inet97fv2.dts         |  21 +-
 arch/arm/boot/dts/sun4i-a10-mini-xplus.dts        |  28 +++
 arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts    |  15 ++
 arch/arm/boot/dts/sun4i-a10-pcduino.dts           |   9 +
 arch/arm/boot/dts/sun4i-a10.dtsi                  |  34 ++-
 arch/arm/boot/dts/sun5i-a10s.dtsi                 |   2 +-
 arch/arm/boot/dts/sun5i-a13.dtsi                  |   2 +-
 arch/arm/boot/dts/sun6i-a31.dtsi                  |   4 +-
 arch/arm/boot/dts/sun7i-a20-cubieboard2.dts       |  16 ++
 arch/arm/boot/dts/sun7i-a20-cubietruck.dts        |  16 ++
 arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts         |  22 ++
 arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts   |  10 +
 arch/arm/boot/dts/sun7i-a20-pcduino3.dts          | 173 ++++++++++++++
 arch/arm/boot/dts/sun7i-a20.dtsi                  |  34 ++-
 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts       |  30 +++
 arch/arm/boot/dts/sun8i-a23.dtsi                  | 275 ++++++++++++++++++++++
 arch/arm/mach-sunxi/Kconfig                       |   5 +
 arch/arm/mach-sunxi/sunxi.c                       |   9 +
 drivers/clk/sunxi/clk-factors.c                   |   2 +-
 drivers/clk/sunxi/clk-factors.h                   |   1 +
 drivers/clk/sunxi/clk-sunxi.c                     | 119 +++++++++-
 28 files changed, 986 insertions(+), 23 deletions(-)
 create mode 100644 arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts
 create mode 100644 arch/arm/boot/dts/sun7i-a20-pcduino3.dts
 create mode 100644 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts
 create mode 100644 arch/arm/boot/dts/sun8i-a23.dtsi
Merging tegra/for-next (bbcfcc8541a4 Merge branch for-3.17/defconfig into for-next)
$ git merge tegra/for-next
Auto-merging drivers/soc/tegra/fuse/speedo-tegra30.c
Auto-merging drivers/soc/tegra/fuse/speedo-tegra20.c
Auto-merging drivers/soc/tegra/fuse/speedo-tegra114.c
Auto-merging arch/arm/mach-tegra/sleep-tegra30.S
Removing arch/arm/mach-tegra/powergate.c
Removing arch/arm/mach-tegra/pmc.h
Removing arch/arm/mach-tegra/pmc.c
Removing arch/arm/mach-tegra/fuse.h
Removing arch/arm/mach-tegra/fuse.c
Removing arch/arm/mach-tegra/apbio.h
Removing arch/arm/mach-tegra/apbio.c
Auto-merging arch/arm/boot/dts/exynos5250-snow.dts
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-driver-tegra-fuse  |  11 +
 Documentation/devicetree/bindings/arm/tegra.txt    |   2 +
 .../bindings/fuse/nvidia,tegra20-fuse.txt          |  40 +
 .../devicetree/bindings/gpu/nvidia,gk20a.txt       |  43 +
 .../bindings/misc/nvidia,tegra20-apbmisc.txt       |  13 +
 .../bindings/pci/nvidia,tegra20-pcie.txt           |  30 +-
 .../pinctrl/nvidia,tegra124-xusb-padctl.txt        | 127 +++
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/cros-ec-keyboard.dtsi            | 105 +++
 arch/arm/boot/dts/exynos5250-snow.dts              |  93 +-
 arch/arm/boot/dts/tegra114-roth.dts                |  32 +-
 arch/arm/boot/dts/tegra114.dtsi                    |  15 +
 arch/arm/boot/dts/tegra124-jetson-tk1.dts          |  33 +-
 arch/arm/boot/dts/tegra124-venice2.dts             | 128 +--
 arch/arm/boot/dts/tegra124.dtsi                    |  55 ++
 arch/arm/boot/dts/tegra20-harmony.dts              |   8 +-
 arch/arm/boot/dts/tegra20-medcom-wide.dts          |  61 +-
 arch/arm/boot/dts/tegra20-plutux.dts               |  41 +
 arch/arm/boot/dts/tegra20-tamonten.dtsi            |  17 +-
 arch/arm/boot/dts/tegra20-tec.dts                  |  41 +
 arch/arm/boot/dts/tegra20-trimslice.dts            |   8 +-
 arch/arm/boot/dts/tegra20.dtsi                     |  15 +
 arch/arm/boot/dts/tegra30-apalis-eval.dts          | 260 ++++++
 arch/arm/boot/dts/tegra30-apalis.dtsi              | 678 ++++++++++++++
 arch/arm/boot/dts/tegra30-beaver.dts               |  12 +-
 arch/arm/boot/dts/tegra30-cardhu.dtsi              |  11 +-
 arch/arm/boot/dts/tegra30.dtsi                     |  15 +
 arch/arm/configs/tegra_defconfig                   |  16 +-
 arch/arm/mach-tegra/Makefile                       |   8 +-
 arch/arm/mach-tegra/apbio.c                        | 206 -----
 arch/arm/mach-tegra/apbio.h                        |  22 -
 arch/arm/mach-tegra/board-paz00.c                  |   3 +-
 arch/arm/mach-tegra/board.h                        |   7 -
 arch/arm/mach-tegra/cpuidle-tegra114.c             |  10 +-
 arch/arm/mach-tegra/cpuidle-tegra20.c              |  16 +-
 arch/arm/mach-tegra/cpuidle-tegra30.c              |  10 +-
 arch/arm/mach-tegra/cpuidle.c                      |   6 +-
 arch/arm/mach-tegra/flowctrl.c                     |  10 +-
 arch/arm/mach-tegra/fuse.c                         | 252 ------
 arch/arm/mach-tegra/fuse.h                         |  79 --
 arch/arm/mach-tegra/hotplug.c                      |  25 +-
 arch/arm/mach-tegra/io.c                           |   8 +-
 arch/arm/mach-tegra/irq.c                          |   8 +-
 arch/arm/mach-tegra/platsmp.c                      |  27 +-
 arch/arm/mach-tegra/pm-tegra20.c                   |   1 +
 arch/arm/mach-tegra/pm-tegra30.c                   |   1 +
 arch/arm/mach-tegra/pm.c                           |  60 +-
 arch/arm/mach-tegra/pm.h                           |  10 +-
 arch/arm/mach-tegra/pmc.c                          | 413 ---------
 arch/arm/mach-tegra/pmc.h                          |  49 --
 arch/arm/mach-tegra/powergate.c                    | 515 -----------
 arch/arm/mach-tegra/reset-handler.S                |   6 +-
 arch/arm/mach-tegra/reset.c                        |  18 +-
 arch/arm/mach-tegra/sleep-tegra30.S                |   6 +-
 arch/arm/mach-tegra/sleep.h                        |   3 -
 arch/arm/mach-tegra/tegra-pmc.c                    | 948 ++++++++++++++++++++
 arch/arm/mach-tegra/tegra.c                        |  35 +-
 drivers/misc/fuse/Makefile                         |   1 +
 drivers/pci/host/pci-tegra.c                       | 148 ++--
 drivers/pinctrl/Kconfig                            |   6 +
 drivers/pinctrl/Makefile                           |   1 +
 drivers/pinctrl/pinctrl-tegra-xusb.c               | 973 +++++++++++++++++++++
 drivers/soc/Makefile                               |   1 +
 drivers/soc/tegra/Makefile                         |   1 +
 drivers/soc/tegra/fuse/Makefile                    |   8 +
 drivers/soc/tegra/fuse/fuse-tegra.c                | 158 ++++
 drivers/soc/tegra/fuse/fuse-tegra20.c              | 214 +++++
 drivers/soc/tegra/fuse/fuse-tegra30.c              | 223 +++++
 drivers/soc/tegra/fuse/fuse.h                      |  71 ++
 .../soc/tegra/fuse/speedo-tegra114.c               |  53 +-
 drivers/soc/tegra/fuse/speedo-tegra124.c           | 167 ++++
 .../soc/tegra/fuse/speedo-tegra20.c                |  42 +-
 .../soc/tegra/fuse/speedo-tegra30.c                | 173 ++--
 drivers/soc/tegra/fuse/tegra-apbmisc.c             | 114 +++
 include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h   |   7 +
 include/linux/tegra-soc.h                          |  89 ++
 76 files changed, 5018 insertions(+), 2105 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-driver-tegra-fuse
 create mode 100644 Documentation/devicetree/bindings/fuse/nvidia,tegra20-fuse.txt
 create mode 100644 Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt
 create mode 100644 Documentation/devicetree/bindings/misc/nvidia,tegra20-apbmisc.txt
 create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-xusb-padctl.txt
 create mode 100644 arch/arm/boot/dts/cros-ec-keyboard.dtsi
 create mode 100644 arch/arm/boot/dts/tegra30-apalis-eval.dts
 create mode 100644 arch/arm/boot/dts/tegra30-apalis.dtsi
 delete mode 100644 arch/arm/mach-tegra/apbio.c
 delete mode 100644 arch/arm/mach-tegra/apbio.h
 delete mode 100644 arch/arm/mach-tegra/fuse.c
 delete mode 100644 arch/arm/mach-tegra/fuse.h
 delete mode 100644 arch/arm/mach-tegra/pmc.c
 delete mode 100644 arch/arm/mach-tegra/pmc.h
 delete mode 100644 arch/arm/mach-tegra/powergate.c
 create mode 100644 arch/arm/mach-tegra/tegra-pmc.c
 create mode 100644 drivers/misc/fuse/Makefile
 create mode 100644 drivers/pinctrl/pinctrl-tegra-xusb.c
 create mode 100644 drivers/soc/tegra/Makefile
 create mode 100644 drivers/soc/tegra/fuse/Makefile
 create mode 100644 drivers/soc/tegra/fuse/fuse-tegra.c
 create mode 100644 drivers/soc/tegra/fuse/fuse-tegra20.c
 create mode 100644 drivers/soc/tegra/fuse/fuse-tegra30.c
 create mode 100644 drivers/soc/tegra/fuse/fuse.h
 rename arch/arm/mach-tegra/tegra114_speedo.c => drivers/soc/tegra/fuse/speedo-tegra114.c (55%)
 create mode 100644 drivers/soc/tegra/fuse/speedo-tegra124.c
 rename arch/arm/mach-tegra/tegra20_speedo.c => drivers/soc/tegra/fuse/speedo-tegra20.c (67%)
 rename arch/arm/mach-tegra/tegra30_speedo.c => drivers/soc/tegra/fuse/speedo-tegra30.c (52%)
 create mode 100644 drivers/soc/tegra/fuse/tegra-apbmisc.c
 create mode 100644 include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h
Merging arm64/for-next/core (da57a369d3bc arm64: Enable TEXT_OFFSET fuzzing)
$ git merge arm64/for-next/core
Merge made by the 'recursive' strategy.
 Documentation/arm64/booting.txt         |   43 +-
 arch/arm64/Kconfig                      |    4 +
 arch/arm64/Kconfig.debug                |   15 +
 arch/arm64/Makefile                     |    4 +
 arch/arm64/include/asm/cputype.h        |    2 +
 arch/arm64/include/asm/page.h           |    9 +
 arch/arm64/include/asm/processor.h      |    4 +-
 arch/arm64/include/asm/stackprotector.h |   38 +
 arch/arm64/include/asm/syscall.h        |   14 +
 arch/arm64/include/asm/thread_info.h    |    5 +-
 arch/arm64/include/asm/unistd.h         |   17 +
 arch/arm64/include/asm/unistd32.h       | 1166 ++++++++++++++++++++-----------
 arch/arm64/kernel/entry.S               |   56 +-
 arch/arm64/kernel/head.S                |   49 +-
 arch/arm64/kernel/image.h               |   62 ++
 arch/arm64/kernel/kuser32.S             |    2 +-
 arch/arm64/kernel/process.c             |    6 +
 arch/arm64/kernel/ptrace.c              |    7 +
 arch/arm64/kernel/signal32.c            |    2 +-
 arch/arm64/kernel/sys_compat.c          |    2 +-
 arch/arm64/kernel/topology.c            |   47 +-
 arch/arm64/kernel/vmlinux.lds.S         |   16 +
 arch/arm64/mm/init.c                    |   12 +-
 include/uapi/linux/audit.h              |    1 +
 24 files changed, 1114 insertions(+), 469 deletions(-)
 create mode 100644 arch/arm64/include/asm/stackprotector.h
 create mode 100644 arch/arm64/kernel/image.h
Merging blackfin/for-linus (51fdc6bf9880 blackfin: defconfigs: add MTD_SPI_NOR (new dependency for M25P80))
$ git merge blackfin/for-linus
Already up-to-date.
Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h)
$ git merge c6x/for-linux-next
Already up-to-date.
Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header)
$ git merge cris/for-next
Already up-to-date.
Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h)
$ git merge hexagon/linux-next
Already up-to-date.
Merging ia64/next (e32634f5d57f pstore: Fix memory leak when decompress using big_oops_buf)
$ git merge ia64/next
Already up-to-date.
Merging m68k/for-next (47d3aef76466 m68k/sun3: Remove define statement no longer needed)
$ git merge m68k/for-next
Merge made by the 'recursive' strategy.
 arch/m68k/include/asm/sun3_pgalloc.h | 4 ----
 arch/m68k/q40/q40ints.c              | 2 +-
 drivers/zorro/names.c                | 4 ++--
 3 files changed, 3 insertions(+), 7 deletions(-)
Merging m68knommu/for-next (9a1a1aea7572 m68knommu: Remove unnecessary prototype for kobjsize())
$ git merge m68knommu/for-next
Merge made by the 'recursive' strategy.
 arch/m68k/include/asm/pgtable_no.h  | 5 -----
 arch/m68k/include/asm/virtconvert.h | 6 +-----
 2 files changed, 1 insertion(+), 10 deletions(-)
Merging metag/for-next (8bc613befaec metag: hugetlbpage: Remove null pointer checks that could never happen)
$ git merge metag/for-next
Merge made by the 'recursive' strategy.
 arch/metag/mm/hugetlbpage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging microblaze/next (08e6bbda0b48 microblaze: Wire-up renameat2 syscall)
$ git merge microblaze/next
Merge made by the 'recursive' strategy.
 arch/microblaze/include/asm/delay.h       | 28 ++++++++++++++++++++++------
 arch/microblaze/include/uapi/asm/unistd.h |  1 +
 arch/microblaze/kernel/syscall_table.S    |  3 ++-
 3 files changed, 25 insertions(+), 7 deletions(-)
Merging mips/mips-for-linux-next (de3d02f3906d Merge branch '3.16-fixes' into mips-for-linux-next)
$ git merge mips/mips-for-linux-next
Merge made by the 'recursive' strategy.
 arch/mips/rb532/devices.c        | 27 ++++-----------------------
 arch/mips/sgi-ip22/ip22-gio.c    | 10 +++++++++-
 arch/mips/txx9/generic/7segled.c | 14 +++++++++++---
 arch/mips/txx9/generic/setup.c   | 29 +++++++++++++++++++----------
 4 files changed, 43 insertions(+), 37 deletions(-)
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 (1860e379875d Linux 3.15)
$ git merge parisc-hd/for-next
Already up-to-date.
Merging powerpc/next (cd1154770ba9 powerpc/85xx: drop hypervisor specific board compatibles)
$ git merge powerpc/next
Removing drivers/pcmcia/m8xx_pcmcia.c
Removing arch/powerpc/include/asm/mpc8xx.h
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                      |    3 +-
 arch/powerpc/boot/dts/fsl/p2041si-post.dtsi      |    1 +
 arch/powerpc/boot/dts/fsl/t2080si-post.dtsi      |   69 ++
 arch/powerpc/boot/dts/fsl/t2081si-post.dtsi      |  435 ++++++++
 arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi       |   99 ++
 arch/powerpc/boot/dts/fsl/t4240si-post.dtsi      |    1 +
 arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi       |    1 +
 arch/powerpc/boot/dts/t2080qds.dts               |   57 ++
 arch/powerpc/boot/dts/t2081qds.dts               |   46 +
 arch/powerpc/boot/dts/t208xqds.dtsi              |  239 +++++
 arch/powerpc/boot/dts/t4240rdb.dts               |  186 ++++
 arch/powerpc/configs/corenet32_smp_defconfig     |    3 +-
 arch/powerpc/configs/corenet64_smp_defconfig     |    4 +
 arch/powerpc/configs/mpc85xx_defconfig           |    3 +
 arch/powerpc/configs/mpc85xx_smp_defconfig       |    3 +
 arch/powerpc/include/asm/fs_pd.h                 |    1 -
 arch/powerpc/include/asm/mpc85xx.h               |    2 +
 arch/powerpc/include/asm/mpc8xx.h                |   12 -
 arch/powerpc/include/asm/pte-fsl-booke.h         |    2 +
 arch/powerpc/include/asm/reg_booke.h             |    2 +-
 arch/powerpc/kernel/traps.c                      |    2 +-
 arch/powerpc/mm/tlb_low_64e.S                    |   19 +-
 arch/powerpc/platforms/85xx/Kconfig              |    2 +-
 arch/powerpc/platforms/85xx/corenet_generic.c    |   52 +-
 arch/powerpc/platforms/8xx/m8xx_setup.c          |    3 -
 arch/powerpc/platforms/8xx/mpc885ads_setup.c     |   62 --
 arch/powerpc/platforms/8xx/tqm8xx_setup.c        |    1 -
 arch/powerpc/sysdev/micropatch.c                 |    1 -
 drivers/net/ethernet/freescale/fs_enet/mac-fec.c |    1 -
 drivers/net/ethernet/freescale/fs_enet/mac-scc.c |    1 -
 drivers/pcmcia/Kconfig                           |   10 -
 drivers/pcmcia/Makefile                          |    1 -
 drivers/pcmcia/m8xx_pcmcia.c                     | 1168 ----------------------
 33 files changed, 1189 insertions(+), 1303 deletions(-)
 create mode 100644 arch/powerpc/boot/dts/fsl/t2080si-post.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi
 create mode 100644 arch/powerpc/boot/dts/t2080qds.dts
 create mode 100644 arch/powerpc/boot/dts/t2081qds.dts
 create mode 100644 arch/powerpc/boot/dts/t208xqds.dtsi
 create mode 100644 arch/powerpc/boot/dts/t4240rdb.dts
 delete mode 100644 arch/powerpc/include/asm/mpc8xx.h
 delete mode 100644 drivers/pcmcia/m8xx_pcmcia.c
Merging fsl/next (cd1154770ba9 powerpc/85xx: drop hypervisor specific board compatibles)
$ git merge fsl/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 s390/features (c60d0baa40f9 s390/3270: correct size detection with the read-partition command)
$ git merge s390/features
Merge made by the 'recursive' strategy.
 arch/s390/kernel/head.S     | 6 +++---
 arch/s390/pci/pci.c         | 2 +-
 drivers/s390/char/raw3270.c | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)
Merging sparc-next/master (894e552cfaa3 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security)
$ git merge sparc-next/master
Already up-to-date.
Merging tile/master (ed93567c6fbc tile: Remove tile-specific _sinitdata and _einitdata)
$ git merge tile/master
Merge made by the 'recursive' strategy.
 arch/tile/include/asm/sections.h |  3 ---
 arch/tile/kernel/traps.c         |  2 +-
 arch/tile/kernel/vmlinux.lds.S   |  2 --
 arch/tile/mm/init.c              | 12 ++++++------
 4 files changed, 7 insertions(+), 12 deletions(-)
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/shared/os.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 78ea34757c37] 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 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
$ git merge unicore32/unicore32
Already up-to-date.
Merging xtensa/for_next (55b441be5cd6 xtensa: ISS: don't depend on CONFIG_TTY)
$ git merge xtensa/for_next
Already up-to-date.
Merging btrfs/next (c7548af69d9e Btrfs: convert smp_mb__{before,after}_clear_bit)
$ git merge btrfs/next
Already up-to-date.
Merging ceph/master (437f2c0d0c01 rbd: fix ida/idr memory leak)
$ git merge ceph/master
Auto-merging fs/dcache.c
Merge made by the 'recursive' strategy.
 fs/dcache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging cifs/for-next (b68cdc6fabbf [CIFS] Remove sparse build warning)
$ git merge cifs/for-next
Merge made by the 'recursive' strategy.
 fs/cifs/cifsglob.h      |   19 +
 fs/cifs/cifsproto.h     |    4 +
 fs/cifs/cifssmb.c       |  113 +++--
 fs/cifs/connect.c       |    8 +-
 fs/cifs/file.c          |  901 +++++++++++++++++++++--------------
 fs/cifs/misc.c          |    9 +
 fs/cifs/sess.c          | 1192 +++++++++++++++++++++++++++++++++--------------
 fs/cifs/smb1ops.c       |    8 +
 fs/cifs/smb2ops.c       |   64 ++-
 fs/cifs/smb2pdu.c       |   77 ++-
 fs/cifs/smb2transport.c |    5 +
 fs/cifs/transport.c     |   25 +-
 12 files changed, 1642 insertions(+), 783 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 (27199b15e4f0 ecryptfs: Remove unnecessary include of syscall.h in keystore.c)
$ git merge ecryptfs/next
Auto-merging fs/ecryptfs/inode.c
Auto-merging fs/ecryptfs/file.c
Merge made by the 'recursive' strategy.
 fs/ecryptfs/file.c      |  4 ++--
 fs/ecryptfs/inode.c     | 16 +++++++---------
 fs/ecryptfs/keystore.c  |  1 -
 fs/ecryptfs/messaging.c |  3 +--
 4 files changed, 10 insertions(+), 14 deletions(-)
Merging ext3/for_next (19ef1229bc2e reiserfs: Fix compilation breakage with CONFIG_REISERFS_CHECK)
$ git merge ext3/for_next
Already up-to-date.
Merging ext4/dev (69a9fd008f68 ext4: fix punch hole on files with indirect mapping)
$ git merge ext4/dev
Merge made by the 'recursive' strategy.
 fs/ext4/balloc.c   |   1 -
 fs/ext4/ext4.h     |   5 +-
 fs/ext4/extents.c  |   3 +-
 fs/ext4/indirect.c | 281 ++++++++++++++++++++++++++++++++++++++---------------
 fs/ext4/inode.c    | 130 ++-----------------------
 fs/ext4/mballoc.c  |  15 +--
 fs/ext4/super.c    |  87 ++++++++---------
 7 files changed, 250 insertions(+), 272 deletions(-)
Merging f2fs/dev (4b2868aa4f07 f2fs: remove the unused stat_lock)
$ git merge f2fs/dev
Merge made by the 'recursive' strategy.
 fs/f2fs/acl.c     |   6 --
 fs/f2fs/data.c    |  43 ++++++---
 fs/f2fs/debug.c   |  17 ++--
 fs/f2fs/dir.c     |  87 ++++++++++++------
 fs/f2fs/f2fs.h    |   8 +-
 fs/f2fs/file.c    |  13 +--
 fs/f2fs/hash.c    |   4 +-
 fs/f2fs/namei.c   |  84 +++++++++++++----
 fs/f2fs/node.c    | 265 ++++++++++++++++++++++++++++++++++++------------------
 fs/f2fs/node.h    |   7 ++
 fs/f2fs/segment.c |  11 ++-
 fs/f2fs/super.c   |   7 +-
 12 files changed, 370 insertions(+), 182 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.
Merging fuse/for-next (4237ba43b65a fuse: restructure ->rename2())
$ git merge fuse/for-next
Auto-merging fs/fuse/dev.c
Merge made by the 'recursive' strategy.
 fs/fuse/dev.c   | 51 +++++++++++++++++++++++----------------------------
 fs/fuse/dir.c   | 41 ++++++++++++++++++++++++-----------------
 fs/fuse/inode.c | 22 +++++++++++++++++-----
 3 files changed, 64 insertions(+), 50 deletions(-)
Merging gfs2/master (c04d5ee35ba6 GFS2: fs/gfs2/rgrp.c: kernel-doc warning fixes)
$ git merge gfs2/master
Merge made by the 'recursive' strategy.
 fs/gfs2/file.c     |  4 ++--
 fs/gfs2/glock.c    | 14 +++++++++-----
 fs/gfs2/glops.c    |  4 ++--
 fs/gfs2/lock_dlm.c |  4 ++--
 fs/gfs2/rgrp.c     |  4 ++--
 fs/gfs2/super.c    | 20 ++++++++++----------
 6 files changed, 27 insertions(+), 23 deletions(-)
Merging jfs/jfs-next (bb5e50aaa805 fs/jfs/super.c: convert simple_str to kstr)
$ 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 (e655f945cd7b Merge branch 'bugfixes' into linux-next)
$ git merge nfs/linux-next
Merge made by the 'recursive' strategy.
 fs/nfs/blocklayout/blocklayout.c  | 101 +++++-----
 fs/nfs/callback.c                 |  12 ++
 fs/nfs/client.c                   |  10 +-
 fs/nfs/delegation.c               |  34 +++-
 fs/nfs/delegation.h               |   1 +
 fs/nfs/direct.c                   |  35 ++--
 fs/nfs/filelayout/filelayout.c    | 262 ++++++++++++------------
 fs/nfs/filelayout/filelayoutdev.c |   2 +-
 fs/nfs/internal.h                 |  12 +-
 fs/nfs/nfs3acl.c                  |  43 ++++
 fs/nfs/nfs3proc.c                 |  25 ++-
 fs/nfs/nfs4_fs.h                  |  32 +--
 fs/nfs/nfs4client.c               |   5 +
 fs/nfs/nfs4proc.c                 | 231 +++++++++++++++------
 fs/nfs/nfs4state.c                |  69 +++----
 fs/nfs/nfs4trace.h                |  28 +--
 fs/nfs/nfs4xdr.c                  |   2 +-
 fs/nfs/objlayout/objio_osd.c      |  24 +--
 fs/nfs/objlayout/objlayout.c      |  81 ++++----
 fs/nfs/objlayout/objlayout.h      |   8 +-
 fs/nfs/pagelist.c                 | 267 ++++++++++++------------
 fs/nfs/pnfs.c                     | 161 +++++----------
 fs/nfs/pnfs.h                     |  18 +-
 fs/nfs/proc.c                     |  27 +--
 fs/nfs/read.c                     |  54 +++--
 fs/nfs/super.c                    |   3 +-
 fs/nfs/write.c                    | 413 +++++++++++++++++++++++++++++---------
 fs/nfs_common/nfsacl.c            |   5 +-
 include/linux/nfs_fs_sb.h         |   1 +
 include/linux/nfs_page.h          |  15 +-
 include/linux/nfs_xdr.h           |  34 ++--
 include/linux/sunrpc/auth.h       |   2 +
 include/linux/sunrpc/auth_gss.h   |   1 +
 net/sunrpc/addr.c                 |  16 +-
 net/sunrpc/auth.c                 |  11 +-
 net/sunrpc/auth_gss/auth_gss.c    |  82 +++++---
 net/sunrpc/clnt.c                 |   5 +
 net/sunrpc/rpc_pipe.c             |   2 +-
 net/sunrpc/xprt.c                 |   1 +
 net/sunrpc/xprtsock.c             |   9 +-
 40 files changed, 1233 insertions(+), 911 deletions(-)
Merging nfsd/nfsd-next (d5d5c304b13b NFSD: Fix bad checking of space for padding in splice read)
$ git merge nfsd/nfsd-next
Resolved 'fs/nfsd/nfs4xdr.c' using previous resolution.
Auto-merging fs/nfsd/nfs4xdr.c
CONFLICT (content): Merge conflict in fs/nfsd/nfs4xdr.c
Auto-merging fs/nfsd/nfs4proc.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master ba9e26a54dfe] Merge remote-tracking branch 'nfsd/nfsd-next'
$ git diff -M --stat --summary HEAD^..
 fs/nfsd/acl.h                         |    2 +-
 fs/nfsd/export.c                      |    6 +-
 fs/nfsd/export.h                      |    3 +-
 fs/nfsd/fault_inject.c                |    8 +
 fs/nfsd/netns.h                       |   10 +-
 fs/nfsd/nfs2acl.c                     |    8 +-
 fs/nfsd/nfs3acl.c                     |    8 +-
 fs/nfsd/nfs3proc.c                    |    9 +-
 fs/nfsd/nfs3xdr.c                     |   30 +-
 fs/nfsd/nfs4acl.c                     |   39 +-
 fs/nfsd/nfs4proc.c                    |   36 +-
 fs/nfsd/nfs4state.c                   | 1084 +++++++++++++++++++++------------
 fs/nfsd/nfs4xdr.c                     |  128 ++--
 fs/nfsd/nfscache.c                    |   13 +-
 fs/nfsd/nfsctl.c                      |   51 +-
 fs/nfsd/nfsfh.c                       |   12 +-
 fs/nfsd/nfsfh.h                       |   15 +-
 fs/nfsd/nfsproc.c                     |   12 +-
 fs/nfsd/nfssvc.c                      |   16 +-
 fs/nfsd/nfsxdr.c                      |   14 +-
 fs/nfsd/state.h                       |   43 +-
 fs/nfsd/vfs.c                         |   48 +-
 fs/nfsd/vfs.h                         |    8 +-
 fs/nfsd/xdr4.h                        |   25 +-
 include/linux/sunrpc/svc.h            |    4 +-
 net/sunrpc/auth_gss/svcauth_gss.c     |    2 +-
 net/sunrpc/svc.c                      |    4 +-
 net/sunrpc/xprtrdma/svc_rdma_sendto.c |   39 +-
 28 files changed, 992 insertions(+), 685 deletions(-)
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 (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set)
$ git merge v9fs/for-next
Already up-to-date.
Merging ubifs/linux-next (e9110361a9a4 UBI: fix the volumes tree sorting criteria)
$ git merge ubifs/linux-next
Merge made by the 'recursive' strategy.
 drivers/mtd/ubi/fastmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging xfs/for-next (2451337dd043 xfs: global error sign conversion)
$ git merge xfs/for-next
Auto-merging fs/xfs/libxfs/xfs_symlink_remote.c
Auto-merging fs/xfs/libxfs/xfs_sb.c
Auto-merging fs/xfs/libxfs/xfs_inode_fork.c
Auto-merging fs/xfs/libxfs/xfs_inode_buf.c
Auto-merging fs/xfs/libxfs/xfs_ialloc_btree.c
Auto-merging fs/xfs/libxfs/xfs_ialloc.c
Auto-merging fs/xfs/libxfs/xfs_dquot_buf.c
Auto-merging fs/xfs/libxfs/xfs_dir2_sf.c
Auto-merging fs/xfs/libxfs/xfs_dir2_node.c
Auto-merging fs/xfs/libxfs/xfs_dir2_leaf.c
Auto-merging fs/xfs/libxfs/xfs_dir2_data.c
Auto-merging fs/xfs/libxfs/xfs_dir2_block.c
Auto-merging fs/xfs/libxfs/xfs_dir2.c
Auto-merging fs/xfs/libxfs/xfs_da_btree.c
Auto-merging fs/xfs/libxfs/xfs_btree.c
Auto-merging fs/xfs/libxfs/xfs_bmap_btree.c
Auto-merging fs/xfs/libxfs/xfs_bmap.c
Auto-merging fs/xfs/libxfs/xfs_attr_remote.c
Auto-merging fs/xfs/libxfs/xfs_attr_leaf.c
Auto-merging fs/xfs/libxfs/xfs_attr.c
Auto-merging fs/xfs/libxfs/xfs_alloc_btree.c
Auto-merging fs/xfs/libxfs/xfs_alloc.c
Merge made by the 'recursive' strategy.
 fs/xfs/Makefile                          |  70 +++++----
 fs/xfs/{ => libxfs}/xfs_ag.h             |   0
 fs/xfs/{ => libxfs}/xfs_alloc.c          |  20 +--
 fs/xfs/{ => libxfs}/xfs_alloc.h          |   0
 fs/xfs/{ => libxfs}/xfs_alloc_btree.c    |   6 +-
 fs/xfs/{ => libxfs}/xfs_alloc_btree.h    |   0
 fs/xfs/{ => libxfs}/xfs_attr.c           |  92 +++++------
 fs/xfs/{ => libxfs}/xfs_attr_leaf.c      |  78 +++++-----
 fs/xfs/{ => libxfs}/xfs_attr_leaf.h      |   0
 fs/xfs/{ => libxfs}/xfs_attr_remote.c    |  22 +--
 fs/xfs/{ => libxfs}/xfs_attr_remote.h    |   0
 fs/xfs/{ => libxfs}/xfs_attr_sf.h        |   0
 fs/xfs/{ => libxfs}/xfs_bit.h            |   0
 fs/xfs/{ => libxfs}/xfs_bmap.c           |  52 +++----
 fs/xfs/{ => libxfs}/xfs_bmap.h           |   0
 fs/xfs/{ => libxfs}/xfs_bmap_btree.c     |  10 +-
 fs/xfs/{ => libxfs}/xfs_bmap_btree.h     |   0
 fs/xfs/{ => libxfs}/xfs_btree.c          |  14 +-
 fs/xfs/{ => libxfs}/xfs_btree.h          |   0
 fs/xfs/{ => libxfs}/xfs_cksum.h          |   0
 fs/xfs/{ => libxfs}/xfs_da_btree.c       | 110 ++++++-------
 fs/xfs/{ => libxfs}/xfs_da_btree.h       |   0
 fs/xfs/{ => libxfs}/xfs_da_format.c      |   0
 fs/xfs/{ => libxfs}/xfs_da_format.h      |   0
 fs/xfs/{ => libxfs}/xfs_dinode.h         |   0
 fs/xfs/{ => libxfs}/xfs_dir2.c           |  24 +--
 fs/xfs/{ => libxfs}/xfs_dir2.h           |   0
 fs/xfs/{ => libxfs}/xfs_dir2_block.c     |  18 +--
 fs/xfs/{ => libxfs}/xfs_dir2_data.c      |  10 +-
 fs/xfs/{ => libxfs}/xfs_dir2_leaf.c      |  24 +--
 fs/xfs/{ => libxfs}/xfs_dir2_node.c      |  40 ++---
 fs/xfs/{ => libxfs}/xfs_dir2_priv.h      |   0
 fs/xfs/{ => libxfs}/xfs_dir2_sf.c        |  30 ++--
 fs/xfs/{ => libxfs}/xfs_dquot_buf.c      |   6 +-
 fs/xfs/{ => libxfs}/xfs_format.h         |   0
 fs/xfs/{ => libxfs}/xfs_ialloc.c         |  34 ++--
 fs/xfs/{ => libxfs}/xfs_ialloc.h         |   0
 fs/xfs/{ => libxfs}/xfs_ialloc_btree.c   |   6 +-
 fs/xfs/{ => libxfs}/xfs_ialloc_btree.h   |   0
 fs/xfs/{ => libxfs}/xfs_inode_buf.c      |  10 +-
 fs/xfs/{ => libxfs}/xfs_inode_buf.h      |   0
 fs/xfs/{ => libxfs}/xfs_inode_fork.c     |  32 ++--
 fs/xfs/{ => libxfs}/xfs_inode_fork.h     |   0
 fs/xfs/{ => libxfs}/xfs_inum.h           |   0
 fs/xfs/{ => libxfs}/xfs_log_format.h     |   0
 fs/xfs/{ => libxfs}/xfs_log_recover.h    |   0
 fs/xfs/{ => libxfs}/xfs_log_rlimit.c     |   0
 fs/xfs/{ => libxfs}/xfs_quota_defs.h     |   0
 fs/xfs/{ => libxfs}/xfs_rtbitmap.c       |   0
 fs/xfs/{ => libxfs}/xfs_sb.c             |  32 ++--
 fs/xfs/{ => libxfs}/xfs_sb.h             |   0
 fs/xfs/{ => libxfs}/xfs_shared.h         |   0
 fs/xfs/{ => libxfs}/xfs_symlink_remote.c |   6 +-
 fs/xfs/{ => libxfs}/xfs_trans_resv.c     |   0
 fs/xfs/{ => libxfs}/xfs_trans_resv.h     |   0
 fs/xfs/{ => libxfs}/xfs_trans_space.h    |   0
 fs/xfs/xfs_acl.c                         |   8 +-
 fs/xfs/xfs_aops.c                        |  18 +--
 fs/xfs/xfs_attr_inactive.c               |  22 +--
 fs/xfs/xfs_attr_list.c                   |  38 ++---
 fs/xfs/xfs_bmap_util.c                   |  78 +++++-----
 fs/xfs/xfs_buf.c                         |  26 ++--
 fs/xfs/xfs_buf.h                         |   2 +-
 fs/xfs/xfs_buf_item.c                    |   4 +-
 fs/xfs/xfs_dir2_readdir.c                |   4 +-
 fs/xfs/xfs_discard.c                     |  18 +--
 fs/xfs/xfs_dquot.c                       |  38 ++---
 fs/xfs/xfs_error.c                       |  25 +--
 fs/xfs/xfs_error.h                       |  13 +-
 fs/xfs/xfs_export.c                      |  10 +-
 fs/xfs/xfs_extfree_item.c                |   2 +-
 fs/xfs/xfs_file.c                        |  42 ++---
 fs/xfs/xfs_filestream.c                  |   4 +-
 fs/xfs/xfs_fsops.c                       |  42 ++---
 fs/xfs/xfs_icache.c                      |  52 +++----
 fs/xfs/xfs_icache.h                      |  10 +-
 fs/xfs/xfs_inode.c                       |  66 ++++----
 fs/xfs/xfs_inode_item.c                  |   2 +-
 fs/xfs/xfs_ioctl.c                       | 256 +++++++++++++++----------------
 fs/xfs/xfs_ioctl32.c                     | 106 ++++++-------
 fs/xfs/xfs_iomap.c                       |  34 ++--
 fs/xfs/xfs_iops.c                        |  68 ++++----
 fs/xfs/xfs_itable.c                      |  24 +--
 fs/xfs/xfs_linux.h                       |   2 +-
 fs/xfs/xfs_log.c                         |  52 +++----
 fs/xfs/xfs_log_cil.c                     |   6 +-
 fs/xfs/xfs_log_recover.c                 | 191 +++++++++++------------
 fs/xfs/xfs_mount.c                       |  70 ++++-----
 fs/xfs/xfs_mru_cache.c                   |  14 +-
 fs/xfs/xfs_qm.c                          |  32 ++--
 fs/xfs/xfs_qm_bhv.c                      |   2 +-
 fs/xfs/xfs_qm_syscalls.c                 |  46 +++---
 fs/xfs/xfs_quotaops.c                    |  18 +--
 fs/xfs/xfs_rtalloc.c                     |  20 +--
 fs/xfs/xfs_rtalloc.h                     |   2 +-
 fs/xfs/xfs_super.c                       |  88 +++++------
 fs/xfs/xfs_symlink.c                     |  30 ++--
 fs/xfs/xfs_trans.c                       |  10 +-
 fs/xfs/xfs_trans_ail.c                   |   4 +-
 fs/xfs/xfs_trans_buf.c                   |  37 +++--
 fs/xfs/xfs_trans_dquot.c                 |   4 +-
 fs/xfs/xfs_xattr.c                       |   6 +-
 102 files changed, 1180 insertions(+), 1212 deletions(-)
 rename fs/xfs/{ => libxfs}/xfs_ag.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_alloc.c (99%)
 rename fs/xfs/{ => libxfs}/xfs_alloc.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_alloc_btree.c (99%)
 rename fs/xfs/{ => libxfs}/xfs_alloc_btree.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_attr.c (97%)
 rename fs/xfs/{ => libxfs}/xfs_attr_leaf.c (98%)
 rename fs/xfs/{ => libxfs}/xfs_attr_leaf.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_attr_remote.c (98%)
 rename fs/xfs/{ => libxfs}/xfs_attr_remote.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_attr_sf.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_bit.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_bmap.c (99%)
 rename fs/xfs/{ => libxfs}/xfs_bmap.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_bmap_btree.c (99%)
 rename fs/xfs/{ => libxfs}/xfs_bmap_btree.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_btree.c (99%)
 rename fs/xfs/{ => libxfs}/xfs_btree.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_cksum.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_da_btree.c (97%)
 rename fs/xfs/{ => libxfs}/xfs_da_btree.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_da_format.c (100%)
 rename fs/xfs/{ => libxfs}/xfs_da_format.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_dinode.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_dir2.c (98%)
 rename fs/xfs/{ => libxfs}/xfs_dir2.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_dir2_block.c (99%)
 rename fs/xfs/{ => libxfs}/xfs_dir2_data.c (99%)
 rename fs/xfs/{ => libxfs}/xfs_dir2_leaf.c (99%)
 rename fs/xfs/{ => libxfs}/xfs_dir2_node.c (98%)
 rename fs/xfs/{ => libxfs}/xfs_dir2_priv.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_dir2_sf.c (98%)
 rename fs/xfs/{ => libxfs}/xfs_dquot_buf.c (98%)
 rename fs/xfs/{ => libxfs}/xfs_format.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_ialloc.c (99%)
 rename fs/xfs/{ => libxfs}/xfs_ialloc.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_ialloc_btree.c (98%)
 rename fs/xfs/{ => libxfs}/xfs_ialloc_btree.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_inode_buf.c (98%)
 rename fs/xfs/{ => libxfs}/xfs_inode_buf.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_inode_fork.c (99%)
 rename fs/xfs/{ => libxfs}/xfs_inode_fork.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_inum.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_log_format.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_log_recover.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_log_rlimit.c (100%)
 rename fs/xfs/{ => libxfs}/xfs_quota_defs.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_rtbitmap.c (100%)
 rename fs/xfs/{ => libxfs}/xfs_sb.c (97%)
 rename fs/xfs/{ => libxfs}/xfs_sb.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_shared.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_symlink_remote.c (97%)
 rename fs/xfs/{ => libxfs}/xfs_trans_resv.c (100%)
 rename fs/xfs/{ => libxfs}/xfs_trans_resv.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_trans_space.h (100%)
Merging file-private-locks/linux-next (a497c3ba1d97 Linux 3.16-rc2)
$ git merge file-private-locks/linux-next
Already up-to-date.
Merging vfs/for-next (cd67b9ac44ea switch iov_iter_get_pages() to passing maximal number of pages)
$ git merge vfs/for-next
Auto-merging include/linux/uio.h
Merge made by the 'recursive' strategy.
 fs/direct-io.c      |  2 +-
 fs/fuse/file.c      |  4 ++--
 include/linux/uio.h |  2 +-
 mm/iov_iter.c       | 17 ++++++++---------
 4 files changed, 12 insertions(+), 13 deletions(-)
Merging pci/next (1d0df48692af Merge branches 'pci/host-rcar', 'pci/hotplug', 'pci/iommu', 'pci/misc' and 'pci/msi' into next)
$ git merge pci/next
Merge made by the 'recursive' strategy.
 drivers/pci/host/pcie-rcar.c       | 156 +++++++++++++++++--------------------
 drivers/pci/hotplug/cpqphp_sysfs.c |   3 +-
 drivers/pci/hotplug/pciehp.h       |   3 +-
 drivers/pci/hotplug/pciehp_core.c  |   7 ++
 drivers/pci/hotplug/pciehp_hpc.c   | 101 +++++++++++-------------
 drivers/pci/msi.c                  |  59 +++++---------
 drivers/pci/pci-label.c            |  18 +++--
 drivers/pci/pcie/portdrv_pci.c     |   4 -
 drivers/pci/quirks.c               |   2 +
 include/linux/msi.h                |   3 +-
 10 files changed, 163 insertions(+), 193 deletions(-)
Merging hid/for-next (1d259fbdd1dc Merge branch 'for-3.17/cp2112' into for-next)
$ git merge hid/for-next
Auto-merging drivers/hid/usbhid/hid-quirks.c
Auto-merging drivers/hid/hid-ids.h
Auto-merging drivers/hid/Kconfig
Merge made by the 'recursive' strategy.
 .../ABI/testing/sysfs-class-hid-driver-gt683r      |  14 +
 drivers/hid/Kconfig                                |  16 +-
 drivers/hid/Makefile                               |   1 +
 drivers/hid/hid-core.c                             |   1 +
 drivers/hid/hid-cp2112.c                           |   8 +-
 drivers/hid/hid-gt683r.c                           | 309 +++++++++++++++++++++
 drivers/hid/hid-ids.h                              |   2 +-
 drivers/hid/hid-picolcd_debugfs.c                  |   9 +-
 drivers/hid/hid-roccat-lua.c                       |   2 +-
 drivers/hid/hid-sony.c                             | 130 ++++++---
 drivers/hid/usbhid/hid-core.c                      |   2 +-
 drivers/hid/usbhid/hid-quirks.c                    |   2 +-
 12 files changed, 438 insertions(+), 58 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-class-hid-driver-gt683r
 create mode 100644 drivers/hid/hid-gt683r.c
Merging i2c/i2c/for-next (2fd6cf0523fc i2c: taos-evm: Use module_serio_driver())
$ git merge i2c/i2c/for-next
Merge made by the 'recursive' strategy.
 drivers/i2c/Kconfig               |  18 +-
 drivers/i2c/Makefile              |   5 +-
 drivers/i2c/busses/i2c-taos-evm.c |  13 +-
 drivers/i2c/i2c-acpi.c            | 362 ++++++++++++++++++++++++++++++++++++++
 drivers/i2c/i2c-core.c            |  97 +---------
 include/linux/acpi.h              |  11 ++
 include/linux/i2c.h               |  12 ++
 7 files changed, 409 insertions(+), 109 deletions(-)
 create mode 100644 drivers/i2c/i2c-acpi.c
Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7)
$ git merge jdelvare-hwmon/master
Already up-to-date.
Merging hwmon-staging/hwmon-next (0b06e14a229c hwmon: (pmbus) Add tps40422 front-end driver)
$ git merge hwmon-staging/hwmon-next
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/hwmon/ntc_thermistor.txt   |   1 +
 .../devicetree/bindings/i2c/trivial-devices.txt    |   1 +
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 Documentation/hwmon/lm75                           |   5 +-
 Documentation/hwmon/ntc_thermistor                 |   5 +
 Documentation/hwmon/pmbus                          |   5 +-
 Documentation/hwmon/powr1220                       |  45 ++
 Documentation/hwmon/tmp103                         |  28 +
 Documentation/hwmon/tmp421                         |  26 +-
 Documentation/hwmon/tps40422                       |  64 +++
 drivers/hwmon/Kconfig                              |  31 +-
 drivers/hwmon/Makefile                             |   2 +
 drivers/hwmon/ad7414.c                             |  57 +-
 drivers/hwmon/ad7418.c                             | 133 ++---
 drivers/hwmon/adm1021.c                            | 175 +++---
 drivers/hwmon/adm1025.c                            | 231 ++++----
 drivers/hwmon/adm1026.c                            | 588 ++++++++++-----------
 drivers/hwmon/adm1029.c                            | 208 +++-----
 drivers/hwmon/adm1031.c                            | 349 ++++++------
 drivers/hwmon/adm9240.c                            | 339 ++++++------
 drivers/hwmon/ads7828.c                            |  52 +-
 drivers/hwmon/amc6821.c                            | 380 ++++++-------
 drivers/hwmon/atxp1.c                              |  76 +--
 drivers/hwmon/emc1403.c                            |   2 +-
 drivers/hwmon/emc6w201.c                           |  64 +--
 drivers/hwmon/fam15h_power.c                       |  51 +-
 drivers/hwmon/g760a.c                              |  84 +--
 drivers/hwmon/gl518sm.c                            | 319 +++++------
 drivers/hwmon/gl520sm.c                            | 353 ++++++-------
 drivers/hwmon/gpio-fan.c                           |  17 +-
 drivers/hwmon/hih6130.c                            |  88 +--
 drivers/hwmon/htu21.c                              |  69 +--
 drivers/hwmon/lineage-pem.c                        |  66 +--
 drivers/hwmon/lm63.c                               |  27 +-
 drivers/hwmon/lm75.c                               |   8 +
 drivers/hwmon/lm93.c                               | 154 +++---
 drivers/hwmon/ltc2945.c                            |   2 +-
 drivers/hwmon/ltc4222.c                            |   2 +-
 drivers/hwmon/ltc4260.c                            |   2 +-
 drivers/hwmon/ntc_thermistor.c                     |  50 +-
 drivers/hwmon/pmbus/Kconfig                        |  13 +-
 drivers/hwmon/pmbus/Makefile                       |   1 +
 drivers/hwmon/pmbus/pmbus.c                        |   1 -
 drivers/hwmon/pmbus/tps40422.c                     |  64 +++
 drivers/hwmon/powr1220.c                           | 391 ++++++++++++++
 drivers/hwmon/smm665.c                             |  44 +-
 drivers/hwmon/tmp103.c                             | 206 ++++++++
 drivers/hwmon/tmp421.c                             |  37 +-
 drivers/hwmon/twl4030-madc-hwmon.c                 |  38 +-
 drivers/hwmon/w83791d.c                            |  15 +-
 drivers/hwmon/w83l786ng.c                          | 289 +++++-----
 drivers/hwmon/wm831x-hwmon.c                       |  72 +--
 drivers/hwmon/wm8350-hwmon.c                       |  50 +-
 include/linux/platform_data/ntc_thermistor.h       |   1 +
 54 files changed, 2733 insertions(+), 2649 deletions(-)
 create mode 100644 Documentation/hwmon/powr1220
 create mode 100644 Documentation/hwmon/tmp103
 create mode 100644 Documentation/hwmon/tps40422
 create mode 100644 drivers/hwmon/pmbus/tps40422.c
 create mode 100644 drivers/hwmon/powr1220.c
 create mode 100644 drivers/hwmon/tmp103.c
Merging v4l-dvb/master (ac35b35b30aa Merge branch 'patchwork' into to_next)
$ git merge v4l-dvb/master
Removing drivers/media/platform/soc_camera/mx1_camera.c
Merge made by the 'recursive' strategy.
 drivers/media/dvb-core/dvb_frontend.c          |   8 +-
 drivers/media/dvb-core/dvbdev.h                |   4 +
 drivers/media/dvb-frontends/au8522_decoder.c   | 180 +++--
 drivers/media/dvb-frontends/au8522_priv.h      |   2 +
 drivers/media/dvb-frontends/dib7000p.c         | 433 ++++++++++++-
 drivers/media/dvb-frontends/dib7000p.h         | 131 +---
 drivers/media/dvb-frontends/dib8000.c          |  88 +--
 drivers/media/dvb-frontends/dib8000.h          | 150 +----
 drivers/media/dvb-frontends/drxd.h             |   1 -
 drivers/media/dvb-frontends/drxd_hard.c        |   3 +-
 drivers/media/dvb-frontends/si2168.c           |  16 +-
 drivers/media/dvb-frontends/si2168_priv.h      |   2 +-
 drivers/media/i2c/smiapp/smiapp-core.c         |   6 +-
 drivers/media/pci/cx23885/cx23885-dvb.c        |   8 +-
 drivers/media/pci/saa7134/saa7134-empress.c    |   2 +-
 drivers/media/platform/davinci/vpif_capture.c  | 245 ++-----
 drivers/media/platform/davinci/vpif_capture.h  |  11 -
 drivers/media/platform/m2m-deinterlace.c       |   7 +-
 drivers/media/platform/soc_camera/Kconfig      |  18 +-
 drivers/media/platform/soc_camera/Makefile     |   1 -
 drivers/media/platform/soc_camera/mx1_camera.c | 866 -------------------------
 drivers/media/platform/soc_camera/rcar_vin.c   |  12 +-
 drivers/media/platform/soc_camera/soc_camera.c |  12 +-
 drivers/media/platform/vsp1/vsp1_video.c       |   2 -
 drivers/media/platform/vsp1/vsp1_video.h       |   1 -
 drivers/media/rc/img-ir/img-ir-core.c          |   5 +
 drivers/media/rc/img-ir/img-ir-hw.c            |   5 +
 drivers/media/rc/img-ir/img-ir-hw.h            |   5 +
 drivers/media/rc/img-ir/img-ir-jvc.c           |   5 +
 drivers/media/rc/img-ir/img-ir-nec.c           |   5 +
 drivers/media/rc/img-ir/img-ir-raw.c           |   5 +
 drivers/media/rc/img-ir/img-ir-raw.h           |   5 +
 drivers/media/rc/img-ir/img-ir-sanyo.c         |   5 +
 drivers/media/rc/img-ir/img-ir-sharp.c         |   5 +
 drivers/media/rc/img-ir/img-ir-sony.c          |   5 +
 drivers/media/rc/img-ir/img-ir.h               |   5 +
 drivers/media/tuners/si2157.c                  |   2 +-
 drivers/media/usb/au0828/Kconfig               |   1 +
 drivers/media/usb/au0828/au0828-video.c        |  60 +-
 drivers/media/usb/dvb-usb-v2/lmedm04.c         |  25 +-
 drivers/media/usb/dvb-usb/cxusb.c              |  39 +-
 drivers/media/usb/dvb-usb/dib0700_devices.c    | 464 ++++++++-----
 drivers/media/usb/dvb-usb/technisat-usb2.c     |   2 +-
 drivers/media/usb/usbtv/usbtv-core.c           |   2 +
 drivers/media/v4l2-core/v4l2-dv-timings.c      |   4 +-
 drivers/staging/media/omap4iss/Kconfig         |   2 +-
 46 files changed, 1160 insertions(+), 1705 deletions(-)
 delete mode 100644 drivers/media/platform/soc_camera/mx1_camera.c
Merging kbuild/for-next (6296fcc8a669 Merge branch 'kbuild/kbuild' into kbuild/for-next)
$ git merge kbuild/for-next
Auto-merging lib/Kconfig.debug
Auto-merging arch/x86/Kconfig
Auto-merging Makefile
Merge made by the 'recursive' strategy.
 Documentation/lto-build  | 173 +++++++++++++++++++++++++++++++++++++++++++++++
 Makefile                 |  19 +++++-
 arch/x86/Kconfig         |   2 +-
 init/Kconfig             |  73 ++++++++++++++++++++
 kernel/gcov/Kconfig      |   2 +-
 lib/Kconfig.debug        |   2 +-
 scripts/Makefile.clean   |   4 +-
 scripts/Makefile.lto     |  84 +++++++++++++++++++++++
 scripts/Makefile.modpost |   7 +-
 scripts/link-vmlinux.sh  |   2 +-
 10 files changed, 358 insertions(+), 10 deletions(-)
 create mode 100644 Documentation/lto-build
 create mode 100644 scripts/Makefile.lto
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 (c4666b089d2b Merge branch 'for-3.16-fixes' into for-next)
$ git merge libata/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/ata/ahci-platform.txt      |   6 -
 Documentation/devicetree/bindings/ata/imx-sata.txt |  36 +++++
 drivers/ata/ahci_imx.c                             | 180 ++++++++++++++++++++-
 drivers/ata/ahci_xgene.c                           |  10 --
 drivers/ata/libahci_platform.c                     |  13 ++
 drivers/ata/pata_samsung_cf.c                      |  13 --
 drivers/ata/sata_fsl.c                             |   5 +-
 include/linux/platform_data/ata-samsung_cf.h       |   1 -
 8 files changed, 223 insertions(+), 41 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/ata/imx-sata.txt
Merging pm/linux-next (c1e3b247e688 Merge branch 'acpi-scan' into linux-next)
$ git merge pm/linux-next
Merge made by the 'recursive' strategy.
 Documentation/acpi/enumeration.txt                 |    6 -
 arch/x86/kernel/apm_32.c                           |    1 -
 drivers/acpi/acpi_extlog.c                         |   14 +-
 drivers/acpi/acpica/Makefile                       |    2 +-
 drivers/acpi/acpica/acapps.h                       |    9 +-
 drivers/acpi/acpica/acdebug.h                      |    3 -
 drivers/acpi/acpica/acglobal.h                     |    8 +-
 drivers/acpi/acpica/acutils.h                      |   39 +-
 drivers/acpi/acpica/evgpe.c                        |   32 +-
 drivers/acpi/acpica/exfield.c                      |    4 +-
 drivers/acpi/acpica/hwregs.c                       |    3 +-
 drivers/acpi/acpica/nsobject.c                     |   10 +
 drivers/acpi/acpica/utbuffer.c                     |  128 ++
 drivers/acpi/acpica/utcopy.c                       |    6 +
 drivers/acpi/acpica/utdebug.c                      |   26 +
 drivers/acpi/acpica/utfileio.c                     |  332 +++++
 drivers/acpi/acpica/utglobal.c                     |  146 ---
 drivers/acpi/acpica/utinit.c                       |  145 +++
 drivers/acpi/acpica/utprint.c                      |  661 ++++++++++
 drivers/acpi/apei/apei-internal.h                  |   10 +-
 drivers/acpi/apei/ghes.c                           |   32 +-
 drivers/acpi/blacklist.c                           |   83 --
 drivers/acpi/internal.h                            |    2 -
 drivers/acpi/video.c                               |   76 +-
 drivers/firmware/efi/cper.c                        |   20 +-
 drivers/pnp/pnpacpi/core.c                         |   41 +-
 include/acpi/acpi_bus.h                            |    2 +
 include/acpi/acpiosxf.h                            |   31 +
 include/acpi/acpixf.h                              |   22 +-
 include/acpi/actbl1.h                              |   14 +-
 include/acpi/actbl2.h                              |    2 +-
 include/acpi/actypes.h                             |   14 +
 include/acpi/ghes.h                                |    2 +-
 include/acpi/platform/acenv.h                      |   53 +-
 tools/power/acpi/Makefile                          |    5 +
 tools/power/acpi/common/cmfsize.c                  |   20 +-
 tools/power/acpi/common/getopt.c                   |   14 +-
 .../acpi/os_specific/service_layers/oslibcfs.c     |  214 ++++
 .../acpi/os_specific/service_layers/oslinuxtbl.c   |   48 +-
 .../acpi/os_specific/service_layers/osunixxf.c     | 1311 ++++++++++++++++++++
 tools/power/acpi/tools/acpidump/acpidump.h         |    3 +-
 tools/power/acpi/tools/acpidump/apdump.c           |  108 +-
 tools/power/acpi/tools/acpidump/apfiles.c          |   92 +-
 tools/power/acpi/tools/acpidump/apmain.c           |   96 +-
 44 files changed, 3357 insertions(+), 533 deletions(-)
 create mode 100644 drivers/acpi/acpica/utfileio.c
 create mode 100644 drivers/acpi/acpica/utprint.c
 create mode 100644 tools/power/acpi/os_specific/service_layers/oslibcfs.c
 create mode 100644 tools/power/acpi/os_specific/service_layers/osunixxf.c
Merging idle/next (23a299cd9378 Merge branches 'turbostat' and 'intel_idle' into release)
$ git merge idle/next
Already up-to-date.
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
$ 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 (b6902baa1fab Merge branch 'for-rc' of .git into next)
$ git merge thermal/next
Merge made by the 'recursive' strategy.
 drivers/thermal/cpu_cooling.c     |  2 +-
 drivers/thermal/int3403_thermal.c | 67 +++++++++++++++++++++++++++++++++++----
 include/linux/thermal.h           | 46 +++++++++++++++++++++++++--
 3 files changed, 105 insertions(+), 10 deletions(-)
Merging ieee1394/for-next (655fc39bf403 firewire: IEEE 1394 (FireWire) support should depend on HAS_DMA)
$ git merge ieee1394/for-next
Merge made by the 'recursive' strategy.
 drivers/firewire/Kconfig | 1 +
 1 file changed, 1 insertion(+)
Merging dlm/next (883854c5457a dlm: keep listening connection alive with sctp mode)
$ git merge dlm/next
Already up-to-date.
Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid)
$ git merge swiotlb/linux-next
Already up-to-date.
Merging slave-dma/next (d1a792f3b407 Update imx-sdma cyclic handling to report residue)
$ git merge slave-dma/next
Already up-to-date.
Merging dmaengine/next (fbeec99ad5c0 dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup())
$ git merge dmaengine/next
Auto-merging drivers/dma/mv_xor.c
Merge made by the 'recursive' strategy.
 drivers/dma/ioat/dca.c    | 13 ++++----
 drivers/dma/ioat/dma.c    |  2 +-
 drivers/dma/ioat/dma_v3.c |  6 ++--
 drivers/dma/mv_xor.c      | 80 +++++++++++++++++++++++++++++++++++++----------
 4 files changed, 74 insertions(+), 27 deletions(-)
Merging net-next/master (279f64b7a771 net/hsr: Remove left-over never-true conditional code.)
$ git merge net-next/master
Auto-merging net/wireless/nl80211.c
Removing net/wireless/ethtool.h
Auto-merging net/tipc/msg.c
Removing net/sctp/command.c
Auto-merging net/openvswitch/datapath.c
Auto-merging net/netlink/af_netlink.c
Auto-merging net/mac80211/util.c
Removing net/mac80211/rc80211_pid_debugfs.c
Removing net/mac80211/rc80211_pid_algo.c
Removing net/mac80211/rc80211_pid.h
Auto-merging net/ipv6/udp.c
Auto-merging net/ipv4/udp.c
Auto-merging net/ipv4/tcp_output.c
Auto-merging net/ipv4/tcp_input.c
Auto-merging net/core/dev.c
Auto-merging net/appletalk/ddp.c
Auto-merging net/8021q/vlan_dev.c
Auto-merging include/net/sock.h
Auto-merging include/linux/mlx4/device.h
Auto-merging drivers/net/wireless/mwifiex/uap_txrx.c
Auto-merging drivers/net/wireless/mwifiex/txrx.c
Auto-merging drivers/net/wireless/mwifiex/tdls.c
Auto-merging drivers/net/wireless/mwifiex/sta_tx.c
Auto-merging drivers/net/wireless/mwifiex/main.c
Auto-merging drivers/net/wireless/mwifiex/cmdevt.c
Auto-merging drivers/net/wireless/mwifiex/cfg80211.c
Auto-merging drivers/net/wireless/mwifiex/11n_aggr.c
Auto-merging drivers/net/wireless/brcm80211/brcmfmac/usb.c
Auto-merging drivers/net/usb/r8152.c
Auto-merging drivers/net/phy/dp83640.c
Auto-merging drivers/net/fddi/defxx.c
Auto-merging drivers/net/ethernet/realtek/r8169.c
Auto-merging drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
Auto-merging drivers/net/ethernet/mellanox/mlx4/en_rx.c
Auto-merging drivers/net/ethernet/mellanox/mlx4/en_netdev.c
Auto-merging drivers/net/ethernet/intel/igb/igb_main.c
Auto-merging drivers/net/ethernet/emulex/benet/be_main.c
Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Auto-merging drivers/net/ethernet/broadcom/bcmsysport.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../bindings/net/broadcom-systemport.txt           |    3 +-
 .../devicetree/bindings/net/ieee802154/cc2520.txt  |   29 +
 .../devicetree/bindings/net/marvell-pp2.txt        |   61 +
 Documentation/networking/ip-sysctl.txt             |   21 +
 Documentation/networking/pktgen.txt                |   28 +
 MAINTAINERS                                        |   15 +-
 drivers/bcma/Makefile                              |    1 +
 drivers/bcma/driver_gpio.c                         |    1 +
 drivers/bcma/driver_pcie2.c                        |  175 +
 drivers/bcma/main.c                                |    8 +
 drivers/infiniband/hw/cxgb4/cm.c                   |    3 +-
 drivers/net/bonding/bond_main.c                    |   20 -
 drivers/net/ethernet/amd/Kconfig                   |    2 +
 drivers/net/ethernet/amd/declance.c                |   12 +-
 drivers/net/ethernet/amd/xgbe/xgbe-common.h        |   28 +-
 drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c       |    7 +-
 drivers/net/ethernet/amd/xgbe/xgbe-desc.c          |   23 +-
 drivers/net/ethernet/amd/xgbe/xgbe-dev.c           |  417 +-
 drivers/net/ethernet/amd/xgbe/xgbe-drv.c           |  213 +-
 drivers/net/ethernet/amd/xgbe/xgbe-main.c          |   23 +-
 drivers/net/ethernet/amd/xgbe/xgbe.h               |   74 +-
 drivers/net/ethernet/arc/emac.h                    |    4 -
 drivers/net/ethernet/arc/emac_main.c               |   11 +-
 drivers/net/ethernet/broadcom/Kconfig              |    8 +-
 drivers/net/ethernet/broadcom/bcmsysport.c         |  489 +-
 drivers/net/ethernet/broadcom/bcmsysport.h         |   14 +-
 drivers/net/ethernet/broadcom/bnx2.c               |    9 +-
 drivers/net/ethernet/broadcom/bnx2.h               |    5 +-
 drivers/net/ethernet/broadcom/bnx2_fw.h            |    3 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x.h        |    9 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c    |   55 +-
 .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c    |   44 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   |    9 +
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c  |  264 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h  |   35 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c   |   78 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h   |   23 +-
 drivers/net/ethernet/broadcom/cnic.c               |   10 +-
 drivers/net/ethernet/broadcom/cnic.h               |    3 +-
 drivers/net/ethernet/broadcom/cnic_defs.h          |    3 +-
 drivers/net/ethernet/broadcom/cnic_if.h            |    3 +-
 drivers/net/ethernet/chelsio/Kconfig               |   11 +
 drivers/net/ethernet/chelsio/cxgb4/Makefile        |    1 +
 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h         |   33 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c     |  980 +++
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h     |  141 +
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |  372 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h     |    3 +-
 drivers/net/ethernet/chelsio/cxgb4/l2t.c           |    2 +-
 drivers/net/ethernet/chelsio/cxgb4/l2t.h           |    2 +-
 drivers/net/ethernet/chelsio/cxgb4/sge.c           |    2 +-
 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c         |  348 +-
 drivers/net/ethernet/chelsio/cxgb4/t4_hw.h         |    2 +-
 drivers/net/ethernet/chelsio/cxgb4/t4_msg.h        |    2 +-
 drivers/net/ethernet/chelsio/cxgb4/t4_regs.h       |    8 +-
 drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h      |   97 +-
 .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c    |    9 +
 drivers/net/ethernet/cisco/enic/Makefile           |    2 +-
 drivers/net/ethernet/cisco/enic/enic.h             |   45 +-
 drivers/net/ethernet/cisco/enic/enic_api.c         |    4 +-
 drivers/net/ethernet/cisco/enic/enic_clsf.c        |  269 +
 drivers/net/ethernet/cisco/enic/enic_clsf.h        |   22 +
 drivers/net/ethernet/cisco/enic/enic_dev.c         |   80 +-
 drivers/net/ethernet/cisco/enic/enic_dev.h         |    4 +-
 drivers/net/ethernet/cisco/enic/enic_ethtool.c     |   27 +-
 drivers/net/ethernet/cisco/enic/enic_main.c        |  245 +-
 drivers/net/ethernet/cisco/enic/enic_res.c         |    1 +
 drivers/net/ethernet/cisco/enic/vnic_dev.c         |   65 +-
 drivers/net/ethernet/cisco/enic/vnic_dev.h         |    2 +
 drivers/net/ethernet/cisco/enic/vnic_devcmd.h      |    5 +
 drivers/net/ethernet/cisco/enic/vnic_enet.h        |    2 +
 drivers/net/ethernet/cisco/enic/vnic_rq.h          |  122 +
 drivers/net/ethernet/emulex/benet/be.h             |    9 +-
 drivers/net/ethernet/emulex/benet/be_cmds.c        |  226 +-
 drivers/net/ethernet/emulex/benet/be_cmds.h        |    9 +-
 drivers/net/ethernet/emulex/benet/be_main.c        |  141 +-
 drivers/net/ethernet/freescale/fec.h               |   10 +-
 drivers/net/ethernet/freescale/fec_main.c          |  373 +-
 drivers/net/ethernet/intel/i40e/i40e.h             |    8 +-
 drivers/net/ethernet/intel/i40e/i40e_adminq.c      |  103 +-
 drivers/net/ethernet/intel/i40e/i40e_adminq.h      |    3 +
 drivers/net/ethernet/intel/i40e/i40e_common.c      |  312 +-
 drivers/net/ethernet/intel/i40e/i40e_debugfs.c     |    6 +-
 drivers/net/ethernet/intel/i40e/i40e_ethtool.c     |  449 +-
 drivers/net/ethernet/intel/i40e/i40e_hmc.h         |    4 +-
 drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c     |  247 +-
 drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h     |   28 +-
 drivers/net/ethernet/intel/i40e/i40e_main.c        |  461 +-
 drivers/net/ethernet/intel/i40e/i40e_nvm.c         |    9 +-
 drivers/net/ethernet/intel/i40e/i40e_prototype.h   |   14 +-
 drivers/net/ethernet/intel/i40e/i40e_ptp.c         |  125 +-
 drivers/net/ethernet/intel/i40e/i40e_register.h    | 5011 ++++++---------
 drivers/net/ethernet/intel/i40e/i40e_txrx.c        |  143 +-
 drivers/net/ethernet/intel/i40e/i40e_txrx.h        |    7 +-
 drivers/net/ethernet/intel/i40e/i40e_type.h        |   16 +-
 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c |    6 +-
 drivers/net/ethernet/intel/i40evf/i40e_adminq.c    |  103 +-
 drivers/net/ethernet/intel/i40evf/i40e_adminq.h    |    3 +
 drivers/net/ethernet/intel/i40evf/i40e_common.c    |    2 +-
 drivers/net/ethernet/intel/i40evf/i40e_hmc.h       |    4 +-
 drivers/net/ethernet/intel/i40evf/i40e_lan_hmc.h   |   28 +-
 drivers/net/ethernet/intel/i40evf/i40e_register.h  | 5011 ++++++---------
 drivers/net/ethernet/intel/i40evf/i40e_txrx.c      |    7 +-
 drivers/net/ethernet/intel/i40evf/i40e_txrx.h      |    7 +-
 drivers/net/ethernet/intel/i40evf/i40e_type.h      |   16 +-
 drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c |    4 +-
 drivers/net/ethernet/intel/i40evf/i40evf_main.c    |   21 +-
 .../net/ethernet/intel/i40evf/i40evf_virtchnl.c    |   44 +-
 drivers/net/ethernet/intel/igb/igb_main.c          |    2 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c       |   16 +-
 drivers/net/ethernet/marvell/Kconfig               |    8 +
 drivers/net/ethernet/marvell/Makefile              |    1 +
 drivers/net/ethernet/marvell/mvpp2.c               | 6393 ++++++++++++++++++++
 drivers/net/ethernet/mellanox/mlx4/en_netdev.c     |   33 +-
 drivers/net/ethernet/mellanox/mlx4/en_rx.c         |    2 +-
 drivers/net/ethernet/mellanox/mlx4/en_selftest.c   |    3 +-
 drivers/net/ethernet/mellanox/mlx4/mlx4.h          |    5 -
 drivers/net/ethernet/mellanox/mlx4/mlx4_en.h       |    4 +-
 drivers/net/ethernet/mellanox/mlx4/port.c          |   32 +-
 drivers/net/ethernet/qlogic/qlcnic/qlcnic.h        |    4 +-
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c   |   48 +-
 drivers/net/ethernet/realtek/r8169.c               |  220 +-
 drivers/net/ethernet/renesas/sh_eth.c              |   18 +-
 drivers/net/ethernet/ti/cpmac.c                    |  279 +-
 drivers/net/ethernet/ti/cpts.c                     |   24 +-
 drivers/net/ethernet/ti/tlan.c                     |  224 +-
 drivers/net/ethernet/ti/tlan.h                     |    5 +-
 drivers/net/ethernet/xilinx/ll_temac_main.c        |    2 +-
 drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c  |    2 +-
 drivers/net/ethernet/xilinx/xilinx_emaclite.c      |    2 +-
 drivers/net/fddi/defxx.c                           |  142 +-
 drivers/net/fddi/defxx.h                           |    2 +-
 drivers/net/hyperv/hyperv_net.h                    |    3 +-
 drivers/net/hyperv/netvsc.c                        |    4 +-
 drivers/net/hyperv/netvsc_drv.c                    |   41 +-
 drivers/net/hyperv/rndis_filter.c                  |   21 +-
 drivers/net/ieee802154/Kconfig                     |   12 +
 drivers/net/ieee802154/Makefile                    |    1 +
 drivers/net/ieee802154/at86rf230.c                 | 1464 +++--
 drivers/net/ieee802154/cc2520.c                    | 1039 ++++
 drivers/net/ieee802154/mrf24j40.c                  |  115 +-
 drivers/net/irda/kingsun-sir.c                     |    4 +-
 drivers/net/phy/dp83640.c                          |   88 +-
 drivers/net/phy/phy_device.c                       |    2 +
 drivers/net/usb/r8152.c                            |   38 +-
 drivers/net/veth.c                                 |   18 +
 drivers/net/vxlan.c                                |   29 +-
 drivers/net/wireless/at76c50x-usb.c                |    3 +-
 drivers/net/wireless/ath/ath.h                     |    1 +
 drivers/net/wireless/ath/ath10k/mac.c              |    3 +-
 drivers/net/wireless/ath/ath5k/ath5k.h             |    1 +
 drivers/net/wireless/ath/ath5k/base.c              |   31 +-
 drivers/net/wireless/ath/ath5k/mac80211-ops.c      |    2 +
 drivers/net/wireless/ath/ath9k/Makefile            |    3 +-
 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |    3 +-
 drivers/net/wireless/ath/ath9k/ar9003_hw.c         |   15 +-
 drivers/net/wireless/ath/ath9k/ar9003_phy.c        |    6 +-
 drivers/net/wireless/ath/ath9k/ar953x_initvals.h   |  201 +-
 drivers/net/wireless/ath/ath9k/ath9k.h             |  159 +-
 drivers/net/wireless/ath/ath9k/beacon.c            |   97 +-
 drivers/net/wireless/ath/ath9k/channel.c           |  685 +++
 drivers/net/wireless/ath/ath9k/common-beacon.c     |    5 +-
 drivers/net/wireless/ath/ath9k/debug.c             |   28 +-
 drivers/net/wireless/ath/ath9k/hw.c                |   26 +-
 drivers/net/wireless/ath/ath9k/hw.h                |    1 +
 drivers/net/wireless/ath/ath9k/init.c              |   57 +-
 drivers/net/wireless/ath/ath9k/link.c              |    6 +-
 drivers/net/wireless/ath/ath9k/main.c              |  892 ++-
 drivers/net/wireless/ath/ath9k/mci.c               |    4 +-
 drivers/net/wireless/ath/ath9k/pci.c               |    1 +
 drivers/net/wireless/ath/ath9k/recv.c              |   16 +-
 drivers/net/wireless/ath/ath9k/reg.h               |    4 +
 drivers/net/wireless/ath/ath9k/tx99.c              |    2 +-
 drivers/net/wireless/ath/ath9k/wow.c               |    1 +
 drivers/net/wireless/ath/ath9k/xmit.c              |  114 +-
 drivers/net/wireless/ath/wil6210/cfg80211.c        |   68 +-
 drivers/net/wireless/ath/wil6210/debugfs.c         |  305 +-
 drivers/net/wireless/ath/wil6210/interrupt.c       |    3 +
 drivers/net/wireless/ath/wil6210/main.c            |   22 +-
 drivers/net/wireless/ath/wil6210/pcie_bus.c        |   31 +-
 drivers/net/wireless/ath/wil6210/rx_reorder.c      |    1 +
 drivers/net/wireless/ath/wil6210/txrx.c            |   33 +-
 drivers/net/wireless/ath/wil6210/wil6210.h         |   10 +-
 drivers/net/wireless/ath/wil6210/wmi.c             |   40 +-
 drivers/net/wireless/b43/Kconfig                   |    9 +
 drivers/net/wireless/b43/Makefile                  |    6 +-
 drivers/net/wireless/b43/main.c                    |  311 +-
 drivers/net/wireless/b43/phy_a.c                   |    2 +-
 drivers/net/wireless/b43/phy_a.h                   |    4 -
 drivers/net/wireless/b43/phy_common.c              |   26 +-
 drivers/net/wireless/b43/phy_common.h              |   12 +-
 drivers/net/wireless/b43/phy_ht.c                  |    2 +-
 drivers/net/wireless/b43/phy_n.c                   |  360 +-
 drivers/net/wireless/b43/radio_2057.c              |  122 +-
 drivers/net/wireless/b43/radio_2057.h              |   66 +
 drivers/net/wireless/b43/tables_nphy.c             |  470 +-
 drivers/net/wireless/b43/tables_nphy.h             |    4 +
 drivers/net/wireless/brcm80211/brcmfmac/Makefile   |    3 +-
 drivers/net/wireless/brcm80211/brcmfmac/btcoex.c   |   38 +-
 drivers/net/wireless/brcm80211/brcmfmac/dhd.h      |   10 -
 .../net/wireless/brcm80211/brcmfmac/dhd_common.c   |    7 +
 drivers/net/wireless/brcm80211/brcmfmac/fwil.c     |    2 +-
 drivers/net/wireless/brcm80211/brcmfmac/p2p.c      |    2 +-
 drivers/net/wireless/brcm80211/brcmfmac/usb.c      |  214 +-
 drivers/net/wireless/brcm80211/brcmfmac/vendor.c   |  115 +
 drivers/net/wireless/brcm80211/brcmfmac/vendor.h   |   64 +
 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c  |   81 +-
 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h  |    2 +-
 .../net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c  |    6 +-
 drivers/net/wireless/cw1200/scan.c                 |    3 +-
 drivers/net/wireless/cw1200/scan.h                 |    2 +-
 drivers/net/wireless/cw1200/sta.c                  |    3 +-
 drivers/net/wireless/ipw2x00/libipw_module.c       |    3 +-
 drivers/net/wireless/iwlegacy/common.c             |    3 +-
 drivers/net/wireless/iwlegacy/common.h             |    2 +-
 drivers/net/wireless/iwlwifi/dvm/mac80211.c        |    3 +-
 drivers/net/wireless/iwlwifi/dvm/power.c           |    9 +
 drivers/net/wireless/iwlwifi/iwl-8000.c            |    5 +-
 drivers/net/wireless/iwlwifi/iwl-config.h          |    2 +-
 drivers/net/wireless/iwlwifi/iwl-drv.c             |   15 +
 drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c    |    1 -
 drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h   |   50 +-
 drivers/net/wireless/iwlwifi/iwl-fw-file.h         |    6 +-
 drivers/net/wireless/iwlwifi/iwl-fw.h              |   12 +
 drivers/net/wireless/iwlwifi/iwl-modparams.h       |    2 +
 drivers/net/wireless/iwlwifi/iwl-nvm-parse.c       |   99 +-
 drivers/net/wireless/iwlwifi/iwl-prph.h            |    6 +
 drivers/net/wireless/iwlwifi/mvm/Makefile          |    2 +-
 drivers/net/wireless/iwlwifi/mvm/coex.c            |  350 +-
 drivers/net/wireless/iwlwifi/mvm/coex_legacy.c     | 1332 ++++
 drivers/net/wireless/iwlwifi/mvm/constants.h       |    2 +
 drivers/net/wireless/iwlwifi/mvm/debugfs.c         |  232 +-
 drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h     |  220 +-
 drivers/net/wireless/iwlwifi/mvm/fw-api-power.h    |    2 +-
 drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h     |  256 +-
 drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h      |    7 +-
 drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h       |   30 +-
 drivers/net/wireless/iwlwifi/mvm/fw-api.h          |   11 +-
 drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c        |  111 +-
 drivers/net/wireless/iwlwifi/mvm/mac80211.c        |  496 +-
 drivers/net/wireless/iwlwifi/mvm/mvm.h             |   98 +-
 drivers/net/wireless/iwlwifi/mvm/nvm.c             |   31 +-
 drivers/net/wireless/iwlwifi/mvm/ops.c             |  114 +-
 drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c        |   26 +
 drivers/net/wireless/iwlwifi/mvm/power.c           |   39 +-
 drivers/net/wireless/iwlwifi/mvm/quota.c           |   38 +-
 drivers/net/wireless/iwlwifi/mvm/rs.c              |   96 +-
 drivers/net/wireless/iwlwifi/mvm/rs.h              |   19 +-
 drivers/net/wireless/iwlwifi/mvm/rx.c              |   17 +
 drivers/net/wireless/iwlwifi/mvm/scan.c            |  540 +-
 drivers/net/wireless/iwlwifi/mvm/sta.c             |   74 +
 drivers/net/wireless/iwlwifi/mvm/sta.h             |   12 +
 drivers/net/wireless/iwlwifi/mvm/time-event.c      |   73 +
 drivers/net/wireless/iwlwifi/mvm/time-event.h      |   29 +
 drivers/net/wireless/iwlwifi/mvm/tx.c              |   25 +-
 drivers/net/wireless/iwlwifi/mvm/utils.c           |   65 -
 drivers/net/wireless/iwlwifi/pcie/internal.h       |    7 +
 drivers/net/wireless/iwlwifi/pcie/trans.c          |  145 +-
 drivers/net/wireless/iwlwifi/pcie/tx.c             |    1 +
 drivers/net/wireless/libertas/Kconfig              |    2 +-
 drivers/net/wireless/libertas/cmd.c                |    1 +
 drivers/net/wireless/mac80211_hwsim.c              |   69 +-
 drivers/net/wireless/mwifiex/11ac.c                |    2 +-
 drivers/net/wireless/mwifiex/11ac.h                |    2 +-
 drivers/net/wireless/mwifiex/11h.c                 |    2 +-
 drivers/net/wireless/mwifiex/11n.c                 |    2 +-
 drivers/net/wireless/mwifiex/11n.h                 |    2 +-
 drivers/net/wireless/mwifiex/11n_aggr.c            |    2 +-
 drivers/net/wireless/mwifiex/11n_aggr.h            |    2 +-
 drivers/net/wireless/mwifiex/11n_rxreorder.c       |    2 +-
 drivers/net/wireless/mwifiex/11n_rxreorder.h       |    2 +-
 drivers/net/wireless/mwifiex/Makefile              |    2 +-
 drivers/net/wireless/mwifiex/README                |   32 +-
 drivers/net/wireless/mwifiex/cfg80211.c            |   55 +-
 drivers/net/wireless/mwifiex/cfg80211.h            |    2 +-
 drivers/net/wireless/mwifiex/cfp.c                 |    2 +-
 drivers/net/wireless/mwifiex/cmdevt.c              |   30 +-
 drivers/net/wireless/mwifiex/debugfs.c             |   95 +-
 drivers/net/wireless/mwifiex/decl.h                |    2 +-
 drivers/net/wireless/mwifiex/ethtool.c             |   85 +-
 drivers/net/wireless/mwifiex/fw.h                  |    2 +-
 drivers/net/wireless/mwifiex/ie.c                  |    2 +-
 drivers/net/wireless/mwifiex/init.c                |   15 +-
 drivers/net/wireless/mwifiex/ioctl.h               |    2 +-
 drivers/net/wireless/mwifiex/join.c                |    2 +-
 drivers/net/wireless/mwifiex/main.c                |    8 +-
 drivers/net/wireless/mwifiex/main.h                |   34 +-
 drivers/net/wireless/mwifiex/pcie.c                |  195 +-
 drivers/net/wireless/mwifiex/pcie.h                |   12 +-
 drivers/net/wireless/mwifiex/scan.c                |    2 +-
 drivers/net/wireless/mwifiex/sdio.c                |  240 +-
 drivers/net/wireless/mwifiex/sdio.h                |   14 +-
 drivers/net/wireless/mwifiex/sta_cmd.c             |    2 +-
 drivers/net/wireless/mwifiex/sta_cmdresp.c         |    2 +-
 drivers/net/wireless/mwifiex/sta_event.c           |    2 +-
 drivers/net/wireless/mwifiex/sta_ioctl.c           |    8 +-
 drivers/net/wireless/mwifiex/sta_rx.c              |    2 +-
 drivers/net/wireless/mwifiex/sta_tx.c              |    2 +-
 drivers/net/wireless/mwifiex/tdls.c                |    8 +-
 drivers/net/wireless/mwifiex/txrx.c                |    2 +-
 drivers/net/wireless/mwifiex/uap_cmd.c             |    2 +-
 drivers/net/wireless/mwifiex/uap_event.c           |    2 +-
 drivers/net/wireless/mwifiex/uap_txrx.c            |    6 +-
 drivers/net/wireless/mwifiex/usb.c                 |    2 +-
 drivers/net/wireless/mwifiex/usb.h                 |    2 +-
 drivers/net/wireless/mwifiex/util.c                |    2 +-
 drivers/net/wireless/mwifiex/util.h                |    2 +-
 drivers/net/wireless/mwifiex/wmm.c                 |   11 +-
 drivers/net/wireless/mwifiex/wmm.h                 |    2 +-
 drivers/net/wireless/orinoco/Kconfig               |    4 +-
 drivers/net/wireless/p54/p54spi.c                  |    2 +-
 drivers/net/wireless/rsi/rsi_91x_core.c            |   85 +-
 drivers/net/wireless/rsi/rsi_91x_debugfs.c         |   10 +-
 drivers/net/wireless/rsi/rsi_91x_mac80211.c        |  143 +-
 drivers/net/wireless/rsi/rsi_91x_mgmt.c            |  239 +-
 drivers/net/wireless/rsi/rsi_91x_pkt.c             |   17 +
 drivers/net/wireless/rsi/rsi_91x_sdio.c            |    6 +-
 drivers/net/wireless/rsi/rsi_91x_sdio_ops.c        |    8 +-
 drivers/net/wireless/rsi/rsi_91x_usb.c             |   88 +-
 drivers/net/wireless/rsi/rsi_main.h                |   12 +
 drivers/net/wireless/rsi/rsi_mgmt.h                |   25 +-
 drivers/net/wireless/rsi/rsi_sdio.h                |    8 +-
 drivers/net/wireless/rt2x00/rt2800lib.c            |   69 +-
 drivers/net/wireless/rt2x00/rt2x00dev.c            |   10 +-
 drivers/net/wireless/rt2x00/rt2x00mac.c            |   20 +-
 drivers/net/wireless/rt2x00/rt2x00mmio.c           |    8 +-
 drivers/net/wireless/rt2x00/rt2x00queue.c          |   21 +-
 drivers/net/wireless/rt2x00/rt2x00queue.h          |    1 +
 drivers/net/wireless/rtl818x/rtl8180/dev.c         |   78 +-
 drivers/net/wireless/rtl818x/rtl8180/rtl8180.h     |    1 +
 .../net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h  |    2 +-
 drivers/net/wireless/rtlwifi/rtl8188ee/hw.c        |    2 +-
 drivers/net/wireless/rtlwifi/rtl8188ee/reg.h       |    1 +
 drivers/net/wireless/rtlwifi/rtl8192ce/hw.c        |    2 +-
 drivers/net/wireless/rtlwifi/rtl8192ce/reg.h       |    1 +
 drivers/net/wireless/rtlwifi/rtl8192cu/hw.c        |    2 +-
 drivers/net/wireless/rtlwifi/rtl8192de/hw.c        |    2 +-
 drivers/net/wireless/rtlwifi/rtl8192de/phy.c       |    3 +-
 drivers/net/wireless/rtlwifi/rtl8192de/reg.h       |    1 +
 drivers/net/wireless/rtlwifi/rtl8723ae/hw.c        |    2 +-
 drivers/net/wireless/rtlwifi/rtl8723ae/reg.h       |    1 +
 drivers/net/wireless/rtlwifi/rtl8723be/hw.c        |    2 +-
 drivers/net/wireless/rtlwifi/rtl8723be/reg.h       |    1 +
 drivers/net/wireless/ti/wl1251/main.c              |    3 +-
 drivers/net/wireless/ti/wl12xx/scan.c              |   20 +-
 drivers/net/wireless/ti/wl12xx/scan.h              |    2 +-
 drivers/net/wireless/ti/wl18xx/scan.c              |   16 +-
 drivers/net/wireless/ti/wl18xx/scan.h              |    2 +-
 drivers/net/wireless/ti/wlcore/cmd.c               |   11 +-
 drivers/net/wireless/ti/wlcore/cmd.h               |    3 +-
 drivers/net/wireless/ti/wlcore/main.c              |    5 +-
 drivers/net/wireless/ti/wlcore/scan.h              |    2 +-
 drivers/net/wireless/ti/wlcore/wlcore.h            |    2 +-
 drivers/net/xen-netback/common.h                   |   11 +
 drivers/net/xen-netback/interface.c                |    2 +-
 drivers/net/xen-netback/netback.c                  |   11 +
 drivers/net/xen-netback/xenbus.c                   |  178 +-
 drivers/ptp/ptp_chardev.c                          |    9 +-
 include/linux/arcdevice.h                          |   10 +-
 include/linux/bcma/bcma.h                          |    2 +
 include/linux/bcma/bcma_driver_pcie2.h             |  158 +
 include/linux/crc32.h                              |   20 +-
 include/linux/filter.h                             |   13 +
 include/linux/ieee80211.h                          |    3 +
 include/linux/if_bridge.h                          |   20 +
 include/linux/ipv6.h                               |   24 +-
 include/linux/kernel.h                             |    2 +-
 include/linux/mlx4/device.h                        |   11 +
 include/linux/netdevice.h                          |    6 +-
 include/linux/ptp_classify.h                       |    5 +-
 include/linux/rndis.h                              |    1 +
 include/linux/rtnetlink.h                          |    1 +
 include/linux/skbuff.h                             |   11 +-
 include/linux/spi/cc2520.h                         |   26 +
 include/linux/tcp.h                                |    3 -
 include/net/cfg80211.h                             |   38 +-
 include/net/flow_keys.h                            |   15 +
 include/net/inet_sock.h                            |    6 +-
 include/net/inet_timewait_sock.h                   |    3 +-
 include/net/ip.h                                   |   14 +
 include/net/ipv6.h                                 |   45 +
 include/net/mac80211.h                             |   71 +-
 include/net/mac802154.h                            |   19 +
 include/net/netns/ipv6.h                           |    1 +
 include/net/sch_generic.h                          |    2 +-
 include/net/sctp/command.h                         |   39 +-
 include/net/sctp/sctp.h                            |   21 -
 include/net/sock.h                                 |   15 +-
 include/net/tcp.h                                  |   59 +-
 include/net/udp.h                                  |   29 +
 include/net/vxlan.h                                |    2 -
 include/uapi/linux/in6.h                           |    1 +
 include/uapi/linux/ipv6.h                          |    1 +
 include/uapi/linux/nl80211.h                       |    5 +
 include/uapi/linux/sysctl.h                        |    1 +
 include/uapi/linux/tipc_config.h                   |    2 +-
 kernel/sysctl_binary.c                             |    1 +
 lib/crc32.c                                        |  153 +-
 lib/net_utils.c                                    |   10 +-
 net/8021q/vlan_dev.c                               |    2 +
 net/appletalk/ddp.c                                |    2 +-
 net/batman-adv/sysfs.c                             |   24 +-
 net/bridge/br_fdb.c                                |   24 +-
 net/bridge/br_multicast.c                          |   37 +
 net/bridge/br_private.h                            |    2 +-
 net/caif/caif_socket.c                             |    3 +-
 net/core/dev.c                                     |   12 +-
 net/core/filter.c                                  |   15 +-
 net/core/flow_dissector.c                          |   85 +-
 net/core/netpoll.c                                 |    3 +-
 net/core/pktgen.c                                  |  110 +-
 net/core/ptp_classifier.c                          |   64 +-
 net/core/request_sock.c                            |   43 +-
 net/core/rtnetlink.c                               |   87 +-
 net/core/timestamping.c                            |   57 +-
 net/dccp/ipv6.c                                    |    2 +-
 net/dccp/minisocks.c                               |    4 +-
 net/dsa/dsa.c                                      |    3 +-
 net/hsr/Makefile                                   |    3 +-
 net/hsr/hsr_device.c                               |  580 +-
 net/hsr/hsr_device.h                               |   12 +-
 net/hsr/hsr_forward.c                              |  368 ++
 net/hsr/hsr_forward.h                              |   20 +
 net/hsr/hsr_framereg.c                             |  477 +-
 net/hsr/hsr_framereg.h                             |   45 +-
 net/hsr/hsr_main.c                                 |  425 +-
 net/hsr/hsr_main.h                                 |   61 +-
 net/hsr/hsr_netlink.c                              |  102 +-
 net/hsr/hsr_netlink.h                              |   11 +-
 net/hsr/hsr_slave.c                                |  196 +
 net/hsr/hsr_slave.h                                |   38 +
 net/ieee802154/6lowpan_iphc.c                      |  113 +-
 net/ieee802154/6lowpan_rtnl.c                      |   16 +-
 net/ieee802154/af_ieee802154.c                     |   26 +-
 net/ieee802154/dgram.c                             |   28 +-
 net/ieee802154/ieee802154.h                        |    2 +-
 net/ieee802154/netlink.c                           |    4 +-
 net/ieee802154/nl-mac.c                            |   48 +-
 net/ieee802154/nl-phy.c                            |   23 +-
 net/ieee802154/raw.c                               |   14 +-
 net/ieee802154/reassembly.c                        |    1 +
 net/ieee802154/wpan-class.c                        |   10 +-
 net/ipv4/datagram.c                                |    1 +
 net/ipv4/ipconfig.c                                |    5 +-
 net/ipv4/syncookies.c                              |    3 +-
 net/ipv4/tcp_input.c                               |  150 +
 net/ipv4/tcp_ipv4.c                                |  194 +-
 net/ipv4/tcp_minisocks.c                           |    2 +-
 net/ipv4/tcp_output.c                              |   16 +
 net/ipv4/udp.c                                     |    9 +-
 net/ipv6/addrconf.c                                |   10 +
 net/ipv6/af_inet6.c                                |    7 +-
 net/ipv6/datagram.c                                |    1 +
 net/ipv6/ip6_gre.c                                 |    7 +-
 net/ipv6/ip6_output.c                              |    7 +-
 net/ipv6/ip6_tunnel.c                              |    3 +-
 net/ipv6/ipv6_sockglue.c                           |   12 +-
 net/ipv6/ndisc.c                                   |   56 +-
 net/ipv6/syncookies.c                              |    2 +-
 net/ipv6/sysctl_net_ipv6.c                         |    8 +
 net/ipv6/tcp_ipv6.c                                |  209 +-
 net/ipv6/udp.c                                     |    3 +-
 net/irda/irlmp.c                                   |    3 +-
 net/mac80211/Kconfig                               |   17 -
 net/mac80211/Makefile                              |    6 +-
 net/mac80211/agg-tx.c                              |    8 +-
 net/mac80211/cfg.c                                 |  555 +-
 net/mac80211/chan.c                                |  861 ++-
 net/mac80211/debugfs_sta.c                         |    3 +-
 net/mac80211/driver-ops.h                          |   20 +-
 net/mac80211/ethtool.c                             |  244 +
 net/mac80211/ibss.c                                |    2 +-
 net/mac80211/ieee80211_i.h                         |   88 +-
 net/mac80211/iface.c                               |   13 +-
 net/mac80211/main.c                                |   10 +-
 net/mac80211/mesh.c                                |    4 +-
 net/mac80211/mesh_plink.c                          |   30 +-
 net/mac80211/mlme.c                                |  134 +-
 net/mac80211/offchannel.c                          |    6 +-
 net/mac80211/pm.c                                  |    6 +-
 net/mac80211/rate.h                                |   13 -
 net/mac80211/rc80211_pid.h                         |  278 -
 net/mac80211/rc80211_pid_algo.c                    |  478 --
 net/mac80211/rc80211_pid_debugfs.c                 |  228 -
 net/mac80211/rx.c                                  |    2 +
 net/mac80211/scan.c                                |  118 +-
 net/mac80211/sta_info.c                            |  201 +-
 net/mac80211/sta_info.h                            |   13 +-
 net/mac80211/status.c                              |    7 +-
 net/mac80211/tdls.c                                |  293 +-
 net/mac80211/trace.h                               |    7 +
 net/mac80211/tx.c                                  |  170 +-
 net/mac80211/util.c                                |  270 +-
 net/mac80211/wep.c                                 |   20 -
 net/mac802154/ieee802154_dev.c                     |   64 +-
 net/mac802154/llsec.c                              |    1 +
 net/mac802154/mib.c                                |    7 +-
 net/mac802154/tx.c                                 |    1 +
 net/netlink/af_netlink.c                           |   15 +-
 net/openvswitch/datapath.c                         |    9 +-
 net/openvswitch/vport-internal_dev.c               |   16 +
 net/openvswitch/vport-internal_dev.h               |    2 +
 net/openvswitch/vport-vxlan.c                      |    5 +-
 net/sched/em_canid.c                               |    7 -
 net/sched/sch_generic.c                            |    4 +-
 net/sctp/Makefile                                  |    2 +-
 net/sctp/command.c                                 |   68 -
 net/sctp/sysctl.c                                  |    5 +-
 net/sctp/transport.c                               |   17 +-
 net/tipc/link.c                                    |  545 +-
 net/tipc/link.h                                    |    2 +
 net/tipc/msg.c                                     |  282 +-
 net/tipc/msg.h                                     |   32 +-
 net/tipc/net.c                                     |   63 +-
 net/tipc/net.h                                     |    2 -
 net/tipc/node.c                                    |   25 +-
 net/tipc/node.h                                    |   17 +
 net/tipc/node_subscr.c                             |    6 +-
 net/tipc/port.c                                    |  328 +-
 net/tipc/port.h                                    |   40 -
 net/tipc/socket.c                                  |  490 +-
 net/tipc/socket.h                                  |   14 +
 net/wireless/core.c                                |    3 -
 net/wireless/ethtool.c                             |   86 +-
 net/wireless/ethtool.h                             |    6 -
 net/wireless/nl80211.c                             |   15 +-
 net/wireless/rdev-ops.h                            |   54 +-
 net/wireless/trace.h                               |   59 +-
 528 files changed, 34799 insertions(+), 16528 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
 create mode 100644 Documentation/devicetree/bindings/net/marvell-pp2.txt
 create mode 100644 drivers/bcma/driver_pcie2.c
 create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c
 create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h
 create mode 100644 drivers/net/ethernet/cisco/enic/enic_clsf.c
 create mode 100644 drivers/net/ethernet/cisco/enic/enic_clsf.h
 create mode 100644 drivers/net/ethernet/marvell/mvpp2.c
 create mode 100644 drivers/net/ieee802154/cc2520.c
 create mode 100644 drivers/net/wireless/ath/ath9k/channel.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/vendor.c
 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/vendor.h
 create mode 100644 drivers/net/wireless/iwlwifi/mvm/coex_legacy.c
 create mode 100644 include/linux/bcma/bcma_driver_pcie2.h
 create mode 100644 include/linux/spi/cc2520.h
 create mode 100644 net/hsr/hsr_forward.c
 create mode 100644 net/hsr/hsr_forward.h
 create mode 100644 net/hsr/hsr_slave.c
 create mode 100644 net/hsr/hsr_slave.h
 create mode 100644 net/mac80211/ethtool.c
 delete mode 100644 net/mac80211/rc80211_pid.h
 delete mode 100644 net/mac80211/rc80211_pid_algo.c
 delete mode 100644 net/mac80211/rc80211_pid_debugfs.c
 delete mode 100644 net/sctp/command.c
 delete mode 100644 net/wireless/ethtool.h
Merging ipsec-next/master (1759389e8af4 xfrm4: Remove duplicate semicolon)
$ git merge ipsec-next/master
Merge made by the 'recursive' strategy.
 net/ipv4/ip_vti.c         | 54 ++++++++++++++++++-----------------------------
 net/ipv4/xfrm4_protocol.c |  2 +-
 net/ipv6/ip6_vti.c        | 51 ++++++++++++++++++--------------------------
 3 files changed, 42 insertions(+), 65 deletions(-)
Merging wireless-next/master (ca424b202241 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next)
$ git merge wireless-next/master
Removing net/bluetooth/6lowpan.h
Merge made by the 'recursive' strategy.
 drivers/bluetooth/Kconfig         |   12 +-
 drivers/bluetooth/ath3k.c         |    6 +-
 drivers/bluetooth/btmrvl_drv.h    |    3 +
 drivers/bluetooth/btmrvl_main.c   |   44 +-
 drivers/bluetooth/btmrvl_sdio.c   |    5 +
 drivers/bluetooth/btmrvl_sdio.h   |    2 +
 drivers/bluetooth/btusb.c         |  187 +++++-
 drivers/bluetooth/hci_h5.c        |    4 -
 drivers/bluetooth/hci_vhci.c      |   34 +-
 include/net/bluetooth/bluetooth.h |   18 +-
 include/net/bluetooth/hci.h       |  135 +++-
 include/net/bluetooth/hci_core.h  |  134 ++--
 include/net/bluetooth/l2cap.h     |   36 +-
 include/net/bluetooth/mgmt.h      |   99 +++
 net/bluetooth/6lowpan.c           |  857 +++++++++++++++++++------
 net/bluetooth/6lowpan.h           |   47 --
 net/bluetooth/Kconfig             |    6 +-
 net/bluetooth/Makefile            |    4 +-
 net/bluetooth/a2mp.c              |    8 +-
 net/bluetooth/af_bluetooth.c      |    2 +-
 net/bluetooth/hci_conn.c          |  164 +++--
 net/bluetooth/hci_core.c          |  909 ++++++++++++++-------------
 net/bluetooth/hci_event.c         |  698 +++++++++++++++------
 net/bluetooth/hci_sock.c          |   12 +-
 net/bluetooth/l2cap_core.c        |  144 +++--
 net/bluetooth/l2cap_sock.c        |   46 +-
 net/bluetooth/mgmt.c              | 1254 +++++++++++++++++++++++++++++++------
 net/bluetooth/smp.c               |  177 +++---
 net/bluetooth/smp.h               |    7 +
 29 files changed, 3645 insertions(+), 1409 deletions(-)
 delete mode 100644 net/bluetooth/6lowpan.h
Merging bluetooth/master (5a54e7c85b83 Bluetooth: Convert L2CAP ident spinlock into a mutex)
$ git merge bluetooth/master
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                       |   7 +
 drivers/bluetooth/hci_ldisc.c                     |  25 +++-
 drivers/bluetooth/hci_uart.h                      |   1 +
 fs/compat_ioctl.c                                 |   2 +-
 include/net/bluetooth/hci.h                       | 150 +------------------
 include/net/bluetooth/hci_core.h                  |  34 +----
 include/net/bluetooth/hci_sock.h                  | 175 ++++++++++++++++++++++
 include/net/bluetooth/l2cap.h                     |   8 +-
 include/net/bluetooth/sco.h                       |  30 ----
 net/6lowpan/Kconfig                               |   6 +
 net/6lowpan/Makefile                              |   3 +
 net/{ieee802154/6lowpan_iphc.c => 6lowpan/iphc.c} |   0
 net/Kconfig                                       |   1 +
 net/Makefile                                      |   3 +-
 net/bluetooth/Kconfig                             |   3 +-
 net/bluetooth/hci_core.c                          | 134 ++++++++++++-----
 net/bluetooth/hci_event.c                         |  45 ++----
 net/bluetooth/hci_sock.c                          |  21 ++-
 net/bluetooth/l2cap_core.c                        |   8 +-
 net/bluetooth/mgmt.c                              | 116 ++++----------
 net/bluetooth/sco.c                               | 105 ++++++++-----
 net/bluetooth/smp.c                               |  33 ++--
 net/ieee802154/Kconfig                            |   9 +-
 net/ieee802154/Makefile                           |   5 +-
 24 files changed, 481 insertions(+), 443 deletions(-)
 create mode 100644 include/net/bluetooth/hci_sock.h
 create mode 100644 net/6lowpan/Kconfig
 create mode 100644 net/6lowpan/Makefile
 rename net/{ieee802154/6lowpan_iphc.c => 6lowpan/iphc.c} (100%)
Merging infiniband/for-next (e082dbeccab6 Merge branches 'cxgb4' and 'mlx5' into for-next)
$ git merge infiniband/for-next
Auto-merging drivers/infiniband/hw/cxgb4/cm.c
Merge made by the 'recursive' strategy.
 drivers/infiniband/hw/cxgb4/cm.c             | 14 +++++++++++---
 drivers/infiniband/hw/cxgb4/device.c         | 18 +++++++++++-------
 drivers/infiniband/hw/cxgb4/iw_cxgb4.h       |  2 +-
 drivers/net/ethernet/mellanox/mlx5/core/mr.c | 19 +++++++++++++++----
 4 files changed, 38 insertions(+), 15 deletions(-)
Merging mtd/master (6938ad40cb97 mtd: devices: elm: fix elm_context_save() and elm_context_restore() functions)
$ git merge mtd/master
Merge made by the 'recursive' strategy.
 drivers/mtd/devices/elm.c | 2 ++
 1 file changed, 2 insertions(+)
Merging l2-mtd/master (61c13b7104d3 mtd: cfi_cmdset_0001.c: add support for Sharp LH28F640BF NOR)
$ git merge l2-mtd/master
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-class-mtd |  38 ++++
 drivers/mtd/chips/cfi_cmdset_0001.c       |  43 ++++
 drivers/mtd/chips/cfi_cmdset_0002.c       | 350 ++++++++++++++++++++++++++++--
 drivers/mtd/cmdlinepart.c                 |   2 +-
 drivers/mtd/devices/phram.c               |   4 +-
 drivers/mtd/ftl.c                         |   3 -
 drivers/mtd/maps/rbtx4939-flash.c         |   2 -
 drivers/mtd/mtdcore.c                     |  59 ++++-
 drivers/mtd/mtdpart.c                     |  13 +-
 drivers/mtd/nand/bf5xx_nand.c             |  24 --
 drivers/mtd/nand/lpc32xx_mlc.c            |   6 -
 drivers/mtd/nand/lpc32xx_slc.c            |   6 -
 drivers/mtd/nand/nand_base.c              |  18 ++
 drivers/mtd/nand/nand_bbt.c               |  14 ++
 drivers/mtd/nand/s3c2410.c                |   4 +-
 drivers/mtd/spi-nor/spi-nor.c             |  52 +++++
 fs/jffs2/acl.c                            |   3 +-
 fs/jffs2/xattr.c                          |   3 +-
 include/linux/mtd/mtd.h                   |   2 +
 include/linux/mtd/nand.h                  |   1 +
 include/linux/mtd/spi-nor.h               |   4 +
 21 files changed, 578 insertions(+), 73 deletions(-)
Merging crypto/master (96956aef2ff5 crypto: drbg - drbg_exit() can be static)
$ git merge crypto/master
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/crypto/amd-ccp.txt         |   16 +
 .../devicetree/bindings/crypto/qcom-qce.txt        |   25 +
 Documentation/ioctl/ioctl-number.txt               |    1 +
 MAINTAINERS                                        |    6 +
 arch/powerpc/boot/dts/fsl/qoriq-sec6.0-0.dtsi      |    3 +-
 arch/x86/crypto/Makefile                           |    4 +-
 arch/x86/crypto/aes_ctrby8_avx-x86_64.S            |  546 ++++++
 arch/x86/crypto/aesni-intel_glue.c                 |   40 +-
 arch/x86/crypto/crc32c-pcl-intel-asm_64.S          |  281 ++-
 arch/x86/crypto/des3_ede-asm_64.S                  |  805 ++++++++
 arch/x86/crypto/des3_ede_glue.c                    |  509 +++++
 crypto/Kconfig                                     |   50 +-
 crypto/Makefile                                    |    1 +
 crypto/algapi.c                                    |   14 +
 crypto/des_generic.c                               |   22 +-
 crypto/drbg.c                                      | 2044 ++++++++++++++++++++
 crypto/lzo.c                                       |    8 +-
 crypto/tcrypt.c                                    |   37 +-
 crypto/testmgr.c                                   |  247 +++
 crypto/testmgr.h                                   |  892 ++++++++-
 drivers/crypto/Kconfig                             |   20 +-
 drivers/crypto/Makefile                            |    2 +
 drivers/crypto/amcc/crypto4xx_core.c               |    2 +-
 drivers/crypto/caam/caamalg.c                      |   37 +-
 drivers/crypto/caam/caamhash.c                     |   68 +-
 drivers/crypto/caam/caamrng.c                      |   28 +
 drivers/crypto/caam/ctrl.c                         |   67 +-
 drivers/crypto/caam/desc.h                         |    1 -
 drivers/crypto/caam/intern.h                       |    1 +
 drivers/crypto/caam/regs.h                         |  105 +-
 drivers/crypto/ccp/Makefile                        |    5 +
 drivers/crypto/ccp/ccp-dev.c                       |   34 +
 drivers/crypto/ccp/ccp-dev.h                       |   10 +-
 drivers/crypto/ccp/ccp-pci.c                       |   39 +-
 drivers/crypto/ccp/ccp-platform.c                  |  224 +++
 drivers/crypto/nx/nx-842.c                         |    2 +-
 drivers/crypto/qat/Kconfig                         |   23 +
 drivers/crypto/qat/Makefile                        |    2 +
 drivers/crypto/qat/qat_common/Makefile             |   14 +
 drivers/crypto/qat/qat_common/adf_accel_devices.h  |  205 ++
 drivers/crypto/qat/qat_common/adf_accel_engine.c   |  168 ++
 drivers/crypto/qat/qat_common/adf_aer.c            |  259 +++
 drivers/crypto/qat/qat_common/adf_cfg.c            |  362 ++++
 drivers/crypto/qat/qat_common/adf_cfg.h            |   87 +
 drivers/crypto/qat/qat_common/adf_cfg_common.h     |  100 +
 drivers/crypto/qat/qat_common/adf_cfg_strings.h    |   83 +
 drivers/crypto/qat/qat_common/adf_cfg_user.h       |   94 +
 drivers/crypto/qat/qat_common/adf_common_drv.h     |  192 ++
 drivers/crypto/qat/qat_common/adf_ctl_drv.c        |  490 +++++
 drivers/crypto/qat/qat_common/adf_dev_mgr.c        |  215 ++
 drivers/crypto/qat/qat_common/adf_init.c           |  388 ++++
 drivers/crypto/qat/qat_common/adf_transport.c      |  567 ++++++
 drivers/crypto/qat/qat_common/adf_transport.h      |   63 +
 .../qat/qat_common/adf_transport_access_macros.h   |  160 ++
 .../crypto/qat/qat_common/adf_transport_debug.c    |  304 +++
 .../crypto/qat/qat_common/adf_transport_internal.h |  115 ++
 drivers/crypto/qat/qat_common/icp_qat_fw.h         |  316 +++
 .../crypto/qat/qat_common/icp_qat_fw_init_admin.h  |  131 ++
 drivers/crypto/qat/qat_common/icp_qat_fw_la.h      |  403 ++++
 .../qat/qat_common/icp_qat_fw_loader_handle.h      |   78 +
 drivers/crypto/qat/qat_common/icp_qat_hal.h        |  125 ++
 drivers/crypto/qat/qat_common/icp_qat_hw.h         |  305 +++
 drivers/crypto/qat/qat_common/icp_qat_uclo.h       |  377 ++++
 drivers/crypto/qat/qat_common/qat_algs.c           | 1038 ++++++++++
 drivers/crypto/qat/qat_common/qat_crypto.c         |  284 +++
 drivers/crypto/qat/qat_common/qat_crypto.h         |   83 +
 drivers/crypto/qat/qat_common/qat_hal.c            | 1405 ++++++++++++++
 drivers/crypto/qat/qat_common/qat_uclo.c           | 1195 ++++++++++++
 drivers/crypto/qat/qat_dh895xcc/Makefile           |    8 +
 drivers/crypto/qat/qat_dh895xcc/adf_admin.c        |  144 ++
 .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c |  214 ++
 .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h |   86 +
 drivers/crypto/qat/qat_dh895xcc/adf_drv.c          |  449 +++++
 drivers/crypto/qat/qat_dh895xcc/adf_drv.h          |   67 +
 drivers/crypto/qat/qat_dh895xcc/adf_hw_arbiter.c   |  159 ++
 drivers/crypto/qat/qat_dh895xcc/adf_isr.c          |  266 +++
 drivers/crypto/qat/qat_dh895xcc/qat_admin.c        |  107 +
 drivers/crypto/qce/Makefile                        |    6 +
 drivers/crypto/qce/ablkcipher.c                    |  431 +++++
 drivers/crypto/qce/cipher.h                        |   68 +
 drivers/crypto/qce/common.c                        |  438 +++++
 drivers/crypto/qce/common.h                        |  102 +
 drivers/crypto/qce/core.c                          |  286 +++
 drivers/crypto/qce/core.h                          |   68 +
 drivers/crypto/qce/dma.c                           |  186 ++
 drivers/crypto/qce/dma.h                           |   58 +
 drivers/crypto/qce/regs-v5.h                       |  334 ++++
 drivers/crypto/qce/sha.c                           |  588 ++++++
 drivers/crypto/qce/sha.h                           |   81 +
 drivers/crypto/ux500/cryp/cryp_core.c              |   25 +-
 include/crypto/algapi.h                            |    6 +
 include/crypto/des.h                               |    3 +
 include/crypto/drbg.h                              |  290 +++
 include/crypto/internal/skcipher.h                 |    3 +-
 include/crypto/scatterwalk.h                       |    6 -
 kernel/module.c                                    |    4 -
 96 files changed, 20015 insertions(+), 295 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/crypto/amd-ccp.txt
 create mode 100644 Documentation/devicetree/bindings/crypto/qcom-qce.txt
 create mode 100644 arch/x86/crypto/aes_ctrby8_avx-x86_64.S
 create mode 100644 arch/x86/crypto/des3_ede-asm_64.S
 create mode 100644 arch/x86/crypto/des3_ede_glue.c
 create mode 100644 crypto/drbg.c
 create mode 100644 drivers/crypto/ccp/ccp-platform.c
 create mode 100644 drivers/crypto/qat/Kconfig
 create mode 100644 drivers/crypto/qat/Makefile
 create mode 100644 drivers/crypto/qat/qat_common/Makefile
 create mode 100644 drivers/crypto/qat/qat_common/adf_accel_devices.h
 create mode 100644 drivers/crypto/qat/qat_common/adf_accel_engine.c
 create mode 100644 drivers/crypto/qat/qat_common/adf_aer.c
 create mode 100644 drivers/crypto/qat/qat_common/adf_cfg.c
 create mode 100644 drivers/crypto/qat/qat_common/adf_cfg.h
 create mode 100644 drivers/crypto/qat/qat_common/adf_cfg_common.h
 create mode 100644 drivers/crypto/qat/qat_common/adf_cfg_strings.h
 create mode 100644 drivers/crypto/qat/qat_common/adf_cfg_user.h
 create mode 100644 drivers/crypto/qat/qat_common/adf_common_drv.h
 create mode 100644 drivers/crypto/qat/qat_common/adf_ctl_drv.c
 create mode 100644 drivers/crypto/qat/qat_common/adf_dev_mgr.c
 create mode 100644 drivers/crypto/qat/qat_common/adf_init.c
 create mode 100644 drivers/crypto/qat/qat_common/adf_transport.c
 create mode 100644 drivers/crypto/qat/qat_common/adf_transport.h
 create mode 100644 drivers/crypto/qat/qat_common/adf_transport_access_macros.h
 create mode 100644 drivers/crypto/qat/qat_common/adf_transport_debug.c
 create mode 100644 drivers/crypto/qat/qat_common/adf_transport_internal.h
 create mode 100644 drivers/crypto/qat/qat_common/icp_qat_fw.h
 create mode 100644 drivers/crypto/qat/qat_common/icp_qat_fw_init_admin.h
 create mode 100644 drivers/crypto/qat/qat_common/icp_qat_fw_la.h
 create mode 100644 drivers/crypto/qat/qat_common/icp_qat_fw_loader_handle.h
 create mode 100644 drivers/crypto/qat/qat_common/icp_qat_hal.h
 create mode 100644 drivers/crypto/qat/qat_common/icp_qat_hw.h
 create mode 100644 drivers/crypto/qat/qat_common/icp_qat_uclo.h
 create mode 100644 drivers/crypto/qat/qat_common/qat_algs.c
 create mode 100644 drivers/crypto/qat/qat_common/qat_crypto.c
 create mode 100644 drivers/crypto/qat/qat_common/qat_crypto.h
 create mode 100644 drivers/crypto/qat/qat_common/qat_hal.c
 create mode 100644 drivers/crypto/qat/qat_common/qat_uclo.c
 create mode 100644 drivers/crypto/qat/qat_dh895xcc/Makefile
 create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_admin.c
 create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c
 create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h
 create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_drv.c
 create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_drv.h
 create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_hw_arbiter.c
 create mode 100644 drivers/crypto/qat/qat_dh895xcc/adf_isr.c
 create mode 100644 drivers/crypto/qat/qat_dh895xcc/qat_admin.c
 create mode 100644 drivers/crypto/qce/Makefile
 create mode 100644 drivers/crypto/qce/ablkcipher.c
 create mode 100644 drivers/crypto/qce/cipher.h
 create mode 100644 drivers/crypto/qce/common.c
 create mode 100644 drivers/crypto/qce/common.h
 create mode 100644 drivers/crypto/qce/core.c
 create mode 100644 drivers/crypto/qce/core.h
 create mode 100644 drivers/crypto/qce/dma.c
 create mode 100644 drivers/crypto/qce/dma.h
 create mode 100644 drivers/crypto/qce/regs-v5.h
 create mode 100644 drivers/crypto/qce/sha.c
 create mode 100644 drivers/crypto/qce/sha.h
 create mode 100644 include/crypto/drbg.h
Merging drm/drm-next (62eb3e20f8f3 drm/tilcdc: Fix build breakage)
$ git merge drm/drm-next
Resolved 'drivers/gpu/drm/i915/intel_drv.h' using previous resolution.
Auto-merging drivers/gpu/drm/nouveau/nouveau_fbcon.c
Auto-merging drivers/gpu/drm/i915/intel_lvds.c
Auto-merging drivers/gpu/drm/i915/intel_dsi.c
Auto-merging drivers/gpu/drm/i915/intel_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h
Auto-merging drivers/gpu/drm/i915/intel_dp.c
Auto-merging drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/i915_reg.h
Auto-merging drivers/gpu/drm/i915/i915_gem_stolen.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/i915_dma.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 6f83f2dc73c9] Merge remote-tracking branch 'drm/drm-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/DocBook/drm.tmpl                |   12 +-
 drivers/gpu/drm/Makefile                      |    2 +-
 drivers/gpu/drm/armada/armada_fbdev.c         |    4 +-
 drivers/gpu/drm/armada/armada_output.c        |    4 +-
 drivers/gpu/drm/ast/ast_fb.c                  |    6 +-
 drivers/gpu/drm/ast/ast_mode.c                |    4 +-
 drivers/gpu/drm/bochs/bochs_fbdev.c           |    5 +-
 drivers/gpu/drm/bochs/bochs_mm.c              |    2 +-
 drivers/gpu/drm/bridge/ptn3460.c              |    2 +-
 drivers/gpu/drm/cirrus/cirrus_fbdev.c         |    6 +-
 drivers/gpu/drm/drm_crtc.c                    |  441 +++-
 drivers/gpu/drm/drm_crtc_helper.c             |    1 +
 drivers/gpu/drm/drm_debugfs.c                 |  182 ++
 drivers/gpu/drm/drm_dp_mst_topology.c         | 2713 +++++++++++++++++++++++++
 drivers/gpu/drm/drm_fb_cma_helper.c           |    5 +-
 drivers/gpu/drm/drm_fb_helper.c               |  115 +-
 drivers/gpu/drm/drm_gem.c                     |   29 +-
 drivers/gpu/drm/drm_ioctl.c                   |    2 -
 drivers/gpu/drm/drm_probe_helper.c            |    9 +-
 drivers/gpu/drm/drm_stub.c                    |   14 +-
 drivers/gpu/drm/drm_sysfs.c                   |    2 -
 drivers/gpu/drm/exynos/exynos_dp_core.c       |    2 +-
 drivers/gpu/drm/exynos/exynos_drm_connector.c |    6 +-
 drivers/gpu/drm/exynos/exynos_drm_dpi.c       |    4 +-
 drivers/gpu/drm/exynos/exynos_drm_drv.c       |    4 -
 drivers/gpu/drm/exynos/exynos_drm_drv.h       |    2 -
 drivers/gpu/drm/exynos/exynos_drm_dsi.c       |    2 +-
 drivers/gpu/drm/exynos/exynos_drm_fbdev.c     |    5 +-
 drivers/gpu/drm/exynos/exynos_drm_vidi.c      |    2 +-
 drivers/gpu/drm/exynos/exynos_hdmi.c          |    2 +-
 drivers/gpu/drm/gma500/cdv_intel_crt.c        |    4 +-
 drivers/gpu/drm/gma500/cdv_intel_dp.c         |    4 +-
 drivers/gpu/drm/gma500/cdv_intel_hdmi.c       |    4 +-
 drivers/gpu/drm/gma500/cdv_intel_lvds.c       |    4 +-
 drivers/gpu/drm/gma500/framebuffer.c          |    5 +-
 drivers/gpu/drm/gma500/gtt.c                  |    2 +-
 drivers/gpu/drm/gma500/mdfld_dsi_output.c     |    4 +-
 drivers/gpu/drm/gma500/oaktrail_hdmi.c        |    2 +-
 drivers/gpu/drm/gma500/oaktrail_lvds.c        |    2 +-
 drivers/gpu/drm/gma500/psb_intel_lvds.c       |    4 +-
 drivers/gpu/drm/gma500/psb_intel_sdvo.c       |    4 +-
 drivers/gpu/drm/i915/i915_cmd_parser.c        |    3 +
 drivers/gpu/drm/i915/i915_debugfs.c           |   52 +-
 drivers/gpu/drm/i915/i915_dma.c               |   37 +-
 drivers/gpu/drm/i915/i915_drv.c               |   41 +-
 drivers/gpu/drm/i915/i915_drv.h               |   77 +-
 drivers/gpu/drm/i915/i915_gem.c               |   97 +-
 drivers/gpu/drm/i915/i915_gem_context.c       |    3 +-
 drivers/gpu/drm/i915/i915_gem_execbuffer.c    |    8 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c           |   54 +-
 drivers/gpu/drm/i915/i915_gem_gtt.h           |    5 +-
 drivers/gpu/drm/i915/i915_gem_render_state.c  |  161 +-
 drivers/gpu/drm/i915/i915_gem_stolen.c        |   21 +-
 drivers/gpu/drm/i915/i915_irq.c               |  217 +-
 drivers/gpu/drm/i915/i915_params.c            |    5 +
 drivers/gpu/drm/i915/i915_reg.h               |  442 ++--
 drivers/gpu/drm/i915/intel_crt.c              |    2 +-
 drivers/gpu/drm/i915/intel_ddi.c              |    4 +-
 drivers/gpu/drm/i915/intel_display.c          |  905 ++++++++-
 drivers/gpu/drm/i915/intel_dp.c               |  253 ++-
 drivers/gpu/drm/i915/intel_drv.h              |   45 +-
 drivers/gpu/drm/i915/intel_dsi.c              |   28 +-
 drivers/gpu/drm/i915/intel_dsi_panel_vbt.c    |    8 +-
 drivers/gpu/drm/i915/intel_dvo.c              |   10 +-
 drivers/gpu/drm/i915/intel_fbdev.c            |   35 +-
 drivers/gpu/drm/i915/intel_hdmi.c             |   67 +-
 drivers/gpu/drm/i915/intel_lvds.c             |    2 +-
 drivers/gpu/drm/i915/intel_overlay.c          |   13 +-
 drivers/gpu/drm/i915/intel_pm.c               |  370 +++-
 drivers/gpu/drm/i915/intel_renderstate.h      |    2 -
 drivers/gpu/drm/i915/intel_renderstate_gen6.c |    1 +
 drivers/gpu/drm/i915/intel_renderstate_gen7.c |    1 +
 drivers/gpu/drm/i915/intel_renderstate_gen8.c |    1 +
 drivers/gpu/drm/i915/intel_ringbuffer.c       |   12 +-
 drivers/gpu/drm/i915/intel_sdvo.c             |   10 +-
 drivers/gpu/drm/i915/intel_sprite.c           |    9 +
 drivers/gpu/drm/i915/intel_tv.c               |    2 +-
 drivers/gpu/drm/i915/intel_uncore.c           |  180 +-
 drivers/gpu/drm/mgag200/mgag200_fb.c          |    5 +-
 drivers/gpu/drm/mgag200/mgag200_mode.c        |    2 +-
 drivers/gpu/drm/msm/hdmi/hdmi_connector.c     |    4 +-
 drivers/gpu/drm/msm/msm_fbdev.c               |    4 +-
 drivers/gpu/drm/msm/msm_gem.c                 |    2 +-
 drivers/gpu/drm/nouveau/nouveau_connector.c   |    4 +-
 drivers/gpu/drm/nouveau/nouveau_fbcon.c       |    5 +-
 drivers/gpu/drm/nouveau/nouveau_ttm.c         |    3 +
 drivers/gpu/drm/omapdrm/omap_connector.c      |    4 +-
 drivers/gpu/drm/omapdrm/omap_fbdev.c          |    4 +-
 drivers/gpu/drm/omapdrm/omap_gem.c            |   23 +-
 drivers/gpu/drm/qxl/qxl_display.c             |    4 +-
 drivers/gpu/drm/qxl/qxl_fb.c                  |    7 +-
 drivers/gpu/drm/radeon/radeon_connectors.c    |    6 +-
 drivers/gpu/drm/radeon/radeon_fb.c            |    6 +-
 drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c     |    4 +-
 drivers/gpu/drm/rcar-du/rcar_du_vgacon.c      |    4 +-
 drivers/gpu/drm/shmobile/shmob_drm_crtc.c     |    6 +-
 drivers/gpu/drm/tegra/drm.c                   |    8 +-
 drivers/gpu/drm/tegra/drm.h                   |    1 +
 drivers/gpu/drm/tegra/fb.c                    |   53 +-
 drivers/gpu/drm/tegra/output.c                |    4 +-
 drivers/gpu/drm/tilcdc/tilcdc_drv.c           |   15 +-
 drivers/gpu/drm/tilcdc/tilcdc_drv.h           |    1 -
 drivers/gpu/drm/tilcdc/tilcdc_panel.c         |   41 +-
 drivers/gpu/drm/tilcdc/tilcdc_slave.c         |   29 +-
 drivers/gpu/drm/tilcdc/tilcdc_tfp410.c        |   37 +-
 drivers/gpu/drm/ttm/ttm_bo.c                  |   20 +-
 drivers/gpu/drm/ttm/ttm_bo_manager.c          |    3 +-
 drivers/gpu/drm/ttm/ttm_bo_util.c             |    2 +-
 drivers/gpu/drm/udl/udl_connector.c           |    4 +-
 drivers/gpu/drm/udl/udl_fb.c                  |    5 +-
 drivers/gpu/drm/udl/udl_gem.c                 |    8 +-
 drivers/gpu/drm/udl/udl_main.c                |   15 +
 drivers/gpu/drm/udl/udl_modeset.c             |   21 +
 drivers/gpu/drm/vmwgfx/Makefile               |    3 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c    |  341 ++++
 drivers/gpu/drm/vmwgfx/vmwgfx_context.c       |   38 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c           |    7 -
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h           |   74 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c       |  227 ++-
 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c |    1 +
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c           |    2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c           |    2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c          |    2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_shader.c        |  396 ++--
 drivers/gpu/vga/vgaarb.c                      |   40 +-
 drivers/staging/imx-drm/imx-drm-core.c        |    6 +-
 include/drm/drmP.h                            |   15 +-
 include/drm/drm_crtc.h                        |   17 +-
 include/drm/drm_dp_mst_helper.h               |  509 +++++
 include/drm/drm_fb_helper.h                   |    8 +-
 include/drm/ttm/ttm_bo_driver.h               |   14 +-
 include/uapi/drm/drm.h                        |    2 +-
 132 files changed, 7218 insertions(+), 1661 deletions(-)
 create mode 100644 drivers/gpu/drm/drm_dp_mst_topology.c
 create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c
 create mode 100644 include/drm/drm_dp_mst_helper.h
Merging drm-panel/drm/panel/for-next (7e40b5162b3c drm/panel: make DRM_PANEL_LD9040 depend on SPI)
$ git merge drm-panel/drm/panel/for-next
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/panel/Kconfig | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
Merging drm-intel/for-linux-next (491a34486220 drm/i915: Enable PSR by default.)
$ git merge drm-intel/for-linux-next
Auto-merging include/drm/drm_crtc.h
Auto-merging drivers/gpu/drm/i915/intel_lvds.c
Auto-merging drivers/gpu/drm/i915/intel_fbdev.c
Auto-merging drivers/gpu/drm/i915/intel_drv.h
Auto-merging drivers/gpu/drm/i915/intel_dp.c
Auto-merging drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/intel_crt.c
Auto-merging drivers/gpu/drm/i915/i915_reg.h
Auto-merging drivers/gpu/drm/i915/i915_irq.c
Auto-merging drivers/gpu/drm/i915/i915_gem_stolen.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/i915_drv.c
Auto-merging drivers/gpu/drm/i915/i915_dma.c
Auto-merging drivers/gpu/drm/drm_crtc.c
Auto-merging Documentation/DocBook/drm.tmpl
Merge made by the 'recursive' strategy.
 Documentation/DocBook/drm.tmpl             |  64 +---
 drivers/gpu/drm/drm_crtc.c                 |  65 +++-
 drivers/gpu/drm/drm_rect.c                 | 140 ++++++++
 drivers/gpu/drm/i915/i915_debugfs.c        | 328 +++++++++++-------
 drivers/gpu/drm/i915/i915_dma.c            |   8 +-
 drivers/gpu/drm/i915/i915_drv.c            |  20 +-
 drivers/gpu/drm/i915/i915_drv.h            |  91 +++--
 drivers/gpu/drm/i915/i915_gem.c            |   8 +-
 drivers/gpu/drm/i915/i915_gem_context.c    | 142 ++++----
 drivers/gpu/drm/i915/i915_gem_execbuffer.c | 300 ++++++++--------
 drivers/gpu/drm/i915/i915_gem_gtt.c        |   3 +-
 drivers/gpu/drm/i915/i915_gem_stolen.c     |  83 +++--
 drivers/gpu/drm/i915/i915_gpu_error.c      |  79 ++++-
 drivers/gpu/drm/i915/i915_irq.c            | 337 ++++++++++++++++--
 drivers/gpu/drm/i915/i915_params.c         |   4 +-
 drivers/gpu/drm/i915/i915_reg.h            |  47 ++-
 drivers/gpu/drm/i915/i915_sysfs.c          |  57 ++-
 drivers/gpu/drm/i915/intel_crt.c           |  32 +-
 drivers/gpu/drm/i915/intel_ddi.c           | 350 ++++---------------
 drivers/gpu/drm/i915/intel_display.c       | 536 ++++++++++++++++-------------
 drivers/gpu/drm/i915/intel_dp.c            | 252 +++++++++-----
 drivers/gpu/drm/i915/intel_drv.h           |  31 +-
 drivers/gpu/drm/i915/intel_fbdev.c         |   2 +-
 drivers/gpu/drm/i915/intel_i2c.c           |  54 ---
 drivers/gpu/drm/i915/intel_lvds.c          |  18 +-
 drivers/gpu/drm/i915/intel_pm.c            | 483 +++++++++++++++++++-------
 drivers/gpu/drm/i915/intel_ringbuffer.c    | 420 ++++++++++++++--------
 drivers/gpu/drm/i915/intel_ringbuffer.h    |  90 ++++-
 drivers/gpu/drm/i915/intel_uncore.c        |   2 +-
 drivers/gpu/drm/omapdrm/omap_drv.h         |   7 -
 drivers/gpu/drm/omapdrm/omap_plane.c       |  17 +-
 include/drm/drm_crtc.h                     |  15 +-
 include/drm/drm_rect.h                     |   6 +
 33 files changed, 2626 insertions(+), 1465 deletions(-)
Merging drm-tegra/drm/tegra/for-next (1f64ae7c5af0 drm/tegra: sor - Remove obsolete comment)
$ git merge drm-tegra/drm/tegra/for-next
Already up-to-date.
Merging sound/for-next (50dd9050e45c ALSA: hda - add capture mute led support in led_power_filter)
$ git merge sound/for-next
Auto-merging sound/pci/hda/patch_hdmi.c
Auto-merging sound/pci/hda/hda_tegra.c
Merge made by the 'recursive' strategy.
 sound/aoa/soundbus/i2sbus/core.c   |   12 +-
 sound/core/seq/seq_memory.c        |    4 +-
 sound/oss/mpu401.c                 |    2 +-
 sound/pci/echoaudio/echoaudio.c    |    6 -
 sound/pci/hda/hda_auto_parser.c    |    2 -
 sound/pci/hda/hda_codec.c          |   44 +-
 sound/pci/hda/hda_codec.h          |    3 +-
 sound/pci/hda/hda_controller.c     |  203 +--
 sound/pci/hda/hda_controller.h     |    9 +-
 sound/pci/hda/hda_eld.c            |   46 +-
 sound/pci/hda/hda_generic.c        |   22 +-
 sound/pci/hda/hda_i915.c           |    4 +-
 sound/pci/hda/hda_intel.c          |  319 ++++-
 sound/pci/hda/hda_local.h          |    7 +-
 sound/pci/hda/hda_priv.h           |  253 ++--
 sound/pci/hda/hda_tegra.c          |   36 +-
 sound/pci/hda/patch_ca0132.c       |    6 +-
 sound/pci/hda/patch_cmedia.c       |  624 +--------
 sound/pci/hda/patch_conexant.c     | 2715 +-----------------------------------
 sound/pci/hda/patch_hdmi.c         |   11 +-
 sound/pci/hda/patch_realtek.c      |  122 +-
 sound/pci/hda/patch_sigmatel.c     |    2 +-
 sound/pci/ice1712/ice1712.h        |   15 +-
 sound/pci/mixart/mixart_core.c     |    4 +-
 sound/pci/trident/trident_main.c   |    2 -
 sound/pci/trident/trident_memory.c |    3 +-
 sound/sparc/dbri.c                 |    6 +-
 27 files changed, 704 insertions(+), 3778 deletions(-)
Merging sound-asoc/for-next (4b9e806a7a09 Merge remote-tracking branches 'asoc/topic/tlv320aic3x', 'asoc/topic/wm0010', 'asoc/topic/wm8904' and 'asoc/topic/wm8985' into asoc-next)
$ git merge sound-asoc/for-next
Removing sound/soc/samsung/dma.c
Auto-merging sound/soc/samsung/Kconfig
Auto-merging arch/arm/mach-shmobile/board-mackerel.c
Auto-merging arch/arm/mach-shmobile/board-kzm9g.c
Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/sound/ak5386.txt |    4 +
 Documentation/devicetree/bindings/sound/cs4265.txt |   29 +
 .../devicetree/bindings/sound/max98090.txt         |    2 +-
 .../devicetree/bindings/sound/renesas,rsnd.txt     |    9 +
 .../devicetree/bindings/sound/rockchip-i2s.txt     |   37 +
 .../bindings/sound/samsung,odroidx2-max98090.txt   |   35 +
 .../devicetree/bindings/sound/sirf-usp.txt         |   27 +
 Documentation/devicetree/bindings/sound/snow.txt   |    5 +
 .../devicetree/bindings/sound/ti,tas5086.txt       |    5 +
 Documentation/devicetree/bindings/sound/wm8904.txt |   33 +
 arch/arm/mach-shmobile/board-armadillo800eva.c     |    4 +
 arch/arm/mach-shmobile/board-kzm9g.c               |    2 +
 arch/arm/mach-shmobile/board-mackerel.c            |    4 +
 arch/sh/boards/mach-ecovec24/setup.c               |    2 +
 arch/x86/include/asm/platform_sst_audio.h          |   78 +
 drivers/dma/edma.c                                 |    1 +
 drivers/misc/atmel-ssc.c                           |   13 +
 include/linux/atmel-ssc.h                          |   13 +
 include/linux/dmaengine.h                          |    1 +
 include/linux/mfd/arizona/core.h                   |    6 +
 include/sound/rcar_snd.h                           |    1 +
 include/sound/rt286.h                              |   19 +
 include/sound/rt5670.h                             |   27 +
 include/sound/soc-dai.h                            |    1 -
 include/sound/soc-dapm.h                           |    8 +-
 include/sound/soc.h                                |   51 +-
 include/trace/events/asoc.h                        |    6 +-
 sound/arm/pxa2xx-ac97-lib.c                        |   12 +-
 sound/core/pcm_dmaengine.c                         |    4 +-
 sound/soc/Kconfig                                  |    1 +
 sound/soc/Makefile                                 |    1 +
 sound/soc/atmel/atmel_ssc_dai.c                    |   34 +-
 sound/soc/atmel/atmel_wm8904.c                     |   50 -
 sound/soc/codecs/Kconfig                           |   18 +
 sound/soc/codecs/Makefile                          |    6 +
 sound/soc/codecs/adau1701.c                        |    6 +-
 sound/soc/codecs/ak5386.c                          |   50 +
 sound/soc/codecs/arizona.c                         |  201 +-
 sound/soc/codecs/arizona.h                         |    1 +
 sound/soc/codecs/cs4265.c                          |  682 +++++
 sound/soc/codecs/cs4265.h                          |   64 +
 sound/soc/codecs/cs4270.c                          |    4 +-
 sound/soc/codecs/cs42l56.c                         |   64 +-
 sound/soc/codecs/cs42l73.c                         |    4 +-
 sound/soc/codecs/cs42xx8.c                         |    2 +-
 sound/soc/codecs/max98090.c                        |   44 +-
 sound/soc/codecs/mc13783.c                         |    6 +-
 sound/soc/codecs/rl6231.c                          |   19 -
 sound/soc/codecs/rt286.c                           | 1224 +++++++++
 sound/soc/codecs/rt286.h                           |  198 ++
 sound/soc/codecs/rt5640.c                          |   10 +-
 sound/soc/codecs/rt5645.c                          |   10 +-
 sound/soc/codecs/rt5670-dsp.h                      |   54 +
 sound/soc/codecs/rt5670.c                          | 2692 ++++++++++++++++++++
 sound/soc/codecs/rt5670.h                          | 2000 +++++++++++++++
 sound/soc/codecs/rt5677.c                          |  272 +-
 sound/soc/codecs/rt5677.h                          |   15 -
 sound/soc/codecs/sgtl5000.c                        |   15 +-
 sound/soc/codecs/spdif_transmitter.c               |    2 +-
 sound/soc/codecs/sta529.c                          |    4 +-
 sound/soc/codecs/tas5086.c                         |   67 +-
 sound/soc/codecs/tlv320aic31xx.c                   |   23 +-
 sound/soc/codecs/tlv320aic32x4.c                   |   21 +-
 sound/soc/codecs/tlv320aic3x.c                     |   12 +-
 sound/soc/codecs/tlv320dac33.c                     |    2 +-
 sound/soc/codecs/tpa6130a2.c                       |    4 +-
 sound/soc/codecs/twl4030.c                         |    9 +-
 sound/soc/codecs/wl1273.c                          |    4 +-
 sound/soc/codecs/wm0010.c                          |   14 +-
 sound/soc/codecs/wm1250-ev1.c                      |    1 -
 sound/soc/codecs/wm2000.c                          |    4 +-
 sound/soc/codecs/wm5100.c                          |    3 +-
 sound/soc/codecs/wm5102.c                          |   62 +
 sound/soc/codecs/wm5110.c                          |    1 +
 sound/soc/codecs/wm8350.c                          |    3 -
 sound/soc/codecs/wm8903.c                          |    3 +-
 sound/soc/codecs/wm8904.c                          |   17 +-
 sound/soc/codecs/wm8958-dsp2.c                     |   24 +-
 sound/soc/codecs/wm8985.c                          |    3 -
 sound/soc/codecs/wm8994.c                          |   15 +-
 sound/soc/codecs/wm8996.c                          |    6 +-
 sound/soc/codecs/wm9090.c                          |    4 +-
 sound/soc/codecs/wm_adsp.c                         |    2 +
 sound/soc/codecs/wm_hubs.c                         |    4 +-
 sound/soc/davinci/Kconfig                          |    1 +
 sound/soc/davinci/davinci-mcasp.c                  |   75 +-
 sound/soc/fsl/Kconfig                              |    6 +-
 sound/soc/fsl/fsl_spdif.c                          |   86 +-
 sound/soc/fsl/fsl_spdif.h                          |   10 +-
 sound/soc/fsl/fsl_ssi.c                            |    4 +-
 sound/soc/generic/simple-card.c                    |   13 +-
 sound/soc/intel/byt-max98090.c                     |   27 +-
 sound/soc/intel/byt-rt5640.c                       |    1 +
 sound/soc/intel/sst-atom-controls.h                |   30 +
 sound/soc/intel/sst-baytrail-ipc.c                 |   30 +
 sound/soc/intel/sst-mfld-dsp.h                     |  414 ++-
 sound/soc/intel/sst-mfld-platform-compress.c       |   11 +-
 sound/soc/intel/sst-mfld-platform-pcm.c            |  313 ++-
 sound/soc/intel/sst-mfld-platform.h                |   24 +-
 sound/soc/kirkwood/kirkwood-dma.c                  |   11 +-
 sound/soc/kirkwood/kirkwood-i2s.c                  |   33 +-
 sound/soc/kirkwood/kirkwood.h                      |    7 +-
 sound/soc/omap/omap-dmic.c                         |    6 +-
 sound/soc/omap/omap-mcbsp.c                        |    7 +-
 sound/soc/omap/omap-pcm.c                          |    1 +
 sound/soc/rockchip/Kconfig                         |   12 +
 sound/soc/rockchip/Makefile                        |    4 +
 sound/soc/rockchip/rockchip_i2s.c                  |  531 ++++
 sound/soc/rockchip/rockchip_i2s.h                  |  223 ++
 sound/soc/s6000/Kconfig                            |   13 +-
 sound/soc/s6000/Makefile                           |    2 +-
 sound/soc/s6000/s6000-i2s.c                        |    4 +-
 sound/soc/s6000/s6105-ipcam.c                      |   17 +-
 sound/soc/samsung/Kconfig                          |   22 +-
 sound/soc/samsung/Makefile                         |    4 +-
 sound/soc/samsung/dma.c                            |  454 ----
 sound/soc/samsung/dmaengine.c                      |    3 +
 sound/soc/samsung/i2s.c                            |   29 +-
 sound/soc/samsung/idma.c                           |    3 +-
 sound/soc/samsung/odroidx2_max98090.c              |  177 ++
 sound/soc/samsung/s3c-i2s-v2.c                     |   17 +-
 sound/soc/samsung/s3c2412-i2s.c                    |   51 +-
 sound/soc/samsung/s3c24xx-i2s.c                    |   62 +-
 sound/soc/samsung/snow.c                           |    4 +
 sound/soc/sh/fsi.c                                 |  201 +-
 sound/soc/sh/rcar/core.c                           |  160 +-
 sound/soc/sh/rcar/dvc.c                            |   50 +-
 sound/soc/sh/rcar/gen.c                            |  110 +-
 sound/soc/sh/rcar/rsnd.h                           |   24 +-
 sound/soc/sh/rcar/src.c                            |   37 +-
 sound/soc/sh/rcar/ssi.c                            |   33 +-
 sound/soc/sirf/Kconfig                             |    6 +
 sound/soc/sirf/Makefile                            |    2 +
 sound/soc/sirf/sirf-usp.c                          |  415 +++
 sound/soc/sirf/sirf-usp.h                          |  293 +++
 sound/soc/soc-cache.c                              |    7 +-
 sound/soc/soc-compress.c                           |    8 +-
 sound/soc/soc-core.c                               |  548 ++--
 sound/soc/soc-dapm.c                               |  183 +-
 sound/soc/soc-generic-dmaengine-pcm.c              |   37 +-
 sound/soc/soc-pcm.c                                |   40 +-
 141 files changed, 11379 insertions(+), 2017 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/sound/cs4265.txt
 create mode 100644 Documentation/devicetree/bindings/sound/rockchip-i2s.txt
 create mode 100644 Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt
 create mode 100644 Documentation/devicetree/bindings/sound/sirf-usp.txt
 create mode 100644 Documentation/devicetree/bindings/sound/wm8904.txt
 create mode 100644 arch/x86/include/asm/platform_sst_audio.h
 create mode 100644 include/sound/rt286.h
 create mode 100644 include/sound/rt5670.h
 create mode 100644 sound/soc/codecs/cs4265.c
 create mode 100644 sound/soc/codecs/cs4265.h
 create mode 100644 sound/soc/codecs/rt286.c
 create mode 100644 sound/soc/codecs/rt286.h
 create mode 100644 sound/soc/codecs/rt5670-dsp.h
 create mode 100644 sound/soc/codecs/rt5670.c
 create mode 100644 sound/soc/codecs/rt5670.h
 create mode 100644 sound/soc/intel/sst-atom-controls.h
 create mode 100644 sound/soc/rockchip/Kconfig
 create mode 100644 sound/soc/rockchip/Makefile
 create mode 100644 sound/soc/rockchip/rockchip_i2s.c
 create mode 100644 sound/soc/rockchip/rockchip_i2s.h
 delete mode 100644 sound/soc/samsung/dma.c
 create mode 100644 sound/soc/samsung/odroidx2_max98090.c
 create mode 100644 sound/soc/sirf/sirf-usp.c
 create mode 100644 sound/soc/sirf/sirf-usp.h
Merging modules/modules-next (4982223e51e8 module: set nx before marking module MODULE_STATE_COMING.)
$ git merge modules/modules-next
Already up-to-date.
Merging virtio/virtio-next (c77fba9ab058 virtio_scsi: don't call virtqueue_add_sgs(... GFP_NOIO) holding spinlock.)
$ git merge virtio/virtio-next
Already up-to-date.
Merging input/next (68807a0c2015 Input: atmel_mxt_ts - fix invalid return from mxt_get_bootloader_version)
$ git merge input/next
Already up-to-date.
Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
$ git merge input-mt/for-next
Already up-to-date.
Merging block/for-next (b0adcfe80363 Merge branch 'for-3.17/drivers' into for-next)
$ git merge block/for-next
Auto-merging kernel/workqueue.c
Auto-merging kernel/cgroup.c
Auto-merging include/linux/percpu-defs.h
Merge made by the 'recursive' strategy.
 arch/x86/include/asm/percpu.h      |   3 +-
 block/bio-integrity.c              |  12 +-
 block/bio.c                        |  52 +-
 block/blk-core.c                   |  13 +-
 block/blk-mq.c                     |  81 ++--
 block/blk-mq.h                     |   2 +-
 block/blk-sysfs.c                  |   2 +-
 block/compat_ioctl.c               |   6 +-
 block/ioctl.c                      |   5 +-
 block/partitions/aix.c             |   2 +-
 block/partitions/amiga.c           |  12 +-
 block/partitions/efi.c             |  46 +-
 block/partitions/msdos.c           |  13 +-
 block/scsi_ioctl.c                 |  20 +-
 drivers/block/drbd/Makefile        |   1 +
 drivers/block/drbd/drbd_actlog.c   | 518 ++++++++------------
 drivers/block/drbd/drbd_bitmap.c   | 150 ++----
 drivers/block/drbd/drbd_debugfs.c  | 958 +++++++++++++++++++++++++++++++++++++
 drivers/block/drbd/drbd_debugfs.h  |  39 ++
 drivers/block/drbd/drbd_int.h      | 383 ++++++++++-----
 drivers/block/drbd/drbd_interval.h |   4 +-
 drivers/block/drbd/drbd_main.c     | 302 +++++-------
 drivers/block/drbd/drbd_nl.c       | 110 +++--
 drivers/block/drbd/drbd_proc.c     | 125 +++--
 drivers/block/drbd/drbd_receiver.c | 316 ++++++++----
 drivers/block/drbd/drbd_req.c      | 527 +++++++++++++-------
 drivers/block/drbd/drbd_req.h      |   1 +
 drivers/block/drbd/drbd_state.c    |  90 ++--
 drivers/block/drbd/drbd_worker.c   | 348 +++++++++++---
 drivers/block/virtio_blk.c         | 104 +++-
 drivers/target/target_core_tpg.c   |   4 +-
 fs/aio.c                           |   6 +-
 include/asm-generic/percpu.h       | 410 +++++++++++++---
 include/linux/bio.h                |   1 +
 include/linux/blkdev.h             |   4 +-
 include/linux/drbd.h               |   4 +-
 include/linux/drbd_genl.h          |   4 +
 include/linux/drbd_limits.h        |   6 +
 include/linux/percpu-defs.h        | 380 ++++++++++++++-
 include/linux/percpu-refcount.h    |  64 ++-
 include/linux/percpu.h             | 673 --------------------------
 include/scsi/sg.h                  |   3 +
 include/uapi/linux/bsg.h           |  11 +-
 include/uapi/linux/virtio_blk.h    |   5 +
 kernel/cgroup.c                    |   8 +-
 kernel/workqueue.c                 |  19 +-
 lib/lru_cache.c                    |  23 +-
 lib/percpu-refcount.c              |  86 ++--
 mm/percpu.c                        |   3 +-
 49 files changed, 3769 insertions(+), 2190 deletions(-)
 create mode 100644 drivers/block/drbd/drbd_debugfs.c
 create mode 100644 drivers/block/drbd/drbd_debugfs.h
Merging device-mapper/for-next (e7be4af4f2d2 dm crypt: sort writes)
$ git merge device-mapper/for-next
Auto-merging block/bio.c
Merge made by the 'recursive' strategy.
 block/bio.c                  |   3 +-
 drivers/md/dm-cache-target.c | 124 ++++++++-----
 drivers/md/dm-crypt.c        | 401 ++++++++++++++++++++++---------------------
 drivers/md/dm-io.c           |  77 +++++----
 drivers/md/dm-mpath.c        |   6 +-
 drivers/md/dm-table.c        |  73 ++++----
 drivers/md/dm-thin.c         | 179 +++++++++++++------
 drivers/md/dm.h              |   1 -
 8 files changed, 497 insertions(+), 367 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 (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
$ git merge mmc/mmc-next
Already up-to-date.
Merging mmc-uh/next (f25c33724d15 mmc: sdhci: add DDR50 1.8V mode support for BayTrail eMMC Controller)
$ git merge mmc-uh/next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/mmc/mmc.txt      |   4 +-
 Documentation/devicetree/bindings/mmc/sdhci-st.txt |  33 +++
 .../devicetree/bindings/mmc/ti-omap-hsmmc.txt      |  54 ++++
 Documentation/devicetree/bindings/mmc/tmio_mmc.txt |   1 +
 drivers/mmc/core/bus.c                             |  10 +-
 drivers/mmc/core/mmc.c                             |  11 +-
 drivers/mmc/core/quirks.c                          |   2 +-
 drivers/mmc/core/sd_ops.c                          |   3 +
 drivers/mmc/host/Kconfig                           |  26 +-
 drivers/mmc/host/Makefile                          |   1 +
 drivers/mmc/host/mmci.c                            | 127 ++++++++-
 drivers/mmc/host/mmci.h                            |  20 ++
 drivers/mmc/host/moxart-mmc.c                      |   1 -
 drivers/mmc/host/mxs-mmc.c                         |   3 +-
 drivers/mmc/host/omap_hsmmc.c                      | 283 +++++++++++++++++++--
 drivers/mmc/host/s3cmci.c                          | 186 ++++----------
 drivers/mmc/host/s3cmci.h                          |   4 +-
 drivers/mmc/host/sdhci-acpi.c                      |   4 +-
 drivers/mmc/host/sdhci-pci.c                       |  15 +-
 drivers/mmc/host/sdhci-pci.h                       |   1 +
 drivers/mmc/host/sdhci-st.c                        | 176 +++++++++++++
 drivers/mmc/host/sdhci-tegra.c                     |   2 -
 drivers/mmc/host/sdhci.c                           | 144 +++++------
 drivers/mmc/host/sh_mmcif.c                        |  83 ++----
 drivers/mmc/host/wmt-sdmmc.c                       |  33 ++-
 include/linux/mmc/sdhci.h                          |   3 -
 include/linux/platform_data/mmc-omap.h             |   1 +
 27 files changed, 867 insertions(+), 364 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-st.txt
 create mode 100644 drivers/mmc/host/sdhci-st.c
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 (201ed0edb712 Merge branch 'slab/next' into for-next)
$ git merge slab/for-next
Auto-merging mm/slub.c
Auto-merging mm/slab_common.c
Merge made by the 'recursive' strategy.
 mm/slab_common.c |  2 +-
 mm/slub.c        | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)
Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
$ git merge uclinux/for-next
Already up-to-date.
Merging md/for-next (133d4527eab8 md: flush writes before starting a recovery.)
$ git merge md/for-next
Already up-to-date.
Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.linaro.org/people/ljones/mfd)
$ git merge mfd/master
Already up-to-date.
Merging mfd-lj/for-mfd-next (819b2dd1af7b mfd: arizona: Update DT binding to support MICVDD init_data)
$ git merge mfd-lj/for-mfd-next
Auto-merging include/linux/mfd/arizona/core.h
Removing drivers/mfd/max77693-irq.c
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/mfd/arizona.txt  |  10 +
 Documentation/devicetree/bindings/mfd/as3722.txt   |   8 +
 Documentation/devicetree/bindings/mfd/s2mps11.txt  |  11 +-
 .../bindings/regulator/s5m8767-regulator.txt       |   2 +-
 drivers/extcon/extcon-max77693.c                   |  35 +-
 drivers/gpio/Kconfig                               |  13 +
 drivers/gpio/Makefile                              |   1 +
 drivers/gpio/gpio-crystalcove.c                    | 380 +++++++++++++++++++++
 drivers/i2c/busses/i2c-cros-ec-tunnel.c            |  17 +-
 drivers/input/keyboard/cros_ec_keyb.c              |  70 ++--
 drivers/mfd/88pm805.c                              |   2 +-
 drivers/mfd/88pm860x-core.c                        |  37 +-
 drivers/mfd/88pm860x-i2c.c                         |   3 +-
 drivers/mfd/Kconfig                                |  19 +-
 drivers/mfd/Makefile                               |   5 +-
 drivers/mfd/aat2870-core.c                         |   5 +-
 drivers/mfd/ab3100-core.c                          |  54 ++-
 drivers/mfd/ab8500-core.c                          |  49 +--
 drivers/mfd/ab8500-debugfs.c                       |  20 +-
 drivers/mfd/arizona-core.c                         |  28 +-
 drivers/mfd/arizona-i2c.c                          |   5 +-
 drivers/mfd/arizona-spi.c                          |   3 +-
 drivers/mfd/arizona.h                              |   4 +-
 drivers/mfd/asic3.c                                |  12 +-
 drivers/mfd/cros_ec.c                              |  97 ++----
 drivers/mfd/cros_ec_i2c.c                          |  44 +--
 drivers/mfd/cros_ec_spi.c                          |  56 ++-
 drivers/mfd/intel_soc_pmic_core.c                  | 170 +++++++++
 drivers/mfd/intel_soc_pmic_core.h                  |  32 ++
 drivers/mfd/intel_soc_pmic_crc.c                   | 158 +++++++++
 drivers/mfd/max77693-irq.c                         | 336 ------------------
 drivers/mfd/max77693.c                             | 210 ++++++++----
 drivers/mfd/mc13xxx-core.c                         | 310 +++--------------
 drivers/mfd/mc13xxx.h                              |  11 +-
 drivers/mfd/pcf50633-core.c                        |  18 +-
 drivers/mfd/pm8921-core.c                          |   4 -
 drivers/mfd/rtsx_pcr.c                             |  76 +++--
 drivers/mfd/sec-core.c                             |  81 ++++-
 drivers/mfd/sec-irq.c                              | 110 +++++-
 drivers/mfd/stmpe-i2c.c                            |   4 +-
 drivers/mfd/stmpe.c                                |   2 +-
 drivers/mfd/stmpe.h                                |   2 +-
 drivers/mfd/tc3589x.c                              |   2 +-
 drivers/mfd/tps65910.c                             |  10 +-
 drivers/mfd/wm8994-regmap.c                        |  64 ++++
 drivers/mmc/host/rtsx_pci_sdmmc.c                  | 133 +++++++-
 drivers/regulator/max77693.c                       |  12 +-
 drivers/regulator/s2mps11.c                        | 321 +++++++++++++++--
 include/dt-bindings/mfd/as3722.h                   |   2 +-
 include/linux/mfd/arizona/core.h                   |   2 +-
 include/linux/mfd/cros_ec.h                        | 110 +++---
 include/linux/mfd/intel_soc_pmic.h                 |  30 ++
 include/linux/mfd/max77693-private.h               |  54 ++-
 include/linux/mfd/mc13783.h                        |   1 -
 include/linux/mfd/mc13xxx.h                        |  23 +-
 include/linux/mfd/rtsx_pci.h                       |   6 +
 include/linux/mfd/samsung/core.h                   |   1 +
 include/linux/mfd/samsung/irq.h                    |  24 ++
 include/linux/mfd/samsung/s2mpu02.h                | 201 +++++++++++
 include/linux/mfd/tps65910.h                       |   2 +-
 60 files changed, 2377 insertions(+), 1135 deletions(-)
 create mode 100644 drivers/gpio/gpio-crystalcove.c
 create mode 100644 drivers/mfd/intel_soc_pmic_core.c
 create mode 100644 drivers/mfd/intel_soc_pmic_core.h
 create mode 100644 drivers/mfd/intel_soc_pmic_crc.c
 delete mode 100644 drivers/mfd/max77693-irq.c
 create mode 100644 include/linux/mfd/intel_soc_pmic.h
 create mode 100644 include/linux/mfd/samsung/s2mpu02.h
Merging battery/master (ac323d8d8070 power: max17040: Fix NULL pointer dereference when there is no platform_data)
$ git merge battery/master
Already up-to-date.
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 (b1f46dd1079d video: clps711x: Fix sparse warnings)
$ git merge omap_dss2/for-next
Auto-merging drivers/video/fbdev/Makefile
Auto-merging drivers/video/fbdev/Kconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../bindings/video/cirrus,clps711x-fb.txt          |  47 +++
 MAINTAINERS                                        |  74 ++--
 drivers/video/fbdev/68328fb.c                      |   8 +-
 drivers/video/fbdev/Kconfig                        |  21 +-
 drivers/video/fbdev/Makefile                       |   3 +-
 drivers/video/fbdev/clps711x-fb.c                  | 397 +++++++++++++++++++++
 drivers/video/fbdev/da8xx-fb.c                     |   9 +-
 drivers/video/fbdev/mbx/mbxfb.c                    |   4 +-
 drivers/video/fbdev/msm/mddi_client_dummy.c        |  19 +-
 drivers/video/fbdev/s3c2410fb.c                    |  10 +-
 drivers/video/fbdev/sis/init.c                     |   2 +-
 drivers/video/fbdev/sis/sis_main.c                 |   4 -
 include/linux/fb.h                                 |   2 +-
 13 files changed, 515 insertions(+), 85 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/video/cirrus,clps711x-fb.txt
 create mode 100644 drivers/video/fbdev/clps711x-fb.c
Merging regulator/for-next (3012b47d28f1 Merge remote-tracking branches 'regulator/topic/tps65217', 'regulator/topic/tps65218', 'regulator/topic/tps6586x' and 'regulator/topic/twl' into regulator-next)
$ git merge regulator/for-next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/mfd/palmas.txt   |    2 +
 .../bindings/regulator/act8865-regulator.txt       |    7 +-
 .../devicetree/bindings/regulator/palmas-pmic.txt  |    1 +
 drivers/mfd/palmas.c                               |  233 ++++-
 drivers/regulator/88pm800.c                        |    1 -
 drivers/regulator/ab8500.c                         |   38 +-
 drivers/regulator/act8865-regulator.c              |  329 +++---
 drivers/regulator/arizona-ldo1.c                   |    2 -
 drivers/regulator/as3722-regulator.c               |    4 +-
 drivers/regulator/bcm590xx-regulator.c             |   16 +-
 drivers/regulator/core.c                           |   30 +-
 drivers/regulator/lp8755.c                         |   23 +-
 drivers/regulator/ltc3589.c                        |    2 +-
 drivers/regulator/max8952.c                        |   34 +-
 drivers/regulator/mc13xxx-regulator-core.c         |   37 +-
 drivers/regulator/mc13xxx.h                        |    1 -
 drivers/regulator/palmas-regulator.c               | 1104 ++++++++++++++------
 drivers/regulator/s5m8767.c                        |    4 +-
 drivers/regulator/tps65217-regulator.c             |    4 +-
 drivers/regulator/tps65218-regulator.c             |   52 +-
 drivers/regulator/tps6586x-regulator.c             |  129 +--
 drivers/regulator/twl-regulator.c                  |   13 +-
 include/linux/mfd/palmas.h                         |  837 +++++++++++++++
 include/linux/regulator/ab8500.h                   |   14 -
 include/linux/regulator/act8865.h                  |   23 +-
 25 files changed, 2184 insertions(+), 756 deletions(-)
Merging security/next (f01387d26938 Merge commit 'v3.15' into next)
$ git merge security/next
Merge made by the 'recursive' strategy.
Merging integrity/next (a0f9fd9d6d8a ima: define '.ima' as a builtin 'trusted' keyring)
$ git merge integrity/next
Auto-merging Documentation/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 Documentation/kernel-parameters.txt      |   5 ++
 crypto/asymmetric_keys/asymmetric_keys.h |   2 +
 crypto/asymmetric_keys/asymmetric_type.c |  51 +++++++++------
 crypto/asymmetric_keys/x509_public_key.c | 109 ++++++++++++++++++++++++++++++-
 include/keys/system_keyring.h            |  10 ++-
 include/linux/key.h                      |   1 +
 kernel/system_keyring.c                  |   1 +
 security/integrity/digsig.c              |  28 ++++++++
 security/integrity/ima/Kconfig           |  10 +++
 security/integrity/ima/ima.h             |  12 ++++
 security/integrity/ima/ima_appraise.c    |   2 +-
 security/integrity/ima/ima_main.c        |  17 +++--
 security/integrity/ima/ima_policy.c      |   6 +-
 security/integrity/integrity.h           |   5 ++
 security/keys/keyctl.c                   |   6 +-
 15 files changed, 231 insertions(+), 34 deletions(-)
Merging selinux/next (615e51fdda6f selinux: reduce the number of calls to synchronize_net() when flushing caches)
$ git merge selinux/next
Auto-merging security/selinux/hooks.c
Merge made by the 'recursive' strategy.
 scripts/selinux/genheaders/Makefile |   1 -
 scripts/selinux/mdp/Makefile        |   2 +-
 security/selinux/hooks.c            |  14 ++++
 security/selinux/include/netif.h    |   2 +
 security/selinux/include/netnode.h  |   2 +
 security/selinux/include/netport.h  |   2 +
 security/selinux/include/security.h |   3 +-
 security/selinux/netif.c            |  15 +---
 security/selinux/netnode.c          |  15 +---
 security/selinux/netport.c          |  15 +---
 security/selinux/ss/conditional.c   |  11 +--
 security/selinux/ss/policydb.c      | 141 +++++++++++-------------------------
 security/selinux/ss/services.c      |  41 ++++++++---
 13 files changed, 102 insertions(+), 162 deletions(-)
Merging lblnet/next (d8ec26d7f828 Linux 3.13)
$ git merge lblnet/next
Already up-to-date.
Merging watchdog/master (7171511eaec5 Linux 3.16-rc1)
$ git merge watchdog/master
Already up-to-date.
Merging iommu/next (7ee9bd3a4990 Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'arm/omap', 'ppc/pamu' and 'core' into next)
$ git merge iommu/next
Removing drivers/iommu/pci.h
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-class-iommu        |  17 +
 .../ABI/testing/sysfs-class-iommu-amd-iommu        |  14 +
 .../ABI/testing/sysfs-class-iommu-intel-iommu      |  32 ++
 drivers/iommu/Makefile                             |   1 +
 drivers/iommu/amd_iommu.c                          | 224 ++++--------
 drivers/iommu/amd_iommu_init.c                     |  38 ++
 drivers/iommu/amd_iommu_types.h                    |  10 +-
 drivers/iommu/amd_iommu_v2.c                       |   1 +
 drivers/iommu/arm-smmu.c                           |   2 +-
 drivers/iommu/dmar.c                               |  12 +-
 drivers/iommu/exynos-iommu.c                       |   2 +-
 drivers/iommu/fsl_pamu.c                           |  10 +-
 drivers/iommu/fsl_pamu_domain.c                    |  91 +----
 drivers/iommu/intel-iommu.c                        | 406 ++++++++++-----------
 drivers/iommu/intel_irq_remapping.c                |  55 ++-
 drivers/iommu/iommu-sysfs.c                        | 134 +++++++
 drivers/iommu/iommu.c                              | 201 +++++++++-
 drivers/iommu/ipmmu-vmsa.c                         |   2 +-
 drivers/iommu/msm_iommu.c                          |   2 +-
 drivers/iommu/omap-iommu.c                         |   2 +-
 drivers/iommu/omap-iovmm.c                         |  10 +-
 drivers/iommu/pci.h                                |  29 --
 drivers/iommu/shmobile-iommu.c                     |   2 +-
 drivers/iommu/tegra-gart.c                         |   2 +-
 drivers/iommu/tegra-smmu.c                         |   2 +-
 include/linux/amd-iommu.h                          |   7 +
 include/linux/device.h                             |   2 +-
 include/linux/intel-iommu.h                        |   3 +
 include/linux/iommu.h                              |  32 +-
 29 files changed, 823 insertions(+), 522 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-class-iommu
 create mode 100644 Documentation/ABI/testing/sysfs-class-iommu-amd-iommu
 create mode 100644 Documentation/ABI/testing/sysfs-class-iommu-intel-iommu
 create mode 100644 drivers/iommu/iommu-sysfs.c
 delete mode 100644 drivers/iommu/pci.h
Merging dwmw2-iommu/master (1860e379875d Linux 3.15)
$ git merge dwmw2-iommu/master
Already up-to-date.
Merging vfio/next (fd49c81f080a drivers/vfio/pci: Fix wrong MSI interrupt count)
$ git merge vfio/next
Already up-to-date.
Merging osd/linux-next (ce5d36aac26c ore: Support for raid 6)
$ 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 (d31e373d0778 irq-gic: remove file name from heading comment)
$ git merge trivial/for-next
Resolved 'Documentation/laptops/freefall.c' using previous resolution.
Resolved 'arch/arm/mach-msm/Kconfig' using previous resolution.
Auto-merging fs/befs/linuxvfs.c
Auto-merging drivers/usb/phy/phy.c
Auto-merging drivers/irqchip/irq-gic.c
Auto-merging drivers/cpuidle/governors/menu.c
Auto-merging arch/sh/boards/Kconfig
Auto-merging arch/arm/mach-msm/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-msm/Kconfig
Auto-merging Documentation/laptops/freefall.c
CONFLICT (content): Merge conflict in Documentation/laptops/freefall.c
Auto-merging Documentation/SubmittingPatches
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 3a8d7934e0fd] Merge remote-tracking branch 'trivial/for-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/PCI/MSI-HOWTO.txt       |  2 +-
 Documentation/RCU/RTFP.txt            |  4 ++--
 Documentation/SubmittingDrivers       |  4 ----
 Documentation/SubmittingPatches       |  4 ++--
 Documentation/laptops/freefall.c      |  1 +
 Documentation/scsi/ncr53c8xx.txt      |  2 +-
 Documentation/security/LSM.txt        |  2 +-
 Documentation/usb/hotplug.txt         |  8 ++++----
 Documentation/zh_CN/SubmittingDrivers |  4 ----
 arch/arm/mach-msm/Kconfig             |  3 ---
 arch/hexagon/include/asm/cache.h      |  2 +-
 arch/sh/boards/Kconfig                |  2 +-
 crypto/asymmetric_keys/Kconfig        |  1 -
 drivers/cpuidle/governors/menu.c      |  2 +-
 drivers/gpu/drm/gma500/mid_bios.c     |  1 -
 drivers/irqchip/irq-gic.c             |  2 --
 drivers/media/radio/radio-mr800.c     |  2 +-
 drivers/mfd/intel_msic.c              |  2 +-
 drivers/scsi/mvsas/mv_sas.c           | 24 ++++++++++++++----------
 drivers/usb/phy/phy.c                 |  2 +-
 fs/befs/linuxvfs.c                    |  2 --
 scripts/Makefile.modinst              |  2 +-
 22 files changed, 33 insertions(+), 45 deletions(-)
Merging audit/master (3efe33f5d2da audit: x86: drop arch from __audit_syscall_entry() interface)
$ git merge audit/master
Resolved 'arch/mips/include/asm/syscall.h' using previous resolution.
Resolved 'arch/mips/kernel/ptrace.c' using previous resolution.
Resolved 'arch/x86/Kconfig' using previous resolution.
Resolved 'kernel/audit.c' using previous resolution.
Auto-merging kernel/auditsc.c
Auto-merging kernel/audit.c
CONFLICT (content): Merge conflict in kernel/audit.c
Auto-merging include/uapi/linux/audit.h
Auto-merging arch/x86/kernel/ptrace.c
Auto-merging arch/x86/kernel/entry_64.S
Auto-merging arch/x86/kernel/entry_32.S
Auto-merging arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/x86/Kconfig
Auto-merging arch/um/kernel/ptrace.c
Auto-merging arch/s390/kernel/ptrace.c
Auto-merging arch/mips/kernel/ptrace.c
CONFLICT (content): Merge conflict in arch/mips/kernel/ptrace.c
Auto-merging arch/mips/include/asm/syscall.h
CONFLICT (content): Merge conflict in arch/mips/include/asm/syscall.h
Auto-merging arch/arm/kernel/ptrace.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master ded8cc736e86] Merge remote-tracking branch 'audit/master'
$ git diff -M --stat --summary HEAD^..
 arch/alpha/include/asm/syscall.h        | 11 +++++++++++
 arch/alpha/kernel/ptrace.c              |  2 +-
 arch/arm/kernel/ptrace.c                |  4 ++--
 arch/ia64/include/asm/syscall.h         |  6 ++++++
 arch/ia64/kernel/ptrace.c               |  2 +-
 arch/microblaze/include/asm/syscall.h   |  5 +++++
 arch/microblaze/kernel/ptrace.c         |  3 +--
 arch/mips/include/asm/syscall.h         |  2 +-
 arch/mips/kernel/ptrace.c               |  4 +---
 arch/openrisc/include/asm/syscall.h     |  5 +++++
 arch/openrisc/kernel/ptrace.c           |  3 +--
 arch/parisc/include/asm/syscall.h       | 11 +++++++++++
 arch/parisc/kernel/ptrace.c             |  9 +++------
 arch/powerpc/include/asm/syscall.h      |  6 ++++++
 arch/powerpc/kernel/ptrace.c            |  7 ++-----
 arch/s390/kernel/ptrace.c               |  4 +---
 arch/sh/include/asm/syscall_32.h        | 10 ++++++++++
 arch/sh/include/asm/syscall_64.h        | 14 ++++++++++++++
 arch/sh/kernel/ptrace_32.c              | 14 +-------------
 arch/sh/kernel/ptrace_64.c              | 17 +----------------
 arch/sparc/include/asm/syscall.h        |  7 +++++++
 arch/sparc/include/asm/thread_info_32.h |  2 ++
 arch/sparc/include/asm/thread_info_64.h |  2 ++
 arch/sparc/kernel/ptrace_64.c           |  9 ++-------
 arch/um/kernel/ptrace.c                 |  3 +--
 arch/x86/ia32/ia32entry.S               | 12 ++++++------
 arch/x86/kernel/entry_32.S              | 11 +++++------
 arch/x86/kernel/entry_64.S              | 11 +++++------
 arch/x86/kernel/ptrace.c                |  8 ++------
 arch/x86/um/asm/ptrace.h                |  4 ----
 arch/x86/um/asm/syscall.h               | 15 +++++++++++++++
 arch/xtensa/kernel/ptrace.c             |  2 +-
 include/asm-generic/syscall.h           |  2 +-
 include/linux/audit.h                   | 11 ++++++-----
 include/uapi/linux/audit.h              | 14 +-------------
 kernel/auditsc.c                        | 17 +++++++----------
 36 files changed, 147 insertions(+), 122 deletions(-)
 create mode 100644 arch/alpha/include/asm/syscall.h
 create mode 100644 arch/x86/um/asm/syscall.h
Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
$ git merge fsnotify/for-next
Already up-to-date.
Merging devicetree/devicetree/next (c9e0fb3bb3aa tty: Update hypervisor tty drivers to use core stdout parsing code.)
$ git merge devicetree/devicetree/next
Auto-merging include/linux/of.h
Auto-merging drivers/of/base.c
Auto-merging arch/arm/boot/dts/versatile-ab.dts
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/versatile-ab.dts |  4 ++++
 drivers/of/base.c                  | 28 +++++++++++++++----------
 drivers/tty/ehv_bytechan.c         | 43 ++++----------------------------------
 drivers/tty/hvc/hvc_opal.c         | 15 +++----------
 drivers/tty/hvc/hvc_vio.c          | 29 +++++++++----------------
 drivers/tty/serial/serial_core.c   |  3 +++
 include/linux/of.h                 |  7 ++++---
 7 files changed, 45 insertions(+), 84 deletions(-)
Merging dt-rh/for-next (99de64984c3a OF: fix of_find_node_by_path() assumption that of_allnodes is root)
$ git merge dt-rh/for-next
Already up-to-date.
Merging spi/for-next (fdc82f81a4e7 Merge remote-tracking branches 'spi/topic/rockchip', 'spi/topic/rspi', 'spi/topic/sh' and 'spi/topic/sh-msiof' into spi-next)
$ git merge spi/for-next
Auto-merging Documentation/devicetree/bindings/spi/spi-samsung.txt
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/spi/efm32-spi.txt          |  13 +-
 .../devicetree/bindings/spi/qcom,spi-qup.txt       |   6 +-
 .../devicetree/bindings/spi/snps,dw-apb-ssi.txt    |  28 +
 .../devicetree/bindings/spi/spi-rockchip.txt       |  37 +
 .../devicetree/bindings/spi/spi-samsung.txt        |  18 +-
 drivers/spi/Kconfig                                |  16 +-
 drivers/spi/Makefile                               |   1 +
 drivers/spi/spi-adi-v3.c                           |   5 +-
 drivers/spi/spi-au1550.c                           |   6 +-
 drivers/spi/spi-cadence.c                          |  37 +-
 drivers/spi/spi-clps711x.c                         |   2 -
 drivers/spi/spi-dw-mmio.c                          |  19 +-
 drivers/spi/spi-efm32.c                            |   8 +-
 drivers/spi/spi-falcon.c                           |   2 -
 drivers/spi/spi-fsl-lib.c                          |   2 +-
 drivers/spi/spi-fsl-spi.c                          |   2 +-
 drivers/spi/spi-omap-100k.c                        |   2 -
 drivers/spi/spi-omap-uwire.c                       |  11 +-
 drivers/spi/spi-omap2-mcspi.c                      |  14 +
 drivers/spi/spi-orion.c                            |  65 +-
 drivers/spi/spi-qup.c                              |  36 +-
 drivers/spi/spi-rockchip.c                         | 838 +++++++++++++++++++++
 drivers/spi/spi-rspi.c                             |  15 +-
 drivers/spi/spi-sh-hspi.c                          |   2 +-
 drivers/spi/spi-sh-msiof.c                         | 514 +++++++++++--
 drivers/spi/spi-sh.c                               |  15 +-
 drivers/spi/spi-xilinx.c                           |   2 +-
 drivers/spi/spi.c                                  |  12 +-
 include/linux/spi/sh_msiof.h                       |   2 +
 29 files changed, 1579 insertions(+), 151 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt
 create mode 100644 Documentation/devicetree/bindings/spi/spi-rockchip.txt
 create mode 100644 drivers/spi/spi-rockchip.c
Merging tip/auto-latest (ae072dca7a35 Merge branch 'locking/core')
$ git merge tip/auto-latest
Auto-merging lib/Kconfig.debug
Auto-merging kernel/time/timer.c
Auto-merging kernel/time/hrtimer.c
Auto-merging drivers/clocksource/Kconfig
Auto-merging MAINTAINERS
Auto-merging Documentation/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 Documentation/kernel-parameters.txt                |  21 +
 MAINTAINERS                                        |   6 +-
 arch/arc/kernel/perf_event.c                       |   7 +-
 arch/arm/kernel/topology.c                         |   2 +-
 arch/blackfin/kernel/perf_event.c                  |  15 +-
 arch/metag/kernel/perf/perf_event.c                |  19 +-
 arch/powerpc/kernel/smp.c                          |   2 +-
 arch/powerpc/perf/hv-24x7.c                        |   6 +-
 arch/powerpc/perf/hv-gpci.c                        |   6 +-
 arch/s390/kernel/perf_cpum_cf.c                    |  12 +-
 arch/sh/kernel/perf_event.c                        |  15 +-
 arch/x86/Makefile                                  |   9 +-
 arch/x86/boot/code16gcc.h                          |  24 +-
 arch/x86/include/asm/alternative.h                 |  14 +
 arch/x86/include/asm/apic.h                        |   2 +-
 arch/x86/include/asm/barrier.h                     |   2 +-
 arch/x86/include/asm/cpufeature.h                  | 395 ++++++++-------
 arch/x86/include/asm/fpu-internal.h                |  11 +-
 arch/x86/include/asm/mwait.h                       |   2 +-
 arch/x86/include/asm/processor.h                   |   4 +-
 arch/x86/include/asm/qrwlock.h                     |   2 +-
 arch/x86/include/asm/uv/uv_bau.h                   |  19 +-
 arch/x86/include/asm/xsave.h                       | 223 ++++++--
 arch/x86/include/uapi/asm/msr-index.h              |   2 +
 arch/x86/kernel/cpu/amd.c                          |   2 +-
 arch/x86/kernel/cpu/common.c                       |  17 +
 arch/x86/kernel/cpu/intel.c                        |   4 +-
 arch/x86/kernel/cpu/mcheck/mce.c                   |  19 +-
 arch/x86/kernel/cpu/perf_event_intel.c             |   9 +
 arch/x86/kernel/cpu/perf_event_intel_uncore.c      |   5 +-
 arch/x86/kernel/cpu/scattered.c                    |   1 -
 arch/x86/kernel/i387.c                             |   2 +-
 arch/x86/kernel/process.c                          |   1 +
 arch/x86/kernel/tsc.c                              |  11 +-
 arch/x86/kernel/xsave.c                            | 118 ++++-
 arch/x86/mm/fault.c                                |   6 +
 arch/x86/platform/uv/tlb_uv.c                      |  69 +--
 drivers/clocksource/Kconfig                        |   4 +
 drivers/firewire/core-cdev.c                       |   6 +-
 include/linux/hrtimer.h                            |   2 +
 include/linux/irq_work.h                           |   5 +
 include/linux/irqdomain.h                          |   2 +
 include/linux/rcupdate.h                           |  46 +-
 include/linux/rtmutex.h                            |   6 +-
 include/linux/sched.h                              |   8 +-
 include/linux/seqlock.h                            |   2 -
 include/linux/tick.h                               |   9 +-
 kernel/Makefile                                    |  25 +-
 kernel/acct.c                                      |   2 +-
 kernel/cpu.c                                       |  33 +-
 kernel/debug/kdb/kdb_main.c                        |   2 +-
 kernel/delayacct.c                                 |  16 +-
 kernel/events/core.c                               |   4 +-
 kernel/fork.c                                      |   2 +-
 kernel/futex.c                                     | 402 +++++++--------
 kernel/irq/irqdomain.c                             |   2 +-
 kernel/irq_work.c                                  | 110 ++--
 kernel/locking/mutex.c                             |  35 +-
 kernel/locking/rtmutex-debug.c                     |   5 +-
 kernel/locking/rtmutex-debug.h                     |   7 +-
 kernel/locking/rtmutex.c                           | 562 +++++++++++++++------
 kernel/locking/rtmutex.h                           |   7 +-
 kernel/locking/rtmutex_common.h                    |  22 +-
 kernel/rcu/tree.c                                  | 140 ++++-
 kernel/rcu/tree.h                                  |   6 +-
 kernel/rcu/tree_plugin.h                           |   2 +-
 kernel/rcu/update.c                                |  22 +-
 kernel/sched/core.c                                |  60 ++-
 kernel/sched/fair.c                                | 237 +++++----
 kernel/sched/idle.c                                |   4 +-
 kernel/sched/rt.c                                  |   3 +
 kernel/sched/sched.h                               |  24 +-
 kernel/smp.c                                       |   9 +
 kernel/time/Makefile                               |  17 +
 kernel/{ => time}/hrtimer.c                        |  49 +-
 kernel/{ => time}/itimer.c                         |   0
 kernel/{ => time}/posix-cpu-timers.c               |   0
 kernel/{ => time}/posix-timers.c                   |   0
 kernel/time/tick-sched.c                           |  10 +-
 kernel/{ => time}/time.c                           |   0
 kernel/{ => time}/timeconst.bc                     |   0
 kernel/{ => time}/timer.c                          |  34 +-
 kernel/tsacct.c                                    |   2 +-
 lib/Kconfig.debug                                  |   2 +-
 security/tomoyo/audit.c                            |   8 +-
 security/tomoyo/common.c                           |   4 +-
 tools/lib/traceevent/event-parse.c                 |   6 +-
 tools/lib/traceevent/plugin_cfg80211.c             |   3 +-
 tools/lib/traceevent/plugin_jbd2.c                 |   6 +-
 tools/lib/traceevent/plugin_kvm.c                  |  64 ++-
 tools/perf/Documentation/perf-bench.txt            |   4 +
 tools/perf/Documentation/perf-trace.txt            |  46 ++
 tools/perf/arch/powerpc/Makefile                   |   1 +
 tools/perf/arch/powerpc/util/skip-callchain-idx.c  | 266 ++++++++++
 tools/perf/bench/bench.h                           |   1 +
 tools/perf/bench/futex-requeue.c                   |  10 +-
 tools/perf/bench/futex-wake.c                      |  12 +-
 tools/perf/bench/mem-memcpy.c                      |   5 +
 tools/perf/bench/mem-memset.c                      |   5 +
 tools/perf/bench/sched-messaging.c                 |  47 +-
 tools/perf/builtin-bench.c                         |   7 +
 tools/perf/builtin-stat.c                          |   2 +-
 tools/perf/builtin-trace.c                         | 249 +++++++--
 tools/perf/config/Makefile                         |   4 +
 tools/perf/scripts/perl/bin/failed-syscalls-record |   3 +-
 tools/perf/scripts/perl/failed-syscalls.pl         |   5 +
 .../python/bin/failed-syscalls-by-pid-record       |   3 +-
 tools/perf/scripts/python/bin/sctop-record         |   3 +-
 .../python/bin/syscall-counts-by-pid-record        |   3 +-
 .../perf/scripts/python/bin/syscall-counts-record  |   3 +-
 .../perf/scripts/python/failed-syscalls-by-pid.py  |   5 +
 tools/perf/scripts/python/sctop.py                 |   5 +
 tools/perf/scripts/python/syscall-counts-by-pid.py |   5 +
 tools/perf/scripts/python/syscall-counts.py        |   5 +
 tools/perf/ui/browser.c                            |   2 +-
 tools/perf/ui/browsers/hists.c                     |  46 +-
 tools/perf/util/callchain.h                        |  13 +
 tools/perf/util/evlist.c                           |   5 +-
 tools/perf/util/machine.c                          |  72 +--
 .../util/scripting-engines/trace-event-python.c    |  57 ++-
 120 files changed, 2656 insertions(+), 1360 deletions(-)
 rename kernel/{ => time}/hrtimer.c (98%)
 rename kernel/{ => time}/itimer.c (100%)
 rename kernel/{ => time}/posix-cpu-timers.c (100%)
 rename kernel/{ => time}/posix-timers.c (100%)
 rename kernel/{ => time}/time.c (100%)
 rename kernel/{ => time}/timeconst.bc (100%)
 rename kernel/{ => time}/timer.c (99%)
 create mode 100644 tools/perf/arch/powerpc/util/skip-callchain-idx.c
Merging clockevents/clockevents/next (2529c3a33079 clocksource: Add Freescale FlexTimer Module (FTM) timer support)
$ git merge clockevents/clockevents/next
Already up-to-date.
Merging edac/linux_next (50d1bb93672f sb_edac: add support for Haswell based systems)
$ git merge edac/linux_next
Merge made by the 'recursive' strategy.
 drivers/edac/Kconfig         |   4 +-
 drivers/edac/edac_mc_sysfs.c |   4 +-
 drivers/edac/sb_edac.c       | 810 +++++++++++++++++++++++++++++--------------
 include/linux/edac.h         |   5 +
 4 files changed, 551 insertions(+), 272 deletions(-)
Merging edac-amd/for-next (791b470684c1 MAINTAINERS: add ie31200_edac entry)
$ git merge edac-amd/for-next
Auto-merging drivers/edac/Kconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                 |   7 +
 drivers/edac/Kconfig                        |   7 +
 drivers/edac/Makefile                       |   1 +
 drivers/edac/edac_module.c                  |   2 +-
 drivers/edac/ie31200_edac.c                 | 536 ++++++++++++++++++++++++++++
 drivers/edac/x38_edac.c                     |  15 +-
 include/asm-generic/io-64-nonatomic-hi-lo.h |  14 +-
 include/asm-generic/io-64-nonatomic-lo-hi.h |  14 +-
 8 files changed, 576 insertions(+), 20 deletions(-)
 create mode 100644 drivers/edac/ie31200_edac.c
Merging irqchip/irqchip/for-next (ecdad51eb008 Merge branch 'irqchip/urgent' into irqchip/for-next)
$ git merge irqchip/irqchip/for-next
Resolved 'arch/arm64/Kconfig' using previous resolution.
Removing include/linux/irqchip/spear-shirq.h
Auto-merging drivers/irqchip/irq-gic.c
Auto-merging drivers/irqchip/Kconfig
Auto-merging arch/arm64/kernel/head.S
Auto-merging arch/arm64/Kconfig
CONFLICT (content): Merge conflict in arch/arm64/Kconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 71c467c5af6e] Merge remote-tracking branch 'irqchip/irqchip/for-next'
$ git diff -M --stat --summary HEAD^..
 .../devicetree/bindings/arm/omap/crossbar.txt      |  36 ++
 .../interrupt-controller/opencores,or1k-pic.txt    |  23 +
 arch/arm64/Kconfig                                 |   1 +
 arch/arm64/kernel/head.S                           |  18 +
 arch/arm64/kernel/hyp-stub.S                       |   1 +
 arch/openrisc/Kconfig                              |   1 +
 arch/openrisc/include/asm/irq.h                    |   3 +
 arch/openrisc/kernel/irq.c                         | 146 +----
 drivers/irqchip/Kconfig                            |   9 +
 drivers/irqchip/Makefile                           |   4 +-
 drivers/irqchip/irq-crossbar.c                     | 168 ++++-
 drivers/irqchip/irq-gic-common.c                   | 115 ++++
 drivers/irqchip/irq-gic-common.h                   |  29 +
 drivers/irqchip/irq-gic-v3.c                       | 692 +++++++++++++++++++++
 drivers/irqchip/irq-gic.c                          |  60 +-
 drivers/irqchip/irq-nvic.c                         |  13 +-
 drivers/irqchip/irq-or1k-pic.c                     | 182 ++++++
 drivers/irqchip/spear-shirq.c                      | 304 ++++-----
 include/linux/irqchip/arm-gic-v3.h                 | 198 ++++++
 include/linux/irqchip/spear-shirq.h                |  64 --
 20 files changed, 1613 insertions(+), 454 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/opencores,or1k-pic.txt
 create mode 100644 drivers/irqchip/irq-gic-common.c
 create mode 100644 drivers/irqchip/irq-gic-common.h
 create mode 100644 drivers/irqchip/irq-gic-v3.c
 create mode 100644 drivers/irqchip/irq-or1k-pic.c
 create mode 100644 include/linux/irqchip/arm-gic-v3.h
 delete mode 100644 include/linux/irqchip/spear-shirq.h
Merging ftrace/for-next (d048a8c7b509 tracing: Add description of set_graph_notrace to tracing/README)
$ git merge ftrace/for-next
Auto-merging kernel/trace/trace.c
Auto-merging Documentation/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 Documentation/kernel-parameters.txt        |   6 +
 arch/x86/kernel/mcount_64.S                |   5 +
 arch/x86/kvm/mmutrace.h                    |   2 +-
 drivers/scsi/scsi_trace.c                  |  16 +-
 include/linux/ftrace.h                     |  24 +-
 include/linux/trace_seq.h                  |  36 ++-
 kernel/trace/Makefile                      |   1 +
 kernel/trace/ftrace.c                      | 394 ++++++++++++++++++++++----
 kernel/trace/trace.c                       |  31 +--
 kernel/trace/trace_events.c                |  56 ++--
 kernel/trace/trace_output.c                | 282 +------------------
 kernel/trace/trace_output.h                |   4 -
 kernel/trace/trace_seq.c                   | 428 +++++++++++++++++++++++++++++
 samples/trace_events/trace-events-sample.h |   2 +-
 14 files changed, 870 insertions(+), 417 deletions(-)
 create mode 100644 kernel/trace/trace_seq.c
Merging rcu/rcu/next (1823172ab582 Merge branches 'doc.2014.07.08a', 'fixes.2014.07.09a', 'maintainers.2014.07.08b', 'nocbs.2014.07.07a' and 'torture.2014.07.07a' into HEAD)
$ git merge rcu/rcu/next
Auto-merging lib/Kconfig.debug
Auto-merging kernel/time/tick-sched.c
Auto-merging init/Kconfig
Auto-merging include/linux/tick.h
Auto-merging include/linux/sched.h
Auto-merging MAINTAINERS
Auto-merging Documentation/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 Documentation/RCU/rcuref.txt                       |   9 +
 Documentation/kernel-parameters.txt                |   7 +
 Documentation/memory-barriers.txt                  |  27 +-
 MAINTAINERS                                        |  18 +-
 include/linux/init_task.h                          |   9 +-
 include/linux/rcupdate.h                           |  45 ++-
 include/linux/sched.h                              |   6 -
 include/linux/tick.h                               |  20 ++
 init/Kconfig                                       |   6 +-
 kernel/rcu/rcu.h                                   |   8 +-
 kernel/rcu/srcu.c                                  |   4 +-
 kernel/rcu/tree.c                                  |  59 ++--
 kernel/rcu/tree.h                                  |  36 ++-
 kernel/rcu/tree_plugin.h                           | 301 +++++++++++++++++----
 kernel/rcu/update.c                                |   3 -
 kernel/signal.c                                    |   4 +
 kernel/time/tick-sched.c                           |  10 +
 kernel/torture.c                                   |   2 +-
 lib/Kconfig.debug                                  |  14 -
 scripts/get_maintainer.pl                          |  22 +-
 .../selftests/rcutorture/bin/kvm-recheck.sh        |   8 +-
 .../selftests/rcutorture/bin/kvm-test-1-run.sh     |   9 +-
 tools/testing/selftests/rcutorture/bin/kvm.sh      |  21 +-
 .../selftests/rcutorture/configs/rcu/TREE01        |   1 -
 .../selftests/rcutorture/configs/rcu/TREE02        |   1 -
 .../selftests/rcutorture/configs/rcu/TREE02-T      |   1 -
 .../selftests/rcutorture/configs/rcu/TREE03        |   1 -
 .../selftests/rcutorture/configs/rcu/TREE04        |   1 -
 .../selftests/rcutorture/configs/rcu/TREE05        |   1 -
 .../selftests/rcutorture/configs/rcu/TREE06        |   1 -
 .../selftests/rcutorture/configs/rcu/TREE07        |   1 -
 .../selftests/rcutorture/configs/rcu/TREE08        |   1 -
 .../selftests/rcutorture/configs/rcu/TREE08-T      |   1 -
 .../selftests/rcutorture/configs/rcu/TREE09        |   1 -
 .../configs/rcu/v0.0/P5-U-T-NH-sd-SMP-hp           |   1 -
 .../configs/rcu/v3.12/P5-U-T-NH-sd-SMP-hp          |   1 -
 .../configs/rcu/v3.3/P5-U-T-NH-sd-SMP-hp           |   1 -
 .../configs/rcu/v3.5/P5-U-T-NH-sd-SMP-hp           |   1 -
 .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt  |   1 -
 39 files changed, 489 insertions(+), 175 deletions(-)
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 (9f6226a762c7 arch: x86: kvm: x86.c: Cleaning up variable is set more than once)
$ git merge kvm/linux-next
Auto-merging arch/x86/kvm/x86.c
Auto-merging arch/x86/include/uapi/asm/msr-index.h
Auto-merging arch/x86/include/asm/kvm_host.h
Auto-merging arch/mips/kvm/trap_emul.c
Auto-merging arch/mips/kvm/tlb.c
Auto-merging arch/mips/kvm/stats.c
Auto-merging arch/mips/kvm/mips.c
Auto-merging arch/mips/kvm/locore.S
Removing arch/mips/kvm/kvm_mips_opcode.h
Removing arch/mips/kvm/kvm_mips_commpage.c
Removing arch/mips/kvm/kvm_mips_comm.h
Auto-merging arch/mips/kvm/interrupt.h
Auto-merging arch/mips/kvm/interrupt.c
Auto-merging arch/mips/kvm/emulate.c
Auto-merging arch/mips/kvm/dyntrans.c
Merge made by the 'recursive' strategy.
 arch/mips/include/asm/kvm_host.h                  |  12 +-
 arch/mips/include/asm/r4kcache.h                  |   3 +
 arch/mips/kvm/Makefile                            |   8 +-
 arch/mips/kvm/{kvm_cb.c => callback.c}            |   0
 arch/mips/kvm/commpage.c                          |  33 ++
 arch/mips/kvm/commpage.h                          |  24 +
 arch/mips/kvm/{kvm_mips_dyntrans.c => dyntrans.c} |  40 +-
 arch/mips/kvm/{kvm_mips_emul.c => emulate.c}      | 539 +++++++++++-----------
 arch/mips/kvm/{kvm_mips_int.c => interrupt.c}     |  47 +-
 arch/mips/kvm/{kvm_mips_int.h => interrupt.h}     |  22 +-
 arch/mips/kvm/kvm_mips_comm.h                     |  23 -
 arch/mips/kvm/kvm_mips_commpage.c                 |  37 --
 arch/mips/kvm/kvm_mips_opcode.h                   |  24 -
 arch/mips/kvm/{kvm_locore.S => locore.S}          |  55 ++-
 arch/mips/kvm/{kvm_mips.c => mips.c}              | 224 +++++----
 arch/mips/kvm/opcode.h                            |  22 +
 arch/mips/kvm/{kvm_mips_stats.c => stats.c}       |  28 +-
 arch/mips/kvm/{kvm_tlb.c => tlb.c}                | 258 +++++------
 arch/mips/kvm/trace.h                             |  18 +-
 arch/mips/kvm/{kvm_trap_emul.c => trap_emul.c}    | 112 +++--
 arch/x86/include/asm/kvm_emulate.h                |   1 +
 arch/x86/include/asm/kvm_host.h                   |   1 +
 arch/x86/include/asm/vmx.h                        |   7 +-
 arch/x86/include/uapi/asm/msr-index.h             |   1 +
 arch/x86/kvm/emulate.c                            |  82 +++-
 arch/x86/kvm/pmu.c                                |   9 +
 arch/x86/kvm/vmx.c                                | 105 +++--
 arch/x86/kvm/x86.c                                |  19 +-
 arch/x86/kvm/x86.h                                |  27 ++
 29 files changed, 934 insertions(+), 847 deletions(-)
 rename arch/mips/kvm/{kvm_cb.c => callback.c} (100%)
 create mode 100644 arch/mips/kvm/commpage.c
 create mode 100644 arch/mips/kvm/commpage.h
 rename arch/mips/kvm/{kvm_mips_dyntrans.c => dyntrans.c} (79%)
 rename arch/mips/kvm/{kvm_mips_emul.c => emulate.c} (83%)
 rename arch/mips/kvm/{kvm_mips_int.c => interrupt.c} (85%)
 rename arch/mips/kvm/{kvm_mips_int.h => interrupt.h} (74%)
 delete mode 100644 arch/mips/kvm/kvm_mips_comm.h
 delete mode 100644 arch/mips/kvm/kvm_mips_commpage.c
 delete mode 100644 arch/mips/kvm/kvm_mips_opcode.h
 rename arch/mips/kvm/{kvm_locore.S => locore.S} (93%)
 rename arch/mips/kvm/{kvm_mips.c => mips.c} (84%)
 create mode 100644 arch/mips/kvm/opcode.h
 rename arch/mips/kvm/{kvm_mips_stats.c => stats.c} (63%)
 rename arch/mips/kvm/{kvm_tlb.c => tlb.c} (78%)
 rename arch/mips/kvm/{kvm_trap_emul.c => trap_emul.c} (83%)
Merging kvm-arm/next (9f6226a762c7 arch: x86: kvm: x86.c: Cleaning up variable is set more than once)
$ git merge kvm-arm/next
Already up-to-date.
Merging kvm-ppc/kvm-ppc-next (c387936a9386 KVM: PPC: Book3S: Move vcore definition to end of kvm_arch struct)
$ git merge kvm-ppc/kvm-ppc-next
Merge made by the 'recursive' strategy.
 Documentation/virtual/kvm/api.txt        |  45 ++++++++-
 arch/powerpc/include/asm/asm-compat.h    |   4 +
 arch/powerpc/include/asm/hvcall.h        |   6 ++
 arch/powerpc/include/asm/kvm_book3s.h    |  10 +-
 arch/powerpc/include/asm/kvm_book3s_64.h |  23 +++--
 arch/powerpc/include/asm/kvm_host.h      |  14 ++-
 arch/powerpc/include/asm/kvm_ppc.h       |   2 +-
 arch/powerpc/include/asm/mmu-book3e.h    |   5 +-
 arch/powerpc/include/asm/reg.h           |  16 +++
 arch/powerpc/include/asm/time.h          |   9 ++
 arch/powerpc/kernel/asm-offsets.c        |   1 +
 arch/powerpc/kvm/Kconfig                 |   1 -
 arch/powerpc/kvm/book3s.c                |  17 ++++
 arch/powerpc/kvm/book3s_64_mmu_hv.c      | 128 ++++++++++++------------
 arch/powerpc/kvm/book3s_emulate.c        |  22 +++--
 arch/powerpc/kvm/book3s_hv.c             | 164 ++++++++++++++++++++++++++-----
 arch/powerpc/kvm/book3s_hv_builtin.c     |  13 +++
 arch/powerpc/kvm/book3s_hv_ras.c         |   6 +-
 arch/powerpc/kvm/book3s_hv_rm_mmu.c      | 146 +++++++++++++++------------
 arch/powerpc/kvm/book3s_hv_rmhandlers.S  |  72 +++++++++-----
 arch/powerpc/kvm/book3s_interrupts.S     |   4 +
 arch/powerpc/kvm/book3s_pr.c             |  37 +++++++
 arch/powerpc/kvm/book3s_pr_papr.c        |  83 ++++++++++++++--
 arch/powerpc/kvm/book3s_rmhandlers.S     |   6 +-
 arch/powerpc/kvm/e500_emulate.c          |  12 +++
 arch/powerpc/kvm/e500_mmu_host.c         |   4 +
 arch/powerpc/kvm/e500mc.c                |   6 +-
 arch/powerpc/kvm/powerpc.c               |  47 +++++++++
 include/uapi/linux/kvm.h                 |   1 +
 29 files changed, 685 insertions(+), 219 deletions(-)
Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1)
$ git merge oprofile/for-next
Already up-to-date.
Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work)
$ git merge fw-nohz/nohz/next
Already up-to-date.
Merging xen-tip/linux-next (77945ca73e9a x86/xen: map foreign pfns for autotranslated guests)
$ git merge xen-tip/linux-next
Already up-to-date.
Merging percpu/for-next (a46e532a9145 Merge branch 'for-3.16-fixes' into for-next)
$ git merge percpu/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging workqueues/for-next (2b8da254fd06 Merge branch 'for-3.17' into for-next)
$ git merge workqueues/for-next
Resolved 'kernel/workqueue.c' using previous resolution.
Auto-merging kernel/workqueue.c
CONFLICT (content): Merge conflict in kernel/workqueue.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master a171f743cfdc] Merge remote-tracking branch 'workqueues/for-next'
$ git diff -M --stat --summary HEAD^..
 kernel/workqueue.c | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)
Merging drivers-x86/linux-next (f82bdd0d77b6 hp-wmi: Enable hotkeys on some systems)
$ git merge drivers-x86/linux-next
Already up-to-date.
Merging chrome-platform/for-next (d1c1437062db platform/chrome: pstore: fix dmi table to match all chrome systems)
$ git merge chrome-platform/for-next
Merge made by the 'recursive' strategy.
 drivers/platform/chrome/chromeos_laptop.c | 93 +++++++++++++++++++++++++++++--
 drivers/platform/chrome/chromeos_pstore.c | 14 +----
 2 files changed, 89 insertions(+), 18 deletions(-)
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 (cd3de83f1476 Linux 3.16-rc4)
$ git merge regmap/for-next
Already up-to-date.
Merging hsi/for-next (b357d7b58f37 hsi: omap_ssi_port: use normal module refcounting)
$ git merge hsi/for-next
Already up-to-date.
Merging leds/for-next (7e7743901b53 leds:pca963x: Update for PCA9635 and correct statement about MODE2 OUTDRV default)
$ git merge leds/for-next
Resolved 'drivers/hid/hid-gt683r.c' using previous resolution.
Auto-merging drivers/hid/hid-gt683r.c
CONFLICT (add/add): Merge conflict in drivers/hid/hid-gt683r.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 40b23961dbf5] Merge remote-tracking branch 'leds/for-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/ABI/testing/sysfs-class-leds-gt683r  | 16 +++++++++
 Documentation/devicetree/bindings/leds/pca963x.txt |  9 ++---
 drivers/hid/hid-gt683r.c                           | 42 ++++++++++++++--------
 drivers/input/keyboard/lm8323.c                    | 22 +++++-------
 drivers/leds/led-class.c                           |  5 +--
 drivers/leds/leds-lm3530.c                         | 20 ++++-------
 drivers/leds/leds-lm3533.c                         | 20 +++++------
 drivers/leds/leds-lm355x.c                         | 21 +++++------
 drivers/leds/leds-lm3642.c                         | 30 ++++++++--------
 drivers/leds/leds-lp55xx-common.c                  | 20 ++---------
 drivers/leds/leds-max8997.c                        | 16 ++++-----
 drivers/leds/leds-netxbig.c                        | 31 +++++++---------
 drivers/leds/leds-ns2.c                            | 16 ++++-----
 drivers/leds/leds-pca963x.c                        | 28 ++++++++++-----
 drivers/leds/leds-ss4200.c                         | 14 +++++---
 drivers/leds/leds-wm831x-status.c                  | 23 +++++-------
 include/linux/leds.h                               |  2 ++
 17 files changed, 168 insertions(+), 167 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-class-leds-gt683r
Merging driver-core/driver-core-next (954513551f5a staging: android: Cleanup style issues)
$ git merge driver-core/driver-core-next
Removing scripts/coccinelle/api/devm_ioremap_resource.cocci
Auto-merging include/linux/device.h
Auto-merging include/drm/drmP.h
Auto-merging drivers/gpu/drm/nouveau/nouveau_drm.c
Auto-merging drivers/dma-buf/dma-buf.c
Removing drivers/base/reservation.c
Auto-merging drivers/base/platform.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-bus-platform       |  20 +
 Documentation/DocBook/device-drivers.tmpl          |   8 +-
 Documentation/driver-model/devres.txt              | 112 +--
 Documentation/stable_kernel_rules.txt              |   3 +
 MAINTAINERS                                        |   4 +-
 drivers/Makefile                                   |   1 +
 drivers/base/Kconfig                               |  19 +-
 drivers/base/Makefile                              |   1 -
 drivers/base/component.c                           | 192 ++++-
 drivers/base/firmware_class.c                      |  43 +-
 drivers/base/platform.c                            |  51 +-
 drivers/base/reservation.c                         |  39 -
 drivers/bus/brcmstb_gisb.c                         |   6 +-
 drivers/dma-buf/Makefile                           |   1 +
 drivers/{base => dma-buf}/dma-buf.c                | 168 +++-
 drivers/dma-buf/fence.c                            | 431 ++++++++++
 drivers/dma-buf/reservation.c                      | 477 +++++++++++
 drivers/dma-buf/seqno-fence.c                      |  73 ++
 drivers/gpu/drm/armada/armada_crtc.c               |   8 +-
 drivers/gpu/drm/armada/armada_gem.c                |   2 +-
 drivers/gpu/drm/drm_prime.c                        |   8 +-
 drivers/gpu/drm/exynos/exynos_drm_dmabuf.c         |   2 +-
 drivers/gpu/drm/i915/i915_gem_dmabuf.c             |   3 +-
 drivers/gpu/drm/nouveau/nouveau_drm.c              |   1 +
 drivers/gpu/drm/nouveau/nouveau_gem.h              |   1 +
 drivers/gpu/drm/nouveau/nouveau_prime.c            |   7 +
 drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c          |   2 +-
 drivers/gpu/drm/radeon/radeon_drv.c                |   2 +
 drivers/gpu/drm/radeon/radeon_prime.c              |   8 +
 drivers/gpu/drm/tegra/gem.c                        |   2 +-
 drivers/gpu/drm/ttm/ttm_object.c                   |   2 +-
 drivers/media/v4l2-core/videobuf2-dma-contig.c     |   2 +-
 drivers/staging/android/Kconfig                    |   1 +
 drivers/staging/android/Makefile                   |   2 +-
 drivers/staging/android/ion/ion.c                  |   3 +-
 drivers/staging/android/sw_sync.c                  |   6 +-
 drivers/staging/android/sync.c                     | 913 +++++++--------------
 drivers/staging/android/sync.h                     |  79 +-
 drivers/staging/android/sync_debug.c               | 252 ++++++
 drivers/staging/android/trace/sync.h               |  12 +-
 fs/debugfs/file.c                                  |   2 +-
 fs/debugfs/inode.c                                 |  39 +-
 fs/kernfs/file.c                                   |   2 +-
 include/drm/drmP.h                                 |   3 +
 include/linux/component.h                          |   7 +
 include/linux/device.h                             |   2 -
 include/linux/dma-buf.h                            |  21 +-
 include/linux/fence.h                              | 360 ++++++++
 include/linux/firmware.h                           |  15 +-
 include/linux/platform_device.h                    |   1 +
 include/linux/reservation.h                        |  82 +-
 include/linux/seqno-fence.h                        | 116 +++
 include/trace/events/fence.h                       | 128 +++
 lib/devres.c                                       |  28 -
 scripts/coccinelle/api/devm_ioremap_resource.cocci |  90 --
 55 files changed, 2888 insertions(+), 975 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-bus-platform
 delete mode 100644 drivers/base/reservation.c
 create mode 100644 drivers/dma-buf/Makefile
 rename drivers/{base => dma-buf}/dma-buf.c (81%)
 create mode 100644 drivers/dma-buf/fence.c
 create mode 100644 drivers/dma-buf/reservation.c
 create mode 100644 drivers/dma-buf/seqno-fence.c
 create mode 100644 drivers/staging/android/sync_debug.c
 create mode 100644 include/linux/fence.h
 create mode 100644 include/linux/seqno-fence.h
 create mode 100644 include/trace/events/fence.h
 delete mode 100644 scripts/coccinelle/api/devm_ioremap_resource.cocci
Merging tty/tty-next (ca17749259d2 Merge 3.16-rc5 into tty-next.)
$ git merge tty/tty-next
Auto-merging drivers/tty/serial/serial_core.c
Auto-merging drivers/tty/serial/samsung.c
Auto-merging drivers/tty/serial/Kconfig
Auto-merging arch/arm/boot/dts/exynos5410.dtsi
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/serial/efm32-uart.txt      |   4 +-
 .../devicetree/bindings/serial/samsung_uart.txt    |  52 +++-
 .../bindings/serial/snps-dw-apb-uart.txt           |  31 ++
 arch/arc/boot/dts/angel4.dts                       |   3 +-
 arch/arc/plat-arcfpga/Kconfig                      |   7 -
 arch/arc/plat-arcfpga/platform.c                   |  97 +-----
 arch/arm/boot/dts/exynos3250.dtsi                  |   2 +
 arch/arm/boot/dts/exynos4.dtsi                     |  12 +-
 arch/arm/boot/dts/exynos5.dtsi                     |  15 +-
 arch/arm/boot/dts/exynos5260.dtsi                  |   4 +
 arch/arm/boot/dts/exynos5410.dtsi                  |   6 +
 arch/arm/boot/dts/exynos5440.dtsi                  |   6 +-
 arch/arm/boot/dts/s3c2416.dtsi                     |   6 +-
 arch/arm/boot/dts/s3c24xx.dtsi                     |   9 +-
 arch/arm/boot/dts/s3c64xx.dtsi                     |   4 +
 drivers/char/pcmcia/synclink_cs.c                  |   4 +-
 drivers/staging/dgrp/dgrp_tty.c                    |  10 -
 drivers/tty/cyclades.c                             |   2 +-
 drivers/tty/ipwireless/tty.c                       |   5 -
 drivers/tty/pty.c                                  |  21 +-
 drivers/tty/serial/21285.c                         |   5 -
 drivers/tty/serial/8250/8250_dw.c                  | 136 ++++-----
 drivers/tty/serial/Kconfig                         |   3 +-
 drivers/tty/serial/altera_jtaguart.c               |   5 -
 drivers/tty/serial/altera_uart.c                   |  13 +-
 drivers/tty/serial/amba-pl010.c                    |  48 +--
 drivers/tty/serial/amba-pl011.c                    |  30 +-
 drivers/tty/serial/apbuart.c                       |   6 -
 drivers/tty/serial/ar933x_uart.c                   |   5 -
 drivers/tty/serial/arc_uart.c                      | 337 ++++++++-------------
 drivers/tty/serial/bfin_sport_uart.c               |  17 +-
 drivers/tty/serial/bfin_uart.c                     |  22 +-
 drivers/tty/serial/clps711x.c                      |   1 -
 drivers/tty/serial/cpm_uart/cpm_uart_core.c        |   9 -
 drivers/tty/serial/crisv10.c                       |  15 +-
 drivers/tty/serial/dz.c                            |   6 -
 drivers/tty/serial/efm32-uart.c                    |  14 +-
 drivers/tty/serial/fsl_lpuart.c                    |  50 ++-
 drivers/tty/serial/icom.c                          |   6 -
 drivers/tty/serial/ioc3_serial.c                   |   1 -
 drivers/tty/serial/ioc4_serial.c                   |   1 -
 drivers/tty/serial/jsm/jsm_tty.c                   |   6 -
 drivers/tty/serial/lantiq.c                        |   8 +-
 drivers/tty/serial/lpc32xx_hs.c                    |   7 -
 drivers/tty/serial/max310x.c                       |   1 -
 drivers/tty/serial/mcf.c                           |  11 +-
 drivers/tty/serial/men_z135_uart.c                 |   6 +-
 drivers/tty/serial/mpsc.c                          |   5 -
 drivers/tty/serial/mrst_max3110.c                  |   5 -
 drivers/tty/serial/msm_serial.c                    |  30 +-
 drivers/tty/serial/msm_serial.h                    |   4 +-
 drivers/tty/serial/mux.c                           |  11 -
 drivers/tty/serial/mxs-auart.c                     |   6 -
 drivers/tty/serial/nwpserial.c                     |   6 -
 drivers/tty/serial/pch_uart.c                      |   2 +-
 drivers/tty/serial/pxa.c                           |   2 +-
 drivers/tty/serial/samsung.c                       |  27 +-
 drivers/tty/serial/sc16is7xx.c                     |   1 -
 drivers/tty/serial/sccnxp.c                        |   6 -
 drivers/tty/serial/serial-tegra.c                  |   4 +
 drivers/tty/serial/serial_core.c                   |  35 +--
 drivers/tty/serial/serial_txx9.c                   |   7 -
 drivers/tty/serial/sh-sci.c                        |   8 -
 drivers/tty/serial/sirfsoc_uart.c                  |   3 +-
 drivers/tty/serial/sirfsoc_uart.h                  |   2 +-
 drivers/tty/serial/sn_console.c                    |  10 -
 drivers/tty/serial/st-asc.c                        |   7 -
 drivers/tty/serial/sunhv.c                         |   6 -
 drivers/tty/serial/sunsab.c                        |   7 -
 drivers/tty/serial/tilegx.c                        |  10 -
 drivers/tty/serial/timbuart.c                      |   6 -
 drivers/tty/serial/uartlite.c                      |   6 -
 drivers/tty/serial/ucc_uart.c                      |  11 -
 drivers/tty/serial/xilinx_uartps.c                 |   6 -
 drivers/tty/synclink.c                             |  10 +-
 drivers/tty/synclink_gt.c                          |  10 +-
 drivers/tty/synclinkmp.c                           |  11 +-
 drivers/tty/tty_io.c                               |  39 +--
 drivers/tty/tty_port.c                             |  43 ++-
 include/linux/tty.h                                |   4 +-
 include/linux/tty_driver.h                         |   8 +-
 net/irda/ircomm/ircomm_tty.c                       |   6 +-
 82 files changed, 539 insertions(+), 894 deletions(-)
Merging usb/usb-next (85bf20d18ac0 Merge 3.16-rc5 into usb-next)
$ git merge usb/usb-next
Auto-merging arch/arm/boot/dts/tegra30.dtsi
Auto-merging arch/arm/boot/dts/tegra20.dtsi
Auto-merging arch/arm/boot/dts/tegra124.dtsi
Auto-merging arch/arm/boot/dts/tegra114.dtsi
Merge made by the 'recursive' strategy.
 Documentation/ABI/stable/sysfs-bus-usb             |  14 +-
 .../bindings/usb/nvidia,tegra20-usb-phy.txt        |   8 +
 Documentation/devicetree/bindings/usb/usb-xhci.txt |   3 +-
 Documentation/usb/power-management.txt             | 245 ++++++++++++++++++++-
 arch/arm/boot/dts/tegra114.dtsi                    |   5 +
 arch/arm/boot/dts/tegra124.dtsi                    |   7 +
 arch/arm/boot/dts/tegra20.dtsi                     |   7 +
 arch/arm/boot/dts/tegra30.dtsi                     |   7 +
 drivers/usb/class/usbtmc.c                         |   2 +-
 drivers/usb/core/hub.c                             |  42 ++--
 drivers/usb/core/hub.h                             |   2 +
 drivers/usb/core/port.c                            |  21 +-
 drivers/usb/core/quirks.c                          |   3 +
 drivers/usb/dwc2/gadget.c                          |  12 +-
 drivers/usb/dwc3/Kconfig                           |   7 +
 drivers/usb/dwc3/host.c                            |  14 ++
 drivers/usb/gadget/mv_udc_core.c                   |   4 +-
 drivers/usb/host/Kconfig                           |   8 +
 drivers/usb/host/Makefile                          |   3 +
 drivers/usb/host/ehci-exynos.c                     |   2 +-
 drivers/usb/host/ehci-mem.c                        |   2 +-
 drivers/usb/host/ehci-msm.c                        |   2 +-
 drivers/usb/host/ehci-pci.c                        |  25 +++
 drivers/usb/host/ehci-spear.c                      |   2 +-
 drivers/usb/host/ehci-tegra.c                      |  67 +++++-
 drivers/usb/host/fhci-dbg.c                        |   8 +-
 drivers/usb/host/fotg210-hcd.c                     |  48 +---
 drivers/usb/host/max3421-hcd.c                     |  48 ++--
 drivers/usb/host/ohci-exynos.c                     |   2 +-
 drivers/usb/host/ohci-hcd.c                        |   2 +-
 drivers/usb/host/ohci-spear.c                      |   2 +-
 drivers/usb/host/oxu210hp-hcd.c                    |  48 +---
 drivers/usb/host/uhci-grlib.c                      |  31 +--
 drivers/usb/host/uhci-hcd.c                        |   2 +-
 drivers/usb/host/uhci-platform.c                   |  22 +-
 drivers/usb/host/xhci-plat.c                       |  52 +++--
 drivers/usb/host/xhci-rcar.c                       | 148 +++++++++++++
 drivers/usb/host/xhci-rcar.h                       |  27 +++
 drivers/usb/host/xhci.c                            | 153 +++++++------
 drivers/usb/misc/usb3503.c                         |  37 +++-
 drivers/usb/phy/phy-tegra-usb.c                    |   9 +-
 drivers/usb/serial/kl5kusb105.c                    |  30 ---
 drivers/usb/serial/mos7840.c                       |   5 +-
 include/linux/usb/xhci_pdriver.h                   |  27 +++
 44 files changed, 878 insertions(+), 337 deletions(-)
 create mode 100644 drivers/usb/host/xhci-rcar.c
 create mode 100644 drivers/usb/host/xhci-rcar.h
 create mode 100644 include/linux/usb/xhci_pdriver.h
Merging usb-gadget/next (527b570c8427 usb: gadget: s3c2410: Move to clk_prepare_enable/clk_disable_unprepare)
$ git merge usb-gadget/next
Resolved 'drivers/usb/musb/musb_cppi41.c' using previous resolution.
Auto-merging drivers/usb/phy/phy-tegra-usb.c
Auto-merging drivers/usb/phy/phy-msm-usb.c
Auto-merging drivers/usb/musb/ux500.c
Auto-merging drivers/usb/musb/musb_dsps.c
Auto-merging drivers/usb/musb/musb_cppi41.c
CONFLICT (content): Merge conflict in drivers/usb/musb/musb_cppi41.c
Auto-merging drivers/usb/musb/musb_core.c
Auto-merging drivers/usb/gadget/gr_udc.c
Auto-merging drivers/usb/gadget/f_fs.c
Auto-merging drivers/usb/gadget/configfs.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 0a1485fcee92] Merge remote-tracking branch 'usb-gadget/next'
$ git diff -M --stat --summary HEAD^..
 drivers/usb/dwc3/core.c                            |   51 +-
 drivers/usb/dwc3/core.h                            |   13 +
 drivers/usb/gadget/Kconfig                         |   10 +-
 drivers/usb/gadget/atmel_usba_udc.c                |    2 +-
 drivers/usb/gadget/configfs.c                      |    4 +-
 drivers/usb/gadget/f_fs.c                          |    4 +-
 drivers/usb/gadget/fsl_qe_udc.c                    |   19 +-
 drivers/usb/gadget/fsl_udc_core.c                  |    7 +-
 drivers/usb/gadget/fusb300_udc.c                   |    4 +-
 drivers/usb/gadget/g_ffs.c                         |    2 +-
 drivers/usb/gadget/gr_udc.c                        |    2 +-
 drivers/usb/gadget/lpc32xx_udc.c                   |    7 +-
 drivers/usb/gadget/m66592-udc.c                    |    4 +-
 drivers/usb/gadget/net2272.c                       |    2 +-
 drivers/usb/gadget/net2280.c                       | 2752 +++++++++++++-------
 drivers/usb/gadget/net2280.h                       |  285 +-
 drivers/usb/gadget/omap_udc.c                      |    5 +-
 drivers/usb/gadget/pxa25x_udc.c                    |   73 +-
 drivers/usb/gadget/pxa27x_udc.c                    |    6 +
 drivers/usb/gadget/r8a66597-udc.c                  |   92 +-
 drivers/usb/gadget/s3c2410_udc.c                   |    8 +-
 drivers/usb/musb/blackfin.c                        |   20 +-
 drivers/usb/musb/davinci.c                         |   20 +-
 drivers/usb/musb/musb_core.c                       |   16 +-
 drivers/usb/musb/musb_cppi41.c                     |   70 +-
 drivers/usb/musb/musb_dma.h                        |    1 +
 drivers/usb/musb/musb_dsps.c                       |   22 +-
 drivers/usb/musb/musb_host.c                       |   19 +-
 drivers/usb/musb/tusb6010.c                        |   16 +-
 drivers/usb/musb/ux500.c                           |   28 +-
 drivers/usb/phy/phy-gpio-vbus-usb.c                |   45 +-
 drivers/usb/phy/phy-msm-usb.c                      |   12 +-
 drivers/usb/phy/phy-tegra-usb.c                    |    2 +-
 include/linux/usb/usb338x.h                        |  199 ++
 .../multibuff/device_app/aio_multibuff.c           |   39 +-
 .../usb/ffs-aio-example/multibuff/host_app/test.c  |   27 +
 .../ffs-aio-example/simple/device_app/aio_simple.c |   39 +-
 tools/usb/ffs-aio-example/simple/host_app/test.c   |   27 +
 38 files changed, 2584 insertions(+), 1370 deletions(-)
 create mode 100644 include/linux/usb/usb338x.h
Merging usb-serial/usb-next (5bc9e5933a41 USB: kl5kusb105: Remove klsi_105_tiocmset function)
$ git merge usb-serial/usb-next
Auto-merging drivers/usb/serial/ftdi_sio.c
Merge made by the 'recursive' strategy.
 drivers/usb/serial/ftdi_sio.c | 82 ++++++++++++-------------------------------
 1 file changed, 23 insertions(+), 59 deletions(-)
Merging staging/staging-next (589e1d10ff27 Merge 3.16-rc5 into staging-next)
$ git merge staging/staging-next
Removing drivers/staging/wlags49_h25/wl_wext.h
Removing drivers/staging/wlags49_h25/wl_wext.c
Removing drivers/staging/wlags49_h25/wl_version.h
Removing drivers/staging/wlags49_h25/wl_util.h
Removing drivers/staging/wlags49_h25/wl_util.c
Removing drivers/staging/wlags49_h25/wl_profile.h
Removing drivers/staging/wlags49_h25/wl_profile.c
Removing drivers/staging/wlags49_h25/wl_priv.h
Removing drivers/staging/wlags49_h25/wl_priv.c
Removing drivers/staging/wlags49_h25/wl_netdev.h
Removing drivers/staging/wlags49_h25/wl_netdev.c
Removing drivers/staging/wlags49_h25/wl_main.h
Removing drivers/staging/wlags49_h25/wl_main.c
Removing drivers/staging/wlags49_h25/wl_internal.h
Removing drivers/staging/wlags49_h25/wl_if.h
Removing drivers/staging/wlags49_h25/wl_enc.h
Removing drivers/staging/wlags49_h25/wl_enc.c
Removing drivers/staging/wlags49_h25/wl_cs.h
Removing drivers/staging/wlags49_h25/wl_cs.c
Removing drivers/staging/wlags49_h25/sta_h25.c
Removing drivers/staging/wlags49_h25/mmd.h
Removing drivers/staging/wlags49_h25/mmd.c
Removing drivers/staging/wlags49_h25/mdd.h
Removing drivers/staging/wlags49_h25/hcfdef.h
Removing drivers/staging/wlags49_h25/hcfcfg.h
Removing drivers/staging/wlags49_h25/hcf.h
Removing drivers/staging/wlags49_h25/hcf.c
Removing drivers/staging/wlags49_h25/dhfcfg.h
Removing drivers/staging/wlags49_h25/dhf.h
Removing drivers/staging/wlags49_h25/dhf.c
Removing drivers/staging/wlags49_h25/debug.h
Removing drivers/staging/wlags49_h25/ap_h25.c
Removing drivers/staging/wlags49_h25/TODO
Removing drivers/staging/wlags49_h25/README.txt
Removing drivers/staging/wlags49_h25/Makefile
Removing drivers/staging/wlags49_h25/Kconfig
Removing drivers/staging/wlags49_h2/wl_wext.h
Removing drivers/staging/wlags49_h2/wl_wext.c
Removing drivers/staging/wlags49_h2/wl_version.h
Removing drivers/staging/wlags49_h2/wl_util.h
Removing drivers/staging/wlags49_h2/wl_util.c
Removing drivers/staging/wlags49_h2/wl_profile.h
Removing drivers/staging/wlags49_h2/wl_profile.c
Removing drivers/staging/wlags49_h2/wl_priv.h
Removing drivers/staging/wlags49_h2/wl_priv.c
Removing drivers/staging/wlags49_h2/wl_netdev.h
Removing drivers/staging/wlags49_h2/wl_netdev.c
Removing drivers/staging/wlags49_h2/wl_main.h
Removing drivers/staging/wlags49_h2/wl_main.c
Removing drivers/staging/wlags49_h2/wl_internal.h
Removing drivers/staging/wlags49_h2/wl_if.h
Removing drivers/staging/wlags49_h2/wl_enc.h
Removing drivers/staging/wlags49_h2/wl_enc.c
Removing drivers/staging/wlags49_h2/wl_cs.h
Removing drivers/staging/wlags49_h2/wl_cs.c
Removing drivers/staging/wlags49_h2/sta_h25.c
Removing drivers/staging/wlags49_h2/sta_h2.c
Removing drivers/staging/wlags49_h2/mmd.h
Removing drivers/staging/wlags49_h2/mmd.c
Removing drivers/staging/wlags49_h2/mdd.h
Removing drivers/staging/wlags49_h2/man/wlags49.4
Removing drivers/staging/wlags49_h2/hcfdef.h
Removing drivers/staging/wlags49_h2/hcfcfg.h
Removing drivers/staging/wlags49_h2/hcf.h
Removing drivers/staging/wlags49_h2/hcf.c
Removing drivers/staging/wlags49_h2/dhfcfg.h
Removing drivers/staging/wlags49_h2/dhf.h
Removing drivers/staging/wlags49_h2/dhf.c
Removing drivers/staging/wlags49_h2/debug.h
Removing drivers/staging/wlags49_h2/ap_h25.c
Removing drivers/staging/wlags49_h2/ap_h2.c
Removing drivers/staging/wlags49_h2/WARNING.txt
Removing drivers/staging/wlags49_h2/TODO
Removing drivers/staging/wlags49_h2/README.wlags49
Removing drivers/staging/wlags49_h2/README.ubuntu
Removing drivers/staging/wlags49_h2/Makefile
Removing drivers/staging/wlags49_h2/Kconfig
Removing drivers/staging/winbond/wbusb.c
Removing drivers/staging/winbond/wbhal.h
Removing drivers/staging/winbond/wb35tx_s.h
Removing drivers/staging/winbond/wb35tx_f.h
Removing drivers/staging/winbond/wb35tx.c
Removing drivers/staging/winbond/wb35rx_s.h
Removing drivers/staging/winbond/wb35rx_f.h
Removing drivers/staging/winbond/wb35rx.c
Removing drivers/staging/winbond/wb35reg_s.h
Removing drivers/staging/winbond/wb35reg_f.h
Removing drivers/staging/winbond/wb35reg.c
Removing drivers/staging/winbond/sme_api.h
Removing drivers/staging/winbond/reg.c
Removing drivers/staging/winbond/phy_calibration.h
Removing drivers/staging/winbond/phy_calibration.c
Removing drivers/staging/winbond/mto.h
Removing drivers/staging/winbond/mto.c
Removing drivers/staging/winbond/mds_s.h
Removing drivers/staging/winbond/mds_f.h
Removing drivers/staging/winbond/mds.c
Removing drivers/staging/winbond/mac_structures.h
Removing drivers/staging/winbond/localpara.h
Removing drivers/staging/winbond/core.h
Removing drivers/staging/winbond/TODO
Removing drivers/staging/winbond/Makefile
Removing drivers/staging/winbond/Kconfig
Removing drivers/staging/vt6656/wpactl.h
Removing drivers/staging/vt6656/wpactl.c
Removing drivers/staging/vt6656/wpa2.h
Removing drivers/staging/vt6656/wpa2.c
Removing drivers/staging/vt6656/wpa.h
Removing drivers/staging/vt6656/wpa.c
Removing drivers/staging/vt6656/wmgr.h
Removing drivers/staging/vt6656/wmgr.c
Removing drivers/staging/vt6656/wctl.h
Removing drivers/staging/vt6656/wctl.c
Removing drivers/staging/vt6656/vntconfiguration.dat
Removing drivers/staging/vt6656/tmacro.h
Removing drivers/staging/vt6656/tkip.h
Removing drivers/staging/vt6656/tkip.c
Removing drivers/staging/vt6656/tether.h
Removing drivers/staging/vt6656/tether.c
Removing drivers/staging/vt6656/rc4.h
Removing drivers/staging/vt6656/rc4.c
Removing drivers/staging/vt6656/michael.h
Removing drivers/staging/vt6656/michael.c
Removing drivers/staging/vt6656/iwctl.h
Removing drivers/staging/vt6656/iwctl.c
Removing drivers/staging/vt6656/iowpa.h
Removing drivers/staging/vt6656/iocmd.h
Removing drivers/staging/vt6656/datarate.h
Removing drivers/staging/vt6656/datarate.c
Removing drivers/staging/vt6656/country.h
Removing drivers/staging/vt6656/bssdb.h
Removing drivers/staging/vt6656/bssdb.c
Removing drivers/staging/vt6656/80211mgr.h
Removing drivers/staging/vt6656/80211mgr.c
Removing drivers/staging/vt6656/80211hdr.h
Removing drivers/staging/serqt_usb2/serqt_usb2.c
Removing drivers/staging/serqt_usb2/Makefile
Removing drivers/staging/serqt_usb2/Kconfig
Removing drivers/staging/rtl8723au/include/rtw_ioctl_set.h
Removing drivers/staging/rtl8723au/core/rtw_ioctl_set.c
Removing drivers/staging/rtl8188eu/include/usb_vendor_req.h
Removing drivers/staging/rtl8188eu/include/usb_osintf.h
Removing drivers/staging/rtl8188eu/include/usb_ops.h
Removing drivers/staging/rtl8188eu/include/rtw_version.h
Removing drivers/staging/rtl8188eu/include/rtw_p2p.h
Removing drivers/staging/rtl8188eu/include/rtw_mp_ioctl.h
Removing drivers/staging/rtl8188eu/include/rtw_mp.h
Removing drivers/staging/rtl8188eu/include/rtw_io.h
Removing drivers/staging/rtl8188eu/include/rtw_br_ext.h
Removing drivers/staging/rtl8188eu/include/rtl8188e_sreset.h
Removing drivers/staging/rtl8188eu/include/cmd_osdep.h
Removing drivers/staging/rtl8188eu/include/HalPhyRf.h
Removing drivers/staging/rtl8188eu/include/Hal8188EReg.h
Removing drivers/staging/rtl8188eu/hal/usb_ops_linux.c
Removing drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c
Removing drivers/staging/rtl8188eu/hal/rtl8188e_mp.c
Removing drivers/staging/rtl8188eu/hal/HalPhyRf.c
Removing drivers/staging/rtl8188eu/core/rtw_p2p.c
Removing drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c
Removing drivers/staging/rtl8188eu/core/rtw_mp.c
Removing drivers/staging/rtl8188eu/core/rtw_io.c
Removing drivers/staging/rtl8188eu/core/rtw_br_ext.c
Removing drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c
Removing drivers/staging/lustre/lustre/ptlrpc/gss/lproc_gss.c
Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_svc_upcall.c
Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_rawobj.c
Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c
Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_mech_switch.c
Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_krb5_mech.c
Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_krb5.h
Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_keyring.c
Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_internal.h
Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_generic_token.c
Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_err.h
Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_cli_upcall.c
Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_bulk.c
Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_asn1.h
Removing drivers/staging/lustre/lustre/ptlrpc/gss/gss_api.h
Removing drivers/staging/lustre/lustre/ptlrpc/gss/Makefile
Auto-merging drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.h
Removing drivers/staging/lustre/include/linux/libcfs/params_tree.h
Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-types.h
Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-tcpip.h
Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-lock.h
Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-bitops.h
Removing drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
Removing drivers/staging/lustre/include/linux/libcfs/bitmap.h
Auto-merging drivers/staging/imx-drm/imx-drm-core.c
Removing drivers/staging/dgrp/drp.h
Removing drivers/staging/dgrp/digirp.h
CONFLICT (modify/delete): drivers/staging/dgrp/dgrp_tty.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/dgrp/dgrp_tty.c left in tree.
Removing drivers/staging/dgrp/dgrp_sysfs.c
Removing drivers/staging/dgrp/dgrp_specproc.c
Removing drivers/staging/dgrp/dgrp_ports_ops.c
Removing drivers/staging/dgrp/dgrp_net_ops.c
Removing drivers/staging/dgrp/dgrp_mon_ops.c
Removing drivers/staging/dgrp/dgrp_driver.c
Removing drivers/staging/dgrp/dgrp_dpa_ops.c
Removing drivers/staging/dgrp/dgrp_common.h
Removing drivers/staging/dgrp/dgrp_common.c
Removing drivers/staging/dgrp/TODO
Removing drivers/staging/dgrp/README
Removing drivers/staging/dgrp/Makefile
Removing drivers/staging/dgrp/Kconfig
Removing drivers/staging/cxt1e1/sbew_ioc.h
Removing drivers/staging/cxt1e1/sbeproc.h
Removing drivers/staging/cxt1e1/sbeproc.c
Removing drivers/staging/cxt1e1/sbeid.c
Removing drivers/staging/cxt1e1/sbecrc.c
Removing drivers/staging/cxt1e1/sbecom_inline_linux.h
Removing drivers/staging/cxt1e1/sbe_promformat.h
Removing drivers/staging/cxt1e1/sbe_bid.h
Removing drivers/staging/cxt1e1/pmcc4_sysdep.h
Removing drivers/staging/cxt1e1/pmcc4_private.h
Removing drivers/staging/cxt1e1/pmcc4_ioctls.h
Removing drivers/staging/cxt1e1/pmcc4_drv.c
Removing drivers/staging/cxt1e1/pmcc4_defs.h
Removing drivers/staging/cxt1e1/pmcc4_cpld.h
Removing drivers/staging/cxt1e1/pmcc4.h
Removing drivers/staging/cxt1e1/pmc93x6_eeprom.h
Removing drivers/staging/cxt1e1/pmc93x6_eeprom.c
Removing drivers/staging/cxt1e1/musycc.h
Removing drivers/staging/cxt1e1/musycc.c
Removing drivers/staging/cxt1e1/linux.c
Removing drivers/staging/cxt1e1/libsbew.h
Removing drivers/staging/cxt1e1/hwprobe.c
Removing drivers/staging/cxt1e1/functions.c
Removing drivers/staging/cxt1e1/comet_tables.h
Removing drivers/staging/cxt1e1/comet_tables.c
Removing drivers/staging/cxt1e1/comet.h
Removing drivers/staging/cxt1e1/comet.c
Removing drivers/staging/cxt1e1/Makefile
Removing drivers/staging/cxt1e1/Kconfig
Removing drivers/staging/crystalhd/crystalhd_misc.h
Removing drivers/staging/crystalhd/crystalhd_misc.c
Removing drivers/staging/crystalhd/crystalhd_lnx.h
Removing drivers/staging/crystalhd/crystalhd_lnx.c
Removing drivers/staging/crystalhd/crystalhd_hw.h
Removing drivers/staging/crystalhd/crystalhd_hw.c
Removing drivers/staging/crystalhd/crystalhd_fw_if.h
Removing drivers/staging/crystalhd/crystalhd_cmds.h
Removing drivers/staging/crystalhd/crystalhd_cmds.c
Removing drivers/staging/crystalhd/crystalhd.h
Removing drivers/staging/crystalhd/bcm_70012_regs.h
Removing drivers/staging/crystalhd/bc_dts_glob_lnx.h
Removing drivers/staging/crystalhd/bc_dts_defs.h
Removing drivers/staging/crystalhd/TODO
Removing drivers/staging/crystalhd/Makefile
Removing drivers/staging/crystalhd/Kconfig
Auto-merging drivers/staging/android/Kconfig
Auto-merging drivers/iio/industrialio-event.c
Auto-merging drivers/iio/adc/ad7291.c
Auto-merging drivers/iio/accel/mma8452.c
Auto-merging MAINTAINERS
Auto-merging Documentation/kernel-parameters.txt
Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f drivers/staging/dgrp/dgrp_tty.c
drivers/staging/dgrp/dgrp_tty.c: needs merge
rm 'drivers/staging/dgrp/dgrp_tty.c'
$ git commit -v -a
[master b64e89a9db06] Merge remote-tracking branch 'staging/staging-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/ABI/testing/sysfs-bus-iio            |   13 +
 .../ABI/testing}/sysfs-bus-iio-trigger-sysfs       |    0
 .../devicetree/bindings/i2c/trivial-devices.txt    |    1 +
 .../devicetree/bindings/iio/adc/max1027-adc.txt    |   22 +
 .../bindings/iio/magnetometer/hmc5843.txt          |    3 +
 .../devicetree/bindings/iio/st-sensors.txt         |   54 +
 Documentation/kernel-parameters.txt                |    4 -
 MAINTAINERS                                        |   50 +-
 .../cavium-octeon/executive/cvmx-helper-sgmii.c    |   12 +-
 drivers/iio/accel/Kconfig                          |   12 +
 drivers/iio/accel/Makefile                         |    1 +
 drivers/iio/accel/kxcjk-1013.c                     |  764 +++
 drivers/iio/accel/mma8452.c                        |    6 +
 drivers/iio/accel/st_accel_core.c                  |   12 +-
 drivers/iio/accel/st_accel_i2c.c                   |   51 +
 drivers/iio/adc/Kconfig                            |   19 +
 drivers/iio/adc/Makefile                           |    2 +
 drivers/{staging => }/iio/adc/ad7291.c             |  107 +-
 drivers/iio/adc/ad7298.c                           |   21 +-
 drivers/iio/adc/ad7476.c                           |    5 +-
 drivers/iio/adc/ad7887.c                           |   21 +-
 drivers/iio/adc/ad799x.c                           |    3 +-
 drivers/iio/adc/ad_sigma_delta.c                   |    2 +-
 drivers/iio/adc/at91_adc.c                         |    2 +-
 drivers/iio/adc/max1027.c                          |  521 ++
 drivers/iio/adc/xilinx-xadc-core.c                 |    2 +-
 drivers/iio/adc/xilinx-xadc-events.c               |    6 -
 .../iio/common/hid-sensors/hid-sensor-attributes.c |    5 +-
 drivers/iio/common/st_sensors/st_sensors_core.c    |   64 +-
 drivers/iio/common/st_sensors/st_sensors_i2c.c     |   30 +
 drivers/iio/dac/Kconfig                            |   10 +
 drivers/iio/dac/Makefile                           |    1 +
 drivers/iio/dac/ad5504.c                           |   16 +-
 drivers/iio/dac/ad5624r_spi.c                      |    5 +-
 drivers/iio/dac/ad5686.c                           |    3 +-
 drivers/iio/dac/ad5791.c                           |   29 +-
 drivers/iio/dac/mcp4922.c                          |  216 +
 drivers/iio/gyro/adis16260.c                       |  124 +-
 drivers/iio/gyro/itg3200_core.c                    |  101 +-
 drivers/iio/gyro/st_gyro_core.c                    |   12 +-
 drivers/iio/gyro/st_gyro_i2c.c                     |   39 +
 drivers/iio/imu/adis16400_buffer.c                 |    3 +-
 drivers/iio/imu/adis16400_core.c                   |   78 +-
 drivers/iio/imu/adis16480.c                        |   82 +-
 drivers/iio/industrialio-buffer.c                  |    5 +-
 drivers/iio/industrialio-event.c                   |    1 +
 drivers/iio/industrialio-trigger.c                 |    8 +-
 drivers/iio/light/Kconfig                          |   24 +
 drivers/iio/light/Makefile                         |    2 +
 drivers/iio/light/cm32181.c                        |   11 +-
 drivers/iio/light/gp2ap020a00f.c                   |    2 +-
 drivers/iio/light/isl29125.c                       |  347 +
 drivers/iio/light/tcs3414.c                        |  405 ++
 drivers/iio/magnetometer/Kconfig                   |   10 +
 drivers/iio/magnetometer/Makefile                  |    1 +
 drivers/iio/magnetometer/ak09911.c                 |  326 +
 drivers/iio/magnetometer/ak8975.c                  |   58 +-
 drivers/iio/magnetometer/st_magn_core.c            |   12 +-
 drivers/iio/magnetometer/st_magn_i2c.c             |   23 +
 drivers/iio/pressure/Kconfig                       |   10 +
 drivers/iio/pressure/Makefile                      |    1 +
 drivers/iio/pressure/st_pressure_core.c            |   27 +-
 drivers/iio/pressure/st_pressure_i2c.c             |   23 +
 drivers/iio/pressure/t5403.c                       |  275 +
 drivers/iio/proximity/as3935.c                     |    2 +-
 drivers/iio/trigger/iio-trig-interrupt.c           |    3 +-
 drivers/iio/trigger/iio-trig-sysfs.c               |    2 +-
 drivers/staging/Kconfig                            |   18 +-
 drivers/staging/Makefile                           |    9 +-
 drivers/staging/android/Kconfig                    |    2 +-
 drivers/staging/android/alarm-dev.c                |    2 +-
 drivers/staging/android/binder.c                   |  197 +-
 drivers/staging/android/ion/Kconfig                |    2 +-
 drivers/staging/android/ion/ion_chunk_heap.c       |    2 +-
 drivers/staging/android/ion/ion_system_heap.c      |   71 +-
 drivers/staging/android/logger.c                   |    7 +-
 drivers/staging/bcm/Bcmchar.c                      |    2 +-
 drivers/staging/bcm/CmHost.c                       |    3 +-
 drivers/staging/bcm/DDRInit.c                      |  279 +-
 drivers/staging/bcm/HandleControlPacket.c          |   24 +-
 drivers/staging/bcm/IPv6Protocol.c                 |    6 +
 drivers/staging/bcm/InterfaceDld.c                 |    1 +
 drivers/staging/bcm/InterfaceInit.c                |  304 +-
 drivers/staging/bcm/InterfaceMisc.c                |  126 +-
 drivers/staging/bcm/InterfaceRx.c                  |  206 +-
 drivers/staging/bcm/InterfaceTx.c                  |  185 +-
 drivers/staging/bcm/LeakyBucket.c                  |  312 +-
 drivers/staging/bcm/Misc.c                         |   25 +-
 drivers/staging/bcm/PHSModule.c                    |    3 +-
 drivers/staging/bcm/Prototypes.h                   |   89 +-
 drivers/staging/bcm/Qos.c                          |  135 +-
 drivers/staging/bcm/Queue.h                        |   46 +-
 drivers/staging/bcm/TODO                           |    4 +
 drivers/staging/bcm/Transmit.c                     |   78 +-
 drivers/staging/bcm/hostmibs.c                     |   62 +-
 drivers/staging/bcm/led_control.c                  |  668 +-
 drivers/staging/bcm/led_control.h                  |   16 +-
 drivers/staging/bcm/nvm.c                          |   14 +-
 drivers/staging/board/Kconfig                      |    9 +
 drivers/staging/board/Makefile                     |    2 +
 drivers/staging/board/TODO                         |    2 +
 drivers/staging/board/board.c                      |   41 +
 drivers/staging/board/board.h                      |   20 +
 drivers/staging/board/kzm9d.c                      |   19 +
 drivers/staging/ced1401/ced_ioc.c                  | 1725 ++---
 drivers/staging/ced1401/usb1401.c                  | 1777 +++---
 drivers/staging/ced1401/usb1401.h                  |  286 +-
 drivers/staging/ced1401/userspace/use1401.c        |   11 +-
 drivers/staging/comedi/Kconfig                     |   16 +-
 drivers/staging/comedi/comedi.h                    |   11 +
 drivers/staging/comedi/comedi_fops.c               |   27 +-
 drivers/staging/comedi/comedidev.h                 |  122 +-
 .../staging/comedi/drivers/addi-data/addi_common.c |   10 +-
 .../staging/comedi/drivers/addi-data/addi_common.h |   20 -
 .../comedi/drivers/addi-data/hwdrv_apci035.c       |    9 +-
 .../comedi/drivers/addi-data/hwdrv_apci1564.c      |  310 +-
 .../comedi/drivers/addi-data/hwdrv_apci3120.c      |   16 +-
 .../comedi/drivers/addi-data/hwdrv_apci3200.c      |  109 +-
 drivers/staging/comedi/drivers/addi_apci_035.c     |    2 +-
 drivers/staging/comedi/drivers/addi_apci_1500.c    |    2 +-
 drivers/staging/comedi/drivers/addi_apci_1564.c    |  374 +-
 drivers/staging/comedi/drivers/addi_apci_3120.c    |   11 +-
 drivers/staging/comedi/drivers/addi_apci_3200.c    |    8 +-
 drivers/staging/comedi/drivers/adl_pci9111.c       |  101 +-
 drivers/staging/comedi/drivers/adq12b.c            |  148 +-
 drivers/staging/comedi/drivers/das16m1.c           |    2 +-
 drivers/staging/comedi/drivers/das1800.c           |    2 +-
 drivers/staging/comedi/drivers/dt282x.c            | 1340 ++--
 drivers/staging/comedi/drivers/ke_counter.c        |   66 +-
 drivers/staging/comedi/drivers/mite.c              |   18 +-
 drivers/staging/comedi/drivers/mite.h              |   17 +-
 drivers/staging/comedi/drivers/ni_65xx.c           |   10 +-
 drivers/staging/comedi/drivers/ni_660x.c           |   11 +-
 drivers/staging/comedi/drivers/ni_670x.c           |    6 +-
 drivers/staging/comedi/drivers/ni_atmio.c          |  371 +-
 drivers/staging/comedi/drivers/ni_atmio16d.c       |   10 +-
 drivers/staging/comedi/drivers/ni_daq_700.c        |   89 +-
 drivers/staging/comedi/drivers/ni_labpc_pci.c      |    8 +-
 drivers/staging/comedi/drivers/ni_mio_common.c     | 5917 ++++++++---------
 drivers/staging/comedi/drivers/ni_mio_cs.c         |   83 +-
 drivers/staging/comedi/drivers/ni_pcidio.c         |    9 +-
 drivers/staging/comedi/drivers/ni_pcimio.c         |  481 +-
 drivers/staging/comedi/drivers/ni_stc.h            |  165 +-
 drivers/staging/comedi/drivers/pcl724.c            |    5 +
 drivers/staging/comedi/drivers/pcl730.c            |   21 +-
 drivers/staging/comedi/drivers/pcl812.c            |    2 +-
 drivers/staging/comedi/drivers/pcl816.c            |    2 +-
 drivers/staging/comedi/drivers/s626.c              |  668 +-
 drivers/staging/comedi/drivers/s626.h              |   28 +-
 drivers/staging/comedi/drivers/usbduxsigma.c       |    2 +-
 drivers/staging/comedi/drivers/vmk80xx.c           |    1 -
 drivers/staging/cptm1217/clearpad_tm1217.c         |   15 +-
 drivers/staging/crystalhd/Kconfig                  |    6 -
 drivers/staging/crystalhd/Makefile                 |    6 -
 drivers/staging/crystalhd/TODO                     |   15 -
 drivers/staging/crystalhd/bc_dts_defs.h            |  572 --
 drivers/staging/crystalhd/bc_dts_glob_lnx.h        |  300 -
 drivers/staging/crystalhd/bcm_70012_regs.h         |  758 ---
 drivers/staging/crystalhd/crystalhd.h              |   13 -
 drivers/staging/crystalhd/crystalhd_cmds.c         | 1066 ----
 drivers/staging/crystalhd/crystalhd_cmds.h         |   92 -
 drivers/staging/crystalhd/crystalhd_fw_if.h        |  370 --
 drivers/staging/crystalhd/crystalhd_hw.c           | 2458 --------
 drivers/staging/crystalhd/crystalhd_hw.h           |  407 --
 drivers/staging/crystalhd/crystalhd_lnx.c          |  782 ---
 drivers/staging/crystalhd/crystalhd_lnx.h          |   93 -
 drivers/staging/crystalhd/crystalhd_misc.c         | 1044 ---
 drivers/staging/crystalhd/crystalhd_misc.h         |  232 -
 drivers/staging/cxt1e1/Kconfig                     |   21 -
 drivers/staging/cxt1e1/Makefile                    |   18 -
 drivers/staging/cxt1e1/comet.c                     |  596 --
 drivers/staging/cxt1e1/comet.h                     |  353 --
 drivers/staging/cxt1e1/comet_tables.c              |  538 --
 drivers/staging/cxt1e1/comet_tables.h              |   61 -
 drivers/staging/cxt1e1/functions.c                 |  318 -
 drivers/staging/cxt1e1/hwprobe.c                   |  382 --
 drivers/staging/cxt1e1/libsbew.h                   |  549 --
 drivers/staging/cxt1e1/linux.c                     | 1142 ----
 drivers/staging/cxt1e1/musycc.c                    | 1720 -----
 drivers/staging/cxt1e1/musycc.h                    |  427 --
 drivers/staging/cxt1e1/pmc93x6_eeprom.c            |  532 --
 drivers/staging/cxt1e1/pmc93x6_eeprom.h            |   39 -
 drivers/staging/cxt1e1/pmcc4.h                     |  108 -
 drivers/staging/cxt1e1/pmcc4_cpld.h                |   91 -
 drivers/staging/cxt1e1/pmcc4_defs.h                |   68 -
 drivers/staging/cxt1e1/pmcc4_drv.c                 | 1613 -----
 drivers/staging/cxt1e1/pmcc4_ioctls.h              |   65 -
 drivers/staging/cxt1e1/pmcc4_private.h             |  295 -
 drivers/staging/cxt1e1/pmcc4_sysdep.h              |   63 -
 drivers/staging/cxt1e1/sbe_bid.h                   |   47 -
 drivers/staging/cxt1e1/sbe_promformat.h            |  130 -
 drivers/staging/cxt1e1/sbecom_inline_linux.h       |  193 -
 drivers/staging/cxt1e1/sbecrc.c                    |  133 -
 drivers/staging/cxt1e1/sbeid.c                     |  205 -
 drivers/staging/cxt1e1/sbeproc.c                   |  219 -
 drivers/staging/cxt1e1/sbeproc.h                   |   42 -
 drivers/staging/cxt1e1/sbew_ioc.h                  |   81 -
 drivers/staging/dgap/dgap.c                        |  543 +-
 drivers/staging/dgap/dgap.h                        |    2 -
 drivers/staging/dgnc/dgnc_driver.c                 |   14 +-
 drivers/staging/dgnc/dgnc_sysfs.c                  |   20 +-
 drivers/staging/dgnc/dgnc_tty.c                    |   34 +-
 drivers/staging/dgrp/Kconfig                       |    9 -
 drivers/staging/dgrp/Makefile                      |   12 -
 drivers/staging/dgrp/README                        |    2 -
 drivers/staging/dgrp/TODO                          |   13 -
 drivers/staging/dgrp/dgrp_common.c                 |  169 -
 drivers/staging/dgrp/dgrp_common.h                 |  150 -
 drivers/staging/dgrp/dgrp_dpa_ops.c                |  534 --
 drivers/staging/dgrp/dgrp_driver.c                 |  105 -
 drivers/staging/dgrp/dgrp_mon_ops.c                |  327 -
 drivers/staging/dgrp/dgrp_net_ops.c                | 3666 -----------
 drivers/staging/dgrp/dgrp_ports_ops.c              |  156 -
 drivers/staging/dgrp/dgrp_specproc.c               |  541 --
 drivers/staging/dgrp/dgrp_sysfs.c                  |  558 --
 drivers/staging/dgrp/dgrp_tty.c                    | 3327 ----------
 drivers/staging/dgrp/digirp.h                      |  129 -
 drivers/staging/dgrp/drp.h                         |  693 --
 drivers/staging/emxx_udc/Kconfig                   |   10 +
 drivers/staging/emxx_udc/Makefile                  |    1 +
 drivers/staging/emxx_udc/TODO                      |    4 +
 drivers/staging/emxx_udc/emxx_udc.c                | 3520 +++++++++++
 drivers/staging/emxx_udc/emxx_udc.h                |  653 ++
 drivers/staging/et131x/et131x.c                    |   18 +-
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c |    4 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_debug.c   |    6 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c      |   25 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.h     |    2 +-
 drivers/staging/fwserial/fwserial.c                |    6 +-
 drivers/staging/gdm724x/gdm_lte.c                  |    2 +
 drivers/staging/gdm724x/gdm_usb.c                  |   11 +-
 drivers/staging/gdm72xx/Kconfig                    |   19 +-
 drivers/staging/gdm72xx/gdm_qos.c                  |   61 +-
 drivers/staging/gdm72xx/gdm_qos.h                  |   18 +-
 drivers/staging/gdm72xx/gdm_sdio.c                 |   92 +-
 drivers/staging/gdm72xx/gdm_sdio.h                 |    6 +-
 drivers/staging/gdm72xx/gdm_usb.c                  |  111 +-
 drivers/staging/gdm72xx/gdm_usb.h                  |    6 +-
 drivers/staging/gdm72xx/gdm_wimax.c                |  273 +-
 drivers/staging/gdm72xx/gdm_wimax.h                |   17 +-
 drivers/staging/gdm72xx/hci.h                      |   22 +-
 drivers/staging/gdm72xx/netlink_k.h                |    7 +-
 drivers/staging/gdm72xx/sdio_boot.h                |    6 +-
 drivers/staging/gdm72xx/usb_boot.c                 |   10 +-
 drivers/staging/gdm72xx/usb_boot.h                 |    6 +-
 drivers/staging/gdm72xx/usb_ids.h                  |    6 +-
 drivers/staging/gdm72xx/wm_ioctl.h                 |    7 +-
 drivers/staging/goldfish/goldfish_audio.c          |   63 +-
 drivers/staging/iio/Documentation/generic_buffer.c |    9 +-
 .../staging/iio/Documentation/iio_event_monitor.c  |    8 +
 drivers/staging/iio/Documentation/iio_utils.h      |    6 +-
 drivers/staging/iio/Documentation/trigger.txt      |    2 +-
 drivers/staging/iio/accel/adis16201_core.c         |   14 +-
 drivers/staging/iio/accel/adis16203_core.c         |   11 +-
 drivers/staging/iio/accel/adis16204_core.c         |   12 +-
 drivers/staging/iio/accel/adis16209_core.c         |   18 +-
 drivers/staging/iio/accel/adis16240_core.c         |   12 +-
 drivers/staging/iio/accel/lis3l02dq_ring.c         |    2 +-
 drivers/staging/iio/accel/sca3000_ring.c           |    6 +
 drivers/staging/iio/adc/Kconfig                    |    9 +-
 drivers/staging/iio/adc/Makefile                   |    1 -
 drivers/staging/iio/adc/ad7606_par.c               |   37 +-
 drivers/staging/iio/adc/mxs-lradc.c                |    2 +-
 drivers/staging/iio/frequency/ad9832.c             |   16 +-
 drivers/staging/iio/frequency/ad9850.c             |    6 -
 drivers/staging/iio/iio_simple_dummy.c             |    2 +
 drivers/staging/iio/magnetometer/hmc5843.c         |    4 +-
 drivers/staging/iio/meter/ade7758_trigger.c        |    2 +-
 drivers/staging/iio/trigger/iio-trig-bfin-timer.c  |   33 +-
 .../staging/iio/trigger/iio-trig-periodic-rtc.c    |   29 +-
 drivers/staging/imx-drm/imx-drm-core.c             |   57 +-
 drivers/staging/keucr/usb.c                        |    3 +-
 drivers/staging/line6/driver.c                     |    2 +-
 drivers/staging/lustre/Makefile                    |    2 -
 drivers/staging/lustre/TODO                        |    3 +-
 .../staging/lustre/include/linux/libcfs/bitmap.h   |    1 -
 .../staging/lustre/include/linux/libcfs/curproc.h  |    2 +-
 .../staging/lustre/include/linux/libcfs/libcfs.h   |   55 +-
 .../lustre/include/linux/libcfs/libcfs_debug.h     |   10 +-
 .../lustre/include/linux/libcfs/libcfs_fail.h      |    2 +
 .../lustre/include/linux/libcfs/libcfs_hash.h      |   18 +-
 .../lustre/include/linux/libcfs/libcfs_ioctl.h     |   33 +-
 .../include/linux/libcfs/libcfs_kernelcomm.h       |   17 +-
 .../lustre/include/linux/libcfs/libcfs_prim.h      |    4 +-
 .../lustre/include/linux/libcfs/libcfs_private.h   |   43 +-
 .../lustre/include/linux/libcfs/libcfs_time.h      |   29 +-
 .../lustre/include/linux/libcfs/linux/kp30.h       |   93 -
 .../lustre/include/linux/libcfs/linux/libcfs.h     |   67 +-
 .../include/linux/libcfs/linux/linux-bitops.h      |   38 -
 .../lustre/include/linux/libcfs/linux/linux-cpu.h  |   84 -
 .../lustre/include/linux/libcfs/linux/linux-lock.h |  204 -
 .../lustre/include/linux/libcfs/linux/linux-mem.h  |   11 +-
 .../lustre/include/linux/libcfs/linux/linux-prim.h |   82 -
 .../include/linux/libcfs/linux/linux-tcpip.h       |   72 -
 .../lustre/include/linux/libcfs/linux/linux-time.h |  149 +-
 .../include/linux/libcfs/linux/linux-types.h       |   36 -
 .../include/linux/libcfs/linux/portals_compat25.h  |   22 +-
 .../staging/lustre/include/linux/libcfs/lucache.h  |   16 +-
 .../lustre/include/linux/libcfs/params_tree.h      |  164 -
 .../lustre/include/linux/lnet/api-support.h        |    8 +-
 drivers/staging/lustre/include/linux/lnet/api.h    |    5 +-
 .../staging/lustre/include/linux/lnet/lib-lnet.h   |   50 +-
 .../staging/lustre/include/linux/lnet/lib-types.h  |   23 +-
 .../lustre/include/linux/lnet/linux/api-support.h  |    1 -
 .../lustre/include/linux/lnet/linux/lib-lnet.h     |    5 +-
 .../lustre/include/linux/lnet/lnet-sysctl.h        |    2 -
 drivers/staging/lustre/include/linux/lnet/lnet.h   |    6 +-
 .../staging/lustre/include/linux/lnet/lnetctl.h    |   22 +-
 drivers/staging/lustre/include/linux/lnet/lnetst.h |    6 +-
 drivers/staging/lustre/include/linux/lnet/ptllnd.h |    3 +-
 .../lustre/include/linux/lnet/ptllnd_wire.h        |    3 +-
 .../staging/lustre/include/linux/lnet/socklnd.h    |    4 +-
 drivers/staging/lustre/include/linux/lnet/types.h  |    4 +-
 drivers/staging/lustre/lnet/klnds/o2iblnd/Makefile |    3 -
 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c    |   39 +-
 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h    |   22 +-
 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c |   11 +-
 drivers/staging/lustre/lnet/klnds/socklnd/Makefile |    4 -
 .../staging/lustre/lnet/klnds/socklnd/socklnd.c    |   98 +-
 .../staging/lustre/lnet/klnds/socklnd/socklnd.h    |   46 +-
 .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c |   43 +-
 .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.c  |    2 +-
 .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.h  |    4 +-
 .../lustre/lnet/klnds/socklnd/socklnd_proto.c      |   12 +-
 drivers/staging/lustre/lnet/lnet/Makefile          |    3 -
 drivers/staging/lustre/lnet/lnet/acceptor.c        |   20 +-
 drivers/staging/lustre/lnet/lnet/api-ni.c          |   30 +-
 drivers/staging/lustre/lnet/lnet/config.c          |    4 +-
 drivers/staging/lustre/lnet/lnet/lib-eq.c          |    4 +-
 drivers/staging/lustre/lnet/lnet/lib-md.c          |   12 +-
 drivers/staging/lustre/lnet/lnet/lib-me.c          |   15 +-
 drivers/staging/lustre/lnet/lnet/lib-move.c        |  108 +-
 drivers/staging/lustre/lnet/lnet/lib-msg.c         |    2 +-
 drivers/staging/lustre/lnet/lnet/lib-ptl.c         |   18 +-
 drivers/staging/lustre/lnet/lnet/lo.c              |    2 +-
 drivers/staging/lustre/lnet/lnet/module.c          |    2 +-
 drivers/staging/lustre/lnet/lnet/peer.c            |    2 +-
 drivers/staging/lustre/lnet/lnet/router.c          |   23 +-
 drivers/staging/lustre/lnet/lnet/router_proc.c     |   84 +-
 drivers/staging/lustre/lnet/selftest/Makefile      |    2 -
 drivers/staging/lustre/lnet/selftest/brw_test.c    |    2 +-
 drivers/staging/lustre/lnet/selftest/conctl.c      |    8 +-
 drivers/staging/lustre/lnet/selftest/conrpc.c      |   16 +-
 drivers/staging/lustre/lnet/selftest/conrpc.h      |   10 +-
 drivers/staging/lustre/lnet/selftest/console.c     |   16 +-
 drivers/staging/lustre/lnet/selftest/console.h     |   10 +-
 drivers/staging/lustre/lnet/selftest/framework.c   |   12 +-
 drivers/staging/lustre/lnet/selftest/rpc.c         |   14 +-
 drivers/staging/lustre/lnet/selftest/rpc.h         |    2 +-
 drivers/staging/lustre/lnet/selftest/selftest.h    |   12 +-
 drivers/staging/lustre/lnet/selftest/timer.c       |   16 +-
 drivers/staging/lustre/lnet/selftest/timer.h       |    2 +-
 drivers/staging/lustre/lustre/Kconfig              |    1 +
 drivers/staging/lustre/lustre/fid/Makefile         |    3 -
 drivers/staging/lustre/lustre/fid/fid_internal.h   |    8 +-
 drivers/staging/lustre/lustre/fid/fid_lib.c        |    6 +-
 drivers/staging/lustre/lustre/fid/fid_request.c    |   38 +-
 drivers/staging/lustre/lustre/fid/lproc_fid.c      |   32 +-
 drivers/staging/lustre/lustre/fld/Makefile         |    3 -
 drivers/staging/lustre/lustre/fld/fld_cache.c      |   34 +-
 drivers/staging/lustre/lustre/fld/fld_internal.h   |   12 +-
 drivers/staging/lustre/lustre/fld/fld_request.c    |   52 +-
 drivers/staging/lustre/lustre/fld/lproc_fld.c      |   25 +-
 drivers/staging/lustre/lustre/include/cl_object.h  |    8 +-
 drivers/staging/lustre/lustre/include/dt_object.h  |    8 +-
 .../staging/lustre/lustre/include/interval_tree.h  |    2 +-
 .../lustre/lustre/include/linux/lprocfs_status.h   |    2 +-
 .../lustre/lustre/include/linux/lustre_acl.h       |    2 +-
 .../lustre/lustre/include/linux/lustre_compat25.h  |    4 +-
 .../lustre/lustre/include/linux/lustre_fsfilt.h    |   10 +-
 .../lustre/lustre/include/linux/lustre_lib.h       |    4 +-
 .../lustre/lustre/include/linux/lustre_lite.h      |   10 +-
 drivers/staging/lustre/lustre/include/linux/lvfs.h |    6 +-
 .../lustre/lustre/include/linux/lvfs_linux.h       |    9 +-
 drivers/staging/lustre/lustre/include/linux/obd.h  |    4 +-
 .../lustre/lustre/include/linux/obd_support.h      |   10 +-
 .../staging/lustre/lustre/include/lprocfs_status.h |   19 +-
 drivers/staging/lustre/lustre/include/lu_object.h  |    6 +-
 .../lustre/lustre/include/lustre/lustre_idl.h      |   17 +-
 .../lustre/lustre/include/lustre/lustre_user.h     |   14 +-
 drivers/staging/lustre/lustre/include/lustre_acl.h |    2 +-
 .../staging/lustre/lustre/include/lustre_capa.h    |   14 +-
 drivers/staging/lustre/lustre/include/lustre_cfg.h |    4 +-
 .../staging/lustre/lustre/include/lustre_debug.h   |    4 +-
 .../staging/lustre/lustre/include/lustre_disk.h    |    4 +-
 drivers/staging/lustre/lustre/include/lustre_dlm.h |   28 +-
 .../staging/lustre/lustre/include/lustre_export.h  |   16 +-
 drivers/staging/lustre/lustre/include/lustre_fid.h |    6 +-
 drivers/staging/lustre/lustre/include/lustre_fld.h |    4 +-
 .../staging/lustre/lustre/include/lustre_fsfilt.h  |    2 +-
 .../staging/lustre/lustre/include/lustre_handles.h |    4 +-
 .../staging/lustre/lustre/include/lustre_idmap.h   |    2 +-
 .../staging/lustre/lustre/include/lustre_import.h  |   10 +-
 drivers/staging/lustre/lustre/include/lustre_lib.h |   30 +-
 .../staging/lustre/lustre/include/lustre_lite.h    |   14 +-
 drivers/staging/lustre/lustre/include/lustre_log.h |   10 +-
 drivers/staging/lustre/lustre/include/lustre_mdc.h |   16 +-
 drivers/staging/lustre/lustre/include/lustre_mds.h |   12 +-
 drivers/staging/lustre/lustre/include/lustre_net.h |   58 +-
 .../staging/lustre/lustre/include/lustre_quota.h   |    8 +-
 .../lustre/lustre/include/lustre_req_layout.h      |    2 +-
 drivers/staging/lustre/lustre/include/lustre_sec.h |    8 +-
 drivers/staging/lustre/lustre/include/lvfs.h       |    6 +-
 drivers/staging/lustre/lustre/include/md_object.h  |    2 +-
 drivers/staging/lustre/lustre/include/obd.h        |   21 +-
 drivers/staging/lustre/lustre/include/obd_cksum.h  |    4 +-
 drivers/staging/lustre/lustre/include/obd_class.h  |   32 +-
 drivers/staging/lustre/lustre/include/obd_ost.h    |    6 +-
 .../staging/lustre/lustre/include/obd_support.h    |   23 +-
 drivers/staging/lustre/lustre/lclient/glimpse.c    |   28 +-
 drivers/staging/lustre/lustre/lclient/lcommon_cl.c |   37 +-
 .../staging/lustre/lustre/lclient/lcommon_misc.c   |   16 +-
 drivers/staging/lustre/lustre/ldlm/interval_tree.c |    6 +-
 drivers/staging/lustre/lustre/ldlm/l_lock.c        |    6 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_extent.c   |   16 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_flock.c    |   14 +-
 .../staging/lustre/lustre/ldlm/ldlm_inodebits.c    |    7 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_lib.c      |   46 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_lock.c     |   53 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c    |   15 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_plain.c    |    6 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_pool.c     |   38 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_request.c  |   38 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_resource.c |   34 +-
 drivers/staging/lustre/lustre/libcfs/Makefile      |    3 -
 drivers/staging/lustre/lustre/libcfs/debug.c       |   10 +-
 drivers/staging/lustre/lustre/libcfs/fail.c        |   12 +-
 drivers/staging/lustre/lustre/libcfs/hash.c        |    2 +-
 drivers/staging/lustre/lustre/libcfs/heap.c        |    2 +-
 .../lustre/lustre/libcfs/kernel_user_comm.c        |    2 +-
 drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c  |    2 +-
 drivers/staging/lustre/lustre/libcfs/libcfs_lock.c |    2 +-
 drivers/staging/lustre/lustre/libcfs/libcfs_mem.c  |    2 +-
 .../staging/lustre/lustre/libcfs/libcfs_string.c   |    2 +-
 .../staging/lustre/lustre/libcfs/linux/linux-cpu.c |    2 +-
 .../lustre/libcfs/linux/linux-crypto-adler.c       |    5 +-
 .../lustre/lustre/libcfs/linux/linux-crypto.c      |    4 +-
 .../linux => lustre}/libcfs/linux/linux-crypto.h   |   20 -
 .../lustre/lustre/libcfs/linux/linux-curproc.c     |    2 +-
 .../lustre/lustre/libcfs/linux/linux-debug.c       |    6 +-
 .../lustre/lustre/libcfs/linux/linux-module.c      |    2 +-
 .../lustre/lustre/libcfs/linux/linux-prim.c        |    6 +-
 .../lustre/lustre/libcfs/linux/linux-proc.c        |   94 +-
 .../lustre/lustre/libcfs/linux/linux-tcpip.c       |   31 +-
 .../lustre/lustre/libcfs/linux/linux-tracefile.c   |    6 +-
 drivers/staging/lustre/lustre/libcfs/module.c      |   11 +-
 drivers/staging/lustre/lustre/libcfs/nidstrings.c  |    9 +-
 drivers/staging/lustre/lustre/libcfs/prng.c        |    2 +-
 drivers/staging/lustre/lustre/libcfs/tracefile.c   |    2 +-
 drivers/staging/lustre/lustre/libcfs/tracefile.h   |    2 +-
 .../staging/lustre/lustre/libcfs/upcall_cache.c    |   26 +-
 drivers/staging/lustre/lustre/libcfs/workitem.c    |    2 +-
 drivers/staging/lustre/lustre/llite/Makefile       |    3 -
 drivers/staging/lustre/lustre/llite/dcache.c       |   16 +-
 drivers/staging/lustre/lustre/llite/dir.c          |   62 +-
 drivers/staging/lustre/lustre/llite/file.c         |   24 +-
 drivers/staging/lustre/lustre/llite/llite_capa.c   |   24 +-
 drivers/staging/lustre/lustre/llite/llite_close.c  |    4 +-
 .../staging/lustre/lustre/llite/llite_internal.h   |   26 +-
 drivers/staging/lustre/lustre/llite/llite_lib.c    |   50 +-
 drivers/staging/lustre/lustre/llite/llite_mmap.c   |    6 +-
 drivers/staging/lustre/lustre/llite/llite_nfs.c    |    2 +-
 drivers/staging/lustre/lustre/llite/llite_rmtacl.c |    4 +-
 drivers/staging/lustre/lustre/llite/lloop.c        |    4 +-
 drivers/staging/lustre/lustre/llite/lproc_llite.c  |   75 +-
 drivers/staging/lustre/lustre/llite/namei.c        |   14 +-
 drivers/staging/lustre/lustre/llite/remote_perm.c  |   14 +-
 drivers/staging/lustre/lustre/llite/rw.c           |   10 +-
 drivers/staging/lustre/lustre/llite/rw26.c         |    4 +-
 drivers/staging/lustre/lustre/llite/statahead.c    |   30 +-
 drivers/staging/lustre/lustre/llite/super25.c      |    8 +-
 drivers/staging/lustre/lustre/llite/symlink.c      |    2 +-
 drivers/staging/lustre/lustre/llite/vvp_dev.c      |    4 +-
 drivers/staging/lustre/lustre/llite/vvp_internal.h |    2 +-
 drivers/staging/lustre/lustre/llite/vvp_io.c       |   10 +-
 drivers/staging/lustre/lustre/llite/vvp_lock.c     |    4 +-
 drivers/staging/lustre/lustre/llite/vvp_object.c   |    6 +-
 drivers/staging/lustre/lustre/llite/vvp_page.c     |    4 +-
 drivers/staging/lustre/lustre/llite/xattr.c        |   11 +-
 drivers/staging/lustre/lustre/llite/xattr_cache.c  |    8 +-
 drivers/staging/lustre/lustre/lmv/Makefile         |    2 -
 drivers/staging/lustre/lustre/lmv/lmv_fld.c        |   20 +-
 drivers/staging/lustre/lustre/lmv/lmv_intent.c     |   17 +-
 drivers/staging/lustre/lustre/lmv/lmv_internal.h   |    6 +-
 drivers/staging/lustre/lustre/lmv/lmv_obd.c        |   30 +-
 drivers/staging/lustre/lustre/lmv/lproc_lmv.c      |    4 +-
 drivers/staging/lustre/lustre/lov/Makefile         |    4 -
 .../staging/lustre/lustre/lov/lov_cl_internal.h    |    6 +-
 drivers/staging/lustre/lustre/lov/lov_dev.c        |    2 +-
 drivers/staging/lustre/lustre/lov/lov_ea.c         |    8 +-
 drivers/staging/lustre/lustre/lov/lov_internal.h   |    8 +-
 drivers/staging/lustre/lustre/lov/lov_io.c         |    6 +-
 drivers/staging/lustre/lustre/lov/lov_merge.c      |   31 +-
 drivers/staging/lustre/lustre/lov/lov_obd.c        |   46 +-
 drivers/staging/lustre/lustre/lov/lov_offset.c     |    6 +-
 drivers/staging/lustre/lustre/lov/lov_pack.c       |   12 +-
 drivers/staging/lustre/lustre/lov/lov_pool.c       |   10 +-
 drivers/staging/lustre/lustre/lov/lov_request.c    |   18 +-
 drivers/staging/lustre/lustre/lov/lproc_lov.c      |    8 +-
 drivers/staging/lustre/lustre/lvfs/Makefile        |    3 -
 drivers/staging/lustre/lustre/lvfs/fsfilt.c        |    4 +-
 drivers/staging/lustre/lustre/lvfs/lvfs_lib.c      |    4 +-
 drivers/staging/lustre/lustre/lvfs/lvfs_linux.c    |   18 +-
 drivers/staging/lustre/lustre/mdc/Makefile         |    3 -
 drivers/staging/lustre/lustre/mdc/lproc_mdc.c      |    4 +-
 drivers/staging/lustre/lustre/mdc/mdc_internal.h   |    6 +-
 drivers/staging/lustre/lustre/mdc/mdc_lib.c        |    4 +-
 drivers/staging/lustre/lustre/mdc/mdc_locks.c      |   18 +-
 drivers/staging/lustre/lustre/mdc/mdc_reint.c      |    6 +-
 drivers/staging/lustre/lustre/mdc/mdc_request.c    |   28 +-
 drivers/staging/lustre/lustre/mgc/Makefile         |    3 -
 drivers/staging/lustre/lustre/mgc/libmgc.c         |   12 +-
 drivers/staging/lustre/lustre/mgc/lproc_mgc.c      |    4 +-
 drivers/staging/lustre/lustre/mgc/mgc_internal.h   |   16 +-
 drivers/staging/lustre/lustre/mgc/mgc_request.c    |   27 +-
 drivers/staging/lustre/lustre/obdclass/Makefile    |    3 -
 drivers/staging/lustre/lustre/obdclass/acl.c       |    8 +-
 drivers/staging/lustre/lustre/obdclass/capa.c      |   23 +-
 drivers/staging/lustre/lustre/obdclass/cl_io.c     |   10 +-
 drivers/staging/lustre/lustre/obdclass/cl_lock.c   |    8 +-
 drivers/staging/lustre/lustre/obdclass/cl_object.c |   15 +-
 drivers/staging/lustre/lustre/obdclass/cl_page.c   |    8 +-
 drivers/staging/lustre/lustre/obdclass/class_obd.c |   56 +-
 drivers/staging/lustre/lustre/obdclass/debug.c     |   24 +-
 drivers/staging/lustre/lustre/obdclass/dt_object.c |   22 +-
 drivers/staging/lustre/lustre/obdclass/genops.c    |   16 +-
 drivers/staging/lustre/lustre/obdclass/idmap.c     |    6 +-
 drivers/staging/lustre/lustre/obdclass/linkea.c    |    6 +-
 .../lustre/lustre/obdclass/linux/linux-module.c    |   18 +-
 .../lustre/lustre/obdclass/linux/linux-obdo.c      |    8 +-
 .../lustre/lustre/obdclass/linux/linux-sysctl.c    |   98 +-
 drivers/staging/lustre/lustre/obdclass/llog.c      |    6 +-
 drivers/staging/lustre/lustre/obdclass/llog_cat.c  |    2 +-
 .../staging/lustre/lustre/obdclass/llog_internal.h |    2 +-
 .../staging/lustre/lustre/obdclass/llog_ioctl.c    |    4 +-
 drivers/staging/lustre/lustre/obdclass/llog_lvfs.c |   50 +-
 drivers/staging/lustre/lustre/obdclass/llog_obd.c  |    4 +-
 drivers/staging/lustre/lustre/obdclass/llog_osd.c  |   22 +-
 drivers/staging/lustre/lustre/obdclass/llog_swab.c |    6 +-
 drivers/staging/lustre/lustre/obdclass/llog_test.c |    8 +-
 .../staging/lustre/lustre/obdclass/local_storage.c |   10 +-
 .../staging/lustre/lustre/obdclass/local_storage.h |    8 +-
 .../lustre/lustre/obdclass/lprocfs_status.c        |   48 +-
 drivers/staging/lustre/lustre/obdclass/lu_object.c |   18 +-
 drivers/staging/lustre/lustre/obdclass/lu_ref.c    |   10 +-
 drivers/staging/lustre/lustre/obdclass/lu_ucred.c  |    8 +-
 .../lustre/lustre/obdclass/lustre_handles.c        |   14 +-
 .../staging/lustre/lustre/obdclass/lustre_peer.c   |   14 +-
 drivers/staging/lustre/lustre/obdclass/md_attrs.c  |    6 +-
 drivers/staging/lustre/lustre/obdclass/mea.c       |    6 +-
 .../staging/lustre/lustre/obdclass/obd_config.c    |   16 +-
 drivers/staging/lustre/lustre/obdclass/obd_mount.c |   32 +-
 drivers/staging/lustre/lustre/obdclass/obdo.c      |    8 +-
 .../staging/lustre/lustre/obdclass/statfs_pack.c   |    8 +-
 drivers/staging/lustre/lustre/obdclass/uuid.c      |    6 +-
 drivers/staging/lustre/lustre/obdecho/Makefile     |    3 -
 drivers/staging/lustre/lustre/obdecho/echo.c       |   32 +-
 .../staging/lustre/lustre/obdecho/echo_client.c    |   38 +-
 drivers/staging/lustre/lustre/obdecho/lproc_echo.c |   12 +-
 drivers/staging/lustre/lustre/osc/Makefile         |    4 -
 drivers/staging/lustre/lustre/osc/lproc_osc.c      |   12 +-
 drivers/staging/lustre/lustre/osc/osc_cache.c      |   13 +-
 .../staging/lustre/lustre/osc/osc_cl_internal.h    |   14 +-
 drivers/staging/lustre/lustre/osc/osc_dev.c        |   16 +-
 drivers/staging/lustre/lustre/osc/osc_internal.h   |    6 +-
 drivers/staging/lustre/lustre/osc/osc_io.c         |    4 +-
 drivers/staging/lustre/lustre/osc/osc_lock.c       |   17 +-
 drivers/staging/lustre/lustre/osc/osc_object.c     |   12 +-
 drivers/staging/lustre/lustre/osc/osc_page.c       |    6 +-
 drivers/staging/lustre/lustre/osc/osc_quota.c      |    2 +-
 drivers/staging/lustre/lustre/osc/osc_request.c    |   87 +-
 drivers/staging/lustre/lustre/ptlrpc/Makefile      |    5 -
 drivers/staging/lustre/lustre/ptlrpc/client.c      |   92 +-
 drivers/staging/lustre/lustre/ptlrpc/connection.c  |    6 +-
 drivers/staging/lustre/lustre/ptlrpc/errno.c       |    4 +-
 drivers/staging/lustre/lustre/ptlrpc/events.c      |   27 +-
 drivers/staging/lustre/lustre/ptlrpc/gss/Makefile  |    8 -
 drivers/staging/lustre/lustre/ptlrpc/gss/gss_api.h |  179 -
 .../staging/lustre/lustre/ptlrpc/gss/gss_asn1.h    |   84 -
 .../staging/lustre/lustre/ptlrpc/gss/gss_bulk.c    |  505 --
 .../lustre/lustre/ptlrpc/gss/gss_cli_upcall.c      |  446 --
 drivers/staging/lustre/lustre/ptlrpc/gss/gss_err.h |  193 -
 .../lustre/lustre/ptlrpc/gss/gss_generic_token.c   |  296 -
 .../lustre/lustre/ptlrpc/gss/gss_internal.h        |  526 --
 .../staging/lustre/lustre/ptlrpc/gss/gss_keyring.c | 1409 -----
 .../staging/lustre/lustre/ptlrpc/gss/gss_krb5.h    |  163 -
 .../lustre/lustre/ptlrpc/gss/gss_krb5_mech.c       | 1786 ------
 .../lustre/lustre/ptlrpc/gss/gss_mech_switch.c     |  358 --
 .../staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c  | 1233 ----
 .../staging/lustre/lustre/ptlrpc/gss/gss_rawobj.c  |  242 -
 .../lustre/lustre/ptlrpc/gss/gss_svc_upcall.c      | 1093 ----
 .../staging/lustre/lustre/ptlrpc/gss/lproc_gss.c   |  220 -
 drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c | 2889 ---------
 drivers/staging/lustre/lustre/ptlrpc/import.c      |   89 +-
 drivers/staging/lustre/lustre/ptlrpc/layout.c      |   16 +-
 drivers/staging/lustre/lustre/ptlrpc/llog_client.c |    8 +-
 drivers/staging/lustre/lustre/ptlrpc/llog_net.c    |   10 +-
 .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c    |   26 +-
 drivers/staging/lustre/lustre/ptlrpc/niobuf.c      |   49 +-
 drivers/staging/lustre/lustre/ptlrpc/nrs.c         |   10 +-
 drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c    |   14 +-
 .../staging/lustre/lustre/ptlrpc/pack_generic.c    |   38 +-
 drivers/staging/lustre/lustre/ptlrpc/pers.c        |   10 +-
 drivers/staging/lustre/lustre/ptlrpc/pinger.c      |   26 +-
 .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h |    6 +-
 .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c   |    8 +-
 drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c     |   19 +-
 drivers/staging/lustre/lustre/ptlrpc/recover.c     |   26 +-
 drivers/staging/lustre/lustre/ptlrpc/sec.c         |   36 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c    |   40 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_config.c  |   24 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_gc.c      |   16 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c   |   20 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_null.c    |   21 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_plain.c   |   22 +-
 drivers/staging/lustre/lustre/ptlrpc/service.c     |   84 +-
 drivers/staging/lustre/lustre/ptlrpc/wiretest.c    |    8 +-
 drivers/staging/media/lirc/lirc_sir.c              |  301 +-
 drivers/staging/media/sn9c102/Kconfig              |    2 +-
 drivers/staging/nokia_h4p/nokia_core.c             |    1 +
 drivers/staging/nvec/nvec.c                        |    8 +-
 drivers/staging/nvec/nvec_paz00.c                  |    1 +
 drivers/staging/nvec/nvec_power.c                  |    1 +
 drivers/staging/nvec/nvec_ps2.c                    |    2 +
 drivers/staging/octeon-usb/octeon-hcd.c            |   69 +-
 drivers/staging/octeon/ethernet-mdio.c             |   79 +-
 drivers/staging/octeon/ethernet-mem.c              |   11 +-
 drivers/staging/octeon/ethernet-rgmii.c            |   23 +-
 drivers/staging/octeon/ethernet-sgmii.c            |   87 +-
 drivers/staging/octeon/ethernet-xaui.c             |   83 +-
 drivers/staging/octeon/ethernet.c                  |    2 +-
 drivers/staging/octeon/octeon-ethernet.h           |    4 +
 drivers/staging/panel/panel.c                      |    9 +-
 drivers/staging/rtl8188eu/Kconfig                  |    8 -
 drivers/staging/rtl8188eu/Makefile                 |    9 -
 drivers/staging/rtl8188eu/core/rtw_ap.c            |   60 +-
 drivers/staging/rtl8188eu/core/rtw_br_ext.c        | 1191 ----
 drivers/staging/rtl8188eu/core/rtw_cmd.c           |  931 +--
 drivers/staging/rtl8188eu/core/rtw_debug.c         |   28 +-
 drivers/staging/rtl8188eu/core/rtw_efuse.c         | 1509 +++--
 drivers/staging/rtl8188eu/core/rtw_ieee80211.c     |  262 +-
 drivers/staging/rtl8188eu/core/rtw_io.c            |  301 -
 drivers/staging/rtl8188eu/core/rtw_ioctl_set.c     |  480 +-
 drivers/staging/rtl8188eu/core/rtw_iol.c           |   14 -
 drivers/staging/rtl8188eu/core/rtw_led.c           |   52 +-
 drivers/staging/rtl8188eu/core/rtw_mlme.c          |  197 +-
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c      | 3321 +---------
 drivers/staging/rtl8188eu/core/rtw_mp.c            |  995 ---
 drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c      | 1430 -----
 drivers/staging/rtl8188eu/core/rtw_p2p.c           | 2041 ------
 drivers/staging/rtl8188eu/core/rtw_pwrctrl.c       |  171 +-
 drivers/staging/rtl8188eu/core/rtw_recv.c          |   80 +-
 drivers/staging/rtl8188eu/core/rtw_security.c      |   59 +-
 drivers/staging/rtl8188eu/core/rtw_sreset.c        |   19 +-
 drivers/staging/rtl8188eu/core/rtw_sta_mgt.c       |   54 +-
 drivers/staging/rtl8188eu/core/rtw_wlan_util.c     |   17 +-
 drivers/staging/rtl8188eu/core/rtw_xmit.c          |  252 +-
 .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c   |   10 +-
 drivers/staging/rtl8188eu/hal/HalPhyRf.c           |   49 -
 drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c     |   99 +-
 drivers/staging/rtl8188eu/hal/HalPwrSeqCmd.c       |    7 +-
 drivers/staging/rtl8188eu/hal/hal_com.c            |   60 -
 drivers/staging/rtl8188eu/hal/hal_intf.c           |   67 -
 drivers/staging/rtl8188eu/hal/odm.c                |   28 +-
 drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c |    2 +-
 drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c       |  107 +-
 drivers/staging/rtl8188eu/hal/rtl8188e_dm.c        |    8 +-
 drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c  | 1394 +----
 drivers/staging/rtl8188eu/hal/rtl8188e_mp.c        |  854 ---
 drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c    |   26 +-
 drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c    |    2 +-
 drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c    |    2 +-
 drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c    |   80 -
 drivers/staging/rtl8188eu/hal/rtl8188eu_led.c      |   15 +-
 drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c     |    6 +-
 drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c     |   33 +-
 drivers/staging/rtl8188eu/hal/usb_halinit.c        |  560 +-
 drivers/staging/rtl8188eu/hal/usb_ops_linux.c      |  684 --
 drivers/staging/rtl8188eu/include/Hal8188EReg.h    |   46 -
 drivers/staging/rtl8188eu/include/HalPhyRf.h       |   30 -
 drivers/staging/rtl8188eu/include/HalPhyRf_8188e.h |    2 +-
 drivers/staging/rtl8188eu/include/cmd_osdep.h      |   32 -
 drivers/staging/rtl8188eu/include/drv_types.h      |   78 +-
 drivers/staging/rtl8188eu/include/hal_com.h        |    4 -
 drivers/staging/rtl8188eu/include/hal_intf.h       |   46 -
 drivers/staging/rtl8188eu/include/ieee80211.h      |   13 -
 drivers/staging/rtl8188eu/include/odm_precomp.h    |    4 +-
 drivers/staging/rtl8188eu/include/osdep_intf.h     |   38 +-
 drivers/staging/rtl8188eu/include/osdep_service.h  |  178 -
 drivers/staging/rtl8188eu/include/recv_osdep.h     |    1 -
 drivers/staging/rtl8188eu/include/rtl8188e_cmd.h   |    5 -
 drivers/staging/rtl8188eu/include/rtl8188e_hal.h   |   13 +-
 .../staging/rtl8188eu/include/rtl8188e_sreset.h    |   31 -
 drivers/staging/rtl8188eu/include/rtl8188e_xmit.h  |    1 -
 drivers/staging/rtl8188eu/include/rtw_br_ext.h     |   66 -
 drivers/staging/rtl8188eu/include/rtw_cmd.h        |  612 +-
 drivers/staging/rtl8188eu/include/rtw_debug.h      |    2 +-
 drivers/staging/rtl8188eu/include/rtw_efuse.h      |   51 +-
 drivers/staging/rtl8188eu/include/rtw_io.h         |  343 -
 drivers/staging/rtl8188eu/include/rtw_ioctl_set.h  |    8 -
 drivers/staging/rtl8188eu/include/rtw_iol.h        |    2 -
 drivers/staging/rtl8188eu/include/rtw_mlme.h       |   20 -
 drivers/staging/rtl8188eu/include/rtw_mlme_ext.h   |   87 +-
 drivers/staging/rtl8188eu/include/rtw_mp.h         |  495 --
 drivers/staging/rtl8188eu/include/rtw_mp_ioctl.h   |  340 -
 drivers/staging/rtl8188eu/include/rtw_p2p.h        |  135 -
 drivers/staging/rtl8188eu/include/rtw_security.h   |    1 -
 drivers/staging/rtl8188eu/include/rtw_sreset.h     |    5 -
 drivers/staging/rtl8188eu/include/rtw_version.h    |    1 -
 drivers/staging/rtl8188eu/include/sta_info.h       |   15 -
 drivers/staging/rtl8188eu/include/usb_ops.h        |  114 -
 drivers/staging/rtl8188eu/include/usb_ops_linux.h  |   42 +-
 drivers/staging/rtl8188eu/include/usb_osintf.h     |   45 -
 drivers/staging/rtl8188eu/include/usb_vendor_req.h |   52 -
 drivers/staging/rtl8188eu/include/wlan_bssdef.h    |    4 -
 drivers/staging/rtl8188eu/os_dep/ioctl_linux.c     | 6616 +++-----------------
 drivers/staging/rtl8188eu/os_dep/mlme_linux.c      |    8 +-
 drivers/staging/rtl8188eu/os_dep/os_intfs.c        |  111 +-
 drivers/staging/rtl8188eu/os_dep/osdep_service.c   |  287 +-
 drivers/staging/rtl8188eu/os_dep/recv_linux.c      |    8 +-
 drivers/staging/rtl8188eu/os_dep/usb_intf.c        |  255 +-
 drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c   |  646 +-
 drivers/staging/rtl8188eu/os_dep/xmit_linux.c      |    5 +-
 drivers/staging/rtl8192e/dot11d.c                  |    8 +-
 drivers/staging/rtl8192e/rtllib_module.c           |    5 +-
 drivers/staging/rtl8192e/rtllib_rx.c               |    3 +-
 drivers/staging/rtl8192ee/Kconfig                  |    1 -
 drivers/staging/rtl8192ee/base.c                   |    4 +-
 drivers/staging/rtl8192ee/base.h                   |    4 +-
 .../staging/rtl8192ee/btcoexist/halbtc8821a2ant.c  |    2 +-
 drivers/staging/rtl8192ee/btcoexist/halbtcoutsrc.h |    2 +-
 drivers/staging/rtl8192ee/pci.c                    |    2 +-
 drivers/staging/rtl8192ee/rtl8192ee/trx.c          |    4 +-
 drivers/staging/rtl8192ee/rtl8192ee/trx.h          |    2 +-
 drivers/staging/rtl8192ee/wifi.h                   |    2 +-
 drivers/staging/rtl8192u/ieee80211/ieee80211.h     |   10 +-
 drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c  |    2 -
 drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c  |    8 +-
 drivers/staging/rtl8192u/r8192U_core.c             |  548 +-
 drivers/staging/rtl8192u/r8192U_wx.c               |  159 +-
 drivers/staging/rtl8192u/r819xU_phy.c              |   25 +-
 drivers/staging/rtl8712/drv_types.h                |    3 +-
 drivers/staging/rtl8712/hal_init.c                 |    2 -
 drivers/staging/rtl8712/ieee80211.h                |    4 +-
 drivers/staging/rtl8712/os_intfs.c                 |    3 +-
 drivers/staging/rtl8712/osdep_service.h            |   82 +-
 drivers/staging/rtl8712/rtl8712_cmd.c              |    6 +-
 drivers/staging/rtl8712/rtl8712_led.c              |    4 +-
 drivers/staging/rtl8712/rtl8712_recv.c             |   57 +-
 drivers/staging/rtl8712/rtl8712_xmit.c             |   20 +-
 drivers/staging/rtl8712/rtl871x_cmd.c              |  114 +-
 drivers/staging/rtl8712/rtl871x_cmd.h              |    2 +-
 drivers/staging/rtl8712/rtl871x_io.c               |   12 +-
 drivers/staging/rtl8712/rtl871x_ioctl_linux.c      |   31 +-
 drivers/staging/rtl8712/rtl871x_ioctl_set.c        |    6 +-
 drivers/staging/rtl8712/rtl871x_led.h              |    2 +-
 drivers/staging/rtl8712/rtl871x_mlme.c             |   64 +-
 drivers/staging/rtl8712/rtl871x_mp.c               |    8 +-
 drivers/staging/rtl8712/rtl871x_pwrctrl.c          |   10 +-
 drivers/staging/rtl8712/rtl871x_pwrctrl.h          |    4 +-
 drivers/staging/rtl8712/rtl871x_recv.c             |   18 +-
 drivers/staging/rtl8712/rtl871x_sta_mgt.c          |   51 +-
 drivers/staging/rtl8712/rtl871x_xmit.c             |   56 +-
 drivers/staging/rtl8712/rtl871x_xmit.h             |    6 +-
 drivers/staging/rtl8712/usb_intf.c                 |   40 +-
 drivers/staging/rtl8723au/Makefile                 |    4 +-
 drivers/staging/rtl8723au/core/rtw_ap.c            |  179 +-
 drivers/staging/rtl8723au/core/rtw_cmd.c           |   25 +-
 drivers/staging/rtl8723au/core/rtw_ieee80211.c     |  346 +-
 drivers/staging/rtl8723au/core/rtw_ioctl_set.c     |  425 --
 drivers/staging/rtl8723au/core/rtw_mlme.c          |  517 +-
 drivers/staging/rtl8723au/core/rtw_mlme_ext.c      | 1607 ++---
 drivers/staging/rtl8723au/core/rtw_pwrctrl.c       |   32 +-
 drivers/staging/rtl8723au/core/rtw_sreset.c        |   47 -
 drivers/staging/rtl8723au/core/rtw_sta_mgt.c       |   21 +-
 drivers/staging/rtl8723au/core/rtw_wlan_util.c     |  401 +-
 drivers/staging/rtl8723au/hal/HalHWImg8723A_BB.c   |  160 -
 drivers/staging/rtl8723au/hal/HalHWImg8723A_RF.c   |    5 +-
 drivers/staging/rtl8723au/hal/odm_HWConfig.c       |   57 -
 drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c |   58 -
 .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c    |    5 +-
 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c       |   82 +-
 drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c  |   91 +-
 drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c    |   28 +-
 drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c    |   13 +-
 drivers/staging/rtl8723au/hal/rtl8723a_sreset.c    |   19 -
 drivers/staging/rtl8723au/hal/rtl8723a_xmit.c      |   21 -
 drivers/staging/rtl8723au/hal/usb_halinit.c        |    8 +-
 drivers/staging/rtl8723au/hal/usb_ops_linux.c      |  317 +-
 drivers/staging/rtl8723au/include/Hal8723APhyCfg.h |    1 -
 .../staging/rtl8723au/include/HalHWImg8723A_BB.h   |    6 -
 drivers/staging/rtl8723au/include/drv_types.h      |   14 +-
 drivers/staging/rtl8723au/include/ieee80211.h      |  109 +-
 drivers/staging/rtl8723au/include/ioctl_cfg80211.h |    3 -
 drivers/staging/rtl8723au/include/odm.h            |    8 -
 drivers/staging/rtl8723au/include/odm_HWConfig.h   |   17 -
 .../staging/rtl8723au/include/odm_RegConfig8723A.h |    6 -
 drivers/staging/rtl8723au/include/rtl8723a_cmd.h   |    2 +-
 .../staging/rtl8723au/include/rtl8723a_sreset.h    |    1 -
 drivers/staging/rtl8723au/include/rtl8723a_xmit.h  |    1 -
 drivers/staging/rtl8723au/include/rtw_ap.h         |    3 +-
 drivers/staging/rtl8723au/include/rtw_debug.h      |    2 +-
 drivers/staging/rtl8723au/include/rtw_event.h      |    2 +-
 drivers/staging/rtl8723au/include/rtw_ht.h         |    4 +-
 drivers/staging/rtl8723au/include/rtw_ioctl_set.h  |   32 -
 drivers/staging/rtl8723au/include/rtw_mlme.h       |   50 +-
 drivers/staging/rtl8723au/include/rtw_mlme_ext.h   |   25 +-
 drivers/staging/rtl8723au/include/rtw_pwrctrl.h    |   18 -
 drivers/staging/rtl8723au/include/rtw_rf.h         |   11 -
 drivers/staging/rtl8723au/include/rtw_security.h   |    3 -
 drivers/staging/rtl8723au/include/rtw_sreset.h     |   20 -
 drivers/staging/rtl8723au/include/sta_info.h       |    2 +-
 drivers/staging/rtl8723au/include/usb_ops_linux.h  |   14 +-
 drivers/staging/rtl8723au/include/wifi.h           |   71 -
 drivers/staging/rtl8723au/include/wlan_bssdef.h    |    6 +-
 drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c  | 1105 ++--
 drivers/staging/rtl8723au/os_dep/mlme_linux.c      |    1 -
 drivers/staging/rtl8723au/os_dep/os_intfs.c        |   11 -
 drivers/staging/rtl8723au/os_dep/usb_intf.c        |   34 +-
 drivers/staging/rtl8723au/os_dep/usb_ops_linux.c   |   10 +-
 drivers/staging/rtl8821ae/Kconfig                  |    1 -
 .../staging/rtl8821ae/btcoexist/HalBtc8812a1Ant.c  |   14 +-
 drivers/staging/rtl8821ae/btcoexist/halbtcoutsrc.h |    2 +-
 drivers/staging/rtl8821ae/pci.c                    |    2 +-
 drivers/staging/rtl8821ae/ps.c                     |    6 +-
 drivers/staging/rtl8821ae/rtl8821ae/hal_btc.c      |   17 +-
 drivers/staging/rtl8821ae/rtl8821ae/hw.c           |    2 +-
 drivers/staging/rtl8821ae/rtl8821ae/reg.h          |    1 +
 drivers/staging/rtl8821ae/rtl8821ae/sw.c           |    4 +-
 drivers/staging/rtl8821ae/wifi.h                   |    2 +-
 drivers/staging/sep/sep_crypto.c                   |   17 +
 drivers/staging/serqt_usb2/Kconfig                 |    9 -
 drivers/staging/serqt_usb2/Makefile                |    1 -
 drivers/staging/serqt_usb2/serqt_usb2.c            | 1528 -----
 drivers/staging/skein/skein_iv.h                   |   26 +-
 drivers/staging/slicoss/slicoss.c                  |   22 +-
 drivers/staging/speakup/main.c                     |    2 +-
 drivers/staging/speakup/speakup_dectlk.c           |    2 +-
 drivers/staging/tidspbridge/core/chnl_sm.c         |    1 +
 drivers/staging/tidspbridge/core/io_sm.c           |    1 +
 drivers/staging/tidspbridge/core/tiomap3430.c      |    2 +
 drivers/staging/tidspbridge/core/tiomap_io.c       |    2 +
 drivers/staging/tidspbridge/core/wdt.c             |    1 +
 drivers/staging/tidspbridge/dynload/cload.c        |    7 +
 drivers/staging/tidspbridge/dynload/reloc.c        |    2 +
 .../tidspbridge/include/dspbridge/dblldefs.h       |   14 +-
 drivers/staging/tidspbridge/pmgr/chnl.c            |    1 +
 drivers/staging/tidspbridge/pmgr/dspapi.c          |   64 +-
 drivers/staging/tidspbridge/rmgr/dbdcd.c           |    1 +
 drivers/staging/tidspbridge/rmgr/drv_interface.c   |    2 +
 drivers/staging/tidspbridge/rmgr/nldr.c            |    1 +
 drivers/staging/tidspbridge/rmgr/node.c            |    2 +
 drivers/staging/tidspbridge/rmgr/proc.c            |    3 +
 drivers/staging/unisys/Kconfig                     |    2 +-
 drivers/staging/unisys/channels/Kconfig            |    2 +-
 drivers/staging/unisys/channels/Makefile           |    2 -
 .../common-spar/include/channels/vbuschannel.h     |   36 -
 .../unisys/common-spar/include/vbusdeviceinfo.h    |   34 +-
 drivers/staging/unisys/include/guestlinuxdebug.h   |    6 +-
 drivers/staging/unisys/include/vbushelper.h        |    8 +-
 drivers/staging/unisys/uislib/Makefile             |    3 -
 drivers/staging/unisys/uislib/uislib.c             |   26 +-
 drivers/staging/unisys/uislib/uisutils.c           |   11 +-
 drivers/staging/unisys/virthba/Makefile            |    3 -
 drivers/staging/unisys/virthba/virthba.c           |    5 -
 drivers/staging/unisys/virtpci/Makefile            |    3 -
 drivers/staging/unisys/virtpci/virtpci.c           |  323 +-
 drivers/staging/unisys/virtpci/virtpci.h           |    2 -
 drivers/staging/unisys/visorchannel/Makefile       |    2 -
 drivers/staging/unisys/visorchipset/Makefile       |    2 -
 .../unisys/visorchipset/visorchipset_main.c        |    4 +-
 drivers/staging/unisys/visorutil/Makefile          |    1 -
 .../usbip/userspace/libsrc/usbip_host_driver.c     |    7 +-
 drivers/staging/usbip/vhci_hcd.c                   |    2 +-
 drivers/staging/vt6655/baseband.c                  |  300 +-
 drivers/staging/vt6655/card.c                      |    2 +-
 drivers/staging/vt6655/device.h                    |    6 +-
 drivers/staging/vt6655/device_main.c               |    6 +-
 drivers/staging/vt6655/dpc.c                       |    3 +-
 drivers/staging/vt6655/iwctl.c                     |    5 +-
 drivers/staging/vt6655/iwctl.h                     |   12 +-
 drivers/staging/vt6655/rxtx.c                      |    6 +-
 drivers/staging/vt6655/vntwifi.c                   |    8 +-
 drivers/staging/vt6655/wmgr.c                      |    2 +-
 drivers/staging/vt6656/80211hdr.h                  |  324 -
 drivers/staging/vt6656/80211mgr.c                  |  861 ---
 drivers/staging/vt6656/80211mgr.h                  |  808 ---
 drivers/staging/vt6656/Kconfig                     |    4 +-
 drivers/staging/vt6656/Makefile                    |   13 -
 drivers/staging/vt6656/baseband.c                  |  754 +--
 drivers/staging/vt6656/baseband.h                  |    5 +-
 drivers/staging/vt6656/bssdb.c                     | 1466 -----
 drivers/staging/vt6656/bssdb.h                     |  276 -
 drivers/staging/vt6656/card.c                      |  244 +-
 drivers/staging/vt6656/card.h                      |   35 +-
 drivers/staging/vt6656/channel.c                   |  544 +-
 drivers/staging/vt6656/channel.h                   |    9 +-
 drivers/staging/vt6656/country.h                   |  162 -
 drivers/staging/vt6656/datarate.c                  |  364 --
 drivers/staging/vt6656/datarate.h                  |   76 -
 drivers/staging/vt6656/desc.h                      |    2 -
 drivers/staging/vt6656/device.h                    |  354 +-
 drivers/staging/vt6656/dpc.c                       |  991 +--
 drivers/staging/vt6656/dpc.h                       |    6 +-
 drivers/staging/vt6656/firmware.c                  |   78 +-
 drivers/staging/vt6656/firmware.h                  |    6 +-
 drivers/staging/vt6656/int.c                       |  173 +-
 drivers/staging/vt6656/iocmd.h                     |   38 -
 drivers/staging/vt6656/iowpa.h                     |   75 -
 drivers/staging/vt6656/iwctl.c                     | 1802 ------
 drivers/staging/vt6656/iwctl.h                     |  138 -
 drivers/staging/vt6656/key.c                       |  789 +--
 drivers/staging/vt6656/key.h                       |   79 +-
 drivers/staging/vt6656/mac.c                       |   35 +-
 drivers/staging/vt6656/mac.h                       |   29 +-
 drivers/staging/vt6656/main_usb.c                  | 1110 ++--
 drivers/staging/vt6656/michael.c                   |  167 -
 drivers/staging/vt6656/michael.h                   |   52 -
 drivers/staging/vt6656/power.c                     |  250 +-
 drivers/staging/vt6656/power.h                     |   13 +-
 drivers/staging/vt6656/rc4.c                       |   87 -
 drivers/staging/vt6656/rc4.h                       |   46 -
 drivers/staging/vt6656/rf.c                        | 1281 ++--
 drivers/staging/vt6656/rf.h                        |    3 +-
 drivers/staging/vt6656/rxtx.c                      | 2295 ++-----
 drivers/staging/vt6656/rxtx.h                      |   24 +-
 drivers/staging/vt6656/tether.c                    |   60 -
 drivers/staging/vt6656/tether.h                    |  101 -
 drivers/staging/vt6656/tkip.c                      |  246 -
 drivers/staging/vt6656/tkip.h                      |   45 -
 drivers/staging/vt6656/tmacro.h                    |   52 -
 drivers/staging/vt6656/usbpipe.c                   |   63 +-
 drivers/staging/vt6656/vntconfiguration.dat        |    6 -
 drivers/staging/vt6656/wcmd.c                      | 1066 +---
 drivers/staging/vt6656/wcmd.h                      |   90 +-
 drivers/staging/vt6656/wctl.c                      |  244 -
 drivers/staging/vt6656/wctl.h                      |   94 -
 drivers/staging/vt6656/wmgr.c                      | 4362 -------------
 drivers/staging/vt6656/wmgr.h                      |  397 --
 drivers/staging/vt6656/wpa.c                       |  314 -
 drivers/staging/vt6656/wpa.h                       |   72 -
 drivers/staging/vt6656/wpa2.c                      |  235 -
 drivers/staging/vt6656/wpa2.h                      |   53 -
 drivers/staging/vt6656/wpactl.c                    |  247 -
 drivers/staging/vt6656/wpactl.h                    |   47 -
 drivers/staging/winbond/Kconfig                    |   11 -
 drivers/staging/winbond/Makefile                   |   15 -
 drivers/staging/winbond/TODO                       |   12 -
 drivers/staging/winbond/core.h                     |   61 -
 drivers/staging/winbond/localpara.h                |  311 -
 drivers/staging/winbond/mac_structures.h           |   71 -
 drivers/staging/winbond/mds.c                      |  650 --
 drivers/staging/winbond/mds_f.h                    |   22 -
 drivers/staging/winbond/mds_s.h                    |  130 -
 drivers/staging/winbond/mto.c                      |  167 -
 drivers/staging/winbond/mto.h                      |  134 -
 drivers/staging/winbond/phy_calibration.c          | 1317 ----
 drivers/staging/winbond/phy_calibration.h          |   85 -
 drivers/staging/winbond/reg.c                      | 2328 -------
 drivers/staging/winbond/sme_api.h                  |  191 -
 drivers/staging/winbond/wb35reg.c                  |  806 ---
 drivers/staging/winbond/wb35reg_f.h                |   65 -
 drivers/staging/winbond/wb35reg_s.h                |  240 -
 drivers/staging/winbond/wb35rx.c                   |  358 --
 drivers/staging/winbond/wb35rx_f.h                 |   15 -
 drivers/staging/winbond/wb35rx_s.h                 |   44 -
 drivers/staging/winbond/wb35tx.c                   |  290 -
 drivers/staging/winbond/wb35tx_f.h                 |   22 -
 drivers/staging/winbond/wb35tx_s.h                 |   39 -
 drivers/staging/winbond/wbhal.h                    |  513 --
 drivers/staging/winbond/wbusb.c                    |  853 ---
 drivers/staging/wlags49_h2/Kconfig                 |   11 -
 drivers/staging/wlags49_h2/Makefile                |   53 -
 drivers/staging/wlags49_h2/README.ubuntu           |  180 -
 drivers/staging/wlags49_h2/README.wlags49          |  641 --
 drivers/staging/wlags49_h2/TODO                    |   33 -
 drivers/staging/wlags49_h2/WARNING.txt             |    3 -
 drivers/staging/wlags49_h2/ap_h2.c                 | 3337 ----------
 drivers/staging/wlags49_h2/ap_h25.c                | 4094 ------------
 drivers/staging/wlags49_h2/debug.h                 |  199 -
 drivers/staging/wlags49_h2/dhf.c                   |  380 --
 drivers/staging/wlags49_h2/dhf.h                   |  225 -
 drivers/staging/wlags49_h2/dhfcfg.h                |  158 -
 drivers/staging/wlags49_h2/hcf.c                   | 4748 --------------
 drivers/staging/wlags49_h2/hcf.h                   |  394 --
 drivers/staging/wlags49_h2/hcfcfg.h                |  785 ---
 drivers/staging/wlags49_h2/hcfdef.h                |  752 ---
 drivers/staging/wlags49_h2/man/wlags49.4           |  734 ---
 drivers/staging/wlags49_h2/mdd.h                   | 1155 ----
 drivers/staging/wlags49_h2/mmd.c                   |  250 -
 drivers/staging/wlags49_h2/mmd.h                   |   77 -
 drivers/staging/wlags49_h2/sta_h2.c                | 4480 -------------
 drivers/staging/wlags49_h2/sta_h25.c               | 5255 ----------------
 drivers/staging/wlags49_h2/wl_cs.c                 |  440 --
 drivers/staging/wlags49_h2/wl_cs.h                 |   89 -
 drivers/staging/wlags49_h2/wl_enc.c                |  217 -
 drivers/staging/wlags49_h2/wl_enc.h                |  118 -
 drivers/staging/wlags49_h2/wl_if.h                 |  221 -
 drivers/staging/wlags49_h2/wl_internal.h           | 1040 ---
 drivers/staging/wlags49_h2/wl_main.c               | 3702 -----------
 drivers/staging/wlags49_h2/wl_main.h               |  138 -
 drivers/staging/wlags49_h2/wl_netdev.c             | 1951 ------
 drivers/staging/wlags49_h2/wl_netdev.h             |  154 -
 drivers/staging/wlags49_h2/wl_priv.c               | 1928 ------
 drivers/staging/wlags49_h2/wl_priv.h               |  127 -
 drivers/staging/wlags49_h2/wl_profile.c            |  995 ---
 drivers/staging/wlags49_h2/wl_profile.h            |   87 -
 drivers/staging/wlags49_h2/wl_util.c               | 1367 ----
 drivers/staging/wlags49_h2/wl_util.h               |   96 -
 drivers/staging/wlags49_h2/wl_version.h            |  146 -
 drivers/staging/wlags49_h2/wl_wext.c               | 3794 -----------
 drivers/staging/wlags49_h2/wl_wext.h               |   88 -
 drivers/staging/wlags49_h25/Kconfig                |   11 -
 drivers/staging/wlags49_h25/Makefile               |   52 -
 drivers/staging/wlags49_h25/README.txt             |   30 -
 drivers/staging/wlags49_h25/TODO                   |   33 -
 drivers/staging/wlags49_h25/ap_h25.c               |    2 -
 drivers/staging/wlags49_h25/debug.h                |    2 -
 drivers/staging/wlags49_h25/dhf.c                  |    2 -
 drivers/staging/wlags49_h25/dhf.h                  |    2 -
 drivers/staging/wlags49_h25/dhfcfg.h               |    2 -
 drivers/staging/wlags49_h25/hcf.c                  |    2 -
 drivers/staging/wlags49_h25/hcf.h                  |    2 -
 drivers/staging/wlags49_h25/hcfcfg.h               |    2 -
 drivers/staging/wlags49_h25/hcfdef.h               |    2 -
 drivers/staging/wlags49_h25/mdd.h                  |    2 -
 drivers/staging/wlags49_h25/mmd.c                  |    2 -
 drivers/staging/wlags49_h25/mmd.h                  |    2 -
 drivers/staging/wlags49_h25/sta_h25.c              |    2 -
 drivers/staging/wlags49_h25/wl_cs.c                |    2 -
 drivers/staging/wlags49_h25/wl_cs.h                |    2 -
 drivers/staging/wlags49_h25/wl_enc.c               |    2 -
 drivers/staging/wlags49_h25/wl_enc.h               |    2 -
 drivers/staging/wlags49_h25/wl_if.h                |    2 -
 drivers/staging/wlags49_h25/wl_internal.h          |    2 -
 drivers/staging/wlags49_h25/wl_main.c              |    2 -
 drivers/staging/wlags49_h25/wl_main.h              |    2 -
 drivers/staging/wlags49_h25/wl_netdev.c            |    2 -
 drivers/staging/wlags49_h25/wl_netdev.h            |    2 -
 drivers/staging/wlags49_h25/wl_priv.c              |    2 -
 drivers/staging/wlags49_h25/wl_priv.h              |    2 -
 drivers/staging/wlags49_h25/wl_profile.c           |    2 -
 drivers/staging/wlags49_h25/wl_profile.h           |    2 -
 drivers/staging/wlags49_h25/wl_util.c              |    2 -
 drivers/staging/wlags49_h25/wl_util.h              |    2 -
 drivers/staging/wlags49_h25/wl_version.h           |    2 -
 drivers/staging/wlags49_h25/wl_wext.c              |    2 -
 drivers/staging/wlags49_h25/wl_wext.h              |    2 -
 drivers/staging/wlan-ng/cfg80211.c                 |    2 +
 drivers/staging/wlan-ng/hfa384x_usb.c              |   19 +-
 drivers/staging/wlan-ng/p80211netdev.c             |   40 +-
 drivers/staging/wlan-ng/p80211netdev.h             |    1 -
 drivers/staging/wlan-ng/prism2fw.c                 |    2 +
 drivers/staging/wlan-ng/prism2mgmt.c               |   42 +-
 drivers/staging/wlan-ng/prism2mib.c                |    4 +-
 drivers/staging/wlan-ng/prism2sta.c                |    7 +-
 drivers/staging/xillybus/xillybus.h                |   48 +-
 drivers/staging/xillybus/xillybus_core.c           |  523 +-
 drivers/staging/xillybus/xillybus_of.c             |   72 +-
 drivers/staging/xillybus/xillybus_pcie.c           |   66 +-
 include/linux/iio/accel/kxcjk_1013.h               |   22 +
 include/linux/iio/common/st_sensors.h              |   12 +-
 include/linux/iio/common/st_sensors_i2c.h          |   11 +
 include/linux/iio/imu/adis.h                       |   33 +-
 include/linux/iio/trigger.h                        |    5 +-
 include/linux/iio/types.h                          |    1 +
 .../adc => include/linux/platform_data}/ad7291.h   |    0
 kernel/time/alarmtimer.c                           |    2 +-
 1068 files changed, 29586 insertions(+), 161500 deletions(-)
 rename {drivers/staging/iio/Documentation => Documentation/ABI/testing}/sysfs-bus-iio-trigger-sysfs (100%)
 create mode 100644 Documentation/devicetree/bindings/iio/adc/max1027-adc.txt
 create mode 100644 Documentation/devicetree/bindings/iio/st-sensors.txt
 create mode 100644 drivers/iio/accel/kxcjk-1013.c
 rename drivers/{staging => }/iio/adc/ad7291.c (89%)
 create mode 100644 drivers/iio/adc/max1027.c
 create mode 100644 drivers/iio/dac/mcp4922.c
 create mode 100644 drivers/iio/light/isl29125.c
 create mode 100644 drivers/iio/light/tcs3414.c
 create mode 100644 drivers/iio/magnetometer/ak09911.c
 create mode 100644 drivers/iio/pressure/t5403.c
 create mode 100644 drivers/staging/board/Kconfig
 create mode 100644 drivers/staging/board/Makefile
 create mode 100644 drivers/staging/board/TODO
 create mode 100644 drivers/staging/board/board.c
 create mode 100644 drivers/staging/board/board.h
 create mode 100644 drivers/staging/board/kzm9d.c
 delete mode 100644 drivers/staging/crystalhd/Kconfig
 delete mode 100644 drivers/staging/crystalhd/Makefile
 delete mode 100644 drivers/staging/crystalhd/TODO
 delete mode 100644 drivers/staging/crystalhd/bc_dts_defs.h
 delete mode 100644 drivers/staging/crystalhd/bc_dts_glob_lnx.h
 delete mode 100644 drivers/staging/crystalhd/bcm_70012_regs.h
 delete mode 100644 drivers/staging/crystalhd/crystalhd.h
 delete mode 100644 drivers/staging/crystalhd/crystalhd_cmds.c
 delete mode 100644 drivers/staging/crystalhd/crystalhd_cmds.h
 delete mode 100644 drivers/staging/crystalhd/crystalhd_fw_if.h
 delete mode 100644 drivers/staging/crystalhd/crystalhd_hw.c
 delete mode 100644 drivers/staging/crystalhd/crystalhd_hw.h
 delete mode 100644 drivers/staging/crystalhd/crystalhd_lnx.c
 delete mode 100644 drivers/staging/crystalhd/crystalhd_lnx.h
 delete mode 100644 drivers/staging/crystalhd/crystalhd_misc.c
 delete mode 100644 drivers/staging/crystalhd/crystalhd_misc.h
 delete mode 100644 drivers/staging/cxt1e1/Kconfig
 delete mode 100644 drivers/staging/cxt1e1/Makefile
 delete mode 100644 drivers/staging/cxt1e1/comet.c
 delete mode 100644 drivers/staging/cxt1e1/comet.h
 delete mode 100644 drivers/staging/cxt1e1/comet_tables.c
 delete mode 100644 drivers/staging/cxt1e1/comet_tables.h
 delete mode 100644 drivers/staging/cxt1e1/functions.c
 delete mode 100644 drivers/staging/cxt1e1/hwprobe.c
 delete mode 100644 drivers/staging/cxt1e1/libsbew.h
 delete mode 100644 drivers/staging/cxt1e1/linux.c
 delete mode 100644 drivers/staging/cxt1e1/musycc.c
 delete mode 100644 drivers/staging/cxt1e1/musycc.h
 delete mode 100644 drivers/staging/cxt1e1/pmc93x6_eeprom.c
 delete mode 100644 drivers/staging/cxt1e1/pmc93x6_eeprom.h
 delete mode 100644 drivers/staging/cxt1e1/pmcc4.h
 delete mode 100644 drivers/staging/cxt1e1/pmcc4_cpld.h
 delete mode 100644 drivers/staging/cxt1e1/pmcc4_defs.h
 delete mode 100644 drivers/staging/cxt1e1/pmcc4_drv.c
 delete mode 100644 drivers/staging/cxt1e1/pmcc4_ioctls.h
 delete mode 100644 drivers/staging/cxt1e1/pmcc4_private.h
 delete mode 100644 drivers/staging/cxt1e1/pmcc4_sysdep.h
 delete mode 100644 drivers/staging/cxt1e1/sbe_bid.h
 delete mode 100644 drivers/staging/cxt1e1/sbe_promformat.h
 delete mode 100644 drivers/staging/cxt1e1/sbecom_inline_linux.h
 delete mode 100644 drivers/staging/cxt1e1/sbecrc.c
 delete mode 100644 drivers/staging/cxt1e1/sbeid.c
 delete mode 100644 drivers/staging/cxt1e1/sbeproc.c
 delete mode 100644 drivers/staging/cxt1e1/sbeproc.h
 delete mode 100644 drivers/staging/cxt1e1/sbew_ioc.h
 delete mode 100644 drivers/staging/dgrp/Kconfig
 delete mode 100644 drivers/staging/dgrp/Makefile
 delete mode 100644 drivers/staging/dgrp/README
 delete mode 100644 drivers/staging/dgrp/TODO
 delete mode 100644 drivers/staging/dgrp/dgrp_common.c
 delete mode 100644 drivers/staging/dgrp/dgrp_common.h
 delete mode 100644 drivers/staging/dgrp/dgrp_dpa_ops.c
 delete mode 100644 drivers/staging/dgrp/dgrp_driver.c
 delete mode 100644 drivers/staging/dgrp/dgrp_mon_ops.c
 delete mode 100644 drivers/staging/dgrp/dgrp_net_ops.c
 delete mode 100644 drivers/staging/dgrp/dgrp_ports_ops.c
 delete mode 100644 drivers/staging/dgrp/dgrp_specproc.c
 delete mode 100644 drivers/staging/dgrp/dgrp_sysfs.c
 delete mode 100644 drivers/staging/dgrp/dgrp_tty.c
 delete mode 100644 drivers/staging/dgrp/digirp.h
 delete mode 100644 drivers/staging/dgrp/drp.h
 create mode 100644 drivers/staging/emxx_udc/Kconfig
 create mode 100644 drivers/staging/emxx_udc/Makefile
 create mode 100644 drivers/staging/emxx_udc/TODO
 create mode 100644 drivers/staging/emxx_udc/emxx_udc.c
 create mode 100644 drivers/staging/emxx_udc/emxx_udc.h
 delete mode 100644 drivers/staging/lustre/include/linux/libcfs/bitmap.h
 delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
 delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-bitops.h
 delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-lock.h
 delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
 delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-tcpip.h
 delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-types.h
 delete mode 100644 drivers/staging/lustre/include/linux/libcfs/params_tree.h
 rename drivers/staging/lustre/{include/linux => lustre}/libcfs/linux/linux-crypto.h (72%)
 delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/Makefile
 delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_api.h
 delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_asn1.h
 delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_bulk.c
 delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_cli_upcall.c
 delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_err.h
 delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_generic_token.c
 delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_internal.h
 delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_keyring.c
 delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_krb5.h
 delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_krb5_mech.c
 delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_mech_switch.c
 delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c
 delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_rawobj.c
 delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/gss_svc_upcall.c
 delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/lproc_gss.c
 delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c
 delete mode 100644 drivers/staging/rtl8188eu/core/rtw_br_ext.c
 delete mode 100644 drivers/staging/rtl8188eu/core/rtw_io.c
 delete mode 100644 drivers/staging/rtl8188eu/core/rtw_mp.c
 delete mode 100644 drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c
 delete mode 100644 drivers/staging/rtl8188eu/core/rtw_p2p.c
 delete mode 100644 drivers/staging/rtl8188eu/hal/HalPhyRf.c
 delete mode 100644 drivers/staging/rtl8188eu/hal/rtl8188e_mp.c
 delete mode 100644 drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c
 delete mode 100644 drivers/staging/rtl8188eu/hal/usb_ops_linux.c
 delete mode 100644 drivers/staging/rtl8188eu/include/Hal8188EReg.h
 delete mode 100644 drivers/staging/rtl8188eu/include/HalPhyRf.h
 delete mode 100644 drivers/staging/rtl8188eu/include/cmd_osdep.h
 delete mode 100644 drivers/staging/rtl8188eu/include/rtl8188e_sreset.h
 delete mode 100644 drivers/staging/rtl8188eu/include/rtw_br_ext.h
 delete mode 100644 drivers/staging/rtl8188eu/include/rtw_io.h
 delete mode 100644 drivers/staging/rtl8188eu/include/rtw_mp.h
 delete mode 100644 drivers/staging/rtl8188eu/include/rtw_mp_ioctl.h
 delete mode 100644 drivers/staging/rtl8188eu/include/rtw_p2p.h
 delete mode 100644 drivers/staging/rtl8188eu/include/rtw_version.h
 delete mode 100644 drivers/staging/rtl8188eu/include/usb_ops.h
 delete mode 100644 drivers/staging/rtl8188eu/include/usb_osintf.h
 delete mode 100644 drivers/staging/rtl8188eu/include/usb_vendor_req.h
 delete mode 100644 drivers/staging/rtl8723au/core/rtw_ioctl_set.c
 delete mode 100644 drivers/staging/rtl8723au/include/rtw_ioctl_set.h
 delete mode 100644 drivers/staging/serqt_usb2/Kconfig
 delete mode 100644 drivers/staging/serqt_usb2/Makefile
 delete mode 100644 drivers/staging/serqt_usb2/serqt_usb2.c
 delete mode 100644 drivers/staging/vt6656/80211hdr.h
 delete mode 100644 drivers/staging/vt6656/80211mgr.c
 delete mode 100644 drivers/staging/vt6656/80211mgr.h
 delete mode 100644 drivers/staging/vt6656/bssdb.c
 delete mode 100644 drivers/staging/vt6656/bssdb.h
 delete mode 100644 drivers/staging/vt6656/country.h
 delete mode 100644 drivers/staging/vt6656/datarate.c
 delete mode 100644 drivers/staging/vt6656/datarate.h
 delete mode 100644 drivers/staging/vt6656/iocmd.h
 delete mode 100644 drivers/staging/vt6656/iowpa.h
 delete mode 100644 drivers/staging/vt6656/iwctl.c
 delete mode 100644 drivers/staging/vt6656/iwctl.h
 delete mode 100644 drivers/staging/vt6656/michael.c
 delete mode 100644 drivers/staging/vt6656/michael.h
 delete mode 100644 drivers/staging/vt6656/rc4.c
 delete mode 100644 drivers/staging/vt6656/rc4.h
 delete mode 100644 drivers/staging/vt6656/tether.c
 delete mode 100644 drivers/staging/vt6656/tether.h
 delete mode 100644 drivers/staging/vt6656/tkip.c
 delete mode 100644 drivers/staging/vt6656/tkip.h
 delete mode 100644 drivers/staging/vt6656/tmacro.h
 delete mode 100644 drivers/staging/vt6656/vntconfiguration.dat
 delete mode 100644 drivers/staging/vt6656/wctl.c
 delete mode 100644 drivers/staging/vt6656/wctl.h
 delete mode 100644 drivers/staging/vt6656/wmgr.c
 delete mode 100644 drivers/staging/vt6656/wmgr.h
 delete mode 100644 drivers/staging/vt6656/wpa.c
 delete mode 100644 drivers/staging/vt6656/wpa.h
 delete mode 100644 drivers/staging/vt6656/wpa2.c
 delete mode 100644 drivers/staging/vt6656/wpa2.h
 delete mode 100644 drivers/staging/vt6656/wpactl.c
 delete mode 100644 drivers/staging/vt6656/wpactl.h
 delete mode 100644 drivers/staging/winbond/Kconfig
 delete mode 100644 drivers/staging/winbond/Makefile
 delete mode 100644 drivers/staging/winbond/TODO
 delete mode 100644 drivers/staging/winbond/core.h
 delete mode 100644 drivers/staging/winbond/localpara.h
 delete mode 100644 drivers/staging/winbond/mac_structures.h
 delete mode 100644 drivers/staging/winbond/mds.c
 delete mode 100644 drivers/staging/winbond/mds_f.h
 delete mode 100644 drivers/staging/winbond/mds_s.h
 delete mode 100644 drivers/staging/winbond/mto.c
 delete mode 100644 drivers/staging/winbond/mto.h
 delete mode 100644 drivers/staging/winbond/phy_calibration.c
 delete mode 100644 drivers/staging/winbond/phy_calibration.h
 delete mode 100644 drivers/staging/winbond/reg.c
 delete mode 100644 drivers/staging/winbond/sme_api.h
 delete mode 100644 drivers/staging/winbond/wb35reg.c
 delete mode 100644 drivers/staging/winbond/wb35reg_f.h
 delete mode 100644 drivers/staging/winbond/wb35reg_s.h
 delete mode 100644 drivers/staging/winbond/wb35rx.c
 delete mode 100644 drivers/staging/winbond/wb35rx_f.h
 delete mode 100644 drivers/staging/winbond/wb35rx_s.h
 delete mode 100644 drivers/staging/winbond/wb35tx.c
 delete mode 100644 drivers/staging/winbond/wb35tx_f.h
 delete mode 100644 drivers/staging/winbond/wb35tx_s.h
 delete mode 100644 drivers/staging/winbond/wbhal.h
 delete mode 100644 drivers/staging/winbond/wbusb.c
 delete mode 100644 drivers/staging/wlags49_h2/Kconfig
 delete mode 100644 drivers/staging/wlags49_h2/Makefile
 delete mode 100644 drivers/staging/wlags49_h2/README.ubuntu
 delete mode 100644 drivers/staging/wlags49_h2/README.wlags49
 delete mode 100644 drivers/staging/wlags49_h2/TODO
 delete mode 100644 drivers/staging/wlags49_h2/WARNING.txt
 delete mode 100644 drivers/staging/wlags49_h2/ap_h2.c
 delete mode 100644 drivers/staging/wlags49_h2/ap_h25.c
 delete mode 100644 drivers/staging/wlags49_h2/debug.h
 delete mode 100644 drivers/staging/wlags49_h2/dhf.c
 delete mode 100644 drivers/staging/wlags49_h2/dhf.h
 delete mode 100644 drivers/staging/wlags49_h2/dhfcfg.h
 delete mode 100644 drivers/staging/wlags49_h2/hcf.c
 delete mode 100644 drivers/staging/wlags49_h2/hcf.h
 delete mode 100644 drivers/staging/wlags49_h2/hcfcfg.h
 delete mode 100644 drivers/staging/wlags49_h2/hcfdef.h
 delete mode 100644 drivers/staging/wlags49_h2/man/wlags49.4
 delete mode 100644 drivers/staging/wlags49_h2/mdd.h
 delete mode 100644 drivers/staging/wlags49_h2/mmd.c
 delete mode 100644 drivers/staging/wlags49_h2/mmd.h
 delete mode 100644 drivers/staging/wlags49_h2/sta_h2.c
 delete mode 100644 drivers/staging/wlags49_h2/sta_h25.c
 delete mode 100644 drivers/staging/wlags49_h2/wl_cs.c
 delete mode 100644 drivers/staging/wlags49_h2/wl_cs.h
 delete mode 100644 drivers/staging/wlags49_h2/wl_enc.c
 delete mode 100644 drivers/staging/wlags49_h2/wl_enc.h
 delete mode 100644 drivers/staging/wlags49_h2/wl_if.h
 delete mode 100644 drivers/staging/wlags49_h2/wl_internal.h
 delete mode 100644 drivers/staging/wlags49_h2/wl_main.c
 delete mode 100644 drivers/staging/wlags49_h2/wl_main.h
 delete mode 100644 drivers/staging/wlags49_h2/wl_netdev.c
 delete mode 100644 drivers/staging/wlags49_h2/wl_netdev.h
 delete mode 100644 drivers/staging/wlags49_h2/wl_priv.c
 delete mode 100644 drivers/staging/wlags49_h2/wl_priv.h
 delete mode 100644 drivers/staging/wlags49_h2/wl_profile.c
 delete mode 100644 drivers/staging/wlags49_h2/wl_profile.h
 delete mode 100644 drivers/staging/wlags49_h2/wl_util.c
 delete mode 100644 drivers/staging/wlags49_h2/wl_util.h
 delete mode 100644 drivers/staging/wlags49_h2/wl_version.h
 delete mode 100644 drivers/staging/wlags49_h2/wl_wext.c
 delete mode 100644 drivers/staging/wlags49_h2/wl_wext.h
 delete mode 100644 drivers/staging/wlags49_h25/Kconfig
 delete mode 100644 drivers/staging/wlags49_h25/Makefile
 delete mode 100644 drivers/staging/wlags49_h25/README.txt
 delete mode 100644 drivers/staging/wlags49_h25/TODO
 delete mode 100644 drivers/staging/wlags49_h25/ap_h25.c
 delete mode 100644 drivers/staging/wlags49_h25/debug.h
 delete mode 100644 drivers/staging/wlags49_h25/dhf.c
 delete mode 100644 drivers/staging/wlags49_h25/dhf.h
 delete mode 100644 drivers/staging/wlags49_h25/dhfcfg.h
 delete mode 100644 drivers/staging/wlags49_h25/hcf.c
 delete mode 100644 drivers/staging/wlags49_h25/hcf.h
 delete mode 100644 drivers/staging/wlags49_h25/hcfcfg.h
 delete mode 100644 drivers/staging/wlags49_h25/hcfdef.h
 delete mode 100644 drivers/staging/wlags49_h25/mdd.h
 delete mode 100644 drivers/staging/wlags49_h25/mmd.c
 delete mode 100644 drivers/staging/wlags49_h25/mmd.h
 delete mode 100644 drivers/staging/wlags49_h25/sta_h25.c
 delete mode 100644 drivers/staging/wlags49_h25/wl_cs.c
 delete mode 100644 drivers/staging/wlags49_h25/wl_cs.h
 delete mode 100644 drivers/staging/wlags49_h25/wl_enc.c
 delete mode 100644 drivers/staging/wlags49_h25/wl_enc.h
 delete mode 100644 drivers/staging/wlags49_h25/wl_if.h
 delete mode 100644 drivers/staging/wlags49_h25/wl_internal.h
 delete mode 100644 drivers/staging/wlags49_h25/wl_main.c
 delete mode 100644 drivers/staging/wlags49_h25/wl_main.h
 delete mode 100644 drivers/staging/wlags49_h25/wl_netdev.c
 delete mode 100644 drivers/staging/wlags49_h25/wl_netdev.h
 delete mode 100644 drivers/staging/wlags49_h25/wl_priv.c
 delete mode 100644 drivers/staging/wlags49_h25/wl_priv.h
 delete mode 100644 drivers/staging/wlags49_h25/wl_profile.c
 delete mode 100644 drivers/staging/wlags49_h25/wl_profile.h
 delete mode 100644 drivers/staging/wlags49_h25/wl_util.c
 delete mode 100644 drivers/staging/wlags49_h25/wl_util.h
 delete mode 100644 drivers/staging/wlags49_h25/wl_version.h
 delete mode 100644 drivers/staging/wlags49_h25/wl_wext.c
 delete mode 100644 drivers/staging/wlags49_h25/wl_wext.h
 create mode 100644 include/linux/iio/accel/kxcjk_1013.h
 rename {drivers/staging/iio/adc => include/linux/platform_data}/ad7291.h (100%)
Merging char-misc/char-misc-next (9f48c89862e3 Merge 3.16-rc5 into char-misc-next)
$ git merge char-misc/char-misc-next
Auto-merging drivers/pcmcia/Makefile
Auto-merging drivers/pcmcia/Kconfig
Auto-merging drivers/pci/quirks.c
Auto-merging drivers/Makefile
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-class-mei          |  16 +
 Documentation/ABI/testing/sysfs-driver-genwqe      |   9 +
 Documentation/mic/mic_overview.txt                 |  67 +-
 Documentation/mic/mpssd/mpss                       |  14 +-
 Documentation/w1/slaves/w1_ds2406                  |  25 +
 MAINTAINERS                                        |   5 +
 drivers/Kconfig                                    |   2 +
 drivers/Makefile                                   |   1 +
 drivers/char/bsr.c                                 |   2 +-
 drivers/char/i8k.c                                 | 123 ++--
 drivers/char/xilinx_hwicap/xilinx_hwicap.c         |   1 +
 drivers/dma/Kconfig                                |  19 +
 drivers/dma/Makefile                               |   1 +
 drivers/dma/mic_x100_dma.c                         | 774 +++++++++++++++++++++
 drivers/dma/mic_x100_dma.h                         | 286 ++++++++
 drivers/hv/channel.c                               |   6 +-
 drivers/ipack/devices/ipoctal.c                    |  20 +-
 drivers/misc/carma/carma-fpga.c                    |   5 +-
 drivers/misc/dummy-irq.c                           |   1 +
 drivers/misc/genwqe/Kconfig                        |   6 +
 drivers/misc/genwqe/card_base.c                    | 215 +++++-
 drivers/misc/genwqe/card_base.h                    |   2 +
 drivers/misc/genwqe/card_ddcb.c                    |  28 +-
 drivers/misc/genwqe/card_debugfs.c                 |   7 +
 drivers/misc/genwqe/card_dev.c                     |   5 +
 drivers/misc/genwqe/card_sysfs.c                   |  25 +
 drivers/misc/genwqe/card_utils.c                   |  20 +-
 drivers/misc/genwqe/genwqe_driver.h                |   2 +-
 drivers/misc/lkdtm.c                               |   1 +
 drivers/misc/mei/hw-me-regs.h                      |   1 +
 drivers/misc/mei/main.c                            | 148 +++-
 drivers/misc/mei/mei_dev.h                         |   9 +-
 drivers/misc/mei/pci-me.c                          |   4 +-
 drivers/misc/mei/pci-txe.c                         |   2 +-
 drivers/misc/mic/Kconfig                           |  21 +-
 drivers/misc/mic/Makefile                          |   1 +
 drivers/misc/mic/bus/Makefile                      |   5 +
 drivers/misc/mic/bus/mic_bus.c                     | 218 ++++++
 drivers/misc/mic/card/mic_device.c                 |  23 +-
 drivers/misc/mic/card/mic_device.h                 |   9 +-
 drivers/misc/mic/card/mic_virtio.c                 |   7 +-
 drivers/misc/mic/card/mic_x100.c                   |  55 +-
 drivers/misc/mic/host/mic_boot.c                   |  83 ++-
 drivers/misc/mic/host/mic_device.h                 |  24 +
 drivers/misc/mic/host/mic_intr.c                   | 121 ++--
 drivers/misc/mic/host/mic_intr.h                   |  27 +-
 drivers/misc/mic/host/mic_main.c                   |   5 +-
 drivers/misc/mic/host/mic_virtio.c                 | 187 ++++-
 drivers/misc/mic/host/mic_virtio.h                 |  21 +-
 drivers/misc/mic/host/mic_x100.c                   |   8 +
 drivers/misc/ti-st/st_kim.c                        |   3 +-
 drivers/pci/pci-driver.c                           |  18 +-
 drivers/pci/quirks.c                               | 104 +++
 drivers/pcmcia/Kconfig                             |   2 +-
 drivers/pcmcia/Makefile                            |   1 +
 drivers/pcmcia/sa1111_jornada720.c                 |  10 +-
 drivers/spmi/spmi.c                                |   1 -
 drivers/thunderbolt/Kconfig                        |  13 +
 drivers/thunderbolt/Makefile                       |   3 +
 drivers/thunderbolt/cap.c                          | 116 +++
 drivers/thunderbolt/ctl.c                          | 731 +++++++++++++++++++
 drivers/thunderbolt/ctl.h                          |  75 ++
 drivers/thunderbolt/eeprom.c                       | 449 ++++++++++++
 drivers/thunderbolt/nhi.c                          | 675 ++++++++++++++++++
 drivers/thunderbolt/nhi.h                          | 114 +++
 drivers/thunderbolt/nhi_regs.h                     | 101 +++
 drivers/thunderbolt/path.c                         | 215 ++++++
 drivers/thunderbolt/switch.c                       | 507 ++++++++++++++
 drivers/thunderbolt/tb.c                           | 436 ++++++++++++
 drivers/thunderbolt/tb.h                           | 271 ++++++++
 drivers/thunderbolt/tb_regs.h                      | 213 ++++++
 drivers/thunderbolt/tunnel_pci.c                   | 232 ++++++
 drivers/thunderbolt/tunnel_pci.h                   |  30 +
 drivers/uio/uio_pruss.c                            |  37 +-
 drivers/vme/bridges/vme_ca91cx42.h                 |   1 -
 drivers/w1/masters/ds1wm.c                         |   2 +-
 drivers/w1/masters/ds2482.c                        |   2 +-
 drivers/w1/masters/ds2490.c                        |  50 +-
 drivers/w1/masters/mxc_w1.c                        |  64 +-
 drivers/w1/slaves/Kconfig                          |   8 +
 drivers/w1/slaves/Makefile                         |   1 +
 drivers/w1/slaves/w1_ds2406.c                      | 168 +++++
 drivers/w1/slaves/w1_ds2760.c                      |   3 +-
 drivers/w1/w1.c                                    |  10 +-
 drivers/w1/w1_family.c                             |   2 +-
 drivers/w1/w1_family.h                             |   1 +
 drivers/w1/w1_int.c                                |  19 +-
 drivers/w1/w1_log.h                                |   4 +-
 drivers/w1/w1_netlink.c                            |   3 +-
 include/asm-generic/vmlinux.lds.h                  |   3 +
 include/linux/mic_bus.h                            | 110 +++
 include/linux/pci.h                                |  12 +-
 include/uapi/linux/genwqe/genwqe_card.h            |   1 +
 include/uapi/linux/i8k.h                           |   3 +-
 tools/hv/hv_fcopy_daemon.c                         |   3 +-
 tools/testing/selftests/Makefile                   |  18 +
 tools/testing/selftests/README.txt                 |  27 +-
 tools/testing/selftests/cpu-hotplug/Makefile       |   3 +
 tools/testing/selftests/cpu-hotplug/on-off-test.sh |  52 +-
 tools/testing/selftests/kcmp/kcmp_test.c           |   2 +-
 tools/testing/selftests/memory-hotplug/Makefile    |   3 +
 .../selftests/memory-hotplug/on-off-test.sh        |   8 +
 tools/testing/selftests/mqueue/Makefile            |   4 +-
 tools/testing/selftests/mqueue/mq_open_tests.c     |  20 +-
 tools/testing/selftests/mqueue/mq_perf_tests.c     |  40 +-
 105 files changed, 7254 insertions(+), 417 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-class-mei
 create mode 100644 Documentation/w1/slaves/w1_ds2406
 create mode 100644 drivers/dma/mic_x100_dma.c
 create mode 100644 drivers/dma/mic_x100_dma.h
 create mode 100644 drivers/misc/mic/bus/Makefile
 create mode 100644 drivers/misc/mic/bus/mic_bus.c
 create mode 100644 drivers/thunderbolt/Kconfig
 create mode 100644 drivers/thunderbolt/Makefile
 create mode 100644 drivers/thunderbolt/cap.c
 create mode 100644 drivers/thunderbolt/ctl.c
 create mode 100644 drivers/thunderbolt/ctl.h
 create mode 100644 drivers/thunderbolt/eeprom.c
 create mode 100644 drivers/thunderbolt/nhi.c
 create mode 100644 drivers/thunderbolt/nhi.h
 create mode 100644 drivers/thunderbolt/nhi_regs.h
 create mode 100644 drivers/thunderbolt/path.c
 create mode 100644 drivers/thunderbolt/switch.c
 create mode 100644 drivers/thunderbolt/tb.c
 create mode 100644 drivers/thunderbolt/tb.h
 create mode 100644 drivers/thunderbolt/tb_regs.h
 create mode 100644 drivers/thunderbolt/tunnel_pci.c
 create mode 100644 drivers/thunderbolt/tunnel_pci.h
 create mode 100644 drivers/w1/slaves/w1_ds2406.c
 create mode 100644 include/linux/mic_bus.h
Merging cgroup/for-next (52c5b223e4d5 Merge branch 'for-3.17' into for-next)
$ git merge cgroup/for-next
Auto-merging kernel/cgroup.c
Auto-merging block/blk-cgroup.c
Merge made by the 'recursive' strategy.
 Documentation/cgroups/cgroups.txt           |  14 +
 Documentation/cgroups/unified-hierarchy.txt |  23 +-
 block/blk-cgroup.c                          |   8 +
 block/blk-throttle.c                        |   6 +-
 include/linux/cgroup.h                      | 148 ++++----
 kernel/cgroup.c                             | 297 +++++++++++------
 kernel/cpuset.c                             | 500 +++++++++++++++++-----------
 mm/memcontrol.c                             |  31 +-
 8 files changed, 652 insertions(+), 375 deletions(-)
Merging scsi/for-next (4944d7521bec pm8001: more fixes to honor return value)
$ git merge scsi/for-next
Resolved 'include/scsi/sg.h' using previous resolution.
Auto-merging include/scsi/sg.h
CONFLICT (content): Merge conflict in include/scsi/sg.h
Removing include/scsi/scsi_tgt_if.h
Removing include/scsi/scsi_tgt.h
Removing include/scsi/libsrp.h
Removing drivers/scsi/scsi_transport_srp_internal.h
Removing drivers/scsi/scsi_transport_fc_internal.h
Removing drivers/scsi/scsi_tgt_priv.h
Removing drivers/scsi/scsi_tgt_lib.c
Removing drivers/scsi/scsi_tgt_if.c
Removing drivers/scsi/libsrp.c
Removing drivers/scsi/ibmvscsi/ibmvstgt.c
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 2525fea15657] Merge remote-tracking branch 'scsi/for-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/scsi/tmscsim.txt                   |    2 -
 MAINTAINERS                                      |    4 +-
 arch/arm/configs/msm_defconfig                   |    1 -
 arch/arm/configs/s3c2410_defconfig               |    1 -
 arch/m68k/configs/amiga_defconfig                |    1 -
 arch/m68k/configs/apollo_defconfig               |    1 -
 arch/m68k/configs/atari_defconfig                |    1 -
 arch/m68k/configs/bvme6000_defconfig             |    1 -
 arch/m68k/configs/hp300_defconfig                |    1 -
 arch/m68k/configs/mac_defconfig                  |    1 -
 arch/m68k/configs/multi_defconfig                |    1 -
 arch/m68k/configs/mvme147_defconfig              |    1 -
 arch/m68k/configs/mvme16x_defconfig              |    1 -
 arch/m68k/configs/q40_defconfig                  |    1 -
 arch/m68k/configs/sun3_defconfig                 |    1 -
 arch/m68k/configs/sun3x_defconfig                |    1 -
 arch/mips/configs/db1xxx_defconfig               |    1 -
 arch/mips/configs/decstation_defconfig           |    1 -
 arch/mips/configs/ip22_defconfig                 |    1 -
 arch/mips/configs/ip27_defconfig                 |    1 -
 arch/mips/configs/ip32_defconfig                 |    1 -
 arch/mips/configs/jazz_defconfig                 |    1 -
 arch/mips/configs/loongson3_defconfig            |    1 -
 arch/mips/configs/malta_defconfig                |    1 -
 arch/mips/configs/malta_kvm_defconfig            |    1 -
 arch/mips/configs/malta_kvm_guest_defconfig      |    1 -
 arch/mips/configs/markeins_defconfig             |    1 -
 arch/mips/configs/nlm_xlp_defconfig              |    3 -
 arch/mips/configs/nlm_xlr_defconfig              |    3 -
 arch/mips/configs/rm200_defconfig                |    1 -
 arch/mips/configs/tb0226_defconfig               |    1 -
 arch/mips/configs/tb0287_defconfig               |    1 -
 arch/powerpc/configs/52xx/motionpro_defconfig    |    1 -
 arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig |    1 -
 arch/powerpc/configs/mpc5200_defconfig           |    1 -
 arch/powerpc/configs/ppc6xx_defconfig            |    2 -
 arch/s390/configs/default_defconfig              |    2 -
 arch/s390/configs/gcov_defconfig                 |    2 -
 arch/s390/configs/performance_defconfig          |    2 -
 arch/sh/configs/sh2007_defconfig                 |    1 -
 arch/tile/configs/tilegx_defconfig               |    1 -
 arch/tile/configs/tilepro_defconfig              |    1 -
 drivers/ata/libata-scsi.c                        |    2 +-
 drivers/ata/libata.h                             |    2 +-
 drivers/message/fusion/mptbase.c                 |   23 +-
 drivers/message/fusion/mptbase.h                 |    4 +-
 drivers/message/fusion/mptctl.c                  |   18 +-
 drivers/message/fusion/mptfc.c                   |    9 +-
 drivers/message/fusion/mptsas.c                  |   74 +-
 drivers/message/fusion/mptsas.h                  |    2 +-
 drivers/message/fusion/mptscsih.c                |   31 +-
 drivers/message/fusion/mptscsih.h                |    4 +-
 drivers/message/fusion/mptspi.c                  |    5 +-
 drivers/message/i2o/i2o_scsi.c                   |   11 +-
 drivers/s390/scsi/zfcp_dbf.c                     |    3 +-
 drivers/s390/scsi/zfcp_unit.c                    |    4 +-
 drivers/scsi/3w-xxxx.h                           |    4 +-
 drivers/scsi/53c700.c                            |    7 +-
 drivers/scsi/Kconfig                             |   47 +-
 drivers/scsi/Makefile                            |    5 -
 drivers/scsi/NCR5380.c                           |   31 +-
 drivers/scsi/NCR53c406a.c                        |    4 +-
 drivers/scsi/a100u2w.c                           |    2 +-
 drivers/scsi/aacraid/linit.c                     |    2 +-
 drivers/scsi/advansys.c                          |    2 +-
 drivers/scsi/aha152x.c                           |    6 +-
 drivers/scsi/aic7xxx/aic7770_osm.c               |    3 +-
 drivers/scsi/aic7xxx/aic79xx.h                   |    2 +-
 drivers/scsi/aic7xxx/aic79xx_osm.c               |    6 +-
 drivers/scsi/aic7xxx/aic79xx_osm_pci.c           |    3 +-
 drivers/scsi/aic7xxx/aic79xx_proc.c              |    2 +-
 drivers/scsi/aic7xxx/aic7xxx_osm.c               |   11 +-
 drivers/scsi/aic7xxx/aic7xxx_osm_pci.c           |    3 +-
 drivers/scsi/aic7xxx/aic7xxx_proc.c              |    2 +-
 drivers/scsi/arcmsr/arcmsr_hba.c                 |    8 +-
 drivers/scsi/arm/acornscsi.c                     |   14 +-
 drivers/scsi/arm/fas216.c                        |   11 +-
 drivers/scsi/arm/queue.c                         |    3 +-
 drivers/scsi/atari_NCR5380.c                     |   62 +-
 drivers/scsi/be2iscsi/be_iscsi.c                 |    2 +-
 drivers/scsi/be2iscsi/be_mgmt.c                  |   20 +-
 drivers/scsi/bfa/bfa_fcs.c                       |    6 +-
 drivers/scsi/bfa/bfa_ioc.h                       |    2 +-
 drivers/scsi/bfa/bfad_bsg.c                      |   16 +-
 drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h            |   13 +
 drivers/scsi/bnx2fc/Kconfig                      |    4 +-
 drivers/scsi/bnx2fc/bnx2fc.h                     |    7 +-
 drivers/scsi/bnx2fc/bnx2fc_constants.h           |   13 +
 drivers/scsi/bnx2fc/bnx2fc_debug.c               |   13 +
 drivers/scsi/bnx2fc/bnx2fc_debug.h               |   13 +
 drivers/scsi/bnx2fc/bnx2fc_els.c                 |    3 +-
 drivers/scsi/bnx2fc/bnx2fc_fcoe.c                |   11 +-
 drivers/scsi/bnx2fc/bnx2fc_hwi.c                 |    3 +-
 drivers/scsi/bnx2fc/bnx2fc_io.c                  |    7 +-
 drivers/scsi/bnx2fc/bnx2fc_tgt.c                 |    3 +-
 drivers/scsi/bnx2i/57xx_iscsi_constants.h        |    6 +-
 drivers/scsi/bnx2i/57xx_iscsi_hsi.h              |    6 +-
 drivers/scsi/bnx2i/Kconfig                       |    4 +-
 drivers/scsi/bnx2i/bnx2i.h                       |    6 +-
 drivers/scsi/bnx2i/bnx2i_hwi.c                   |    6 +-
 drivers/scsi/bnx2i/bnx2i_init.c                  |   10 +-
 drivers/scsi/bnx2i/bnx2i_iscsi.c                 |   15 +-
 drivers/scsi/bnx2i/bnx2i_sysfs.c                 |    6 +-
 drivers/scsi/ch.c                                |   30 +-
 drivers/scsi/csiostor/csio_scsi.c                |   24 +-
 drivers/scsi/cxgbi/libcxgbi.c                    |    2 +-
 drivers/scsi/cxgbi/libcxgbi.h                    |    2 +-
 drivers/scsi/dc395x.c                            |   51 +-
 drivers/scsi/dpt_i2o.c                           |   38 +-
 drivers/scsi/dpti.h                              |    6 +-
 drivers/scsi/eata.c                              |    4 +-
 drivers/scsi/fnic/fnic_scsi.c                    |    4 +-
 drivers/scsi/g_NCR5380.c                         |    2 +-
 drivers/scsi/hosts.c                             |   15 +-
 drivers/scsi/hpsa.c                              |   37 +-
 drivers/scsi/hptiop.c                            |    2 +-
 drivers/scsi/ibmvscsi/Makefile                   |    1 -
 drivers/scsi/ibmvscsi/ibmvfc.c                   |  477 ++++++-----
 drivers/scsi/ibmvscsi/ibmvfc.h                   |  268 +++---
 drivers/scsi/ibmvscsi/ibmvstgt.c                 | 1001 ----------------------
 drivers/scsi/in2000.c                            |    6 +-
 drivers/scsi/libiscsi.c                          |    8 +-
 drivers/scsi/libsas/sas_scsi_host.c              |   11 +-
 drivers/scsi/libsrp.c                            |  447 ----------
 drivers/scsi/lpfc/lpfc_attr.c                    |   10 +-
 drivers/scsi/lpfc/lpfc_scsi.c                    |   36 +-
 drivers/scsi/megaraid.c                          |    6 +-
 drivers/scsi/megaraid/mega_common.h              |    2 +-
 drivers/scsi/megaraid/megaraid_sas_fusion.c      |    4 +-
 drivers/scsi/mesh.c                              |    2 +-
 drivers/scsi/mpt2sas/mpt2sas_base.c              |   73 +-
 drivers/scsi/mpt2sas/mpt2sas_base.h              |    2 +-
 drivers/scsi/mpt2sas/mpt2sas_scsih.c             |   58 +-
 drivers/scsi/mpt3sas/mpt3sas_base.c              |   73 +-
 drivers/scsi/mpt3sas/mpt3sas_scsih.c             |   66 +-
 drivers/scsi/ncr53c8xx.c                         |    2 +-
 drivers/scsi/ncr53c8xx.h                         |    4 -
 drivers/scsi/nsp32.c                             |    2 +-
 drivers/scsi/pas16.c                             |    2 -
 drivers/scsi/pcmcia/nsp_cs.c                     |    2 +-
 drivers/scsi/pcmcia/sym53c500_cs.c               |    2 +-
 drivers/scsi/pm8001/pm8001_ctl.c                 |    5 +-
 drivers/scsi/pm8001/pm8001_hwi.c                 |   45 +-
 drivers/scsi/pm8001/pm8001_init.c                |   35 +-
 drivers/scsi/pm8001/pm8001_sas.c                 |   38 +-
 drivers/scsi/pm8001/pm8001_sas.h                 |    2 +-
 drivers/scsi/pm8001/pm80xx_hwi.c                 |   48 +-
 drivers/scsi/pmcraid.c                           |    2 +-
 drivers/scsi/ps3rom.c                            |    2 +-
 drivers/scsi/qla2xxx/qla_def.h                   |    6 +-
 drivers/scsi/qla2xxx/qla_gbl.h                   |   18 +-
 drivers/scsi/qla2xxx/qla_init.c                  |   10 +-
 drivers/scsi/qla2xxx/qla_iocb.c                  |   11 +-
 drivers/scsi/qla2xxx/qla_isr.c                   |    4 +-
 drivers/scsi/qla2xxx/qla_mbx.c                   |   12 +-
 drivers/scsi/qla2xxx/qla_mr.c                    |    8 +-
 drivers/scsi/qla2xxx/qla_os.c                    |   48 +-
 drivers/scsi/qla4xxx/ql4_glbl.h                  |    4 +-
 drivers/scsi/qla4xxx/ql4_iocb.c                  |    2 +-
 drivers/scsi/qla4xxx/ql4_isr.c                   |   22 +-
 drivers/scsi/qla4xxx/ql4_mbx.c                   |    6 +-
 drivers/scsi/qla4xxx/ql4_os.c                    |   20 +-
 drivers/scsi/qlogicfas.c                         |    2 -
 drivers/scsi/scsi.c                              |   48 +-
 drivers/scsi/scsi_debug.c                        |   21 +-
 drivers/scsi/scsi_error.c                        |  181 ++--
 drivers/scsi/scsi_ioctl.c                        |   17 +-
 drivers/scsi/scsi_lib.c                          |   28 +-
 drivers/scsi/scsi_priv.h                         |    2 +-
 drivers/scsi/scsi_proc.c                         |    2 +-
 drivers/scsi/scsi_scan.c                         |  152 ++--
 drivers/scsi/scsi_sysfs.c                        |   14 +-
 drivers/scsi/scsi_tgt_if.c                       |  399 ---------
 drivers/scsi/scsi_tgt_lib.c                      |  661 --------------
 drivers/scsi/scsi_tgt_priv.h                     |   32 -
 drivers/scsi/scsi_transport_fc.c                 |   20 +-
 drivers/scsi/scsi_transport_fc_internal.h        |   26 -
 drivers/scsi/scsi_transport_iscsi.c              |    8 +-
 drivers/scsi/scsi_transport_sas.c                |    2 +-
 drivers/scsi/scsi_transport_srp.c                |   18 -
 drivers/scsi/scsi_transport_srp_internal.h       |   25 -
 drivers/scsi/sd.c                                |   46 +-
 drivers/scsi/sd.h                                |    3 +
 drivers/scsi/sg.c                                |  654 ++++++++------
 drivers/scsi/sr.c                                |   61 +-
 drivers/scsi/sr.h                                |    4 +
 drivers/scsi/sr_ioctl.c                          |   26 +-
 drivers/scsi/sr_vendor.c                         |   36 +-
 drivers/scsi/st.c                                |  605 ++++++-------
 drivers/scsi/sun3_NCR5380.c                      |   57 +-
 drivers/scsi/sym53c8xx_2/sym_glue.c              |    2 +-
 drivers/scsi/sym53c8xx_2/sym_hipd.h              |    2 +-
 drivers/scsi/tmscsim.c                           |    6 +-
 drivers/scsi/u14-34f.c                           |    4 +-
 drivers/scsi/ufs/ufs.h                           |   38 +-
 drivers/scsi/ufs/ufshcd.c                        |  403 ++++++---
 drivers/scsi/ufs/ufshci.h                        |    5 +
 drivers/scsi/virtio_scsi.c                       |   75 +-
 drivers/scsi/wd33c93.c                           |    8 +-
 drivers/target/loopback/tcm_loop.c               |    2 +-
 drivers/target/target_core_pscsi.c               |   12 +-
 drivers/usb/storage/Kconfig                      |    4 +-
 drivers/usb/storage/sddr09.c                     |    4 +-
 drivers/usb/storage/usb.c                        |   10 +-
 include/linux/moduleparam.h                      |    5 +
 include/scsi/libsrp.h                            |   78 --
 include/scsi/scsi.h                              |    2 +-
 include/scsi/scsi_cmnd.h                         |    3 -
 include/scsi/scsi_device.h                       |   22 +-
 include/scsi/scsi_devinfo.h                      |    2 +
 include/scsi/scsi_host.h                         |   33 +-
 include/scsi/scsi_tgt.h                          |   21 -
 include/scsi/scsi_tgt_if.h                       |  108 ---
 include/scsi/scsi_transport.h                    |    2 +-
 include/scsi/scsi_transport_fc.h                 |    4 +
 include/scsi/sg.h                                |   91 +-
 kernel/params.c                                  |    1 +
 217 files changed, 2709 insertions(+), 5199 deletions(-)
 delete mode 100644 drivers/scsi/ibmvscsi/ibmvstgt.c
 delete mode 100644 drivers/scsi/libsrp.c
 delete mode 100644 drivers/scsi/scsi_tgt_if.c
 delete mode 100644 drivers/scsi/scsi_tgt_lib.c
 delete mode 100644 drivers/scsi/scsi_tgt_priv.h
 delete mode 100644 drivers/scsi/scsi_transport_fc_internal.h
 delete mode 100644 drivers/scsi/scsi_transport_srp_internal.h
 delete mode 100644 include/scsi/libsrp.h
 delete mode 100644 include/scsi/scsi_tgt.h
 delete mode 100644 include/scsi/scsi_tgt_if.h
Merging scsi-core/core-for-3.16 (7bafc240e126 scsi: use the scsi data buffer length to extract transfer size)
$ git merge scsi-core/core-for-3.16
Merge made by the 'recursive' strategy.
Merging scsi-drivers/drivers-for-3.16 (8faeb529b2da virtio-scsi: fix various bad behavior on aborted requests)
$ git merge scsi-drivers/drivers-for-3.16
Already up-to-date.
Merging target-updates/for-next (a497c3ba1d97 Linux 3.16-rc2)
$ git merge target-updates/for-next
Already up-to-date.
Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2)
$ 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 (400f0cbd75df Merge branch 'devel' into for-next)
$ git merge pinctrl/for-next
Auto-merging drivers/pinctrl/samsung/pinctrl-samsung.h
Auto-merging drivers/pinctrl/samsung/pinctrl-samsung.c
Auto-merging drivers/pinctrl/samsung/pinctrl-exynos5440.c
Auto-merging drivers/pinctrl/samsung/pinctrl-exynos.c
Auto-merging drivers/pinctrl/qcom/pinctrl-msm.c
Auto-merging drivers/pinctrl/nomadik/pinctrl-nomadik.c
Auto-merging drivers/pinctrl/nomadik/pinctrl-abx500.c
Auto-merging drivers/pinctrl/Makefile
Auto-merging drivers/pinctrl/Kconfig
Auto-merging arch/arm/mach-sunxi/Kconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt   |    2 +
 .../bindings/pinctrl/qcom,msm8960-pinctrl.txt      |  181 +++
 .../bindings/pinctrl/renesas,pfc-pinctrl.txt       |    1 +
 .../bindings/pinctrl/rockchip,pinctrl.txt          |    4 +-
 .../bindings/pinctrl/samsung-pinctrl.txt           |   24 +-
 MAINTAINERS                                        |    6 +
 arch/arm/boot/dts/imx27-pinfunc.h                  |   46 -
 arch/arm/mach-sunxi/Kconfig                        |    1 -
 drivers/gpio/gpio-rcar.c                           |    1 +
 drivers/pinctrl/Kconfig                            |  115 +-
 drivers/pinctrl/Makefile                           |   24 +-
 drivers/pinctrl/core.c                             |   24 +-
 drivers/pinctrl/nomadik/Kconfig                    |   51 +
 drivers/pinctrl/nomadik/Makefile                   |   10 +
 drivers/pinctrl/{ => nomadik}/pinctrl-ab8500.c     |    0
 drivers/pinctrl/{ => nomadik}/pinctrl-ab8505.c     |    0
 drivers/pinctrl/{ => nomadik}/pinctrl-ab8540.c     |    0
 drivers/pinctrl/{ => nomadik}/pinctrl-ab9540.c     |    0
 drivers/pinctrl/{ => nomadik}/pinctrl-abx500.c     |   19 +-
 drivers/pinctrl/{ => nomadik}/pinctrl-abx500.h     |    0
 .../pinctrl/{ => nomadik}/pinctrl-nomadik-db8500.c |    0
 .../pinctrl/{ => nomadik}/pinctrl-nomadik-db8540.c |    0
 .../{ => nomadik}/pinctrl-nomadik-stn8815.c        |    0
 drivers/pinctrl/{ => nomadik}/pinctrl-nomadik.c    |   18 +-
 drivers/pinctrl/{ => nomadik}/pinctrl-nomadik.h    |    0
 drivers/pinctrl/pinctrl-adi2.c                     |   32 +-
 drivers/pinctrl/pinctrl-at91.c                     |   27 +-
 drivers/pinctrl/pinctrl-baytrail.c                 |   11 +
 drivers/pinctrl/pinctrl-bcm281xx.c                 |    2 +-
 drivers/pinctrl/pinctrl-bcm2835.c                  |   11 -
 drivers/pinctrl/pinctrl-imx.c                      |    2 +-
 drivers/pinctrl/pinctrl-imx1-core.c                |    2 +-
 drivers/pinctrl/pinctrl-imx1.c                     |  279 +++++
 drivers/pinctrl/pinctrl-imx27.c                    |   52 -
 drivers/pinctrl/pinctrl-rockchip.c                 |  268 ++++-
 drivers/pinctrl/pinctrl-single.c                   |   61 +-
 drivers/pinctrl/pinctrl-st.c                       |   17 +-
 drivers/pinctrl/pinctrl-tb10x.c                    |   17 -
 drivers/pinctrl/pinctrl-tegra.c                    |   13 -
 drivers/pinctrl/pinctrl-tz1090-pdc.c               |   28 -
 drivers/pinctrl/pinctrl-tz1090.c                   |   58 -
 drivers/pinctrl/pinctrl-u300.c                     |   14 -
 drivers/pinctrl/pinmux.c                           |    4 -
 drivers/pinctrl/qcom/Kconfig                       |   42 +
 drivers/pinctrl/qcom/Makefile                      |    6 +
 drivers/pinctrl/{ => qcom}/pinctrl-apq8064.c       |    0
 drivers/pinctrl/{ => qcom}/pinctrl-ipq8064.c       |    0
 drivers/pinctrl/{ => qcom}/pinctrl-msm.c           |   39 +-
 drivers/pinctrl/{ => qcom}/pinctrl-msm.h           |    0
 drivers/pinctrl/qcom/pinctrl-msm8960.c             | 1254 ++++++++++++++++++++
 drivers/pinctrl/{ => qcom}/pinctrl-msm8x74.c       |    0
 drivers/pinctrl/samsung/Kconfig                    |   28 +
 drivers/pinctrl/samsung/Makefile                   |    7 +
 drivers/pinctrl/{ => samsung}/pinctrl-exynos.c     |  307 +----
 drivers/pinctrl/{ => samsung}/pinctrl-exynos.h     |    0
 drivers/pinctrl/{ => samsung}/pinctrl-exynos5440.c |   10 +-
 drivers/pinctrl/{ => samsung}/pinctrl-s3c24xx.c    |    0
 drivers/pinctrl/{ => samsung}/pinctrl-s3c64xx.c    |    0
 drivers/pinctrl/{ => samsung}/pinctrl-samsung.c    |  728 +++++++-----
 drivers/pinctrl/{ => samsung}/pinctrl-samsung.h    |   18 +-
 drivers/pinctrl/sh-pfc/pfc-r8a7791.c               |  417 +++++++
 drivers/pinctrl/sh-pfc/pfc-sh73a0.c                |   11 +-
 drivers/pinctrl/sh-pfc/pinctrl.c                   |   22 -
 drivers/pinctrl/sirf/pinctrl-sirf.c                |   10 -
 drivers/pinctrl/spear/Kconfig                      |    1 +
 drivers/pinctrl/spear/pinctrl-plgpio.c             |   81 +-
 drivers/pinctrl/spear/pinctrl-spear.c              |    7 -
 drivers/pinctrl/sunxi/Kconfig                      |   24 +-
 drivers/pinctrl/sunxi/Makefile                     |    2 +
 drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c          |    1 +
 drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c         |    1 +
 drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c          |    4 +-
 drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c        |    1 +
 drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c          |  217 ++--
 drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c          |    1 +
 drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c        |  142 +++
 drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c          |  593 +++++++++
 drivers/pinctrl/sunxi/pinctrl-sunxi.c              |  158 ++-
 drivers/pinctrl/sunxi/pinctrl-sunxi.h              |   44 +-
 drivers/pinctrl/vt8500/pinctrl-wmt.c               |   12 -
 include/linux/pinctrl/pinmux.h                     |    2 -
 81 files changed, 4146 insertions(+), 1469 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.txt
 create mode 100644 drivers/pinctrl/nomadik/Kconfig
 create mode 100644 drivers/pinctrl/nomadik/Makefile
 rename drivers/pinctrl/{ => nomadik}/pinctrl-ab8500.c (100%)
 rename drivers/pinctrl/{ => nomadik}/pinctrl-ab8505.c (100%)
 rename drivers/pinctrl/{ => nomadik}/pinctrl-ab8540.c (100%)
 rename drivers/pinctrl/{ => nomadik}/pinctrl-ab9540.c (100%)
 rename drivers/pinctrl/{ => nomadik}/pinctrl-abx500.c (98%)
 rename drivers/pinctrl/{ => nomadik}/pinctrl-abx500.h (100%)
 rename drivers/pinctrl/{ => nomadik}/pinctrl-nomadik-db8500.c (100%)
 rename drivers/pinctrl/{ => nomadik}/pinctrl-nomadik-db8540.c (100%)
 rename drivers/pinctrl/{ => nomadik}/pinctrl-nomadik-stn8815.c (100%)
 rename drivers/pinctrl/{ => nomadik}/pinctrl-nomadik.c (99%)
 rename drivers/pinctrl/{ => nomadik}/pinctrl-nomadik.h (100%)
 create mode 100644 drivers/pinctrl/pinctrl-imx1.c
 create mode 100644 drivers/pinctrl/qcom/Kconfig
 create mode 100644 drivers/pinctrl/qcom/Makefile
 rename drivers/pinctrl/{ => qcom}/pinctrl-apq8064.c (100%)
 rename drivers/pinctrl/{ => qcom}/pinctrl-ipq8064.c (100%)
 rename drivers/pinctrl/{ => qcom}/pinctrl-msm.c (97%)
 rename drivers/pinctrl/{ => qcom}/pinctrl-msm.h (100%)
 create mode 100644 drivers/pinctrl/qcom/pinctrl-msm8960.c
 rename drivers/pinctrl/{ => qcom}/pinctrl-msm8x74.c (100%)
 create mode 100644 drivers/pinctrl/samsung/Kconfig
 create mode 100644 drivers/pinctrl/samsung/Makefile
 rename drivers/pinctrl/{ => samsung}/pinctrl-exynos.c (79%)
 rename drivers/pinctrl/{ => samsung}/pinctrl-exynos.h (100%)
 rename drivers/pinctrl/{ => samsung}/pinctrl-exynos5440.c (99%)
 rename drivers/pinctrl/{ => samsung}/pinctrl-s3c24xx.c (100%)
 rename drivers/pinctrl/{ => samsung}/pinctrl-s3c64xx.c (100%)
 rename drivers/pinctrl/{ => samsung}/pinctrl-samsung.c (71%)
 rename drivers/pinctrl/{ => samsung}/pinctrl-samsung.h (93%)
 create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c
 create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c
Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs)
$ git merge vhost/linux-next
Resolved 'drivers/vhost/net.c' using previous resolution.
Auto-merging drivers/vhost/net.c
CONFLICT (content): Merge conflict in drivers/vhost/net.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 1c18df68e5f5] Merge remote-tracking branch 'vhost/linux-next'
$ git diff -M --stat --summary HEAD^..
Merging remoteproc/for-next (bd88acba5f98 remoteproc/ste_modem: staticize local symbols)
$ 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 (b45d1c62672f Merge branch 'devel' into for-next)
$ git merge gpio/for-next
Auto-merging drivers/gpio/gpio-rcar.c
Auto-merging drivers/gpio/Makefile
Auto-merging drivers/gpio/Kconfig
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/gpio/gpio-zynq.txt         |   26 +
 drivers/gpio/Kconfig                               |    8 +
 drivers/gpio/Makefile                              |    3 +
 drivers/gpio/gpio-intel-mid.c                      |   86 +-
 drivers/gpio/gpio-lpc32xx.c                        |    2 +-
 drivers/gpio/gpio-mcp23s08.c                       |    6 -
 drivers/gpio/gpio-omap.c                           |  275 +++---
 drivers/gpio/gpio-pxa.c                            |    7 +-
 drivers/gpio/gpio-rcar.c                           |    4 +-
 drivers/gpio/gpio-stmpe.c                          |  111 +--
 drivers/gpio/gpio-twl4030.c                        |    2 +-
 drivers/gpio/gpio-ucb1400.c                        |    2 +-
 drivers/gpio/gpio-vr41xx.c                         |    8 +-
 drivers/gpio/gpio-zynq.c                           |  649 ++++++++++++
 drivers/gpio/gpiolib-legacy.c                      |  111 +++
 drivers/gpio/gpiolib-of.c                          |    7 +-
 drivers/gpio/gpiolib-sysfs.c                       |  829 ++++++++++++++++
 drivers/gpio/gpiolib.c                             | 1043 +-------------------
 drivers/gpio/gpiolib.h                             |   91 ++
 19 files changed, 1933 insertions(+), 1337 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-zynq.txt
 create mode 100644 drivers/gpio/gpio-zynq.c
 create mode 100644 drivers/gpio/gpiolib-legacy.c
 create mode 100644 drivers/gpio/gpiolib-sysfs.c
Merging dma-mapping/dma-mapping-next (f70e3c4f8b6a CMA: correct unlock target)
$ git merge dma-mapping/dma-mapping-next
Already up-to-date.
Merging pwm/for-next (eae266a284f3 pwm: rockchip: document device tree bindings)
$ git merge pwm/for-next
Auto-merging drivers/pwm/Kconfig
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/pwm/pwm-rockchip.txt       |  17 ++
 drivers/pwm/Kconfig                                |   7 +
 drivers/pwm/Makefile                               |   1 +
 drivers/pwm/pwm-rockchip.c                         | 177 +++++++++++++++++++++
 4 files changed, 202 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/pwm/pwm-rockchip.txt
 create mode 100644 drivers/pwm/pwm-rockchip.c
Merging dma-buf/for-next (b23b35445ec8 Documentation: devres: Add devm_kmalloc() et al)
$ git merge dma-buf/for-next
Already up-to-date.
Merging userns/for-next (3efe1ac78e99 vfs: Block intuitively in the case of BSD accounting files)
$ git merge userns/for-next
Resolved 'fs/btrfs/ioctl.c' using previous resolution.
Resolved 'fs/dcache.c' using previous resolution.
Resolved 'fs/namei.c' using previous resolution.
Resolved 'fs/namespace.c' using previous resolution.
Auto-merging kernel/acct.c
Auto-merging include/linux/dcache.h
Auto-merging fs/proc/fd.c
Auto-merging fs/proc/base.c
Auto-merging fs/nfs/dir.c
Auto-merging fs/namespace.c
CONFLICT (content): Merge conflict in fs/namespace.c
Auto-merging fs/namei.c
CONFLICT (content): Merge conflict in fs/namei.c
Auto-merging fs/mount.h
Auto-merging fs/kernfs/dir.c
Auto-merging fs/fuse/dir.c
Auto-merging fs/dcache.c
CONFLICT (content): Merge conflict in fs/dcache.c
Auto-merging fs/ceph/dir.c
Auto-merging fs/btrfs/ioctl.c
CONFLICT (content): Merge conflict in fs/btrfs/ioctl.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 7e588485829a] Merge remote-tracking branch 'userns/for-next'
$ git diff -M --stat --summary HEAD^..
 fs/afs/dir.c           |   5 --
 fs/btrfs/ioctl.c       |   6 +--
 fs/ceph/dir.c          |   1 -
 fs/cifs/readdir.c      |   6 +--
 fs/dcache.c            | 140 ++++++++++++++++++-------------------------------
 fs/fuse/dir.c          |   7 +--
 fs/gfs2/dentry.c       |   3 --
 fs/kernfs/dir.c        |  11 ----
 fs/mount.h             |  22 ++++++++
 fs/namei.c             |  22 ++++----
 fs/namespace.c         | 130 +++++++++++++++++++++++++++++++++++++++++----
 fs/nfs/dir.c           |   7 +--
 fs/proc/base.c         |  10 +---
 fs/proc/fd.c           |   2 -
 include/linux/dcache.h |   3 +-
 kernel/acct.c          |  25 +++++++--
 16 files changed, 232 insertions(+), 168 deletions(-)
Merging ktest/for-next (4c16b1d6d5e0 ktest: Update documentation on config_bisect)
$ git merge ktest/for-next
Merge made by the 'recursive' strategy.
 tools/testing/ktest/ktest.pl    | 581 +++++++++++++++++++---------------------
 tools/testing/ktest/sample.conf |  65 ++---
 2 files changed, 297 insertions(+), 349 deletions(-)
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 (cdae1730d0c6 Merge branch 'clk-fixes' into clk-next)
$ git merge clk/clk-next
Merge made by the 'recursive' strategy.
 .../bindings/clock/clk-palmas-clk32kg-clocks.txt   |  35 +++
 drivers/clk/Kconfig                                |   7 +
 drivers/clk/Makefile                               |   1 +
 drivers/clk/at91/clk-main.c                        |   1 +
 drivers/clk/clk-palmas.c                           | 307 +++++++++++++++++++++
 drivers/clk/clk-ppc-corenet.c                      |   2 +-
 drivers/clk/clk-s2mps11.c                          |  33 +--
 drivers/clk/clk.c                                  | 116 +++-----
 drivers/clk/clkdev.c                               |   5 +-
 include/dt-bindings/mfd/palmas.h                   |  18 ++
 include/linux/clk-provider.h                       |   5 +
 11 files changed, 431 insertions(+), 99 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/clk-palmas-clk32kg-clocks.txt
 create mode 100644 drivers/clk/clk-palmas.c
 create mode 100644 include/dt-bindings/mfd/palmas.h
Merging random/dev (5458c2fecbb8 hw_random: fix sparse warning (NULL vs 0 for pointer))
$ git merge random/dev
Auto-merging drivers/char/random.c
Merge made by the 'recursive' strategy.
 drivers/char/hw_random/core.c |  78 +++++++++++++-
 drivers/char/random.c         | 234 ++++++++++++++++++++++++++----------------
 include/linux/hw_random.h     |   5 +
 3 files changed, 225 insertions(+), 92 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
Auto-merging lib/lzo/lzo1x_decompress_safe.c
Merge made by the 'recursive' strategy.
 lib/lzo/lzo1x_decompress_safe.c | 4 ++++
 lib/lzo/lzodefs.h               | 6 ++++++
 2 files changed, 10 insertions(+)
Merging aio/master (855ef0dec727 aio: kill the misleading rcu read locks in ioctx_add_table() and kill_ioctx())
$ git merge aio/master
Auto-merging fs/aio.c
Merge made by the 'recursive' strategy.
 fs/aio.c | 56 +++++++++++++++++++-------------------------------------
 1 file changed, 19 insertions(+), 37 deletions(-)
Merging llvmlinux/for-next (f9da455b93f6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next)
$ git merge llvmlinux/for-next
Already up-to-date.
Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states)
$ git merge powernv-cpuidle/powernv-cpuidle
Already up-to-date.
Merging rd-docs/master (cd3de83f1476 Linux 3.16-rc4)
$ git merge rd-docs/master
Already up-to-date.
Merging akpm-current/current (7407621ec9e0 fs/dlm/debug_fs.c: remove unnecessary null test before debugfs_remove)
$ git merge --no-ff akpm-current/current
Auto-merging scripts/basic/bin2c.c
Auto-merging net/xfrm/xfrm_policy.c
Auto-merging net/bridge/br_multicast.c
Auto-merging mm/slub.c
Auto-merging mm/memcontrol.c
Auto-merging kernel/fork.c
Auto-merging kernel/Makefile
Auto-merging init/Kconfig
Auto-merging include/scsi/scsi.h
Auto-merging include/linux/sched.h
Auto-merging include/linux/kernel.h
Auto-merging fs/proc/fd.c
Auto-merging fs/proc/base.c
Auto-merging fs/namespace.c
Auto-merging fs/cifs/smb2pdu.c
Auto-merging fs/cifs/smb2ops.c
Auto-merging fs/cifs/sess.c
Auto-merging fs/cifs/file.c
Auto-merging fs/cifs/cifssmb.c
Auto-merging drivers/staging/lustre/lustre/libcfs/hash.c
Auto-merging drivers/staging/android/binder.c
Auto-merging drivers/net/ethernet/intel/i40e/i40e_ethtool.c
Auto-merging drivers/leds/Kconfig
Auto-merging drivers/base/Kconfig
Auto-merging block/bio-integrity.c
Auto-merging arch/x86/mm/fault.c
Removing arch/x86/include/asm/scatterlist.h
Auto-merging arch/x86/Makefile
Auto-merging arch/x86/Kconfig
Removing arch/sparc/include/asm/scatterlist.h
Removing arch/score/include/asm/scatterlist.h
Removing arch/s390/include/asm/scatterlist.h
Removing arch/powerpc/kvm/book3s_hv_cma.h
Removing arch/powerpc/kvm/book3s_hv_cma.c
Auto-merging arch/powerpc/kvm/book3s_hv_builtin.c
Auto-merging arch/powerpc/kvm/book3s_64_mmu_hv.c
Removing arch/powerpc/include/asm/scatterlist.h
Auto-merging arch/powerpc/Kconfig
Removing arch/mn10300/include/asm/scatterlist.h
Removing arch/microblaze/include/asm/scatterlist.h
Removing arch/m32r/include/asm/scatterlist.h
Removing arch/ia64/include/asm/scatterlist.h
Removing arch/frv/include/asm/scatterlist.h
Removing arch/cris/include/asm/scatterlist.h
Auto-merging arch/arm64/Kconfig
Removing arch/arm/include/asm/scatterlist.h
Auto-merging arch/arm/Kconfig
Removing arch/alpha/include/asm/scatterlist.h
Auto-merging Makefile
Auto-merging MAINTAINERS
Auto-merging Documentation/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 CREDITS                                            |    7 +
 Documentation/ABI/testing/sysfs-fs-nilfs2          |  269 +++
 Documentation/RCU/whatisRCU.txt                    |    2 +-
 Documentation/cgroups/memcg_test.txt               |  160 +-
 Documentation/kernel-parameters.txt                |    8 +-
 Documentation/leds/leds-class.txt                  |    3 -
 Documentation/oops-tracing.txt                     |    2 +
 Documentation/printk-formats.txt                   |    6 +
 Documentation/sysctl/kernel.txt                    |    1 +
 .../trace/postprocess/trace-vmscan-postprocess.pl  |   53 +
 MAINTAINERS                                        |   19 +-
 Makefile                                           |   19 +
 arch/alpha/include/asm/Kbuild                      |    1 +
 arch/alpha/include/asm/scatterlist.h               |    6 -
 arch/arm/Kconfig                                   |    3 +
 arch/arm/include/asm/Kbuild                        |    1 +
 arch/arm/include/asm/scatterlist.h                 |   12 -
 arch/arm/mm/dma-mapping.c                          |    1 +
 arch/arm64/Kconfig                                 |    1 +
 arch/cris/include/asm/Kbuild                       |    1 +
 arch/cris/include/asm/scatterlist.h                |    6 -
 arch/frv/include/asm/Kbuild                        |    1 +
 arch/frv/include/asm/scatterlist.h                 |    6 -
 arch/ia64/Kconfig                                  |    3 +
 arch/ia64/include/asm/Kbuild                       |    1 +
 arch/ia64/include/asm/scatterlist.h                |    7 -
 arch/m32r/include/asm/Kbuild                       |    1 +
 arch/m32r/include/asm/scatterlist.h                |    6 -
 arch/m68k/Kconfig                                  |    2 +
 arch/m68k/kernel/sys_m68k.c                        |   18 +-
 arch/microblaze/include/asm/Kbuild                 |    1 +
 arch/microblaze/include/asm/scatterlist.h          |    1 -
 arch/mips/Kconfig                                  |    2 +
 arch/mn10300/include/asm/Kbuild                    |    1 +
 arch/mn10300/include/asm/scatterlist.h             |   16 -
 arch/powerpc/Kconfig                               |    3 +
 arch/powerpc/include/asm/Kbuild                    |    1 +
 arch/powerpc/include/asm/scatterlist.h             |   17 -
 arch/powerpc/kvm/Makefile                          |    1 -
 arch/powerpc/kvm/book3s_64_mmu_hv.c                |    4 +-
 arch/powerpc/kvm/book3s_hv_builtin.c               |   19 +-
 arch/powerpc/kvm/book3s_hv_cma.c                   |  240 ---
 arch/powerpc/kvm/book3s_hv_cma.h                   |   27 -
 arch/powerpc/mm/dma-noncoherent.c                  |    1 +
 arch/powerpc/platforms/44x/warp.c                  |    1 +
 arch/powerpc/platforms/52xx/efika.c                |    1 +
 arch/powerpc/platforms/amigaone/setup.c            |    1 +
 arch/s390/Kconfig                                  |    3 +
 arch/s390/include/asm/Kbuild                       |    1 +
 arch/s390/include/asm/scatterlist.h                |    3 -
 arch/score/include/asm/Kbuild                      |    1 +
 arch/score/include/asm/scatterlist.h               |    6 -
 arch/sh/Kconfig                                    |    2 +
 arch/sh/Makefile                                   |    3 +-
 arch/sh/drivers/dma/Kconfig                        |    5 +-
 arch/sh/include/cpu-sh4/cpu/dma-register.h         |    1 -
 arch/sh/include/cpu-sh4a/cpu/dma.h                 |    3 +-
 arch/sh/kernel/time.c                              |    4 +-
 arch/sh/mm/asids-debugfs.c                         |    4 +-
 arch/sparc/Kconfig                                 |    1 +
 arch/sparc/include/asm/Kbuild                      |    1 +
 arch/sparc/include/asm/scatterlist.h               |    8 -
 arch/tile/Kconfig                                  |    2 +
 arch/um/include/asm/Kbuild                         |    1 +
 arch/x86/Kbuild                                    |    4 +
 arch/x86/Kconfig                                   |    4 +
 arch/x86/Makefile                                  |    8 +
 arch/x86/include/asm/Kbuild                        |    3 +-
 arch/x86/include/asm/crash.h                       |    9 +
 arch/x86/include/asm/kexec-bzimage64.h             |    6 +
 arch/x86/include/asm/kexec.h                       |   45 +
 arch/x86/include/asm/numa.h                        |    1 -
 arch/x86/include/asm/pgtable_64.h                  |    3 +-
 arch/x86/include/asm/scatterlist.h                 |    8 -
 arch/x86/kernel/Makefile                           |    1 +
 arch/x86/kernel/crash.c                            |  563 +++++++
 arch/x86/kernel/kexec-bzimage64.c                  |  532 ++++++
 arch/x86/kernel/machine_kexec_64.c                 |  228 +++
 arch/x86/mm/fault.c                                |    2 +-
 arch/x86/mm/init_64.c                              |   36 +-
 arch/x86/mm/numa.c                                 |   34 +-
 arch/x86/purgatory/Makefile                        |   30 +
 arch/x86/purgatory/entry64.S                       |  101 ++
 arch/x86/purgatory/purgatory.c                     |   72 +
 arch/x86/purgatory/setup-x86_64.S                  |   58 +
 arch/x86/purgatory/sha256.c                        |  283 ++++
 arch/x86/purgatory/sha256.h                        |   22 +
 arch/x86/purgatory/stack.S                         |   19 +
 arch/x86/purgatory/string.c                        |   13 +
 arch/x86/syscalls/syscall_64.tbl                   |    1 +
 block/bio-integrity.c                              |    2 -
 block/genhd.c                                      |    2 +-
 crypto/zlib.c                                      |    8 +-
 drivers/ata/Kconfig                                |    1 +
 drivers/ata/libata-core.c                          |   72 +-
 drivers/base/Kconfig                               |   10 -
 drivers/base/dma-contiguous.c                      |  220 +--
 drivers/base/memory.c                              |   30 +-
 drivers/base/node.c                                |    2 +-
 drivers/block/zram/zram_drv.c                      |   93 +-
 drivers/block/zram/zram_drv.h                      |   29 +-
 drivers/firmware/efi/runtime-map.c                 |   21 +
 drivers/firmware/memmap.c                          |    6 +-
 drivers/gpu/drm/drm_hashtab.c                      |    2 +-
 drivers/hwmon/asus_atk0110.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/lguest/core.c                              |    7 +-
 drivers/misc/ti-st/st_core.c                       |    2 +-
 drivers/net/ethernet/intel/i40e/i40e_ethtool.c     |    2 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c   |    2 +-
 drivers/net/irda/donauboe.c                        |   15 +-
 drivers/parport/parport_ip32.c                     |    2 +-
 drivers/rtc/Kconfig                                |   19 +-
 drivers/rtc/interface.c                            |    2 +
 drivers/rtc/rtc-ds1343.c                           |   75 +-
 drivers/rtc/rtc-ds1742.c                           |    2 +-
 drivers/rtc/rtc-efi.c                              |   32 +-
 drivers/staging/android/binder.c                   |    4 +-
 drivers/staging/lustre/lustre/libcfs/hash.c        |    4 +-
 drivers/tty/Kconfig                                |    4 +
 drivers/tty/vt/keyboard.c                          |  110 +-
 drivers/video/backlight/backlight.c                |    2 -
 fs/adfs/adfs.h                                     |    1 +
 fs/adfs/dir.c                                      |    2 +-
 fs/adfs/dir_fplus.c                                |    9 +-
 fs/bfs/bfs.h                                       |    1 +
 fs/bfs/dir.c                                       |    4 +-
 fs/bfs/inode.c                                     |    8 +-
 fs/binfmt_elf.c                                    |   21 +-
 fs/cachefiles/bind.c                               |    6 +-
 fs/cachefiles/daemon.c                             |    6 +-
 fs/cifs/cifsacl.c                                  |    2 +-
 fs/cifs/cifssmb.c                                  |   20 +-
 fs/cifs/file.c                                     |    4 +-
 fs/cifs/sess.c                                     |    2 +-
 fs/cifs/smb2file.c                                 |    4 +-
 fs/cifs/smb2misc.c                                 |   38 +-
 fs/cifs/smb2ops.c                                  |    2 +-
 fs/cifs/smb2pdu.c                                  |    2 +-
 fs/cifs/smb2pdu.h                                  |   28 +-
 fs/coda/cache.c                                    |    2 +-
 fs/coda/coda_linux.c                               |    2 +-
 fs/coda/dir.c                                      |    3 +-
 fs/coda/file.c                                     |    2 +-
 fs/coda/inode.c                                    |    4 +-
 fs/coda/pioctl.c                                   |    2 +-
 fs/coda/psdev.c                                    |    2 +-
 fs/coda/upcall.c                                   |    2 +-
 fs/compat.c                                        |    2 +-
 fs/cramfs/inode.c                                  |   45 +-
 fs/cramfs/uncompress.c                             |   10 +-
 fs/dlm/debug_fs.c                                  |   15 +-
 fs/efs/namei.c                                     |   11 +-
 fs/exec.c                                          |    4 -
 fs/exofs/ore_raid.c                                |    2 +-
 fs/ext4/fsync.c                                    |    5 +-
 fs/hfsplus/catalog.c                               |   89 +-
 fs/hfsplus/dir.c                                   |   11 +-
 fs/hfsplus/hfsplus_fs.h                            |    4 +-
 fs/hfsplus/super.c                                 |    4 +-
 fs/hpfs/dnode.c                                    |   17 +-
 fs/isofs/Makefile                                  |    2 +
 fs/isofs/compress.c                                |   10 +-
 fs/isofs/export.c                                  |   11 +-
 fs/isofs/inode.c                                   |   88 +-
 fs/isofs/namei.c                                   |    5 +-
 fs/isofs/rock.c                                    |   44 +-
 fs/jffs2/compr_zlib.c                              |    7 +-
 fs/mpage.c                                         |   23 +-
 fs/namespace.c                                     |    2 +-
 fs/nilfs2/Makefile                                 |    2 +-
 fs/nilfs2/nilfs.h                                  |    8 +
 fs/nilfs2/super.c                                  |   11 +-
 fs/nilfs2/sysfs.c                                  | 1137 +++++++++++++
 fs/nilfs2/sysfs.h                                  |  176 ++
 fs/nilfs2/the_nilfs.c                              |   17 +-
 fs/nilfs2/the_nilfs.h                              |   20 +-
 fs/notify/inode_mark.c                             |    2 +-
 fs/notify/vfsmount_mark.c                          |    2 +-
 fs/ntfs/file.c                                     |    3 -
 fs/ocfs2/alloc.c                                   |   15 +-
 fs/ocfs2/aops.c                                    |   21 +-
 fs/ocfs2/cluster/quorum.c                          |   13 +-
 fs/ocfs2/cluster/tcp.c                             |   45 +-
 fs/ocfs2/cluster/tcp.h                             |    1 +
 fs/ocfs2/dlm/dlmdomain.c                           |    5 +-
 fs/ocfs2/dlm/dlmmaster.c                           |   12 +-
 fs/ocfs2/inode.c                                   |   10 +-
 fs/ocfs2/ioctl.c                                   |  129 +-
 fs/ocfs2/move_extents.c                            |    2 +-
 fs/ocfs2/refcounttree.c                            |    2 +-
 fs/ocfs2/slot_map.c                                |    2 +-
 fs/omfs/inode.c                                    |    2 +-
 fs/proc/base.c                                     |    8 +-
 fs/proc/fd.c                                       |    2 +-
 fs/proc/generic.c                                  |   32 +-
 fs/proc/internal.h                                 |    8 +-
 fs/proc/kcore.c                                    |    2 +-
 fs/proc/meminfo.c                                  |    2 +-
 fs/proc/proc_sysctl.c                              |    2 +-
 fs/proc/proc_tty.c                                 |    4 +-
 fs/proc/root.c                                     |    4 +-
 fs/proc/vmcore.c                                   |   89 +-
 fs/pstore/ram_core.c                               |    2 +-
 fs/qnx6/Makefile                                   |    1 +
 fs/qnx6/dir.c                                      |   26 +-
 fs/qnx6/inode.c                                    |   99 +-
 fs/qnx6/namei.c                                    |    6 +-
 fs/qnx6/qnx6.h                                     |   12 +-
 fs/qnx6/super_mmi.c                                |   22 +-
 fs/quota/kqid.c                                    |    2 +-
 fs/quota/netlink.c                                 |    3 +-
 fs/ramfs/file-nommu.c                              |    2 +-
 fs/reiserfs/dir.c                                  |    2 +-
 fs/reiserfs/do_balan.c                             |    2 +-
 fs/reiserfs/file.c                                 |    2 +-
 fs/reiserfs/ibalance.c                             |    2 +-
 fs/reiserfs/inode.c                                |    2 +-
 fs/reiserfs/ioctl.c                                |    2 +-
 fs/reiserfs/item_ops.c                             |    4 +-
 fs/reiserfs/lbalance.c                             |    2 +-
 fs/reiserfs/prints.c                               |    4 +-
 fs/reiserfs/procfs.c                               |    2 +-
 fs/reiserfs/stree.c                                |    2 +-
 fs/reiserfs/super.c                                |    9 +-
 fs/reiserfs/xattr.c                                |   22 +-
 fs/reiserfs/xattr_acl.c                            |    2 +-
 fs/reiserfs/xattr_security.c                       |    2 +-
 fs/reiserfs/xattr_trusted.c                        |    2 +-
 fs/reiserfs/xattr_user.c                           |    2 +-
 fs/romfs/super.c                                   |   23 +-
 fs/seq_file.c                                      |   30 +-
 fs/squashfs/file_direct.c                          |    2 +-
 fs/squashfs/super.c                                |    5 +-
 fs/ubifs/recovery.c                                |    1 -
 fs/ufs/Makefile                                    |    1 +
 fs/ufs/super.c                                     |  304 ++--
 fs/ufs/ufs.h                                       |   10 +-
 include/linux/bitmap.h                             |   62 +-
 include/linux/cma.h                                |   27 +
 include/linux/crc64_ecma.h                         |   56 +
 include/linux/decompress/bunzip2.h                 |    8 +-
 include/linux/decompress/generic.h                 |   10 +-
 include/linux/decompress/inflate.h                 |    8 +-
 include/linux/decompress/unlz4.h                   |    8 +-
 include/linux/decompress/unlzma.h                  |    8 +-
 include/linux/decompress/unlzo.h                   |    8 +-
 include/linux/decompress/unxz.h                    |    8 +-
 include/linux/dma-contiguous.h                     |   11 +-
 include/linux/efi.h                                |   19 +
 include/linux/fs.h                                 |    2 +-
 include/linux/gfp.h                                |    2 +-
 include/linux/glob.h                               |   10 +
 include/linux/huge_mm.h                            |    4 -
 include/linux/hugetlb.h                            |    1 -
 include/linux/input.h                              |   21 +
 include/linux/ioport.h                             |    6 +
 include/linux/kernel.h                             |   38 +-
 include/linux/kexec.h                              |  101 +-
 include/linux/klist.h                              |    2 +-
 include/linux/list.h                               |   14 +-
 include/linux/memblock.h                           |    4 +-
 include/linux/memcontrol.h                         |   98 +-
 include/linux/memory_hotplug.h                     |    9 +-
 include/linux/mm_types.h                           |    1 +
 include/linux/mmdebug.h                            |    2 +
 include/linux/mmzone.h                             |    2 +
 include/linux/page-flags.h                         |   21 +-
 include/linux/page_cgroup.h                        |   70 +-
 include/linux/pagemap.h                            |   12 +
 include/linux/rculist.h                            |    8 +-
 include/linux/scatterlist.h                        |    2 +-
 include/linux/sched.h                              |   13 +-
 include/linux/shm.h                                |   18 +-
 include/linux/slab.h                               |   14 +-
 include/linux/string.h                             |    1 +
 include/linux/swap.h                               |   16 +-
 include/linux/syscalls.h                           |    4 +
 include/linux/sysctl.h                             |    2 -
 include/linux/user_namespace.h                     |    6 +-
 include/linux/vmalloc.h                            |    2 +-
 include/linux/zbud.h                               |    2 +-
 include/linux/zlib.h                               |  122 +-
 include/linux/zpool.h                              |  224 +++
 include/scsi/scsi.h                                |    2 +-
 include/trace/events/migrate.h                     |    1 +
 include/uapi/linux/kexec.h                         |   11 +
 init/Kconfig                                       |   51 +-
 init/do_mounts.c                                   |   12 +-
 init/do_mounts_rd.c                                |   10 +-
 init/initramfs.c                                   |   58 +-
 ipc/shm.c                                          |   75 +-
 kernel/Makefile                                    |    2 +-
 kernel/auditfilter.c                               |    4 +-
 kernel/bounds.c                                    |    2 -
 kernel/events/uprobes.c                            |   15 +-
 kernel/fork.c                                      |   77 +-
 kernel/gcov/fs.c                                   |    3 +-
 kernel/kexec.c                                     | 1326 +++++++++++++--
 kernel/panic.c                                     |    1 +
 kernel/printk/printk.c                             |   57 +-
 kernel/resource.c                                  |  101 +-
 kernel/sys_ni.c                                    |    1 +
 kernel/sysctl.c                                    |    9 +-
 kernel/test_kprobes.c                              |   87 +-
 kernel/user_namespace.c                            |    6 +-
 kernel/watchdog.c                                  |   11 +-
 lib/Kconfig                                        |   47 +
 lib/Makefile                                       |    3 +
 lib/bitmap.c                                       |  111 +-
 lib/cmdline.c                                      |   15 +-
 lib/crc64_ecma.c                                   |  341 ++++
 lib/decompress.c                                   |    2 +-
 lib/decompress_bunzip2.c                           |   26 +-
 lib/decompress_inflate.c                           |   12 +-
 lib/decompress_unlz4.c                             |   83 +-
 lib/decompress_unlzma.c                            |   28 +-
 lib/decompress_unlzo.c                             |   12 +-
 lib/decompress_unxz.c                              |   10 +-
 lib/glob.c                                         |  287 ++++
 lib/idr.c                                          |   25 +-
 lib/kfifo.c                                        |    6 +-
 lib/klist.c                                        |    6 +-
 lib/list_sort.c                                    |   71 +-
 lib/scatterlist.c                                  |    4 +-
 lib/string_helpers.c                               |   15 +-
 lib/test-kstrtox.c                                 |    2 +-
 lib/vsprintf.c                                     |   20 +-
 lib/zlib_deflate/deflate.c                         |  143 --
 lib/zlib_inflate/inflate.c                         |  132 --
 mm/Kconfig                                         |   54 +-
 mm/Makefile                                        |    2 +
 mm/cma.c                                           |  335 ++++
 mm/compaction.c                                    |   17 +-
 mm/filemap.c                                       |   17 +-
 mm/huge_memory.c                                   |   63 +-
 mm/hugetlb.c                                       |  126 +-
 mm/hwpoison-inject.c                               |    3 +-
 mm/internal.h                                      |    2 +-
 mm/madvise.c                                       |    3 -
 mm/memcontrol.c                                    | 1769 ++++++++------------
 mm/memory-failure.c                                |   14 +-
 mm/memory.c                                        |   57 +-
 mm/memory_hotplug.c                                |   17 +-
 mm/migrate.c                                       |   44 +-
 mm/mmap.c                                          |    5 +
 mm/page_alloc.c                                    |   26 +-
 mm/readahead.c                                     |    3 +-
 mm/rmap.c                                          |   30 +-
 mm/shmem.c                                         |  151 +-
 mm/slab.c                                          |  553 +++---
 mm/slab.h                                          |   47 +-
 mm/slub.c                                          |  246 ++-
 mm/swap.c                                          |   50 +-
 mm/swap_state.c                                    |    8 +-
 mm/swapfile.c                                      |   21 +-
 mm/truncate.c                                      |   20 +-
 mm/util.c                                          |   30 +
 mm/vmalloc.c                                       |   30 +-
 mm/vmscan.c                                        |  160 +-
 mm/zbud.c                                          |  123 +-
 mm/zpool.c                                         |  207 +++
 mm/zsmalloc.c                                      |   85 +-
 mm/zswap.c                                         |   82 +-
 net/batman-adv/fragmentation.c                     |    2 +-
 net/bridge/br_multicast.c                          |    2 +-
 net/ipv4/fib_trie.c                                |    2 +-
 net/ipv6/addrlabel.c                               |    2 +-
 net/xfrm/xfrm_policy.c                             |    4 +-
 scripts/.gitignore                                 |    1 -
 scripts/Makefile                                   |    1 -
 scripts/basic/.gitignore                           |    1 +
 scripts/basic/Makefile                             |    1 +
 scripts/{ => basic}/bin2c.c                        |    7 +-
 scripts/checkpatch.pl                              |  431 ++++-
 scripts/checkstack.pl                              |   12 +-
 scripts/coccinelle/free/ifnullfree.cocci           |   54 +
 scripts/tags.sh                                    |    2 +
 382 files changed, 11299 insertions(+), 5181 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-fs-nilfs2
 delete mode 100644 arch/alpha/include/asm/scatterlist.h
 delete mode 100644 arch/arm/include/asm/scatterlist.h
 delete mode 100644 arch/cris/include/asm/scatterlist.h
 delete mode 100644 arch/frv/include/asm/scatterlist.h
 delete mode 100644 arch/ia64/include/asm/scatterlist.h
 delete mode 100644 arch/m32r/include/asm/scatterlist.h
 delete mode 100644 arch/microblaze/include/asm/scatterlist.h
 delete mode 100644 arch/mn10300/include/asm/scatterlist.h
 delete mode 100644 arch/powerpc/include/asm/scatterlist.h
 delete mode 100644 arch/powerpc/kvm/book3s_hv_cma.c
 delete mode 100644 arch/powerpc/kvm/book3s_hv_cma.h
 delete mode 100644 arch/s390/include/asm/scatterlist.h
 delete mode 100644 arch/score/include/asm/scatterlist.h
 delete mode 100644 arch/sparc/include/asm/scatterlist.h
 create mode 100644 arch/x86/include/asm/crash.h
 create mode 100644 arch/x86/include/asm/kexec-bzimage64.h
 delete mode 100644 arch/x86/include/asm/scatterlist.h
 create mode 100644 arch/x86/kernel/kexec-bzimage64.c
 create mode 100644 arch/x86/purgatory/Makefile
 create mode 100644 arch/x86/purgatory/entry64.S
 create mode 100644 arch/x86/purgatory/purgatory.c
 create mode 100644 arch/x86/purgatory/setup-x86_64.S
 create mode 100644 arch/x86/purgatory/sha256.c
 create mode 100644 arch/x86/purgatory/sha256.h
 create mode 100644 arch/x86/purgatory/stack.S
 create mode 100644 arch/x86/purgatory/string.c
 create mode 100644 drivers/input/leds.c
 create mode 100644 fs/nilfs2/sysfs.c
 create mode 100644 fs/nilfs2/sysfs.h
 create mode 100644 include/linux/cma.h
 create mode 100644 include/linux/crc64_ecma.h
 create mode 100644 include/linux/glob.h
 create mode 100644 include/linux/zpool.h
 create mode 100644 lib/crc64_ecma.c
 create mode 100644 lib/glob.c
 create mode 100644 mm/cma.c
 create mode 100644 mm/zpool.c
 rename scripts/{ => basic}/bin2c.c (88%)
 create mode 100644 scripts/coccinelle/free/ifnullfree.cocci
$ 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: drivers/gpio/gpio-zevio.c: fix build
Applying: init/main.c: code clean-up
Applying: arch/arm/mach-omap2: replace strict_strto* with kstrto*
Applying: arch/arm/mach-pxa: replace strict_strto call with kstrto
Applying: arch/arm/mach-s3c24xx/mach-jive.c: replace strict_strto* with kstrto*
Applying: arch/arm/mach-w90x900/cpu.c: replace obsolete strict_strto
Applying: arch/powerpc: replace obsolete strict_strto* calls
Applying: arch/x86: replace strict_strto calls
Applying: drivers/scsi: replace strict_strto calls
Applying: include/linux: remove strict_strto* definitions
Applying: pci-dma-compat: add pci_zalloc_consistent helper
Applying: atm: use pci_zalloc_consistent
Applying: block: use pci_zalloc_consistent
Applying: crypto: use pci_zalloc_consistent
Applying: infiniband: use pci_zalloc_consistent
Applying: i810: use pci_zalloc_consistent
Applying: media: use pci_zalloc_consistent
Applying: amd: use pci_zalloc_consistent
Applying: atl1e: use pci_zalloc_consistent
Applying: enic: use pci_zalloc_consistent
Applying: sky2: use pci_zalloc_consistent
Applying: micrel: use pci_zalloc_consistent
Applying: qlogic: use pci_zalloc_consistent
Applying: irda: use pci_zalloc_consistent
Applying: ipw2100: use pci_zalloc_consistent
Applying: mwl8k: use pci_zalloc_consistent
Applying: rtl818x: use pci_zalloc_consistent
Applying: rtlwifi: use pci_zalloc_consistent
Applying: scsi: use pci_zalloc_consistent
Applying: staging: use pci_zalloc_consistent
Applying: synclink_gt: use pci_zalloc_consistent
Applying: vme: bridges: use pci_zalloc_consistent
Applying: drivers/net/ethernet/amd/pcnet32.c: neaten and remove unnecessary OOM messages
Applying: kernel/posix-timers.c: code clean-up
Applying: kernel-posix-timersc-code-clean-up-checkpatch-fixes
Applying: MAINTAINERS: update microcode patterns
Applying: MAINTAINERS: update cifs location
Applying: MAINTAINERS: use the correct efi-stub location
Applying: MAINTAINERS: update clk/sirf patterns
Applying: MAINTAINERS: fix ssbi pattern
Applying: MAINTAINERS: use correct filename for sdhci-bcm-kona
Applying: MAINTAINERS: fix PXA3xx NAND FLASH DRIVER pattern
Applying: MAINTAINERS: update picoxcell patterns
Applying: MAINTAINERS: remove section CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER
Applying: MAINTAINERS: remove METAG imgdafs pattern
Applying: MAINTAINERS: remove unused radeon drm pattern
Applying: MAINTAINERS: remove unusd ARM/QUALCOMM MSM pattern
Applying: MAINTAINERS: remove unused NFSD pattern
Applying: kernel/kprobes.c: convert printk to pr_foo()
Applying: mm: replace remap_file_pages() syscall with emulation
Applying: mm-replace-remap_file_pages-syscall-with-emulation-fix
Applying: mm: remap_file_pages: initialize populate before usage
Applying: mm: remap_file_pages: grab file ref to prevent race while mmaping
Applying: memcg: deprecate memory.force_empty knob
Applying: memcg-deprecate-memoryforce_empty-knob-fix
Applying: fat: add i_disksize to represent uninitialized size
Applying: fat: add fat_fallocate operation
Applying: fat: zero out seek range on _fat_get_block
Applying: fat: fallback to buffered write in case of fallocated region on direct IO
Applying: fat: permit to return phy block number by fibmap in fallocated region
Applying: Documentation/filesystems/vfat.txt: update the limitation for fat fallocate
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
Applying: mm: add strictlimit knob
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
 + f96adb0500b6...318cd2a4dcdc akpm       -> akpm/master  (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (318cd2a4dcdc mm: add strictlimit knob)
$ git merge --no-ff akpm/master
Removing mm/fremap.c
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-class-bdi          |   8 +
 Documentation/cgroups/memory.txt                   |   3 +
 Documentation/filesystems/vfat.txt                 |  10 +
 Documentation/vm/remap_file_pages.txt              |   7 +-
 MAINTAINERS                                        |  32 +--
 arch/arm/mach-omap2/board-omap3touchbook.c         |   2 +-
 arch/arm/mach-omap2/mux.c                          |  22 +-
 arch/arm/mach-pxa/balloon3.c                       |   2 +-
 arch/arm/mach-pxa/viper.c                          |   2 +-
 arch/arm/mach-s3c24xx/mach-jive.c                  |   2 +-
 arch/arm/mach-w90x900/cpu.c                        |   3 +-
 arch/powerpc/kernel/setup_64.c                     |   6 +-
 arch/powerpc/kernel/vio.c                          |   2 +-
 arch/powerpc/platforms/pseries/dlpar.c             |   4 +-
 arch/powerpc/platforms/pseries/mobility.c          |   2 +-
 arch/x86/kernel/cpu/intel_cacheinfo.c              |   4 +-
 arch/x86/kernel/cpu/mcheck/mce.c                   |   6 +-
 arch/x86/kernel/cpu/mcheck/mce_amd.c               |   4 +-
 arch/x86/kvm/mmu_audit.c                           |   2 +-
 arch/x86/platform/uv/tlb_uv.c                      |   2 +-
 drivers/atm/he.c                                   |  31 ++-
 drivers/atm/idt77252.c                             |  15 +-
 drivers/block/DAC960.c                             |  18 +-
 drivers/block/cciss.c                              |  11 +-
 drivers/block/skd_main.c                           |  25 +-
 drivers/crypto/hifn_795x.c                         |   5 +-
 drivers/gpio/gpio-zevio.c                          |   4 +
 drivers/gpu/drm/i810/i810_dma.c                    |   5 +-
 drivers/infiniband/hw/amso1100/c2.c                |   6 +-
 drivers/infiniband/hw/nes/nes_hw.c                 |  12 +-
 drivers/infiniband/hw/nes/nes_verbs.c              |   5 +-
 drivers/media/common/saa7146/saa7146_core.c        |  15 +-
 drivers/media/common/saa7146/saa7146_fops.c        |   5 +-
 drivers/media/pci/bt8xx/bt878.c                    |  16 +-
 drivers/media/pci/ngene/ngene-core.c               |   7 +-
 drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c  |  11 +-
 drivers/media/usb/ttusb-dec/ttusb_dec.c            |  11 +-
 drivers/net/ethernet/amd/pcnet32.c                 |  45 ++--
 drivers/net/ethernet/atheros/atl1e/atl1e_main.c    |   7 +-
 drivers/net/ethernet/cisco/enic/vnic_dev.c         |   8 +-
 drivers/net/ethernet/marvell/sky2.c                |   5 +-
 drivers/net/ethernet/micrel/ksz884x.c              |   7 +-
 .../net/ethernet/qlogic/netxen/netxen_nic_ctx.c    |   4 +-
 drivers/net/ethernet/qlogic/qlge/qlge_main.c       |  11 +-
 drivers/net/irda/vlsi_ir.c                         |   4 +-
 drivers/net/wireless/ipw2x00/ipw2100.c             |  16 +-
 drivers/net/wireless/mwl8k.c                       |   6 +-
 drivers/net/wireless/rtl818x/rtl8180/dev.c         |  11 +-
 drivers/net/wireless/rtlwifi/pci.c                 |  17 +-
 drivers/scsi/3w-sas.c                              |   5 +-
 drivers/scsi/a100u2w.c                             |   8 +-
 drivers/scsi/be2iscsi/be_main.c                    |  10 +-
 drivers/scsi/be2iscsi/be_mgmt.c                    |   3 +-
 drivers/scsi/csiostor/csio_wr.c                    |   8 +-
 drivers/scsi/eata.c                                |   5 +-
 drivers/scsi/hpsa.c                                |   8 +-
 drivers/scsi/megaraid/megaraid_mbox.c              |  16 +-
 drivers/scsi/megaraid/megaraid_sas_base.c          |   8 +-
 drivers/scsi/mesh.c                                |   6 +-
 drivers/scsi/mvumi.c                               |   9 +-
 drivers/scsi/pm8001/pm8001_sas.c                   |   5 +-
 drivers/scsi/pmcraid.c                             |   4 +-
 drivers/scsi/scsi_sysfs.c                          |   4 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c       |  15 +-
 drivers/staging/rtl8192ee/pci.c                    |  37 +--
 drivers/staging/rtl8821ae/pci.c                    |  36 +--
 drivers/staging/slicoss/slicoss.c                  |   9 +-
 drivers/staging/vt6655/device_main.c               |  40 +--
 drivers/tty/synclink_gt.c                          |   5 +-
 drivers/vme/bridges/vme_ca91cx42.c                 |   6 +-
 drivers/vme/bridges/vme_tsi148.c                   |   6 +-
 drivers/w1/w1_int.c                                |   3 +-
 fs/fat/cache.c                                     |  70 +++--
 fs/fat/fat.h                                       |   6 +-
 fs/fat/file.c                                      |  78 +++++-
 fs/fat/inode.c                                     |  87 ++++++-
 include/asm-generic/pci-dma-compat.h               |   8 +
 include/linux/fs.h                                 |   8 +-
 include/linux/kernel.h                             |   4 -
 init/main.c                                        |  23 +-
 kernel/kprobes.c                                   |  36 +--
 kernel/time/posix-timers.c                         |  57 +++--
 mm/Makefile                                        |   2 +-
 mm/backing-dev.c                                   |  35 +++
 mm/fremap.c                                        | 283 ---------------------
 mm/memcontrol.c                                    |   5 +
 mm/mmap.c                                          |  69 +++++
 mm/nommu.c                                         |   8 -
 88 files changed, 689 insertions(+), 814 deletions(-)
 delete mode 100644 mm/fremap.c