Next/merge.log

   1 $ date
   2 Thursday 16 January  09:56:45 EST 2014
   3 $ git checkout master
   4 Already on 'master'
   5 $ git reset --hard stable
   6 HEAD is now at a6da83f98267 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
   7 Merging origin/master (2e67c56248b7 Merge branch 'akpm' (incoming from Andrew))
   8 $ git merge origin/master
   9 Updating a6da83f98267..2e67c56248b7
  10 Fast-forward
  11  arch/mips/include/asm/cacheops.h                   |  2 +-
  12  arch/mips/include/asm/r4kcache.h                   | 51 +++++++++++-----------
  13  arch/mips/mm/c-r4k.c                               | 11 ++++-
  14  drivers/gpu/drm/drm_modes.c                        |  2 +-
  15  drivers/gpu/drm/i915/i915_irq.c                    |  2 +
  16  drivers/gpu/drm/i915/intel_ddi.c                   |  8 +++-
  17  drivers/gpu/drm/i915/intel_display.c               |  4 +-
  18  drivers/gpu/drm/nouveau/core/include/subdev/i2c.h  |  2 +-
  19  .../gpu/drm/nouveau/core/include/subdev/instmem.h  |  7 +++
  20  drivers/gpu/drm/nouveau/core/subdev/i2c/base.c     |  4 +-
  21  drivers/gpu/drm/nouveau/core/subdev/therm/ic.c     | 10 ++---
  22  drivers/gpu/drm/nouveau/dispnv04/dfp.c             |  2 +-
  23  drivers/gpu/drm/nouveau/dispnv04/tvnv04.c          |  2 +-
  24  drivers/md/md.c                                    | 18 ++++++--
  25  drivers/md/md.h                                    |  3 ++
  26  drivers/md/raid1.c                                 |  3 +-
  27  drivers/md/raid10.c                                | 12 ++---
  28  drivers/md/raid5.c                                 |  7 +--
  29  fs/nilfs2/segment.c                                | 10 +++--
  30  include/linux/crash_dump.h                         |  2 +
  31  lib/percpu_counter.c                               |  4 +-
  32  mm/util.c                                          |  5 ++-
  33  22 files changed, 108 insertions(+), 63 deletions(-)
  34 Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator)
  35 $ git merge fixes/master
  36 Already up-to-date.
  37 Merging kbuild-current/rc-fixes (19514fc665ff arm, kbuild: make "make install" not depend on vmlinux)
  38 $ git merge kbuild-current/rc-fixes
  39 Already up-to-date.
  40 Merging arc-current/for-curr (1e01c7eb7c43 ARC: Allow conditional multiple inclusion of uapi/asm/unistd.h)
  41 $ git merge arc-current/for-curr
  42 Already up-to-date.
  43 Merging arm-current/fixes (b25f3e1c3584 ARM: 7938/1: OMAP4/highbank: Flush L2 cache before disabling)
  44 $ git merge arm-current/fixes
  45 Auto-merging arch/arm/mach-omap2/omap4-common.c
  46 Auto-merging arch/arm/mach-highbank/highbank.c
  47 Merge made by the 'recursive' strategy.
  48  arch/arm/kernel/devtree.c          | 2 +-
  49  arch/arm/kernel/perf_event_cpu.c   | 2 +-
  50  arch/arm/kernel/traps.c            | 5 +++--
  51  arch/arm/mach-highbank/highbank.c  | 1 +
  52  arch/arm/mach-omap2/omap4-common.c | 1 +
  53  arch/arm/mm/init.c                 | 2 +-
  54  6 files changed, 8 insertions(+), 5 deletions(-)
  55 Merging m68k-current/for-linus (77a42796786c m68k: Remove deprecated IRQF_DISABLED)
  56 $ git merge m68k-current/for-linus
  57 Already up-to-date.
  58 Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2)
  59 $ git merge metag-fixes/fixes
  60 Already up-to-date.
  61 Merging powerpc-merge/merge (b3084f4db3ae powerpc/thp: Fix crash on mremap)
  62 $ git merge powerpc-merge/merge
  63 Merge made by the 'recursive' strategy.
  64  arch/powerpc/include/asm/pgtable-ppc64.h | 14 ++++++++++++++
  65  include/asm-generic/pgtable.h            | 12 ++++++++++++
  66  mm/huge_memory.c                         | 14 +++++---------
  67  3 files changed, 31 insertions(+), 9 deletions(-)
  68 Merging sparc/master (ef350bb7c5e0 Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
  69 $ git merge sparc/master
  70 Already up-to-date.
  71 Merging net/master (51bb352f1559 qlge: Fix vlan netdev features.)
  72 $ git merge net/master
  73 Merge made by the 'recursive' strategy.
  74  MAINTAINERS                                  |  3 +++
  75  drivers/net/ethernet/chelsio/cxgb4/l2t.c     |  2 +-
  76  drivers/net/ethernet/qlogic/qlge/qlge_main.c |  2 ++
  77  drivers/net/usb/dm9601.c                     | 12 ++++++++++++
  78  drivers/net/usb/usbnet.c                     |  2 +-
  79  net/ieee802154/nl-phy.c                      |  6 ++++--
  80  net/ipv4/inet_diag.c                         |  5 ++++-
  81  net/ipv4/ipmr.c                              |  7 +++++--
  82  net/ipv6/ip6mr.c                             |  7 +++++--
  83  9 files changed, 37 insertions(+), 9 deletions(-)
  84 Merging ipsec/master (965cdea82569 dccp: catch failed request_module call in dccp_probe init)
  85 $ git merge ipsec/master
  86 Already up-to-date.
  87 Merging sound-current/for-linus (150116bcfbd9 ALSA: hiface: Fix typo in 352800 rate definition)
  88 $ git merge sound-current/for-linus
  89 Merge made by the 'recursive' strategy.
  90  sound/usb/hiface/pcm.c | 6 +++---
  91  1 file changed, 3 insertions(+), 3 deletions(-)
  92 Merging pci-current/for-linus (f0b75693cbb2 MAINTAINERS: Add DesignWare, i.MX6, Armada, R-Car PCI host maintainers)
  93 $ git merge pci-current/for-linus
  94 Already up-to-date.
  95 Merging wireless/master (2eff7c791a18 Merge tag 'nfc-fixes-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes)
  96 $ git merge wireless/master
  97 Already up-to-date.
  98 Merging driver-core.current/driver-core-linus (413541dd66d5 Linux 3.13-rc5)
  99 $ git merge driver-core.current/driver-core-linus
 100 Already up-to-date.
 101 Merging tty.current/tty-linus (413541dd66d5 Linux 3.13-rc5)
 102 $ git merge tty.current/tty-linus
 103 Already up-to-date.
 104 Merging usb.current/usb-linus (413541dd66d5 Linux 3.13-rc5)
 105 $ git merge usb.current/usb-linus
 106 Already up-to-date.
 107 Merging staging.current/staging-linus (413541dd66d5 Linux 3.13-rc5)
 108 $ git merge staging.current/staging-linus
 109 Already up-to-date.
 110 Merging char-misc.current/char-misc-linus (802eee95bde7 Linux 3.13-rc6)
 111 $ git merge char-misc.current/char-misc-linus
 112 Already up-to-date.
 113 Merging input-current/for-linus (8e2f2325b73f Input: xpad - add new USB IDs for Logitech F310 and F710)
 114 $ git merge input-current/for-linus
 115 Merge made by the 'recursive' strategy.
 116  drivers/input/joystick/xpad.c | 6 ++++--
 117  1 file changed, 4 insertions(+), 2 deletions(-)
 118 Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
 119 $ git merge md-current/for-linus
 120 Already up-to-date.
 121 Merging crypto-current/master (efb753b8e013 crypto: ixp4xx - Fix kernel compile error)
 122 $ git merge crypto-current/master
 123 Already up-to-date.
 124 Merging ide/master (c2f7d1e103ef ide: pmac: remove unnecessary pci_set_drvdata())
 125 $ git merge ide/master
 126 Already up-to-date.
 127 Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
 128 $ git merge dwmw2/master
 129 Already up-to-date.
 130 Merging sh-current/sh-fixes-for-linus (44033109e99c SH: Convert out[bwl] macros to inline functions)
 131 $ git merge sh-current/sh-fixes-for-linus
 132 Already up-to-date.
 133 Merging devicetree-current/devicetree/merge (6f041e99fc7b of: Fix NULL dereference in unflatten_and_copy())
 134 $ git merge devicetree-current/devicetree/merge
 135 Already up-to-date.
 136 Merging rr-fixes/fixes (7122c3e9154b scripts/link-vmlinux.sh: only filter kernel symbols for arm)
 137 $ git merge rr-fixes/fixes
 138 Already up-to-date.
 139 Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts before cancelling delayed works)
 140 $ git merge mfd-fixes/master
 141 Already up-to-date.
 142 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)
 143 $ git merge vfio-fixes/for-linus
 144 Already up-to-date.
 145 Merging drm-intel-fixes/for-linux-next-fixes (09f2344d0896 drm/i915/bdw: make sure south port interrupts are enabled properly v2)
 146 $ git merge drm-intel-fixes/for-linux-next-fixes
 147 Already up-to-date.
 148 Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu)
 149 $ git merge asm-generic/master
 150 Already up-to-date.
 151 Merging arc/for-next (d8e8c7dda11f ARC: [SMP] optimize IPI send and receive)
 152 $ git merge arc/for-next
 153 Merge made by the 'recursive' strategy.
 154  arch/arc/include/asm/smp.h  |   8 +--
 155  arch/arc/kernel/smp.c       | 124 +++++++++++++++++++++++++-------------------
 156  arch/arc/plat-arcfpga/smp.c |  12 ++---
 157  3 files changed, 78 insertions(+), 66 deletions(-)
 158 Merging arm/for-next (4a9fcd956bbc Merge branch 'devel-stable' into for-next)
 159 $ git merge arm/for-next
 160 Merge made by the 'recursive' strategy.
 161  Documentation/devicetree/bindings/arm/l2cc.txt   |  23 +-
 162  arch/arm/Kconfig                                 |  14 +-
 163  arch/arm/Kconfig.debug                           |  39 ++-
 164  arch/arm/boot/compressed/Makefile                |  15 +-
 165  arch/arm/common/mcpm_entry.c                     |   7 +-
 166  arch/arm/include/asm/bitops.h                    |  54 +++-
 167  arch/arm/include/asm/cacheflush.h                |   5 +
 168  arch/arm/include/asm/checksum.h                  |  34 ++-
 169  arch/arm/include/asm/hardware/cache-l2x0.h       |   1 +
 170  arch/arm/include/asm/mach/map.h                  |  27 +-
 171  arch/arm/include/asm/pci.h                       |   5 +-
 172  arch/arm/include/asm/pgtable-2level.h            |   1 +
 173  arch/arm/include/asm/pgtable-3level.h            |   1 +
 174  arch/arm/include/asm/pgtable.h                   |   2 +
 175  arch/arm/include/asm/word-at-a-time.h            |  18 +-
 176  arch/arm/kernel/armksyms.c                       |   4 +
 177  arch/arm/kernel/entry-v7m.S                      |   2 -
 178  arch/arm/kernel/etm.c                            |   6 -
 179  arch/arm/kernel/setup.c                          |  57 ++--
 180  arch/arm/kernel/smp.c                            |   6 +-
 181  arch/arm/kernel/tcm.c                            |   4 +-
 182  arch/arm/kernel/topology.c                       |  12 +-
 183  arch/arm/kernel/traps.c                          |   2 +-
 184  arch/arm/lib/Makefile                            |   2 +-
 185  arch/arm/lib/backtrace.S                         |  20 +-
 186  arch/arm/lib/bswapsdi2.S                         |  36 +++
 187  arch/arm/mach-at91/setup.c                       |   2 +-
 188  arch/arm/mach-footbridge/common.c                |   5 -
 189  arch/arm/mach-footbridge/common.h                |   2 +
 190  arch/arm/mach-footbridge/dc21285-timer.c         |  39 ++-
 191  arch/arm/mach-footbridge/ebsa285.c               |  18 +-
 192  arch/arm/mach-footbridge/include/mach/hardware.h |   6 +-
 193  arch/arm/mach-omap2/io.c                         |   4 +-
 194  arch/arm/mach-omap2/omap4-common.c               |   2 +-
 195  arch/arm/mach-sa1100/assabet.c                   | 145 +++++++++-
 196  arch/arm/mach-sa1100/collie.c                    |  35 +++
 197  arch/arm/mach-sa1100/h3100.c                     |  54 +++-
 198  arch/arm/mach-sa1100/h3600.c                     |  74 +++--
 199  arch/arm/mach-sa1100/include/mach/assabet.h      |   6 +-
 200  arch/arm/mach-ux500/setup.h                      |   2 +-
 201  arch/arm/mm/Makefile                             |   1 +
 202  arch/arm/mm/cache-l2x0.c                         |  48 +++-
 203  arch/arm/mm/cache-tauros3.h                      |  41 +++
 204  arch/arm/mm/cache-v7.S                           |  14 +-
 205  arch/arm/mm/context.c                            |  41 +--
 206  arch/arm/mm/dma-mapping.c                        |   6 +-
 207  arch/arm/mm/dump.c                               | 345 +++++++++++++++++++++++
 208  arch/arm/mm/init.c                               |  62 +---
 209  arch/arm/mm/ioremap.c                            |   4 +-
 210  arch/arm/mm/mmu.c                                | 126 +++++++--
 211  arch/arm/mm/pgd.c                                |   2 +-
 212  drivers/amba/bus.c                               | 213 ++------------
 213  drivers/input/serio/ambakmi.c                    |   2 -
 214  drivers/mmc/host/mmci.c                          |   2 -
 215  54 files changed, 1177 insertions(+), 521 deletions(-)
 216  create mode 100644 arch/arm/lib/bswapsdi2.S
 217  create mode 100644 arch/arm/mm/cache-tauros3.h
 218  create mode 100644 arch/arm/mm/dump.c
 219 Merging arm-perf/for-next/perf (6ce4eac1f600 Linux 3.13-rc1)
 220 $ git merge arm-perf/for-next/perf
 221 Already up-to-date.
 222 Merging arm-soc/for-next (fb54a12a810e Merge branch 'next/dt' into for-next)
 223 $ git merge arm-soc/for-next
 224 Resolved 'arch/arm/Kconfig.debug' using previous resolution.
 225 Removing include/linux/platform_data/pinctrl-nomadik.h
 226 Removing include/linux/platform_data/clocksource-nomadik-mtu.h
 227 Auto-merging include/linux/clk/at91_pmc.h
 228 Auto-merging drivers/pinctrl/pinctrl-baytrail.c
 229 Auto-merging drivers/clk/samsung/clk-exynos4.c
 230 Auto-merging arch/arm/mach-ux500/setup.h
 231 Removing arch/arm/mach-ux500/devices.h
 232 Removing arch/arm/mach-ux500/devices.c
 233 Removing arch/arm/mach-ux500/devices-db8500.h
 234 Removing arch/arm/mach-ux500/devices-db8500.c
 235 Removing arch/arm/mach-ux500/board-mop500.c
 236 Removing arch/arm/mach-shmobile/board-kzm9d.c
 237 Removing arch/arm/mach-s3c64xx/dma.c
 238 Removing arch/arm/mach-omap2/mux2430.h
 239 Removing arch/arm/mach-omap2/mux2430.c
 240 Removing arch/arm/mach-omap2/mux2420.h
 241 Removing arch/arm/mach-omap2/mux2420.c
 242 Removing arch/arm/mach-omap2/board-h4.c
 243 Removing arch/arm/mach-omap2/board-2430sdp.c
 244 Auto-merging arch/arm/mach-exynos/regs-pmu.h
 245 Removing arch/arm/mach-exynos/include/mach/regs-irq.h
 246 Removing arch/arm/mach-exynos/include/mach/regs-clock.h
 247 Auto-merging arch/arm/mach-at91/setup.c
 248 Removing arch/arm/mach-at91/board-qil-a9260.c
 249 Removing arch/arm/boot/dts/r8a7790-lager-reference.dts
 250 Auto-merging arch/arm/boot/dts/keystone.dtsi
 251 Auto-merging arch/arm/boot/dts/exynos5250.dtsi
 252 Auto-merging arch/arm/boot/dts/exynos5250-cros-common.dtsi
 253 Auto-merging arch/arm/boot/compressed/Makefile
 254 Auto-merging arch/arm/Kconfig.debug
 255 CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug
 256 Auto-merging arch/arm/Kconfig
 257 Auto-merging MAINTAINERS
 258 Automatic merge failed; fix conflicts and then commit the result.
 259 $ git commit -v -a
 260 [master 5d64e4a2f6e6] Merge remote-tracking branch 'arm-soc/for-next'
 261 $ git diff -M --stat --summary HEAD^..
 262  Documentation/arm/Marvell/README                   |   24 +
 263  Documentation/devicetree/bindings/arm/arm-boards   |    8 +
 264  .../devicetree/bindings/arm/atmel-aic.txt          |    1 +
 265  .../devicetree/bindings/arm/atmel-at91.txt         |    3 +-
 266  .../arm/firmware/tlm,trusted-foundations.txt       |   20 +
 267  .../bindings/arm/hisilicon/hisilicon.txt           |   32 +
 268  .../devicetree/bindings/arm/marvell,berlin.txt     |   24 +
 269  Documentation/devicetree/bindings/arm/moxart.txt   |   12 +
 270  .../devicetree/bindings/arm/omap/omap.txt          |   53 +
 271  .../devicetree/bindings/arm/samsung/sysreg.txt     |    7 +-
 272  Documentation/devicetree/bindings/arm/tegra.txt    |    5 +
 273  .../bindings/arm/tegra/nvidia,tegra20-pmc.txt      |    1 +
 274  .../devicetree/bindings/arm/versatile-fpga-irq.txt |    5 +
 275  .../devicetree/bindings/clock/at91-clock.txt       |  339 ++++
 276  .../devicetree/bindings/clock/hi3620-clock.txt     |   19 +
 277  .../devicetree/bindings/clock/imx35-clock.txt      |  113 ++
 278  .../devicetree/bindings/clock/imx5-clock.txt       |  195 +--
 279  .../bindings/clock/nvidia,tegra114-car.txt         |    4 +
 280  .../bindings/clock/nvidia,tegra124-car.txt         |   63 +
 281  .../bindings/clock/nvidia,tegra20-car.txt          |    4 +
 282  .../bindings/clock/nvidia,tegra30-car.txt          |    4 +
 283  .../bindings/clock/renesas,cpg-div6-clocks.txt     |   28 +
 284  .../bindings/clock/renesas,cpg-mstp-clocks.txt     |   51 +
 285  .../clock/renesas,rcar-gen2-cpg-clocks.txt         |   32 +
 286  .../devicetree/bindings/crypto/atmel-crypto.txt    |   68 +
 287  .../devicetree/bindings/dma/ste-dma40.txt          |    3 +
 288  .../devicetree/bindings/dma/tegra20-apbdma.txt     |   14 +
 289  .../devicetree/bindings/gpio/gpio-davinci.txt      |   41 +
 290  .../bindings/gpu/nvidia,tegra20-host1x.txt         |  122 ++
 291  .../devicetree/bindings/i2c/i2c-mv64xxx.txt        |    6 +-
 292  .../devicetree/bindings/i2c/nvidia,tegra20-i2c.txt |   27 +-
 293  .../devicetree/bindings/i2c/trivial-devices.txt    |    1 +
 294  .../bindings/input/nvidia,tegra20-kbc.txt          |    9 +
 295  .../interrupt-controller/allwinner,sun4i-ic.txt    |    2 +-
 296  .../interrupt-controller/snps,dw-apb-ictl.txt      |   32 +
 297  .../devicetree/bindings/mmc/exynos-dw-mshc.txt     |    2 +
 298  .../bindings/mmc/nvidia,tegra20-sdhci.txt          |    9 +
 299  .../devicetree/bindings/nvec/nvidia,nvec.txt       |   12 +
 300  .../bindings/pci/nvidia,tegra20-pcie.txt           |   26 +-
 301  .../bindings/pinctrl/fsl,imx25-pinctrl.txt         |   23 +
 302  .../bindings/pinctrl/fsl,imx27-pinctrl.txt         |   22 +
 303  .../bindings/pinctrl/qcom,msm8x74-pinctrl.txt      |   92 ++
 304  .../bindings/pinctrl/renesas,pfc-pinctrl.txt       |   14 +
 305  .../devicetree/bindings/pwm/nvidia,tegra20-pwm.txt |    9 +
 306  .../devicetree/bindings/rtc/nvidia,tegra20-rtc.txt |    3 +
 307  .../devicetree/bindings/rtc/sunxi-rtc.txt          |   17 +
 308  .../bindings/serial/nvidia,tegra20-hsuart.txt      |   19 +-
 309  .../bindings/serial/renesas,sci-serial.txt         |   46 +
 310  .../bindings/sound/nvidia,tegra-audio-alc5632.txt  |    7 +-
 311  .../bindings/sound/nvidia,tegra-audio-rt5640.txt   |    7 +-
 312  .../bindings/sound/nvidia,tegra-audio-wm8753.txt   |    7 +-
 313  .../bindings/sound/nvidia,tegra-audio-wm8903.txt   |    7 +-
 314  .../bindings/sound/nvidia,tegra-audio-wm9712.txt   |    7 +-
 315  .../bindings/sound/nvidia,tegra20-ac97.txt         |   20 +-
 316  .../bindings/sound/nvidia,tegra20-i2s.txt          |   19 +-
 317  .../bindings/sound/nvidia,tegra30-ahub.txt         |   63 +-
 318  .../bindings/sound/nvidia,tegra30-i2s.txt          |   11 +-
 319  .../bindings/spi/nvidia,tegra114-spi.txt           |   24 +-
 320  .../bindings/spi/nvidia,tegra20-sflash.txt         |   20 +-
 321  .../bindings/spi/nvidia,tegra20-slink.txt          |   20 +-
 322  .../bindings/timer/nvidia,tegra20-timer.txt        |    3 +
 323  .../bindings/timer/nvidia,tegra30-timer.txt        |    3 +
 324  .../bindings/timer/samsung,exynos4210-mct.txt      |   54 +-
 325  .../devicetree/bindings/usb/keystone-phy.txt       |   20 +
 326  .../devicetree/bindings/usb/keystone-usb.txt       |   42 +
 327  .../bindings/usb/nvidia,tegra20-ehci.txt           |    7 +-
 328  .../devicetree/bindings/vendor-prefixes.txt        |    2 +
 329  MAINTAINERS                                        |   19 +-
 330  arch/arm/Kconfig                                   |   55 +-
 331  arch/arm/Kconfig.debug                             |   19 +
 332  arch/arm/Makefile                                  |    6 +-
 333  arch/arm/arm-soc-for-next-contents.txt             |  267 ++++
 334  arch/arm/boot/compressed/Makefile                  |    2 +-
 335  arch/arm/boot/dts/Makefile                         |   35 +-
 336  arch/arm/boot/dts/am3517-evm.dts                   |   29 +
 337  arch/arm/boot/dts/animeo_ip.dts                    |   31 +-
 338  arch/arm/boot/dts/armada-370-mirabox.dts           |   25 +-
 339  arch/arm/boot/dts/armada-370-netgear-rn102.dts     |  125 +-
 340  arch/arm/boot/dts/armada-370-netgear-rn104.dts     |  131 +-
 341  arch/arm/boot/dts/armada-370-rd.dts                |   21 +
 342  arch/arm/boot/dts/armada-370-xp.dtsi               |  167 +-
 343  arch/arm/boot/dts/armada-370.dtsi                  |   74 +-
 344  arch/arm/boot/dts/armada-xp-gp.dts                 |    8 +
 345  arch/arm/boot/dts/armada-xp-netgear-rn2120.dts     |  327 ++++
 346  arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts   |    3 +-
 347  arch/arm/boot/dts/armada-xp.dtsi                   |  100 +-
 348  arch/arm/boot/dts/armv7-m.dtsi                     |   18 +
 349  arch/arm/boot/dts/at91-cosino.dtsi                 |  122 ++
 350  arch/arm/boot/dts/at91-cosino_mega2560.dts         |   84 +
 351  arch/arm/boot/dts/at91-qil_a9260.dts               |  185 +++
 352  arch/arm/boot/dts/at91rm9200.dtsi                  |    4 +-
 353  arch/arm/boot/dts/at91rm9200ek.dts                 |   57 +-
 354  arch/arm/boot/dts/at91sam9263.dtsi                 |   46 +
 355  arch/arm/boot/dts/at91sam9263ek.dts                |   30 +
 356  arch/arm/boot/dts/at91sam9g45.dtsi                 |   76 +
 357  arch/arm/boot/dts/at91sam9m10g45ek.dts             |   54 +-
 358  arch/arm/boot/dts/at91sam9n12.dtsi                 |    9 +
 359  arch/arm/boot/dts/at91sam9x5.dtsi                  |    9 +
 360  arch/arm/boot/dts/atlas6.dtsi                      |   26 +
 361  arch/arm/boot/dts/bcm2835-rpi-b.dts                |    9 +-
 362  arch/arm/boot/dts/bcm2835.dtsi                     |    6 +
 363  arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts         |   29 +
 364  arch/arm/boot/dts/berlin2.dtsi                     |  227 +++
 365  arch/arm/boot/dts/berlin2cd-google-chromecast.dts  |   29 +
 366  arch/arm/boot/dts/berlin2cd.dtsi                   |  210 +++
 367  arch/arm/boot/dts/dove-cubox.dts                   |    2 +-
 368  arch/arm/boot/dts/dove.dtsi                        |  500 +++---
 369  arch/arm/boot/dts/efm32gg-dk3750.dts               |   86 +
 370  arch/arm/boot/dts/efm32gg.dtsi                     |  172 ++
 371  arch/arm/boot/dts/emev2-kzm9d.dts                  |   42 +-
 372  arch/arm/boot/dts/emev2.dtsi                       |  116 +-
 373  arch/arm/boot/dts/exynos4.dtsi                     |    6 +-
 374  arch/arm/boot/dts/exynos4210-origen.dts            |    2 +-
 375  arch/arm/boot/dts/exynos4210.dtsi                  |   23 +-
 376  arch/arm/boot/dts/exynos4212.dtsi                  |   24 +-
 377  arch/arm/boot/dts/exynos4412-odroidx.dts           |    5 +-
 378  arch/arm/boot/dts/exynos4412-origen.dts            |    7 +-
 379  arch/arm/boot/dts/exynos4412-tiny4412.dts          |   93 ++
 380  arch/arm/boot/dts/exynos4412-trats2.dts            |   20 +-
 381  arch/arm/boot/dts/exynos4412.dtsi                  |   35 +-
 382  arch/arm/boot/dts/exynos4x12.dtsi                  |   33 +
 383  arch/arm/boot/dts/exynos5.dtsi                     |   25 +-
 384  arch/arm/boot/dts/exynos5250-arndale.dts           |   64 +-
 385  ...250-common.dtsi => exynos5250-cros-common.dtsi} |   34 +-
 386  arch/arm/boot/dts/exynos5250-smdk5250.dts          |   62 +-
 387  arch/arm/boot/dts/exynos5250-snow.dts              |   16 +-
 388  arch/arm/boot/dts/exynos5250.dtsi                  |   60 +-
 389  arch/arm/boot/dts/exynos5420-arndale-octa.dts      |   66 +
 390  arch/arm/boot/dts/exynos5420-pinctrl.dtsi          |    2 +-
 391  arch/arm/boot/dts/exynos5420-smdk5420.dts          |   33 +
 392  arch/arm/boot/dts/exynos5420.dtsi                  |  346 +++-
 393  arch/arm/boot/dts/exynos5440.dtsi                  |    2 +-
 394  arch/arm/boot/dts/hi3620-hi4511.dts                |  649 ++++++++
 395  arch/arm/boot/dts/hi3620.dtsi                      |  565 +++++++
 396  arch/arm/boot/dts/integrator.dtsi                  |    5 +
 397  arch/arm/boot/dts/integratorcp.dts                 |    3 +
 398  arch/arm/boot/dts/k2hk-evm.dts                     |   63 +
 399  arch/arm/boot/dts/keystone-clocks.dtsi             |   36 +-
 400  arch/arm/boot/dts/{keystone.dts => keystone.dtsi}  |   35 +-
 401  arch/arm/boot/dts/kirkwood-6192.dtsi               |  107 ++
 402  arch/arm/boot/dts/kirkwood-6281.dtsi               |    4 +
 403  arch/arm/boot/dts/kirkwood-6282.dtsi               |   39 +-
 404  arch/arm/boot/dts/kirkwood-cloudbox.dts            |   10 +-
 405  arch/arm/boot/dts/kirkwood-db.dtsi                 |    4 +-
 406  arch/arm/boot/dts/kirkwood-dns320.dts              |   12 +-
 407  arch/arm/boot/dts/kirkwood-dns325.dts              |   12 +-
 408  arch/arm/boot/dts/kirkwood-dnskw.dtsi              |   18 +-
 409  arch/arm/boot/dts/kirkwood-dockstar.dts            |    6 +-
 410  arch/arm/boot/dts/kirkwood-dreamplug.dts           |    6 +-
 411  arch/arm/boot/dts/kirkwood-goflexnet.dts           |   24 +-
 412  .../arm/boot/dts/kirkwood-guruplug-server-plus.dts |   12 +-
 413  arch/arm/boot/dts/kirkwood-ib62x0.dts              |   18 +-
 414  arch/arm/boot/dts/kirkwood-iconnect.dts            |   28 +-
 415  arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts      |   22 +-
 416  arch/arm/boot/dts/kirkwood-km_kirkwood.dts         |    4 +-
 417  arch/arm/boot/dts/kirkwood-laplug.dts              |  175 ++
 418  arch/arm/boot/dts/kirkwood-lsxl.dtsi               |   30 +-
 419  arch/arm/boot/dts/kirkwood-mplcec4.dts             |   14 +-
 420  arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts     |   14 +-
 421  .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts  |  111 +-
 422  .../boot/dts/kirkwood-netgear_readynas_nv+_v2.dts  |  268 ++++
 423  arch/arm/boot/dts/kirkwood-ns2-common.dtsi         |    8 +-
 424  arch/arm/boot/dts/kirkwood-ns2lite.dts             |    4 +-
 425  arch/arm/boot/dts/kirkwood-ns2max.dts              |   10 +-
 426  arch/arm/boot/dts/kirkwood-ns2mini.dts             |   10 +-
 427  arch/arm/boot/dts/kirkwood-nsa310-common.dtsi      |    4 +-
 428  arch/arm/boot/dts/kirkwood-nsa310.dts              |   32 +-
 429  arch/arm/boot/dts/kirkwood-nsa310a.dts             |   30 +-
 430  arch/arm/boot/dts/kirkwood-openblocks_a6.dts       |   10 +-
 431  arch/arm/boot/dts/kirkwood-openblocks_a7.dts       |   10 +-
 432  arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi  |    2 +-
 433  arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts    |    8 +-
 434  arch/arm/boot/dts/kirkwood-sheevaplug.dts          |    8 +-
 435  arch/arm/boot/dts/kirkwood-topkick.dts             |   10 +-
 436  arch/arm/boot/dts/kirkwood-ts219-6281.dts          |    8 +-
 437  arch/arm/boot/dts/kirkwood-ts219-6282.dts          |    8 +-
 438  arch/arm/boot/dts/kirkwood.dtsi                    |  160 +-
 439  arch/arm/boot/dts/moxart-uc7112lx.dts              |  109 ++
 440  arch/arm/boot/dts/moxart.dtsi                      |  154 ++
 441  arch/arm/boot/dts/omap2.dtsi                       |    2 +-
 442  arch/arm/boot/dts/omap2420-n800.dts                |    8 +
 443  arch/arm/boot/dts/omap2420-n810-wimax.dts          |    8 +
 444  arch/arm/boot/dts/omap2420-n810.dts                |    8 +
 445  arch/arm/boot/dts/omap2420-n8x0-common.dtsi        |   99 ++
 446  arch/arm/boot/dts/omap2430-sdp.dts                 |   49 +
 447  arch/arm/boot/dts/omap3-beagle-xm.dts              |   40 +-
 448  arch/arm/boot/dts/omap3-beagle.dts                 |   40 +-
 449  arch/arm/boot/dts/omap3-cm-t3730.dts               |  104 ++
 450  arch/arm/boot/dts/omap3-cm-t3x30.dtsi              |   95 ++
 451  arch/arm/boot/dts/omap3-igep.dtsi                  |    2 -
 452  arch/arm/boot/dts/omap3-igep0020.dts               |   52 +-
 453  arch/arm/boot/dts/omap3-igep0030.dts               |   10 +-
 454  arch/arm/boot/dts/omap3-ldp.dts                    |  231 +++
 455  arch/arm/boot/dts/omap3-sb-t35.dtsi                |   40 +
 456  arch/arm/boot/dts/omap3-sbc-t3730.dts              |   30 +
 457  arch/arm/boot/dts/omap3-zoom3.dts                  |   23 +-
 458  arch/arm/boot/dts/omap3.dtsi                       |    2 +-
 459  arch/arm/boot/dts/omap34xx.dtsi                    |   13 +
 460  arch/arm/boot/dts/omap36xx.dtsi                    |   11 +
 461  .../dts/orion5x-lacie-ethernet-disk-mini-v2.dts    |    2 +-
 462  arch/arm/boot/dts/orion5x.dtsi                     |  106 +-
 463  arch/arm/boot/dts/prima2.dtsi                      |   41 +
 464  arch/arm/boot/dts/pxa27x.dtsi                      |   24 +
 465  arch/arm/boot/dts/qcom-apq8074-dragonboard.dts     |    6 +
 466  arch/arm/boot/dts/qcom-msm8660-surf.dts            |    4 +-
 467  arch/arm/boot/dts/qcom-msm8960-cdp.dts             |    2 +-
 468  arch/arm/boot/dts/qcom-msm8974.dtsi                |   97 ++
 469  arch/arm/boot/dts/r7s72100-genmai-reference.dts    |   31 +
 470  arch/arm/boot/dts/r7s72100-genmai.dts              |    2 +-
 471  arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts    |   15 +-
 472  arch/arm/boot/dts/r8a73a4-ape6evm.dts              |   10 +-
 473  arch/arm/boot/dts/r8a73a4.dtsi                     |  184 ++-
 474  .../boot/dts/r8a7740-armadillo800eva-reference.dts |   90 +-
 475  arch/arm/boot/dts/r8a7740-armadillo800eva.dts      |    2 +-
 476  arch/arm/boot/dts/r8a7740.dtsi                     |  144 +-
 477  arch/arm/boot/dts/r8a7778-bockw-reference.dts      |   57 +-
 478  arch/arm/boot/dts/r8a7778-bockw.dts                |    2 +-
 479  arch/arm/boot/dts/r8a7778.dtsi                     |  172 +-
 480  arch/arm/boot/dts/r8a7779-marzen-reference.dts     |   36 +-
 481  arch/arm/boot/dts/r8a7779-marzen.dts               |    2 +-
 482  arch/arm/boot/dts/r8a7779.dtsi                     |  114 +-
 483  arch/arm/boot/dts/r8a7790-lager-reference.dts      |   45 -
 484  arch/arm/boot/dts/r8a7790-lager.dts                |   64 +-
 485  arch/arm/boot/dts/r8a7790.dtsi                     |  413 ++++-
 486  arch/arm/boot/dts/r8a7791-koelsch-reference.dts    |  115 ++
 487  arch/arm/boot/dts/r8a7791-koelsch.dts              |   35 +-
 488  arch/arm/boot/dts/r8a7791.dtsi                     |  467 +++++-
 489  arch/arm/boot/dts/sama5d3.dtsi                     |  423 ++++-
 490  arch/arm/boot/dts/sama5d36.dtsi                    |   20 +
 491  arch/arm/boot/dts/sama5d36ek.dts                   |   53 +
 492  arch/arm/boot/dts/sama5d3_can.dtsi                 |   20 +
 493  arch/arm/boot/dts/sama5d3_emac.dtsi                |   11 +
 494  arch/arm/boot/dts/sama5d3_gmac.dtsi                |   11 +
 495  arch/arm/boot/dts/sama5d3_lcd.dtsi                 |   17 +
 496  arch/arm/boot/dts/sama5d3_mci2.dtsi                |   12 +
 497  arch/arm/boot/dts/sama5d3_tcb1.dtsi                |   12 +
 498  arch/arm/boot/dts/sama5d3_uart.dtsi                |   26 +
 499  arch/arm/boot/dts/sama5d3xcm.dtsi                  |   17 +-
 500  arch/arm/boot/dts/sama5d3xdm.dtsi                  |    1 +
 501  arch/arm/boot/dts/sh7372-mackerel.dts              |    2 +-
 502  arch/arm/boot/dts/sh73a0-kzm9g-reference.dts       |  103 +-
 503  arch/arm/boot/dts/sh73a0-kzm9g.dts                 |    2 +-
 504  arch/arm/boot/dts/sh73a0.dtsi                      |  168 +-
 505  arch/arm/boot/dts/socfpga.dtsi                     |    4 +
 506  arch/arm/boot/dts/st-pincfg.h                      |    2 +-
 507  arch/arm/boot/dts/ste-dbx5x0.dtsi                  |   32 +
 508  arch/arm/boot/dts/ste-href-family-pinctrl.dtsi     |  745 +++++++++
 509  arch/arm/boot/dts/ste-href-stuib.dtsi              |   41 +
 510  arch/arm/boot/dts/ste-href-tvk1281618.dtsi         |   90 +-
 511  arch/arm/boot/dts/ste-href.dtsi                    |   80 +-
 512  arch/arm/boot/dts/ste-hrefprev60.dtsi              |   78 +-
 513  arch/arm/boot/dts/ste-hrefv60plus.dtsi             |  251 ++-
 514  arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi         |   80 +
 515  arch/arm/boot/dts/ste-nomadik-s8815.dts            |    4 -
 516  arch/arm/boot/dts/ste-nomadik-stn8815.dtsi         |    4 +-
 517  arch/arm/boot/dts/ste-snowball.dts                 |  231 ++-
 518  arch/arm/boot/dts/ste-u300.dts                     |    6 +-
 519  arch/arm/boot/dts/stih415-pinctrl.dtsi             |   36 +
 520  arch/arm/boot/dts/stih415.dtsi                     |   53 +
 521  arch/arm/boot/dts/stih416-pinctrl.dtsi             |   35 +
 522  arch/arm/boot/dts/stih416.dtsi                     |   53 +
 523  arch/arm/boot/dts/stih41x-b2000.dtsi               |    9 +
 524  arch/arm/boot/dts/stih41x-b2020.dtsi               |   22 +
 525  arch/arm/boot/dts/sun4i-a10-a1000.dts              |    4 -
 526  arch/arm/boot/dts/sun4i-a10-cubieboard.dts         |    9 -
 527  arch/arm/boot/dts/sun4i-a10-hackberry.dts          |    4 -
 528  arch/arm/boot/dts/sun4i-a10-mini-xplus.dts         |    4 -
 529  arch/arm/boot/dts/sun4i-a10.dtsi                   |  164 +-
 530  arch/arm/boot/dts/sun5i-a10s.dtsi                  |  132 +-
 531  arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts    |   68 +
 532  arch/arm/boot/dts/sun5i-a13-olinuxino.dts          |    4 -
 533  arch/arm/boot/dts/sun5i-a13.dtsi                   |  128 +-
 534  arch/arm/boot/dts/sun6i-a31.dtsi                   |   34 +
 535  arch/arm/boot/dts/sun7i-a20-cubietruck.dts         |   18 +
 536  arch/arm/boot/dts/sun7i-a20.dtsi                   |  222 ++-
 537  arch/arm/boot/dts/tegra114-dalmore.dts             |  630 ++++----
 538  arch/arm/boot/dts/tegra114.dtsi                    |  295 +++-
 539  arch/arm/boot/dts/tegra124-venice2.dts             | 1064 ++++++++++++
 540  arch/arm/boot/dts/tegra124.dtsi                    |  418 +++++
 541  arch/arm/boot/dts/tegra20-colibri-512.dtsi         |  205 +--
 542  arch/arm/boot/dts/tegra20-harmony.dts              |  316 ++--
 543  arch/arm/boot/dts/tegra20-iris-512.dts             |   30 +-
 544  arch/arm/boot/dts/tegra20-medcom-wide.dts          |    2 +-
 545  arch/arm/boot/dts/tegra20-paz00.dts                |   52 +-
 546  arch/arm/boot/dts/tegra20-plutux.dts               |    4 +-
 547  arch/arm/boot/dts/tegra20-seaboard.dts             |  353 ++--
 548  arch/arm/boot/dts/tegra20-tamonten.dtsi            |   47 +-
 549  arch/arm/boot/dts/tegra20-tec.dts                  |    6 +-
 550  arch/arm/boot/dts/tegra20-trimslice.dts            |   54 +-
 551  arch/arm/boot/dts/tegra20-ventana.dts              |   62 +-
 552  arch/arm/boot/dts/tegra20-whistler.dts             |   84 +-
 553  arch/arm/boot/dts/tegra20.dtsi                     |  191 ++-
 554  arch/arm/boot/dts/tegra30-beaver.dts               |  126 +-
 555  arch/arm/boot/dts/tegra30-cardhu-a02.dts           |   14 +-
 556  arch/arm/boot/dts/tegra30-cardhu-a04.dts           |   14 +-
 557  arch/arm/boot/dts/tegra30-cardhu.dtsi              |  104 +-
 558  arch/arm/boot/dts/tegra30.dtsi                     |  247 ++-
 559  arch/arm/boot/dts/zynq-7000.dtsi                   |   39 +-
 560  arch/arm/boot/dts/zynq-zc702.dts                   |    5 +
 561  arch/arm/boot/dts/zynq-zc706.dts                   |    5 +
 562  arch/arm/boot/dts/zynq-zed.dts                     |    5 +
 563  arch/arm/common/timer-sp.c                         |    4 +-
 564  arch/arm/configs/ape6evm_defconfig                 |    2 +-
 565  arch/arm/configs/armadillo800eva_defconfig         |    5 +-
 566  arch/arm/configs/at91_dt_defconfig                 |    1 -
 567  arch/arm/configs/at91rm9200_defconfig              |    1 -
 568  arch/arm/configs/at91sam9260_9g20_defconfig        |    2 -
 569  arch/arm/configs/at91sam9261_9g10_defconfig        |    1 -
 570  arch/arm/configs/at91sam9g45_defconfig             |    1 -
 571  arch/arm/configs/at91sam9rl_defconfig              |    1 -
 572  arch/arm/configs/bcm2835_defconfig                 |   37 +-
 573  arch/arm/configs/bcm_defconfig                     |    3 +-
 574  arch/arm/configs/bockw_defconfig                   |   12 +-
 575  arch/arm/configs/efm32_defconfig                   |  102 ++
 576  arch/arm/configs/exynos_defconfig                  |    3 +-
 577  arch/arm/configs/genmai_defconfig                  |  116 ++
 578  arch/arm/configs/hi3xxx_defconfig                  |   56 +
 579  arch/arm/configs/imx_v4_v5_defconfig               |    2 +
 580  arch/arm/configs/imx_v6_v7_defconfig               |   13 +-
 581  arch/arm/configs/keystone_defconfig                |   20 +-
 582  arch/arm/configs/kirkwood_defconfig                |    1 +
 583  arch/arm/configs/koelsch_defconfig                 |   27 +-
 584  arch/arm/configs/kzm9d_defconfig                   |    3 +-
 585  arch/arm/configs/kzm9g_defconfig                   |    2 +-
 586  arch/arm/configs/lager_defconfig                   |    5 +-
 587  arch/arm/configs/mackerel_defconfig                |    2 +-
 588  arch/arm/configs/marzen_defconfig                  |   12 +-
 589  arch/arm/configs/moxart_defconfig                  |  149 ++
 590  arch/arm/configs/msm_defconfig                     |   14 +-
 591  arch/arm/configs/multi_v7_defconfig                |  158 +-
 592  arch/arm/configs/mvebu_defconfig                   |    3 +
 593  arch/arm/configs/omap2plus_defconfig               |    3 +
 594  arch/arm/configs/sama5_defconfig                   |    1 -
 595  arch/arm/configs/tegra_defconfig                   |   23 +-
 596  arch/arm/configs/u8500_defconfig                   |    1 +
 597  arch/arm/configs/versatile_defconfig               |   26 +-
 598  arch/arm/firmware/Kconfig                          |   28 +
 599  arch/arm/firmware/Makefile                         |    1 +
 600  arch/arm/firmware/trusted_foundations.c            |   81 +
 601  arch/arm/include/asm/trusted_foundations.h         |   67 +
 602  arch/arm/include/debug/imx-uart.h                  |   10 +
 603  arch/arm/include/debug/tegra.S                     |   34 +-
 604  arch/arm/mach-at91/Kconfig                         |   52 +-
 605  arch/arm/mach-at91/Kconfig.non_dt                  |   12 +-
 606  arch/arm/mach-at91/Makefile                        |    3 +-
 607  arch/arm/mach-at91/at91rm9200.c                    |    2 +-
 608  arch/arm/mach-at91/at91sam9260.c                   |    2 +-
 609  arch/arm/mach-at91/at91sam9261.c                   |    2 +-
 610  arch/arm/mach-at91/at91sam9263.c                   |    2 +-
 611  arch/arm/mach-at91/at91sam926x_time.c              |   14 +-
 612  arch/arm/mach-at91/at91sam9g45.c                   |    2 +-
 613  arch/arm/mach-at91/at91sam9n12.c                   |    2 +-
 614  arch/arm/mach-at91/at91sam9rl.c                    |    2 +-
 615  arch/arm/mach-at91/at91sam9x5.c                    |    2 +-
 616  arch/arm/mach-at91/board-dt-sama5.c                |   10 +-
 617  arch/arm/mach-at91/board-qil-a9260.c               |  266 ---
 618  arch/arm/mach-at91/clock.c                         |   13 +-
 619  arch/arm/mach-at91/generic.h                       |    3 +-
 620  arch/arm/mach-at91/include/mach/cpu.h              |    3 +-
 621  arch/arm/mach-at91/pm.c                            |    5 +-
 622  arch/arm/mach-at91/pm_slowclock.S                  |    2 +-
 623  arch/arm/mach-at91/sam9_smc.c                      |    2 +-
 624  arch/arm/mach-at91/sama5d3.c                       |  344 +---
 625  arch/arm/mach-at91/setup.c                         |   12 +-
 626  arch/arm/mach-bcm2835/Kconfig                      |    2 +-
 627  arch/arm/mach-berlin/Kconfig                       |   29 +
 628  arch/arm/mach-berlin/Makefile                      |    1 +
 629  arch/arm/mach-berlin/berlin.c                      |   39 +
 630  arch/arm/mach-clps711x/common.c                    |    4 +-
 631  arch/arm/mach-davinci/da830.c                      |    1 -
 632  arch/arm/mach-davinci/da850.c                      |    1 -
 633  arch/arm/mach-davinci/dm355.c                      |    1 -
 634  arch/arm/mach-davinci/dm365.c                      |    1 -
 635  arch/arm/mach-davinci/dm644x.c                     |    1 -
 636  arch/arm/mach-davinci/dm646x.c                     |    1 -
 637  arch/arm/mach-davinci/time.c                       |    4 +-
 638  arch/arm/mach-dove/common.c                        |   15 +-
 639  arch/arm/mach-efm32/Makefile                       |    1 +
 640  arch/arm/mach-efm32/Makefile.boot                  |    3 +
 641  arch/arm/mach-efm32/dtmachine.c                    |   15 +
 642  arch/arm/mach-efm32/include/mach/entry-macro.S     |    4 +
 643  arch/arm/mach-efm32/include/mach/timex.h           |    3 +
 644  arch/arm/mach-ep93xx/Kconfig                       |    1 +
 645  arch/arm/mach-ep93xx/core.c                        |  110 +-
 646  arch/arm/mach-ep93xx/include/mach/platform.h       |    3 +-
 647  arch/arm/mach-exynos/Kconfig                       |    4 +-
 648  arch/arm/mach-exynos/common.c                      |    8 +-
 649  arch/arm/mach-exynos/common.h                      |    6 -
 650  arch/arm/mach-exynos/cpuidle.c                     |   25 +-
 651  arch/arm/mach-exynos/hotplug.c                     |    2 +-
 652  arch/arm/mach-exynos/include/mach/pm-core.h        |    5 +-
 653  arch/arm/mach-exynos/include/mach/regs-clock.h     |  372 -----
 654  arch/arm/mach-exynos/include/mach/regs-irq.h       |   19 -
 655  arch/arm/mach-exynos/mach-exynos5-dt.c             |    2 +-
 656  arch/arm/mach-exynos/platsmp.c                     |    6 +-
 657  arch/arm/mach-exynos/pm.c                          |   33 +-
 658  arch/arm/mach-exynos/pm_domains.c                  |    9 +-
 659  arch/arm/mach-exynos/pmu.c                         |   17 +-
 660  arch/arm/mach-exynos/{include/mach => }/regs-pmu.h |   53 -
 661  arch/arm/mach-hisi/Kconfig                         |   17 +
 662  arch/arm/mach-hisi/Makefile                        |    7 +
 663  arch/arm/mach-hisi/core.h                          |   15 +
 664  arch/arm/mach-hisi/hisilicon.c                     |   90 ++
 665  arch/arm/mach-hisi/hotplug.c                       |  200 +++
 666  arch/arm/mach-hisi/platsmp.c                       |   89 ++
 667  arch/arm/mach-imx/Kconfig                          |   35 +-
 668  arch/arm/mach-imx/Makefile                         |    2 +
 669  arch/arm/mach-imx/avic.c                           |   25 -
 670  arch/arm/mach-imx/clk-gate2.c                      |    2 +-
 671  arch/arm/mach-imx/clk-imx35.c                      |   14 +
 672  arch/arm/mach-imx/clk-imx51-imx53.c                |  804 +++++-----
 673  arch/arm/mach-imx/clk-imx6q.c                      |    5 +-
 674  arch/arm/mach-imx/clk-imx6sl.c                     |   11 +-
 675  arch/arm/mach-imx/clk-pfd.c                        |   11 +
 676  arch/arm/mach-imx/clk-pllv1.c                      |   23 +-
 677  arch/arm/mach-imx/clk-vf610.c                      |    5 +
 678  arch/arm/mach-imx/common.h                         |    1 +
 679  arch/arm/mach-imx/imx31-dt.c                       |    2 +-
 680  arch/arm/mach-imx/imx35-dt.c                       |   50 +
 681  arch/arm/mach-imx/imx51-dt.c                       |    2 +-
 682  arch/arm/mach-imx/irq-common.h                     |    1 -
 683  arch/arm/mach-imx/mach-imx50.c                     |   38 +
 684  arch/arm/mach-imx/mach-imx53.c                     |    2 +-
 685  arch/arm/mach-imx/mach-imx6q.c                     |   32 +-
 686  arch/arm/mach-imx/mach-imx6sl.c                    |   10 +-
 687  arch/arm/mach-imx/mach-vf610.c                     |    2 +-
 688  arch/arm/mach-imx/mm-imx5.c                        |    8 -
 689  arch/arm/mach-imx/platsmp.c                        |    3 +-
 690  arch/arm/mach-imx/pm-imx6q.c                       |   16 +-
 691  arch/arm/mach-imx/time.c                           |    4 +-
 692  arch/arm/mach-integrator/integrator_ap.c           |   64 +-
 693  arch/arm/mach-integrator/integrator_cp.c           |   14 -
 694  arch/arm/mach-ixp4xx/common.c                      |    4 +-
 695  arch/arm/mach-keystone/Kconfig                     |    2 +
 696  arch/arm/mach-keystone/keystone.c                  |    4 +
 697  arch/arm/mach-keystone/keystone.h                  |    1 +
 698  arch/arm/mach-keystone/pm_domain.c                 |    2 -
 699  arch/arm/mach-kirkwood/board-dt.c                  |   40 +-
 700  arch/arm/mach-mmp/Kconfig                          |    3 +
 701  arch/arm/mach-mmp/Makefile                         |    3 +-
 702  arch/arm/mach-mmp/time.c                           |    4 +-
 703  arch/arm/mach-moxart/Kconfig                       |   31 +
 704  arch/arm/mach-moxart/Makefile                      |    3 +
 705  arch/arm/mach-moxart/moxart.c                      |   15 +
 706  arch/arm/mach-msm/Kconfig                          |   74 +-
 707  arch/arm/mach-msm/Makefile                         |    4 +-
 708  arch/arm/mach-msm/board-dt.c                       |    9 +
 709  arch/arm/mach-msm/board-msm7x30.c                  |   35 +
 710  arch/arm/mach-msm/board-qsd8x50.c                  |   35 +
 711  arch/arm/mach-msm/board-trout.c                    |   12 +-
 712  arch/arm/mach-msm/platsmp.c                        |    3 +-
 713  arch/arm/mach-msm/timer.c                          |    4 +-
 714  arch/arm/mach-mvebu/Makefile                       |    2 +-
 715  arch/arm/mach-mvebu/armada-370-xp.c                |   32 +
 716  arch/arm/mach-mvebu/armada-370-xp.h                |    4 +
 717  arch/arm/mach-mvebu/coherency.c                    |    1 +
 718  arch/arm/mach-mvebu/coherency.h                    |    4 +-
 719  arch/arm/mach-mvebu/common.h                       |   10 +-
 720  arch/arm/mach-mvebu/hotplug.c                      |    1 +
 721  arch/arm/mach-mvebu/mvebu-soc-id.c                 |  119 ++
 722  arch/arm/mach-mvebu/mvebu-soc-id.h                 |   32 +
 723  arch/arm/mach-mvebu/platsmp.c                      |    4 +-
 724  arch/arm/mach-mvebu/pmsu.c                         |    3 +-
 725  arch/arm/mach-mvebu/system-controller.c            |    5 +-
 726  arch/arm/mach-nomadik/cpu-8815.c                   |   32 -
 727  arch/arm/mach-omap1/time.c                         |    4 +-
 728  arch/arm/mach-omap2/Kconfig                        |   13 -
 729  arch/arm/mach-omap2/Makefile                       |    4 -
 730  arch/arm/mach-omap2/board-2430sdp.c                |  273 ----
 731  arch/arm/mach-omap2/board-generic.c                |    7 +
 732  arch/arm/mach-omap2/board-h4.c                     |  365 -----
 733  arch/arm/mach-omap2/board-n8x0.c                   |  234 +--
 734  arch/arm/mach-omap2/common-board-devices.h         |    1 +
 735  arch/arm/mach-omap2/common.h                       |    1 +
 736  arch/arm/mach-omap2/gpmc-nand.c                    |   50 +-
 737  arch/arm/mach-omap2/msdi.c                         |   69 -
 738  arch/arm/mach-omap2/mux.h                          |    2 -
 739  arch/arm/mach-omap2/mux2420.c                      |  690 --------
 740  arch/arm/mach-omap2/mux2420.h                      |  282 ----
 741  arch/arm/mach-omap2/mux2430.c                      |  793 ---------
 742  arch/arm/mach-omap2/mux2430.h                      |  370 -----
 743  arch/arm/mach-omap2/omap_device.c                  |    2 +
 744  arch/arm/mach-omap2/omap_hwmod_2420_data.c         |  137 --
 745  arch/arm/mach-omap2/omap_hwmod_2430_data.c         |  266 ---
 746  .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c |  165 +-
 747  arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c |   72 +-
 748  arch/arm/mach-omap2/omap_hwmod_common_data.h       |    5 -
 749  arch/arm/mach-omap2/pdata-quirks.c                 |  138 +-
 750  arch/arm/mach-omap2/timer.c                        |    4 +-
 751  arch/arm/mach-orion5x/board-dt.c                   |    2 +-
 752  arch/arm/mach-orion5x/common.c                     |    7 +-
 753  arch/arm/mach-orion5x/db88f5281-setup.c            |    2 +-
 754  arch/arm/mach-orion5x/irq.c                        |    1 +
 755  arch/arm/mach-orion5x/pci.c                        |    4 +-
 756  arch/arm/mach-orion5x/rd88f5182-setup.c            |    2 +-
 757  arch/arm/mach-orion5x/terastation_pro2-setup.c     |    2 +-
 758  arch/arm/mach-orion5x/ts209-setup.c                |    2 +-
 759  arch/arm/mach-orion5x/ts78xx-setup.c               |    2 +-
 760  arch/arm/mach-prima2/platsmp.c                     |    3 +-
 761  arch/arm/mach-pxa/am200epd.c                       |    3 +-
 762  arch/arm/mach-pxa/am300epd.c                       |    3 +-
 763  arch/arm/mach-pxa/em-x270.c                        |    3 +-
 764  arch/arm/mach-pxa/irq.c                            |    4 -
 765  arch/arm/mach-pxa/magician.c                       |    2 +-
 766  arch/arm/mach-pxa/mainstone.c                      |    2 +-
 767  arch/arm/mach-pxa/pcm990-baseboard.c               |    2 +-
 768  arch/arm/mach-pxa/sharpsl_pm.c                     |    8 +-
 769  arch/arm/mach-pxa/time.c                           |    6 +-
 770  arch/arm/mach-pxa/trizeps4.c                       |    3 +-
 771  arch/arm/mach-s3c24xx/dma.c                        |    2 +-
 772  arch/arm/mach-s3c24xx/simtec-usb.c                 |    3 +-
 773  arch/arm/mach-s3c64xx/Kconfig                      |    7 +-
 774  arch/arm/mach-s3c64xx/Makefile                     |    2 +-
 775  arch/arm/mach-s3c64xx/common.h                     |    5 +
 776  arch/arm/mach-s3c64xx/dma.c                        |  762 ---------
 777  arch/arm/mach-s3c64xx/include/mach/dma.h           |  144 +-
 778  arch/arm/mach-s3c64xx/mach-mini6410.c              |   10 +
 779  arch/arm/mach-s3c64xx/mach-smartq.c                |    2 +-
 780  arch/arm/mach-s3c64xx/pl080.c                      |  244 +++
 781  arch/arm/mach-sa1100/time.c                        |    4 +-
 782  arch/arm/mach-shmobile/Kconfig                     |   87 +-
 783  arch/arm/mach-shmobile/Makefile                    |    6 +-
 784  arch/arm/mach-shmobile/Makefile.boot               |    5 +-
 785  arch/arm/mach-shmobile/board-ape6evm.c             |    6 +-
 786  arch/arm/mach-shmobile/board-armadillo800eva.c     |    7 +-
 787  arch/arm/mach-shmobile/board-bockw-reference.c     |   32 +-
 788  arch/arm/mach-shmobile/board-bockw.c               |   18 +-
 789  arch/arm/mach-shmobile/board-genmai-reference.c    |   49 +
 790  arch/arm/mach-shmobile/board-koelsch-reference.c   |   79 +
 791  arch/arm/mach-shmobile/board-koelsch.c             |  190 ++-
 792  arch/arm/mach-shmobile/board-kzm9d.c               |   92 --
 793  arch/arm/mach-shmobile/board-lager-reference.c     |   37 +-
 794  arch/arm/mach-shmobile/board-lager.c               |  153 +-
 795  arch/arm/mach-shmobile/board-mackerel.c            |   21 +-
 796  arch/arm/mach-shmobile/board-marzen.c              |   27 +-
 797  arch/arm/mach-shmobile/clock-r7s72100.c            |   11 +-
 798  arch/arm/mach-shmobile/clock-r8a73a4.c             |   10 +-
 799  arch/arm/mach-shmobile/clock-r8a7740.c             |    9 +-
 800  arch/arm/mach-shmobile/clock-r8a7778.c             |   31 +
 801  arch/arm/mach-shmobile/clock-r8a7779.c             |   11 +
 802  arch/arm/mach-shmobile/clock-r8a7790.c             |   76 +-
 803  arch/arm/mach-shmobile/clock-r8a7791.c             |   17 +-
 804  arch/arm/mach-shmobile/clock-sh7372.c              |    9 +-
 805  arch/arm/mach-shmobile/clock-sh73a0.c              |   23 +-
 806  arch/arm/mach-shmobile/include/mach/emev2.h        |    5 -
 807  arch/arm/mach-shmobile/include/mach/r8a7778.h      |   39 +-
 808  arch/arm/mach-shmobile/include/mach/r8a7779.h      |    7 -
 809  arch/arm/mach-shmobile/include/mach/r8a7791.h      |    1 +
 810  arch/arm/mach-shmobile/setup-emev2.c               |  163 +-
 811  arch/arm/mach-shmobile/setup-r7s72100.c            |   82 +-
 812  arch/arm/mach-shmobile/setup-r8a73a4.c             |   68 +-
 813  arch/arm/mach-shmobile/setup-r8a7740.c             |  195 +--
 814  arch/arm/mach-shmobile/setup-r8a7778.c             |  166 +-
 815  arch/arm/mach-shmobile/setup-r8a7779.c             |  185 +--
 816  arch/arm/mach-shmobile/setup-r8a7790.c             |  148 +-
 817  arch/arm/mach-shmobile/setup-r8a7791.c             |  188 ++-
 818  arch/arm/mach-shmobile/setup-rcar-gen2.c           |   29 +-
 819  arch/arm/mach-shmobile/setup-sh7372.c              |  160 +-
 820  arch/arm/mach-shmobile/setup-sh73a0.c              |  207 +--
 821  arch/arm/mach-shmobile/sh-gpio.h                   |   19 -
 822  arch/arm/mach-sti/platsmp.c                        |    3 +-
 823  arch/arm/mach-sunxi/Kconfig                        |    3 +
 824  arch/arm/mach-sunxi/Makefile                       |    1 +
 825  arch/arm/mach-sunxi/common.h                       |   19 +
 826  arch/arm/mach-sunxi/headsmp.S                      |    9 +
 827  arch/arm/mach-sunxi/platsmp.c                      |  124 ++
 828  arch/arm/mach-sunxi/sunxi.c                        |   14 +
 829  arch/arm/mach-tegra/Kconfig                        |    4 +
 830  arch/arm/mach-tegra/fuse.c                         |   41 +-
 831  arch/arm/mach-tegra/iomap.h                        |   14 +-
 832  arch/arm/mach-tegra/powergate.c                    |  203 ++-
 833  arch/arm/mach-tegra/reset.c                        |   40 +-
 834  arch/arm/mach-tegra/tegra.c                        |    6 +-
 835  arch/arm/mach-u300/regulator.c                     |    4 +-
 836  arch/arm/mach-u300/timer.c                         |   42 +-
 837  arch/arm/mach-ux500/Makefile                       |    6 +-
 838  arch/arm/mach-ux500/board-mop500-audio.c           |    3 -
 839  arch/arm/mach-ux500/board-mop500-pins.c            |  804 ----------
 840  arch/arm/mach-ux500/board-mop500-regulators.c      |   14 -
 841  arch/arm/mach-ux500/board-mop500-regulators.h      |    1 -
 842  arch/arm/mach-ux500/board-mop500-sdi.c             |    2 -
 843  arch/arm/mach-ux500/board-mop500.c                 |   78 -
 844  arch/arm/mach-ux500/board-mop500.h                 |    1 -
 845  arch/arm/mach-ux500/cpu-db8500.c                   |   26 +-
 846  arch/arm/mach-ux500/cpu.c                          |   23 +-
 847  arch/arm/mach-ux500/devices-db8500.c               |   28 -
 848  arch/arm/mach-ux500/devices-db8500.h               |   19 -
 849  arch/arm/mach-ux500/devices.c                      |   26 -
 850  arch/arm/mach-ux500/devices.h                      |   15 -
 851  arch/arm/mach-ux500/platsmp.c                      |    3 +-
 852  arch/arm/mach-ux500/pm.c                           |   27 +
 853  arch/arm/mach-ux500/setup.h                        |    6 -
 854  arch/arm/mach-ux500/timer.c                        |   76 +-
 855  arch/arm/mach-versatile/core.c                     |   16 +
 856  arch/arm/mach-versatile/versatile_pb.c             |   21 -
 857  arch/arm/mach-zynq/common.c                        |   16 +-
 858  arch/arm/mach-zynq/common.h                        |    2 +
 859  arch/arm/mach-zynq/headsmp.S                       |    6 +-
 860  arch/arm/mach-zynq/platsmp.c                       |   25 +-
 861  arch/arm/plat-iop/time.c                           |    4 +-
 862  arch/arm/plat-omap/counter_32k.c                   |    4 +-
 863  arch/arm/plat-orion/common.c                       |    9 +-
 864  arch/arm/plat-orion/time.c                         |    7 +-
 865  arch/arm/plat-pxa/dma.c                            |    2 +-
 866  arch/arm/plat-samsung/Kconfig                      |    8 -
 867  arch/arm/plat-samsung/devs.c                       |   10 +-
 868  arch/arm/plat-samsung/dma-ops.c                    |    8 +-
 869  arch/arm/plat-samsung/include/plat/pm.h            |    4 +-
 870  arch/arm/plat-samsung/include/plat/uncompress.h    |    2 +
 871  arch/arm/plat-samsung/pm.c                         |    6 +-
 872  arch/arm/plat-samsung/s5p-irq-eint.c               |    4 +
 873  arch/arm/plat-samsung/s5p-irq-pm.c                 |    3 +
 874  arch/arm/plat-versatile/platsmp.c                  |    3 +-
 875  arch/arm/plat-versatile/sched-clock.c              |    4 +-
 876  arch/sh/kernel/cpu/sh2/setup-sh7619.c              |   30 +-
 877  arch/sh/kernel/cpu/sh2a/setup-mxg.c                |   10 +-
 878  arch/sh/kernel/cpu/sh2a/setup-sh7201.c             |   80 +-
 879  arch/sh/kernel/cpu/sh2a/setup-sh7203.c             |   40 +-
 880  arch/sh/kernel/cpu/sh2a/setup-sh7206.c             |   40 +-
 881  arch/sh/kernel/cpu/sh2a/setup-sh7264.c             |  104 +-
 882  arch/sh/kernel/cpu/sh2a/setup-sh7269.c             |  104 +-
 883  arch/sh/kernel/cpu/sh3/setup-sh7705.c              |   20 +-
 884  arch/sh/kernel/cpu/sh3/setup-sh770x.c              |   30 +-
 885  arch/sh/kernel/cpu/sh3/setup-sh7710.c              |   20 +-
 886  arch/sh/kernel/cpu/sh3/setup-sh7720.c              |   20 +-
 887  arch/sh/kernel/cpu/sh4/setup-sh4-202.c             |   16 +-
 888  arch/sh/kernel/cpu/sh4/setup-sh7750.c              |   20 +-
 889  arch/sh/kernel/cpu/sh4/setup-sh7760.c              |   62 +-
 890  arch/sh/kernel/cpu/sh4a/setup-sh7343.c             |   40 +-
 891  arch/sh/kernel/cpu/sh4a/setup-sh7366.c             |   10 +-
 892  arch/sh/kernel/cpu/sh4a/setup-sh7722.c             |   30 +-
 893  arch/sh/kernel/cpu/sh4a/setup-sh7723.c             |   63 +-
 894  arch/sh/kernel/cpu/sh4a/setup-sh7724.c             |   63 +-
 895  arch/sh/kernel/cpu/sh4a/setup-sh7734.c             |   72 +-
 896  arch/sh/kernel/cpu/sh4a/setup-sh7757.c             |   30 +-
 897  arch/sh/kernel/cpu/sh4a/setup-sh7763.c             |   30 +-
 898  arch/sh/kernel/cpu/sh4a/setup-sh7770.c             |  100 +-
 899  arch/sh/kernel/cpu/sh4a/setup-sh7780.c             |   22 +-
 900  arch/sh/kernel/cpu/sh4a/setup-sh7785.c             |   60 +-
 901  arch/sh/kernel/cpu/sh4a/setup-sh7786.c             |   88 +-
 902  arch/sh/kernel/cpu/sh4a/setup-shx3.c               |   48 +-
 903  arch/sh/kernel/cpu/sh5/setup-sh5.c                 |   12 +-
 904  drivers/Makefile                                   |    2 +-
 905  drivers/bus/mvebu-mbus.c                           |   10 +-
 906  drivers/clk/Makefile                               |    3 +
 907  drivers/clk/at91/Makefile                          |   11 +
 908  drivers/clk/at91/clk-main.c                        |  187 +++
 909  drivers/clk/at91/clk-master.c                      |  270 ++++
 910  drivers/clk/at91/clk-peripheral.c                  |  410 +++++
 911  drivers/clk/at91/clk-pll.c                         |  531 ++++++
 912  drivers/clk/at91/clk-plldiv.c                      |  135 ++
 913  drivers/clk/at91/clk-programmable.c                |  366 +++++
 914  drivers/clk/at91/clk-smd.c                         |  171 ++
 915  drivers/clk/at91/clk-system.c                      |  135 ++
 916  drivers/clk/at91/clk-usb.c                         |  398 +++++
 917  drivers/clk/at91/clk-utmi.c                        |  159 ++
 918  drivers/clk/at91/pmc.c                             |  395 +++++
 919  drivers/clk/at91/pmc.h                             |  114 ++
 920  drivers/clk/hisilicon/Makefile                     |    5 +
 921  drivers/clk/hisilicon/clk-hi3620.c                 |  242 +++
 922  drivers/clk/hisilicon/clk.c                        |  171 ++
 923  drivers/clk/hisilicon/clk.h                        |  103 ++
 924  drivers/clk/hisilicon/clkgate-separated.c          |  130 ++
 925  drivers/clk/samsung/clk-exynos4.c                  |    3 +-
 926  drivers/clk/samsung/clk-s3c64xx.c                  |    4 +-
 927  drivers/clk/shmobile/Makefile                      |    7 +
 928  drivers/clk/shmobile/clk-div6.c                    |  185 +++
 929  drivers/clk/shmobile/clk-mstp.c                    |  229 +++
 930  drivers/clk/shmobile/clk-rcar-gen2.c               |  298 ++++
 931  drivers/clk/tegra/Makefile                         |    7 +-
 932  drivers/clk/tegra/clk-id.h                         |  235 +++
 933  drivers/clk/tegra/clk-periph-gate.c                |   30 +-
 934  drivers/clk/tegra/clk-periph.c                     |   72 +-
 935  drivers/clk/tegra/clk-pll.c                        |  407 +++--
 936  drivers/clk/tegra/clk-tegra-audio.c                |  215 +++
 937  drivers/clk/tegra/clk-tegra-fixed.c                |  111 ++
 938  drivers/clk/tegra/clk-tegra-periph.c               |  674 ++++++++
 939  drivers/clk/tegra/clk-tegra-pmc.c                  |  132 ++
 940  drivers/clk/tegra/clk-tegra-super-gen4.c           |  149 ++
 941  drivers/clk/tegra/clk-tegra114.c                   | 1688 +++++---------------
 942  drivers/clk/tegra/clk-tegra124.c                   | 1424 +++++++++++++++++
 943  drivers/clk/tegra/clk-tegra20.c                    |  817 ++++------
 944  drivers/clk/tegra/clk-tegra30.c                    | 1504 ++++++-----------
 945  drivers/clk/tegra/clk.c                            |  214 +++
 946  drivers/clk/tegra/clk.h                            |  116 +-
 947  drivers/clk/versatile/clk-icst.c                   |    3 +-
 948  drivers/clk/versatile/clk-icst.h                   |    1 +
 949  drivers/clk/versatile/clk-impd1.c                  |   88 +-
 950  drivers/clk/versatile/clk-integrator.c             |    2 +-
 951  drivers/clk/versatile/clk-realview.c               |    6 +-
 952  drivers/clocksource/Makefile                       |    2 +-
 953  drivers/clocksource/exynos_mct.c                   |    4 +
 954  drivers/clocksource/nomadik-mtu.c                  |   23 +-
 955  drivers/clocksource/sh_cmt.c                       |   20 +-
 956  drivers/cpufreq/exynos-cpufreq.h                   |   22 +
 957  drivers/cpufreq/exynos4210-cpufreq.c               |    2 -
 958  drivers/cpufreq/exynos4x12-cpufreq.c               |    2 -
 959  drivers/cpufreq/exynos5250-cpufreq.c               |    1 -
 960  drivers/crypto/atmel-aes.c                         |  143 +-
 961  drivers/crypto/atmel-sha.c                         |  103 +-
 962  drivers/crypto/atmel-tdes.c                        |  143 +-
 963  drivers/devfreq/exynos/exynos4_bus.c               |    4 +-
 964  drivers/devfreq/exynos/exynos4_bus.h               |  110 ++
 965  drivers/dma/Kconfig                                |    2 +
 966  drivers/dma/dmaengine.c                            |   63 +-
 967  drivers/dma/mmp_pdma.c                             |   30 +-
 968  drivers/dma/of-dma.c                               |   15 +-
 969  drivers/dma/ste_dma40.c                            |    4 +
 970  drivers/dma/tegra20-apb-dma.c                      |   52 +-
 971  drivers/gpio/Kconfig                               |    7 +
 972  drivers/gpio/Makefile                              |    2 +-
 973  drivers/gpio/gpio-davinci.c                        |  185 ++-
 974  drivers/gpu/drm/tegra/Kconfig                      |    1 +
 975  drivers/gpu/drm/tegra/dc.c                         |   10 +-
 976  drivers/gpu/drm/tegra/drm.h                        |    3 +
 977  drivers/gpu/drm/tegra/gr3d.c                       |   22 +-
 978  drivers/gpu/drm/tegra/hdmi.c                       |   15 +-
 979  drivers/i2c/busses/i2c-mv64xxx.c                   |    5 +
 980  drivers/i2c/busses/i2c-tegra.c                     |   13 +-
 981  drivers/input/keyboard/tegra-kbc.c                 |   13 +-
 982  drivers/irqchip/Kconfig                            |    4 +
 983  drivers/irqchip/Makefile                           |    1 +
 984  drivers/irqchip/exynos-combiner.c                  |   15 +-
 985  drivers/irqchip/irq-dw-apb-ictl.c                  |  150 ++
 986  drivers/irqchip/irq-renesas-irqc.c                 |   21 +-
 987  drivers/irqchip/irq-sirfsoc.c                      |    3 +-
 988  drivers/irqchip/irq-versatile-fpga.c               |   15 +-
 989  drivers/mfd/twl-core.c                             |   15 +-
 990  drivers/mmc/host/Kconfig                           |    2 +-
 991  drivers/pci/host/pci-tegra.c                       |   53 +-
 992  drivers/pinctrl/Kconfig                            |   28 +-
 993  drivers/pinctrl/Makefile                           |    3 +
 994  drivers/pinctrl/pinconf.c                          |   20 +-
 995  drivers/pinctrl/pinctrl-at91.c                     |    9 +-
 996  drivers/pinctrl/pinctrl-baytrail.c                 |   30 +-
 997  drivers/pinctrl/pinctrl-imx1-core.c                |    7 +
 998  drivers/pinctrl/pinctrl-imx25.c                    |  351 ++++
 999  drivers/pinctrl/pinctrl-msm.c                      | 1028 ++++++++++++
1000  drivers/pinctrl/pinctrl-msm.h                      |  122 ++
1001  drivers/pinctrl/pinctrl-msm8x74.c                  |  636 ++++++++
1002  drivers/pinctrl/pinctrl-nomadik.c                  |  302 +++-
1003  drivers/pinctrl/pinctrl-nomadik.h                  |   14 +-
1004  drivers/pinctrl/sh-pfc/core.c                      |   76 +-
1005  drivers/pinctrl/sh-pfc/core.h                      |    4 +-
1006  drivers/pinctrl/sh-pfc/gpio.c                      |   24 +-
1007  drivers/pinctrl/sh-pfc/pfc-r8a73a4.c               |   15 +-
1008  drivers/pinctrl/sh-pfc/pfc-r8a7740.c               |   13 +-
1009  drivers/pinctrl/sh-pfc/pfc-r8a7790.c               |  748 ++++++++-
1010  drivers/pinctrl/sh-pfc/pfc-r8a7791.c               |   57 +-
1011  drivers/pinctrl/sh-pfc/pfc-sh7372.c                |   13 +-
1012  drivers/pinctrl/sh-pfc/pfc-sh73a0.c                |   64 +-
1013  drivers/pinctrl/sh-pfc/sh_pfc.h                    |    7 +-
1014  drivers/reset/Makefile                             |    1 +
1015  drivers/reset/reset-sunxi.c                        |  175 ++
1016  drivers/rtc/Kconfig                                |   18 +
1017  drivers/rtc/Makefile                               |    2 +
1018  drivers/rtc/rtc-isl12057.c                         |  310 ++++
1019  drivers/rtc/rtc-sunxi.c                            |  523 ++++++
1020  drivers/spi/Kconfig                                |    5 +-
1021  drivers/spi/spi-tegra114.c                         |   66 +-
1022  drivers/spi/spi-tegra20-sflash.c                   |   18 +-
1023  drivers/spi/spi-tegra20-slink.c                    |   66 +-
1024  drivers/staging/nvec/nvec.c                        |   11 +-
1025  drivers/staging/nvec/nvec.h                        |    5 +-
1026  drivers/tty/serial/Kconfig                         |    2 +-
1027  drivers/tty/serial/serial-tegra.c                  |   38 +-
1028  drivers/tty/serial/sh-sci.c                        |  425 +++--
1029  drivers/tty/serial/sh-sci.h                        |    2 +-
1030  drivers/usb/gadget/atmel_usba_udc.c                |    2 +-
1031  drivers/usb/host/ehci-tegra.c                      |   14 +-
1032  drivers/usb/host/r8a66597-hcd.c                    |    4 +-
1033  drivers/usb/phy/phy-msm-usb.c                      |   35 +-
1034  include/dt-bindings/clk/at91.h                     |   22 +
1035  include/dt-bindings/clock/hi3620-clock.h           |  152 ++
1036  include/dt-bindings/clock/imx5-clock.h             |  203 +++
1037  include/dt-bindings/clock/imx6sl-clock.h           |    4 +-
1038  include/dt-bindings/clock/r8a7790-clock.h          |  107 ++
1039  include/dt-bindings/clock/r8a7791-clock.h          |  111 ++
1040  include/dt-bindings/clock/tegra114-car.h           |    8 +-
1041  include/dt-bindings/clock/tegra124-car.h           |  341 ++++
1042  include/dt-bindings/clock/tegra20-car.h            |    2 +-
1043  include/dt-bindings/clock/tegra30-car.h            |   12 +-
1044  include/dt-bindings/clock/vf610-clock.h            |    6 +-
1045  include/dt-bindings/gpio/tegra-gpio.h              |    1 +
1046  include/dt-bindings/pinctrl/omap.h                 |   20 +
1047  include/dt-bindings/pinctrl/pinctrl-tegra.h        |   45 +
1048  .../include/mach => include/linux/clk}/at91_pmc.h  |    4 +-
1049  include/linux/clk/shmobile.h                       |   19 +
1050  include/linux/clk/tegra.h                          |    7 -
1051  include/linux/dmaengine.h                          |    9 +
1052  include/linux/pinctrl/pinconf-generic.h            |    6 +-
1053  .../linux/platform_data/clocksource-nomadik-mtu.h  |    9 -
1054  include/linux/platform_data/gpio-davinci.h         |    3 +-
1055  include/linux/platform_data/pinctrl-nomadik.h      |  242 ---
1056  include/linux/serial_sci.h                         |   52 +-
1057  include/linux/tegra-powergate.h                    |   55 +-
1058  include/linux/usb/msm_hsusb.h                      |    3 +
1059  include/sound/dmaengine_pcm.h                      |   10 +
1060  include/sound/rcar_snd.h                           |    1 -
1061  sound/soc/atmel/Kconfig                            |    2 +-
1062  sound/soc/soc-devres.c                             |   41 +
1063  sound/soc/soc-generic-dmaengine-pcm.c              |   56 +-
1064  sound/soc/tegra/Kconfig                            |    2 +
1065  sound/soc/tegra/tegra20_ac97.c                     |   11 -
1066  sound/soc/tegra/tegra20_i2s.c                      |   20 +-
1067  sound/soc/tegra/tegra30_ahub.c                     |  138 +-
1068  sound/soc/tegra/tegra30_ahub.h                     |   11 +-
1069  sound/soc/tegra/tegra30_i2s.c                      |   97 +-
1070  sound/soc/tegra/tegra30_i2s.h                      |    3 +
1071  sound/soc/tegra/tegra_pcm.c                        |   17 +-
1072  sound/soc/tegra/tegra_pcm.h                        |    5 +
1073  811 files changed, 40240 insertions(+), 16991 deletions(-)
1074  create mode 100644 Documentation/devicetree/bindings/arm/firmware/tlm,trusted-foundations.txt
1075  create mode 100644 Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt
1076  create mode 100644 Documentation/devicetree/bindings/arm/marvell,berlin.txt
1077  create mode 100644 Documentation/devicetree/bindings/arm/moxart.txt
1078  create mode 100644 Documentation/devicetree/bindings/clock/at91-clock.txt
1079  create mode 100644 Documentation/devicetree/bindings/clock/hi3620-clock.txt
1080  create mode 100644 Documentation/devicetree/bindings/clock/imx35-clock.txt
1081  create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra124-car.txt
1082  create mode 100644 Documentation/devicetree/bindings/clock/renesas,cpg-div6-clocks.txt
1083  create mode 100644 Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
1084  create mode 100644 Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.txt
1085  create mode 100644 Documentation/devicetree/bindings/crypto/atmel-crypto.txt
1086  create mode 100644 Documentation/devicetree/bindings/gpio/gpio-davinci.txt
1087  create mode 100644 Documentation/devicetree/bindings/interrupt-controller/snps,dw-apb-ictl.txt
1088  create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx25-pinctrl.txt
1089  create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8x74-pinctrl.txt
1090  create mode 100644 Documentation/devicetree/bindings/rtc/sunxi-rtc.txt
1091  create mode 100644 Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
1092  create mode 100644 Documentation/devicetree/bindings/usb/keystone-phy.txt
1093  create mode 100644 Documentation/devicetree/bindings/usb/keystone-usb.txt
1094  create mode 100644 arch/arm/arm-soc-for-next-contents.txt
1095  create mode 100644 arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
1096  create mode 100644 arch/arm/boot/dts/armv7-m.dtsi
1097  create mode 100644 arch/arm/boot/dts/at91-cosino.dtsi
1098  create mode 100644 arch/arm/boot/dts/at91-cosino_mega2560.dts
1099  create mode 100644 arch/arm/boot/dts/at91-qil_a9260.dts
1100  create mode 100644 arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts
1101  create mode 100644 arch/arm/boot/dts/berlin2.dtsi
1102  create mode 100644 arch/arm/boot/dts/berlin2cd-google-chromecast.dts
1103  create mode 100644 arch/arm/boot/dts/berlin2cd.dtsi
1104  create mode 100644 arch/arm/boot/dts/efm32gg-dk3750.dts
1105  create mode 100644 arch/arm/boot/dts/efm32gg.dtsi
1106  create mode 100644 arch/arm/boot/dts/exynos4412-tiny4412.dts
1107  rename arch/arm/boot/dts/{cros5250-common.dtsi => exynos5250-cros-common.dtsi} (95%)
1108  create mode 100644 arch/arm/boot/dts/exynos5420-arndale-octa.dts
1109  create mode 100644 arch/arm/boot/dts/hi3620-hi4511.dts
1110  create mode 100644 arch/arm/boot/dts/hi3620.dtsi
1111  create mode 100644 arch/arm/boot/dts/k2hk-evm.dts
1112  rename arch/arm/boot/dts/{keystone.dts => keystone.dtsi} (82%)
1113  create mode 100644 arch/arm/boot/dts/kirkwood-6192.dtsi
1114  create mode 100644 arch/arm/boot/dts/kirkwood-laplug.dts
1115  create mode 100644 arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
1116  create mode 100644 arch/arm/boot/dts/moxart-uc7112lx.dts
1117  create mode 100644 arch/arm/boot/dts/moxart.dtsi
1118  create mode 100644 arch/arm/boot/dts/omap2420-n800.dts
1119  create mode 100644 arch/arm/boot/dts/omap2420-n810-wimax.dts
1120  create mode 100644 arch/arm/boot/dts/omap2420-n810.dts
1121  create mode 100644 arch/arm/boot/dts/omap2420-n8x0-common.dtsi
1122  create mode 100644 arch/arm/boot/dts/omap2430-sdp.dts
1123  create mode 100644 arch/arm/boot/dts/omap3-cm-t3730.dts
1124  create mode 100644 arch/arm/boot/dts/omap3-cm-t3x30.dtsi
1125  create mode 100644 arch/arm/boot/dts/omap3-ldp.dts
1126  create mode 100644 arch/arm/boot/dts/omap3-sb-t35.dtsi
1127  create mode 100644 arch/arm/boot/dts/omap3-sbc-t3730.dts
1128  create mode 100644 arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
1129  create mode 100644 arch/arm/boot/dts/qcom-msm8974.dtsi
1130  create mode 100644 arch/arm/boot/dts/r7s72100-genmai-reference.dts
1131  delete mode 100644 arch/arm/boot/dts/r8a7790-lager-reference.dts
1132  create mode 100644 arch/arm/boot/dts/r8a7791-koelsch-reference.dts
1133  create mode 100644 arch/arm/boot/dts/sama5d36.dtsi
1134  create mode 100644 arch/arm/boot/dts/sama5d36ek.dts
1135  create mode 100644 arch/arm/boot/dts/ste-href-family-pinctrl.dtsi
1136  create mode 100644 arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
1137  create mode 100644 arch/arm/configs/efm32_defconfig
1138  create mode 100644 arch/arm/configs/genmai_defconfig
1139  create mode 100644 arch/arm/configs/hi3xxx_defconfig
1140  create mode 100644 arch/arm/configs/moxart_defconfig
1141  create mode 100644 arch/arm/firmware/Kconfig
1142  create mode 100644 arch/arm/firmware/Makefile
1143  create mode 100644 arch/arm/firmware/trusted_foundations.c
1144  create mode 100644 arch/arm/include/asm/trusted_foundations.h
1145  delete mode 100644 arch/arm/mach-at91/board-qil-a9260.c
1146  create mode 100644 arch/arm/mach-berlin/Kconfig
1147  create mode 100644 arch/arm/mach-berlin/Makefile
1148  create mode 100644 arch/arm/mach-berlin/berlin.c
1149  create mode 100644 arch/arm/mach-efm32/Makefile
1150  create mode 100644 arch/arm/mach-efm32/Makefile.boot
1151  create mode 100644 arch/arm/mach-efm32/dtmachine.c
1152  create mode 100644 arch/arm/mach-efm32/include/mach/entry-macro.S
1153  create mode 100644 arch/arm/mach-efm32/include/mach/timex.h
1154  delete mode 100644 arch/arm/mach-exynos/include/mach/regs-clock.h
1155  delete mode 100644 arch/arm/mach-exynos/include/mach/regs-irq.h
1156  rename arch/arm/mach-exynos/{include/mach => }/regs-pmu.h (88%)
1157  create mode 100644 arch/arm/mach-hisi/Kconfig
1158  create mode 100644 arch/arm/mach-hisi/Makefile
1159  create mode 100644 arch/arm/mach-hisi/core.h
1160  create mode 100644 arch/arm/mach-hisi/hisilicon.c
1161  create mode 100644 arch/arm/mach-hisi/hotplug.c
1162  create mode 100644 arch/arm/mach-hisi/platsmp.c
1163  create mode 100644 arch/arm/mach-imx/imx35-dt.c
1164  create mode 100644 arch/arm/mach-imx/mach-imx50.c
1165  create mode 100644 arch/arm/mach-moxart/Kconfig
1166  create mode 100644 arch/arm/mach-moxart/Makefile
1167  create mode 100644 arch/arm/mach-moxart/moxart.c
1168  create mode 100644 arch/arm/mach-mvebu/mvebu-soc-id.c
1169  create mode 100644 arch/arm/mach-mvebu/mvebu-soc-id.h
1170  delete mode 100644 arch/arm/mach-omap2/board-2430sdp.c
1171  delete mode 100644 arch/arm/mach-omap2/board-h4.c
1172  delete mode 100644 arch/arm/mach-omap2/mux2420.c
1173  delete mode 100644 arch/arm/mach-omap2/mux2420.h
1174  delete mode 100644 arch/arm/mach-omap2/mux2430.c
1175  delete mode 100644 arch/arm/mach-omap2/mux2430.h
1176  delete mode 100644 arch/arm/mach-s3c64xx/dma.c
1177  create mode 100644 arch/arm/mach-s3c64xx/pl080.c
1178  create mode 100644 arch/arm/mach-shmobile/board-genmai-reference.c
1179  create mode 100644 arch/arm/mach-shmobile/board-koelsch-reference.c
1180  delete mode 100644 arch/arm/mach-shmobile/board-kzm9d.c
1181  create mode 100644 arch/arm/mach-sunxi/common.h
1182  create mode 100644 arch/arm/mach-sunxi/headsmp.S
1183  create mode 100644 arch/arm/mach-sunxi/platsmp.c
1184  delete mode 100644 arch/arm/mach-ux500/board-mop500.c
1185  delete mode 100644 arch/arm/mach-ux500/devices-db8500.c
1186  delete mode 100644 arch/arm/mach-ux500/devices-db8500.h
1187  delete mode 100644 arch/arm/mach-ux500/devices.c
1188  delete mode 100644 arch/arm/mach-ux500/devices.h
1189  create mode 100644 drivers/clk/at91/Makefile
1190  create mode 100644 drivers/clk/at91/clk-main.c
1191  create mode 100644 drivers/clk/at91/clk-master.c
1192  create mode 100644 drivers/clk/at91/clk-peripheral.c
1193  create mode 100644 drivers/clk/at91/clk-pll.c
1194  create mode 100644 drivers/clk/at91/clk-plldiv.c
1195  create mode 100644 drivers/clk/at91/clk-programmable.c
1196  create mode 100644 drivers/clk/at91/clk-smd.c
1197  create mode 100644 drivers/clk/at91/clk-system.c
1198  create mode 100644 drivers/clk/at91/clk-usb.c
1199  create mode 100644 drivers/clk/at91/clk-utmi.c
1200  create mode 100644 drivers/clk/at91/pmc.c
1201  create mode 100644 drivers/clk/at91/pmc.h
1202  create mode 100644 drivers/clk/hisilicon/Makefile
1203  create mode 100644 drivers/clk/hisilicon/clk-hi3620.c
1204  create mode 100644 drivers/clk/hisilicon/clk.c
1205  create mode 100644 drivers/clk/hisilicon/clk.h
1206  create mode 100644 drivers/clk/hisilicon/clkgate-separated.c
1207  create mode 100644 drivers/clk/shmobile/Makefile
1208  create mode 100644 drivers/clk/shmobile/clk-div6.c
1209  create mode 100644 drivers/clk/shmobile/clk-mstp.c
1210  create mode 100644 drivers/clk/shmobile/clk-rcar-gen2.c
1211  create mode 100644 drivers/clk/tegra/clk-id.h
1212  create mode 100644 drivers/clk/tegra/clk-tegra-audio.c
1213  create mode 100644 drivers/clk/tegra/clk-tegra-fixed.c
1214  create mode 100644 drivers/clk/tegra/clk-tegra-periph.c
1215  create mode 100644 drivers/clk/tegra/clk-tegra-pmc.c
1216  create mode 100644 drivers/clk/tegra/clk-tegra-super-gen4.c
1217  create mode 100644 drivers/clk/tegra/clk-tegra124.c
1218  create mode 100644 drivers/devfreq/exynos/exynos4_bus.h
1219  create mode 100644 drivers/irqchip/irq-dw-apb-ictl.c
1220  create mode 100644 drivers/pinctrl/pinctrl-imx25.c
1221  create mode 100644 drivers/pinctrl/pinctrl-msm.c
1222  create mode 100644 drivers/pinctrl/pinctrl-msm.h
1223  create mode 100644 drivers/pinctrl/pinctrl-msm8x74.c
1224  create mode 100644 drivers/reset/reset-sunxi.c
1225  create mode 100644 drivers/rtc/rtc-isl12057.c
1226  create mode 100644 drivers/rtc/rtc-sunxi.c
1227  create mode 100644 include/dt-bindings/clk/at91.h
1228  create mode 100644 include/dt-bindings/clock/hi3620-clock.h
1229  create mode 100644 include/dt-bindings/clock/imx5-clock.h
1230  create mode 100644 include/dt-bindings/clock/r8a7790-clock.h
1231  create mode 100644 include/dt-bindings/clock/r8a7791-clock.h
1232  create mode 100644 include/dt-bindings/clock/tegra124-car.h
1233  create mode 100644 include/dt-bindings/pinctrl/pinctrl-tegra.h
1234  rename {arch/arm/mach-at91/include/mach => include/linux/clk}/at91_pmc.h (98%)
1235  create mode 100644 include/linux/clk/shmobile.h
1236  delete mode 100644 include/linux/platform_data/clocksource-nomadik-mtu.h
1237  delete mode 100644 include/linux/platform_data/pinctrl-nomadik.h
1238 Merging bcm2835/for-next (413541dd66d5 Linux 3.13-rc5)
1239 $ git merge bcm2835/for-next
1240 Already up-to-date.
1241 Merging cortex-m/for-next (f41bfc9423aa Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
1242 $ git merge cortex-m/for-next
1243 Already up-to-date.
1244 Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
1245 $ git merge ep93xx/ep93xx-for-next
1246 Merge made by the 'recursive' strategy.
1247 Merging imx-mxs/for-next (53749239e004 Merge branch 'imx/dt' into for-next)
1248 $ git merge imx-mxs/for-next
1249 Removing arch/arm/boot/dts/imx53-evk.dts
1250 Auto-merging arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
1251 Auto-merging arch/arm/boot/dts/Makefile
1252 Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
1253 Merge made by the 'recursive' strategy.
1254  .../devicetree/bindings/vendor-prefixes.txt        |   3 +
1255  arch/arm/boot/dts/Makefile                         |  25 +-
1256  arch/arm/boot/dts/imx23-evk.dts                    |   8 +-
1257  arch/arm/boot/dts/imx23-olinuxino.dts              |   5 +-
1258  arch/arm/boot/dts/imx23-stmp378x_devb.dts          |   5 +-
1259  arch/arm/boot/dts/imx23.dtsi                       |   8 +-
1260  arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi       |  60 ++
1261  .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts  | 128 +++
1262  arch/arm/boot/dts/imx25-pinfunc.h                  | 494 +++++++++++
1263  arch/arm/boot/dts/imx25-pingrp.h                   |  81 ++
1264  arch/arm/boot/dts/imx25.dtsi                       |  18 +-
1265  arch/arm/boot/dts/imx27-apf27.dts                  |  16 +
1266  arch/arm/boot/dts/imx27-apf27dev.dts               |  98 ++-
1267  arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts   |  50 +-
1268  arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts   |  20 +-
1269  arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts     |  86 +-
1270  ...ycore-som.dts => imx27-phytec-phycore-som.dtsi} |  65 +-
1271  arch/arm/boot/dts/imx27-pinfunc.h                  | 526 ++++++++++++
1272  arch/arm/boot/dts/imx27-pingrp.h                   | 151 ++++
1273  arch/arm/boot/dts/imx27.dtsi                       | 151 ++--
1274  arch/arm/boot/dts/imx28-apf28dev.dts               |  29 +-
1275  arch/arm/boot/dts/imx28-apx4devkit.dts             |   5 +-
1276  arch/arm/boot/dts/imx28-cfa10036.dts               |   2 +
1277  arch/arm/boot/dts/imx28-cfa10037.dts               |   7 +-
1278  arch/arm/boot/dts/imx28-cfa10049.dts               |  31 +-
1279  arch/arm/boot/dts/imx28-cfa10057.dts               |   7 +-
1280  arch/arm/boot/dts/imx28-cfa10058.dts               |   7 +-
1281  arch/arm/boot/dts/imx28-duckbill.dts               | 121 +++
1282  arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts       |  71 ++
1283  arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts       |  50 ++
1284  arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi       | 326 ++++++++
1285  arch/arm/boot/dts/imx28-evk.dts                    |  24 +-
1286  arch/arm/boot/dts/imx28-m28cu3.dts                 |  16 +-
1287  arch/arm/boot/dts/imx28-m28evk.dts                 |  18 +-
1288  arch/arm/boot/dts/imx28-sps1.dts                   |   7 +-
1289  arch/arm/boot/dts/imx28-tx28.dts                   |  23 +-
1290  arch/arm/boot/dts/imx28.dtsi                       |  65 +-
1291  arch/arm/boot/dts/imx35-pingrp.h                   | 104 +++
1292  arch/arm/boot/dts/imx35.dtsi                       | 360 ++++++++
1293  arch/arm/boot/dts/imx50-evk.dts                    |  97 +++
1294  arch/arm/boot/dts/imx50-pinfunc.h                  | 923 +++++++++++++++++++++
1295  arch/arm/boot/dts/imx50-pingrp.h                   | 146 ++++
1296  arch/arm/boot/dts/imx50.dtsi                       | 475 +++++++++++
1297  arch/arm/boot/dts/imx51-apf51.dts                  |  18 +-
1298  arch/arm/boot/dts/imx51-apf51dev.dts               |  50 +-
1299  arch/arm/boot/dts/imx51-babbage.dts                | 134 ++-
1300  arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi       |  71 ++
1301  .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts  | 153 ++++
1302  arch/arm/boot/dts/imx51-pingrp.h                   | 249 ++++++
1303  arch/arm/boot/dts/imx51.dtsi                       | 457 ++--------
1304  arch/arm/boot/dts/imx53-ard.dts                    |  19 +-
1305  arch/arm/boot/dts/imx53-evk.dts                    | 126 ---
1306  arch/arm/boot/dts/imx53-m53evk.dts                 | 133 ++-
1307  arch/arm/boot/dts/imx53-mba53.dts                  |  40 +-
1308  arch/arm/boot/dts/imx53-pingrp.h                   | 352 ++++++++
1309  arch/arm/boot/dts/imx53-qsb-common.dtsi            | 264 ++++++
1310  arch/arm/boot/dts/imx53-qsb.dts                    | 210 +----
1311  arch/arm/boot/dts/imx53-qsrb.dts                   | 158 ++++
1312  arch/arm/boot/dts/imx53-smd.dts                    |  62 +-
1313  arch/arm/boot/dts/imx53-tqma53.dtsi                | 112 ++-
1314  arch/arm/boot/dts/imx53-tx53.dtsi                  |   5 +-
1315  arch/arm/boot/dts/imx53-voipac-bsb.dts             | 144 ++++
1316  arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi        | 240 ++++++
1317  arch/arm/boot/dts/imx53.dtsi                       | 651 +++------------
1318  arch/arm/boot/dts/imx6dl-gw51xx.dts                |  19 +
1319  arch/arm/boot/dts/imx6dl-gw52xx.dts                |  19 +
1320  arch/arm/boot/dts/imx6dl-gw53xx.dts                |  19 +
1321  arch/arm/boot/dts/imx6dl-gw54xx.dts                |  19 +
1322  arch/arm/boot/dts/imx6dl-hummingboard.dts          |  94 +++
1323  arch/arm/boot/dts/imx6dl-nitrogen6x.dts            |  21 +
1324  arch/arm/boot/dts/imx6dl-pinfunc.h                 |   2 +
1325  arch/arm/boot/dts/imx6dl-sabrelite.dts             |  20 +
1326  arch/arm/boot/dts/imx6dl.dtsi                      |  30 +-
1327  arch/arm/boot/dts/imx6q-arm2.dts                   |  73 +-
1328  arch/arm/boot/dts/imx6q-cm-fx6.dts                 |  69 ++
1329  arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts            | 178 ++++
1330  arch/arm/boot/dts/imx6q-gw51xx.dts                 |  19 +
1331  arch/arm/boot/dts/imx6q-gw52xx.dts                 |  23 +
1332  arch/arm/boot/dts/imx6q-gw53xx.dts                 |  23 +
1333  arch/arm/boot/dts/imx6q-gw5400-a.dts               | 493 +++++++++++
1334  arch/arm/boot/dts/imx6q-gw54xx.dts                 |  23 +
1335  arch/arm/boot/dts/imx6q-nitrogen6x.dts             |  25 +
1336  arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi         |  44 +-
1337  arch/arm/boot/dts/imx6q-pinfunc.h                  |   2 +
1338  arch/arm/boot/dts/imx6q-sabrelite.dts              | 178 +---
1339  arch/arm/boot/dts/imx6q-sbc6x.dts                  |  29 +-
1340  arch/arm/boot/dts/imx6q-udoo.dts                   |  27 +-
1341  arch/arm/boot/dts/imx6q.dtsi                       |  18 +-
1342  arch/arm/boot/dts/imx6qdl-gw51xx.dtsi              | 317 +++++++
1343  arch/arm/boot/dts/imx6qdl-gw52xx.dtsi              | 424 ++++++++++
1344  arch/arm/boot/dts/imx6qdl-gw53xx.dtsi              | 484 +++++++++++
1345  arch/arm/boot/dts/imx6qdl-gw54xx.dtsi              | 511 ++++++++++++
1346  arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi     |  58 ++
1347  arch/arm/boot/dts/imx6qdl-microsom.dtsi            |  89 ++
1348  arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi          | 382 +++++++++
1349  arch/arm/boot/dts/imx6qdl-pingrp.h                 | 532 ++++++++++++
1350  arch/arm/boot/dts/imx6qdl-sabreauto.dtsi           |  80 +-
1351  arch/arm/boot/dts/imx6qdl-sabrelite.dtsi           | 383 +++++++++
1352  arch/arm/boot/dts/imx6qdl-sabresd.dtsi             | 208 ++++-
1353  arch/arm/boot/dts/imx6qdl-wandboard.dtsi           |  70 +-
1354  arch/arm/boot/dts/imx6qdl.dtsi                     | 922 +++-----------------
1355  arch/arm/boot/dts/imx6sl-evk.dts                   | 116 ++-
1356  arch/arm/boot/dts/imx6sl-pingrp.h                  | 148 ++++
1357  arch/arm/boot/dts/imx6sl.dtsi                      | 374 +++------
1358  arch/arm/boot/dts/vf610-cosmic.dts                 |  16 +-
1359  arch/arm/boot/dts/vf610-pingrp.h                   | 127 +++
1360  arch/arm/boot/dts/vf610-twr.dts                    |  34 +-
1361  arch/arm/boot/dts/vf610.dtsi                       | 209 +----
1362  arch/arm/configs/imx_v6_v7_defconfig               |   5 +
1363  arch/arm/mach-imx/Kconfig                          |   8 +-
1364  arch/arm/mach-imx/Makefile                         |   1 +
1365  arch/arm/mach-imx/clk-imx6sl.c                     |  77 +-
1366  arch/arm/mach-imx/clk-vf610.c                      |  36 +-
1367  arch/arm/mach-imx/common.h                         |   3 +-
1368  arch/arm/mach-imx/cpuidle-imx6q.c                  |   4 +-
1369  arch/arm/mach-imx/cpuidle-imx6sl.c                 |  57 ++
1370  arch/arm/mach-imx/cpuidle.h                        |   5 +
1371  arch/arm/mach-imx/mach-imx6q.c                     |  35 +
1372  arch/arm/mach-imx/mach-imx6sl.c                    |   3 +
1373  arch/arm/mach-imx/pm-imx6q.c                       |   6 +-
1374  arch/arm/mach-mxs/mach-mxs.c                       |  33 +
1375  121 files changed, 12654 insertions(+), 3130 deletions(-)
1376  create mode 100644 arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi
1377  create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
1378  create mode 100644 arch/arm/boot/dts/imx25-pinfunc.h
1379  create mode 100644 arch/arm/boot/dts/imx25-pingrp.h
1380  rename arch/arm/boot/dts/{imx27-phytec-phycore-som.dts => imx27-phytec-phycore-som.dtsi} (74%)
1381  create mode 100644 arch/arm/boot/dts/imx27-pinfunc.h
1382  create mode 100644 arch/arm/boot/dts/imx27-pingrp.h
1383  create mode 100644 arch/arm/boot/dts/imx28-duckbill.dts
1384  create mode 100644 arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts
1385  create mode 100644 arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts
1386  create mode 100644 arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi
1387  create mode 100644 arch/arm/boot/dts/imx35-pingrp.h
1388  create mode 100644 arch/arm/boot/dts/imx35.dtsi
1389  create mode 100644 arch/arm/boot/dts/imx50-evk.dts
1390  create mode 100644 arch/arm/boot/dts/imx50-pinfunc.h
1391  create mode 100644 arch/arm/boot/dts/imx50-pingrp.h
1392  create mode 100644 arch/arm/boot/dts/imx50.dtsi
1393  create mode 100644 arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi
1394  create mode 100644 arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
1395  create mode 100644 arch/arm/boot/dts/imx51-pingrp.h
1396  delete mode 100644 arch/arm/boot/dts/imx53-evk.dts
1397  create mode 100644 arch/arm/boot/dts/imx53-pingrp.h
1398  create mode 100644 arch/arm/boot/dts/imx53-qsb-common.dtsi
1399  create mode 100644 arch/arm/boot/dts/imx53-qsrb.dts
1400  create mode 100644 arch/arm/boot/dts/imx53-voipac-bsb.dts
1401  create mode 100644 arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi
1402  create mode 100644 arch/arm/boot/dts/imx6dl-gw51xx.dts
1403  create mode 100644 arch/arm/boot/dts/imx6dl-gw52xx.dts
1404  create mode 100644 arch/arm/boot/dts/imx6dl-gw53xx.dts
1405  create mode 100644 arch/arm/boot/dts/imx6dl-gw54xx.dts
1406  create mode 100644 arch/arm/boot/dts/imx6dl-hummingboard.dts
1407  create mode 100644 arch/arm/boot/dts/imx6dl-nitrogen6x.dts
1408  create mode 100644 arch/arm/boot/dts/imx6dl-sabrelite.dts
1409  create mode 100644 arch/arm/boot/dts/imx6q-cm-fx6.dts
1410  create mode 100644 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
1411  create mode 100644 arch/arm/boot/dts/imx6q-gw51xx.dts
1412  create mode 100644 arch/arm/boot/dts/imx6q-gw52xx.dts
1413  create mode 100644 arch/arm/boot/dts/imx6q-gw53xx.dts
1414  create mode 100644 arch/arm/boot/dts/imx6q-gw5400-a.dts
1415  create mode 100644 arch/arm/boot/dts/imx6q-gw54xx.dts
1416  create mode 100644 arch/arm/boot/dts/imx6q-nitrogen6x.dts
1417  create mode 100644 arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
1418  create mode 100644 arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
1419  create mode 100644 arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
1420  create mode 100644 arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
1421  create mode 100644 arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi
1422  create mode 100644 arch/arm/boot/dts/imx6qdl-microsom.dtsi
1423  create mode 100644 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
1424  create mode 100644 arch/arm/boot/dts/imx6qdl-pingrp.h
1425  create mode 100644 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
1426  create mode 100644 arch/arm/boot/dts/imx6sl-pingrp.h
1427  create mode 100644 arch/arm/boot/dts/vf610-pingrp.h
1428  create mode 100644 arch/arm/mach-imx/cpuidle-imx6sl.c
1429 Merging ixp4xx/next (19f949f52599 Linux 3.8)
1430 $ git merge ixp4xx/next
1431 Already up-to-date.
1432 Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
1433 $ git merge msm/for-next
1434 Already up-to-date.
1435 Merging mvebu/for-next (ec7d4be690a2 Merge branch 'mvebu/dt' into for-next)
1436 $ git merge mvebu/for-next
1437 Auto-merging drivers/irqchip/Makefile
1438 Auto-merging arch/arm/boot/dts/Makefile
1439 Merge made by the 'recursive' strategy.
1440  .../interrupt-controller/marvell,dove-pmu-intc.txt |  17 ++
1441  arch/arm/boot/dts/Makefile                         |   7 +-
1442  arch/arm/boot/dts/armada-xp-mv78260.dtsi           |   3 +-
1443  arch/arm/boot/dts/kirkwood-b3.dts                  | 204 +++++++++++++++++++
1444  arch/arm/boot/dts/kirkwood-ts419-6281.dts          |  20 ++
1445  arch/arm/boot/dts/kirkwood-ts419-6282.dts          |  32 +++
1446  arch/arm/boot/dts/kirkwood-ts419.dtsi              |  75 +++++++
1447  drivers/clk/mvebu/Kconfig                          |   5 +
1448  drivers/clk/mvebu/Makefile                         |   1 +
1449  drivers/clk/mvebu/clk-corediv.c                    | 223 +++++++++++++++++++++
1450  drivers/clk/mvebu/clk-cpu.c                        |   2 +-
1451  drivers/irqchip/Makefile                           |   1 +
1452  drivers/irqchip/irq-dove.c                         | 126 ++++++++++++
1453  13 files changed, 712 insertions(+), 4 deletions(-)
1454  create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,dove-pmu-intc.txt
1455  create mode 100644 arch/arm/boot/dts/kirkwood-b3.dts
1456  create mode 100644 arch/arm/boot/dts/kirkwood-ts419-6281.dts
1457  create mode 100644 arch/arm/boot/dts/kirkwood-ts419-6282.dts
1458  create mode 100644 arch/arm/boot/dts/kirkwood-ts419.dtsi
1459  create mode 100644 drivers/clk/mvebu/clk-corediv.c
1460  create mode 100644 drivers/irqchip/irq-dove.c
1461 Merging renesas/next (2fb5c387800c Merge branch 'heads/soc-fixes-for-v3.14' into next)
1462 $ git merge renesas/next
1463 Merge made by the 'recursive' strategy.
1464  .../devicetree/bindings/clock/emev2-clock.txt      |  98 +++++++++++++++++++
1465  drivers/clk/shmobile/Makefile                      |   2 +-
1466  drivers/clk/shmobile/clk-emev2.c                   | 104 +++++++++++++++++++++
1467  3 files changed, 203 insertions(+), 1 deletion(-)
1468  create mode 100644 Documentation/devicetree/bindings/clock/emev2-clock.txt
1469  create mode 100644 drivers/clk/shmobile/clk-emev2.c
1470 Merging samsung/for-next (8109c477487a Merge branch 'v3.14-next/dt-exynos-3' into for-next)
1471 $ git merge samsung/for-next
1472 Already up-to-date!
1473 Merge made by the 'recursive' strategy.
1474 Merging tegra/for-next (95e770a5ad96 Merge branch for-3.14/defconfig into for-next)
1475 $ git merge tegra/for-next
1476 Already up-to-date!
1477 Merge made by the 'recursive' strategy.
1478 Merging arm64/for-next/core (65c021bb496a arm64: kernel: restore HW breakpoint registers in cpu_suspend)
1479 $ git merge arm64/for-next/core
1480 Removing arch/arm64/lib/strnlen_user.S
1481 Removing arch/arm64/lib/strncpy_from_user.S
1482 Merge made by the 'recursive' strategy.
1483  arch/arm/kvm/arm.c                           |  30 +++
1484  arch/arm64/Kconfig                           |  27 +++
1485  arch/arm64/boot/dts/foundation-v8.dts        |   2 +-
1486  arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi |   6 +
1487  arch/arm64/include/asm/Kbuild                |   1 -
1488  arch/arm64/include/asm/cmpxchg.h             |  28 ++-
1489  arch/arm64/include/asm/cpu_ops.h             |   6 +
1490  arch/arm64/include/asm/cputype.h             |  28 +--
1491  arch/arm64/include/asm/debug-monitors.h      |  21 ++
1492  arch/arm64/include/asm/dma-contiguous.h      |  29 +++
1493  arch/arm64/include/asm/futex.h               |   1 +
1494  arch/arm64/include/asm/hardirq.h             |   2 +-
1495  arch/arm64/include/asm/insn.h                | 108 ++++++++++
1496  arch/arm64/include/asm/jump_label.h          |  52 +++++
1497  arch/arm64/include/asm/memory.h              |   3 +-
1498  arch/arm64/include/asm/percpu.h              |  41 ++++
1499  arch/arm64/include/asm/proc-fns.h            |   3 +
1500  arch/arm64/include/asm/smp_plat.h            |  13 ++
1501  arch/arm64/include/asm/suspend.h             |  27 +++
1502  arch/arm64/include/asm/uaccess.h             |  25 +--
1503  arch/arm64/include/asm/word-at-a-time.h      |  94 +++++++++
1504  arch/arm64/include/uapi/asm/hwcap.h          |   6 +-
1505  arch/arm64/kernel/Makefile                   |   4 +-
1506  arch/arm64/kernel/arm64ksyms.c               |   5 +-
1507  arch/arm64/kernel/asm-offsets.c              |  11 +
1508  arch/arm64/kernel/debug-monitors.c           |  88 +++++++-
1509  arch/arm64/kernel/entry.S                    |   2 +
1510  arch/arm64/kernel/fpsimd.c                   |  36 ++++
1511  arch/arm64/kernel/head.S                     |  10 -
1512  arch/arm64/kernel/hw_breakpoint.c            | 203 ++++++++++++------
1513  arch/arm64/kernel/insn.c                     | 304 +++++++++++++++++++++++++++
1514  arch/arm64/kernel/jump_label.c               |  58 +++++
1515  arch/arm64/kernel/module.c                   | 157 +++++---------
1516  arch/arm64/kernel/perf_event.c               | 108 +++++++---
1517  arch/arm64/kernel/process.c                  |  14 +-
1518  arch/arm64/kernel/setup.c                    | 122 ++++++++++-
1519  arch/arm64/kernel/sleep.S                    | 184 ++++++++++++++++
1520  arch/arm64/kernel/smp.c                      |  23 +-
1521  arch/arm64/kernel/stacktrace.c               |   2 +-
1522  arch/arm64/kernel/suspend.c                  | 132 ++++++++++++
1523  arch/arm64/kernel/vmlinux.lds.S              |   3 -
1524  arch/arm64/lib/Makefile                      |   8 +-
1525  arch/arm64/lib/strncpy_from_user.S           |  50 -----
1526  arch/arm64/lib/strnlen_user.S                |  47 -----
1527  arch/arm64/mm/dma-mapping.c                  |  35 ++-
1528  arch/arm64/mm/init.c                         |   3 +
1529  arch/arm64/mm/proc.S                         |  69 ++++++
1530  include/linux/irqdesc.h                      |   8 +
1531  include/linux/jump_label.h                   |  19 +-
1532  scripts/gcc-goto.sh                          |   2 +-
1533  50 files changed, 1858 insertions(+), 402 deletions(-)
1534  create mode 100644 arch/arm64/include/asm/dma-contiguous.h
1535  create mode 100644 arch/arm64/include/asm/insn.h
1536  create mode 100644 arch/arm64/include/asm/jump_label.h
1537  create mode 100644 arch/arm64/include/asm/percpu.h
1538  create mode 100644 arch/arm64/include/asm/suspend.h
1539  create mode 100644 arch/arm64/include/asm/word-at-a-time.h
1540  create mode 100644 arch/arm64/kernel/insn.c
1541  create mode 100644 arch/arm64/kernel/jump_label.c
1542  create mode 100644 arch/arm64/kernel/sleep.S
1543  create mode 100644 arch/arm64/kernel/suspend.c
1544  delete mode 100644 arch/arm64/lib/strncpy_from_user.S
1545  delete mode 100644 arch/arm64/lib/strnlen_user.S
1546 Merging blackfin/for-linus (36855dcfc980 blackfin: fix build warning for unused variable)
1547 $ git merge blackfin/for-linus
1548 Already up-to-date.
1549 Merging c6x/for-linux-next (546153d75a48 c6x: fix build failure caused by cache.h)
1550 $ git merge c6x/for-linux-next
1551 Merge made by the 'recursive' strategy.
1552  arch/c6x/include/asm/cache.h | 1 +
1553  1 file changed, 1 insertion(+)
1554 Merging cris/for-next (e269a869417c Drop code for CRISv10 CPU simulator)
1555 $ git merge cris/for-next
1556 Merge made by the 'recursive' strategy.
1557  arch/cris/Kconfig                         |   6 -
1558  arch/cris/arch-v10/drivers/gpio.c         |   4 +-
1559  arch/cris/arch-v10/drivers/sync_serial.c  |   8 +-
1560  arch/cris/arch-v10/kernel/Makefile        |   1 -
1561  arch/cris/arch-v10/kernel/debugport.c     |   7 --
1562  arch/cris/arch-v10/kernel/entry.S         | 184 ++++++++++++++++--------------
1563  arch/cris/arch-v10/kernel/head.S          | 127 ++++++++++-----------
1564  arch/cris/arch-v10/kernel/irq.c           |  18 +--
1565  arch/cris/arch-v10/kernel/process.c       |   5 +-
1566  arch/cris/arch-v10/kernel/time.c          |  98 +++++++---------
1567  arch/cris/arch-v10/lib/dram_init.S        |  40 +++----
1568  arch/cris/arch-v32/drivers/mach-a3/gpio.c |   2 +-
1569  arch/cris/arch-v32/drivers/mach-fs/gpio.c |   4 +-
1570  arch/cris/arch-v32/drivers/sync_serial.c  |   4 +-
1571  arch/cris/arch-v32/kernel/entry.S         |  34 ++++--
1572  arch/cris/arch-v32/kernel/fasttimer.c     |   2 +-
1573  arch/cris/arch-v32/kernel/irq.c           |  10 +-
1574  arch/cris/arch-v32/kernel/smp.c           |   2 +-
1575  arch/cris/arch-v32/kernel/time.c          |   6 +-
1576  arch/cris/arch-v32/mach-a3/arbiter.c      |   4 +-
1577  arch/cris/arch-v32/mach-fs/arbiter.c      |   2 +-
1578  arch/cris/boot/rescue/kimagerescue.S      |   2 -
1579  arch/cris/include/arch-v10/arch/io.h      |  29 +----
1580  arch/cris/include/arch-v10/arch/irq.h     |   6 +-
1581  arch/cris/include/arch-v32/arch/irq.h     |   6 +-
1582  arch/cris/include/asm/unistd.h            |   2 +-
1583  arch/cris/include/uapi/asm/unistd.h       |  16 +++
1584  arch/cris/kernel/irq.c                    |   3 -
1585  28 files changed, 299 insertions(+), 333 deletions(-)
1586 Merging hexagon/linux-next (de44443a45e3 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD)
1587 $ git merge hexagon/linux-next
1588 Already up-to-date.
1589 Merging ia64/next (d52eefb47d4e ia64/xen: Remove Xen support for ia64)
1590 $ git merge ia64/next
1591 Removing arch/ia64/xen/xensetup.S
1592 Removing arch/ia64/xen/xenivt.S
1593 Removing arch/ia64/xen/xencomm.c
1594 Removing arch/ia64/xen/xen_pv_ops.c
1595 Removing arch/ia64/xen/xcom_hcall.c
1596 Removing arch/ia64/xen/time.h
1597 Removing arch/ia64/xen/time.c
1598 Removing arch/ia64/xen/suspend.c
1599 Removing arch/ia64/xen/machvec.c
1600 Removing arch/ia64/xen/irq_xen.h
1601 Removing arch/ia64/xen/irq_xen.c
1602 Removing arch/ia64/xen/hypervisor.c
1603 Removing arch/ia64/xen/hypercall.S
1604 Removing arch/ia64/xen/grant-table.c
1605 Removing arch/ia64/xen/gate-data.S
1606 Removing arch/ia64/xen/Makefile
1607 Removing arch/ia64/xen/Kconfig
1608 Removing arch/ia64/include/asm/xen/xencomm.h
1609 Removing arch/ia64/include/asm/xen/xcom_hcall.h
1610 Removing arch/ia64/include/asm/xen/privop.h
1611 Removing arch/ia64/include/asm/xen/patchlist.h
1612 Removing arch/ia64/include/asm/xen/page.h
1613 Removing arch/ia64/include/asm/xen/page-coherent.h
1614 Removing arch/ia64/include/asm/xen/minstate.h
1615 Removing arch/ia64/include/asm/xen/irq.h
1616 Removing arch/ia64/include/asm/xen/interface.h
1617 Removing arch/ia64/include/asm/xen/inst.h
1618 Removing arch/ia64/include/asm/xen/hypervisor.h
1619 Removing arch/ia64/include/asm/xen/hypercall.h
1620 Removing arch/ia64/include/asm/xen/events.h
1621 Removing arch/ia64/include/asm/sync_bitops.h
1622 Removing arch/ia64/include/asm/machvec_xen.h
1623 Removing arch/ia64/configs/xen_domu_defconfig
1624 Merge made by the 'recursive' strategy.
1625  arch/ia64/Kconfig                         |   12 -
1626  arch/ia64/Makefile                        |    2 -
1627  arch/ia64/configs/xen_domu_defconfig      |  199 -----
1628  arch/ia64/include/asm/acpi.h              |    2 -
1629  arch/ia64/include/asm/machvec.h           |    2 -
1630  arch/ia64/include/asm/machvec_xen.h       |   22 -
1631  arch/ia64/include/asm/meminit.h           |    1 -
1632  arch/ia64/include/asm/paravirt.h          |    1 -
1633  arch/ia64/include/asm/pvclock-abi.h       |    2 +-
1634  arch/ia64/include/asm/sync_bitops.h       |   51 --
1635  arch/ia64/include/asm/xen/events.h        |   41 --
1636  arch/ia64/include/asm/xen/hypercall.h     |  265 -------
1637  arch/ia64/include/asm/xen/hypervisor.h    |   61 --
1638  arch/ia64/include/asm/xen/inst.h          |  486 ------------
1639  arch/ia64/include/asm/xen/interface.h     |  363 ---------
1640  arch/ia64/include/asm/xen/irq.h           |   44 --
1641  arch/ia64/include/asm/xen/minstate.h      |  143 ----
1642  arch/ia64/include/asm/xen/page-coherent.h |   38 -
1643  arch/ia64/include/asm/xen/page.h          |   65 --
1644  arch/ia64/include/asm/xen/patchlist.h     |   38 -
1645  arch/ia64/include/asm/xen/privop.h        |  135 ----
1646  arch/ia64/include/asm/xen/xcom_hcall.h    |   51 --
1647  arch/ia64/include/asm/xen/xencomm.h       |   42 --
1648  arch/ia64/include/uapi/asm/break.h        |    9 -
1649  arch/ia64/kernel/acpi.c                   |    3 -
1650  arch/ia64/kernel/asm-offsets.c            |   32 -
1651  arch/ia64/kernel/head.S                   |    3 -
1652  arch/ia64/kernel/nr-irqs.c                |    4 -
1653  arch/ia64/kernel/paravirt_inst.h          |    3 -
1654  arch/ia64/kernel/paravirt_patchlist.h     |    4 -
1655  arch/ia64/kernel/vmlinux.lds.S            |    6 -
1656  arch/ia64/xen/Kconfig                     |   25 -
1657  arch/ia64/xen/Makefile                    |   37 -
1658  arch/ia64/xen/gate-data.S                 |    3 -
1659  arch/ia64/xen/grant-table.c               |   94 ---
1660  arch/ia64/xen/hypercall.S                 |   88 ---
1661  arch/ia64/xen/hypervisor.c                |   97 ---
1662  arch/ia64/xen/irq_xen.c                   |  443 -----------
1663  arch/ia64/xen/irq_xen.h                   |   34 -
1664  arch/ia64/xen/machvec.c                   |    4 -
1665  arch/ia64/xen/suspend.c                   |   59 --
1666  arch/ia64/xen/time.c                      |  257 -------
1667  arch/ia64/xen/time.h                      |   24 -
1668  arch/ia64/xen/xcom_hcall.c                |  441 -----------
1669  arch/ia64/xen/xen_pv_ops.c                | 1141 -----------------------------
1670  arch/ia64/xen/xencomm.c                   |  106 ---
1671  arch/ia64/xen/xenivt.S                    |   52 --
1672  arch/ia64/xen/xensetup.S                  |   80 --
1673  include/xen/interface/callback.h          |    2 +-
1674  include/xen/interface/io/protocols.h      |    3 -
1675  50 files changed, 2 insertions(+), 5118 deletions(-)
1676  delete mode 100644 arch/ia64/configs/xen_domu_defconfig
1677  delete mode 100644 arch/ia64/include/asm/machvec_xen.h
1678  delete mode 100644 arch/ia64/include/asm/sync_bitops.h
1679  delete mode 100644 arch/ia64/include/asm/xen/events.h
1680  delete mode 100644 arch/ia64/include/asm/xen/hypercall.h
1681  delete mode 100644 arch/ia64/include/asm/xen/hypervisor.h
1682  delete mode 100644 arch/ia64/include/asm/xen/inst.h
1683  delete mode 100644 arch/ia64/include/asm/xen/interface.h
1684  delete mode 100644 arch/ia64/include/asm/xen/irq.h
1685  delete mode 100644 arch/ia64/include/asm/xen/minstate.h
1686  delete mode 100644 arch/ia64/include/asm/xen/page-coherent.h
1687  delete mode 100644 arch/ia64/include/asm/xen/page.h
1688  delete mode 100644 arch/ia64/include/asm/xen/patchlist.h
1689  delete mode 100644 arch/ia64/include/asm/xen/privop.h
1690  delete mode 100644 arch/ia64/include/asm/xen/xcom_hcall.h
1691  delete mode 100644 arch/ia64/include/asm/xen/xencomm.h
1692  delete mode 100644 arch/ia64/xen/Kconfig
1693  delete mode 100644 arch/ia64/xen/Makefile
1694  delete mode 100644 arch/ia64/xen/gate-data.S
1695  delete mode 100644 arch/ia64/xen/grant-table.c
1696  delete mode 100644 arch/ia64/xen/hypercall.S
1697  delete mode 100644 arch/ia64/xen/hypervisor.c
1698  delete mode 100644 arch/ia64/xen/irq_xen.c
1699  delete mode 100644 arch/ia64/xen/irq_xen.h
1700  delete mode 100644 arch/ia64/xen/machvec.c
1701  delete mode 100644 arch/ia64/xen/suspend.c
1702  delete mode 100644 arch/ia64/xen/time.c
1703  delete mode 100644 arch/ia64/xen/time.h
1704  delete mode 100644 arch/ia64/xen/xcom_hcall.c
1705  delete mode 100644 arch/ia64/xen/xen_pv_ops.c
1706  delete mode 100644 arch/ia64/xen/xencomm.c
1707  delete mode 100644 arch/ia64/xen/xenivt.S
1708  delete mode 100644 arch/ia64/xen/xensetup.S
1709 Merging m68k/for-next (a0b7b242261c m68k/irq - Use polled IRQ flag for MFP timer cascaded interrupts)
1710 $ git merge m68k/for-next
1711 Merge made by the 'recursive' strategy.
1712  Documentation/zorro.txt                      |   5 +-
1713  arch/m68k/Kconfig                            |  24 ++
1714  arch/m68k/amiga/chipram.c                    |   2 +-
1715  arch/m68k/amiga/config.c                     |  63 +++--
1716  arch/m68k/amiga/platform.c                   |   9 +-
1717  arch/m68k/apollo/config.c                    |  26 +-
1718  arch/m68k/atari/ataints.c                    |   3 +
1719  arch/m68k/atari/config.c                     |  10 +-
1720  arch/m68k/atari/debug.c                      |   5 +-
1721  arch/m68k/bvme6000/config.c                  |   6 +-
1722  arch/m68k/configs/amiga_defconfig            |  50 +++-
1723  arch/m68k/configs/apollo_defconfig           |  49 +++-
1724  arch/m68k/configs/atari_defconfig            |  50 +++-
1725  arch/m68k/configs/bvme6000_defconfig         |  48 +++-
1726  arch/m68k/configs/hp300_defconfig            |  49 +++-
1727  arch/m68k/configs/mac_defconfig              |  51 +++-
1728  arch/m68k/configs/multi_defconfig            |  53 +++-
1729  arch/m68k/configs/mvme147_defconfig          |  48 +++-
1730  arch/m68k/configs/mvme16x_defconfig          |  49 +++-
1731  arch/m68k/configs/q40_defconfig              |  50 +++-
1732  arch/m68k/configs/sun3_defconfig             |  49 +++-
1733  arch/m68k/configs/sun3x_defconfig            |  49 +++-
1734  arch/m68k/emu/natfeat.c                      |   3 +-
1735  arch/m68k/hp300/config.c                     |  10 +-
1736  arch/m68k/include/asm/amigahw.h              |  28 +--
1737  arch/m68k/include/asm/apollohw.h             |  11 +-
1738  arch/m68k/include/asm/atarihw.h              |   2 +-
1739  arch/m68k/include/asm/bootinfo.h             | 360 +--------------------------
1740  arch/m68k/include/asm/hp300hw.h              |  20 +-
1741  arch/m68k/include/asm/kexec.h                |  29 +++
1742  arch/m68k/include/asm/macintosh.h            |  83 ++----
1743  arch/m68k/include/asm/mc146818rtc.h          |  10 +-
1744  arch/m68k/include/asm/mvme16xhw.h            |  17 --
1745  arch/m68k/include/asm/setup.h                |   5 +-
1746  arch/m68k/include/asm/timex.h                |  10 +
1747  arch/m68k/include/uapi/asm/Kbuild            |   8 +
1748  arch/m68k/include/uapi/asm/bootinfo-amiga.h  |  63 +++++
1749  arch/m68k/include/uapi/asm/bootinfo-apollo.h |  28 +++
1750  arch/m68k/include/uapi/asm/bootinfo-atari.h  |  44 ++++
1751  arch/m68k/include/uapi/asm/bootinfo-hp300.h  |  50 ++++
1752  arch/m68k/include/uapi/asm/bootinfo-mac.h    | 119 +++++++++
1753  arch/m68k/include/uapi/asm/bootinfo-q40.h    |  16 ++
1754  arch/m68k/include/uapi/asm/bootinfo-vme.h    |  70 ++++++
1755  arch/m68k/include/uapi/asm/bootinfo.h        | 174 +++++++++++++
1756  arch/m68k/include/uapi/asm/setup.h           |  87 -------
1757  arch/m68k/kernel/Makefile                    |   3 +
1758  arch/m68k/kernel/asm-offsets.c               |   3 +
1759  arch/m68k/kernel/bootinfo_proc.c             |  80 ++++++
1760  arch/m68k/kernel/head.S                      |  12 +-
1761  arch/m68k/kernel/machine_kexec.c             |  58 +++++
1762  arch/m68k/kernel/relocate_kernel.S           | 159 ++++++++++++
1763  arch/m68k/kernel/setup_mm.c                  |  62 +++--
1764  arch/m68k/kernel/time.c                      |   4 +
1765  arch/m68k/kernel/traps.c                     | 232 ++++++++---------
1766  arch/m68k/mac/config.c                       |  34 +--
1767  arch/m68k/mac/iop.c                          |   5 +-
1768  arch/m68k/mac/misc.c                         |   2 -
1769  arch/m68k/mac/oss.c                          |   1 -
1770  arch/m68k/mac/psc.c                          |   3 +-
1771  arch/m68k/mac/via.c                          |   1 -
1772  arch/m68k/mm/fault.c                         |  26 +-
1773  arch/m68k/mm/init.c                          |   2 +-
1774  arch/m68k/mm/kmap.c                          |  10 +-
1775  arch/m68k/mm/motorola.c                      |   2 +-
1776  arch/m68k/mvme147/config.c                   |   7 +-
1777  arch/m68k/mvme16x/config.c                   |  30 ++-
1778  arch/m68k/q40/config.c                       |   4 +-
1779  arch/m68k/sun3/dvma.c                        |   6 +-
1780  arch/m68k/sun3/mmu_emu.c                     |   3 +-
1781  arch/m68k/sun3/sun3dvma.c                    |   8 +-
1782  arch/m68k/sun3x/prom.c                       |   1 -
1783  drivers/block/z2ram.c                        |   7 +-
1784  drivers/ide/buddha.c                         |   2 +-
1785  drivers/macintosh/Kconfig                    |   2 +-
1786  drivers/net/ethernet/8390/hydra.c            |   2 +-
1787  drivers/net/ethernet/8390/zorro8390.c        |   4 +-
1788  drivers/net/ethernet/amd/a2065.c             |  13 +-
1789  drivers/net/ethernet/amd/ariadne.c           |  13 +-
1790  drivers/net/ethernet/natsemi/macsonic.c      |   1 -
1791  drivers/parport/parport_mfc3.c               |   2 +-
1792  drivers/scsi/a2091.c                         |   2 +-
1793  drivers/scsi/a3000.c                         |   2 +-
1794  drivers/scsi/a4000t.c                        |   2 +-
1795  drivers/scsi/gvp11.c                         |   2 +-
1796  drivers/scsi/zorro7xx.c                      |   2 +-
1797  drivers/video/amifb.c                        |   2 +-
1798  drivers/video/cirrusfb.c                     |   4 +-
1799  drivers/video/macfb.c                        |   1 -
1800  drivers/video/valkyriefb.c                   |   1 -
1801  drivers/zorro/Makefile                       |   3 +-
1802  drivers/zorro/names.c                        |  11 -
1803  drivers/zorro/proc.c                         |  10 +-
1804  drivers/zorro/zorro-driver.c                 |  11 +-
1805  drivers/zorro/zorro-sysfs.c                  |  22 +-
1806  drivers/zorro/zorro.c                        |  27 +-
1807  drivers/zorro/zorro.h                        |   5 +
1808  include/linux/zorro.h                        | 121 ++-------
1809  include/uapi/linux/Kbuild                    |   2 +
1810  include/uapi/linux/kexec.h                   |   1 +
1811  include/uapi/linux/zorro.h                   | 113 +++++++++
1812  include/{ => uapi}/linux/zorro_ids.h         |   0
1813  101 files changed, 1989 insertions(+), 1154 deletions(-)
1814  create mode 100644 arch/m68k/include/asm/kexec.h
1815  create mode 100644 arch/m68k/include/uapi/asm/bootinfo-amiga.h
1816  create mode 100644 arch/m68k/include/uapi/asm/bootinfo-apollo.h
1817  create mode 100644 arch/m68k/include/uapi/asm/bootinfo-atari.h
1818  create mode 100644 arch/m68k/include/uapi/asm/bootinfo-hp300.h
1819  create mode 100644 arch/m68k/include/uapi/asm/bootinfo-mac.h
1820  create mode 100644 arch/m68k/include/uapi/asm/bootinfo-q40.h
1821  create mode 100644 arch/m68k/include/uapi/asm/bootinfo-vme.h
1822  create mode 100644 arch/m68k/include/uapi/asm/bootinfo.h
1823  create mode 100644 arch/m68k/kernel/bootinfo_proc.c
1824  create mode 100644 arch/m68k/kernel/machine_kexec.c
1825  create mode 100644 arch/m68k/kernel/relocate_kernel.S
1826  create mode 100644 include/uapi/linux/zorro.h
1827  rename include/{ => uapi}/linux/zorro_ids.h (100%)
1828 Merging m68knommu/for-next (a695b9c8911e m68k : Kill CONFIG_MTD_PARTITIONS)
1829 $ git merge m68knommu/for-next
1830 Merge made by the 'recursive' strategy.
1831  arch/m68k/configs/m5208evb_defconfig | 1 -
1832  arch/m68k/configs/m5249evb_defconfig | 1 -
1833  arch/m68k/configs/m5272c3_defconfig  | 1 -
1834  arch/m68k/configs/m5275evb_defconfig | 1 -
1835  arch/m68k/configs/m5307c3_defconfig  | 1 -
1836  arch/m68k/configs/m5407c3_defconfig  | 1 -
1837  6 files changed, 6 deletions(-)
1838 Merging metag/for-next (e9a1d0165bbd metag/smp: Make boot_secondary() static)
1839 $ git merge metag/for-next
1840 Merge made by the 'recursive' strategy.
1841  arch/metag/include/asm/smp.h |  2 --
1842  arch/metag/kernel/dma.c      |  5 -----
1843  arch/metag/kernel/smp.c      | 15 ++++-----------
1844  arch/metag/kernel/topology.c |  1 +
1845  4 files changed, 5 insertions(+), 18 deletions(-)
1846 Merging microblaze/next (a23e64af1a9b microblaze: Simplify fcpu helper function)
1847 $ git merge microblaze/next
1848 Removing arch/microblaze/include/uapi/asm/types.h
1849 Merge made by the 'recursive' strategy.
1850  arch/microblaze/Makefile                 | 2 ++
1851  arch/microblaze/include/asm/cpuinfo.h    | 8 +++++---
1852  arch/microblaze/include/asm/sections.h   | 1 -
1853  arch/microblaze/include/uapi/asm/Kbuild  | 3 ++-
1854  arch/microblaze/include/uapi/asm/types.h | 1 -
1855  arch/microblaze/kernel/setup.c           | 5 ++---
1856  6 files changed, 11 insertions(+), 9 deletions(-)
1857  delete mode 100644 arch/microblaze/include/uapi/asm/types.h
1858 Merging mips/mips-for-linux-next (e7fbcb6b0030 Merge branch 'mips-next-3.14' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next)
1859 $ git merge mips/mips-for-linux-next
1860 Removing arch/mips/mti-malta/malta-console.c
1861 Auto-merging arch/mips/mm/c-r4k.c
1862 Removing arch/mips/bcm47xx/wgt634u.c
1863 Merge made by the 'recursive' strategy.
1864  arch/mips/Kconfig                                  | 224 ++++--
1865  arch/mips/Makefile                                 |   2 +-
1866  arch/mips/bcm47xx/Kconfig                          |   4 +
1867  arch/mips/bcm47xx/Makefile                         |   3 +-
1868  arch/mips/bcm47xx/bcm47xx_private.h                |  12 +
1869  arch/mips/bcm47xx/board.c                          |  34 +-
1870  arch/mips/bcm47xx/buttons.c                        | 531 ++++++++++++
1871  arch/mips/bcm47xx/irq.c                            |  25 +-
1872  arch/mips/bcm47xx/leds.c                           | 542 +++++++++++++
1873  arch/mips/bcm47xx/nvram.c                          |   2 +-
1874  arch/mips/bcm47xx/prom.c                           | 127 +--
1875  arch/mips/bcm47xx/serial.c                         |   6 +-
1876  arch/mips/bcm47xx/setup.c                          |  35 +
1877  arch/mips/bcm47xx/sprom.c                          |  18 +-
1878  arch/mips/bcm47xx/wgt634u.c                        | 174 ----
1879  arch/mips/bcm63xx/Kconfig                          |   8 +
1880  arch/mips/bcm63xx/Makefile                         |   4 +-
1881  arch/mips/bcm63xx/boards/board_bcm963xx.c          |   3 +
1882  arch/mips/bcm63xx/clk.c                            |  42 +
1883  arch/mips/bcm63xx/cpu.c                            |   6 +-
1884  arch/mips/bcm63xx/dev-hsspi.c                      |  47 ++
1885  arch/mips/bcm63xx/early_printk.c                   |   2 +-
1886  arch/mips/bcm63xx/prom.c                           |  14 +-
1887  arch/mips/boot/compressed/Makefile                 |   4 +-
1888  arch/mips/boot/compressed/decompress.c             |  22 -
1889  arch/mips/boot/compressed/string.c                 |  28 +
1890  arch/mips/boot/compressed/uart-16550.c             |   4 +-
1891  arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c |   1 +
1892  .../cavium-octeon/executive/cvmx-helper-board.c    |  27 +
1893  .../cavium-octeon/executive/cvmx-helper-util.c     |   4 +
1894  arch/mips/cavium-octeon/executive/cvmx-helper.c    |  10 +-
1895  arch/mips/cavium-octeon/executive/cvmx-pko.c       |   3 +-
1896  arch/mips/cavium-octeon/executive/cvmx-spi.c       |   1 +
1897  arch/mips/cavium-octeon/octeon-platform.c          |  38 +-
1898  arch/mips/cavium-octeon/octeon_3xxx.dts            |  19 +
1899  arch/mips/configs/ar7_defconfig                    |   1 -
1900  arch/mips/configs/bcm47xx_defconfig                | 623 +-------------
1901  arch/mips/configs/bcm63xx_defconfig                |   1 -
1902  arch/mips/configs/cobalt_defconfig                 |   1 -
1903  arch/mips/configs/gpr_defconfig                    |   1 -
1904  arch/mips/configs/jmr3927_defconfig                |   1 -
1905  arch/mips/configs/lasat_defconfig                  |   1 -
1906  arch/mips/configs/maltasmvp_defconfig              |   3 +-
1907  arch/mips/configs/markeins_defconfig               |   1 -
1908  arch/mips/configs/mtx1_defconfig                   |   1 -
1909  arch/mips/configs/pnx8335_stb225_defconfig         |   1 -
1910  arch/mips/configs/qi_lb60_defconfig                | 188 +++++
1911  arch/mips/configs/rb532_defconfig                  |   1 -
1912  arch/mips/configs/rbtx49xx_defconfig               |   1 -
1913  arch/mips/include/asm/amon.h                       |  15 +-
1914  arch/mips/include/asm/asmmacro-32.h                |  42 -
1915  arch/mips/include/asm/asmmacro-64.h                |  96 ---
1916  arch/mips/include/asm/asmmacro.h                   | 107 +++
1917  arch/mips/include/asm/bmips.h                      |  29 +-
1918  arch/mips/include/asm/cpu-features.h               |   7 +
1919  arch/mips/include/asm/cpu-info.h                   |   3 +
1920  arch/mips/include/asm/cpu-type.h                   |  15 +-
1921  arch/mips/include/asm/cpu.h                        |  12 +-
1922  arch/mips/include/asm/dma-coherence.h              |   9 +
1923  arch/mips/include/asm/dma-mapping.h                | 362 ++++++++-
1924  arch/mips/include/asm/elf.h                        |  31 +-
1925  arch/mips/include/asm/fpu.h                        | 104 ++-
1926  arch/mips/include/asm/mach-bcm47xx/bcm47xx.h       |   2 +
1927  arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h |   1 +
1928  .../asm/mach-bcm47xx/cpu-feature-overrides.h       |  82 ++
1929  arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h   |  18 +
1930  .../include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h   |   8 +
1931  arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h  | 120 ---
1932  arch/mips/include/asm/mach-generic/dma-coherence.h |   4 -
1933  arch/mips/include/asm/mach-jz4740/platform.h       |   1 +
1934  arch/mips/include/asm/mach-netlogic/irq.h          |   3 +-
1935  arch/mips/include/asm/mach-netlogic/multi-node.h   |  33 +-
1936  arch/mips/include/asm/mach-netlogic/topology.h     |  20 +
1937  arch/mips/include/asm/mips-boards/piix4.h          |   7 +
1938  arch/mips/include/asm/mipsregs.h                   |  85 +-
1939  arch/mips/include/asm/netlogic/common.h            |  24 +-
1940  arch/mips/include/asm/netlogic/mips-extns.h        |   7 +-
1941  arch/mips/include/asm/netlogic/xlp-hal/bridge.h    |  69 +-
1942  arch/mips/include/asm/netlogic/xlp-hal/iomap.h     |  48 +-
1943  arch/mips/include/asm/netlogic/xlp-hal/pcibus.h    |  41 +-
1944  arch/mips/include/asm/netlogic/xlp-hal/pic.h       |  77 +-
1945  arch/mips/include/asm/netlogic/xlp-hal/sys.h       |  18 +-
1946  arch/mips/include/asm/netlogic/xlp-hal/uart.h      |   3 +-
1947  arch/mips/include/asm/netlogic/xlp-hal/xlp.h       |  38 +-
1948  arch/mips/include/asm/netlogic/xlr/xlr.h           |   5 -
1949  arch/mips/include/asm/octeon/cvmx-helper-board.h   |   9 +
1950  arch/mips/include/asm/page.h                       |  25 +
1951  arch/mips/include/asm/rtlx.h                       |  49 +-
1952  arch/mips/include/asm/switch_to.h                  |  16 +-
1953  arch/mips/include/asm/syscall.h                    |   2 +-
1954  arch/mips/include/asm/thread_info.h                |   4 +-
1955  arch/mips/include/asm/tlb.h                        |   4 +
1956  arch/mips/include/asm/vpe.h                        | 136 +++-
1957  arch/mips/include/uapi/asm/inst.h                  |   7 +-
1958  arch/mips/jz4740/board-qi_lb60.c                   |   1 +
1959  arch/mips/jz4740/platform.c                        |  40 +-
1960  arch/mips/kernel/Makefile                          |   5 +
1961  arch/mips/kernel/binfmt_elfo32.c                   |  14 +
1962  arch/mips/kernel/bmips_vec.S                       |  55 +-
1963  arch/mips/kernel/cpu-probe.c                       | 103 ++-
1964  arch/mips/kernel/genex.S                           |   1 +
1965  arch/mips/kernel/idle.c                            |   2 +
1966  arch/mips/kernel/proc.c                            |  48 +-
1967  arch/mips/kernel/process.c                         |   6 +-
1968  arch/mips/kernel/ptrace.c                          |  60 +-
1969  arch/mips/kernel/ptrace32.c                        |  53 +-
1970  arch/mips/kernel/r4k_fpu.S                         |  74 +-
1971  arch/mips/kernel/r4k_switch.S                      |  45 +-
1972  arch/mips/kernel/rtlx-cmp.c                        | 116 +++
1973  arch/mips/kernel/rtlx-mt.c                         | 148 ++++
1974  arch/mips/kernel/rtlx.c                            | 274 ++-----
1975  arch/mips/kernel/segment.c                         | 110 +++
1976  arch/mips/kernel/signal.c                          |  10 +-
1977  arch/mips/kernel/signal32.c                        |  10 +-
1978  arch/mips/kernel/smp-bmips.c                       | 312 ++++---
1979  arch/mips/kernel/smp-cmp.c                         |   3 +
1980  arch/mips/kernel/smp-mt.c                          |  28 +
1981  arch/mips/kernel/spram.c                           |   2 +
1982  arch/mips/kernel/traps.c                           |  71 +-
1983  arch/mips/kernel/vpe-cmp.c                         | 180 +++++
1984  arch/mips/kernel/vpe-mt.c                          | 523 ++++++++++++
1985  arch/mips/kernel/vpe.c                             | 893 +++------------------
1986  arch/mips/lantiq/xway/dma.c                        |   4 -
1987  arch/mips/math-emu/cp1emu.c                        |  42 +-
1988  arch/mips/math-emu/kernel_linkage.c                |   6 +-
1989  arch/mips/mm/c-r4k.c                               |  26 +-
1990  arch/mips/mm/dma-default.c                         | 165 +---
1991  arch/mips/mm/init.c                                |   2 -
1992  arch/mips/mm/sc-mips.c                             |   2 +
1993  arch/mips/mm/tlb-r4k.c                             |  48 +-
1994  arch/mips/mm/tlbex.c                               |   1 +
1995  arch/mips/mti-malta/Makefile                       |   2 -
1996  arch/mips/mti-malta/malta-amon.c                   |  48 +-
1997  arch/mips/mti-malta/malta-console.c                |  47 --
1998  arch/mips/mti-malta/malta-init.c                   |  58 +-
1999  arch/mips/mti-malta/malta-int.c                    | 127 +--
2000  arch/mips/mti-malta/malta-platform.c               |   2 +
2001  arch/mips/mti-malta/malta-time.c                   |  16 +-
2002  arch/mips/mti-sead3/Makefile                       |   2 +
2003  arch/mips/mti-sead3/sead3-setup.c                  |  84 +-
2004  arch/mips/mti-sead3/sead3-time.c                   |   4 -
2005  arch/mips/mti-sead3/sead3.dts                      |   4 -
2006  arch/mips/netlogic/Kconfig                         |   9 +
2007  arch/mips/netlogic/common/earlycons.c              |   2 +
2008  arch/mips/netlogic/common/irq.c                    |  72 +-
2009  arch/mips/netlogic/common/reset.S                  |  62 +-
2010  arch/mips/netlogic/common/smp.c                    |   8 +-
2011  arch/mips/netlogic/common/smpboot.S                |   3 +-
2012  arch/mips/netlogic/dts/Makefile                    |   1 +
2013  arch/mips/netlogic/dts/xlp_gvp.dts                 |  76 ++
2014  arch/mips/netlogic/xlp/dt.c                        |   7 +-
2015  arch/mips/netlogic/xlp/nlm_hal.c                   |  71 +-
2016  arch/mips/netlogic/xlp/setup.c                     |  25 +-
2017  arch/mips/netlogic/xlp/usb-init-xlp2.c             |  88 +-
2018  arch/mips/netlogic/xlp/wakeup.c                    |  91 ++-
2019  arch/mips/netlogic/xlr/platform.c                  |   4 +-
2020  arch/mips/netlogic/xlr/setup.c                     |  20 -
2021  arch/mips/netlogic/xlr/wakeup.c                    |   2 +-
2022  arch/mips/oprofile/common.c                        |   2 +
2023  arch/mips/oprofile/op_model_mipsxx.c               |   8 +
2024  arch/mips/pci/Makefile                             |   1 +
2025  arch/mips/pci/fixup-malta.c                        |  11 +
2026  arch/mips/pci/msi-xlp.c                            | 494 ++++++++++++
2027  arch/mips/pci/pci-malta.c                          |   6 +-
2028  arch/mips/pci/pci-rt3883.c                         |   3 -
2029  arch/mips/pci/pci-xlp.c                            | 110 ++-
2030  arch/mips/pmcs-msp71xx/Kconfig                     |   1 +
2031  arch/mips/ralink/Kconfig                           |   1 +
2032  drivers/bcma/Kconfig                               |   1 +
2033  drivers/bcma/driver_gpio.c                         | 137 +++-
2034  drivers/ssb/Kconfig                                |   1 +
2035  drivers/ssb/driver_gpio.c                          | 306 ++++++-
2036  drivers/ssb/main.c                                 |  12 +-
2037  drivers/tty/serial/bcm63xx_uart.c                  |   9 +-
2038  include/linux/bcma/bcma_driver_chipcommon.h        |   1 +
2039  include/linux/serial_bcm63xx.h                     | 119 +++
2040  include/linux/ssb/ssb.h                            |   1 +
2041  177 files changed, 7013 insertions(+), 3278 deletions(-)
2042  create mode 100644 arch/mips/bcm47xx/bcm47xx_private.h
2043  create mode 100644 arch/mips/bcm47xx/buttons.c
2044  create mode 100644 arch/mips/bcm47xx/leds.c
2045  delete mode 100644 arch/mips/bcm47xx/wgt634u.c
2046  create mode 100644 arch/mips/bcm63xx/dev-hsspi.c
2047  create mode 100644 arch/mips/boot/compressed/string.c
2048  create mode 100644 arch/mips/configs/qi_lb60_defconfig
2049  create mode 100644 arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h
2050  create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h
2051  create mode 100644 arch/mips/include/asm/mach-netlogic/topology.h
2052  create mode 100644 arch/mips/kernel/rtlx-cmp.c
2053  create mode 100644 arch/mips/kernel/rtlx-mt.c
2054  create mode 100644 arch/mips/kernel/segment.c
2055  create mode 100644 arch/mips/kernel/vpe-cmp.c
2056  create mode 100644 arch/mips/kernel/vpe-mt.c
2057  delete mode 100644 arch/mips/mti-malta/malta-console.c
2058  create mode 100644 arch/mips/netlogic/dts/xlp_gvp.dts
2059  create mode 100644 arch/mips/pci/msi-xlp.c
2060  create mode 100644 include/linux/serial_bcm63xx.h
2061 Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done())
2062 $ git merge openrisc/for-upstream
2063 Merge made by the 'recursive' strategy.
2064  arch/openrisc/kernel/entry.S  |  59 ++++++-----
2065  arch/openrisc/kernel/signal.c | 233 +++++++++++++++++++++---------------------
2066  2 files changed, 149 insertions(+), 143 deletions(-)
2067 Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
2068 $ git merge parisc/for-next
2069 Already up-to-date.
2070 Merging parisc-hd/for-next (7d1c153ab373 Merge branch 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
2071 $ git merge parisc-hd/for-next
2072 Already up-to-date.
2073 Merging powerpc/next (fac515db4520 Merge remote-tracking branch 'scott/next' into next)
2074 $ git merge powerpc/next
2075 Auto-merging mm/mempolicy.c
2076 Auto-merging include/linux/mm.h
2077 Auto-merging arch/powerpc/kernel/process.c
2078 Auto-merging arch/powerpc/kernel/asm-offsets.c
2079 Removing arch/powerpc/configs/85xx/p1023_defconfig
2080 Removing arch/powerpc/boot/dts/p1010rdb.dts
2081 Auto-merging arch/powerpc/boot/dts/p1010rdb-pa_36b.dts
2082 Merge made by the 'recursive' strategy.
2083  .../devicetree/bindings/video/ssd1289fb.txt        |  13 +
2084  arch/powerpc/Kconfig                               |  14 +-
2085  arch/powerpc/boot/.gitignore                       |   1 +
2086  arch/powerpc/boot/Makefile                         |   7 +-
2087  arch/powerpc/boot/dts/fsl/elo3-dma-2.dtsi          |  82 +++++
2088  arch/powerpc/boot/dts/fsl/p1020si-post.dtsi        |   3 +-
2089  arch/powerpc/boot/dts/fsl/p1021si-post.dtsi        |   3 +-
2090  arch/powerpc/boot/dts/fsl/p1022si-post.dtsi        |   3 +-
2091  arch/powerpc/boot/dts/fsl/p1023si-post.dtsi        |   3 +-
2092  arch/powerpc/boot/dts/kilauea.dts                  |   2 +-
2093  arch/powerpc/boot/dts/mvme5100.dts                 | 185 ++++++++++
2094  arch/powerpc/boot/dts/p1010rdb-pa.dts              |  23 ++
2095  arch/powerpc/boot/dts/p1010rdb-pa.dtsi             |  85 +++++
2096  .../dts/{p1010rdb_36b.dts => p1010rdb-pa_36b.dts}  |  47 +--
2097  arch/powerpc/boot/dts/p1010rdb-pb.dts              |  35 ++
2098  arch/powerpc/boot/dts/p1010rdb-pb_36b.dts          |  58 +++
2099  arch/powerpc/boot/dts/p1010rdb.dts                 |  66 ----
2100  arch/powerpc/boot/dts/p1010rdb.dtsi                |  43 +--
2101  arch/powerpc/boot/dts/p1010rdb_32b.dtsi            |  79 +++++
2102  arch/powerpc/boot/dts/p1010rdb_36b.dtsi            |  79 +++++
2103  arch/powerpc/boot/dts/p1022ds.dtsi                 |   3 +-
2104  arch/powerpc/boot/dts/p1025twr.dts                 |  95 +++++
2105  arch/powerpc/boot/dts/p1025twr.dtsi                | 280 +++++++++++++++
2106  arch/powerpc/boot/dts/virtex440-ml507.dts          |   2 +
2107  arch/powerpc/boot/mvme5100.c                       |  27 ++
2108  arch/powerpc/boot/wrapper                          |   4 +
2109  arch/powerpc/configs/85xx/p1023_defconfig          | 188 ----------
2110  arch/powerpc/configs/adder875_defconfig            |   1 +
2111  arch/powerpc/configs/ep88xc_defconfig              |   1 +
2112  arch/powerpc/configs/mpc85xx_defconfig             |   3 +
2113  arch/powerpc/configs/mpc85xx_smp_defconfig         |   3 +
2114  arch/powerpc/configs/mpc866_ads_defconfig          |   1 +
2115  arch/powerpc/configs/mpc885_ads_defconfig          |   1 +
2116  arch/powerpc/configs/mvme5100_defconfig            | 144 ++++++++
2117  arch/powerpc/configs/ppc64_defconfig               |   1 +
2118  arch/powerpc/configs/tqm8xx_defconfig              |   1 +
2119  arch/powerpc/include/asm/bitops.h                  |   5 +
2120  arch/powerpc/include/asm/cache.h                   |  14 +-
2121  arch/powerpc/include/asm/code-patching.h           |   7 +
2122  arch/powerpc/include/asm/cputable.h                |  12 +
2123  arch/powerpc/include/asm/eeh.h                     |   4 +-
2124  arch/powerpc/include/asm/exception-64s.h           |  21 +-
2125  arch/powerpc/include/asm/fsl_lbc.h                 |   2 +-
2126  arch/powerpc/include/asm/hardirq.h                 |   3 +-
2127  arch/powerpc/include/asm/io.h                      |  16 +
2128  arch/powerpc/include/asm/iommu.h                   |  54 ++-
2129  arch/powerpc/include/asm/kvm_asm.h                 |   1 +
2130  arch/powerpc/include/asm/lppaca.h                  |   2 -
2131  arch/powerpc/include/asm/mce.h                     | 197 +++++++++++
2132  arch/powerpc/include/asm/mmu-book3e.h              |  13 +
2133  arch/powerpc/include/asm/mmu.h                     |  21 +-
2134  arch/powerpc/include/asm/opal.h                    | 106 +++++-
2135  arch/powerpc/include/asm/paca.h                    |  16 +-
2136  arch/powerpc/include/asm/pgtable.h                 |  66 +++-
2137  arch/powerpc/include/asm/ppc_asm.h                 |  14 +-
2138  arch/powerpc/include/asm/processor.h               |   8 +-
2139  arch/powerpc/include/asm/ps3.h                     |   1 -
2140  arch/powerpc/include/asm/pte-hash64.h              |   8 +-
2141  arch/powerpc/include/asm/reg.h                     |   2 +
2142  arch/powerpc/include/asm/reg_booke.h               |  10 +
2143  arch/powerpc/include/asm/thread_info.h             |   9 +-
2144  arch/powerpc/include/asm/tm.h                      |   1 +
2145  arch/powerpc/include/asm/topology.h                |  10 +-
2146  arch/powerpc/include/asm/vio.h                     |   1 -
2147  arch/powerpc/kernel/Makefile                       |   1 +
2148  arch/powerpc/kernel/asm-offsets.c                  |  13 +
2149  arch/powerpc/kernel/cacheinfo.c                    |   1 -
2150  arch/powerpc/kernel/cpu_setup_fsl_booke.S          |  54 +++
2151  arch/powerpc/kernel/cpu_setup_power.S              |  38 +-
2152  arch/powerpc/kernel/cputable.c                     |  16 +
2153  arch/powerpc/kernel/crash.c                        |   1 -
2154  arch/powerpc/kernel/dma-iommu.c                    |   4 +-
2155  arch/powerpc/kernel/eeh.c                          |  17 +-
2156  arch/powerpc/kernel/eeh_driver.c                   |  12 +-
2157  arch/powerpc/kernel/eeh_pe.c                       |   4 +-
2158  arch/powerpc/kernel/entry_64.S                     |  12 +-
2159  arch/powerpc/kernel/exceptions-64e.S               |  27 +-
2160  arch/powerpc/kernel/exceptions-64s.S               | 242 +++++++++++--
2161  arch/powerpc/kernel/fpu.S                          |  16 +
2162  arch/powerpc/kernel/fsl_booke_entry_mapping.S      |   2 +
2163  arch/powerpc/kernel/head_64.S                      |   1 +
2164  arch/powerpc/kernel/head_fsl_booke.S               | 266 ++++++++++++--
2165  arch/powerpc/kernel/hw_breakpoint.c                |   1 -
2166  arch/powerpc/kernel/idle_power7.S                  |   1 +
2167  arch/powerpc/kernel/iomap.c                        |   1 -
2168  arch/powerpc/kernel/iommu.c                        | 145 ++++----
2169  arch/powerpc/kernel/irq.c                          |  12 +-
2170  arch/powerpc/kernel/kgdb.c                         |   1 -
2171  arch/powerpc/kernel/mce.c                          | 352 +++++++++++++++++++
2172  arch/powerpc/kernel/mce_power.c                    | 284 +++++++++++++++
2173  arch/powerpc/kernel/misc_32.S                      |   4 +-
2174  arch/powerpc/kernel/misc_64.S                      |   6 +
2175  arch/powerpc/kernel/paca.c                         |  37 +-
2176  arch/powerpc/kernel/process.c                      | 177 +++++++++-
2177  arch/powerpc/kernel/prom.c                         |  41 ++-
2178  arch/powerpc/kernel/setup_64.c                     |  47 ++-
2179  arch/powerpc/kernel/signal.c                       |   3 +-
2180  arch/powerpc/kernel/signal_32.c                    |  21 +-
2181  arch/powerpc/kernel/signal_64.c                    |  14 +-
2182  arch/powerpc/kernel/smp-tbsync.c                   |   1 -
2183  arch/powerpc/kernel/smp.c                          |   9 +-
2184  arch/powerpc/kernel/swsusp_booke.S                 |  32 +-
2185  arch/powerpc/kernel/syscalls.c                     |   1 -
2186  arch/powerpc/kernel/sysfs.c                        | 388 +++++++++++++++++++--
2187  arch/powerpc/kernel/time.c                         |  14 +-
2188  arch/powerpc/kernel/traps.c                        |  72 +++-
2189  arch/powerpc/kernel/vdso32/vdso32_wrapper.S        |   1 -
2190  arch/powerpc/kernel/vdso64/vdso64_wrapper.S        |   1 -
2191  arch/powerpc/kernel/vector.S                       |  10 +
2192  arch/powerpc/kernel/vio.c                          |  31 +-
2193  arch/powerpc/kvm/book3s_hv_ras.c                   |  50 ++-
2194  arch/powerpc/kvm/bookehv_interrupts.S              |   2 +
2195  arch/powerpc/lib/code-patching.c                   |  15 +
2196  arch/powerpc/lib/crtsavres.S                       | 186 ++++++++++
2197  arch/powerpc/math-emu/math_efp.c                   | 316 ++++++++++++-----
2198  arch/powerpc/mm/fsl_booke_mmu.c                    |  80 ++++-
2199  arch/powerpc/mm/hash_low_64.S                      |  15 +-
2200  arch/powerpc/mm/hash_utils_64.c                    |   7 +-
2201  arch/powerpc/mm/hugepage-hash64.c                  |   6 +-
2202  arch/powerpc/mm/hugetlbpage-book3e.c               |  54 ++-
2203  arch/powerpc/mm/hugetlbpage-hash64.c               |   4 +
2204  arch/powerpc/mm/mem.c                              |   8 +-
2205  arch/powerpc/mm/mmu_decl.h                         |   2 +
2206  arch/powerpc/mm/numa.c                             |  96 ++++-
2207  arch/powerpc/mm/pgtable.c                          |   3 +-
2208  arch/powerpc/mm/pgtable_32.c                       |   1 +
2209  arch/powerpc/mm/pgtable_64.c                       |  15 +-
2210  arch/powerpc/mm/tlb_hash64.c                       |   1 -
2211  arch/powerpc/mm/tlb_low_64e.S                      | 174 ++++++++-
2212  arch/powerpc/mm/tlb_nohash.c                       | 112 +++---
2213  arch/powerpc/mm/tlb_nohash_low.S                   |   4 +-
2214  arch/powerpc/oprofile/op_model_7450.c              |   1 -
2215  arch/powerpc/oprofile/op_model_cell.c              |   1 -
2216  arch/powerpc/oprofile/op_model_fsl_emb.c           |   1 -
2217  arch/powerpc/oprofile/op_model_pa6t.c              |   1 -
2218  arch/powerpc/oprofile/op_model_power4.c            |   1 -
2219  arch/powerpc/oprofile/op_model_rs64.c              |   1 -
2220  arch/powerpc/platforms/83xx/Kconfig                |   1 -
2221  arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c     |   1 -
2222  arch/powerpc/platforms/83xx/suspend.c              |   1 -
2223  arch/powerpc/platforms/85xx/Kconfig                |   6 +
2224  arch/powerpc/platforms/85xx/Makefile               |   1 +
2225  arch/powerpc/platforms/85xx/common.c               |  38 ++
2226  arch/powerpc/platforms/85xx/mpc85xx.h              |   6 +
2227  arch/powerpc/platforms/85xx/mpc85xx_mds.c          |  29 +-
2228  arch/powerpc/platforms/85xx/mpc85xx_rdb.c          |  25 +-
2229  arch/powerpc/platforms/85xx/sgy_cts1000.c          |   1 -
2230  arch/powerpc/platforms/85xx/smp.c                  |  17 +-
2231  arch/powerpc/platforms/85xx/twr_p102x.c            | 147 ++++++++
2232  arch/powerpc/platforms/8xx/Kconfig                 |   1 -
2233  arch/powerpc/platforms/Kconfig.cputype             |   1 +
2234  arch/powerpc/platforms/cell/beat_htab.c            |   4 +-
2235  arch/powerpc/platforms/cell/iommu.c                |  14 +-
2236  arch/powerpc/platforms/chrp/smp.c                  |   1 -
2237  arch/powerpc/platforms/embedded6xx/Kconfig         |  13 +-
2238  arch/powerpc/platforms/embedded6xx/Makefile        |   1 +
2239  arch/powerpc/platforms/embedded6xx/hlwd-pic.c      |   1 -
2240  arch/powerpc/platforms/embedded6xx/mvme5100.c      | 221 ++++++++++++
2241  arch/powerpc/platforms/pasemi/dma_lib.c            |   1 -
2242  arch/powerpc/platforms/pasemi/iommu.c              |   5 +-
2243  arch/powerpc/platforms/powermac/pfunc_core.c       |   1 -
2244  arch/powerpc/platforms/powernv/Kconfig             |   5 -
2245  arch/powerpc/platforms/powernv/Makefile            |   1 +
2246  arch/powerpc/platforms/powernv/eeh-ioda.c          | 155 +-------
2247  arch/powerpc/platforms/powernv/eeh-powernv.c       |  24 +-
2248  arch/powerpc/platforms/powernv/opal-flash.c        |  35 +-
2249  .../powerpc/platforms/powernv/opal-memory-errors.c | 146 ++++++++
2250  arch/powerpc/platforms/powernv/opal-rtc.c          |   6 +-
2251  arch/powerpc/platforms/powernv/opal-wrappers.S     |   2 +
2252  arch/powerpc/platforms/powernv/opal.c              | 251 +++++++------
2253  arch/powerpc/platforms/powernv/pci-ioda.c          |  11 +-
2254  arch/powerpc/platforms/powernv/pci-p5ioc2.c        |   2 +-
2255  arch/powerpc/platforms/powernv/pci.c               | 230 ++++++++----
2256  arch/powerpc/platforms/powernv/pci.h               |   3 +
2257  arch/powerpc/platforms/ps3/spu.c                   |   2 +-
2258  arch/powerpc/platforms/pseries/Kconfig             |   2 +-
2259  arch/powerpc/platforms/pseries/cmm.c               |   1 -
2260  arch/powerpc/platforms/pseries/dtl.c               |   1 -
2261  arch/powerpc/platforms/pseries/eeh_pseries.c       |   4 +-
2262  arch/powerpc/platforms/pseries/iommu.c             | 167 +++------
2263  arch/powerpc/platforms/pseries/lpar.c              |   5 +-
2264  arch/powerpc/platforms/pseries/processor_idle.c    |   3 -
2265  arch/powerpc/platforms/pseries/setup.c             |   4 +-
2266  arch/powerpc/platforms/wsp/wsp_pci.c               |  11 +-
2267  arch/powerpc/sysdev/Kconfig                        |   2 +-
2268  arch/powerpc/sysdev/cpm2_pic.c                     |   1 -
2269  arch/powerpc/sysdev/fsl_ifc.c                      |   1 -
2270  arch/powerpc/sysdev/fsl_lbc.c                      |  31 +-
2271  arch/powerpc/sysdev/fsl_pci.c                      |   5 +-
2272  arch/powerpc/sysdev/ge/ge_pic.h                    |   1 -
2273  arch/powerpc/sysdev/i8259.c                        |   1 -
2274  arch/powerpc/sysdev/indirect_pci.c                 |   6 +-
2275  arch/powerpc/sysdev/mpc8xx_pic.c                   |   1 -
2276  arch/powerpc/sysdev/mpic_timer.c                   |  10 +-
2277  arch/powerpc/sysdev/qe_lib/qe_io.c                 |   1 -
2278  arch/powerpc/sysdev/qe_lib/ucc.c                   |   1 -
2279  arch/powerpc/sysdev/qe_lib/ucc_fast.c              |   1 -
2280  arch/powerpc/sysdev/qe_lib/ucc_slow.c              |   1 -
2281  arch/powerpc/sysdev/udbg_memcons.c                 |   1 -
2282  arch/powerpc/sysdev/xics/icp-hv.c                  |   1 -
2283  arch/powerpc/xmon/xmon.c                           |   4 +
2284  drivers/macintosh/windfarm_lm75_sensor.c           |   2 +-
2285  drivers/macintosh/windfarm_max6690_sensor.c        |   2 +-
2286  drivers/net/ethernet/ibm/ibmveth.c                 |  12 +-
2287  drivers/tty/Kconfig                                |   2 +-
2288  drivers/vfio/vfio_iommu_spapr_tce.c                |  28 +-
2289  include/linux/mm.h                                 |   2 +-
2290  include/linux/of_fdt.h                             |   1 +
2291  include/math-emu/op-common.h                       |   9 +-
2292  mm/mempolicy.c                                     |   5 +-
2293  scripts/mod/modpost.c                              |   8 +-
2294  211 files changed, 6002 insertions(+), 1547 deletions(-)
2295  create mode 100644 Documentation/devicetree/bindings/video/ssd1289fb.txt
2296  create mode 100644 arch/powerpc/boot/dts/fsl/elo3-dma-2.dtsi
2297  create mode 100644 arch/powerpc/boot/dts/mvme5100.dts
2298  create mode 100644 arch/powerpc/boot/dts/p1010rdb-pa.dts
2299  create mode 100644 arch/powerpc/boot/dts/p1010rdb-pa.dtsi
2300  rename arch/powerpc/boot/dts/{p1010rdb_36b.dts => p1010rdb-pa_36b.dts} (64%)
2301  create mode 100644 arch/powerpc/boot/dts/p1010rdb-pb.dts
2302  create mode 100644 arch/powerpc/boot/dts/p1010rdb-pb_36b.dts
2303  delete mode 100644 arch/powerpc/boot/dts/p1010rdb.dts
2304  create mode 100644 arch/powerpc/boot/dts/p1010rdb_32b.dtsi
2305  create mode 100644 arch/powerpc/boot/dts/p1010rdb_36b.dtsi
2306  create mode 100644 arch/powerpc/boot/dts/p1025twr.dts
2307  create mode 100644 arch/powerpc/boot/dts/p1025twr.dtsi
2308  create mode 100644 arch/powerpc/boot/mvme5100.c
2309  delete mode 100644 arch/powerpc/configs/85xx/p1023_defconfig
2310  create mode 100644 arch/powerpc/configs/mvme5100_defconfig
2311  create mode 100644 arch/powerpc/include/asm/mce.h
2312  create mode 100644 arch/powerpc/kernel/mce.c
2313  create mode 100644 arch/powerpc/kernel/mce_power.c
2314  create mode 100644 arch/powerpc/platforms/85xx/twr_p102x.c
2315  create mode 100644 arch/powerpc/platforms/embedded6xx/mvme5100.c
2316  create mode 100644 arch/powerpc/platforms/powernv/opal-memory-errors.c
2317 Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs)
2318 $ git merge mpc5xxx/next
2319 Auto-merging drivers/spi/spi-mpc512x-psc.c
2320 Removing arch/powerpc/platforms/512x/clock.c
2321 Removing arch/powerpc/kernel/clock.c
2322 Removing arch/powerpc/include/asm/clk_interface.h
2323 Auto-merging arch/powerpc/Kconfig
2324 Merge made by the 'recursive' strategy.
2325  arch/powerpc/Kconfig                          |    5 -
2326  arch/powerpc/boot/dts/ac14xx.dts              |    7 +
2327  arch/powerpc/boot/dts/mpc5121.dtsi            |  113 ++-
2328  arch/powerpc/boot/dts/mpc5125twr.dts          |   53 +-
2329  arch/powerpc/include/asm/clk_interface.h      |   20 -
2330  arch/powerpc/include/asm/mpc5121.h            |    7 +-
2331  arch/powerpc/kernel/Makefile                  |    1 -
2332  arch/powerpc/kernel/clock.c                   |   82 --
2333  arch/powerpc/platforms/512x/Kconfig           |    2 +-
2334  arch/powerpc/platforms/512x/Makefile          |    3 +-
2335  arch/powerpc/platforms/512x/clock-commonclk.c | 1221 +++++++++++++++++++++++++
2336  arch/powerpc/platforms/512x/clock.c           |  754 ---------------
2337  arch/powerpc/platforms/512x/mpc512x_shared.c  |  169 ++--
2338  arch/powerpc/platforms/52xx/Kconfig           |    2 +-
2339  drivers/media/platform/fsl-viu.c              |    2 +-
2340  drivers/mtd/nand/mpc5121_nfc.c                |    2 +-
2341  drivers/net/can/mscan/mpc5xxx_can.c           |  270 +++---
2342  drivers/spi/spi-mpc512x-psc.c                 |   26 +-
2343  drivers/tty/serial/mpc52xx_uart.c             |   90 +-
2344  drivers/usb/host/fsl-mph-dr-of.c              |   13 +-
2345  include/dt-bindings/clock/mpc512x-clock.h     |   76 ++
2346  include/linux/clk-provider.h                  |   16 +
2347  22 files changed, 1840 insertions(+), 1094 deletions(-)
2348  delete mode 100644 arch/powerpc/include/asm/clk_interface.h
2349  delete mode 100644 arch/powerpc/kernel/clock.c
2350  create mode 100644 arch/powerpc/platforms/512x/clock-commonclk.c
2351  delete mode 100644 arch/powerpc/platforms/512x/clock.c
2352  create mode 100644 include/dt-bindings/clock/mpc512x-clock.h
2353 Merging galak/next (9e2ecdbba3b0 powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
2354 $ git merge galak/next
2355 Already up-to-date.
2356 Merging s390/features (1c59a861d698 s390/qdio: bridgeport support - CHSC part)
2357 $ git merge s390/features
2358 Auto-merging drivers/s390/char/tty3270.c
2359 Auto-merging arch/s390/pci/pci_event.c
2360 Auto-merging arch/s390/kernel/smp.c
2361 Merge made by the 'recursive' strategy.
2362  Documentation/kmsg/s390/zcrypt         |   20 +
2363  arch/s390/include/asm/compat.h         |    3 +-
2364  arch/s390/include/asm/cpu_mf.h         |  181 ++++
2365  arch/s390/include/asm/css_chars.h      |    2 +
2366  arch/s390/include/asm/pci.h            |    1 +
2367  arch/s390/include/asm/perf_event.h     |   80 +-
2368  arch/s390/include/asm/qdio.h           |   33 +
2369  arch/s390/include/asm/sclp.h           |    4 +-
2370  arch/s390/include/uapi/asm/zcrypt.h    |   65 ++
2371  arch/s390/kernel/Makefile              |    3 +-
2372  arch/s390/kernel/compat_signal.c       |    5 +-
2373  arch/s390/kernel/entry64.S             |    6 +-
2374  arch/s390/kernel/perf_cpum_cf.c        |    1 +
2375  arch/s390/kernel/perf_cpum_cf_events.c |  322 +++++++
2376  arch/s390/kernel/perf_cpum_sf.c        | 1641 ++++++++++++++++++++++++++++++++
2377  arch/s390/kernel/perf_event.c          |  174 +++-
2378  arch/s390/kernel/process.c             |   14 +-
2379  arch/s390/kernel/ptrace.c              |   27 +-
2380  arch/s390/kernel/s390_ksyms.c          |    2 +-
2381  arch/s390/kernel/smp.c                 |   19 +-
2382  arch/s390/oprofile/hwsampler.c         |   78 +-
2383  arch/s390/oprofile/hwsampler.h         |   52 +-
2384  arch/s390/oprofile/init.c              |   23 +-
2385  arch/s390/pci/pci.c                    |   16 +-
2386  arch/s390/pci/pci_dma.c                |   13 +-
2387  arch/s390/pci/pci_event.c              |   26 +-
2388  drivers/s390/char/sclp.h               |    1 -
2389  drivers/s390/char/sclp_cmd.c           |    2 -
2390  drivers/s390/char/sclp_early.c         |  125 +--
2391  drivers/s390/char/tty3270.c            |    7 +-
2392  drivers/s390/cio/blacklist.c           |    6 +-
2393  drivers/s390/cio/ccwgroup.c            |   12 +-
2394  drivers/s390/cio/chsc.c                |   73 +-
2395  drivers/s390/cio/chsc.h                |   51 +-
2396  drivers/s390/cio/css.c                 |   26 +-
2397  drivers/s390/cio/css.h                 |    1 +
2398  drivers/s390/cio/device.c              |   29 +-
2399  drivers/s390/cio/qdio_main.c           |   91 ++
2400  drivers/s390/crypto/ap_bus.c           |   31 +-
2401  drivers/s390/crypto/ap_bus.h           |    4 +-
2402  drivers/s390/crypto/zcrypt_api.c       |  109 ++-
2403  drivers/s390/crypto/zcrypt_api.h       |    2 +
2404  drivers/s390/crypto/zcrypt_cex4.c      |   20 +-
2405  drivers/s390/crypto/zcrypt_error.h     |   18 +-
2406  drivers/s390/crypto/zcrypt_msgtype50.c |   12 +
2407  drivers/s390/crypto/zcrypt_msgtype6.c  |  260 +++++
2408  drivers/s390/crypto/zcrypt_msgtype6.h  |    2 +
2409  drivers/s390/crypto/zcrypt_pcica.c     |   11 +
2410  drivers/s390/crypto/zcrypt_pcicc.c     |   12 +
2411  49 files changed, 3374 insertions(+), 342 deletions(-)
2412  create mode 100644 Documentation/kmsg/s390/zcrypt
2413  create mode 100644 arch/s390/kernel/perf_cpum_cf_events.c
2414  create mode 100644 arch/s390/kernel/perf_cpum_sf.c
2415 Merging sh/sh-latest (37284bd93103 Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest)
2416 $ git merge sh/sh-latest
2417 Resolved 'arch/sh/kernel/cpu/sh2a/Makefile' using previous resolution.
2418 Auto-merging include/linux/serial_sci.h
2419 CONFLICT (content): Merge conflict in include/linux/serial_sci.h
2420 Auto-merging drivers/tty/serial/sh-sci.c
2421 CONFLICT (content): Merge conflict in drivers/tty/serial/sh-sci.c
2422 Auto-merging arch/sh/kernel/cpu/sh2a/Makefile
2423 CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile
2424 Automatic merge failed; fix conflicts and then commit the result.
2425 $ git merge --abort
2426 Merging sparc-next/master (049ffa8ab33a Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux)
2427 $ git merge sparc-next/master
2428 Already up-to-date.
2429 Merging tile/master (5e01dc7b26d9 Linux 3.12)
2430 $ git merge tile/master
2431 Already up-to-date.
2432 Merging uml/next (989e59fa41c5 um: Include generic barrier.h)
2433 $ git merge uml/next
2434 Removing arch/x86/um/shared/sysdep/skas_ptrace.h
2435 Removing arch/um/sys-ppc/shared/sysdep/skas_ptrace.h
2436 Removing arch/um/sys-ia64/sysdep/skas_ptrace.h
2437 Removing arch/um/include/shared/skas_ptrace.h
2438 Removing arch/um/include/shared/skas/proc_mm.h
2439 Merge made by the 'recursive' strategy.
2440  arch/um/include/asm/Kbuild                  |   1 +
2441  arch/um/include/asm/processor-generic.h     |   3 -
2442  arch/um/include/shared/os.h                 |   2 -
2443  arch/um/include/shared/skas/proc_mm.h       |  44 ------
2444  arch/um/include/shared/skas/skas.h          |   3 -
2445  arch/um/include/shared/skas_ptrace.h        |  14 --
2446  arch/um/kernel/ptrace.c                     |  32 ----
2447  arch/um/kernel/reboot.c                     |  35 ++---
2448  arch/um/kernel/skas/mmu.c                   |  68 +++------
2449  arch/um/kernel/skas/process.c               |  27 ----
2450  arch/um/kernel/trap.c                       |   2 +-
2451  arch/um/kernel/um_arch.c                    |  10 --
2452  arch/um/os-Linux/process.c                  |  16 --
2453  arch/um/os-Linux/skas/mem.c                 | 100 ++----------
2454  arch/um/os-Linux/skas/process.c             | 200 ++++++------------------
2455  arch/um/os-Linux/start_up.c                 | 154 -------------------
2456  arch/um/sys-ia64/sysdep/skas_ptrace.h       |  22 ---
2457  arch/um/sys-ppc/shared/sysdep/skas_ptrace.h |  22 ---
2458  arch/x86/um/ldt.c                           | 227 ++++++----------------------
2459  arch/x86/um/shared/sysdep/faultinfo_32.h    |   3 -
2460  arch/x86/um/shared/sysdep/faultinfo_64.h    |   3 -
2461  arch/x86/um/shared/sysdep/skas_ptrace.h     |  22 ---
2462  22 files changed, 149 insertions(+), 861 deletions(-)
2463  delete mode 100644 arch/um/include/shared/skas/proc_mm.h
2464  delete mode 100644 arch/um/include/shared/skas_ptrace.h
2465  delete mode 100644 arch/um/sys-ia64/sysdep/skas_ptrace.h
2466  delete mode 100644 arch/um/sys-ppc/shared/sysdep/skas_ptrace.h
2467  delete mode 100644 arch/x86/um/shared/sysdep/skas_ptrace.h
2468 Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXPERIMENTAL)
2469 $ git merge unicore32/unicore32
2470 Already up-to-date.
2471 Merging xtensa/for_next (9ed82c6866e2 xtensa: implement ndelay)
2472 $ git merge xtensa/for_next
2473 Auto-merging drivers/irqchip/Makefile
2474 Auto-merging drivers/irqchip/Kconfig
2475 Merge made by the 'recursive' strategy.
2476  Documentation/xtensa/atomctl.txt                   |   2 +-
2477  Documentation/xtensa/mmu.txt                       |  18 +
2478  arch/xtensa/Kconfig                                |  52 +-
2479  arch/xtensa/boot/dts/lx60.dts                      |   2 +-
2480  arch/xtensa/boot/dts/ml605.dts                     |   2 +-
2481  arch/xtensa/boot/dts/xtfpga.dtsi                   |   6 +-
2482  arch/xtensa/include/asm/Kbuild                     |   1 -
2483  arch/xtensa/include/asm/barrier.h                  |   4 +-
2484  arch/xtensa/include/asm/bitops.h                   |   8 +-
2485  arch/xtensa/include/asm/cacheflush.h               |  40 +-
2486  arch/xtensa/include/asm/delay.h                    |  52 +-
2487  arch/xtensa/include/asm/ftrace.h                   |   2 +-
2488  arch/xtensa/include/asm/futex.h                    | 147 +++++
2489  arch/xtensa/include/asm/initialize_mmu.h           |  13 +-
2490  arch/xtensa/include/asm/io.h                       |  16 +-
2491  arch/xtensa/include/asm/irq.h                      |   9 +
2492  arch/xtensa/include/asm/mmu.h                      |  10 +-
2493  arch/xtensa/include/asm/mmu_context.h              | 106 ++--
2494  arch/xtensa/include/asm/mxregs.h                   |  46 ++
2495  arch/xtensa/include/asm/perf_event.h               |   4 +
2496  arch/xtensa/include/asm/processor.h                |  20 +
2497  arch/xtensa/include/asm/ptrace.h                   |   8 +
2498  arch/xtensa/include/asm/smp.h                      |  38 +-
2499  arch/xtensa/include/asm/spinlock.h                 |  31 +-
2500  arch/xtensa/include/asm/spinlock_types.h           |  20 +
2501  arch/xtensa/include/asm/timex.h                    |  14 +-
2502  arch/xtensa/include/asm/tlbflush.h                 |  42 +-
2503  arch/xtensa/include/asm/traps.h                    |   1 +
2504  arch/xtensa/include/asm/vectors.h                  |  23 +-
2505  arch/xtensa/kernel/Makefile                        |   1 +
2506  arch/xtensa/kernel/head.S                          | 181 +++++--
2507  arch/xtensa/kernel/irq.c                           | 207 ++++---
2508  arch/xtensa/kernel/mxhead.S                        |  85 +++
2509  arch/xtensa/kernel/setup.c                         | 131 +++--
2510  arch/xtensa/kernel/smp.c                           | 592 +++++++++++++++++++++
2511  arch/xtensa/kernel/time.c                          |  61 ++-
2512  arch/xtensa/kernel/traps.c                         |  56 +-
2513  arch/xtensa/kernel/vmlinux.lds.S                   |  26 +
2514  arch/xtensa/mm/cache.c                             |   7 +-
2515  arch/xtensa/mm/fault.c                             |   2 +-
2516  arch/xtensa/mm/misc.S                              |   4 +-
2517  arch/xtensa/mm/mmu.c                               |  20 +-
2518  arch/xtensa/mm/tlb.c                               |  37 +-
2519  arch/xtensa/platforms/iss/network.c                | 301 ++++-------
2520  .../platforms/xtfpga/include/platform/hardware.h   |   6 +-
2521  arch/xtensa/platforms/xtfpga/setup.c               |  14 +-
2522  arch/xtensa/variants/s6000/include/variant/irq.h   |   1 -
2523  drivers/irqchip/Kconfig                            |   4 +
2524  drivers/irqchip/Makefile                           |   2 +
2525  drivers/irqchip/irq-xtensa-mx.c                    | 164 ++++++
2526  drivers/irqchip/irq-xtensa-pic.c                   | 108 ++++
2527  include/linux/irqchip/xtensa-mx.h                  |  17 +
2528  include/linux/irqchip/xtensa-pic.h                 |  18 +
2529  53 files changed, 2148 insertions(+), 634 deletions(-)
2530  create mode 100644 arch/xtensa/include/asm/futex.h
2531  create mode 100644 arch/xtensa/include/asm/mxregs.h
2532  create mode 100644 arch/xtensa/include/asm/perf_event.h
2533  create mode 100644 arch/xtensa/include/asm/spinlock_types.h
2534  create mode 100644 arch/xtensa/kernel/mxhead.S
2535  create mode 100644 arch/xtensa/kernel/smp.c
2536  create mode 100644 drivers/irqchip/irq-xtensa-mx.c
2537  create mode 100644 drivers/irqchip/irq-xtensa-pic.c
2538  create mode 100644 include/linux/irqchip/xtensa-mx.h
2539  create mode 100644 include/linux/irqchip/xtensa-pic.h
2540 Merging btrfs/next (56817eda3c10 Btrfs: introduce the delayed inode ref deletion for the single link inode)
2541 $ git merge btrfs/next
2542 Merge made by the 'recursive' strategy.
2543  fs/btrfs/acl.c               |   7 +-
2544  fs/btrfs/backref.c           |  63 ++---
2545  fs/btrfs/btrfs_inode.h       |   3 +
2546  fs/btrfs/check-integrity.c   |  12 +-
2547  fs/btrfs/compression.c       |  12 +-
2548  fs/btrfs/ctree.c             | 482 +++++++++++++++++++++++++--------
2549  fs/btrfs/ctree.h             |  55 +++-
2550  fs/btrfs/delayed-inode.c     | 208 +++++++++------
2551  fs/btrfs/delayed-inode.h     |   8 +-
2552  fs/btrfs/delayed-ref.c       | 133 ++++++----
2553  fs/btrfs/delayed-ref.h       |   5 +
2554  fs/btrfs/dev-replace.c       |  56 ++--
2555  fs/btrfs/dir-item.c          |   8 +-
2556  fs/btrfs/disk-io.c           | 144 +++++-----
2557  fs/btrfs/extent-tree.c       | 120 +++++++--
2558  fs/btrfs/extent_io.c         | 228 +++++++++-------
2559  fs/btrfs/extent_io.h         |   9 +-
2560  fs/btrfs/extent_map.c        |  74 +++---
2561  fs/btrfs/file-item.c         |   4 +-
2562  fs/btrfs/file.c              | 156 +++++++----
2563  fs/btrfs/free-space-cache.c  |  23 +-
2564  fs/btrfs/inode-item.c        |  65 -----
2565  fs/btrfs/inode.c             | 270 ++++++++++++++-----
2566  fs/btrfs/ioctl.c             | 248 +++++++++++++++--
2567  fs/btrfs/lzo.c               |   6 +-
2568  fs/btrfs/ordered-data.c      |  15 +-
2569  fs/btrfs/orphan.c            |  20 --
2570  fs/btrfs/print-tree.c        |   4 +-
2571  fs/btrfs/qgroup.c            |  39 ++-
2572  fs/btrfs/reada.c             |   9 +-
2573  fs/btrfs/relocation.c        |  83 +++---
2574  fs/btrfs/root-tree.c         |  19 +-
2575  fs/btrfs/scrub.c             | 126 ++++-----
2576  fs/btrfs/send.c              | 319 +++++++++++++++-------
2577  fs/btrfs/struct-funcs.c      |   4 +-
2578  fs/btrfs/super.c             | 104 ++++----
2579  fs/btrfs/sysfs.c             | 617 +++++++++++++++++++++++++++++++++++++++++++
2580  fs/btrfs/sysfs.h             |  64 +++++
2581  fs/btrfs/tests/btrfs-tests.h |   2 +-
2582  fs/btrfs/transaction.c       |  21 +-
2583  fs/btrfs/transaction.h       |   2 -
2584  fs/btrfs/tree-log.c          | 175 +++++++++++-
2585  fs/btrfs/uuid-tree.c         |  13 +-
2586  fs/btrfs/volumes.c           |  89 +++----
2587  fs/btrfs/zlib.c              |   8 +-
2588  include/trace/events/btrfs.h |  23 +-
2589  include/uapi/linux/btrfs.h   |  13 +
2590  lib/kobject.c                |   1 +
2591  48 files changed, 2959 insertions(+), 1210 deletions(-)
2592  create mode 100644 fs/btrfs/sysfs.h
2593 Merging ceph/master (8eb4efb091c8 ceph: implement readv/preadv for sync operation)
2594 $ git merge ceph/master
2595 Merge made by the 'recursive' strategy.
2596  fs/ceph/file.c  | 435 ++++++++++++++++++++++++++++++++++++++++----------------
2597  fs/ceph/inode.c |  10 ++
2598  fs/ceph/super.c |   1 +
2599  fs/ceph/super.h |   1 +
2600  4 files changed, 321 insertions(+), 126 deletions(-)
2601 Merging cifs/for-next (a2e70b4d4e85 cifs: Fix memory leak in cifs_hardlink())
2602 $ git merge cifs/for-next
2603 Merge made by the 'recursive' strategy.
2604  fs/cifs/link.c | 6 ++++--
2605  1 file changed, 4 insertions(+), 2 deletions(-)
2606 Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
2607 $ git merge configfs/linux-next
2608 Already up-to-date.
2609 Merging ecryptfs/next (9e78d14a9f64 Use %pd in eCryptFS)
2610 $ git merge ecryptfs/next
2611 Merge made by the 'recursive' strategy.
2612  fs/ecryptfs/file.c  |  4 ++--
2613  fs/ecryptfs/inode.c | 12 ++++++------
2614  2 files changed, 8 insertions(+), 8 deletions(-)
2615 Merging ext3/for_next (4ea7772f828a udf: Fix lockdep warning from udf_symlink())
2616 $ git merge ext3/for_next
2617 Merge made by the 'recursive' strategy.
2618  fs/jbd/journal.c     | 8 +++-----
2619  fs/jbd/transaction.c | 4 ++--
2620  fs/udf/namei.c       | 2 +-
2621  3 files changed, 6 insertions(+), 8 deletions(-)
2622 Merging ext4/dev (27e25f8135e5 ext4: standardize error handling in ext4_da_write_inline_data_begin())
2623 $ git merge ext4/dev
2624 Merge made by the 'recursive' strategy.
2625  fs/ext4/inline.c | 16 ++++++++++------
2626  fs/ext4/inode.c  |  5 -----
2627  2 files changed, 10 insertions(+), 11 deletions(-)
2628 Merging f2fs/dev (3bac380c9012 f2fs: update documents and a MAINTAINERS entry)
2629 $ git merge f2fs/dev
2630 Auto-merging MAINTAINERS
2631 Merge made by the 'recursive' strategy.
2632  Documentation/ABI/testing/sysfs-fs-f2fs |  31 ++
2633  Documentation/filesystems/f2fs.txt      |  24 ++
2634  MAINTAINERS                             |   1 +
2635  fs/f2fs/Makefile                        |   2 +-
2636  fs/f2fs/checkpoint.c                    | 133 +++----
2637  fs/f2fs/data.c                          | 611 ++++++++++++++++++++++++--------
2638  fs/f2fs/debug.c                         |  35 +-
2639  fs/f2fs/dir.c                           |  27 +-
2640  fs/f2fs/f2fs.h                          | 177 ++++++---
2641  fs/f2fs/file.c                          |  82 ++---
2642  fs/f2fs/gc.c                            |  18 +-
2643  fs/f2fs/gc.h                            |   2 +-
2644  fs/f2fs/inline.c                        | 222 ++++++++++++
2645  fs/f2fs/inode.c                         |   9 +-
2646  fs/f2fs/namei.c                         |   2 +
2647  fs/f2fs/node.c                          | 226 +++++++-----
2648  fs/f2fs/node.h                          |   8 +-
2649  fs/f2fs/recovery.c                      |  37 +-
2650  fs/f2fs/segment.c                       | 582 +++++++++++++++++++-----------
2651  fs/f2fs/segment.h                       |  68 ++--
2652  fs/f2fs/super.c                         |  64 +++-
2653  fs/f2fs/xattr.c                         |   2 +-
2654  include/linux/f2fs_fs.h                 |   7 +
2655  include/trace/events/f2fs.h             | 107 ++++--
2656  24 files changed, 1754 insertions(+), 723 deletions(-)
2657  create mode 100644 fs/f2fs/inline.c
2658 Merging fscache/fscache (7c604e5d6e56 FS-Cache: Fix handling of an attempt to store a page that is now beyond EOF)
2659 $ git merge fscache/fscache
2660 Merge made by the 'recursive' strategy.
2661  fs/fscache/page.c | 37 ++++++++++++++++++++++++++++++++++++-
2662  1 file changed, 36 insertions(+), 1 deletion(-)
2663 Merging fuse/for-next (ce128de6260f fuse: writepages: protect secondary requests from fuse file release)
2664 $ git merge fuse/for-next
2665 Already up-to-date.
2666 Merging gfs2/master (1e3d36206bd6 GFS2: Fix kbuild test robot reported warning)
2667 $ git merge gfs2/master
2668 Merge made by the 'recursive' strategy.
2669  fs/gfs2/aops.c                   |  23 +--
2670  fs/gfs2/dir.c                    |  90 +++++++++--
2671  fs/gfs2/dir.h                    |  19 ++-
2672  fs/gfs2/glops.c                  |  20 +--
2673  fs/gfs2/incore.h                 |  21 ++-
2674  fs/gfs2/inode.c                  | 108 ++++++++-----
2675  fs/gfs2/lops.c                   |   5 +
2676  fs/gfs2/main.c                   |   1 +
2677  fs/gfs2/meta_io.c                |   3 +
2678  fs/gfs2/ops_fstype.c             |  56 ++-----
2679  fs/gfs2/quota.c                  | 342 +++++++++++++++++++--------------------
2680  fs/gfs2/quota.h                  |   1 +
2681  fs/gfs2/rgrp.c                   | 106 +++++++++---
2682  fs/gfs2/super.c                  |  43 ++++-
2683  include/uapi/linux/gfs2_ondisk.h |  11 +-
2684  15 files changed, 522 insertions(+), 327 deletions(-)
2685 Merging jfs/jfs-next (0439e091e3b1 jfs: fix xattr value size overflow in __jfs_setxattr)
2686 $ git merge jfs/jfs-next
2687 Merge made by the 'recursive' strategy.
2688  fs/jfs/xattr.c | 15 ++++++++++++++-
2689  1 file changed, 14 insertions(+), 1 deletion(-)
2690 Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found)
2691 $ git merge logfs/master
2692 Auto-merging fs/logfs/super.c
2693 Merge made by the 'recursive' strategy.
2694  fs/logfs/dev_mtd.c | 2 +-
2695  fs/logfs/super.c   | 6 +++---
2696  2 files changed, 4 insertions(+), 4 deletions(-)
2697 Merging nfs/linux-next (a9ab5e840669 nfs: page cache invalidation for dio)
2698 $ git merge nfs/linux-next
2699 Merge made by the 'recursive' strategy.
2700  fs/nfs/dir.c                       |  18 +--
2701  fs/nfs/direct.c                    | 279 ++++++++++++++++++++-----------------
2702  fs/nfs/file.c                      |   6 +-
2703  fs/nfs/inode.c                     |  48 ++++---
2704  fs/nfs/nfs3acl.c                   |   4 +-
2705  fs/nfs/nfs4client.c                |   7 +-
2706  fs/nfs/nfs4filelayout.c            |   8 +-
2707  fs/nfs/nfs4filelayoutdev.c         |   2 +-
2708  fs/nfs/nfs4proc.c                  |   9 +-
2709  fs/nfs/nfs4state.c                 |   4 +-
2710  fs/nfs/nfs4super.c                 |  14 +-
2711  fs/nfs/nfs4xdr.c                   |  47 ++++---
2712  fs/nfs/pnfs.c                      |  67 ++++-----
2713  fs/nfs/pnfs.h                      |  16 +++
2714  fs/nfs/read.c                      |  12 +-
2715  fs/nfs/write.c                     |   8 +-
2716  include/linux/sunrpc/rpc_pipe_fs.h |   5 +-
2717  include/trace/events/sunrpc.h      |   1 +
2718  net/sunrpc/auth_gss/auth_gss.c     |  17 +--
2719  net/sunrpc/clnt.c                  |  15 +-
2720  net/sunrpc/netns.h                 |   3 +-
2721  net/sunrpc/rpc_pipe.c              | 169 +++++++++++++++++++++-
2722  net/sunrpc/sunrpc_syms.c           |   8 +-
2723  net/sunrpc/xprt.c                  |   5 +
2724  net/sunrpc/xprtsock.c              |  42 +++++-
2725  25 files changed, 548 insertions(+), 266 deletions(-)
2726 Merging nfsd/nfsd-next (3554116d3aae nfsd4: simplify xdr encoding of nfsv4 names)
2727 $ git merge nfsd/nfsd-next
2728 Auto-merging net/sunrpc/xprtsock.c
2729 Auto-merging net/sunrpc/netns.h
2730 Merge made by the 'recursive' strategy.
2731  Documentation/filesystems/nfs/nfs41-server.txt |  42 +++----
2732  fs/nfsd/acl.h                                  |   2 +-
2733  fs/nfsd/cache.h                                |   8 --
2734  fs/nfsd/idmap.h                                |   4 +-
2735  fs/nfsd/netns.h                                |   1 +
2736  fs/nfsd/nfs3xdr.c                              |   2 +-
2737  fs/nfsd/nfs4acl.c                              |  20 +--
2738  fs/nfsd/nfs4idmap.c                            |  50 +++++---
2739  fs/nfsd/nfs4proc.c                             |  10 +-
2740  fs/nfsd/nfs4state.c                            |  27 +++--
2741  fs/nfsd/nfs4xdr.c                              | 162 ++++++++-----------------
2742  fs/nfsd/nfscache.c                             |  36 +-----
2743  fs/nfsd/nfssvc.c                               |  30 ++++-
2744  fs/nfsd/nfsxdr.c                               |   2 +-
2745  fs/nfsd/vfs.c                                  |  33 +----
2746  fs/nfsd/vfs.h                                  |   2 -
2747  fs/nfsd/xdr4.h                                 |   4 +-
2748  include/linux/sunrpc/svc.h                     |   6 +-
2749  net/sunrpc/auth_gss/gss_rpc_upcall.c           |   2 -
2750  net/sunrpc/auth_gss/svcauth_gss.c              |  82 ++++---------
2751  net/sunrpc/cache.c                             |   4 +-
2752  net/sunrpc/netns.h                             |   1 -
2753  net/sunrpc/svc.c                               |  25 ++--
2754  net/sunrpc/xprtsock.c                          |   7 +-
2755  24 files changed, 221 insertions(+), 341 deletions(-)
2756 Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
2757 $ git merge omfs/for-next
2758 Already up-to-date.
2759 Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error)
2760 $ git merge squashfs/master
2761 Already up-to-date.
2762 Merging v9fs/for-next (fb89b45cdfdc 9P: introduction of a new cache=mmap model.)
2763 $ git merge v9fs/for-next
2764 Merge made by the 'recursive' strategy.
2765  fs/9p/cache.c          |   3 +-
2766  fs/9p/v9fs.c           |   9 +++-
2767  fs/9p/v9fs.h           |   1 +
2768  fs/9p/v9fs_vfs.h       |   2 +
2769  fs/9p/vfs_addr.c       |   7 +++
2770  fs/9p/vfs_file.c       | 142 ++++++++++++++++++++++++++++++++++++++++++++++---
2771  fs/9p/vfs_inode.c      |  26 +++++----
2772  fs/9p/vfs_inode_dotl.c |  17 ++----
2773  fs/9p/vfs_super.c      |   8 +--
2774  fs/9p/xattr.c          |  10 ++--
2775  net/9p/client.c        |   3 --
2776  net/9p/trans_fd.c      |   2 +-
2777  net/9p/trans_virtio.c  |   2 +-
2778  13 files changed, 189 insertions(+), 43 deletions(-)
2779 Merging ubifs/linux-next (c23e9b75ccd0 UBIFS: remove invalid warn msg with tst_recovery enabled)
2780 $ git merge ubifs/linux-next
2781 Already up-to-date.
2782 Merging xfs/for-next (bf3964c188d6 Merge branch 'xfs-extent-list-locking-fixes' into for-next)
2783 $ git merge xfs/for-next
2784 Removing fs/xfs/xfs_quota_priv.h
2785 Auto-merging fs/xfs/xfs_bmap_util.c
2786 Auto-merging fs/ext4/inode.c
2787 Auto-merging fs/btrfs/inode.c
2788 Merge made by the 'recursive' strategy.
2789  fs/attr.c                 |   5 -
2790  fs/btrfs/inode.c          |   8 +-
2791  fs/ext4/inode.c           |   4 +
2792  fs/xfs/xfs_aops.c         |   2 +-
2793  fs/xfs/xfs_attr.c         |   5 +-
2794  fs/xfs/xfs_attr_list.c    |   8 +-
2795  fs/xfs/xfs_bmap.c         |   4 +
2796  fs/xfs/xfs_bmap_util.c    |  35 ++--
2797  fs/xfs/xfs_buf.c          |  26 +--
2798  fs/xfs/xfs_buf_item.c     | 103 ++++++------
2799  fs/xfs/xfs_dir2_readdir.c |   4 +
2800  fs/xfs/xfs_dir2_sf.c      |  58 ++++---
2801  fs/xfs/xfs_dquot.c        |   7 +-
2802  fs/xfs/xfs_dquot_item.c   |  67 +++-----
2803  fs/xfs/xfs_dquot_item.h   |   3 +-
2804  fs/xfs/xfs_extfree_item.c |  21 +--
2805  fs/xfs/xfs_file.c         |  10 +-
2806  fs/xfs/xfs_ialloc.c       |  53 +++---
2807  fs/xfs/xfs_ialloc.h       |  21 +--
2808  fs/xfs/xfs_icreate_item.c |  10 +-
2809  fs/xfs/xfs_inode.c        |  85 +++++-----
2810  fs/xfs/xfs_inode.h        |   4 +-
2811  fs/xfs/xfs_inode_fork.c   |  17 +-
2812  fs/xfs/xfs_inode_item.c   | 400 +++++++++++++++++++---------------------------
2813  fs/xfs/xfs_inode_item.h   |   5 -
2814  fs/xfs/xfs_ioctl.c        |   4 -
2815  fs/xfs/xfs_iops.c         |  76 ++++-----
2816  fs/xfs/xfs_itable.c       |  22 ++-
2817  fs/xfs/xfs_log.h          |  46 ++++++
2818  fs/xfs/xfs_log_cil.c      |  74 +++------
2819  fs/xfs/xfs_log_recover.c  |  33 ++--
2820  fs/xfs/xfs_qm.c           |   6 +-
2821  fs/xfs/xfs_qm.h           |  18 ++-
2822  fs/xfs/xfs_qm_syscalls.c  |  18 ++-
2823  fs/xfs/xfs_quota_priv.h   |  42 -----
2824  fs/xfs/xfs_trans.h        |   2 +-
2825  fs/xfs/xfs_trans_dquot.c  |   4 +-
2826  fs/xfs/xfs_trans_resv.c   |  10 +-
2827  fs/xfs/xfs_trans_space.h  |   2 +-
2828  fs/xfs/xfs_vnode.h        |   9 --
2829  40 files changed, 614 insertions(+), 717 deletions(-)
2830  delete mode 100644 fs/xfs/xfs_quota_priv.h
2831 Merging vfs/for-next (27ac0ffeac80 locks: break delegations on any attribute modification)
2832 $ git merge vfs/for-next
2833 Already up-to-date.
2834 Merging pci/next (6e2d98dc1af4 Merge branch 'pci/reset' into next)
2835 $ git merge pci/next
2836 Auto-merging include/linux/pci.h
2837 Auto-merging drivers/platform/x86/eeepc-laptop.c
2838 Auto-merging drivers/pci/quirks.c
2839 Auto-merging drivers/pci/pci.c
2840 Auto-merging drivers/pci/pci-acpi.c
2841 Auto-merging drivers/pci/hotplug/acpiphp_glue.c
2842 Auto-merging drivers/pci/host/pci-tegra.c
2843 Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
2844 Auto-merging drivers/ata/ahci.c
2845 Auto-merging drivers/acpi/pci_root.c
2846 Auto-merging arch/s390/pci/pci.c
2847 Auto-merging arch/powerpc/kernel/eeh_driver.c
2848 Merge made by the 'recursive' strategy.
2849  Documentation/ABI/testing/sysfs-bus-pci            |  11 +-
2850  Documentation/PCI/00-INDEX                         |   4 +-
2851  Documentation/PCI/MSI-HOWTO.txt                    | 308 ++++++++----
2852  Documentation/PCI/pci.txt                          |   6 +-
2853  .../devicetree/bindings/pci/designware-pcie.txt    |   2 +
2854  arch/alpha/kernel/pci-sysfs.c                      |   4 +-
2855  arch/alpha/kernel/pci_iommu.c                      |   2 +-
2856  arch/arm/common/it8152.c                           |   4 +-
2857  arch/arm/mach-ixp4xx/common-pci.c                  |   6 +-
2858  arch/ia64/hp/common/sba_iommu.c                    |   2 +-
2859  arch/ia64/sn/pci/pci_dma.c                         |  24 +-
2860  arch/parisc/kernel/drivers.c                       |  22 +-
2861  arch/powerpc/kernel/eeh_driver.c                   |  19 +-
2862  arch/powerpc/kernel/pci-common.c                   |   4 +-
2863  arch/powerpc/kernel/pci_of_scan.c                  |   4 +-
2864  arch/s390/pci/pci.c                                |   4 +-
2865  arch/sparc/kernel/pci.c                            |   6 +-
2866  arch/x86/include/asm/pci.h                         |   3 +-
2867  arch/x86/include/asm/x86_init.h                    |   2 +-
2868  arch/x86/kernel/acpi/boot.c                        |   4 +-
2869  arch/x86/kernel/x86_init.c                         |   4 +-
2870  arch/x86/pci/xen.c                                 |   2 +-
2871  drivers/acpi/pci_root.c                            |   6 +
2872  drivers/ata/ahci.c                                 |  56 ++-
2873  drivers/char/agp/agp.h                             |   1 +
2874  drivers/char/agp/ali-agp.c                         |   4 +-
2875  drivers/char/agp/amd-k7-agp.c                      |  12 +-
2876  drivers/char/agp/amd64-agp.c                       |   5 +-
2877  drivers/char/agp/ati-agp.c                         |  21 +-
2878  drivers/char/agp/efficeon-agp.c                    |   5 +-
2879  drivers/char/agp/generic.c                         |   4 +-
2880  drivers/char/agp/intel-agp.c                       |  48 +-
2881  drivers/char/agp/intel-agp.h                       |  10 +-
2882  drivers/char/agp/intel-gtt.c                       |  47 +-
2883  drivers/char/agp/nvidia-agp.c                      |   9 +-
2884  drivers/char/agp/sis-agp.c                         |   5 +-
2885  drivers/char/agp/via-agp.c                         |  13 +-
2886  drivers/eisa/eisa-bus.c                            |   4 +-
2887  drivers/gpu/drm/i915/i915_gem_gtt.c                |   6 +-
2888  drivers/message/fusion/mptbase.c                   |   2 +-
2889  drivers/pci/Kconfig                                |   3 +-
2890  drivers/pci/Makefile                               |   2 +-
2891  drivers/pci/access.c                               |  24 -
2892  drivers/pci/ats.c                                  |  82 ----
2893  drivers/pci/bus.c                                  | 133 +++--
2894  drivers/pci/host-bridge.c                          |  19 +-
2895  drivers/pci/host/pci-exynos.c                      |   5 +-
2896  drivers/pci/host/pci-imx6.c                        | 225 ++++++---
2897  drivers/pci/host/pci-mvebu.c                       |  99 ++--
2898  drivers/pci/host/pci-rcar-gen2.c                   |  12 +-
2899  drivers/pci/host/pci-tegra.c                       |   2 +-
2900  drivers/pci/host/pcie-designware.c                 |  91 ++--
2901  drivers/pci/host/pcie-designware.h                 |   4 +-
2902  drivers/pci/hotplug/acpiphp.h                      |   5 +-
2903  drivers/pci/hotplug/acpiphp_core.c                 |   2 +-
2904  drivers/pci/hotplug/acpiphp_glue.c                 |  43 +-
2905  drivers/pci/hotplug/cpci_hotplug_pci.c             |  14 +-
2906  drivers/pci/hotplug/cpqphp_pci.c                   |   8 +-
2907  drivers/pci/hotplug/ibmphp_core.c                  |  13 +-
2908  drivers/pci/hotplug/pciehp.h                       |  15 +-
2909  drivers/pci/hotplug/pciehp_core.c                  |  17 +-
2910  drivers/pci/hotplug/pciehp_ctrl.c                  |  90 ++--
2911  drivers/pci/hotplug/pciehp_hpc.c                   | 380 +++++---------
2912  drivers/pci/hotplug/pciehp_pci.c                   |  23 +-
2913  drivers/pci/hotplug/rpadlpar_core.c                |  19 +-
2914  drivers/pci/hotplug/rpaphp_core.c                  |   4 +
2915  drivers/pci/hotplug/s390_pci_hpc.c                 |   4 +-
2916  drivers/pci/hotplug/sgi_hotplug.c                  |   5 +
2917  drivers/pci/hotplug/shpchp_pci.c                   |  18 +-
2918  drivers/pci/ioapic.c                               |   6 +-
2919  drivers/pci/iov.c                                  |   2 +
2920  drivers/pci/msi.c                                  | 348 ++++++++-----
2921  drivers/pci/pci-acpi.c                             |   2 +-
2922  drivers/pci/pci-label.c                            |  57 +--
2923  drivers/pci/pci-sysfs.c                            |  19 +-
2924  drivers/pci/pci.c                                  | 545 ++++++++++-----------
2925  drivers/pci/pci.h                                  |   2 -
2926  drivers/pci/pcie/aer/aerdrv_acpi.c                 |  56 ++-
2927  drivers/pci/pcie/aer/aerdrv_errprint.c             |  95 ++--
2928  drivers/pci/pcie/aspm.c                            |  12 -
2929  drivers/pci/pcie/portdrv_core.c                    |  36 +-
2930  drivers/pci/probe.c                                | 176 ++++---
2931  drivers/pci/quirks.c                               |   2 +-
2932  drivers/pci/remove.c                               |  34 +-
2933  drivers/pci/rom.c                                  |   2 +-
2934  drivers/pci/setup-bus.c                            |  32 +-
2935  drivers/pci/setup-res.c                            |   2 +-
2936  drivers/pci/slot.c                                 |  26 -
2937  drivers/pci/vc.c                                   | 434 ++++++++++++++++
2938  drivers/pci/xen-pcifront.c                         |   8 +
2939  drivers/pcmcia/cardbus.c                           |   7 +
2940  drivers/pcmcia/i82092.c                            |   2 +-
2941  drivers/pcmcia/yenta_socket.c                      |   6 +-
2942  drivers/platform/x86/asus-wmi.c                    |   2 +
2943  drivers/platform/x86/eeepc-laptop.c                |   2 +
2944  drivers/scsi/mpt2sas/mpt2sas_base.c                |   2 +-
2945  drivers/scsi/mpt3sas/mpt3sas_base.c                |   2 +-
2946  drivers/scsi/sym53c8xx_2/sym_glue.c                |   5 +-
2947  drivers/vfio/pci/vfio_pci.c                        |  29 +-
2948  drivers/vfio/pci/vfio_pci_config.c                 |  12 +-
2949  drivers/video/arkfb.c                              |   2 +-
2950  drivers/video/s3fb.c                               |   2 +-
2951  drivers/video/vt8623fb.c                           |   2 +-
2952  include/acpi/actbl1.h                              |  10 +-
2953  include/linux/msi.h                                |   4 +-
2954  include/linux/pci-ats.h                            |  17 -
2955  include/linux/pci.h                                | 352 ++++---------
2956  include/uapi/linux/pci_regs.h                      |  37 +-
2957  scripts/checkpatch.pl                              |  11 +-
2958  109 files changed, 2495 insertions(+), 1973 deletions(-)
2959  create mode 100644 drivers/pci/vc.c
2960 Merging hid/for-next (b18c2fbc3e1a Merge branch 'for-3.14/upstream' into for-next)
2961 $ git merge hid/for-next
2962 Auto-merging drivers/hid/i2c-hid/i2c-hid.c
2963 Auto-merging drivers/hid/hid-multitouch.c
2964 Auto-merging drivers/hid/hid-ids.h
2965 Auto-merging drivers/hid/hid-core.c
2966 Auto-merging drivers/hid/Kconfig
2967 Merge made by the 'recursive' strategy.
2968  drivers/hid/Kconfig             |   1 +
2969  drivers/hid/hid-core.c          |   2 -
2970  drivers/hid/hid-debug.c         |   5 +-
2971  drivers/hid/hid-ids.h           |   9 +-
2972  drivers/hid/hid-input.c         |   2 +-
2973  drivers/hid/hid-lg.c            |   2 +
2974  drivers/hid/hid-multitouch.c    |   7 +-
2975  drivers/hid/hid-sony.c          | 198 ++++++++++++++++++++--------------------
2976  drivers/hid/hidraw.c            |  27 ++++--
2977  drivers/hid/i2c-hid/i2c-hid.c   |   2 +
2978  drivers/hid/usbhid/hid-quirks.c |   9 +-
2979  drivers/hid/usbhid/usbkbd.c     |   2 +-
2980  12 files changed, 145 insertions(+), 121 deletions(-)
2981 Merging i2c/i2c/for-next (001cebf03f91 i2c-ismt: support I2C_SMBUS_I2C_BLOCK_DATA transaction type)
2982 $ git merge i2c/i2c/for-next
2983 Removing include/linux/platform_data/i2c-nomadik.h
2984 Merge made by the 'recursive' strategy.
2985  Documentation/devicetree/bindings/i2c/i2c-at91.txt |   2 +
2986  .../devicetree/bindings/i2c/i2c-mux-pca954x.txt    |  50 +++
2987  Documentation/devicetree/bindings/i2c/i2c-riic.txt |  29 ++
2988  .../devicetree/bindings/i2c/i2c-s3c2410.txt        |   2 +
2989  Documentation/i2c/fault-codes                      |   3 -
2990  drivers/i2c/busses/Kconfig                         |  25 +-
2991  drivers/i2c/busses/Makefile                        |   2 +
2992  drivers/i2c/busses/i2c-designware-core.c           |   1 -
2993  drivers/i2c/busses/i2c-imx.c                       |   2 +-
2994  drivers/i2c/busses/i2c-isch.c                      |   7 +-
2995  drivers/i2c/busses/i2c-ismt.c                      |  37 ++
2996  drivers/i2c/busses/i2c-nomadik.c                   |  64 ++-
2997  drivers/i2c/busses/i2c-riic.c                      | 427 +++++++++++++++++++++
2998  drivers/i2c/busses/i2c-robotfuzz-osif.c            | 202 ++++++++++
2999  drivers/i2c/busses/i2c-s3c2410.c                   |  70 +++-
3000  drivers/i2c/busses/i2c-tiny-usb.c                  |   1 -
3001  drivers/i2c/busses/i2c-viperboard.c                |  16 +-
3002  drivers/i2c/busses/i2c-xiic.c                      |  89 ++---
3003  drivers/i2c/muxes/i2c-mux-pca954x.c                |  44 ++-
3004  include/linux/platform_data/i2c-nomadik.h          |  39 --
3005  20 files changed, 945 insertions(+), 167 deletions(-)
3006  create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt
3007  create mode 100644 Documentation/devicetree/bindings/i2c/i2c-riic.txt
3008  create mode 100644 drivers/i2c/busses/i2c-riic.c
3009  create mode 100644 drivers/i2c/busses/i2c-robotfuzz-osif.c
3010  delete mode 100644 include/linux/platform_data/i2c-nomadik.h
3011 Merging jdelvare-hwmon/master (68d5516b35c7 hwmon: (it87) Print proper names for the IT8771E and IT8772E)
3012 $ git merge jdelvare-hwmon/master
3013 Merge made by the 'recursive' strategy.
3014  Documentation/hwmon/it87 |  27 ++++++++----
3015  drivers/hwmon/Kconfig    |   4 +-
3016  drivers/hwmon/it87.c     | 104 +++++++++++++++++++++++++++++++++++++++--------
3017  3 files changed, 107 insertions(+), 28 deletions(-)
3018 Merging hwmon-staging/hwmon-next (d303b1b5fbb6 hwmon: (k10temp) Add support for Kaveri CPUs)
3019 $ git merge hwmon-staging/hwmon-next
3020 Merge made by the 'recursive' strategy.
3021  drivers/hwmon/coretemp.c                | 60 +++++++++++++++++++++++----------
3022  drivers/hwmon/da9052-hwmon.c            |  4 +--
3023  drivers/hwmon/fam15h_power.c            |  2 +-
3024  drivers/hwmon/k10temp.c                 |  3 +-
3025  drivers/hwmon/k8temp.c                  |  2 +-
3026  drivers/hwmon/nct6775.c                 | 38 +++++++++++++++------
3027  drivers/hwmon/sis5595.c                 |  2 +-
3028  drivers/hwmon/via686a.c                 |  2 +-
3029  drivers/hwmon/vt8231.c                  |  2 +-
3030  include/linux/platform_data/hwmon-s3c.h | 10 +++---
3031  include/linux/platform_data/max197.h    |  5 +++
3032  include/linux/platform_data/sht15.h     |  5 +++
3033  12 files changed, 93 insertions(+), 42 deletions(-)
3034 Merging v4l-dvb/master (e26d710a8cdf Merge branch 'patchwork' into to_next)
3035 $ git merge v4l-dvb/master
3036 Resolved 'drivers/staging/media/go7007/go7007-usb.c' using previous resolution.
3037 Removing include/media/saa6752hs.h
3038 Auto-merging drivers/staging/media/sn9c102/Kconfig
3039 Auto-merging drivers/staging/media/omap24xx/v4l2-int-device.c
3040 Auto-merging drivers/staging/media/omap24xx/tcm825x.h
3041 Auto-merging drivers/staging/media/omap24xx/tcm825x.c
3042 Auto-merging drivers/staging/media/omap24xx/omap24xxcam.h
3043 Auto-merging drivers/staging/media/go7007/go7007-usb.c
3044 CONFLICT (content): Merge conflict in drivers/staging/media/go7007/go7007-usb.c
3045 Auto-merging drivers/media/radio/si4713/si4713.h
3046 Auto-merging drivers/media/radio/si4713/si4713.c
3047 Auto-merging drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c
3048 Auto-merging drivers/media/i2c/saa6752hs.c
3049 Auto-merging drivers/hid/hid-ids.h
3050 Auto-merging drivers/hid/hid-core.c
3051 Auto-merging MAINTAINERS
3052 Automatic merge failed; fix conflicts and then commit the result.
3053 $ git commit -v -a
3054 [master 41eafbc6ebad] Merge remote-tracking branch 'v4l-dvb/master'
3055 $ git diff -M --stat --summary HEAD^..
3056  Documentation/DocBook/media/v4l/compat.xml         |   12 +
3057  Documentation/DocBook/media/v4l/controls.xml       |   41 +
3058  Documentation/DocBook/media/v4l/dev-overlay.xml    |    9 +-
3059  .../DocBook/media/v4l/media-ioc-enum-links.xml     |    9 +
3060  Documentation/DocBook/media/v4l/subdev-formats.xml |  163 +-
3061  Documentation/DocBook/media/v4l/v4l2.xml           |   10 +-
3062  Documentation/DocBook/media/v4l/vidioc-cropcap.xml |   10 +-
3063  .../DocBook/media/v4l/vidioc-streamon.xml          |    2 +-
3064  Documentation/cgroups/resource_counter.txt         |    2 +-
3065  .../bindings/media/exynos-jpeg-codec.txt           |   11 +
3066  .../devicetree/bindings/media/samsung-s5k5baf.txt  |   58 +
3067  Documentation/video4linux/omap4_camera.txt         |   60 +
3068  Documentation/video4linux/si476x.txt               |    2 +-
3069  MAINTAINERS                                        |   50 +-
3070  arch/arm/mach-omap2/board-rx51-peripherals.c       |    7 +
3071  arch/blackfin/mach-bf609/boards/ezkit.c            |    4 +-
3072  arch/score/lib/checksum.S                          |    2 +-
3073  drivers/hid/hid-core.c                             |    1 +
3074  drivers/hid/hid-ids.h                              |    2 +
3075  drivers/media/Kconfig                              |    3 +
3076  drivers/media/dvb-core/dvb-usb-ids.h               |    3 +
3077  drivers/media/dvb-frontends/Kconfig                |    7 +
3078  drivers/media/dvb-frontends/Makefile               |    1 +
3079  drivers/media/dvb-frontends/a8293.c                |    2 +
3080  drivers/media/dvb-frontends/cx24117.c              |  121 +-
3081  drivers/media/dvb-frontends/dib8000.c              |  590 ++++-
3082  drivers/media/dvb-frontends/m88ds3103.c            | 1311 ++++++++++
3083  drivers/media/dvb-frontends/m88ds3103.h            |  114 +
3084  drivers/media/dvb-frontends/m88ds3103_priv.h       |  215 ++
3085  drivers/media/dvb-frontends/m88rs2000.c            |  172 +-
3086  drivers/media/dvb-frontends/m88rs2000.h            |    2 +
3087  drivers/media/dvb-frontends/nxt200x.c              |    2 +-
3088  drivers/media/i2c/Kconfig                          |   27 +-
3089  drivers/media/i2c/Makefile                         |    3 +-
3090  drivers/media/i2c/ad9389b.c                        |  277 +-
3091  drivers/media/i2c/adv7511.c                        |   64 +-
3092  drivers/media/i2c/adv7604.c                        |  645 +++--
3093  drivers/media/i2c/adv7842.c                        |  646 +++--
3094  drivers/media/i2c/lm3560.c                         |   34 +-
3095  drivers/media/i2c/mt9m032.c                        |   16 +-
3096  drivers/media/i2c/mt9p031.c                        |   28 +-
3097  drivers/media/i2c/mt9t001.c                        |   26 +-
3098  drivers/media/i2c/mt9v032.c                        |  264 +-
3099  drivers/media/i2c/s5k5baf.c                        | 2045 +++++++++++++++
3100  drivers/media/i2c/saa6588.c                        |   50 +-
3101  drivers/media/{pci/saa7134 => i2c}/saa6752hs.c     |   19 +-
3102  drivers/media/i2c/smiapp/smiapp-core.c             |    9 +-
3103  drivers/media/i2c/soc_camera/mt9m111.c             |    4 +-
3104  drivers/media/i2c/tvp5150.c                        |   40 +-
3105  drivers/media/i2c/vs6624.c                         |    2 +
3106  drivers/media/media-entity.c                       |   41 +-
3107  drivers/media/pci/bt8xx/bttv-driver.c              |   10 +-
3108  drivers/media/pci/cx18/cx18-driver.c               |    5 +-
3109  drivers/media/pci/cx25821/cx25821-alsa.c           |    2 +-
3110  drivers/media/pci/cx25821/cx25821-core.c           |    2 +-
3111  drivers/media/pci/cx88/cx88-alsa.c                 |    4 +-
3112  drivers/media/pci/saa7134/Kconfig                  |    1 +
3113  drivers/media/pci/saa7134/Makefile                 |    2 +-
3114  drivers/media/pci/saa7134/saa7134-core.c           |   11 +-
3115  drivers/media/pci/saa7134/saa7134-empress.c        |  359 +--
3116  drivers/media/pci/saa7134/saa7134-vbi.c            |   11 +-
3117  drivers/media/pci/saa7134/saa7134-video.c          |  781 ++----
3118  drivers/media/pci/saa7134/saa7134.h                |   66 +-
3119  drivers/media/pci/sta2x11/sta2x11_vip.c            |    2 +-
3120  drivers/media/platform/Kconfig                     |   10 +-
3121  drivers/media/platform/Makefile                    |    3 -
3122  drivers/media/platform/davinci/vpbe_display.c      |    2 +-
3123  drivers/media/platform/davinci/vpif_capture.c      |    2 +-
3124  drivers/media/platform/davinci/vpif_display.c      |    2 +-
3125  drivers/media/platform/exynos4-is/Kconfig          |    2 +-
3126  drivers/media/platform/exynos4-is/fimc-capture.c   |    2 +-
3127  drivers/media/platform/exynos4-is/fimc-core.c      |   29 +-
3128  drivers/media/platform/exynos4-is/fimc-core.h      |    2 -
3129  drivers/media/platform/exynos4-is/fimc-is-regs.c   |   36 +-
3130  drivers/media/platform/exynos4-is/fimc-is-regs.h   |    1 -
3131  drivers/media/platform/exynos4-is/fimc-is.c        |   29 +-
3132  drivers/media/platform/exynos4-is/fimc-lite-reg.c  |    4 +-
3133  drivers/media/platform/exynos4-is/fimc-lite.c      |   26 +-
3134  drivers/media/platform/exynos4-is/fimc-m2m.c       |  148 +-
3135  drivers/media/platform/exynos4-is/mipi-csis.c      |   13 +-
3136  drivers/media/platform/mem2mem_testdev.c           |  152 +-
3137  drivers/media/platform/omap3isp/isp.c              |  100 +-
3138  drivers/media/platform/omap3isp/isp.h              |    6 +-
3139  drivers/media/platform/omap3isp/ispccdc.c          |    5 +-
3140  drivers/media/platform/omap3isp/ispccp2.c          |    3 +-
3141  drivers/media/platform/omap3isp/ispcsi2.c          |    3 +-
3142  drivers/media/platform/omap3isp/isppreview.c       |    3 +-
3143  drivers/media/platform/omap3isp/ispqueue.c         |    2 +
3144  drivers/media/platform/omap3isp/ispresizer.c       |   18 +-
3145  drivers/media/platform/omap3isp/ispstat.c          |    2 +-
3146  drivers/media/platform/omap3isp/ispvideo.c         |  106 +-
3147  drivers/media/platform/omap3isp/ispvideo.h         |    2 +
3148  drivers/media/platform/s5p-g2d/g2d.c               |  124 +-
3149  drivers/media/platform/s5p-g2d/g2d.h               |    1 -
3150  drivers/media/platform/s5p-jpeg/Makefile           |    2 +-
3151  drivers/media/platform/s5p-jpeg/jpeg-core.c        | 1329 +++++++---
3152  drivers/media/platform/s5p-jpeg/jpeg-core.h        |   69 +-
3153  drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c  |  279 ++
3154  drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.h  |   42 +
3155  .../platform/s5p-jpeg/{jpeg-hw.h => jpeg-hw-s5p.c} |   82 +-
3156  drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h      |   63 +
3157  drivers/media/platform/s5p-jpeg/jpeg-regs.h        |  209 +-
3158  drivers/media/platform/s5p-mfc/s5p_mfc.c           |   28 +-
3159  drivers/media/platform/s5p-mfc/s5p_mfc_common.h    |   14 +-
3160  drivers/media/platform/s5p-mfc/s5p_mfc_enc.c       |   57 +-
3161  drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c    |   26 +-
3162  drivers/media/platform/s5p-tv/mixer_drv.c          |   34 +-
3163  drivers/media/platform/s5p-tv/mixer_video.c        |    2 +-
3164  drivers/media/platform/s5p-tv/sdo_drv.c            |   39 +-
3165  drivers/media/platform/sh_vou.c                    |   16 +-
3166  drivers/media/platform/soc_camera/atmel-isi.c      |  179 +-
3167  drivers/media/platform/soc_camera/mx2_camera.c     |    2 +-
3168  drivers/media/platform/soc_camera/rcar_vin.c       |    7 +-
3169  drivers/media/platform/soc_camera/soc_scale_crop.c |    4 +-
3170  drivers/media/platform/ti-vpe/Makefile             |    2 +-
3171  drivers/media/platform/ti-vpe/csc.c                |  196 ++
3172  drivers/media/platform/ti-vpe/csc.h                |   68 +
3173  drivers/media/platform/ti-vpe/sc.c                 |  311 +++
3174  drivers/media/platform/ti-vpe/sc.h                 |  208 ++
3175  drivers/media/platform/ti-vpe/sc_coeff.h           | 1342 ++++++++++
3176  drivers/media/platform/ti-vpe/vpdma.c              |   40 +-
3177  drivers/media/platform/ti-vpe/vpdma.h              |   12 +-
3178  drivers/media/platform/ti-vpe/vpdma_priv.h         |    2 +-
3179  drivers/media/platform/ti-vpe/vpe.c                |  327 ++-
3180  drivers/media/platform/ti-vpe/vpe_regs.h           |  187 --
3181  drivers/media/platform/vsp1/Makefile               |    3 +-
3182  drivers/media/platform/vsp1/vsp1.h                 |    7 +
3183  drivers/media/platform/vsp1/vsp1_drv.c             |   39 +
3184  drivers/media/platform/vsp1/vsp1_entity.c          |    7 +
3185  drivers/media/platform/vsp1/vsp1_entity.h          |    4 +
3186  drivers/media/platform/vsp1/vsp1_hsit.c            |  222 ++
3187  drivers/media/platform/vsp1/vsp1_hsit.h            |   38 +
3188  drivers/media/platform/vsp1/vsp1_lut.c             |  252 ++
3189  drivers/media/platform/vsp1/vsp1_lut.h             |   38 +
3190  drivers/media/platform/vsp1/vsp1_regs.h            |   16 +
3191  drivers/media/platform/vsp1/vsp1_rpf.c             |   34 +-
3192  drivers/media/platform/vsp1/vsp1_rwpf.c            |   96 +
3193  drivers/media/platform/vsp1/vsp1_rwpf.h            |   10 +
3194  drivers/media/platform/vsp1/vsp1_sru.c             |  356 +++
3195  drivers/media/platform/vsp1/vsp1_sru.h             |   41 +
3196  drivers/media/platform/vsp1/vsp1_video.c           |   13 +
3197  drivers/media/platform/vsp1/vsp1_wpf.c             |   17 +-
3198  drivers/media/radio/Kconfig                        |   43 +-
3199  drivers/media/radio/Makefile                       |    4 +-
3200  drivers/media/radio/radio-raremono.c               |  387 +++
3201  drivers/media/radio/si470x/radio-si470x-usb.c      |   81 +-
3202  drivers/media/radio/si470x/radio-si470x.h          |    1 +
3203  drivers/media/radio/si4713/Kconfig                 |   40 +
3204  drivers/media/radio/si4713/Makefile                |    7 +
3205  .../radio-platform-si4713.c}                       |    0
3206  drivers/media/radio/si4713/radio-usb-si4713.c      |  540 ++++
3207  .../media/radio/{si4713-i2c.c => si4713/si4713.c}  |  279 +-
3208  .../media/radio/{si4713-i2c.h => si4713/si4713.h}  |    4 +-
3209  drivers/media/radio/tea575x.c                      |    2 +-
3210  drivers/media/rc/imon.c                            |    8 +-
3211  drivers/media/rc/keymaps/Makefile                  |    3 +-
3212  drivers/media/rc/keymaps/rc-su3000.c               |   75 +
3213  drivers/media/rc/mceusb.c                          |   10 +
3214  drivers/media/tuners/Kconfig                       |    7 +
3215  drivers/media/tuners/Makefile                      |    1 +
3216  drivers/media/tuners/e4000.c                       |   16 +-
3217  drivers/media/tuners/m88ts2022.c                   |  674 +++++
3218  drivers/media/tuners/m88ts2022.h                   |   54 +
3219  drivers/media/tuners/m88ts2022_priv.h              |   34 +
3220  drivers/media/tuners/tuner-xc2028.c                |   38 +-
3221  drivers/media/usb/Kconfig                          |    1 -
3222  drivers/media/usb/Makefile                         |    1 -
3223  drivers/media/usb/au0828/au0828-core.c             |   13 +-
3224  drivers/media/usb/au0828/au0828-dvb.c              |  116 +-
3225  drivers/media/usb/au0828/au0828.h                  |    6 +
3226  drivers/media/usb/cx231xx/Kconfig                  |    2 +
3227  drivers/media/usb/cx231xx/cx231xx-cards.c          |    2 +
3228  drivers/media/usb/cx231xx/cx231xx-i2c.c            |   23 +-
3229  drivers/media/usb/dvb-usb-v2/anysee.c              |    3 +-
3230  drivers/media/usb/dvb-usb-v2/az6007.c              |   59 +
3231  drivers/media/usb/dvb-usb-v2/ec168.c               |    2 +-
3232  drivers/media/usb/dvb-usb-v2/it913x.c              |    3 +
3233  drivers/media/usb/dvb-usb-v2/rtl28xxu.c            |    2 +
3234  drivers/media/usb/dvb-usb/cxusb.c                  |   21 +-
3235  drivers/media/usb/dvb-usb/dw2102.c                 |  455 ++--
3236  drivers/media/usb/em28xx/Kconfig                   |    8 +-
3237  drivers/media/usb/em28xx/Makefile                  |    5 +-
3238  drivers/media/usb/em28xx/em28xx-audio.c            |  373 ++-
3239  drivers/media/usb/em28xx/em28xx-camera.c           |    1 +
3240  drivers/media/usb/em28xx/em28xx-cards.c            |  496 ++--
3241  drivers/media/usb/em28xx/em28xx-core.c             |  412 +--
3242  drivers/media/usb/em28xx/em28xx-dvb.c              |   80 +-
3243  drivers/media/usb/em28xx/em28xx-i2c.c              |  199 +-
3244  drivers/media/usb/em28xx/em28xx-input.c            |  207 +-
3245  drivers/media/usb/em28xx/em28xx-reg.h              |   11 +-
3246  drivers/media/usb/em28xx/em28xx-v4l.h              |   20 +
3247  drivers/media/usb/em28xx/em28xx-vbi.c              |    1 +
3248  drivers/media/usb/em28xx/em28xx-video.c            |  560 +++-
3249  drivers/media/usb/em28xx/em28xx.h                  |  115 +-
3250  drivers/media/usb/pwc/pwc-if.c                     |    1 -
3251  drivers/media/v4l2-core/Kconfig                    |   11 -
3252  drivers/media/v4l2-core/Makefile                   |    1 -
3253  drivers/media/v4l2-core/v4l2-ctrls.c               |    5 +
3254  drivers/media/v4l2-core/v4l2-dev.c                 |    2 +-
3255  drivers/media/v4l2-core/v4l2-ioctl.c               |    9 +
3256  drivers/media/v4l2-core/v4l2-mem2mem.c             |  126 +
3257  drivers/media/v4l2-core/v4l2-of.c                  |   10 +-
3258  drivers/media/v4l2-core/videobuf2-core.c           |  480 ++--
3259  drivers/media/v4l2-core/videobuf2-dma-sg.c         |   53 +-
3260  drivers/staging/media/Kconfig                      |    8 +
3261  drivers/staging/media/Makefile                     |    5 +
3262  drivers/staging/media/as102/as102_drv.c            |   10 -
3263  drivers/staging/media/as102/as102_drv.h            |    8 -
3264  drivers/staging/media/as102/as102_fe.c             |   26 -
3265  drivers/staging/media/as102/as102_fw.c             |   16 +-
3266  drivers/staging/media/as102/as102_usb_drv.c        |   36 +-
3267  drivers/staging/media/as102/as10x_cmd.c            |   21 -
3268  drivers/staging/media/as102/as10x_cmd_cfg.c        |    9 -
3269  drivers/staging/media/as102/as10x_cmd_stream.c     |   12 -
3270  drivers/staging/media/bcm2048/Kconfig              |   13 +
3271  drivers/staging/media/bcm2048/Makefile             |    1 +
3272  drivers/staging/media/bcm2048/TODO                 |   24 +
3273  drivers/staging/media/bcm2048/radio-bcm2048.c      | 2744 ++++++++++++++++++++
3274  drivers/staging/media/bcm2048/radio-bcm2048.h      |   30 +
3275  drivers/staging/media/davinci_vpfe/dm365_ipipe.c   |    2 +-
3276  .../staging/media/davinci_vpfe/dm365_ipipe_hw.c    |    4 +-
3277  drivers/staging/media/davinci_vpfe/dm365_isif.c    |    3 +-
3278  drivers/staging/media/davinci_vpfe/vpfe_video.c    |    4 +-
3279  drivers/staging/media/go7007/go7007-usb.c          |    2 +
3280  drivers/staging/media/lirc/lirc_parallel.c         |    4 +-
3281  drivers/staging/media/lirc/lirc_serial.c           |    4 +-
3282  drivers/staging/media/omap24xx/Kconfig             |   35 +
3283  drivers/staging/media/omap24xx/Makefile            |    5 +
3284  .../media/omap24xx}/omap24xxcam-dma.c              |    0
3285  .../media/omap24xx}/omap24xxcam.c                  |    0
3286  .../media/omap24xx}/omap24xxcam.h                  |    2 +-
3287  .../i2c => staging/media/omap24xx}/tcm825x.c       |    2 +-
3288  .../i2c => staging/media/omap24xx}/tcm825x.h       |    2 +-
3289  .../media/omap24xx}/v4l2-int-device.c              |    2 +-
3290  .../staging/media/omap24xx}/v4l2-int-device.h      |    0
3291  drivers/staging/media/omap4iss/Kconfig             |   12 +
3292  drivers/staging/media/omap4iss/Makefile            |    6 +
3293  drivers/staging/media/omap4iss/TODO                |    4 +
3294  drivers/staging/media/omap4iss/iss.c               | 1563 +++++++++++
3295  drivers/staging/media/omap4iss/iss.h               |  236 ++
3296  drivers/staging/media/omap4iss/iss_csi2.c          | 1343 ++++++++++
3297  drivers/staging/media/omap4iss/iss_csi2.h          |  158 ++
3298  drivers/staging/media/omap4iss/iss_csiphy.c        |  279 ++
3299  drivers/staging/media/omap4iss/iss_csiphy.h        |   51 +
3300  drivers/staging/media/omap4iss/iss_ipipe.c         |  570 ++++
3301  drivers/staging/media/omap4iss/iss_ipipe.h         |   67 +
3302  drivers/staging/media/omap4iss/iss_ipipeif.c       |  849 ++++++
3303  drivers/staging/media/omap4iss/iss_ipipeif.h       |   92 +
3304  drivers/staging/media/omap4iss/iss_regs.h          |  901 +++++++
3305  drivers/staging/media/omap4iss/iss_resizer.c       |  893 +++++++
3306  drivers/staging/media/omap4iss/iss_resizer.h       |   75 +
3307  drivers/staging/media/omap4iss/iss_video.c         | 1226 +++++++++
3308  drivers/staging/media/omap4iss/iss_video.h         |  204 ++
3309  .../{media/usb => staging/media}/sn9c102/Kconfig   |    9 +-
3310  .../{media/usb => staging/media}/sn9c102/Makefile  |    0
3311  .../{media/usb => staging/media}/sn9c102/sn9c102.h |    0
3312  .../staging/media/sn9c102}/sn9c102.txt             |    0
3313  .../usb => staging/media}/sn9c102/sn9c102_config.h |    0
3314  .../usb => staging/media}/sn9c102/sn9c102_core.c   |    0
3315  .../media}/sn9c102/sn9c102_devtable.h              |    0
3316  .../media}/sn9c102/sn9c102_hv7131d.c               |    0
3317  .../media}/sn9c102/sn9c102_hv7131r.c               |    0
3318  .../usb => staging/media}/sn9c102/sn9c102_mi0343.c |    0
3319  .../usb => staging/media}/sn9c102/sn9c102_mi0360.c |    0
3320  .../media}/sn9c102/sn9c102_mt9v111.c               |    0
3321  .../usb => staging/media}/sn9c102/sn9c102_ov7630.c |    0
3322  .../usb => staging/media}/sn9c102/sn9c102_ov7660.c |    0
3323  .../media}/sn9c102/sn9c102_pas106b.c               |    0
3324  .../media}/sn9c102/sn9c102_pas202bcb.c             |    0
3325  .../usb => staging/media}/sn9c102/sn9c102_sensor.h |    0
3326  .../media}/sn9c102/sn9c102_tas5110c1b.c            |    0
3327  .../media}/sn9c102/sn9c102_tas5110d.c              |    0
3328  .../media}/sn9c102/sn9c102_tas5130d1b.c            |    0
3329  drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c |    2 +-
3330  drivers/staging/media/solo6x10/solo6x10-v4l2.c     |    7 +-
3331  drivers/staging/media/solo6x10/solo6x10.h          |    2 +-
3332  include/linux/platform_data/vsp1.h                 |    2 +
3333  include/media/adv7604.h                            |   38 +-
3334  include/media/adv7842.h                            |   59 +-
3335  include/media/atmel-isi.h                          |    2 +
3336  include/media/media-entity.h                       |    1 +
3337  include/media/omap4iss.h                           |   65 +
3338  include/media/rc-map.h                             |    1 +
3339  include/media/saa6588.h                            |    2 +-
3340  include/media/saa6752hs.h                          |   26 -
3341  include/media/si4713.h                             |    2 +
3342  include/media/v4l2-fh.h                            |    4 +
3343  include/media/v4l2-mem2mem.h                       |   24 +
3344  include/media/v4l2-of.h                            |    6 +-
3345  include/media/videobuf2-core.h                     |   18 +-
3346  include/trace/events/v4l2.h                        |  157 ++
3347  include/uapi/linux/media.h                         |    1 +
3348  include/uapi/linux/v4l2-controls.h                 |    9 +
3349  include/uapi/linux/v4l2-mediabus.h                 |    3 +
3350  include/uapi/linux/videodev2.h                     |    4 +-
3351  include/uapi/linux/vsp1.h                          |   34 +
3352  296 files changed, 28976 insertions(+), 4971 deletions(-)
3353  create mode 100644 Documentation/devicetree/bindings/media/exynos-jpeg-codec.txt
3354  create mode 100644 Documentation/devicetree/bindings/media/samsung-s5k5baf.txt
3355  create mode 100644 Documentation/video4linux/omap4_camera.txt
3356  create mode 100644 drivers/media/dvb-frontends/m88ds3103.c
3357  create mode 100644 drivers/media/dvb-frontends/m88ds3103.h
3358  create mode 100644 drivers/media/dvb-frontends/m88ds3103_priv.h
3359  create mode 100644 drivers/media/i2c/s5k5baf.c
3360  rename drivers/media/{pci/saa7134 => i2c}/saa6752hs.c (98%)
3361  create mode 100644 drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c
3362  create mode 100644 drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.h
3363  rename drivers/media/platform/s5p-jpeg/{jpeg-hw.h => jpeg-hw-s5p.c} (70%)
3364  create mode 100644 drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h
3365  create mode 100644 drivers/media/platform/ti-vpe/csc.c
3366  create mode 100644 drivers/media/platform/ti-vpe/csc.h
3367  create mode 100644 drivers/media/platform/ti-vpe/sc.c
3368  create mode 100644 drivers/media/platform/ti-vpe/sc.h
3369  create mode 100644 drivers/media/platform/ti-vpe/sc_coeff.h
3370  create mode 100644 drivers/media/platform/vsp1/vsp1_hsit.c
3371  create mode 100644 drivers/media/platform/vsp1/vsp1_hsit.h
3372  create mode 100644 drivers/media/platform/vsp1/vsp1_lut.c
3373  create mode 100644 drivers/media/platform/vsp1/vsp1_lut.h
3374  create mode 100644 drivers/media/platform/vsp1/vsp1_sru.c
3375  create mode 100644 drivers/media/platform/vsp1/vsp1_sru.h
3376  create mode 100644 drivers/media/radio/radio-raremono.c
3377  create mode 100644 drivers/media/radio/si4713/Kconfig
3378  create mode 100644 drivers/media/radio/si4713/Makefile
3379  rename drivers/media/radio/{radio-si4713.c => si4713/radio-platform-si4713.c} (100%)
3380  create mode 100644 drivers/media/radio/si4713/radio-usb-si4713.c
3381  rename drivers/media/radio/{si4713-i2c.c => si4713/si4713.c} (86%)
3382  rename drivers/media/radio/{si4713-i2c.h => si4713/si4713.h} (98%)
3383  create mode 100644 drivers/media/rc/keymaps/rc-su3000.c
3384  create mode 100644 drivers/media/tuners/m88ts2022.c
3385  create mode 100644 drivers/media/tuners/m88ts2022.h
3386  create mode 100644 drivers/media/tuners/m88ts2022_priv.h
3387  create mode 100644 drivers/media/usb/em28xx/em28xx-v4l.h
3388  create mode 100644 drivers/staging/media/bcm2048/Kconfig
3389  create mode 100644 drivers/staging/media/bcm2048/Makefile
3390  create mode 100644 drivers/staging/media/bcm2048/TODO
3391  create mode 100644 drivers/staging/media/bcm2048/radio-bcm2048.c
3392  create mode 100644 drivers/staging/media/bcm2048/radio-bcm2048.h
3393  create mode 100644 drivers/staging/media/omap24xx/Kconfig
3394  create mode 100644 drivers/staging/media/omap24xx/Makefile
3395  rename drivers/{media/platform => staging/media/omap24xx}/omap24xxcam-dma.c (100%)
3396  rename drivers/{media/platform => staging/media/omap24xx}/omap24xxcam.c (100%)
3397  rename drivers/{media/platform => staging/media/omap24xx}/omap24xxcam.h (99%)
3398  rename drivers/{media/i2c => staging/media/omap24xx}/tcm825x.c (99%)
3399  rename drivers/{media/i2c => staging/media/omap24xx}/tcm825x.h (99%)
3400  rename drivers/{media/v4l2-core => staging/media/omap24xx}/v4l2-int-device.c (99%)
3401  rename {include/media => drivers/staging/media/omap24xx}/v4l2-int-device.h (100%)
3402  create mode 100644 drivers/staging/media/omap4iss/Kconfig
3403  create mode 100644 drivers/staging/media/omap4iss/Makefile
3404  create mode 100644 drivers/staging/media/omap4iss/TODO
3405  create mode 100644 drivers/staging/media/omap4iss/iss.c
3406  create mode 100644 drivers/staging/media/omap4iss/iss.h
3407  create mode 100644 drivers/staging/media/omap4iss/iss_csi2.c
3408  create mode 100644 drivers/staging/media/omap4iss/iss_csi2.h
3409  create mode 100644 drivers/staging/media/omap4iss/iss_csiphy.c
3410  create mode 100644 drivers/staging/media/omap4iss/iss_csiphy.h
3411  create mode 100644 drivers/staging/media/omap4iss/iss_ipipe.c
3412  create mode 100644 drivers/staging/media/omap4iss/iss_ipipe.h
3413  create mode 100644 drivers/staging/media/omap4iss/iss_ipipeif.c
3414  create mode 100644 drivers/staging/media/omap4iss/iss_ipipeif.h
3415  create mode 100644 drivers/staging/media/omap4iss/iss_regs.h
3416  create mode 100644 drivers/staging/media/omap4iss/iss_resizer.c
3417  create mode 100644 drivers/staging/media/omap4iss/iss_resizer.h
3418  create mode 100644 drivers/staging/media/omap4iss/iss_video.c
3419  create mode 100644 drivers/staging/media/omap4iss/iss_video.h
3420  rename drivers/{media/usb => staging/media}/sn9c102/Kconfig (52%)
3421  rename drivers/{media/usb => staging/media}/sn9c102/Makefile (100%)
3422  rename drivers/{media/usb => staging/media}/sn9c102/sn9c102.h (100%)
3423  rename {Documentation/video4linux => drivers/staging/media/sn9c102}/sn9c102.txt (100%)
3424  rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_config.h (100%)
3425  rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_core.c (100%)
3426  rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_devtable.h (100%)
3427  rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_hv7131d.c (100%)
3428  rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_hv7131r.c (100%)
3429  rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_mi0343.c (100%)
3430  rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_mi0360.c (100%)
3431  rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_mt9v111.c (100%)
3432  rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_ov7630.c (100%)
3433  rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_ov7660.c (100%)
3434  rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_pas106b.c (100%)
3435  rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_pas202bcb.c (100%)
3436  rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_sensor.h (100%)
3437  rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_tas5110c1b.c (100%)
3438  rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_tas5110d.c (100%)
3439  rename drivers/{media/usb => staging/media}/sn9c102/sn9c102_tas5130d1b.c (100%)
3440  create mode 100644 include/media/omap4iss.h
3441  delete mode 100644 include/media/saa6752hs.h
3442  create mode 100644 include/trace/events/v4l2.h
3443  create mode 100644 include/uapi/linux/vsp1.h
3444 Merging kbuild/for-next (ddbfd0b07555 Merge branch 'kbuild/kbuild' into kbuild/for-next)
3445 $ git merge kbuild/for-next
3446 Auto-merging Makefile
3447 Merge made by the 'recursive' strategy.
3448  Makefile                                |   6 ++
3449  scripts/coccinelle/api/pm_runtime.cocci | 109 ++++++++++++++++++++++++++++++++
3450  scripts/package/builddeb                |  25 +++++---
3451  scripts/setlocalversion                 |   3 +-
3452  4 files changed, 134 insertions(+), 9 deletions(-)
3453  create mode 100644 scripts/coccinelle/api/pm_runtime.cocci
3454 Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings)
3455 $ git merge kconfig/for-next
3456 Merge made by the 'recursive' strategy.
3457  scripts/kconfig/streamline_config.pl | 7 +++++++
3458  1 file changed, 7 insertions(+)
3459 Merging libata/for-next (e752997672bc Merge branch 'for-3.14' into for-next)
3460 $ git merge libata/for-next
3461 Recorded preimage for 'arch/arm/boot/dts/armada-370-xp.dtsi'
3462 Resolved 'drivers/ata/ahci.c' using previous resolution.
3463 Auto-merging drivers/ata/ahci.c
3464 CONFLICT (content): Merge conflict in drivers/ata/ahci.c
3465 Removing arch/arm/plat-samsung/include/plat/regs-ata.h
3466 Auto-merging arch/arm/boot/dts/armada-370-xp.dtsi
3467 CONFLICT (content): Merge conflict in arch/arm/boot/dts/armada-370-xp.dtsi
3468 Automatic merge failed; fix conflicts and then commit the result.
3469 $ git commit -v -a
3470 Recorded resolution for 'arch/arm/boot/dts/armada-370-xp.dtsi'.
3471 [master e01d6f34d65b] Merge remote-tracking branch 'libata/for-next'
3472 $ git diff -M --stat --summary HEAD^..
3473  Documentation/devicetree/bindings/ata/marvell.txt  |   2 +-
3474  .../devicetree/bindings/ata/sata_rcar.txt          |  18 ++
3475  arch/arm/boot/dts/armada-370-xp.dtsi               |   2 +-
3476  arch/arm/plat-samsung/include/plat/regs-ata.h      |  56 -----
3477  drivers/ata/ahci.c                                 |  62 +++++-
3478  drivers/ata/ahci_imx.c                             | 242 +++++++++++++--------
3479  drivers/ata/ata_generic.c                          |   7 -
3480  drivers/ata/libahci.c                              |   4 +-
3481  drivers/ata/libata-eh.c                            |   5 +-
3482  drivers/ata/pata_samsung_cf.c                      |  43 ++--
3483  drivers/ata/sata_mv.c                              |  25 +++
3484  drivers/ata/sata_rcar.c                            | 118 ++++++++--
3485  12 files changed, 387 insertions(+), 197 deletions(-)
3486  create mode 100644 Documentation/devicetree/bindings/ata/sata_rcar.txt
3487  delete mode 100644 arch/arm/plat-samsung/include/plat/regs-ata.h
3488 Merging pm/linux-next (401ef25ce2f4 Merge branch 'pm-cpuidle')
3489 $ git merge pm/linux-next
3490 Auto-merging include/acpi/acpi_io.h
3491 Auto-merging drivers/platform/x86/eeepc-laptop.c
3492 Auto-merging drivers/platform/x86/asus-wmi.c
3493 Auto-merging drivers/pci/pci-label.c
3494 Auto-merging drivers/pci/pci-acpi.c
3495 Auto-merging drivers/pci/ioapic.c
3496 Auto-merging drivers/pci/hotplug/pciehp.h
3497 Auto-merging drivers/pci/hotplug/acpiphp_glue.c
3498 Auto-merging drivers/hid/i2c-hid/i2c-hid.c
3499 Auto-merging drivers/cpufreq/exynos5250-cpufreq.c
3500 Auto-merging drivers/acpi/pci_root.c
3501 Auto-merging arch/x86/kernel/acpi/boot.c
3502 Auto-merging arch/powerpc/platforms/pseries/processor_idle.c
3503 Auto-merging arch/ia64/kernel/acpi.c
3504 Auto-merging arch/arm/mach-exynos/mach-exynos5-dt.c
3505 Auto-merging arch/arm/mach-exynos/cpuidle.c
3506 Auto-merging arch/arm/mach-exynos/common.h
3507 Auto-merging arch/arm/mach-exynos/common.c
3508 Merge made by the 'recursive' strategy.
3509  Documentation/ABI/testing/sysfs-devices-system-cpu |   24 +
3510  Documentation/acpi/namespace.txt                   |    9 +-
3511  Documentation/cpu-freq/intel-pstate.txt            |   40 +
3512  arch/arm/mach-exynos/common.c                      |    5 +
3513  arch/arm/mach-exynos/common.h                      |    1 +
3514  arch/arm/mach-exynos/cpuidle.c                     |    8 +-
3515  arch/arm/mach-exynos/mach-exynos4-dt.c             |    1 +
3516  arch/arm/mach-exynos/mach-exynos5-dt.c             |    1 +
3517  arch/arm/mach-sa1100/clock.c                       |    7 +
3518  arch/ia64/hp/common/aml_nfw.c                      |    3 +-
3519  arch/ia64/kernel/acpi.c                            |    1 -
3520  arch/powerpc/platforms/pseries/processor_idle.c    |   59 +-
3521  arch/x86/kernel/acpi/boot.c                        |    3 +-
3522  arch/x86/kernel/apic/apic_flat_64.c                |    4 +-
3523  arch/x86/kernel/apic/io_apic.c                     |    3 -
3524  arch/x86/pci/mmconfig-shared.c                     |    1 -
3525  arch/x86/pci/mmconfig_32.c                         |    1 -
3526  arch/x86/platform/olpc/olpc-xo15-sci.c             |    3 +-
3527  drivers/acpi/ac.c                                  |    3 +-
3528  drivers/acpi/acpi_extlog.c                         |   62 +-
3529  drivers/acpi/acpi_memhotplug.c                     |   15 +-
3530  drivers/acpi/acpi_pad.c                            |    3 +-
3531  drivers/acpi/acpi_processor.c                      |   26 +-
3532  drivers/acpi/acpica/acdebug.h                      |    1 -
3533  drivers/acpi/acpica/acevents.h                     |    9 +-
3534  drivers/acpi/acpica/acglobal.h                     |   30 +
3535  drivers/acpi/acpica/aclocal.h                      |    9 +-
3536  drivers/acpi/acpica/dsfield.c                      |    2 +-
3537  drivers/acpi/acpica/dsutils.c                      |   19 +-
3538  drivers/acpi/acpica/dswload.c                      |    4 +-
3539  drivers/acpi/acpica/evgpeblk.c                     |    8 +-
3540  drivers/acpi/acpica/evgpeutil.c                    |   24 +-
3541  drivers/acpi/acpica/exresnte.c                     |    3 +-
3542  drivers/acpi/acpica/nsxfeval.c                     |   23 +-
3543  drivers/acpi/acpica/psopinfo.c                     |   51 +-
3544  drivers/acpi/acpica/tbfadt.c                       |  335 +++---
3545  drivers/acpi/acpica/tbutils.c                      |  214 ++--
3546  drivers/acpi/acpica/utaddress.c                    |   19 +-
3547  drivers/acpi/acpica/utalloc.c                      |   10 +-
3548  drivers/acpi/acpica/utcache.c                      |   12 +-
3549  drivers/acpi/acpica/utdebug.c                      |    4 +-
3550  drivers/acpi/acpica/utglobal.c                     |    4 -
3551  drivers/acpi/acpica/utxfinit.c                     |   12 +-
3552  drivers/acpi/apei/apei-base.c                      |    1 -
3553  drivers/acpi/apei/apei-internal.h                  |    1 -
3554  drivers/acpi/apei/einj.c                           |    1 -
3555  drivers/acpi/apei/ghes.c                           |    1 -
3556  drivers/acpi/battery.c                             |    3 +-
3557  drivers/acpi/blacklist.c                           |   51 +-
3558  drivers/acpi/bus.c                                 |   77 +-
3559  drivers/acpi/button.c                              |   21 +-
3560  drivers/acpi/container.c                           |   55 +-
3561  drivers/acpi/custom_method.c                       |    2 +-
3562  drivers/acpi/debugfs.c                             |    2 +-
3563  drivers/acpi/device_pm.c                           |   22 +-
3564  drivers/acpi/dock.c                                |   16 +-
3565  drivers/acpi/ec.c                                  |   32 +-
3566  drivers/acpi/ec_sys.c                              |    2 +-
3567  drivers/acpi/event.c                               |    2 +-
3568  drivers/acpi/fan.c                                 |    3 +-
3569  drivers/acpi/glue.c                                |  165 +--
3570  drivers/acpi/hed.c                                 |    2 -
3571  drivers/acpi/internal.h                            |   19 +-
3572  drivers/acpi/numa.c                                |    1 -
3573  drivers/acpi/nvs.c                                 |    3 +-
3574  drivers/acpi/osl.c                                 |   14 +-
3575  drivers/acpi/pci_irq.c                             |    2 -
3576  drivers/acpi/pci_link.c                            |    4 +-
3577  drivers/acpi/pci_root.c                            |  126 +-
3578  drivers/acpi/pci_slot.c                            |    1 +
3579  drivers/acpi/power.c                               |    3 +-
3580  drivers/acpi/proc.c                                |    5 +-
3581  drivers/acpi/processor_core.c                      |    3 +-
3582  drivers/acpi/processor_driver.c                    |    8 +-
3583  drivers/acpi/processor_idle.c                      |   37 +-
3584  drivers/acpi/processor_perflib.c                   |    7 +-
3585  drivers/acpi/processor_thermal.c                   |   11 +-
3586  drivers/acpi/processor_throttling.c                |    7 +-
3587  drivers/acpi/sbshc.c                               |    3 +-
3588  drivers/acpi/scan.c                                |  547 +++++----
3589  drivers/acpi/sleep.c                               |   14 +-
3590  drivers/acpi/sysfs.c                               |    2 +-
3591  drivers/acpi/tables.c                              |   11 +-
3592  drivers/acpi/thermal.c                             |    7 +-
3593  drivers/acpi/utils.c                               |   99 +-
3594  drivers/acpi/video.c                               |    5 +-
3595  drivers/acpi/video_detect.c                        |    2 +-
3596  drivers/acpi/wakeup.c                              |    1 -
3597  drivers/ata/libata-acpi.c                          |   28 +-
3598  drivers/ata/pata_acpi.c                            |    5 +-
3599  drivers/base/Makefile                              |    2 +-
3600  drivers/base/base.h                                |    1 +
3601  drivers/base/container.c                           |   44 +
3602  drivers/base/init.c                                |    1 +
3603  drivers/base/power/generic_ops.c                   |    4 +-
3604  drivers/char/apm-emulation.c                       |   11 +-
3605  drivers/char/hpet.c                                |    7 +-
3606  drivers/char/tpm/tpm_acpi.c                        |    2 +-
3607  drivers/char/tpm/tpm_ppi.c                         |  406 +++----
3608  drivers/cpufreq/Kconfig                            |    3 +-
3609  drivers/cpufreq/Kconfig.arm                        |   12 +-
3610  drivers/cpufreq/arm_big_little.c                   |    3 +-
3611  drivers/cpufreq/at32ap-cpufreq.c                   |   17 +-
3612  drivers/cpufreq/cpufreq-cpu0.c                     |   10 +-
3613  drivers/cpufreq/cpufreq.c                          |  100 +-
3614  drivers/cpufreq/cpufreq_governor.c                 |    6 +-
3615  drivers/cpufreq/cpufreq_governor.h                 |    2 +
3616  drivers/cpufreq/cpufreq_stats.c                    |  109 +-
3617  drivers/cpufreq/davinci-cpufreq.c                  |   16 +-
3618  drivers/cpufreq/dbx500-cpufreq.c                   |   22 +-
3619  drivers/cpufreq/exynos-cpufreq.c                   |   25 +-
3620  drivers/cpufreq/exynos5250-cpufreq.c               |   74 +-
3621  drivers/cpufreq/exynos5440-cpufreq.c               |   36 +-
3622  drivers/cpufreq/freq_table.c                       |   22 +
3623  drivers/cpufreq/imx6q-cpufreq.c                    |  134 ++-
3624  drivers/cpufreq/integrator-cpufreq.c               |    1 +
3625  drivers/cpufreq/intel_pstate.c                     |   69 +-
3626  drivers/cpufreq/kirkwood-cpufreq.c                 |    1 +
3627  drivers/cpufreq/loongson2_cpufreq.c                |   15 +-
3628  drivers/cpufreq/omap-cpufreq.c                     |   34 +-
3629  drivers/cpufreq/pcc-cpufreq.c                      |   18 +-
3630  drivers/cpufreq/powernow-k6.c                      |  147 ++-
3631  drivers/cpufreq/powernow-k8.c                      |    7 +-
3632  drivers/cpufreq/ppc-corenet-cpufreq.c              |   17 +-
3633  drivers/cpufreq/pxa2xx-cpufreq.c                   |    1 +
3634  drivers/cpufreq/pxa3xx-cpufreq.c                   |    1 +
3635  drivers/cpufreq/s3c2416-cpufreq.c                  |    2 +-
3636  drivers/cpufreq/s3c2440-cpufreq.c                  |    6 +-
3637  drivers/cpufreq/s3c24xx-cpufreq.c                  |   14 +-
3638  drivers/cpufreq/s3c64xx-cpufreq.c                  |   35 +-
3639  drivers/cpufreq/s5pv210-cpufreq.c                  |   23 +-
3640  drivers/cpufreq/sa1100-cpufreq.c                   |    2 +-
3641  drivers/cpufreq/sa1110-cpufreq.c                   |    2 +-
3642  drivers/cpufreq/spear-cpufreq.c                    |   12 +-
3643  drivers/cpufreq/speedstep-lib.c                    |    3 +
3644  drivers/cpufreq/speedstep-smi.c                    |   44 +-
3645  drivers/cpufreq/tegra-cpufreq.c                    |   49 +-
3646  drivers/cpufreq/unicore2-cpufreq.c                 |   33 +-
3647  drivers/firmware/Kconfig                           |    2 +-
3648  drivers/gpu/drm/gma500/opregion.c                  |    1 -
3649  drivers/gpu/drm/i915/Makefile                      |    3 +-
3650  drivers/gpu/drm/i915/i915_drv.h                    |    3 +-
3651  drivers/gpu/drm/i915/intel_acpi.c                  |  146 +--
3652  drivers/gpu/drm/i915/intel_opregion.c              |    1 -
3653  drivers/gpu/drm/nouveau/core/subdev/mxm/base.c     |   48 +-
3654  drivers/gpu/drm/nouveau/nouveau_acpi.c             |  138 +--
3655  drivers/gpu/drm/radeon/radeon_acpi.c               |    6 +-
3656  drivers/hid/i2c-hid/i2c-hid.c                      |   26 +-
3657  drivers/hv/vmbus_drv.c                             |    2 -
3658  drivers/hwmon/acpi_power_meter.c                   |    3 +-
3659  drivers/hwmon/asus_atk0110.c                       |    6 +-
3660  drivers/ide/ide-acpi.c                             |   12 +-
3661  drivers/idle/intel_idle.c                          |   32 +-
3662  drivers/input/misc/atlas_btns.c                    |    2 +-
3663  drivers/iommu/amd_iommu_init.c                     |    1 -
3664  drivers/iommu/intel_irq_remapping.c                |    4 +-
3665  drivers/mmc/core/sdio_bus.c                        |    2 +-
3666  drivers/pci/hotplug/acpiphp_glue.c                 |    2 +-
3667  drivers/pci/hotplug/acpiphp_ibm.c                  |    3 +-
3668  drivers/pci/hotplug/pciehp.h                       |    2 -
3669  drivers/pci/ioapic.c                               |    1 -
3670  drivers/pci/pci-acpi.c                             |   17 +-
3671  drivers/pci/pci-label.c                            |  130 +--
3672  drivers/platform/x86/acer-wmi.c                    |    2 -
3673  drivers/platform/x86/asus-laptop.c                 |    3 +-
3674  drivers/platform/x86/asus-wmi.c                    |    3 +-
3675  drivers/platform/x86/classmate-laptop.c            |    3 +-
3676  drivers/platform/x86/dell-wmi-aio.c                |    1 -
3677  drivers/platform/x86/dell-wmi.c                    |    1 -
3678  drivers/platform/x86/eeepc-laptop.c                |    3 +-
3679  drivers/platform/x86/eeepc-wmi.c                   |    2 +-
3680  drivers/platform/x86/hp_accel.c                    |    2 +-
3681  drivers/platform/x86/ideapad-laptop.c              |    3 +-
3682  drivers/platform/x86/intel-rst.c                   |    2 +-
3683  drivers/platform/x86/intel-smartconnect.c          |    2 +-
3684  drivers/platform/x86/intel_menlow.c                |    4 +-
3685  drivers/platform/x86/intel_oaktrail.c              |    3 -
3686  drivers/platform/x86/mxm-wmi.c                     |    3 +-
3687  drivers/platform/x86/panasonic-laptop.c            |    4 +-
3688  drivers/platform/x86/pvpanic.c                     |    3 +-
3689  drivers/platform/x86/samsung-q10.c                 |    2 +-
3690  drivers/platform/x86/sony-laptop.c                 |    4 +-
3691  drivers/platform/x86/tc1100-wmi.c                  |    4 +-
3692  drivers/platform/x86/thinkpad_acpi.c               |   14 +-
3693  drivers/platform/x86/toshiba_acpi.c                |    4 +-
3694  drivers/platform/x86/toshiba_bluetooth.c           |    4 +-
3695  drivers/platform/x86/wmi.c                         |    2 -
3696  drivers/platform/x86/xo15-ebook.c                  |    3 +-
3697  drivers/pnp/card.c                                 |    1 +
3698  drivers/pnp/pnpacpi/core.c                         |   33 +-
3699  drivers/pnp/pnpacpi/pnpacpi.h                      |    1 -
3700  drivers/pnp/pnpbios/core.c                         |   12 +-
3701  drivers/pnp/resource.c                             |    2 +-
3702  drivers/sfi/sfi_acpi.c                             |    4 +-
3703  drivers/staging/quickstart/quickstart.c            |    2 +-
3704  drivers/usb/core/usb-acpi.c                        |   41 +-
3705  drivers/xen/xen-acpi-cpuhotplug.c                  |   11 +-
3706  drivers/xen/xen-acpi-memhotplug.c                  |    8 +-
3707  drivers/xen/xen-acpi-pad.c                         |    5 +-
3708  drivers/xen/xen-acpi-processor.c                   |    4 +-
3709  include/acpi/acpi_bus.h                            |   64 +-
3710  include/acpi/acpi_drivers.h                        |    3 -
3711  include/{linux => acpi}/acpi_io.h                  |    1 -
3712  include/acpi/acpixf.h                              |   39 +-
3713  include/acpi/actbl.h                               |    3 +
3714  include/acpi/actbl2.h                              |    5 +
3715  include/acpi/actbl3.h                              |   15 +-
3716  include/acpi/actypes.h                             |   12 +-
3717  include/acpi/platform/acenv.h                      |   20 +-
3718  include/acpi/platform/aclinux.h                    |    4 -
3719  include/linux/acpi.h                               |    9 +-
3720  include/linux/container.h                          |   25 +
3721  include/linux/cpufreq.h                            |   18 +
3722  include/linux/ide.h                                |    8 +-
3723  include/linux/iscsi_ibft.h                         |    2 +-
3724  include/linux/pci_hotplug.h                        |    3 +-
3725  include/linux/pm.h                                 |   21 +
3726  include/linux/pm_runtime.h                         |   12 +-
3727  include/linux/sfi_acpi.h                           |    5 +-
3728  include/linux/tboot.h                              |    2 +-
3729  include/uapi/linux/apm_bios.h                      |    2 +
3730  kernel/power/hibernate.c                           |    7 +-
3731  scripts/analyze_suspend.py                         | 1215 ++++++++++++++++++++
3732  .../power/cpupower/debug/kernel/cpufreq-test_tsc.c |    5 +-
3733  tools/power/cpupower/utils/cpufreq-set.c           |    2 +-
3734  225 files changed, 3777 insertions(+), 2638 deletions(-)
3735  create mode 100644 Documentation/cpu-freq/intel-pstate.txt
3736  create mode 100644 drivers/base/container.c
3737  rename include/{linux => acpi}/acpi_io.h (94%)
3738  create mode 100644 include/linux/container.h
3739  create mode 100755 scripts/analyze_suspend.py
3740 Merging idle/next (4eda09c107d1 Merge branches 'turbostat' and 'bugzilla-60770-mwait-idle' into release)
3741 $ git merge idle/next
3742 Merge made by the 'recursive' strategy.
3743  arch/x86/kernel/process.c             | 46 +++++++++++++++++++++++++++++++++++
3744  tools/power/x86/turbostat/turbostat.c | 42 +++++++++++++++++++++++---------
3745  2 files changed, 77 insertions(+), 11 deletions(-)
3746 Merging apm/for-next (158204397034 apm-emulation: add hibernation APM events to support suspend2disk)
3747 $ git merge apm/for-next
3748 Already up-to-date.
3749 Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
3750 $ git merge cpupowerutils/master
3751 Already up-to-date.
3752 Merging thermal/next (c698a4492f01 Merge branch 'misc' of .git into next)
3753 $ git merge thermal/next
3754 Resolved 'drivers/cpufreq/Kconfig' using previous resolution.
3755 Auto-merging drivers/cpufreq/cpufreq-cpu0.c
3756 Auto-merging drivers/cpufreq/Kconfig
3757 CONFLICT (content): Merge conflict in drivers/cpufreq/Kconfig
3758 Auto-merging MAINTAINERS
3759 Automatic merge failed; fix conflicts and then commit the result.
3760 $ git commit -v -a
3761 [master 072d8366f9d8] Merge remote-tracking branch 'thermal/next'
3762 $ git diff -M --stat --summary HEAD^..
3763  .../devicetree/bindings/cpufreq/cpufreq-cpu0.txt   |   7 +
3764  .../devicetree/bindings/thermal/imx-thermal.txt    |   4 +
3765  .../devicetree/bindings/thermal/thermal.txt        | 595 +++++++++++++++
3766  MAINTAINERS                                        |   1 +
3767  arch/arm/boot/dts/omap4-cpu-thermal.dtsi           |  41 +
3768  arch/arm/boot/dts/omap443x.dtsi                    |  23 +-
3769  arch/arm/boot/dts/omap4460.dtsi                    |  29 +-
3770  arch/arm/boot/dts/omap5-core-thermal.dtsi          |  28 +
3771  arch/arm/boot/dts/omap5-gpu-thermal.dtsi           |  28 +
3772  arch/arm/boot/dts/omap5.dtsi                       |  14 +-
3773  drivers/cpufreq/Kconfig                            |   2 +-
3774  drivers/cpufreq/cpufreq-cpu0.c                     |  16 +
3775  drivers/hwmon/lm75.c                               |  35 +-
3776  drivers/hwmon/tmp102.c                             |  19 +
3777  drivers/thermal/Kconfig                            |  23 +-
3778  drivers/thermal/Makefile                           |   2 +
3779  drivers/thermal/cpu_cooling.c                      |  67 +-
3780  drivers/thermal/imx_thermal.c                      |  54 +-
3781  drivers/thermal/int3403_thermal.c                  | 237 ++++++
3782  drivers/thermal/intel_powerclamp.c                 |  11 +-
3783  drivers/thermal/of-thermal.c                       | 849 +++++++++++++++++++++
3784  drivers/thermal/samsung/exynos_thermal_common.c    |   2 +-
3785  drivers/thermal/samsung/exynos_tmu.c               |   1 +
3786  drivers/thermal/step_wise.c                        |   6 +
3787  drivers/thermal/thermal_core.c                     |  86 ++-
3788  drivers/thermal/thermal_core.h                     |   9 +
3789  drivers/thermal/ti-soc-thermal/ti-thermal-common.c |  77 +-
3790  drivers/thermal/x86_pkg_temp_thermal.c             |   2 +-
3791  include/dt-bindings/thermal/thermal.h              |  17 +
3792  include/linux/cpu_cooling.h                        |  25 +
3793  include/linux/thermal.h                            |  32 +-
3794  31 files changed, 2271 insertions(+), 71 deletions(-)
3795  create mode 100644 Documentation/devicetree/bindings/thermal/thermal.txt
3796  create mode 100644 arch/arm/boot/dts/omap4-cpu-thermal.dtsi
3797  create mode 100644 arch/arm/boot/dts/omap5-core-thermal.dtsi
3798  create mode 100644 arch/arm/boot/dts/omap5-gpu-thermal.dtsi
3799  create mode 100644 drivers/thermal/int3403_thermal.c
3800  create mode 100644 drivers/thermal/of-thermal.c
3801  create mode 100644 include/dt-bindings/thermal/thermal.h
3802 Merging ieee1394/for-next (8bc588e0e585 firewire: ohci: Turn remote DMA support into a module parameter)
3803 $ git merge ieee1394/for-next
3804 Merge made by the 'recursive' strategy.
3805  Documentation/debugging-via-ohci1394.txt   | 28 ++++++++++------------------
3806  Documentation/power/basic-pm-debugging.txt |  2 +-
3807  drivers/firewire/ohci.c                    | 19 +++++++++++--------
3808  lib/Kconfig.debug                          | 11 -----------
3809  4 files changed, 22 insertions(+), 38 deletions(-)
3810 Merging dlm/next (ece35848c184 dlm: set zero linger time on sctp socket)
3811 $ git merge dlm/next
3812 Merge made by the 'recursive' strategy.
3813  fs/dlm/lowcomms.c | 8 ++++++++
3814  1 file changed, 8 insertions(+)
3815 Merging swiotlb/linux-next (0cb637bff80d swiotlb: Don't DoS us with 'swiotlb buffer is full' (v2))
3816 $ git merge swiotlb/linux-next
3817 Auto-merging Documentation/kernel-parameters.txt
3818 Merge made by the 'recursive' strategy.
3819  Documentation/kernel-parameters.txt | 6 +++++-
3820  lib/swiotlb.c                       | 3 ++-
3821  2 files changed, 7 insertions(+), 2 deletions(-)
3822 Merging slave-dma/next (7ae2c0ce15b0 Merge branch 'for-linus' into next)
3823 $ git merge slave-dma/next
3824 Auto-merging drivers/dma/pl330.c
3825 Auto-merging drivers/dma/Kconfig
3826 Merge made by the 'recursive' strategy.
3827  .../devicetree/bindings/dma/bcm2835-dma.txt        |  57 ++
3828  .../devicetree/bindings/dma/fsl-imx-sdma.txt       |   1 +
3829  drivers/dma/Kconfig                                |   6 +
3830  drivers/dma/Makefile                               |   1 +
3831  drivers/dma/amba-pl08x.c                           |   2 +-
3832  drivers/dma/bcm2835-dma.c                          | 706 +++++++++++++++++++++
3833  drivers/dma/edma.c                                 |   6 +-
3834  drivers/dma/imx-sdma.c                             |  23 +-
3835  drivers/dma/mmp_pdma.c                             | 203 +++---
3836  drivers/dma/mmp_tdma.c                             |  28 +-
3837  drivers/dma/pl330.c                                |   6 +
3838  include/linux/dmaengine.h                          |   5 +-
3839  include/linux/platform_data/dma-imx-sdma.h         |   5 +
3840  include/linux/platform_data/dma-imx.h              |   1 +
3841  include/linux/platform_data/dma-mmp_tdma.h         |   8 +-
3842  include/linux/platform_data/dma-mv_xor.h           |   6 +-
3843  sound/soc/fsl/fsl_ssi.c                            |  27 +-
3844  17 files changed, 971 insertions(+), 120 deletions(-)
3845  create mode 100644 Documentation/devicetree/bindings/dma/bcm2835-dma.txt
3846  create mode 100644 drivers/dma/bcm2835-dma.c
3847 Merging dmaengine/next (77873803363c net_dma: mark broken)
3848 $ git merge dmaengine/next
3849 Already up-to-date.
3850 Merging net-next/master (42851e88a755 gianfar: Fix portabilty issues for ethtool and ptp)
3851 $ git merge net-next/master
3852 Resolved 'arch/mips/bcm47xx/setup.c' using previous resolution.
3853 Auto-merging net/sunrpc/xprtsock.c
3854 Auto-merging net/sunrpc/xprt.c
3855 Auto-merging net/sunrpc/cache.c
3856 Auto-merging net/netfilter/nft_reject.c
3857 Removing net/netfilter/nft_meta_target.c
3858 Auto-merging net/ipv4/ipmr.c
3859 Auto-merging include/uapi/linux/pci_regs.h
3860 Removing drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h
3861 Removing drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
3862 Removing drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
3863 Auto-merging drivers/net/ethernet/ibm/ibmveth.c
3864 Auto-merging drivers/net/ethernet/8390/zorro8390.c
3865 Auto-merging drivers/net/ethernet/8390/hydra.c
3866 Auto-merging drivers/net/can/mscan/mpc5xxx_can.c
3867 Auto-merging arch/xtensa/include/asm/Kbuild
3868 Auto-merging arch/um/include/asm/Kbuild
3869 CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild
3870 Auto-merging arch/mips/bcm47xx/setup.c
3871 CONFLICT (content): Merge conflict in arch/mips/bcm47xx/setup.c
3872 Auto-merging arch/arm64/include/asm/Kbuild
3873 Auto-merging MAINTAINERS
3874 Automatic merge failed; fix conflicts and then commit the result.
3875 $ git commit -v -a
3876 Recorded resolution for 'arch/um/include/asm/Kbuild'.
3877 [master 39b12d6cb96b] Merge remote-tracking branch 'net-next/master'
3878 $ git diff -M --stat --summary HEAD^..
3879  Documentation/ABI/testing/sysfs-class-net-mesh     |    8 +
3880  Documentation/cgroups/net_cls.txt                  |    5 +
3881  .../bindings/net/can/microchip,mcp251x.txt         |   25 +
3882  Documentation/devicetree/bindings/net/phy.txt      |    1 +
3883  Documentation/networking/batman-adv.txt            |    9 +-
3884  Documentation/networking/bonding.txt               |    8 +
3885  Documentation/networking/can.txt                   |   94 +-
3886  Documentation/networking/filter.txt                |  608 ++-
3887  Documentation/networking/i40evf.txt                |   47 +
3888  Documentation/networking/ip-sysctl.txt             |   51 +-
3889  Documentation/networking/ipsec.txt                 |   38 +
3890  Documentation/networking/packet_mmap.txt           |   48 +-
3891  Documentation/networking/phy.txt                   |    3 +-
3892  Documentation/networking/pktgen.txt                |   15 +
3893  Documentation/networking/regulatory.txt            |    4 +-
3894  Documentation/networking/timestamping.txt          |    9 +-
3895  Documentation/networking/timestamping/.gitignore   |    1 +
3896  Documentation/networking/timestamping/Makefile     |    5 +-
3897  .../networking/timestamping/hwtstamp_config.c      |  134 +
3898  Documentation/unaligned-memory-access.txt          |   28 +-
3899  MAINTAINERS                                        |   31 +-
3900  arch/alpha/include/asm/Kbuild                      |    1 +
3901  arch/arc/include/asm/Kbuild                        |    1 +
3902  arch/arm/include/asm/Kbuild                        |    1 +
3903  arch/arm64/include/asm/Kbuild                      |    1 +
3904  arch/avr32/include/asm/Kbuild                      |    1 +
3905  arch/blackfin/include/asm/Kbuild                   |    1 +
3906  arch/c6x/include/asm/Kbuild                        |    1 +
3907  arch/cris/include/asm/Kbuild                       |    1 +
3908  arch/frv/include/asm/Kbuild                        |    1 +
3909  arch/hexagon/include/asm/Kbuild                    |    1 +
3910  arch/ia64/include/asm/Kbuild                       |    3 +-
3911  arch/m32r/include/asm/Kbuild                       |    1 +
3912  arch/m68k/include/asm/Kbuild                       |    1 +
3913  arch/metag/include/asm/Kbuild                      |    1 +
3914  arch/microblaze/include/asm/Kbuild                 |    1 +
3915  arch/mips/bcm47xx/setup.c                          |   10 +
3916  arch/mips/include/asm/Kbuild                       |    1 +
3917  arch/mn10300/include/asm/Kbuild                    |    1 +
3918  arch/openrisc/include/asm/Kbuild                   |    1 +
3919  arch/parisc/include/asm/Kbuild                     |    1 +
3920  arch/powerpc/include/asm/Kbuild                    |    3 +-
3921  arch/s390/include/asm/Kbuild                       |    1 +
3922  arch/score/include/asm/Kbuild                      |    2 +
3923  arch/sh/include/asm/Kbuild                         |    1 +
3924  arch/sparc/include/asm/Kbuild                      |    1 +
3925  arch/tile/include/asm/Kbuild                       |    1 +
3926  arch/um/include/asm/Kbuild                         |    1 +
3927  arch/unicore32/include/asm/Kbuild                  |    1 +
3928  arch/x86/include/asm/hash.h                        |    7 +
3929  arch/x86/lib/Makefile                              |    2 +-
3930  arch/x86/lib/hash.c                                |   88 +
3931  arch/xtensa/include/asm/Kbuild                     |    1 +
3932  drivers/atm/he.c                                   |    1 -
3933  drivers/atm/nicstar.c                              |    4 +-
3934  drivers/atm/solos-pci.c                            |    2 -
3935  drivers/bcma/bcma_private.h                        |    2 -
3936  drivers/bcma/driver_chipcommon_sflash.c            |    6 +-
3937  drivers/bcma/host_pci.c                            |    3 +-
3938  drivers/bcma/main.c                                |   14 +-
3939  drivers/bluetooth/ath3k.c                          |    4 +
3940  drivers/bluetooth/btmrvl_drv.h                     |   25 +-
3941  drivers/bluetooth/btmrvl_main.c                    |  130 +-
3942  drivers/bluetooth/btmrvl_sdio.c                    |    9 +-
3943  drivers/bluetooth/btmrvl_sdio.h                    |    2 -
3944  drivers/bluetooth/btsdio.c                         |    6 +-
3945  drivers/bluetooth/btusb.c                          |   53 +-
3946  drivers/bluetooth/hci_vhci.c                       |   29 +-
3947  drivers/infiniband/core/cma.c                      |    2 +-
3948  drivers/infiniband/hw/nes/nes_cm.c                 |    3 +-
3949  drivers/isdn/i4l/isdn_net.c                        |    4 +-
3950  drivers/isdn/sc/event.c                            |    2 +-
3951  drivers/media/dvb-core/dvb_net.c                   |   10 +-
3952  drivers/net/Space.c                                |   29 +-
3953  drivers/net/bonding/bond_3ad.c                     |  900 ++--
3954  drivers/net/bonding/bond_3ad.h                     |    2 +-
3955  drivers/net/bonding/bond_alb.c                     |   49 +-
3956  drivers/net/bonding/bond_alb.h                     |    3 +-
3957  drivers/net/bonding/bond_main.c                    |  314 +-
3958  drivers/net/bonding/bond_netlink.c                 |  378 +-
3959  drivers/net/bonding/bond_options.c                 |  611 ++-
3960  drivers/net/bonding/bond_sysfs.c                   |  684 +--
3961  drivers/net/bonding/bonding.h                      |   42 +-
3962  drivers/net/can/Kconfig                            |    4 +-
3963  drivers/net/can/c_can/c_can.c                      |   22 +-
3964  drivers/net/can/dev.c                              |    3 +-
3965  drivers/net/can/mcp251x.c                          |  121 +-
3966  drivers/net/can/mscan/mpc5xxx_can.c                |    3 +-
3967  drivers/net/can/mscan/mscan.c                      |    3 +-
3968  drivers/net/can/mscan/mscan.h                      |    3 +-
3969  drivers/net/can/pch_can.c                          |    3 +-
3970  drivers/net/can/sja1000/ems_pci.c                  |    3 +-
3971  drivers/net/can/sja1000/kvaser_pci.c               |    3 +-
3972  drivers/net/can/sja1000/plx_pci.c                  |   26 +-
3973  drivers/net/can/sja1000/sja1000_isa.c              |    3 +-
3974  drivers/net/can/sja1000/sja1000_of_platform.c      |    3 +-
3975  drivers/net/can/sja1000/sja1000_platform.c         |    3 +-
3976  drivers/net/can/slcan.c                            |    4 +-
3977  drivers/net/can/softing/softing_cs.c               |    3 +-
3978  drivers/net/can/softing/softing_fw.c               |    3 +-
3979  drivers/net/can/softing/softing_main.c             |    3 +-
3980  drivers/net/can/ti_hecc.c                          |   10 +-
3981  drivers/net/eql.c                                  |   95 +-
3982  drivers/net/ethernet/3com/3c509.c                  |    3 +-
3983  drivers/net/ethernet/3com/3c59x.c                  |    6 +-
3984  drivers/net/ethernet/8390/8390.h                   |    7 +-
3985  drivers/net/ethernet/8390/apne.c                   |   62 +-
3986  drivers/net/ethernet/8390/ax88796.c                |   22 +-
3987  drivers/net/ethernet/8390/axnet_cs.c               |  119 +-
3988  drivers/net/ethernet/8390/etherh.c                 |   53 +-
3989  drivers/net/ethernet/8390/hydra.c                  |   11 +-
3990  drivers/net/ethernet/8390/lib8390.c                |   77 +-
3991  drivers/net/ethernet/8390/mac8390.c                |   19 +-
3992  drivers/net/ethernet/8390/mcf8390.c                |    8 +-
3993  drivers/net/ethernet/8390/ne.c                     |   96 +-
3994  drivers/net/ethernet/8390/ne2k-pci.c               |   54 +-
3995  drivers/net/ethernet/8390/pcnet_cs.c               |   62 +-
3996  drivers/net/ethernet/8390/smc-ultra.c              |   48 +-
3997  drivers/net/ethernet/8390/stnic.c                  |   28 +-
3998  drivers/net/ethernet/8390/wd.c                     |   42 +-
3999  drivers/net/ethernet/8390/zorro8390.c              |   22 +-
4000  drivers/net/ethernet/adi/bfin_mac.c                |   22 +-
4001  drivers/net/ethernet/aeroflex/greth.c              |    2 +-
4002  drivers/net/ethernet/amd/7990.c                    |  836 ++--
4003  drivers/net/ethernet/amd/7990.h                    |  268 +-
4004  drivers/net/ethernet/amd/amd8111e.c                |    4 +-
4005  drivers/net/ethernet/amd/amd8111e.h                |    6 +-
4006  drivers/net/ethernet/amd/au1000_eth.c              |    3 +-
4007  drivers/net/ethernet/amd/au1000_eth.h              |    3 +-
4008  drivers/net/ethernet/amd/hplance.c                 |   96 +-
4009  drivers/net/ethernet/amd/mvme147.c                 |   36 +-
4010  drivers/net/ethernet/amd/pcnet32.c                 |    2 +-
4011  drivers/net/ethernet/arc/emac.h                    |    2 -
4012  drivers/net/ethernet/arc/emac_main.c               |   20 +-
4013  drivers/net/ethernet/atheros/alx/alx.h             |    3 +
4014  drivers/net/ethernet/atheros/alx/ethtool.c         |  101 +
4015  drivers/net/ethernet/atheros/alx/hw.c              |   58 +
4016  drivers/net/ethernet/atheros/alx/hw.h              |   71 +
4017  drivers/net/ethernet/atheros/alx/main.c            |   50 +
4018  drivers/net/ethernet/atheros/alx/reg.h             |   52 +-
4019  drivers/net/ethernet/atheros/atl1c/atl1c_main.c    |   31 +-
4020  drivers/net/ethernet/atheros/atl1e/atl1e_main.c    |   30 +-
4021  drivers/net/ethernet/atheros/atlx/atl1.c           |   46 +-
4022  drivers/net/ethernet/atheros/atlx/atl1.h           |    1 +
4023  drivers/net/ethernet/broadcom/Kconfig              |    1 +
4024  drivers/net/ethernet/broadcom/b44.c                |  250 +-
4025  drivers/net/ethernet/broadcom/b44.h                |   15 +-
4026  drivers/net/ethernet/broadcom/bgmac.c              |  364 +-
4027  drivers/net/ethernet/broadcom/bgmac.h              |   94 +-
4028  drivers/net/ethernet/broadcom/bnx2.c               |   59 +-
4029  drivers/net/ethernet/broadcom/bnx2.h               |   10 +
4030  drivers/net/ethernet/broadcom/bnx2x/bnx2x.h        |    8 +-
4031  drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c    |  101 +-
4032  drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h    |  124 +-
4033  .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c    |    6 +
4034  drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c   |   62 +-
4035  drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h   |   10 +-
4036  drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   |  210 +-
4037  drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h    |    1 +
4038  drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c     |  277 +-
4039  drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h     |   17 +-
4040  drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c  |  120 +-
4041  drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h  |   15 +-
4042  drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c   |   39 +-
4043  drivers/net/ethernet/broadcom/cnic.c               |    1 +
4044  drivers/net/ethernet/broadcom/cnic.h               |    2 +
4045  drivers/net/ethernet/broadcom/cnic_if.h            |    4 +-
4046  drivers/net/ethernet/broadcom/sb1250-mac.c         |    3 +-
4047  drivers/net/ethernet/broadcom/tg3.c                |  229 +-
4048  drivers/net/ethernet/broadcom/tg3.h                |   11 +-
4049  drivers/net/ethernet/brocade/bna/bfa_ioc.c         |  650 ++-
4050  drivers/net/ethernet/brocade/bna/bfa_ioc.h         |    8 +
4051  drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c      |   40 +
4052  drivers/net/ethernet/brocade/bna/bfi.h             |   33 +-
4053  drivers/net/ethernet/brocade/bna/bfi_enet.h        |    3 +-
4054  drivers/net/ethernet/brocade/bna/bna.h             |   24 +-
4055  drivers/net/ethernet/brocade/bna/bna_enet.c        |   58 +-
4056  drivers/net/ethernet/brocade/bna/bna_hw_defs.h     |    4 +
4057  drivers/net/ethernet/brocade/bna/bna_tx_rx.c       |  251 +-
4058  drivers/net/ethernet/brocade/bna/bna_types.h       |   57 +-
4059  drivers/net/ethernet/brocade/bna/bnad.c            |  559 ++-
4060  drivers/net/ethernet/brocade/bna/bnad.h            |   26 +-
4061  drivers/net/ethernet/brocade/bna/bnad_ethtool.c    |    1 +
4062  drivers/net/ethernet/brocade/bna/cna.h             |    4 +-
4063  drivers/net/ethernet/cadence/macb.c                |  126 +-
4064  drivers/net/ethernet/cadence/macb.h                |    1 +
4065  drivers/net/ethernet/chelsio/cxgb/common.h         |    3 +-
4066  drivers/net/ethernet/chelsio/cxgb/cphy.h           |    3 +-
4067  drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h       |    3 +-
4068  drivers/net/ethernet/chelsio/cxgb/cxgb2.c          |    3 +-
4069  drivers/net/ethernet/chelsio/cxgb/elmer0.h         |    3 +-
4070  drivers/net/ethernet/chelsio/cxgb/espi.c           |    3 +-
4071  drivers/net/ethernet/chelsio/cxgb/espi.h           |    3 +-
4072  drivers/net/ethernet/chelsio/cxgb/gmac.h           |    3 +-
4073  drivers/net/ethernet/chelsio/cxgb/mv88x201x.c      |    3 +-
4074  drivers/net/ethernet/chelsio/cxgb/pm3393.c         |    3 +-
4075  drivers/net/ethernet/chelsio/cxgb/regs.h           |    3 +-
4076  drivers/net/ethernet/chelsio/cxgb/sge.c            |    3 +-
4077  drivers/net/ethernet/chelsio/cxgb/sge.h            |    3 +-
4078  drivers/net/ethernet/chelsio/cxgb/subr.c           |    3 +-
4079  .../net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h  |    3 +-
4080  drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c |    2 +-
4081  drivers/net/ethernet/chelsio/cxgb3/l2t.c           |    2 +-
4082  drivers/net/ethernet/chelsio/cxgb4/cxgb4.h         |   16 +-
4083  drivers/net/ethernet/chelsio/cxgb4/sge.c           |    6 +-
4084  drivers/net/ethernet/chelsio/cxgb4/t4_hw.c         |  138 +-
4085  drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h |    1 -
4086  drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c     |    4 +-
4087  drivers/net/ethernet/cisco/enic/enic_main.c        |   11 +-
4088  drivers/net/ethernet/cisco/enic/enic_pp.c          |    2 +-
4089  drivers/net/ethernet/dec/tulip/uli526x.c           |    6 -
4090  drivers/net/ethernet/emulex/benet/be_main.c        |    6 +-
4091  drivers/net/ethernet/freescale/fec.h               |    3 +-
4092  drivers/net/ethernet/freescale/fec_main.c          |    8 +-
4093  drivers/net/ethernet/freescale/fec_ptp.c           |   16 +-
4094  drivers/net/ethernet/freescale/gianfar.c           |   22 +-
4095  drivers/net/ethernet/freescale/gianfar_ethtool.c   |   98 +-
4096  drivers/net/ethernet/freescale/gianfar_ptp.c       |    2 +-
4097  drivers/net/ethernet/freescale/ucc_geth.c          |    5 -
4098  drivers/net/ethernet/ibm/ibmveth.c                 |    3 +-
4099  drivers/net/ethernet/ibm/ibmveth.h                 |    3 +-
4100  drivers/net/ethernet/intel/Kconfig                 |   41 +-
4101  drivers/net/ethernet/intel/Makefile                |    1 +
4102  drivers/net/ethernet/intel/e1000e/netdev.c         |   14 +-
4103  drivers/net/ethernet/intel/i40e/Makefile           |    8 +-
4104  drivers/net/ethernet/intel/i40e/Module.symvers     |    0
4105  drivers/net/ethernet/intel/i40e/i40e.h             |  111 +-
4106  drivers/net/ethernet/intel/i40e/i40e_adminq.c      |  237 +-
4107  drivers/net/ethernet/intel/i40e/i40e_adminq.h      |   21 +-
4108  drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h  |  136 +-
4109  drivers/net/ethernet/intel/i40e/i40e_alloc.h       |    7 +-
4110  drivers/net/ethernet/intel/i40e/i40e_common.c      |  522 ++-
4111  drivers/net/ethernet/intel/i40e/i40e_debugfs.c     |  276 +-
4112  drivers/net/ethernet/intel/i40e/i40e_diag.c        |   23 +-
4113  drivers/net/ethernet/intel/i40e/i40e_diag.h        |   15 +-
4114  drivers/net/ethernet/intel/i40e/i40e_ethtool.c     |  419 +-
4115  drivers/net/ethernet/intel/i40e/i40e_hmc.c         |   17 +-
4116  drivers/net/ethernet/intel/i40e/i40e_hmc.h         |   10 +-
4117  drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c     |   10 +-
4118  drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h     |   11 +-
4119  drivers/net/ethernet/intel/i40e/i40e_main.c        | 1052 ++++-
4120  drivers/net/ethernet/intel/i40e/i40e_nvm.c         |   75 +-
4121  drivers/net/ethernet/intel/i40e/i40e_osdep.h       |    7 +-
4122  drivers/net/ethernet/intel/i40e/i40e_prototype.h   |   37 +-
4123  drivers/net/ethernet/intel/i40e/i40e_ptp.c         |  662 +++
4124  drivers/net/ethernet/intel/i40e/i40e_register.h    |  170 +-
4125  drivers/net/ethernet/intel/i40e/i40e_status.h      |    7 +-
4126  drivers/net/ethernet/intel/i40e/i40e_txrx.c        |  193 +-
4127  drivers/net/ethernet/intel/i40e/i40e_txrx.h        |   64 +-
4128  drivers/net/ethernet/intel/i40e/i40e_type.h        |  113 +-
4129  drivers/net/ethernet/intel/i40e/i40e_virtchnl.h    |   11 +-
4130  drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c |  872 ++--
4131  drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h |   11 +-
4132  drivers/net/ethernet/intel/i40evf/Makefile         |   33 +
4133  drivers/net/ethernet/intel/i40evf/i40e_adminq.c    |  927 ++++
4134  drivers/net/ethernet/intel/i40evf/i40e_adminq.h    |  106 +
4135  .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h    | 2153 +++++++++
4136  drivers/net/ethernet/intel/i40evf/i40e_alloc.h     |   55 +
4137  drivers/net/ethernet/intel/i40evf/i40e_common.c    |  254 ++
4138  drivers/net/ethernet/intel/i40evf/i40e_hmc.h       |  238 +
4139  drivers/net/ethernet/intel/i40evf/i40e_lan_hmc.h   |  165 +
4140  drivers/net/ethernet/intel/i40evf/i40e_osdep.h     |   72 +
4141  drivers/net/ethernet/intel/i40evf/i40e_prototype.h |   84 +
4142  drivers/net/ethernet/intel/i40evf/i40e_register.h  | 4667 ++++++++++++++++++++
4143  drivers/net/ethernet/intel/i40evf/i40e_status.h    |   97 +
4144  drivers/net/ethernet/intel/i40evf/i40e_txrx.c      | 1575 +++++++
4145  drivers/net/ethernet/intel/i40evf/i40e_txrx.h      |  296 ++
4146  drivers/net/ethernet/intel/i40evf/i40e_type.h      | 1152 +++++
4147  drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h  |  364 ++
4148  drivers/net/ethernet/intel/i40evf/i40evf.h         |  321 ++
4149  drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c |  390 ++
4150  drivers/net/ethernet/intel/i40evf/i40evf_main.c    | 2353 ++++++++++
4151  .../net/ethernet/intel/i40evf/i40evf_virtchnl.c    |  772 ++++
4152  drivers/net/ethernet/intel/igb/e1000_82575.c       |   89 +
4153  drivers/net/ethernet/intel/igb/e1000_defines.h     |   16 +
4154  drivers/net/ethernet/intel/igb/e1000_hw.h          |    3 +
4155  drivers/net/ethernet/intel/igb/igb.h               |   28 +-
4156  drivers/net/ethernet/intel/igb/igb_ethtool.c       |   10 +-
4157  drivers/net/ethernet/intel/igb/igb_hwmon.c         |  108 +-
4158  drivers/net/ethernet/intel/igb/igb_main.c          |  303 +-
4159  drivers/net/ethernet/intel/igbvf/netdev.c          |    2 +-
4160  drivers/net/ethernet/intel/ixgbe/ixgbe.h           |   15 +-
4161  drivers/net/ethernet/intel/ixgbe/ixgbe_common.h    |   65 +-
4162  drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c   |  120 +-
4163  drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |   74 +-
4164  drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c       |    3 +-
4165  drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c       |    2 +-
4166  drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c     |    3 +-
4167  drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c     |   84 +-
4168  drivers/net/ethernet/intel/ixgbevf/ixgbevf.h       |    5 +-
4169  drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c  |  283 +-
4170  drivers/net/ethernet/lantiq_etop.c                 |    3 +-
4171  drivers/net/ethernet/marvell/mv643xx_eth.c         |   28 +-
4172  drivers/net/ethernet/marvell/pxa168_eth.c          |   23 +-
4173  drivers/net/ethernet/marvell/sky2.c                |    6 +-
4174  drivers/net/ethernet/mellanox/mlx4/Kconfig         |    1 +
4175  drivers/net/ethernet/mellanox/mlx4/alloc.c         |   12 +-
4176  drivers/net/ethernet/mellanox/mlx4/cq.c            |    4 +-
4177  drivers/net/ethernet/mellanox/mlx4/en_clock.c      |  198 +-
4178  drivers/net/ethernet/mellanox/mlx4/en_cq.c         |   12 +-
4179  drivers/net/ethernet/mellanox/mlx4/en_ethtool.c    |    3 +
4180  drivers/net/ethernet/mellanox/mlx4/en_main.c       |    6 +
4181  drivers/net/ethernet/mellanox/mlx4/en_netdev.c     |  142 +-
4182  drivers/net/ethernet/mellanox/mlx4/en_resources.c  |    6 +
4183  drivers/net/ethernet/mellanox/mlx4/en_rx.c         |   30 +-
4184  drivers/net/ethernet/mellanox/mlx4/en_tx.c         |   62 +-
4185  drivers/net/ethernet/mellanox/mlx4/eq.c            |    4 +-
4186  drivers/net/ethernet/mellanox/mlx4/fw.c            |   93 +-
4187  drivers/net/ethernet/mellanox/mlx4/fw.h            |    2 +
4188  drivers/net/ethernet/mellanox/mlx4/main.c          |  109 +-
4189  drivers/net/ethernet/mellanox/mlx4/mcg.c           |   48 +-
4190  drivers/net/ethernet/mellanox/mlx4/mlx4.h          |   10 +-
4191  drivers/net/ethernet/mellanox/mlx4/mlx4_en.h       |   19 +-
4192  drivers/net/ethernet/mellanox/mlx4/mr.c            |    2 +-
4193  drivers/net/ethernet/mellanox/mlx4/pd.c            |    6 +-
4194  drivers/net/ethernet/mellanox/mlx4/port.c          |   41 +
4195  drivers/net/ethernet/mellanox/mlx4/qp.c            |    2 +-
4196  .../net/ethernet/mellanox/mlx4/resource_tracker.c  |    2 +-
4197  drivers/net/ethernet/mellanox/mlx4/srq.c           |    4 +-
4198  drivers/net/ethernet/micrel/ksz884x.c              |   12 +-
4199  drivers/net/ethernet/natsemi/ns83820.c             |    5 +-
4200  drivers/net/ethernet/neterion/vxge/vxge-main.c     |   32 +-
4201  drivers/net/ethernet/netx-eth.c                    |    3 +-
4202  drivers/net/ethernet/nvidia/forcedeth.c            |    5 +-
4203  drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h    |    3 +-
4204  .../net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c    |    3 +-
4205  .../net/ethernet/oki-semi/pch_gbe/pch_gbe_api.h    |    3 +-
4206  .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c    |    3 +-
4207  .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c   |    3 +-
4208  .../net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c  |    3 +-
4209  .../net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c    |    3 +-
4210  .../net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.h    |    3 +-
4211  drivers/net/ethernet/packetengines/yellowfin.c     |   17 +-
4212  drivers/net/ethernet/pasemi/pasemi_mac.c           |    3 +-
4213  drivers/net/ethernet/pasemi/pasemi_mac.h           |    3 +-
4214  drivers/net/ethernet/pasemi/pasemi_mac_ethtool.c   |    3 +-
4215  drivers/net/ethernet/qlogic/netxen/Makefile        |    4 +-
4216  drivers/net/ethernet/qlogic/netxen/netxen_nic.h    |    4 +-
4217  .../net/ethernet/qlogic/netxen/netxen_nic_ctx.c    |    4 +-
4218  .../ethernet/qlogic/netxen/netxen_nic_ethtool.c    |    4 +-
4219  .../net/ethernet/qlogic/netxen/netxen_nic_hdr.h    |    4 +-
4220  drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c |    6 +-
4221  drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.h |    4 +-
4222  .../net/ethernet/qlogic/netxen/netxen_nic_init.c   |    4 +-
4223  .../net/ethernet/qlogic/netxen/netxen_nic_main.c   |    4 +-
4224  drivers/net/ethernet/qlogic/qlcnic/qlcnic.h        |   58 +-
4225  .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c    |  119 +-
4226  .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h    |   15 +-
4227  .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c  |   15 +-
4228  .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c  |   12 +-
4229  drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c    |   49 +-
4230  drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c    |   31 +-
4231  drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h    |   14 +-
4232  .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c    |    5 +-
4233  drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h    |    1 -
4234  drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c     |   90 +-
4235  drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h     |    1 +
4236  drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c     |   96 +-
4237  drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c   |   65 +-
4238  drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h  |   12 +-
4239  .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c   |  246 +-
4240  .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c   |  236 +-
4241  drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c  |  129 +-
4242  drivers/net/ethernet/qlogic/qlge/qlge.h            |    1 -
4243  drivers/net/ethernet/qlogic/qlge/qlge_dbg.c        |    4 +-
4244  drivers/net/ethernet/renesas/Kconfig               |    2 +-
4245  drivers/net/ethernet/renesas/sh_eth.c              |  131 +-
4246  drivers/net/ethernet/renesas/sh_eth.h              |   53 +-
4247  drivers/net/ethernet/seeq/sgiseeq.c                |    2 +-
4248  drivers/net/ethernet/sfc/ef10.c                    |  518 ++-
4249  drivers/net/ethernet/sfc/efx.c                     |  201 +-
4250  drivers/net/ethernet/sfc/efx.h                     |   13 +-
4251  drivers/net/ethernet/sfc/enum.h                    |    1 +
4252  drivers/net/ethernet/sfc/ethtool.c                 |   12 +-
4253  drivers/net/ethernet/sfc/falcon.c                  |   38 +-
4254  drivers/net/ethernet/sfc/farch.c                   |   48 +-
4255  drivers/net/ethernet/sfc/filter.h                  |   17 +-
4256  drivers/net/ethernet/sfc/mcdi.c                    |  434 +-
4257  drivers/net/ethernet/sfc/mcdi.h                    |   21 +
4258  drivers/net/ethernet/sfc/mcdi_mon.c                |   76 +-
4259  drivers/net/ethernet/sfc/mcdi_pcol.h               |  733 ++-
4260  drivers/net/ethernet/sfc/mcdi_port.c               |   89 +-
4261  drivers/net/ethernet/sfc/net_driver.h              |   75 +-
4262  drivers/net/ethernet/sfc/nic.c                     |   12 +
4263  drivers/net/ethernet/sfc/nic.h                     |   34 +-
4264  drivers/net/ethernet/sfc/ptp.c                     |  854 +++-
4265  drivers/net/ethernet/sfc/rx.c                      |   24 +-
4266  drivers/net/ethernet/sfc/selftest.c                |    2 +-
4267  drivers/net/ethernet/sfc/selftest.h                |    1 +
4268  drivers/net/ethernet/sfc/siena.c                   |  119 +-
4269  drivers/net/ethernet/sis/sis900.c                  |    2 -
4270  drivers/net/ethernet/smsc/smc911x.c                |    3 +-
4271  drivers/net/ethernet/smsc/smc911x.h                |    3 +-
4272  drivers/net/ethernet/smsc/smc91x.c                 |    5 +-
4273  drivers/net/ethernet/smsc/smc91x.h                 |    3 +-
4274  drivers/net/ethernet/smsc/smsc911x.c               |    3 +-
4275  drivers/net/ethernet/smsc/smsc911x.h               |    3 +-
4276  drivers/net/ethernet/smsc/smsc9420.c               |    5 +-
4277  drivers/net/ethernet/smsc/smsc9420.h               |    3 +-
4278  drivers/net/ethernet/stmicro/stmmac/stmmac.h       |    2 -
4279  drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |    2 +-
4280  drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c   |    6 +-
4281  .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |    4 +-
4282  drivers/net/ethernet/sun/cassini.c                 |    4 +-
4283  drivers/net/ethernet/sun/cassini.h                 |    4 +-
4284  drivers/net/ethernet/sun/niu.c                     |   10 +-
4285  drivers/net/ethernet/sun/sunvnet.c                 |    2 +-
4286  drivers/net/ethernet/tehuti/tehuti.c               |    2 +-
4287  drivers/net/ethernet/ti/cpsw.c                     |   32 +-
4288  drivers/net/ethernet/ti/cpsw_ale.c                 |    2 +-
4289  drivers/net/ethernet/ti/davinci_cpdma.c            |    7 +-
4290  drivers/net/ethernet/tile/Kconfig                  |   12 +-
4291  drivers/net/ethernet/tile/tilegx.c                 |   38 +-
4292  drivers/net/ethernet/toshiba/ps3_gelic_net.c       |   18 +-
4293  drivers/net/ethernet/toshiba/tc35815.c             |   15 +-
4294  drivers/net/ethernet/tundra/tsi108_eth.h           |    4 +-
4295  drivers/net/ethernet/xircom/xirc2ps_cs.c           |    3 +-
4296  drivers/net/ethernet/xscale/ixp4xx_eth.c           |   36 +-
4297  drivers/net/fddi/defxx.c                           |   20 +-
4298  drivers/net/fddi/skfp/fplustm.c                    |   27 +-
4299  drivers/net/fddi/skfp/h/supern_2.h                 |   96 +-
4300  drivers/net/fddi/skfp/skfddi.c                     |    1 -
4301  drivers/net/fddi/skfp/smt.c                        |    2 +-
4302  drivers/net/fddi/skfp/srf.c                        |   24 +-
4303  drivers/net/hamradio/6pack.c                       |    3 +-
4304  drivers/net/hamradio/bpqether.c                    |    2 +-
4305  drivers/net/hamradio/mkiss.c                       |    3 +-
4306  drivers/net/hippi/rrunner.c                        |    5 +-
4307  drivers/net/hyperv/hyperv_net.h                    |    3 +-
4308  drivers/net/hyperv/netvsc.c                        |    3 +-
4309  drivers/net/hyperv/netvsc_drv.c                    |    3 +-
4310  drivers/net/hyperv/rndis_filter.c                  |    3 +-
4311  drivers/net/ieee802154/at86rf230.c                 |    2 -
4312  drivers/net/ieee802154/mrf24j40.c                  |    1 -
4313  drivers/net/irda/Kconfig                           |    4 +-
4314  drivers/net/irda/au1k_ir.c                         |    3 +-
4315  drivers/net/irda/esi-sir.c                         |    4 +-
4316  drivers/net/irda/litelink-sir.c                    |    4 +-
4317  drivers/net/irda/ma600-sir.c                       |    4 +-
4318  drivers/net/irda/old_belkin-sir.c                  |    4 +-
4319  drivers/net/irda/sh_irda.c                         |    2 +-
4320  drivers/net/irda/sh_sir.c                          |    2 +-
4321  drivers/net/irda/smsc-ircc2.c                      |    4 +-
4322  drivers/net/irda/smsc-ircc2.h                      |    4 +-
4323  drivers/net/irda/via-ircc.c                        |    5 +-
4324  drivers/net/irda/via-ircc.h                        |    3 +-
4325  drivers/net/irda/vlsi_ir.c                         |    7 +-
4326  drivers/net/irda/vlsi_ir.h                         |    4 +-
4327  drivers/net/macvlan.c                              |   38 +-
4328  drivers/net/macvtap.c                              |   76 +-
4329  drivers/net/mdio.c                                 |   28 -
4330  drivers/net/phy/cicada.c                           |    4 +-
4331  drivers/net/phy/davicom.c                          |    2 +-
4332  drivers/net/phy/dp83640.c                          |    4 +-
4333  drivers/net/phy/icplus.c                           |    2 +-
4334  drivers/net/phy/lxt.c                              |    4 +-
4335  drivers/net/phy/marvell.c                          |   22 +
4336  drivers/net/phy/mdio_bus.c                         |   35 +-
4337  drivers/net/phy/micrel.c                           |    4 +-
4338  drivers/net/phy/phy.c                              |  428 +-
4339  drivers/net/phy/phy_device.c                       |  433 +-
4340  drivers/net/phy/spi_ks8995.c                       |    6 +-
4341  drivers/net/plip/plip.c                            |    4 +-
4342  drivers/net/ppp/ppp_mppe.c                         |    3 +-
4343  drivers/net/ppp/pppoe.c                            |    4 +-
4344  drivers/net/tun.c                                  |   60 +-
4345  drivers/net/usb/Kconfig                            |    5 +-
4346  drivers/net/usb/asix.h                             |    3 +-
4347  drivers/net/usb/asix_common.c                      |    3 +-
4348  drivers/net/usb/asix_devices.c                     |    3 +-
4349  drivers/net/usb/ax88172a.c                         |    3 +-
4350  drivers/net/usb/ax88179_178a.c                     |    3 +-
4351  drivers/net/usb/catc.c                             |    3 +-
4352  drivers/net/usb/cdc_eem.c                          |    3 +-
4353  drivers/net/usb/cdc_ether.c                        |    4 +-
4354  drivers/net/usb/cdc_subset.c                       |    3 +-
4355  drivers/net/usb/cx82310_eth.c                      |    3 +-
4356  drivers/net/usb/gl620a.c                           |    3 +-
4357  drivers/net/usb/int51x1.c                          |    3 +-
4358  drivers/net/usb/kaweth.c                           |    3 +-
4359  drivers/net/usb/lg-vl600.c                         |    3 +-
4360  drivers/net/usb/mcs7830.c                          |    3 +-
4361  drivers/net/usb/net1080.c                          |    3 +-
4362  drivers/net/usb/plusb.c                            |    3 +-
4363  drivers/net/usb/r8152.c                            |  915 +++-
4364  drivers/net/usb/r815x.c                            |    8 -
4365  drivers/net/usb/rndis_host.c                       |    3 +-
4366  drivers/net/usb/sierra_net.c                       |    3 +-
4367  drivers/net/usb/smsc75xx.c                         |    3 +-
4368  drivers/net/usb/smsc75xx.h                         |    3 +-
4369  drivers/net/usb/smsc95xx.c                         |    3 +-
4370  drivers/net/usb/smsc95xx.h                         |    3 +-
4371  drivers/net/usb/usbnet.c                           |    3 +-
4372  drivers/net/usb/zaurus.c                           |    3 +-
4373  drivers/net/virtio_net.c                           |   41 +-
4374  drivers/net/vmxnet3/vmxnet3_drv.c                  |    5 +-
4375  drivers/net/vxlan.c                                |  161 +-
4376  drivers/net/wan/dscc4.c                            |    2 -
4377  drivers/net/wan/hd64570.h                          |    4 +-
4378  drivers/net/wan/hd64572.h                          |    2 +-
4379  drivers/net/wan/lmc/lmc_main.c                     |    2 -
4380  drivers/net/wan/pc300too.c                         |    1 -
4381  drivers/net/wan/pci200syn.c                        |    1 -
4382  drivers/net/wan/sbni.c                             |    1 +
4383  drivers/net/wan/wanxl.c                            |    1 -
4384  drivers/net/wireless/adm8211.c                     |    3 +-
4385  drivers/net/wireless/airo_cs.c                     |    1 -
4386  drivers/net/wireless/at76c50x-usb.c                |    2 +-
4387  drivers/net/wireless/ath/ar5523/ar5523.c           |    1 -
4388  drivers/net/wireless/ath/ath10k/ce.c               |   53 +-
4389  drivers/net/wireless/ath/ath10k/ce.h               |    2 +-
4390  drivers/net/wireless/ath/ath10k/core.c             |   43 +-
4391  drivers/net/wireless/ath/ath10k/core.h             |   23 +-
4392  drivers/net/wireless/ath/ath10k/debug.c            |   94 +
4393  drivers/net/wireless/ath/ath10k/debug.h            |    6 +
4394  drivers/net/wireless/ath/ath10k/htc.c              |   31 +-
4395  drivers/net/wireless/ath/ath10k/htt.c              |    4 +-
4396  drivers/net/wireless/ath/ath10k/htt.h              |    1 +
4397  drivers/net/wireless/ath/ath10k/htt_rx.c           |   25 +-
4398  drivers/net/wireless/ath/ath10k/htt_tx.c           |   11 +-
4399  drivers/net/wireless/ath/ath10k/hw.h               |    1 +
4400  drivers/net/wireless/ath/ath10k/mac.c              |  320 +-
4401  drivers/net/wireless/ath/ath10k/pci.c              |  791 ++--
4402  drivers/net/wireless/ath/ath10k/pci.h              |   14 +-
4403  drivers/net/wireless/ath/ath10k/txrx.c             |    6 +-
4404  drivers/net/wireless/ath/ath10k/wmi.c              |  302 +-
4405  drivers/net/wireless/ath/ath10k/wmi.h              |   96 +-
4406  drivers/net/wireless/ath/ath5k/base.c              |    4 +-
4407  drivers/net/wireless/ath/ath5k/dma.c               |   11 +-
4408  drivers/net/wireless/ath/ath6kl/cfg80211.c         |   11 +-
4409  drivers/net/wireless/ath/ath6kl/wmi.c              |    6 +-
4410  drivers/net/wireless/ath/ath9k/Kconfig             |   10 +-
4411  drivers/net/wireless/ath/ath9k/Makefile            |   12 +-
4412  drivers/net/wireless/ath/ath9k/antenna.c           |    8 +-
4413  drivers/net/wireless/ath/ath9k/ar9002_hw.c         |   23 +-
4414  drivers/net/wireless/ath/ath9k/ar9002_mac.c        |    6 +-
4415  drivers/net/wireless/ath/ath9k/ar9002_phy.c        |    1 -
4416  .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h   |  222 +-
4417  .../wireless/ath/ath9k/ar9003_buffalo_initvals.h   |  126 +
4418  drivers/net/wireless/ath/ath9k/ar9003_calib.c      |  366 +-
4419  drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |   65 +-
4420  drivers/net/wireless/ath/ath9k/ar9003_eeprom.h     |   14 +-
4421  drivers/net/wireless/ath/ath9k/ar9003_hw.c         |  297 +-
4422  drivers/net/wireless/ath/ath9k/ar9003_mac.c        |   18 +-
4423  drivers/net/wireless/ath/ath9k/ar9003_phy.c        |  106 +-
4424  drivers/net/wireless/ath/ath9k/ar9003_phy.h        |   24 +-
4425  drivers/net/wireless/ath/ath9k/ar9003_wow.c        |  422 ++
4426  .../net/wireless/ath/ath9k/ar9330_1p1_initvals.h   |  128 +-
4427  .../net/wireless/ath/ath9k/ar9330_1p2_initvals.h   |  401 +-
4428  drivers/net/wireless/ath/ath9k/ar9340_initvals.h   |  392 +-
4429  .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h   |  723 +--
4430  .../net/wireless/ath/ath9k/ar9462_2p1_initvals.h   | 1559 +------
4431  drivers/net/wireless/ath/ath9k/ar9485_initvals.h   |  117 +-
4432  drivers/net/wireless/ath/ath9k/ar953x_initvals.h   |  718 +++
4433  .../net/wireless/ath/ath9k/ar955x_1p0_initvals.h   |  540 +--
4434  .../net/wireless/ath/ath9k/ar9565_1p0_initvals.h   |   85 +-
4435  .../net/wireless/ath/ath9k/ar9565_1p1_initvals.h   |   64 +
4436  .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h   |  572 ++-
4437  drivers/net/wireless/ath/ath9k/ath9k.h             |  424 +-
4438  drivers/net/wireless/ath/ath9k/beacon.c            |  147 +-
4439  drivers/net/wireless/ath/ath9k/btcoex.c            |    6 -
4440  drivers/net/wireless/ath/ath9k/common.c            |    4 +-
4441  drivers/net/wireless/ath/ath9k/debug.c             |  467 +-
4442  drivers/net/wireless/ath/ath9k/debug.h             |    9 +-
4443  drivers/net/wireless/ath/ath9k/dfs.c               |    4 +-
4444  drivers/net/wireless/ath/ath9k/eeprom_4k.c         |   26 +-
4445  drivers/net/wireless/ath/ath9k/eeprom_9287.c       |   26 +-
4446  drivers/net/wireless/ath/ath9k/eeprom_def.c        |   26 +-
4447  drivers/net/wireless/ath/ath9k/gpio.c              |   89 +-
4448  drivers/net/wireless/ath/ath9k/htc.h               |    5 +
4449  drivers/net/wireless/ath/ath9k/htc_drv_beacon.c    |   39 +-
4450  drivers/net/wireless/ath/ath9k/htc_drv_gpio.c      |   17 +-
4451  drivers/net/wireless/ath/ath9k/htc_drv_init.c      |    2 +
4452  drivers/net/wireless/ath/ath9k/htc_drv_txrx.c      |    2 +-
4453  drivers/net/wireless/ath/ath9k/hw-ops.h            |   47 +-
4454  drivers/net/wireless/ath/ath9k/hw.c                |  596 +--
4455  drivers/net/wireless/ath/ath9k/hw.h                |   73 +-
4456  drivers/net/wireless/ath/ath9k/init.c              |   71 +-
4457  drivers/net/wireless/ath/ath9k/link.c              |   67 +-
4458  drivers/net/wireless/ath/ath9k/mac.c               |   51 +-
4459  drivers/net/wireless/ath/ath9k/mac.h               |    8 +-
4460  drivers/net/wireless/ath/ath9k/main.c              |  633 +--
4461  drivers/net/wireless/ath/ath9k/mci.c               |    2 +-
4462  drivers/net/wireless/ath/ath9k/pci.c               |  134 +-
4463  drivers/net/wireless/ath/ath9k/recv.c              |  227 +-
4464  drivers/net/wireless/ath/ath9k/reg.h               |   29 +-
4465  drivers/net/wireless/ath/ath9k/spectral.c          |  543 +++
4466  drivers/net/wireless/ath/ath9k/spectral.h          |  212 +
4467  drivers/net/wireless/ath/ath9k/tx99.c              |  272 ++
4468  drivers/net/wireless/ath/ath9k/wow.c               |  588 ++-
4469  drivers/net/wireless/ath/ath9k/xmit.c              |   25 +-
4470  drivers/net/wireless/ath/carl9170/debug.c          |    1 -
4471  drivers/net/wireless/ath/carl9170/main.c           |    1 -
4472  drivers/net/wireless/ath/carl9170/rx.c             |    7 +-
4473  drivers/net/wireless/ath/carl9170/tx.c             |    1 -
4474  drivers/net/wireless/ath/regd.c                    |  378 +-
4475  drivers/net/wireless/ath/wcn36xx/hal.h             |    2 +-
4476  drivers/net/wireless/ath/wcn36xx/main.c            |    3 +-
4477  drivers/net/wireless/ath/wcn36xx/smd.c             |   65 +-
4478  drivers/net/wireless/ath/wcn36xx/wcn36xx.h         |    2 +-
4479  drivers/net/wireless/ath/wil6210/interrupt.c       |   13 +
4480  drivers/net/wireless/ath/wil6210/txrx.c            |    8 +-
4481  drivers/net/wireless/ath/wil6210/wil6210.h         |    1 +
4482  drivers/net/wireless/atmel.c                       |    8 +-
4483  drivers/net/wireless/atmel.h                       |    4 +-
4484  drivers/net/wireless/atmel_cs.c                    |    5 +-
4485  drivers/net/wireless/atmel_pci.c                   |    5 +-
4486  drivers/net/wireless/brcm80211/Kconfig             |    5 +-
4487  drivers/net/wireless/brcm80211/brcmfmac/Makefile   |    4 +-
4488  drivers/net/wireless/brcm80211/brcmfmac/bcdc.c     |  375 ++
4489  drivers/net/wireless/brcm80211/brcmfmac/bcdc.h     |   24 +
4490  drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c   |  705 ++-
4491  .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c |  539 ---
4492  drivers/net/wireless/brcm80211/brcmfmac/dhd.h      |  487 +-
4493  drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h  |   23 +-
4494  drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c  |  392 --
4495  .../net/wireless/brcm80211/brcmfmac/dhd_common.c   |   31 +-
4496  drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c  |   36 +-
4497  drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h  |    2 +-
4498  .../net/wireless/brcm80211/brcmfmac/dhd_linux.c    |  203 +-
4499  .../net/wireless/brcm80211/brcmfmac/dhd_proto.h    |   42 -
4500  drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 1307 +++---
4501  drivers/net/wireless/brcm80211/brcmfmac/fweh.h     |   54 +
4502  drivers/net/wireless/brcm80211/brcmfmac/fwil.c     |   19 +-
4503  drivers/net/wireless/brcm80211/brcmfmac/fwil.h     |   61 +
4504  .../net/wireless/brcm80211/brcmfmac/fwil_types.h   |  304 ++
4505  drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c |  216 +-
4506  drivers/net/wireless/brcm80211/brcmfmac/p2p.c      |   52 +-
4507  drivers/net/wireless/brcm80211/brcmfmac/proto.c    |   62 +
4508  drivers/net/wireless/brcm80211/brcmfmac/proto.h    |   57 +
4509  .../net/wireless/brcm80211/brcmfmac/sdio_chip.c    |  342 +-
4510  .../net/wireless/brcm80211/brcmfmac/sdio_chip.h    |   10 +-
4511  .../net/wireless/brcm80211/brcmfmac/sdio_host.h    |   83 +-
4512  .../net/wireless/brcm80211/brcmfmac/tracepoint.h   |   33 +-
4513  drivers/net/wireless/brcm80211/brcmfmac/usb.c      |    5 +-
4514  .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c  |  193 +-
4515  .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h  |    5 +-
4516  drivers/net/wireless/brcm80211/brcmsmac/channel.c  |   38 +-
4517  .../net/wireless/brcm80211/brcmsmac/mac80211_if.c  |   66 +-
4518  .../net/wireless/brcm80211/include/brcm_hw_ids.h   |    1 +
4519  .../net/wireless/brcm80211/include/brcmu_wifi.h    |   14 +
4520  drivers/net/wireless/cw1200/cw1200_sdio.c          |    4 +-
4521  drivers/net/wireless/cw1200/fwio.c                 |    1 -
4522  drivers/net/wireless/cw1200/main.c                 |    1 -
4523  drivers/net/wireless/cw1200/pm.c                   |   11 +-
4524  drivers/net/wireless/cw1200/scan.c                 |   15 +-
4525  drivers/net/wireless/cw1200/sta.c                  |    5 +-
4526  drivers/net/wireless/cw1200/txrx.c                 |    3 +-
4527  drivers/net/wireless/hostap/hostap_80211_rx.c      |    8 +-
4528  drivers/net/wireless/hostap/hostap_80211_tx.c      |    4 +-
4529  drivers/net/wireless/hostap/hostap_ap.c            |   28 +-
4530  drivers/net/wireless/hostap/hostap_cs.c            |    1 -
4531  drivers/net/wireless/hostap/hostap_hw.c            |    2 +-
4532  drivers/net/wireless/hostap/hostap_ioctl.c         |    6 +-
4533  drivers/net/wireless/hostap/hostap_main.c          |    8 +-
4534  drivers/net/wireless/hostap/hostap_pci.c           |    1 -
4535  drivers/net/wireless/hostap/hostap_plx.c           |    1 -
4536  drivers/net/wireless/ipw2x00/ipw2100.c             |    5 +-
4537  drivers/net/wireless/ipw2x00/ipw2200.c             |   42 +-
4538  drivers/net/wireless/ipw2x00/ipw2200.h             |    1 -
4539  drivers/net/wireless/ipw2x00/libipw_rx.c           |   12 +-
4540  drivers/net/wireless/iwlegacy/3945-debug.c         |    6 +-
4541  drivers/net/wireless/iwlegacy/3945-mac.c           |   11 +-
4542  drivers/net/wireless/iwlegacy/3945-rs.c            |    1 -
4543  drivers/net/wireless/iwlegacy/3945.c               |    5 +-
4544  drivers/net/wireless/iwlegacy/4965-debug.c         |    6 +-
4545  drivers/net/wireless/iwlegacy/4965-mac.c           |    8 +-
4546  drivers/net/wireless/iwlegacy/4965-rs.c            |    1 -
4547  drivers/net/wireless/iwlegacy/4965.c               |    1 -
4548  drivers/net/wireless/iwlegacy/common.c             |   13 +-
4549  drivers/net/wireless/iwlegacy/debug.c              |   10 +-
4550  drivers/net/wireless/iwlwifi/dvm/agn.h             |    4 +-
4551  drivers/net/wireless/iwlwifi/dvm/calib.c           |    4 +-
4552  drivers/net/wireless/iwlwifi/dvm/calib.h           |    4 +-
4553  drivers/net/wireless/iwlwifi/dvm/commands.h        |    4 +-
4554  drivers/net/wireless/iwlwifi/dvm/debugfs.c         |   10 +-
4555  drivers/net/wireless/iwlwifi/dvm/dev.h             |    2 +-
4556  drivers/net/wireless/iwlwifi/dvm/devices.c         |    2 +-
4557  drivers/net/wireless/iwlwifi/dvm/led.c             |    3 +-
4558  drivers/net/wireless/iwlwifi/dvm/led.h             |    2 +-
4559  drivers/net/wireless/iwlwifi/dvm/lib.c             |    3 +-
4560  drivers/net/wireless/iwlwifi/dvm/mac80211.c        |   15 +-
4561  drivers/net/wireless/iwlwifi/dvm/main.c            |    6 +-
4562  drivers/net/wireless/iwlwifi/dvm/power.c           |    3 +-
4563  drivers/net/wireless/iwlwifi/dvm/power.h           |    2 +-
4564  drivers/net/wireless/iwlwifi/dvm/rs.c              |    3 +-
4565  drivers/net/wireless/iwlwifi/dvm/rs.h              |    9 +-
4566  drivers/net/wireless/iwlwifi/dvm/rx.c              |    2 +-
4567  drivers/net/wireless/iwlwifi/dvm/rxon.c            |    2 +-
4568  drivers/net/wireless/iwlwifi/dvm/scan.c            |    4 +-
4569  drivers/net/wireless/iwlwifi/dvm/sta.c             |    2 +-
4570  drivers/net/wireless/iwlwifi/dvm/tt.c              |    3 +-
4571  drivers/net/wireless/iwlwifi/dvm/tt.h              |    2 +-
4572  drivers/net/wireless/iwlwifi/dvm/tx.c              |    4 +-
4573  drivers/net/wireless/iwlwifi/dvm/ucode.c           |    3 +-
4574  drivers/net/wireless/iwlwifi/iwl-1000.c            |    2 +-
4575  drivers/net/wireless/iwlwifi/iwl-2000.c            |    2 +-
4576  drivers/net/wireless/iwlwifi/iwl-5000.c            |    2 +-
4577  drivers/net/wireless/iwlwifi/iwl-6000.c            |    2 +-
4578  drivers/net/wireless/iwlwifi/iwl-7000.c            |    6 +-
4579  drivers/net/wireless/iwlwifi/iwl-agn-hw.h          |    4 +-
4580  drivers/net/wireless/iwlwifi/iwl-config.h          |   12 +-
4581  drivers/net/wireless/iwlwifi/iwl-csr.h             |    7 +-
4582  drivers/net/wireless/iwlwifi/iwl-debug.h           |    2 +-
4583  drivers/net/wireless/iwlwifi/iwl-devtrace.c        |    2 +-
4584  drivers/net/wireless/iwlwifi/iwl-devtrace.h        |    2 +-
4585  drivers/net/wireless/iwlwifi/iwl-drv.c             |   43 +-
4586  drivers/net/wireless/iwlwifi/iwl-drv.h             |    6 +-
4587  drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c    |   15 +-
4588  drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h    |    4 +-
4589  drivers/net/wireless/iwlwifi/iwl-eeprom-read.c     |    4 +-
4590  drivers/net/wireless/iwlwifi/iwl-eeprom-read.h     |    4 +-
4591  drivers/net/wireless/iwlwifi/iwl-fh.h              |    4 +-
4592  drivers/net/wireless/iwlwifi/iwl-fw-file.h         |    5 +-
4593  drivers/net/wireless/iwlwifi/iwl-fw.h              |   50 +-
4594  drivers/net/wireless/iwlwifi/iwl-io.c              |    2 +-
4595  drivers/net/wireless/iwlwifi/iwl-io.h              |    2 +-
4596  drivers/net/wireless/iwlwifi/iwl-modparams.h       |    4 +-
4597  drivers/net/wireless/iwlwifi/iwl-notif-wait.c      |    4 +-
4598  drivers/net/wireless/iwlwifi/iwl-notif-wait.h      |    4 +-
4599  drivers/net/wireless/iwlwifi/iwl-nvm-parse.c       |   24 +-
4600  drivers/net/wireless/iwlwifi/iwl-nvm-parse.h       |    4 +-
4601  drivers/net/wireless/iwlwifi/iwl-op-mode.h         |    8 +-
4602  drivers/net/wireless/iwlwifi/iwl-phy-db.c          |    4 +-
4603  drivers/net/wireless/iwlwifi/iwl-phy-db.h          |    4 +-
4604  drivers/net/wireless/iwlwifi/iwl-prph.h            |    7 +-
4605  drivers/net/wireless/iwlwifi/iwl-trans.h           |   77 +-
4606  drivers/net/wireless/iwlwifi/mvm/Makefile          |    4 +-
4607  drivers/net/wireless/iwlwifi/mvm/binding.c         |   20 +-
4608  drivers/net/wireless/iwlwifi/mvm/bt-coex.c         |   21 +-
4609  drivers/net/wireless/iwlwifi/mvm/constants.h       |    4 +-
4610  drivers/net/wireless/iwlwifi/mvm/d3.c              |   42 +-
4611  drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c     |  546 +++
4612  drivers/net/wireless/iwlwifi/mvm/debugfs.c         |  687 +--
4613  drivers/net/wireless/iwlwifi/mvm/debugfs.h         |  101 +
4614  drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h  |    5 +-
4615  drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h       |    4 +-
4616  drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h      |    4 +-
4617  drivers/net/wireless/iwlwifi/mvm/fw-api-power.h    |   20 +-
4618  drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h       |   31 +-
4619  drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h     |    9 +-
4620  drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h      |   14 +-
4621  drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h       |    5 +-
4622  drivers/net/wireless/iwlwifi/mvm/fw-api.h          |   69 +-
4623  drivers/net/wireless/iwlwifi/mvm/fw.c              |   32 +-
4624  drivers/net/wireless/iwlwifi/mvm/led.c             |    6 +-
4625  drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c        |  211 +-
4626  drivers/net/wireless/iwlwifi/mvm/mac80211.c        |  322 +-
4627  drivers/net/wireless/iwlwifi/mvm/mvm.h             |   63 +-
4628  drivers/net/wireless/iwlwifi/mvm/nvm.c             |   38 +-
4629  drivers/net/wireless/iwlwifi/mvm/ops.c             |   26 +-
4630  drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c        |    4 +-
4631  drivers/net/wireless/iwlwifi/mvm/power.c           |  400 +-
4632  drivers/net/wireless/iwlwifi/mvm/power_legacy.c    |    4 +-
4633  drivers/net/wireless/iwlwifi/mvm/quota.c           |    7 +-
4634  drivers/net/wireless/iwlwifi/mvm/rs.c              | 2247 +++++-----
4635  drivers/net/wireless/iwlwifi/mvm/rs.h              |  154 +-
4636  drivers/net/wireless/iwlwifi/mvm/rx.c              |   10 +-
4637  drivers/net/wireless/iwlwifi/mvm/scan.c            |   72 +-
4638  drivers/net/wireless/iwlwifi/mvm/sf.c              |  291 ++
4639  drivers/net/wireless/iwlwifi/mvm/sta.c             |   50 +-
4640  drivers/net/wireless/iwlwifi/mvm/sta.h             |   10 +-
4641  drivers/net/wireless/iwlwifi/mvm/testmode.h        |    4 +-
4642  drivers/net/wireless/iwlwifi/mvm/time-event.c      |    4 +-
4643  drivers/net/wireless/iwlwifi/mvm/time-event.h      |    4 +-
4644  drivers/net/wireless/iwlwifi/mvm/tt.c              |    8 +-
4645  drivers/net/wireless/iwlwifi/mvm/tx.c              |   18 +-
4646  drivers/net/wireless/iwlwifi/mvm/utils.c           |   17 +-
4647  drivers/net/wireless/iwlwifi/pcie/drv.c            |    9 +-
4648  drivers/net/wireless/iwlwifi/pcie/internal.h       |   65 +-
4649  drivers/net/wireless/iwlwifi/pcie/rx.c             |  435 +-
4650  drivers/net/wireless/iwlwifi/pcie/trans.c          |  161 +-
4651  drivers/net/wireless/iwlwifi/pcie/tx.c             |  168 +-
4652  drivers/net/wireless/libertas/README               |    5 +-
4653  drivers/net/wireless/libertas/if_sdio.c            |    6 +-
4654  drivers/net/wireless/libertas/if_spi.c             |    1 -
4655  drivers/net/wireless/mac80211_hwsim.c              |  101 +-
4656  drivers/net/wireless/mwifiex/11n.c                 |    2 +-
4657  drivers/net/wireless/mwifiex/11n_aggr.c            |    6 +-
4658  drivers/net/wireless/mwifiex/cfg80211.c            |   54 +-
4659  drivers/net/wireless/mwifiex/cmdevt.c              |    4 +-
4660  drivers/net/wireless/mwifiex/decl.h                |    1 +
4661  drivers/net/wireless/mwifiex/fw.h                  |   39 +-
4662  drivers/net/wireless/mwifiex/init.c                |    3 +-
4663  drivers/net/wireless/mwifiex/main.c                |   11 +-
4664  drivers/net/wireless/mwifiex/main.h                |    7 +-
4665  drivers/net/wireless/mwifiex/scan.c                |    4 +-
4666  drivers/net/wireless/mwifiex/sta_cmd.c             |   80 +-
4667  drivers/net/wireless/mwifiex/sta_cmdresp.c         |   38 +-
4668  drivers/net/wireless/mwifiex/sta_ioctl.c           |   20 +
4669  drivers/net/wireless/mwifiex/sta_rx.c              |   46 +-
4670  drivers/net/wireless/mwifiex/sta_tx.c              |    1 +
4671  drivers/net/wireless/mwifiex/txrx.c                |   15 +-
4672  drivers/net/wireless/mwifiex/uap_txrx.c            |   39 +-
4673  drivers/net/wireless/mwifiex/usb.c                 |    4 +-
4674  drivers/net/wireless/mwifiex/util.c                |    5 +-
4675  drivers/net/wireless/mwl8k.c                       |    3 +-
4676  drivers/net/wireless/orinoco/hermes.c              |    1 -
4677  drivers/net/wireless/orinoco/orinoco_cs.c          |    1 -
4678  drivers/net/wireless/orinoco/orinoco_usb.c         |    1 -
4679  drivers/net/wireless/orinoco/spectrum_cs.c         |    1 -
4680  drivers/net/wireless/p54/eeprom.c                  |    1 -
4681  drivers/net/wireless/p54/fwio.c                    |    1 -
4682  drivers/net/wireless/p54/led.c                     |    1 -
4683  drivers/net/wireless/p54/main.c                    |    1 -
4684  drivers/net/wireless/p54/net2280.h                 |    3 +-
4685  drivers/net/wireless/p54/p54pci.c                  |    1 -
4686  drivers/net/wireless/p54/p54usb.c                  |    1 -
4687  drivers/net/wireless/p54/txrx.c                    |    3 +-
4688  drivers/net/wireless/prism54/isl_38xx.c            |    3 +-
4689  drivers/net/wireless/prism54/isl_38xx.h            |    3 +-
4690  drivers/net/wireless/prism54/isl_ioctl.c           |    6 +-
4691  drivers/net/wireless/prism54/isl_ioctl.h           |    3 +-
4692  drivers/net/wireless/prism54/isl_oid.h             |    3 +-
4693  drivers/net/wireless/prism54/islpci_dev.c          |    4 +-
4694  drivers/net/wireless/prism54/islpci_dev.h          |    3 +-
4695  drivers/net/wireless/prism54/islpci_eth.c          |    3 +-
4696  drivers/net/wireless/prism54/islpci_eth.h          |    3 +-
4697  drivers/net/wireless/prism54/islpci_hotplug.c      |    5 +-
4698  drivers/net/wireless/prism54/islpci_mgt.c          |    3 +-
4699  drivers/net/wireless/prism54/islpci_mgt.h          |    3 +-
4700  drivers/net/wireless/prism54/oid_mgt.c             |    3 +-
4701  drivers/net/wireless/prism54/oid_mgt.h             |    3 +-
4702  drivers/net/wireless/prism54/prismcompat.h         |    3 +-
4703  drivers/net/wireless/ray_cs.c                      |    3 +-
4704  drivers/net/wireless/rndis_wlan.c                  |    4 +-
4705  drivers/net/wireless/rt2x00/rt2400pci.c            |    5 +-
4706  drivers/net/wireless/rt2x00/rt2400pci.h            |    4 +-
4707  drivers/net/wireless/rt2x00/rt2500pci.c            |    5 +-
4708  drivers/net/wireless/rt2x00/rt2500pci.h            |    4 +-
4709  drivers/net/wireless/rt2x00/rt2500usb.c            |    5 +-
4710  drivers/net/wireless/rt2x00/rt2500usb.h            |    4 +-
4711  drivers/net/wireless/rt2x00/rt2800.h               |    4 +-
4712  drivers/net/wireless/rt2x00/rt2800lib.c            |   41 +-
4713  drivers/net/wireless/rt2x00/rt2800lib.h            |    4 +-
4714  drivers/net/wireless/rt2x00/rt2800mmio.c           |    4 +-
4715  drivers/net/wireless/rt2x00/rt2800mmio.h           |    4 +-
4716  drivers/net/wireless/rt2x00/rt2800pci.c            |    4 +-
4717  drivers/net/wireless/rt2x00/rt2800pci.h            |    4 +-
4718  drivers/net/wireless/rt2x00/rt2800soc.c            |    4 +-
4719  drivers/net/wireless/rt2x00/rt2800usb.c            |    5 +-
4720  drivers/net/wireless/rt2x00/rt2800usb.h            |    4 +-
4721  drivers/net/wireless/rt2x00/rt2x00.h               |    4 +-
4722  drivers/net/wireless/rt2x00/rt2x00config.c         |    4 +-
4723  drivers/net/wireless/rt2x00/rt2x00crypto.c         |    4 +-
4724  drivers/net/wireless/rt2x00/rt2x00debug.c          |    4 +-
4725  drivers/net/wireless/rt2x00/rt2x00debug.h          |    4 +-
4726  drivers/net/wireless/rt2x00/rt2x00dev.c            |    8 +-
4727  drivers/net/wireless/rt2x00/rt2x00dump.h           |    4 +-
4728  drivers/net/wireless/rt2x00/rt2x00firmware.c       |    4 +-
4729  drivers/net/wireless/rt2x00/rt2x00leds.c           |    4 +-
4730  drivers/net/wireless/rt2x00/rt2x00leds.h           |    4 +-
4731  drivers/net/wireless/rt2x00/rt2x00lib.h            |    4 +-
4732  drivers/net/wireless/rt2x00/rt2x00link.c           |    4 +-
4733  drivers/net/wireless/rt2x00/rt2x00mac.c            |    4 +-
4734  drivers/net/wireless/rt2x00/rt2x00mmio.c           |    4 +-
4735  drivers/net/wireless/rt2x00/rt2x00mmio.h           |    4 +-
4736  drivers/net/wireless/rt2x00/rt2x00pci.c            |    7 +-
4737  drivers/net/wireless/rt2x00/rt2x00pci.h            |    4 +-
4738  drivers/net/wireless/rt2x00/rt2x00queue.c          |    4 +-
4739  drivers/net/wireless/rt2x00/rt2x00queue.h          |    4 +-
4740  drivers/net/wireless/rt2x00/rt2x00reg.h            |    4 +-
4741  drivers/net/wireless/rt2x00/rt2x00soc.c            |    4 +-
4742  drivers/net/wireless/rt2x00/rt2x00soc.h            |    4 +-
4743  drivers/net/wireless/rt2x00/rt2x00usb.c            |    4 +-
4744  drivers/net/wireless/rt2x00/rt2x00usb.h            |    4 +-
4745  drivers/net/wireless/rt2x00/rt61pci.c              |    5 +-
4746  drivers/net/wireless/rt2x00/rt61pci.h              |    4 +-
4747  drivers/net/wireless/rt2x00/rt73usb.c              |    5 +-
4748  drivers/net/wireless/rt2x00/rt73usb.h              |    4 +-
4749  drivers/net/wireless/rtl818x/rtl8180/dev.c         |    1 -
4750  drivers/net/wireless/rtl818x/rtl8180/grf5101.c     |    1 -
4751  drivers/net/wireless/rtl818x/rtl8180/max2820.c     |    1 -
4752  drivers/net/wireless/rtl818x/rtl8180/rtl8225.c     |    1 -
4753  drivers/net/wireless/rtl818x/rtl8180/sa2400.c      |    1 -
4754  drivers/net/wireless/rtl818x/rtl8187/dev.c         |    3 +-
4755  drivers/net/wireless/rtl818x/rtl8187/rtl8225.c     |    1 -
4756  drivers/net/wireless/rtlwifi/base.c                |    7 +-
4757  drivers/net/wireless/rtlwifi/cam.c                 |    4 +-
4758  drivers/net/wireless/rtlwifi/core.c                |   11 +
4759  drivers/net/wireless/rtlwifi/pci.c                 |    2 -
4760  drivers/net/wireless/rtlwifi/ps.c                  |    4 +-
4761  drivers/net/wireless/rtlwifi/regd.c                |   61 +-
4762  drivers/net/wireless/rtlwifi/rtl8188ee/dm.c        |    2 +-
4763  drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c  |  327 +-
4764  drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h  |   14 +
4765  drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c |   39 +-
4766  drivers/net/wireless/rtlwifi/rtl8192cu/dm.c        |    9 +
4767  drivers/net/wireless/rtlwifi/rtl8192cu/dm.h        |    3 +
4768  drivers/net/wireless/rtlwifi/rtl8192cu/hw.c        |    2 +-
4769  drivers/net/wireless/rtlwifi/rtl8192cu/phy.c       |    6 +-
4770  drivers/net/wireless/rtlwifi/rtl8192cu/rf.c        |   29 +-
4771  drivers/net/wireless/rtlwifi/rtl8192cu/sw.c        |   16 +-
4772  drivers/net/wireless/rtlwifi/rtl8192cu/table.c     |   40 +-
4773  drivers/net/wireless/rtlwifi/stats.c               |   14 +
4774  drivers/net/wireless/rtlwifi/usb.c                 |    8 +-
4775  drivers/net/wireless/rtlwifi/wifi.h                |   33 +-
4776  drivers/net/wireless/ti/wl1251/acx.c               |  258 +-
4777  drivers/net/wireless/ti/wl1251/acx.h               |   26 +-
4778  drivers/net/wireless/ti/wl1251/boot.c              |    3 +-
4779  drivers/net/wireless/ti/wl1251/cmd.c               |   58 +-
4780  drivers/net/wireless/ti/wl1251/cmd.h               |    8 +-
4781  drivers/net/wireless/ti/wl1251/event.c             |   46 +-
4782  drivers/net/wireless/ti/wl1251/event.h             |    7 +
4783  drivers/net/wireless/ti/wl1251/init.c              |   13 +-
4784  drivers/net/wireless/ti/wl1251/main.c              |  152 +-
4785  drivers/net/wireless/ti/wl1251/rx.c                |    2 +-
4786  drivers/net/wireless/ti/wl1251/tx.c                |   35 +-
4787  drivers/net/wireless/ti/wl1251/wl1251.h            |    6 +
4788  drivers/net/wireless/ti/wl12xx/scan.c              |    2 +-
4789  drivers/net/wireless/ti/wlcore/cmd.c               |    2 +-
4790  drivers/net/wireless/ti/wlcore/main.c              |    3 +-
4791  drivers/net/wireless/ti/wlcore/scan.c              |   12 +-
4792  drivers/net/wireless/wl3501_cs.c                   |    5 +-
4793  drivers/net/wireless/zd1211rw/zd_chip.c            |    3 +-
4794  drivers/net/wireless/zd1211rw/zd_chip.h            |    3 +-
4795  drivers/net/wireless/zd1211rw/zd_def.h             |    3 +-
4796  drivers/net/wireless/zd1211rw/zd_mac.c             |    8 +-
4797  drivers/net/wireless/zd1211rw/zd_mac.h             |    3 +-
4798  drivers/net/wireless/zd1211rw/zd_rf.c              |    3 +-
4799  drivers/net/wireless/zd1211rw/zd_rf.h              |    3 +-
4800  drivers/net/wireless/zd1211rw/zd_rf_al2230.c       |    3 +-
4801  drivers/net/wireless/zd1211rw/zd_rf_al7230b.c      |    3 +-
4802  drivers/net/wireless/zd1211rw/zd_rf_rf2959.c       |    3 +-
4803  drivers/net/wireless/zd1211rw/zd_rf_uw2453.c       |    3 +-
4804  drivers/net/wireless/zd1211rw/zd_usb.c             |    3 +-
4805  drivers/net/wireless/zd1211rw/zd_usb.h             |    3 +-
4806  drivers/net/xen-netback/common.h                   |   28 +-
4807  drivers/net/xen-netback/interface.c                |   47 +-
4808  drivers/net/xen-netback/netback.c                  |  506 +--
4809  drivers/net/xen-netback/xenbus.c                   |    3 +-
4810  drivers/net/xen-netfront.c                         |   48 +-
4811  drivers/nfc/mei_phy.c                              |    4 +-
4812  drivers/nfc/microread/i2c.c                        |    4 +-
4813  drivers/nfc/microread/mei.c                        |    4 +-
4814  drivers/nfc/microread/microread.c                  |    4 +-
4815  drivers/nfc/microread/microread.h                  |    4 +-
4816  drivers/nfc/nfcwilink.c                            |    3 +-
4817  drivers/nfc/pn533.c                                |    4 +-
4818  drivers/nfc/pn544/i2c.c                            |    4 +-
4819  drivers/nfc/pn544/mei.c                            |    4 +-
4820  drivers/nfc/pn544/pn544.c                          |    4 +-
4821  drivers/nfc/pn544/pn544.h                          |    4 +-
4822  drivers/of/of_mdio.c                               |  155 +-
4823  drivers/of/of_net.c                                |    1 +
4824  drivers/s390/net/netiucv.c                         |    8 +-
4825  drivers/s390/net/qeth_core.h                       |    8 +
4826  drivers/s390/net/qeth_core_main.c                  |  198 +-
4827  drivers/s390/net/qeth_core_mpc.h                   |   28 +-
4828  drivers/ssb/driver_chipcommon_sflash.c             |    6 +-
4829  drivers/staging/cxt1e1/linux.c                     |   15 +-
4830  drivers/staging/ozwpan/ozcdev.c                    |    2 +-
4831  drivers/staging/ozwpan/ozproto.c                   |    5 +-
4832  drivers/vhost/net.c                                |    9 +-
4833  drivers/vhost/scsi.c                               |    7 +-
4834  drivers/vhost/test.c                               |    8 +-
4835  drivers/vhost/vhost.c                              |    4 +-
4836  drivers/vhost/vhost.h                              |    2 +-
4837  include/asm-generic/hash.h                         |    9 +
4838  include/linux/ath9k_platform.h                     |    2 +
4839  include/linux/bcma/bcma.h                          |    9 +-
4840  include/linux/cgroup_subsys.h                      |    4 +-
4841  include/linux/etherdevice.h                        |   94 +-
4842  include/linux/hash.h                               |   36 +
4843  include/linux/ieee80211.h                          |    8 +-
4844  include/linux/if_macvlan.h                         |   37 +-
4845  include/linux/if_tunnel.h                          |    9 -
4846  include/linux/if_vlan.h                            |   38 +-
4847  include/linux/inet_lro.h                           |   23 -
4848  include/linux/inetdevice.h                         |   14 +-
4849  include/linux/ipv6.h                               |    4 +-
4850  include/linux/mdio.h                               |    3 -
4851  include/linux/mlx4/cmd.h                           |    1 +
4852  include/linux/mlx4/cq.h                            |    5 +
4853  include/linux/mlx4/device.h                        |   39 +-
4854  include/linux/mlx4/qp.h                            |    6 +
4855  include/linux/mmc/sdio_ids.h                       |    9 +
4856  include/linux/net.h                                |    3 -
4857  include/linux/netdevice.h                          |  107 +-
4858  include/linux/netfilter/ipset/ip_set.h             |    1 -
4859  include/linux/netlink.h                            |    2 -
4860  include/linux/of_mdio.h                            |   10 +
4861  include/linux/phy.h                                |  116 +-
4862  include/linux/platform_data/eth-netx.h             |    6 +-
4863  include/linux/platform_data/pn544.h                |    3 +-
4864  include/linux/printk.h                             |    7 +
4865  include/linux/sctp.h                               |    5 +-
4866  include/linux/sh_eth.h                             |    1 +
4867  include/linux/skbuff.h                             |  224 +-
4868  include/linux/socket.h                             |    2 -
4869  include/linux/tcp.h                                |    5 +-
4870  include/net/Space.h                                |   31 +
4871  include/net/act_api.h                              |   57 +-
4872  include/net/addrconf.h                             |   11 +-
4873  include/net/arp.h                                  |    1 -
4874  include/net/bluetooth/bluetooth.h                  |    3 +
4875  include/net/bluetooth/hci.h                        |   10 +-
4876  include/net/bluetooth/hci_core.h                   |    7 +
4877  include/net/bluetooth/l2cap.h                      |   46 +
4878  include/net/cfg80211.h                             |  315 +-
4879  include/net/cipso_ipv4.h                           |    5 +-
4880  include/net/cls_cgroup.h                           |   40 +-
4881  include/net/dcbevent.h                             |    3 +-
4882  include/net/dcbnl.h                                |    3 +-
4883  include/net/dn_dev.h                               |    2 +-
4884  include/net/dst.h                                  |    5 +-
4885  include/net/flow.h                                 |    3 +-
4886  include/net/genetlink.h                            |    4 +
4887  include/net/gre.h                                  |    3 -
4888  include/net/if_inet6.h                             |    2 +-
4889  include/net/inetpeer.h                             |    1 -
4890  include/net/ip.h                                   |   41 +-
4891  include/net/ip6_fib.h                              |    2 +-
4892  include/net/ip6_route.h                            |   34 +-
4893  include/net/ip6_tunnel.h                           |    2 +-
4894  include/net/ip_tunnels.h                           |   11 +-
4895  include/net/ipv6.h                                 |   16 +-
4896  include/net/irda/discovery.h                       |    4 +-
4897  include/net/irda/ircomm_core.h                     |    4 +-
4898  include/net/irda/ircomm_event.h                    |    4 +-
4899  include/net/irda/ircomm_lmp.h                      |    4 +-
4900  include/net/irda/ircomm_param.h                    |    4 +-
4901  include/net/irda/ircomm_ttp.h                      |    4 +-
4902  include/net/irda/ircomm_tty.h                      |    4 +-
4903  include/net/irda/ircomm_tty_attach.h               |    4 +-
4904  include/net/irda/irda_device.h                     |    4 +-
4905  include/net/irda/irlap_event.h                     |    4 +-
4906  include/net/irda/irlap_frame.h                     |    4 +-
4907  include/net/irda/parameters.h                      |    4 +-
4908  include/net/irda/qos.h                             |    4 +-
4909  include/net/llc.h                                  |    1 -
4910  include/net/mac80211.h                             |  132 +-
4911  include/net/mip6.h                                 |    3 +-
4912  include/net/neighbour.h                            |   78 +-
4913  include/net/netfilter/ipv4/nf_conntrack_ipv4.h     |    2 -
4914  include/net/netfilter/ipv4/nf_reject.h             |  128 +
4915  include/net/netfilter/ipv6/nf_reject.h             |  171 +
4916  include/net/netfilter/nf_conntrack_l3proto.h       |    1 -
4917  include/net/netfilter/nf_queue.h                   |   62 +
4918  include/net/netfilter/nf_tables.h                  |   47 +-
4919  include/net/netfilter/nf_tables_ipv4.h             |    5 +-
4920  include/net/netfilter/nf_tables_ipv6.h             |    3 +
4921  include/net/netlabel.h                             |    3 +-
4922  include/net/netns/conntrack.h                      |   33 +-
4923  include/net/netns/ipv4.h                           |    2 +
4924  include/net/netns/ipv6.h                           |    1 +
4925  include/net/netns/nftables.h                       |    1 +
4926  include/net/netns/xfrm.h                           |    6 +-
4927  include/net/netprio_cgroup.h                       |   18 +-
4928  include/net/nfc/hci.h                              |    4 +-
4929  include/net/nfc/llc.h                              |    4 +-
4930  include/net/nfc/nci.h                              |    3 +-
4931  include/net/nfc/nci_core.h                         |    3 +-
4932  include/net/nfc/nfc.h                              |    4 +-
4933  include/net/ping.h                                 |    8 -
4934  include/net/pkt_cls.h                              |   67 +-
4935  include/net/pkt_sched.h                            |    1 +
4936  include/net/protocol.h                             |    7 +-
4937  include/net/red.h                                  |    2 +-
4938  include/net/regulatory.h                           |   80 +-
4939  include/net/route.h                                |   27 +-
4940  include/net/rtnetlink.h                            |    3 +-
4941  include/net/sch_generic.h                          |    4 +-
4942  include/net/sctp/auth.h                            |    5 +-
4943  include/net/sctp/checksum.h                        |    5 +-
4944  include/net/sctp/command.h                         |    5 +-
4945  include/net/sctp/constants.h                       |    5 +-
4946  include/net/sctp/sctp.h                            |    5 +-
4947  include/net/sctp/sm.h                              |    5 +-
4948  include/net/sctp/structs.h                         |   65 +-
4949  include/net/sctp/tsnmap.h                          |    5 +-
4950  include/net/sctp/ulpevent.h                        |    5 +-
4951  include/net/sctp/ulpqueue.h                        |    5 +-
4952  include/net/sock.h                                 |   26 +-
4953  include/net/tc_act/tc_skbedit.h                    |    3 +-
4954  include/net/tcp.h                                  |   11 +-
4955  include/net/xfrm.h                                 |   16 +-
4956  include/trace/events/net.h                         |  158 +
4957  include/uapi/linux/if_addr.h                       |    5 +
4958  include/uapi/linux/if_arp.h                        |    1 +
4959  include/uapi/linux/if_link.h                       |   32 +
4960  include/uapi/linux/if_packet.h                     |   28 +-
4961  include/uapi/linux/in6.h                           |    4 +
4962  include/uapi/linux/net_tstamp.h                    |   16 +-
4963  include/uapi/linux/netconf.h                       |    1 +
4964  include/uapi/linux/netfilter.h                     |    1 +
4965  include/uapi/linux/netfilter/Kbuild                |    3 +
4966  include/uapi/linux/netfilter/nf_nat.h              |   12 +-
4967  include/uapi/linux/netfilter/nf_tables.h           |   30 +
4968  include/uapi/linux/netfilter/nfnetlink_queue.h     |    5 +-
4969  include/uapi/linux/netfilter/xt_cgroup.h           |   11 +
4970  include/uapi/linux/netfilter/xt_ipcomp.h           |   16 +
4971  include/uapi/linux/netfilter/xt_l2tp.h             |   27 +
4972  include/uapi/linux/netfilter/xt_osf.h              |    3 +-
4973  include/uapi/linux/nl80211.h                       |  129 +-
4974  include/uapi/linux/openvswitch.h                   |   14 +-
4975  include/uapi/linux/pci_regs.h                      |    5 +
4976  include/uapi/linux/pkt_sched.h                     |   53 +
4977  include/uapi/linux/sctp.h                          |    5 +-
4978  include/uapi/linux/snmp.h                          |    1 +
4979  include/uapi/linux/sockios.h                       |    3 +-
4980  include/uapi/linux/tcp_metrics.h                   |    2 +
4981  lib/Makefile                                       |    2 +-
4982  lib/hash.c                                         |   39 +
4983  net/802/garp.c                                     |    2 +-
4984  net/802/hippi.c                                    |    4 +-
4985  net/802/mrp.c                                      |    2 +-
4986  net/Kconfig                                        |   11 +-
4987  net/batman-adv/Kconfig                             |    1 -
4988  net/batman-adv/Makefile                            |    6 +-
4989  net/batman-adv/bat_algo.h                          |    6 +-
4990  net/batman-adv/bat_iv_ogm.c                        |  886 ++--
4991  net/batman-adv/bitarray.c                          |    6 +-
4992  net/batman-adv/bitarray.h                          |    6 +-
4993  net/batman-adv/bridge_loop_avoidance.c             |    6 +-
4994  net/batman-adv/bridge_loop_avoidance.h             |    6 +-
4995  net/batman-adv/debugfs.c                           |   95 +-
4996  net/batman-adv/debugfs.h                           |    8 +-
4997  net/batman-adv/distributed-arp-table.c             |   15 +-
4998  net/batman-adv/distributed-arp-table.h             |   12 +-
4999  net/batman-adv/fragmentation.c                     |    6 +-
5000  net/batman-adv/fragmentation.h                     |    6 +-
5001  net/batman-adv/gateway_client.c                    |  303 +-
5002  net/batman-adv/gateway_client.h                    |   12 +-
5003  net/batman-adv/gateway_common.c                    |    8 +-
5004  net/batman-adv/gateway_common.h                    |    6 +-
5005  net/batman-adv/hard-interface.c                    |   19 +-
5006  net/batman-adv/hard-interface.h                    |   24 +-
5007  net/batman-adv/hash.c                              |    6 +-
5008  net/batman-adv/hash.h                              |    6 +-
5009  net/batman-adv/icmp_socket.c                       |    9 +-
5010  net/batman-adv/icmp_socket.h                       |    6 +-
5011  net/batman-adv/main.c                              |   56 +-
5012  net/batman-adv/main.h                              |   19 +-
5013  net/batman-adv/network-coding.c                    |   55 +-
5014  net/batman-adv/network-coding.h                    |   13 +-
5015  net/batman-adv/originator.c                        |  542 ++-
5016  net/batman-adv/originator.h                        |   26 +-
5017  net/batman-adv/packet.h                            |    7 +-
5018  net/batman-adv/routing.c                           |  441 +-
5019  net/batman-adv/routing.h                           |   18 +-
5020  net/batman-adv/send.c                              |   41 +-
5021  net/batman-adv/send.h                              |   16 +-
5022  net/batman-adv/soft-interface.c                    |  111 +-
5023  net/batman-adv/soft-interface.h                    |    6 +-
5024  net/batman-adv/sysfs.c                             |   94 +-
5025  net/batman-adv/sysfs.h                             |    6 +-
5026  net/batman-adv/translation-table.c                 |   86 +-
5027  net/batman-adv/translation-table.h                 |   10 +-
5028  net/batman-adv/types.h                             |  150 +-
5029  net/bluetooth/6lowpan.c                            |  860 ++++
5030  net/bluetooth/6lowpan.h                            |   26 +
5031  net/bluetooth/Makefile                             |    6 +-
5032  net/bluetooth/af_bluetooth.c                       |    2 +-
5033  net/bluetooth/bnep/bnep.h                          |    3 +-
5034  net/bluetooth/hci_core.c                           |   78 +-
5035  net/bluetooth/hci_event.c                          |   75 +-
5036  net/bluetooth/l2cap_core.c                         |  756 +++-
5037  net/bluetooth/l2cap_sock.c                         |  184 +-
5038  net/bluetooth/mgmt.c                               |   17 +-
5039  net/bluetooth/rfcomm/tty.c                         |  103 +-
5040  net/bluetooth/smp.c                                |   56 +-
5041  net/bluetooth/smp.h                                |    1 +
5042  net/bridge/br.c                                    |   21 +-
5043  net/bridge/br_device.c                             |   10 +-
5044  net/bridge/br_fdb.c                                |    3 +-
5045  net/bridge/br_forward.c                            |    6 +-
5046  net/bridge/br_if.c                                 |   17 +-
5047  net/bridge/br_input.c                              |    2 +-
5048  net/bridge/br_ioctl.c                              |    2 +-
5049  net/bridge/br_netfilter.c                          |    2 +-
5050  net/bridge/br_netlink.c                            |   12 +-
5051  net/bridge/br_private.h                            |   13 +-
5052  net/bridge/br_stp_timer.c                          |    2 +-
5053  net/bridge/br_sysfs_br.c                           |  249 +-
5054  net/bridge/br_sysfs_if.c                           |   20 +-
5055  net/bridge/br_vlan.c                               |    2 +-
5056  net/bridge/netfilter/ebt_log.c                     |    2 +-
5057  net/bridge/netfilter/ebt_snat.c                    |    2 +-
5058  net/bridge/netfilter/ebt_vlan.c                    |    3 +-
5059  net/bridge/netfilter/ebtable_broute.c              |    6 +-
5060  net/bridge/netfilter/ebtable_filter.c              |    9 +-
5061  net/bridge/netfilter/ebtable_nat.c                 |    9 +-
5062  net/bridge/netfilter/ebtables.c                    |   17 +-
5063  net/bridge/netfilter/nf_tables_bridge.c            |   44 +-
5064  net/caif/chnl_net.c                                |    3 +-
5065  net/can/gw.c                                       |   21 +-
5066  net/core/Makefile                                  |    3 +-
5067  net/core/dev.c                                     |  451 +-
5068  net/core/dev_addr_lists.c                          |   97 +-
5069  net/core/dev_ioctl.c                               |    2 +
5070  net/core/flow_dissector.c                          |    6 +-
5071  net/core/neighbour.c                               |  469 +-
5072  net/core/net-sysfs.c                               |    6 +-
5073  net/core/net-sysfs.h                               |    2 +-
5074  net/core/netclassid_cgroup.c                       |  120 +
5075  net/core/netprio_cgroup.c                          |    2 +-
5076  net/core/pktgen.c                                  |   80 +-
5077  net/core/rtnetlink.c                               |   22 +-
5078  net/core/skbuff.c                                  |  366 +-
5079  net/core/sock.c                                    |   35 +-
5080  net/core/stream.c                                  |    2 +-
5081  net/core/sysctl_net_core.c                         |    3 +-
5082  net/dcb/dcbevent.c                                 |    3 +-
5083  net/dcb/dcbnl.c                                    |   18 +-
5084  net/dccp/ccids/lib/tfrc.c                          |    2 +-
5085  net/dccp/ccids/lib/tfrc.h                          |    1 -
5086  net/dccp/dccp.h                                    |    1 -
5087  net/dccp/ipv4.c                                    |    3 +-
5088  net/dccp/ipv6.c                                    |   11 +-
5089  net/dccp/options.c                                 |   32 -
5090  net/decnet/dn_dev.c                                |   13 +-
5091  net/decnet/dn_neigh.c                              |   28 +-
5092  net/decnet/dn_route.c                              |   12 +-
5093  net/dns_resolver/dns_key.c                         |    3 +-
5094  net/dns_resolver/dns_query.c                       |    3 +-
5095  net/dns_resolver/internal.h                        |    3 +-
5096  net/hsr/hsr_framereg.c                             |   13 +-
5097  net/ieee802154/6lowpan.c                           |  796 +---
5098  net/ieee802154/6lowpan.h                           |   72 +
5099  net/ieee802154/6lowpan_iphc.c                      |  799 ++++
5100  net/ieee802154/Makefile                            |    2 +-
5101  net/ieee802154/wpan-class.c                        |    2 +-
5102  net/ipv4/Makefile                                  |    4 +-
5103  net/ipv4/af_inet.c                                 |   43 +-
5104  net/ipv4/arp.c                                     |   53 +-
5105  net/ipv4/cipso_ipv4.c                              |   12 +-
5106  net/ipv4/datagram.c                                |    2 +-
5107  net/ipv4/devinet.c                                 |   66 +-
5108  net/ipv4/fib_lookup.h                              |    2 -
5109  net/ipv4/fib_semantics.c                           |    5 +-
5110  net/ipv4/gre_demux.c                               |    9 -
5111  net/ipv4/gre_offload.c                             |  183 +-
5112  net/ipv4/icmp.c                                    |   26 +-
5113  net/ipv4/igmp.c                                    |   84 +-
5114  net/ipv4/inet_connection_sock.c                    |    2 +-
5115  net/ipv4/inet_lro.c                                |  173 -
5116  net/ipv4/inetpeer.c                                |   11 +-
5117  net/ipv4/ip_forward.c                              |    7 +-
5118  net/ipv4/ip_fragment.c                             |    2 +-
5119  net/ipv4/ip_options.c                              |   42 +-
5120  net/ipv4/ip_output.c                               |   12 +-
5121  net/ipv4/ip_sockglue.c                             |    2 +-
5122  net/ipv4/ip_tunnel.c                               |  142 +-
5123  net/ipv4/ip_tunnel_core.c                          |    5 +-
5124  net/ipv4/ip_vti.c                                  |    2 +-
5125  net/ipv4/ipmr.c                                    |    2 +
5126  net/ipv4/netfilter/Kconfig                         |   18 +-
5127  net/ipv4/netfilter/Makefile                        |    1 -
5128  net/ipv4/netfilter/ipt_REJECT.c                    |  140 +-
5129  net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c     |    6 -
5130  net/ipv4/netfilter/nf_nat_snmp_basic.c             |   15 +-
5131  net/ipv4/netfilter/nf_tables_arp.c                 |   44 +-
5132  net/ipv4/netfilter/nf_tables_ipv4.c                |   60 +-
5133  net/ipv4/netfilter/nft_chain_nat_ipv4.c            |   10 +-
5134  net/ipv4/netfilter/nft_chain_route_ipv4.c          |   10 +-
5135  net/ipv4/ping.c                                    |   10 +-
5136  net/ipv4/proc.c                                    |    9 +-
5137  net/ipv4/raw.c                                     |    2 +-
5138  net/ipv4/route.c                                   |    3 -
5139  net/ipv4/syncookies.c                              |    2 +-
5140  net/ipv4/sysctl_net_ipv4.c                         |   32 +-
5141  net/ipv4/tcp.c                                     |   71 +-
5142  net/ipv4/tcp_input.c                               |    6 +-
5143  net/ipv4/tcp_ipv4.c                                |    4 +-
5144  net/ipv4/tcp_metrics.c                             |  151 +-
5145  net/ipv4/tcp_minisocks.c                           |    2 +-
5146  net/ipv4/tcp_offload.c                             |   18 +-
5147  net/ipv4/tcp_output.c                              |  141 +-
5148  net/ipv4/tcp_probe.c                               |    4 +-
5149  net/ipv4/tcp_yeah.c                                |   20 +-
5150  net/ipv4/udp.c                                     |    4 +-
5151  net/ipv4/xfrm4_mode_beet.c                         |    2 +-
5152  net/ipv4/xfrm4_state.c                             |    2 +-
5153  net/ipv6/addrconf.c                                |  294 +-
5154  net/ipv6/af_inet6.c                                |    7 +-
5155  net/ipv6/ah6.c                                     |    3 +-
5156  net/ipv6/datagram.c                                |    2 +-
5157  net/ipv6/esp6.c                                    |    3 +-
5158  net/ipv6/icmp.c                                    |   17 +-
5159  net/ipv6/inet6_connection_sock.c                   |    4 +-
5160  net/ipv6/ip6_fib.c                                 |    6 +-
5161  net/ipv6/ip6_flowlabel.c                           |    2 +-
5162  net/ipv6/ip6_gre.c                                 |   13 +-
5163  net/ipv6/ip6_offload.c                             |   53 +-
5164  net/ipv6/ip6_output.c                              |   66 +-
5165  net/ipv6/ip6_tunnel.c                              |   15 +-
5166  net/ipv6/ip6_vti.c                                 |    7 +-
5167  net/ipv6/ipcomp6.c                                 |    3 +-
5168  net/ipv6/ipv6_sockglue.c                           |    9 +-
5169  net/ipv6/mcast.c                                   |   10 +-
5170  net/ipv6/mip6.c                                    |    3 +-
5171  net/ipv6/ndisc.c                                   |   55 +-
5172  net/ipv6/netfilter/Kconfig                         |   12 +
5173  net/ipv6/netfilter/ip6t_REJECT.c                   |  179 +-
5174  net/ipv6/netfilter/nf_tables_ipv6.c                |   65 +-
5175  net/ipv6/netfilter/nft_chain_nat_ipv6.c            |   10 +-
5176  net/ipv6/netfilter/nft_chain_route_ipv6.c          |   10 +-
5177  net/ipv6/ping.c                                    |    2 +-
5178  net/ipv6/raw.c                                     |    2 +-
5179  net/ipv6/route.c                                   |   68 +-
5180  net/ipv6/sit.c                                     |   10 +-
5181  net/ipv6/syncookies.c                              |    2 +-
5182  net/ipv6/sysctl_net_ipv6.c                         |    8 +
5183  net/ipv6/tcp_ipv6.c                                |   37 +-
5184  net/ipv6/tcpv6_offload.c                           |    6 +-
5185  net/ipv6/tunnel6.c                                 |    3 +-
5186  net/ipv6/udp.c                                     |    7 +-
5187  net/ipv6/xfrm6_mode_ro.c                           |    3 +-
5188  net/ipv6/xfrm6_tunnel.c                            |    3 +-
5189  net/irda/af_irda.c                                 |    4 +-
5190  net/irda/discovery.c                               |    4 +-
5191  net/irda/ircomm/ircomm_core.c                      |    4 +-
5192  net/irda/ircomm/ircomm_event.c                     |    4 +-
5193  net/irda/ircomm/ircomm_lmp.c                       |    4 +-
5194  net/irda/ircomm/ircomm_param.c                     |    4 +-
5195  net/irda/ircomm/ircomm_ttp.c                       |    4 +-
5196  net/irda/ircomm/ircomm_tty.c                       |    4 +-
5197  net/irda/ircomm/ircomm_tty_attach.c                |    4 +-
5198  net/irda/ircomm/ircomm_tty_ioctl.c                 |    4 +-
5199  net/irda/irda_device.c                             |    4 +-
5200  net/irda/irlap.c                                   |    4 +-
5201  net/irda/parameters.c                              |    4 +-
5202  net/irda/qos.c                                     |    4 +-
5203  net/key/af_key.c                                   |   29 +-
5204  net/l2tp/l2tp_core.c                               |    6 +-
5205  net/l2tp/l2tp_core.h                               |    2 -
5206  net/l2tp/l2tp_ip6.c                                |    2 +-
5207  net/llc/llc_conn.c                                 |    4 +-
5208  net/llc/llc_core.c                                 |    5 +-
5209  net/llc/llc_sap.c                                  |    4 +-
5210  net/mac80211/aes_cmac.c                            |    2 +-
5211  net/mac80211/aes_cmac.h                            |    2 +-
5212  net/mac80211/cfg.c                                 |  207 +-
5213  net/mac80211/chan.c                                |  208 +-
5214  net/mac80211/debugfs.c                             |  168 +
5215  net/mac80211/debugfs_sta.c                         |  134 +
5216  net/mac80211/driver-ops.h                          |   32 +-
5217  net/mac80211/ibss.c                                |   85 +-
5218  net/mac80211/ieee80211_i.h                         |   75 +-
5219  net/mac80211/iface.c                               |   78 +-
5220  net/mac80211/key.c                                 |  122 +-
5221  net/mac80211/key.h                                 |   16 +-
5222  net/mac80211/main.c                                |  155 +-
5223  net/mac80211/mesh.c                                |   12 +-
5224  net/mac80211/mesh.h                                |    6 +-
5225  net/mac80211/mesh_hwmp.c                           |   91 +-
5226  net/mac80211/mesh_pathtbl.c                        |    7 +-
5227  net/mac80211/mesh_plink.c                          |  708 +--
5228  net/mac80211/mesh_ps.c                             |    3 +-
5229  net/mac80211/mesh_sync.c                           |   37 +-
5230  net/mac80211/mlme.c                                |   64 +-
5231  net/mac80211/pm.c                                  |    3 +-
5232  net/mac80211/rate.h                                |    4 +-
5233  net/mac80211/rc80211_minstrel.c                    |   11 +-
5234  net/mac80211/rc80211_minstrel_ht.c                 |   24 +-
5235  net/mac80211/rc80211_minstrel_ht_debugfs.c         |    3 +-
5236  net/mac80211/rx.c                                  |  121 +-
5237  net/mac80211/scan.c                                |   90 +-
5238  net/mac80211/sta_info.c                            |  158 +-
5239  net/mac80211/sta_info.h                            |   68 +-
5240  net/mac80211/status.c                              |   78 +
5241  net/mac80211/tkip.c                                |    2 +-
5242  net/mac80211/trace.h                               |   81 +-
5243  net/mac80211/tx.c                                  |   57 +-
5244  net/mac80211/util.c                                |  279 +-
5245  net/mac80211/vht.c                                 |    7 +-
5246  net/mac80211/wme.c                                 |    7 +-
5247  net/mac80211/wpa.c                                 |  116 +
5248  net/mac80211/wpa.h                                 |    2 +
5249  net/mac802154/wpan.c                               |    4 +-
5250  net/netfilter/Kconfig                              |   96 +-
5251  net/netfilter/Makefile                             |    7 +-
5252  net/netfilter/ipset/ip_set_core.c                  |   28 -
5253  net/netfilter/ipvs/ip_vs_conn.c                    |    2 +-
5254  net/netfilter/ipvs/ip_vs_nfct.c                    |    3 +-
5255  net/netfilter/ipvs/ip_vs_sync.c                    |    5 +-
5256  net/netfilter/nf_conntrack_core.c                  |   15 -
5257  net/netfilter/nf_conntrack_netlink.c               |   12 +-
5258  net/netfilter/nf_conntrack_proto.c                 |    6 -
5259  net/netfilter/nf_conntrack_proto_dccp.c            |   10 +-
5260  net/netfilter/nf_nat_core.c                        |    4 +-
5261  net/netfilter/nf_nat_proto_common.c                |   10 +-
5262  net/netfilter/nf_tables_api.c                      |  327 +-
5263  net/netfilter/nf_tables_core.c                     |   11 +-
5264  net/netfilter/nf_tables_inet.c                     |  104 +
5265  net/netfilter/nfnetlink_queue_core.c               |   94 +-
5266  net/netfilter/nft_compat.c                         |    8 +-
5267  net/netfilter/nft_ct.c                             |  199 +-
5268  net/netfilter/nft_log.c                            |    2 +-
5269  net/netfilter/nft_meta.c                           |  157 +-
5270  net/netfilter/nft_meta_target.c                    |  117 -
5271  net/netfilter/nft_queue.c                          |  134 +
5272  .../nft_reject_ipv4.c => netfilter/nft_reject.c}   |   26 +-
5273  net/netfilter/xt_CT.c                              |    4 +-
5274  net/netfilter/xt_NFQUEUE.c                         |   80 +-
5275  net/netfilter/xt_cgroup.c                          |   71 +
5276  net/netfilter/xt_connmark.c                        |    3 +-
5277  net/netfilter/xt_ipcomp.c                          |  111 +
5278  net/netfilter/xt_l2tp.c                            |  354 ++
5279  net/netfilter/xt_osf.c                             |    3 +-
5280  net/netfilter/xt_statistic.c                       |    2 +-
5281  net/netlabel/netlabel_addrlist.c                   |    3 +-
5282  net/netlabel/netlabel_addrlist.h                   |    3 +-
5283  net/netlabel/netlabel_cipso_v4.c                   |    3 +-
5284  net/netlabel/netlabel_cipso_v4.h                   |    3 +-
5285  net/netlabel/netlabel_domainhash.c                 |    3 +-
5286  net/netlabel/netlabel_domainhash.h                 |    3 +-
5287  net/netlabel/netlabel_kapi.c                       |    3 +-
5288  net/netlabel/netlabel_mgmt.c                       |    3 +-
5289  net/netlabel/netlabel_mgmt.h                       |    3 +-
5290  net/netlabel/netlabel_unlabeled.c                  |    3 +-
5291  net/netlabel/netlabel_unlabeled.h                  |    3 +-
5292  net/netlabel/netlabel_user.c                       |    3 +-
5293  net/netlabel/netlabel_user.h                       |    3 +-
5294  net/netlink/af_netlink.c                           |   37 +-
5295  net/netlink/genetlink.c                            |   21 +
5296  net/nfc/af_nfc.c                                   |    4 +-
5297  net/nfc/core.c                                     |    4 +-
5298  net/nfc/hci/command.c                              |    4 +-
5299  net/nfc/hci/core.c                                 |    4 +-
5300  net/nfc/hci/hci.h                                  |    4 +-
5301  net/nfc/hci/hcp.c                                  |    4 +-
5302  net/nfc/hci/llc.c                                  |    4 +-
5303  net/nfc/hci/llc.h                                  |    4 +-
5304  net/nfc/hci/llc_nop.c                              |    4 +-
5305  net/nfc/hci/llc_shdlc.c                            |    6 +-
5306  net/nfc/llcp.h                                     |    4 +-
5307  net/nfc/llcp_commands.c                            |    4 +-
5308  net/nfc/llcp_core.c                                |    4 +-
5309  net/nfc/llcp_sock.c                                |    4 +-
5310  net/nfc/nci/core.c                                 |    3 +-
5311  net/nfc/nci/data.c                                 |    3 +-
5312  net/nfc/nci/lib.c                                  |    3 +-
5313  net/nfc/nci/ntf.c                                  |    3 +-
5314  net/nfc/nci/rsp.c                                  |    3 +-
5315  net/nfc/netlink.c                                  |    4 +-
5316  net/nfc/nfc.h                                      |    4 +-
5317  net/nfc/rawsock.c                                  |    4 +-
5318  net/openvswitch/actions.c                          |   12 +-
5319  net/openvswitch/datapath.c                         |  231 +-
5320  net/openvswitch/datapath.h                         |    6 +-
5321  net/openvswitch/flow.c                             |   96 +-
5322  net/openvswitch/flow.h                             |   33 +-
5323  net/openvswitch/flow_netlink.c                     |   66 +-
5324  net/openvswitch/flow_netlink.h                     |    1 +
5325  net/openvswitch/flow_table.c                       |   64 +-
5326  net/openvswitch/flow_table.h                       |    6 +-
5327  net/openvswitch/vport.c                            |   18 +-
5328  net/openvswitch/vport.h                            |    3 +-
5329  net/packet/af_packet.c                             |  133 +-
5330  net/packet/internal.h                              |    1 +
5331  net/rds/bind.c                                     |    2 +-
5332  net/rfkill/core.c                                  |    4 +-
5333  net/rose/af_rose.c                                 |    2 +-
5334  net/rose/rose_dev.c                                |    2 +-
5335  net/sched/Kconfig                                  |   23 +
5336  net/sched/Makefile                                 |    2 +
5337  net/sched/act_api.c                                |  414 +-
5338  net/sched/act_csum.c                               |   16 +-
5339  net/sched/act_gact.c                               |   18 +-
5340  net/sched/act_ipt.c                                |   24 +-
5341  net/sched/act_mirred.c                             |   21 +-
5342  net/sched/act_nat.c                                |   17 +-
5343  net/sched/act_pedit.c                              |   17 +-
5344  net/sched/act_police.c                             |   72 +-
5345  net/sched/act_simple.c                             |   23 +-
5346  net/sched/act_skbedit.c                            |   19 +-
5347  net/sched/cls_api.c                                |  130 +-
5348  net/sched/cls_basic.c                              |   25 +-
5349  net/sched/cls_bpf.c                                |   17 +-
5350  net/sched/cls_cgroup.c                             |  127 +-
5351  net/sched/cls_flow.c                               |   17 +-
5352  net/sched/cls_fw.c                                 |   48 +-
5353  net/sched/cls_route.c                              |   21 +-
5354  net/sched/cls_rsvp.h                               |   15 +-
5355  net/sched/cls_tcindex.c                            |   36 +-
5356  net/sched/cls_u32.c                                |   38 +-
5357  net/sched/em_meta.c                                |  159 +-
5358  net/sched/sch_api.c                                |   10 +-
5359  net/sched/sch_cbq.c                                |   10 +-
5360  net/sched/sch_dsmark.c                             |   39 +-
5361  net/sched/sch_fq.c                                 |   36 +-
5362  net/sched/sch_fq_codel.c                           |    2 +-
5363  net/sched/sch_generic.c                            |    6 +-
5364  net/sched/sch_gred.c                               |    4 +-
5365  net/sched/sch_hhf.c                                |  745 ++++
5366  net/sched/sch_htb.c                                |   35 +-
5367  net/sched/sch_mq.c                                 |   13 +-
5368  net/sched/sch_mqprio.c                             |   10 +-
5369  net/sched/sch_multiq.c                             |    3 +-
5370  net/sched/sch_netem.c                              |   38 +-
5371  net/sched/sch_pie.c                                |  555 +++
5372  net/sched/sch_sfb.c                                |    4 +-
5373  net/sched/sch_sfq.c                                |   16 +-
5374  net/sched/sch_tbf.c                                |   29 +-
5375  net/sctp/associola.c                               |   70 +-
5376  net/sctp/auth.c                                    |   32 +-
5377  net/sctp/bind_addr.c                               |    5 +-
5378  net/sctp/chunk.c                                   |    9 +-
5379  net/sctp/command.c                                 |    5 +-
5380  net/sctp/debug.c                                   |    5 +-
5381  net/sctp/endpointola.c                             |    5 +-
5382  net/sctp/input.c                                   |   82 +-
5383  net/sctp/inqueue.c                                 |    5 +-
5384  net/sctp/ipv6.c                                    |   14 +-
5385  net/sctp/objcnt.c                                  |    7 +-
5386  net/sctp/output.c                                  |   24 +-
5387  net/sctp/outqueue.c                                |   13 +-
5388  net/sctp/primitive.c                               |    5 +-
5389  net/sctp/proc.c                                    |   13 +-
5390  net/sctp/protocol.c                                |   10 +-
5391  net/sctp/sm_make_chunk.c                           |   82 +-
5392  net/sctp/sm_sideeffect.c                           |   11 +-
5393  net/sctp/sm_statefuns.c                            |   32 +-
5394  net/sctp/sm_statetable.c                           |    7 +-
5395  net/sctp/socket.c                                  |  104 +-
5396  net/sctp/ssnmap.c                                  |    5 +-
5397  net/sctp/sysctl.c                                  |    7 +-
5398  net/sctp/transport.c                               |    5 +-
5399  net/sctp/tsnmap.c                                  |    5 +-
5400  net/sctp/ulpevent.c                                |    5 +-
5401  net/sctp/ulpqueue.c                                |   16 +-
5402  net/socket.c                                       |  106 +-
5403  net/sunrpc/cache.c                                 |    2 +-
5404  net/sunrpc/xprt.c                                  |    2 +-
5405  net/sunrpc/xprtsock.c                              |    2 +-
5406  net/tipc/bcast.c                                   |    8 +-
5407  net/tipc/bearer.c                                  |  342 +-
5408  net/tipc/bearer.h                                  |   56 +-
5409  net/tipc/core.c                                    |    8 +-
5410  net/tipc/core.h                                    |    2 +-
5411  net/tipc/discover.c                                |   28 +-
5412  net/tipc/eth_media.c                               |  326 +-
5413  net/tipc/ib_media.c                                |  319 +-
5414  net/tipc/link.c                                    |  222 +-
5415  net/tipc/link.h                                    |   25 +-
5416  net/tipc/name_table.c                              |    3 +-
5417  net/tipc/node.c                                    |   15 +-
5418  net/tipc/node.h                                    |    3 -
5419  net/tipc/port.c                                    |    9 +-
5420  net/tipc/server.c                                  |    2 +-
5421  net/tipc/socket.c                                  |   32 +-
5422  net/tipc/subscr.c                                  |    2 +-
5423  net/unix/af_unix.c                                 |    9 +-
5424  net/wireless/ap.c                                  |    1 +
5425  net/wireless/chan.c                                |  203 +-
5426  net/wireless/core.c                                |   31 +-
5427  net/wireless/core.h                                |   24 +-
5428  net/wireless/genregdb.awk                          |   45 +-
5429  net/wireless/ibss.c                                |    6 +-
5430  net/wireless/mesh.c                                |   17 +-
5431  net/wireless/mlme.c                                |   20 +-
5432  net/wireless/nl80211.c                             |  715 ++-
5433  net/wireless/nl80211.h                             |    2 +-
5434  net/wireless/rdev-ops.h                            |   27 +-
5435  net/wireless/reg.c                                 |  829 ++--
5436  net/wireless/reg.h                                 |    4 +-
5437  net/wireless/scan.c                                |   16 +-
5438  net/wireless/sme.c                                 |    2 +
5439  net/wireless/trace.h                               |   55 +-
5440  net/wireless/util.c                                |   19 +-
5441  net/x25/af_x25.c                                   |    4 +-
5442  net/x25/x25_dev.c                                  |   10 +-
5443  net/x25/x25_facilities.c                           |   14 +-
5444  net/x25/x25_forward.c                              |    5 +-
5445  net/x25/x25_in.c                                   |    4 +-
5446  net/x25/x25_link.c                                 |    6 +-
5447  net/x25/x25_subr.c                                 |    6 +-
5448  net/xfrm/xfrm_input.c                              |    6 +-
5449  net/xfrm/xfrm_policy.c                             |  195 +-
5450  net/xfrm/xfrm_proc.c                               |    2 +-
5451  net/xfrm/xfrm_state.c                              |  191 +-
5452  net/xfrm/xfrm_user.c                               |   62 +-
5453  tools/net/Makefile                                 |   23 +-
5454  tools/net/bpf_asm.c                                |   52 +
5455  tools/net/bpf_dbg.c                                | 1404 ++++++
5456  tools/net/bpf_exp.l                                |  143 +
5457  tools/net/bpf_exp.y                                |  762 ++++
5458  1579 files changed, 71308 insertions(+), 33196 deletions(-)
5459  create mode 100644 Documentation/devicetree/bindings/net/can/microchip,mcp251x.txt
5460  create mode 100644 Documentation/networking/i40evf.txt
5461  create mode 100644 Documentation/networking/ipsec.txt
5462  create mode 100644 Documentation/networking/timestamping/hwtstamp_config.c
5463  create mode 100644 arch/x86/include/asm/hash.h
5464  create mode 100644 arch/x86/lib/hash.c
5465  create mode 100644 drivers/net/ethernet/intel/i40e/Module.symvers
5466  create mode 100644 drivers/net/ethernet/intel/i40e/i40e_ptp.c
5467  create mode 100644 drivers/net/ethernet/intel/i40evf/Makefile
5468  create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_adminq.c
5469  create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_adminq.h
5470  create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
5471  create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_alloc.h
5472  create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_common.c
5473  create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_hmc.h
5474  create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_lan_hmc.h
5475  create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_osdep.h
5476  create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_prototype.h
5477  create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_register.h
5478  create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_status.h
5479  create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_txrx.c
5480  create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_txrx.h
5481  create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_type.h
5482  create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h
5483  create mode 100644 drivers/net/ethernet/intel/i40evf/i40evf.h
5484  create mode 100644 drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c
5485  create mode 100644 drivers/net/ethernet/intel/i40evf/i40evf_main.c
5486  create mode 100644 drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
5487  create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_buffalo_initvals.h
5488  create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_wow.c
5489  create mode 100644 drivers/net/wireless/ath/ath9k/ar953x_initvals.h
5490  create mode 100644 drivers/net/wireless/ath/ath9k/ar9565_1p1_initvals.h
5491  create mode 100644 drivers/net/wireless/ath/ath9k/spectral.c
5492  create mode 100644 drivers/net/wireless/ath/ath9k/spectral.h
5493  create mode 100644 drivers/net/wireless/ath/ath9k/tx99.c
5494  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcdc.c
5495  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcdc.h
5496  delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
5497  delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
5498  delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h
5499  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/proto.c
5500  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/proto.h
5501  create mode 100644 drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
5502  create mode 100644 drivers/net/wireless/iwlwifi/mvm/debugfs.h
5503  create mode 100644 drivers/net/wireless/iwlwifi/mvm/sf.c
5504  create mode 100644 include/asm-generic/hash.h
5505  create mode 100644 include/net/Space.h
5506  create mode 100644 include/net/netfilter/ipv4/nf_reject.h
5507  create mode 100644 include/net/netfilter/ipv6/nf_reject.h
5508  create mode 100644 include/uapi/linux/netfilter/xt_cgroup.h
5509  create mode 100644 include/uapi/linux/netfilter/xt_ipcomp.h
5510  create mode 100644 include/uapi/linux/netfilter/xt_l2tp.h
5511  create mode 100644 lib/hash.c
5512  create mode 100644 net/bluetooth/6lowpan.c
5513  create mode 100644 net/bluetooth/6lowpan.h
5514  create mode 100644 net/core/netclassid_cgroup.c
5515  create mode 100644 net/ieee802154/6lowpan_iphc.c
5516  create mode 100644 net/netfilter/nf_tables_inet.c
5517  delete mode 100644 net/netfilter/nft_meta_target.c
5518  create mode 100644 net/netfilter/nft_queue.c
5519  rename net/{ipv4/netfilter/nft_reject_ipv4.c => netfilter/nft_reject.c} (78%)
5520  create mode 100644 net/netfilter/xt_cgroup.c
5521  create mode 100644 net/netfilter/xt_ipcomp.c
5522  create mode 100644 net/netfilter/xt_l2tp.c
5523  create mode 100644 net/sched/sch_hhf.c
5524  create mode 100644 net/sched/sch_pie.c
5525  create mode 100644 tools/net/bpf_asm.c
5526  create mode 100644 tools/net/bpf_dbg.c
5527  create mode 100644 tools/net/bpf_exp.l
5528  create mode 100644 tools/net/bpf_exp.y
5529 Merging ipsec-next/master (ae237b3ede64 net: 3com: fix warning for incorrect type in argument)
5530 $ git merge ipsec-next/master
5531 Already up-to-date.
5532 Merging wireless-next/master (608cfbe4abaf p54: clamp properly instead of just truncating)
5533 $ git merge wireless-next/master
5534 Auto-merging net/wireless/nl80211.c
5535 Auto-merging net/nfc/core.c
5536 Auto-merging net/mac80211/tx.c
5537 Auto-merging include/net/nfc/nci_core.h
5538 Auto-merging drivers/net/wireless/ti/wl1251/main.c
5539 Auto-merging drivers/net/wireless/mac80211_hwsim.c
5540 Auto-merging drivers/net/wireless/adm8211.c
5541 Merge made by the 'recursive' strategy.
5542  drivers/net/wireless/adm8211.c                     |    1 -
5543  drivers/net/wireless/at76c50x-usb.c                |    1 -
5544  drivers/net/wireless/ath/ath10k/Kconfig            |    7 +
5545  drivers/net/wireless/ath/ath10k/core.h             |   11 +
5546  drivers/net/wireless/ath/ath10k/debug.c            |   66 ++
5547  drivers/net/wireless/ath/ath10k/htt.h              |    1 +
5548  drivers/net/wireless/ath/ath10k/htt_rx.c           |   15 +
5549  drivers/net/wireless/ath/ath10k/hw.h               |    1 +
5550  drivers/net/wireless/ath/ath10k/mac.c              |  375 +++++-
5551  drivers/net/wireless/ath/ath10k/trace.h            |   21 +
5552  drivers/net/wireless/ath/ath10k/txrx.c             |    2 +-
5553  drivers/net/wireless/ath/ath10k/wmi.c              |  106 +-
5554  drivers/net/wireless/ath/ath10k/wmi.h              |   61 +
5555  drivers/net/wireless/ath/ath5k/base.c              |    1 -
5556  drivers/net/wireless/ath/ath9k/Kconfig             |    8 +
5557  drivers/net/wireless/ath/ath9k/Makefile            |    2 +
5558  drivers/net/wireless/ath/ath9k/ath9k.h             |   10 +-
5559  drivers/net/wireless/ath/ath9k/debug.c             |  197 ++--
5560  drivers/net/wireless/ath/ath9k/debug.h             |   35 +-
5561  drivers/net/wireless/ath/ath9k/debug_sta.c         |  269 +++++
5562  drivers/net/wireless/ath/ath9k/htc_drv_init.c      |    1 -
5563  drivers/net/wireless/ath/ath9k/init.c              |    1 -
5564  drivers/net/wireless/ath/ath9k/main.c              |   40 +-
5565  drivers/net/wireless/ath/ath9k/recv.c              |    2 +-
5566  drivers/net/wireless/ath/ath9k/xmit.c              |    2 -
5567  drivers/net/wireless/ath/carl9170/main.c           |   12 -
5568  drivers/net/wireless/ath/regd.c                    |    7 +-
5569  drivers/net/wireless/b43/b43.h                     |    4 +-
5570  drivers/net/wireless/b43/main.c                    |   27 +-
5571  drivers/net/wireless/b43legacy/main.c              |    1 +
5572  .../net/wireless/brcm80211/brcmsmac/mac80211_if.c  |    1 -
5573  drivers/net/wireless/brcm80211/brcmsmac/main.c     |    2 -
5574  drivers/net/wireless/cw1200/main.c                 |    1 -
5575  drivers/net/wireless/libertas/cfg.c                |    7 +-
5576  drivers/net/wireless/mac80211_hwsim.c              | 1246 ++++++++++----------
5577  drivers/net/wireless/mac80211_hwsim.h              |   18 +
5578  drivers/net/wireless/mwifiex/Kconfig               |    4 +-
5579  drivers/net/wireless/mwifiex/scan.c                |    4 +-
5580  drivers/net/wireless/mwifiex/usb.c                 |   54 +-
5581  drivers/net/wireless/mwifiex/usb.h                 |   12 +-
5582  drivers/net/wireless/mwl8k.c                       |    2 -
5583  drivers/net/wireless/p54/main.c                    |    1 -
5584  drivers/net/wireless/p54/txrx.c                    |    2 +-
5585  drivers/net/wireless/rtlwifi/base.c                |    1 -
5586  drivers/net/wireless/rtlwifi/rtl8192cu/sw.c        |    1 +
5587  drivers/net/wireless/ti/wl1251/main.c              |    1 -
5588  drivers/net/wireless/ti/wlcore/main.c              |   11 +-
5589  drivers/nfc/Kconfig                                |    1 +
5590  drivers/nfc/Makefile                               |    1 +
5591  drivers/nfc/mei_phy.c                              |    2 +-
5592  drivers/nfc/nfcmrvl/Kconfig                        |   23 +
5593  drivers/nfc/nfcmrvl/Makefile                       |    9 +
5594  drivers/nfc/nfcmrvl/main.c                         |  165 +++
5595  drivers/nfc/nfcmrvl/nfcmrvl.h                      |   48 +
5596  drivers/nfc/nfcmrvl/usb.c                          |  459 +++++++
5597  drivers/nfc/pn533.c                                |    3 +
5598  drivers/nfc/pn544/pn544.c                          |   48 +-
5599  drivers/nfc/port100.c                              |    1 +
5600  drivers/staging/winbond/wbusb.c                    |    1 -
5601  include/linux/ieee80211.h                          |    2 +
5602  include/net/cfg80211.h                             |    8 +
5603  include/net/mac80211.h                             |    8 +-
5604  include/net/nfc/digital.h                          |   10 +
5605  include/net/nfc/nci_core.h                         |    2 +
5606  include/net/regulatory.h                           |    4 +
5607  net/mac80211/cfg.c                                 |    3 +-
5608  net/mac80211/debugfs_netdev.c                      |   61 +-
5609  net/mac80211/ht.c                                  |    5 +-
5610  net/mac80211/ieee80211_i.h                         |    2 +
5611  net/mac80211/main.c                                |   22 +-
5612  net/mac80211/mesh.c                                |    1 +
5613  net/mac80211/mesh_plink.c                          |    1 +
5614  net/mac80211/rx.c                                  |   40 +-
5615  net/mac80211/sta_info.c                            |  238 ++--
5616  net/mac80211/trace.h                               |   27 +
5617  net/mac80211/tx.c                                  |    2 +
5618  net/mac80211/util.c                                |   41 +
5619  net/mac80211/wpa.c                                 |    2 +-
5620  net/nfc/core.c                                     |    7 +-
5621  net/nfc/digital_core.c                             |   28 +-
5622  net/nfc/digital_dep.c                              |   54 +-
5623  net/nfc/hci/core.c                                 |    7 +-
5624  net/nfc/llcp_commands.c                            |    6 +-
5625  net/nfc/llcp_core.c                                |    1 -
5626  net/nfc/llcp_sock.c                                |    1 -
5627  net/nfc/nci/core.c                                 |   27 +-
5628  net/wireless/nl80211.c                             |  111 +-
5629  net/wireless/reg.c                                 |    2 +
5630  net/wireless/scan.c                                |    7 +-
5631  net/wireless/sme.c                                 |   13 +-
5632  net/wireless/util.c                                |   15 +
5633  net/wireless/wext-compat.c                         |    6 +-
5634  92 files changed, 3049 insertions(+), 1131 deletions(-)
5635  create mode 100644 drivers/net/wireless/ath/ath9k/debug_sta.c
5636  create mode 100644 drivers/nfc/nfcmrvl/Kconfig
5637  create mode 100644 drivers/nfc/nfcmrvl/Makefile
5638  create mode 100644 drivers/nfc/nfcmrvl/main.c
5639  create mode 100644 drivers/nfc/nfcmrvl/nfcmrvl.h
5640  create mode 100644 drivers/nfc/nfcmrvl/usb.c
5641 Merging bluetooth/master (91eb476fb032 Bluetooth: Convert to use ATTRIBUTE_GROUPS macro)
5642 $ git merge bluetooth/master
5643 Merge made by the 'recursive' strategy.
5644  include/net/bluetooth/hci.h      |  41 +++++++-
5645  include/net/bluetooth/hci_core.h |  24 +++--
5646  include/net/bluetooth/mgmt.h     |  17 ++++
5647  net/bluetooth/hci_conn.c         |   6 +-
5648  net/bluetooth/hci_core.c         |  98 ++++++++++++++++++-
5649  net/bluetooth/hci_event.c        | 102 +++++++++++++++++---
5650  net/bluetooth/hci_sysfs.c        |  18 +---
5651  net/bluetooth/mgmt.c             | 203 +++++++++++++++++++++++++++++++++++----
5652  8 files changed, 442 insertions(+), 67 deletions(-)
5653 $ git am -3 ../patches/0001-net-6lowpan-fixup-for-code-movement.patch
5654 Applying: net: 6lowpan: fixup for code movement
5655 $ git reset HEAD^
5656 Unstaged changes after reset:
5657 M       net/ieee802154/6lowpan_iphc.c
5658 $ git add -A .
5659 $ git commit -v -a --amend
5660 [master 128577823860] Merge remote-tracking branch 'bluetooth/master'
5661 Merging infiniband/for-next (10e32f8f22ae Merge branch 'ip-roce' into for-next)
5662 $ git merge infiniband/for-next
5663 Resolved 'include/linux/mlx4/device.h' using previous resolution.
5664 Auto-merging include/linux/mlx4/device.h
5665 CONFLICT (content): Merge conflict in include/linux/mlx4/device.h
5666 Auto-merging include/linux/mlx4/cq.h
5667 Auto-merging include/linux/mlx4/cmd.h
5668 Auto-merging drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
5669 Auto-merging drivers/net/ethernet/mellanox/mlx4/port.c
5670 Auto-merging drivers/net/ethernet/mellanox/mlx4/mlx4.h
5671 Auto-merging drivers/net/ethernet/mellanox/mlx4/mcg.c
5672 Auto-merging drivers/net/ethernet/mellanox/mlx4/fw.c
5673 Auto-merging drivers/infiniband/core/cma.c
5674 Auto-merging MAINTAINERS
5675 Automatic merge failed; fix conflicts and then commit the result.
5676 $ git commit -v -a
5677 [master 383dd2087360] Merge remote-tracking branch 'infiniband/for-next'
5678 $ git diff -M --stat --summary HEAD^..
5679  MAINTAINERS                                        |   5 +
5680  drivers/infiniband/Kconfig                         |   1 +
5681  drivers/infiniband/Makefile                        |   1 +
5682  drivers/infiniband/core/addr.c                     |  97 ++-
5683  drivers/infiniband/core/cm.c                       |  50 ++
5684  drivers/infiniband/core/cma.c                      |  74 +-
5685  drivers/infiniband/core/core_priv.h                |   2 +
5686  drivers/infiniband/core/sa_query.c                 |  12 +-
5687  drivers/infiniband/core/ucma.c                     |  18 +-
5688  drivers/infiniband/core/uverbs_cmd.c               |   4 +
5689  drivers/infiniband/core/verbs.c                    | 101 ++-
5690  drivers/infiniband/hw/ehca/ehca_qp.c               |   2 +-
5691  drivers/infiniband/hw/ipath/ipath_qp.c             |   2 +-
5692  drivers/infiniband/hw/mlx4/ah.c                    |  40 +-
5693  drivers/infiniband/hw/mlx4/cq.c                    |   9 +
5694  drivers/infiniband/hw/mlx4/main.c                  | 747 +++++++++++++++-----
5695  drivers/infiniband/hw/mlx4/mlx4_ib.h               |  18 +-
5696  drivers/infiniband/hw/mlx4/qp.c                    | 157 ++++-
5697  drivers/infiniband/hw/mlx5/cq.c                    | 306 ++++++++-
5698  drivers/infiniband/hw/mlx5/main.c                  |  13 +-
5699  drivers/infiniband/hw/mlx5/mlx5_ib.h               |   4 +-
5700  drivers/infiniband/hw/mlx5/mr.c                    |   1 -
5701  drivers/infiniband/hw/mlx5/qp.c                    | 133 ++--
5702  drivers/infiniband/hw/mlx5/user.h                  |   3 +
5703  drivers/infiniband/hw/mthca/mthca_qp.c             |   3 +-
5704  drivers/infiniband/hw/ocrdma/ocrdma.h              |  12 +
5705  drivers/infiniband/hw/ocrdma/ocrdma_ah.c           |   6 +-
5706  drivers/infiniband/hw/ocrdma/ocrdma_hw.c           |  21 +-
5707  drivers/infiniband/hw/ocrdma/ocrdma_hw.h           |   1 -
5708  drivers/infiniband/hw/ocrdma/ocrdma_main.c         | 138 ++--
5709  drivers/infiniband/hw/ocrdma/ocrdma_sli.h          |   4 +-
5710  drivers/infiniband/hw/ocrdma/ocrdma_verbs.c        |   3 +-
5711  drivers/infiniband/hw/qib/qib_qp.c                 |   2 +-
5712  drivers/infiniband/hw/usnic/Kconfig                |  10 +
5713  drivers/infiniband/hw/usnic/Makefile               |  15 +
5714  drivers/infiniband/hw/usnic/usnic.h                |  29 +
5715  drivers/infiniband/hw/usnic/usnic_abi.h            |  73 ++
5716  drivers/infiniband/hw/usnic/usnic_common_pkt_hdr.h |  27 +
5717  drivers/infiniband/hw/usnic/usnic_common_util.h    |  68 ++
5718  drivers/infiniband/hw/usnic/usnic_debugfs.c        | 158 +++++
5719  drivers/infiniband/hw/usnic/usnic_debugfs.h        |  29 +
5720  drivers/infiniband/hw/usnic/usnic_fwd.c            | 350 ++++++++++
5721  drivers/infiniband/hw/usnic/usnic_fwd.h            | 113 +++
5722  drivers/infiniband/hw/usnic/usnic_ib.h             | 119 ++++
5723  drivers/infiniband/hw/usnic/usnic_ib_main.c        | 682 ++++++++++++++++++
5724  drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c      | 754 ++++++++++++++++++++
5725  drivers/infiniband/hw/usnic/usnic_ib_qp_grp.h      | 117 ++++
5726  drivers/infiniband/hw/usnic/usnic_ib_sysfs.c       | 341 +++++++++
5727  drivers/infiniband/hw/usnic/usnic_ib_sysfs.h       |  29 +
5728  drivers/infiniband/hw/usnic/usnic_ib_verbs.c       | 765 +++++++++++++++++++++
5729  drivers/infiniband/hw/usnic/usnic_ib_verbs.h       |  72 ++
5730  drivers/infiniband/hw/usnic/usnic_log.h            |  58 ++
5731  drivers/infiniband/hw/usnic/usnic_transport.c      | 203 ++++++
5732  drivers/infiniband/hw/usnic/usnic_transport.h      |  51 ++
5733  drivers/infiniband/hw/usnic/usnic_uiom.c           | 604 ++++++++++++++++
5734  drivers/infiniband/hw/usnic/usnic_uiom.h           |  80 +++
5735  .../infiniband/hw/usnic/usnic_uiom_interval_tree.c | 237 +++++++
5736  .../infiniband/hw/usnic/usnic_uiom_interval_tree.h |  74 ++
5737  drivers/infiniband/hw/usnic/usnic_vnic.c           | 467 +++++++++++++
5738  drivers/infiniband/hw/usnic/usnic_vnic.h           | 103 +++
5739  drivers/infiniband/ulp/ipoib/ipoib_verbs.c         |   3 +
5740  drivers/net/ethernet/mellanox/mlx4/cmd.c           |   9 +
5741  drivers/net/ethernet/mellanox/mlx4/fw.c            |  10 +
5742  drivers/net/ethernet/mellanox/mlx4/mcg.c           |  17 +
5743  drivers/net/ethernet/mellanox/mlx4/mlx4.h          |   5 +
5744  drivers/net/ethernet/mellanox/mlx4/port.c          |  20 +
5745  .../net/ethernet/mellanox/mlx4/resource_tracker.c  |  10 +
5746  drivers/net/ethernet/mellanox/mlx5/core/cq.c       |  17 +-
5747  drivers/net/ethernet/mellanox/mlx5/core/debugfs.c  |  39 +-
5748  drivers/net/ethernet/mellanox/mlx5/core/main.c     |  10 +-
5749  .../net/ethernet/mellanox/mlx5/core/pagealloc.c    |  13 +-
5750  drivers/net/ethernet/mellanox/mlx5/core/port.c     |   2 +-
5751  drivers/net/ethernet/mellanox/mlx5/core/qp.c       |   5 +-
5752  include/linux/mlx4/cmd.h                           |   1 +
5753  include/linux/mlx4/cq.h                            |  15 +-
5754  include/linux/mlx4/device.h                        |   7 +-
5755  include/linux/mlx5/cq.h                            |  18 +-
5756  include/linux/mlx5/device.h                        |  31 +-
5757  include/linux/mlx5/qp.h                            |  45 ++
5758  include/rdma/ib_addr.h                             |  69 +-
5759  include/rdma/ib_cm.h                               |   1 +
5760  include/rdma/ib_pack.h                             |   1 +
5761  include/rdma/ib_sa.h                               |   3 +
5762  include/rdma/ib_verbs.h                            |  41 +-
5763  84 files changed, 7506 insertions(+), 504 deletions(-)
5764  create mode 100644 drivers/infiniband/hw/usnic/Kconfig
5765  create mode 100644 drivers/infiniband/hw/usnic/Makefile
5766  create mode 100644 drivers/infiniband/hw/usnic/usnic.h
5767  create mode 100644 drivers/infiniband/hw/usnic/usnic_abi.h
5768  create mode 100644 drivers/infiniband/hw/usnic/usnic_common_pkt_hdr.h
5769  create mode 100644 drivers/infiniband/hw/usnic/usnic_common_util.h
5770  create mode 100644 drivers/infiniband/hw/usnic/usnic_debugfs.c
5771  create mode 100644 drivers/infiniband/hw/usnic/usnic_debugfs.h
5772  create mode 100644 drivers/infiniband/hw/usnic/usnic_fwd.c
5773  create mode 100644 drivers/infiniband/hw/usnic/usnic_fwd.h
5774  create mode 100644 drivers/infiniband/hw/usnic/usnic_ib.h
5775  create mode 100644 drivers/infiniband/hw/usnic/usnic_ib_main.c
5776  create mode 100644 drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c
5777  create mode 100644 drivers/infiniband/hw/usnic/usnic_ib_qp_grp.h
5778  create mode 100644 drivers/infiniband/hw/usnic/usnic_ib_sysfs.c
5779  create mode 100644 drivers/infiniband/hw/usnic/usnic_ib_sysfs.h
5780  create mode 100644 drivers/infiniband/hw/usnic/usnic_ib_verbs.c
5781  create mode 100644 drivers/infiniband/hw/usnic/usnic_ib_verbs.h
5782  create mode 100644 drivers/infiniband/hw/usnic/usnic_log.h
5783  create mode 100644 drivers/infiniband/hw/usnic/usnic_transport.c
5784  create mode 100644 drivers/infiniband/hw/usnic/usnic_transport.h
5785  create mode 100644 drivers/infiniband/hw/usnic/usnic_uiom.c
5786  create mode 100644 drivers/infiniband/hw/usnic/usnic_uiom.h
5787  create mode 100644 drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.c
5788  create mode 100644 drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h
5789  create mode 100644 drivers/infiniband/hw/usnic/usnic_vnic.c
5790  create mode 100644 drivers/infiniband/hw/usnic/usnic_vnic.h
5791 Merging mtd/master (802eee95bde7 Linux 3.13-rc6)
5792 $ git merge mtd/master
5793 Already up-to-date.
5794 Merging l2-mtd/master (05f7835975da mtd: nand: don't use {read,write}_buf for 8-bit transfers)
5795 $ git merge l2-mtd/master
5796 Auto-merging drivers/mtd/nand/mpc5121_nfc.c
5797 Auto-merging drivers/mtd/maps/pxa2xx-flash.c
5798 Auto-merging MAINTAINERS
5799 Removing Documentation/devicetree/bindings/arm/davinci/nand.txt
5800 Merge made by the 'recursive' strategy.
5801  .../devicetree/bindings/arm/davinci/nand.txt       |  46 --
5802  .../devicetree/bindings/mtd/davinci-nand.txt       |  94 +++
5803  .../devicetree/bindings/mtd/gpmi-nand.txt          |   8 +
5804  .../devicetree/bindings/mtd/pxa3xx-nand.txt        |   6 +-
5805  Documentation/mtd/nand/pxa3xx-nand.txt             | 113 ++++
5806  MAINTAINERS                                        |   9 +-
5807  drivers/mtd/Kconfig                                |   7 +-
5808  drivers/mtd/afs.c                                  |   3 +-
5809  drivers/mtd/ar7part.c                              |   3 +-
5810  drivers/mtd/bcm47xxpart.c                          |  27 +-
5811  drivers/mtd/bcm63xxpart.c                          |   3 +-
5812  drivers/mtd/cmdlinepart.c                          |   3 +-
5813  drivers/mtd/devices/docg3.c                        |  20 +-
5814  drivers/mtd/devices/m25p80.c                       | 211 ++++++-
5815  drivers/mtd/devices/ms02-nv.c                      |   2 +-
5816  drivers/mtd/devices/mtd_dataflash.c                |   5 +-
5817  drivers/mtd/lpddr/lpddr_cmds.c                     |  32 +-
5818  drivers/mtd/maps/ixp4xx.c                          |  28 +-
5819  drivers/mtd/maps/lantiq-flash.c                    |  37 +-
5820  drivers/mtd/maps/pxa2xx-flash.c                    |   2 +-
5821  drivers/mtd/maps/sun_uflash.c                      |   2 +-
5822  drivers/mtd/mtdcore.c                              |  10 +-
5823  drivers/mtd/mtdpart.c                              |   9 +-
5824  drivers/mtd/nand/Kconfig                           |  14 +-
5825  drivers/mtd/nand/atmel_nand.c                      |   8 +-
5826  drivers/mtd/nand/au1550nd.c                        |   6 +-
5827  drivers/mtd/nand/bf5xx_nand.c                      |   1 -
5828  drivers/mtd/nand/cafe_nand.c                       |   4 +-
5829  drivers/mtd/nand/cmx270_nand.c                     |   1 -
5830  drivers/mtd/nand/cs553x_nand.c                     |   1 -
5831  drivers/mtd/nand/davinci_nand.c                    |  93 +--
5832  drivers/mtd/nand/denali.c                          |  53 +-
5833  drivers/mtd/nand/denali.h                          |   4 +-
5834  drivers/mtd/nand/denali_dt.c                       |   4 +-
5835  drivers/mtd/nand/denali_pci.c                      |   3 +-
5836  drivers/mtd/nand/diskonchip.c                      |  13 +-
5837  drivers/mtd/nand/fsl_elbc_nand.c                   |   3 +-
5838  drivers/mtd/nand/fsl_ifc_nand.c                    |   3 +-
5839  drivers/mtd/nand/fsmc_nand.c                       |  16 +-
5840  drivers/mtd/nand/gpio.c                            |  12 +-
5841  drivers/mtd/nand/gpmi-nand/gpmi-lib.c              | 127 ++--
5842  drivers/mtd/nand/gpmi-nand/gpmi-nand.c             | 165 ++---
5843  drivers/mtd/nand/gpmi-nand/gpmi-nand.h             |   2 -
5844  drivers/mtd/nand/jz4740_nand.c                     |   4 +-
5845  drivers/mtd/nand/lpc32xx_mlc.c                     |  26 +-
5846  drivers/mtd/nand/lpc32xx_slc.c                     |  19 +-
5847  drivers/mtd/nand/mpc5121_nfc.c                     |  10 +-
5848  drivers/mtd/nand/mxc_nand.c                        |  25 +-
5849  drivers/mtd/nand/nand_base.c                       | 178 +++++-
5850  drivers/mtd/nand/nuc900_nand.c                     |  55 +-
5851  drivers/mtd/nand/omap2.c                           |   8 +-
5852  drivers/mtd/nand/orion_nand.c                      |   4 +-
5853  drivers/mtd/nand/pasemi_nand.c                     |   2 +-
5854  drivers/mtd/nand/plat_nand.c                       |  35 +-
5855  drivers/mtd/nand/pxa3xx_nand.c                     | 692 +++++++++++++++++----
5856  drivers/mtd/nand/s3c2410.c                         |   2 -
5857  drivers/mtd/nand/sh_flctl.c                        |  55 +-
5858  drivers/mtd/nand/sharpsl.c                         |   6 +-
5859  drivers/mtd/nand/tmio_nand.c                       |  46 +-
5860  drivers/mtd/nand/txx9ndfmc.c                       |   5 +-
5861  drivers/mtd/ofpart.c                               |  19 +-
5862  drivers/mtd/onenand/generic.c                      |   2 +-
5863  drivers/mtd/onenand/samsung.h                      |   2 -
5864  drivers/mtd/redboot.c                              |   3 +-
5865  drivers/mtd/tests/mtd_nandecctest.c                |   2 +-
5866  fs/jffs2/malloc.c                                  |   4 +
5867  include/linux/mtd/nand.h                           |  39 +-
5868  include/linux/mtd/partitions.h                     |   8 +-
5869  include/linux/of_mtd.h                             |   2 +-
5870  include/linux/platform_data/mtd-nand-omap2.h       |   2 -
5871  include/linux/platform_data/mtd-nand-pxa3xx.h      |   3 +
5872  include/linux/platform_data/mtd-onenand-omap2.h    |   2 -
5873  include/linux/platform_data/mtd-orion_nand.h       |   6 +-
5874  73 files changed, 1582 insertions(+), 897 deletions(-)
5875  delete mode 100644 Documentation/devicetree/bindings/arm/davinci/nand.txt
5876  create mode 100644 Documentation/devicetree/bindings/mtd/davinci-nand.txt
5877  create mode 100644 Documentation/mtd/nand/pxa3xx-nand.txt
5878 Merging crypto/master (79ba451d66ca crypto: aesni - fix build on x86 (32bit))
5879 $ git merge crypto/master
5880 Auto-merging include/linux/compiler-intel.h
5881 Removing drivers/crypto/dcp.c
5882 Auto-merging arch/arm/boot/dts/imx28.dtsi
5883 Auto-merging arch/arm/boot/dts/imx23.dtsi
5884 Auto-merging MAINTAINERS
5885 Merge made by the 'recursive' strategy.
5886  .../devicetree/bindings/crypto/fsl-dcp.txt         |   17 +
5887  MAINTAINERS                                        |    7 +
5888  arch/arm/boot/dts/imx23.dtsi                       |    4 +-
5889  arch/arm/boot/dts/imx28.dtsi                       |    3 +-
5890  arch/s390/crypto/des_s390.c                        |    6 +-
5891  arch/x86/crypto/Makefile                           |    1 +
5892  arch/x86/crypto/aesni-intel_avx-x86_64.S           | 2811 ++++++++++++++++++++
5893  arch/x86/crypto/aesni-intel_glue.c                 |  147 +-
5894  crypto/Makefile                                    |    5 -
5895  crypto/ahash.c                                     |    5 +-
5896  crypto/memneq.c                                    |   80 +-
5897  crypto/pcrypt.c                                    |    2 +-
5898  crypto/tcrypt.c                                    |  270 ++
5899  crypto/tcrypt.h                                    |   10 +
5900  drivers/crypto/Kconfig                             |   39 +-
5901  drivers/crypto/Makefile                            |   33 +-
5902  drivers/crypto/amcc/crypto4xx_core.c               |    1 -
5903  drivers/crypto/caam/caamalg.c                      |   36 +-
5904  drivers/crypto/ccp/Kconfig                         |   24 +
5905  drivers/crypto/ccp/Makefile                        |   10 +
5906  drivers/crypto/ccp/ccp-crypto-aes-cmac.c           |  365 +++
5907  drivers/crypto/ccp/ccp-crypto-aes-xts.c            |  279 ++
5908  drivers/crypto/ccp/ccp-crypto-aes.c                |  369 +++
5909  drivers/crypto/ccp/ccp-crypto-main.c               |  432 +++
5910  drivers/crypto/ccp/ccp-crypto-sha.c                |  517 ++++
5911  drivers/crypto/ccp/ccp-crypto.h                    |  197 ++
5912  drivers/crypto/ccp/ccp-dev.c                       |  595 +++++
5913  drivers/crypto/ccp/ccp-dev.h                       |  272 ++
5914  drivers/crypto/ccp/ccp-ops.c                       | 2024 ++++++++++++++
5915  drivers/crypto/ccp/ccp-pci.c                       |  361 +++
5916  drivers/crypto/dcp.c                               |  903 -------
5917  drivers/crypto/mxs-dcp.c                           | 1100 ++++++++
5918  drivers/crypto/omap-aes.c                          |   16 +-
5919  drivers/crypto/omap-sham.c                         |   19 +-
5920  drivers/crypto/talitos.c                           |   23 +-
5921  include/linux/ccp.h                                |  537 ++++
5922  include/linux/compiler-gcc.h                       |    3 +
5923  include/linux/compiler-intel.h                     |    7 +
5924  include/linux/compiler.h                           |    4 +
5925  kernel/padata.c                                    |    2 +-
5926  40 files changed, 10527 insertions(+), 1009 deletions(-)
5927  create mode 100644 Documentation/devicetree/bindings/crypto/fsl-dcp.txt
5928  create mode 100644 arch/x86/crypto/aesni-intel_avx-x86_64.S
5929  create mode 100644 drivers/crypto/ccp/Kconfig
5930  create mode 100644 drivers/crypto/ccp/Makefile
5931  create mode 100644 drivers/crypto/ccp/ccp-crypto-aes-cmac.c
5932  create mode 100644 drivers/crypto/ccp/ccp-crypto-aes-xts.c
5933  create mode 100644 drivers/crypto/ccp/ccp-crypto-aes.c
5934  create mode 100644 drivers/crypto/ccp/ccp-crypto-main.c
5935  create mode 100644 drivers/crypto/ccp/ccp-crypto-sha.c
5936  create mode 100644 drivers/crypto/ccp/ccp-crypto.h
5937  create mode 100644 drivers/crypto/ccp/ccp-dev.c
5938  create mode 100644 drivers/crypto/ccp/ccp-dev.h
5939  create mode 100644 drivers/crypto/ccp/ccp-ops.c
5940  create mode 100644 drivers/crypto/ccp/ccp-pci.c
5941  delete mode 100644 drivers/crypto/dcp.c
5942  create mode 100644 drivers/crypto/mxs-dcp.c
5943  create mode 100644 include/linux/ccp.h
5944 Merging drm/drm-next (c5416d661daa gpu: fix qxl missing crc32_le)
5945 $ git merge drm/drm-next
5946 Resolved 'drivers/gpu/drm/drm_stub.c' using previous resolution.
5947 Resolved 'drivers/gpu/drm/i915/intel_display.c' using previous resolution.
5948 Resolved 'drivers/gpu/drm/i915/intel_pm.c' using previous resolution.
5949 Resolved 'drivers/staging/imx-drm/imx-drm-core.c' using previous resolution.
5950 Auto-merging drivers/staging/imx-drm/imx-drm-core.c
5951 CONFLICT (content): Merge conflict in drivers/staging/imx-drm/imx-drm-core.c
5952 Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c
5953 Auto-merging drivers/gpu/drm/ttm/ttm_bo_util.c
5954 Auto-merging drivers/gpu/drm/radeon/si.c
5955 Auto-merging drivers/gpu/drm/radeon/rv770_dpm.c
5956 Auto-merging drivers/gpu/drm/radeon/rs690.c
5957 Auto-merging drivers/gpu/drm/radeon/radeon_kms.c
5958 Auto-merging drivers/gpu/drm/radeon/radeon_drv.c
5959 Auto-merging drivers/gpu/drm/radeon/radeon_asic.c
5960 Auto-merging drivers/gpu/drm/radeon/radeon.h
5961 Auto-merging drivers/gpu/drm/radeon/ni.c
5962 Auto-merging drivers/gpu/drm/radeon/cik_sdma.c
5963 Auto-merging drivers/gpu/drm/radeon/cik.c
5964 Auto-merging drivers/gpu/drm/qxl/qxl_display.c
5965 Removing drivers/gpu/drm/msm/mdp4/mdp4_irq.c
5966 Auto-merging drivers/gpu/drm/msm/mdp/mdp_format.c
5967 Auto-merging drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c
5968 Auto-merging drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h
5969 Auto-merging drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c
5970 Auto-merging drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c
5971 Auto-merging drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
5972 Auto-merging drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h
5973 Auto-merging drivers/gpu/drm/i915/intel_pm.c
5974 CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
5975 Auto-merging drivers/gpu/drm/i915/intel_opregion.c
5976 Auto-merging drivers/gpu/drm/i915/intel_drv.h
5977 Auto-merging drivers/gpu/drm/i915/intel_display.c
5978 CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
5979 Auto-merging drivers/gpu/drm/i915/intel_ddi.c
5980 Auto-merging drivers/gpu/drm/i915/i915_irq.c
5981 Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
5982 Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c
5983 Auto-merging drivers/gpu/drm/i915/i915_gem_context.c
5984 Auto-merging drivers/gpu/drm/i915/i915_gem.c
5985 Auto-merging drivers/gpu/drm/i915/i915_drv.h
5986 Auto-merging drivers/gpu/drm/i915/i915_drv.c
5987 Auto-merging drivers/gpu/drm/i915/i915_dma.c
5988 Auto-merging drivers/gpu/drm/drm_stub.c
5989 CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_stub.c
5990 Auto-merging drivers/gpu/drm/armada/armada_drv.c
5991 Auto-merging drivers/char/agp/intel-gtt.c
5992 Auto-merging drivers/char/agp/intel-agp.c
5993 Automatic merge failed; fix conflicts and then commit the result.
5994 $ git commit -v -a
5995 [master dafe32960a42] Merge remote-tracking branch 'drm/drm-next'
5996 $ git diff -M --stat --summary HEAD^..
5997  .../bindings/gpu/nvidia,tegra20-host1x.txt         |   16 +-
5998  .../devicetree/bindings/mipi/dsi/mipi-dsi-bus.txt  |   98 ++
5999  .../bindings/mipi/nvidia,tegra114-mipi.txt         |   41 +
6000  .../devicetree/bindings/panel/auo,b101aw03.txt     |    7 +
6001  .../bindings/panel/chunghwa,claa101wb03.txt        |    7 +
6002  .../bindings/panel/panasonic,vvx10f004b00.txt      |    7 +
6003  .../devicetree/bindings/panel/simple-panel.txt     |   21 +
6004  drivers/char/Makefile                              |    2 +-
6005  drivers/char/agp/Kconfig                           |    5 +
6006  drivers/char/agp/Makefile                          |    2 +-
6007  drivers/char/agp/intel-agp.c                       |    5 -
6008  drivers/char/agp/intel-gtt.c                       |   18 +
6009  drivers/gpu/drm/Kconfig                            |    8 +
6010  drivers/gpu/drm/Makefile                           |    4 +
6011  drivers/gpu/drm/armada/armada_drv.c                |    3 +-
6012  drivers/gpu/drm/ast/ast_main.c                     |   49 +-
6013  drivers/gpu/drm/ast/ast_mode.c                     |   20 +-
6014  drivers/gpu/drm/ast/ast_ttm.c                      |    6 +-
6015  drivers/gpu/drm/bochs/Kconfig                      |   11 +
6016  drivers/gpu/drm/bochs/Makefile                     |    4 +
6017  drivers/gpu/drm/bochs/bochs.h                      |  164 ++++
6018  drivers/gpu/drm/bochs/bochs_drv.c                  |  178 ++++
6019  drivers/gpu/drm/bochs/bochs_fbdev.c                |  215 ++++
6020  drivers/gpu/drm/bochs/bochs_hw.c                   |  177 ++++
6021  drivers/gpu/drm/bochs/bochs_kms.c                  |  294 ++++++
6022  drivers/gpu/drm/bochs/bochs_mm.c                   |  546 +++++++++++
6023  drivers/gpu/drm/cirrus/cirrus_drv.h                |    2 +-
6024  drivers/gpu/drm/cirrus/cirrus_fbdev.c              |    3 +
6025  drivers/gpu/drm/cirrus/cirrus_main.c               |    2 +-
6026  drivers/gpu/drm/cirrus/cirrus_mode.c               |    8 +-
6027  drivers/gpu/drm/cirrus/cirrus_ttm.c                |   26 +-
6028  drivers/gpu/drm/drm_agpsupport.c                   |   35 +-
6029  drivers/gpu/drm/drm_buffer.c                       |    2 +-
6030  drivers/gpu/drm/drm_bufs.c                         |   10 +-
6031  drivers/gpu/drm/drm_crtc.c                         |    2 -
6032  drivers/gpu/drm/drm_drv.c                          |    4 -
6033  drivers/gpu/drm/drm_edid_load.c                    |    4 +-
6034  drivers/gpu/drm/drm_fb_helper.c                    |    6 +
6035  drivers/gpu/drm/drm_fops.c                         |   11 +-
6036  drivers/gpu/drm/drm_gem.c                          |   42 +-
6037  drivers/gpu/drm/drm_info.c                         |   16 +-
6038  drivers/gpu/drm/drm_irq.c                          |   10 +-
6039  drivers/gpu/drm/drm_memory.c                       |   15 +-
6040  drivers/gpu/drm/drm_mipi_dsi.c                     |  315 ++++++
6041  drivers/gpu/drm/drm_panel.c                        |  100 ++
6042  drivers/gpu/drm/drm_pci.c                          |   38 +-
6043  drivers/gpu/drm/drm_platform.c                     |   12 -
6044  drivers/gpu/drm/drm_stub.c                         |   31 +-
6045  drivers/gpu/drm/drm_usb.c                          |    2 +-
6046  drivers/gpu/drm/drm_vm.c                           |   10 +-
6047  drivers/gpu/drm/exynos/exynos_drm_drv.c            |   25 +-
6048  drivers/gpu/drm/exynos/exynos_drm_drv.h            |    1 +
6049  drivers/gpu/drm/exynos/exynos_drm_fimd.c           |    6 +-
6050  drivers/gpu/drm/exynos/exynos_drm_gem.c            |   74 +-
6051  drivers/gpu/drm/exynos/exynos_drm_gem.h            |    3 +
6052  drivers/gpu/drm/exynos/exynos_mixer.c              |    6 +-
6053  drivers/gpu/drm/gma500/accel_2d.c                  |    2 +-
6054  drivers/gpu/drm/gma500/cdv_intel_dp.c              |   37 +-
6055  drivers/gpu/drm/gma500/psb_drv.h                   |    8 +-
6056  drivers/gpu/drm/gma500/psb_intel_drv.h             |    5 -
6057  drivers/gpu/drm/gma500/psb_irq.c                   |   19 +-
6058  drivers/gpu/drm/gma500/psb_irq.h                   |    2 +-
6059  drivers/gpu/drm/i810/i810_dma.c                    |    4 +
6060  drivers/gpu/drm/i810/i810_drv.c                    |    2 +-
6061  drivers/gpu/drm/i915/Kconfig                       |   32 +-
6062  drivers/gpu/drm/i915/dvo_ns2501.c                  |   73 +-
6063  drivers/gpu/drm/i915/i915_debugfs.c                |  208 +++-
6064  drivers/gpu/drm/i915/i915_dma.c                    |   50 +-
6065  drivers/gpu/drm/i915/i915_drv.c                    |   85 +-
6066  drivers/gpu/drm/i915/i915_drv.h                    |  150 ++-
6067  drivers/gpu/drm/i915/i915_gem.c                    |   65 +-
6068  drivers/gpu/drm/i915/i915_gem_context.c            |   45 +-
6069  drivers/gpu/drm/i915/i915_gem_execbuffer.c         |   55 +-
6070  drivers/gpu/drm/i915/i915_gem_gtt.c                |   17 +-
6071  drivers/gpu/drm/i915/i915_gpu_error.c              |   12 +-
6072  drivers/gpu/drm/i915/i915_irq.c                    |   57 +-
6073  drivers/gpu/drm/i915/i915_reg.h                    |  230 +++--
6074  drivers/gpu/drm/i915/i915_suspend.c                |   45 -
6075  drivers/gpu/drm/i915/i915_sysfs.c                  |   49 +-
6076  drivers/gpu/drm/i915/i915_ums.c                    |   27 +
6077  drivers/gpu/drm/i915/intel_bios.c                  |    8 +-
6078  drivers/gpu/drm/i915/intel_bios.h                  |   48 +-
6079  drivers/gpu/drm/i915/intel_crt.c                   |    5 +-
6080  drivers/gpu/drm/i915/intel_ddi.c                   |  148 ++-
6081  drivers/gpu/drm/i915/intel_display.c               |  390 ++++++--
6082  drivers/gpu/drm/i915/intel_dp.c                    |  121 ++-
6083  drivers/gpu/drm/i915/intel_drv.h                   |   41 +-
6084  drivers/gpu/drm/i915/intel_dsi.c                   |  193 ++--
6085  drivers/gpu/drm/i915/intel_dsi.h                   |   21 +
6086  drivers/gpu/drm/i915/intel_dsi_pll.c               |  119 +--
6087  drivers/gpu/drm/i915/intel_dvo.c                   |    5 +-
6088  drivers/gpu/drm/i915/intel_fbdev.c                 |   63 +-
6089  drivers/gpu/drm/i915/intel_hdmi.c                  |   87 +-
6090  drivers/gpu/drm/i915/intel_i2c.c                   |   15 +-
6091  drivers/gpu/drm/i915/intel_lvds.c                  |   90 +-
6092  drivers/gpu/drm/i915/intel_opregion.c              |   51 +-
6093  drivers/gpu/drm/i915/intel_panel.c                 |  954 ++++++++++++------
6094  drivers/gpu/drm/i915/intel_pm.c                    |  623 +++++++-----
6095  drivers/gpu/drm/i915/intel_ringbuffer.c            |   21 +-
6096  drivers/gpu/drm/i915/intel_sdvo.c                  |   62 +-
6097  drivers/gpu/drm/i915/intel_sdvo_regs.h             |   40 +-
6098  drivers/gpu/drm/i915/intel_sideband.c              |   43 +-
6099  drivers/gpu/drm/i915/intel_sprite.c                |   18 +
6100  drivers/gpu/drm/i915/intel_uncore.c                |  317 ++++--
6101  drivers/gpu/drm/mga/mga_dma.c                      |    4 +-
6102  drivers/gpu/drm/mga/mga_drv.h                      |    4 +-
6103  drivers/gpu/drm/mga/mga_ioc32.c                    |    1 +
6104  drivers/gpu/drm/mga/mga_irq.c                      |    8 +-
6105  drivers/gpu/drm/mga/mga_state.c                    |    2 +-
6106  drivers/gpu/drm/mgag200/mgag200_main.c             |    2 +-
6107  drivers/gpu/drm/mgag200/mgag200_mode.c             |    6 +-
6108  drivers/gpu/drm/mgag200/mgag200_ttm.c              |    6 +-
6109  drivers/gpu/drm/msm/Kconfig                        |    3 +-
6110  drivers/gpu/drm/msm/Makefile                       |   21 +-
6111  drivers/gpu/drm/msm/NOTES                          |   20 +-
6112  drivers/gpu/drm/msm/adreno/a2xx.xml.h              |  125 ++-
6113  drivers/gpu/drm/msm/adreno/a3xx.xml.h              |  116 ++-
6114  drivers/gpu/drm/msm/adreno/a3xx_gpu.c              |  190 +++-
6115  drivers/gpu/drm/msm/adreno/a3xx_gpu.h              |    4 +
6116  drivers/gpu/drm/msm/adreno/adreno_common.xml.h     |  171 ++--
6117  drivers/gpu/drm/msm/adreno/adreno_gpu.c            |   25 +-
6118  drivers/gpu/drm/msm/adreno/adreno_gpu.h            |    9 +
6119  drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h        |   30 +-
6120  drivers/gpu/drm/msm/dsi/dsi.xml.h                  |    8 +-
6121  drivers/gpu/drm/msm/dsi/mmss_cc.xml.h              |    8 +-
6122  drivers/gpu/drm/msm/dsi/sfpb.xml.h                 |    8 +-
6123  drivers/gpu/drm/msm/hdmi/hdmi.c                    |  201 +++-
6124  drivers/gpu/drm/msm/hdmi/hdmi.h                    |   38 +-
6125  drivers/gpu/drm/msm/hdmi/hdmi.xml.h                |   83 +-
6126  drivers/gpu/drm/msm/hdmi/hdmi_bridge.c             |   71 ++
6127  drivers/gpu/drm/msm/hdmi/hdmi_connector.c          |  139 ++-
6128  drivers/gpu/drm/msm/hdmi/hdmi_phy_8x74.c           |  157 +++
6129  drivers/gpu/drm/msm/hdmi/qfprom.xml.h              |    8 +-
6130  drivers/gpu/drm/msm/{ => mdp}/mdp4/mdp4.xml.h      |   88 +-
6131  drivers/gpu/drm/msm/{ => mdp}/mdp4/mdp4_crtc.c     |   26 +-
6132  .../gpu/drm/msm/{ => mdp}/mdp4/mdp4_dtv_encoder.c  |    6 +-
6133  drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c            |   93 ++
6134  drivers/gpu/drm/msm/{ => mdp}/mdp4/mdp4_kms.c      |   61 +-
6135  drivers/gpu/drm/msm/{ => mdp}/mdp4/mdp4_kms.h      |   56 +-
6136  drivers/gpu/drm/msm/{ => mdp}/mdp4/mdp4_plane.c    |    6 +-
6137  drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h            | 1036 ++++++++++++++++++++
6138  drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c           |  569 +++++++++++
6139  drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c        |  258 +++++
6140  drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c            |  111 +++
6141  drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c            |  350 +++++++
6142  drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h            |  213 ++++
6143  drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c          |  389 ++++++++
6144  drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c            |  173 ++++
6145  drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.h            |   41 +
6146  drivers/gpu/drm/msm/mdp/mdp_common.xml.h           |   78 ++
6147  .../msm/{mdp4/mdp4_format.c => mdp/mdp_format.c}   |   13 +-
6148  drivers/gpu/drm/msm/mdp/mdp_kms.c                  |  144 +++
6149  drivers/gpu/drm/msm/mdp/mdp_kms.h                  |   97 ++
6150  drivers/gpu/drm/msm/mdp4/mdp4_irq.c                |  203 ----
6151  drivers/gpu/drm/msm/msm_drv.c                      |  132 ++-
6152  drivers/gpu/drm/msm/msm_drv.h                      |   64 +-
6153  drivers/gpu/drm/msm/msm_fb.c                       |    1 +
6154  drivers/gpu/drm/msm/msm_gem.c                      |  170 ++--
6155  drivers/gpu/drm/msm/msm_gem.h                      |    5 +
6156  drivers/gpu/drm/msm/msm_gpu.c                      |   39 +-
6157  drivers/gpu/drm/msm/msm_gpu.h                      |    6 +-
6158  drivers/gpu/drm/msm/msm_iommu.c                    |  148 +++
6159  drivers/gpu/drm/msm/msm_kms.h                      |   68 ++
6160  drivers/gpu/drm/msm/msm_mmu.h                      |   47 +
6161  drivers/gpu/drm/nouveau/nouveau_dma.c              |    2 +-
6162  drivers/gpu/drm/nouveau/nouveau_dma.h              |    2 +-
6163  drivers/gpu/drm/nouveau/nouveau_fence.c            |    2 +-
6164  drivers/gpu/drm/nouveau/nouveau_gem.c              |    4 +-
6165  drivers/gpu/drm/omapdrm/omap_debugfs.c             |    2 +-
6166  drivers/gpu/drm/omapdrm/omap_drv.c                 |    4 +-
6167  drivers/gpu/drm/omapdrm/omap_drv.h                 |    2 +-
6168  drivers/gpu/drm/omapdrm/omap_fb.c                  |    4 +
6169  drivers/gpu/drm/omapdrm/omap_irq.c                 |    4 +-
6170  drivers/gpu/drm/panel/Kconfig                      |   19 +
6171  drivers/gpu/drm/panel/Makefile                     |    1 +
6172  drivers/gpu/drm/panel/panel-simple.c               |  497 ++++++++++
6173  drivers/gpu/drm/qxl/qxl_display.c                  |    9 +-
6174  drivers/gpu/drm/qxl/qxl_drv.h                      |    2 +-
6175  drivers/gpu/drm/qxl/qxl_ioctl.c                    |    4 +-
6176  drivers/gpu/drm/qxl/qxl_irq.c                      |    2 +-
6177  drivers/gpu/drm/qxl/qxl_kms.c                      |    2 +-
6178  drivers/gpu/drm/r128/r128_cce.c                    |    4 +-
6179  drivers/gpu/drm/r128/r128_drv.h                    |    4 +-
6180  drivers/gpu/drm/r128/r128_ioc32.c                  |    1 +
6181  drivers/gpu/drm/r128/r128_irq.c                    |    2 +-
6182  drivers/gpu/drm/r128/r128_state.c                  |   66 +-
6183  drivers/gpu/drm/radeon/atombios_dp.c               |   36 +-
6184  drivers/gpu/drm/radeon/atombios_i2c.c              |    2 -
6185  drivers/gpu/drm/radeon/btc_dpm.c                   |   20 +-
6186  drivers/gpu/drm/radeon/ci_dpm.c                    |   70 +-
6187  drivers/gpu/drm/radeon/ci_smc.c                    |    1 +
6188  drivers/gpu/drm/radeon/cik.c                       |  268 ++++-
6189  drivers/gpu/drm/radeon/cik_sdma.c                  |   69 ++
6190  drivers/gpu/drm/radeon/cikd.h                      |   11 +
6191  drivers/gpu/drm/radeon/cypress_dpm.c               |   15 -
6192  drivers/gpu/drm/radeon/evergreen.c                 |   95 +-
6193  drivers/gpu/drm/radeon/evergreen_cs.c              |    5 +-
6194  drivers/gpu/drm/radeon/evergreen_reg.h             |    1 +
6195  drivers/gpu/drm/radeon/evergreend.h                |    4 +
6196  drivers/gpu/drm/radeon/kv_dpm.c                    |   48 +-
6197  drivers/gpu/drm/radeon/ni.c                        |  119 ++-
6198  drivers/gpu/drm/radeon/ni_dma.c                    |   69 ++
6199  drivers/gpu/drm/radeon/ni_dpm.c                    |   21 +-
6200  drivers/gpu/drm/radeon/pptable.h                   |    4 +-
6201  drivers/gpu/drm/radeon/r100.c                      |   38 +-
6202  drivers/gpu/drm/radeon/r300.c                      |    7 +
6203  drivers/gpu/drm/radeon/r300_cmdbuf.c               |    8 +-
6204  drivers/gpu/drm/radeon/r420.c                      |    7 +
6205  drivers/gpu/drm/radeon/r520.c                      |    5 +
6206  drivers/gpu/drm/radeon/r600.c                      |  124 ++-
6207  drivers/gpu/drm/radeon/r600_cp.c                   |    4 +-
6208  drivers/gpu/drm/radeon/r600_cs.c                   |    7 +-
6209  drivers/gpu/drm/radeon/r600_dma.c                  |   13 +-
6210  drivers/gpu/drm/radeon/r600_dpm.c                  |   20 +-
6211  drivers/gpu/drm/radeon/r600_dpm.h                  |    2 -
6212  drivers/gpu/drm/radeon/r600_hdmi.c                 |    2 +-
6213  drivers/gpu/drm/radeon/r600d.h                     |    7 +
6214  drivers/gpu/drm/radeon/radeon.h                    |   17 +-
6215  drivers/gpu/drm/radeon/radeon_asic.c               |   85 +-
6216  drivers/gpu/drm/radeon/radeon_asic.h               |   64 +-
6217  drivers/gpu/drm/radeon/radeon_atombios.c           |   17 -
6218  drivers/gpu/drm/radeon/radeon_combios.c            |   16 -
6219  drivers/gpu/drm/radeon/radeon_connectors.c         |    9 -
6220  drivers/gpu/drm/radeon/radeon_cp.c                 |    6 +-
6221  drivers/gpu/drm/radeon/radeon_cs.c                 |   10 +-
6222  drivers/gpu/drm/radeon/radeon_device.c             |   23 +-
6223  drivers/gpu/drm/radeon/radeon_display.c            |   17 +-
6224  drivers/gpu/drm/radeon/radeon_drv.c                |    6 +-
6225  drivers/gpu/drm/radeon/radeon_drv.h                |    2 +-
6226  drivers/gpu/drm/radeon/radeon_fence.c              |    2 +
6227  drivers/gpu/drm/radeon/radeon_gem.c                |    2 +-
6228  drivers/gpu/drm/radeon/radeon_i2c.c                |    3 +
6229  drivers/gpu/drm/radeon/radeon_irq.c                |   10 +-
6230  drivers/gpu/drm/radeon/radeon_irq_kms.c            |    4 +-
6231  drivers/gpu/drm/radeon/radeon_kms.c                |   15 +-
6232  drivers/gpu/drm/radeon/radeon_mem.c                |    2 +-
6233  drivers/gpu/drm/radeon/radeon_mode.h               |   34 +
6234  drivers/gpu/drm/radeon/radeon_object.c             |    2 +-
6235  drivers/gpu/drm/radeon/radeon_pm.c                 |  146 +--
6236  drivers/gpu/drm/radeon/radeon_ring.c               |   94 +-
6237  drivers/gpu/drm/radeon/radeon_sa.c                 |    6 +-
6238  drivers/gpu/drm/radeon/radeon_state.c              |   18 +-
6239  drivers/gpu/drm/radeon/radeon_ttm.c                |  197 +++-
6240  drivers/gpu/drm/radeon/rs400.c                     |    7 +
6241  drivers/gpu/drm/radeon/rs600.c                     |    7 +
6242  drivers/gpu/drm/radeon/rs690.c                     |    7 +
6243  drivers/gpu/drm/radeon/rs780_dpm.c                 |    8 -
6244  drivers/gpu/drm/radeon/rv515.c                     |    7 +
6245  drivers/gpu/drm/radeon/rv6xx_dpm.c                 |   10 -
6246  drivers/gpu/drm/radeon/rv770.c                     |   55 +-
6247  drivers/gpu/drm/radeon/rv770_dpm.c                 |   15 +-
6248  drivers/gpu/drm/radeon/rv770_dpm.h                 |    4 -
6249  drivers/gpu/drm/radeon/rv770d.h                    |    7 +
6250  drivers/gpu/drm/radeon/si.c                        |  152 ++-
6251  drivers/gpu/drm/radeon/si_dpm.c                    |   60 +-
6252  drivers/gpu/drm/radeon/si_smc.c                    |    1 +
6253  drivers/gpu/drm/radeon/sid.h                       |    7 +
6254  drivers/gpu/drm/radeon/sislands_smc.h              |    2 -
6255  drivers/gpu/drm/radeon/sumo_dpm.c                  |   21 +-
6256  drivers/gpu/drm/radeon/sumo_smc.c                  |    1 -
6257  drivers/gpu/drm/radeon/trinity_dpm.c               |   21 +-
6258  drivers/gpu/drm/radeon/trinity_smc.c               |    3 -
6259  drivers/gpu/drm/rcar-du/rcar_du_crtc.c             |    3 +-
6260  drivers/gpu/drm/rcar-du/rcar_du_drv.c              |   28 +-
6261  drivers/gpu/drm/rcar-du/rcar_du_drv.h              |   14 +-
6262  drivers/gpu/drm/rcar-du/rcar_du_kms.c              |    4 +-
6263  drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c          |   28 +-
6264  drivers/gpu/drm/rcar-du/rcar_du_plane.c            |   21 +-
6265  drivers/gpu/drm/savage/savage_bci.c                |   10 +-
6266  drivers/gpu/drm/savage/savage_state.c              |    8 +-
6267  drivers/gpu/drm/shmobile/shmob_drm_crtc.c          |   18 +-
6268  drivers/gpu/drm/shmobile/shmob_drm_drv.c           |    4 +-
6269  drivers/gpu/drm/sis/sis_drv.c                      |    2 +-
6270  drivers/gpu/drm/sis/sis_mm.c                       |    2 +-
6271  drivers/gpu/drm/tegra/Kconfig                      |   24 +-
6272  drivers/gpu/drm/tegra/Makefile                     |    2 +
6273  drivers/gpu/drm/tegra/bus.c                        |    1 -
6274  drivers/gpu/drm/tegra/dc.c                         |   66 +-
6275  drivers/gpu/drm/tegra/dc.h                         |    9 +
6276  drivers/gpu/drm/tegra/drm.c                        |   21 +-
6277  drivers/gpu/drm/tegra/drm.h                        |   12 +
6278  drivers/gpu/drm/tegra/dsi.c                        |  971 ++++++++++++++++++
6279  drivers/gpu/drm/tegra/dsi.h                        |  134 +++
6280  drivers/gpu/drm/tegra/fb.c                         |   45 +-
6281  drivers/gpu/drm/tegra/gem.c                        |  183 +++-
6282  drivers/gpu/drm/tegra/gem.h                        |    9 +-
6283  drivers/gpu/drm/tegra/hdmi.c                       |   60 +-
6284  drivers/gpu/drm/tegra/mipi-phy.c                   |  138 +++
6285  drivers/gpu/drm/tegra/mipi-phy.h                   |   65 ++
6286  drivers/gpu/drm/tegra/output.c                     |   44 +-
6287  drivers/gpu/drm/tegra/rgb.c                        |   45 +
6288  drivers/gpu/drm/tilcdc/tilcdc_drv.c                |    6 +-
6289  drivers/gpu/drm/ttm/ttm_bo.c                       |    2 +-
6290  drivers/gpu/drm/ttm/ttm_bo_util.c                  |    6 +-
6291  drivers/gpu/drm/ttm/ttm_bo_vm.c                    |   32 +-
6292  drivers/gpu/drm/ttm/ttm_lock.c                     |    8 -
6293  drivers/gpu/drm/ttm/ttm_object.c                   |   90 +-
6294  drivers/gpu/drm/ttm/ttm_tt.c                       |   27 +-
6295  drivers/gpu/drm/udl/udl_fb.c                       |   12 +-
6296  drivers/gpu/drm/via/via_dma.c                      |   12 +-
6297  drivers/gpu/drm/via/via_dmablit.c                  |   20 +-
6298  drivers/gpu/drm/via/via_drv.c                      |    2 +-
6299  drivers/gpu/drm/via/via_drv.h                      |    2 +-
6300  drivers/gpu/drm/via/via_irq.c                      |   10 +-
6301  drivers/gpu/drm/via/via_video.c                    |    8 +-
6302  drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c             |    8 +-
6303  drivers/gpu/drm/vmwgfx/vmwgfx_drv.h                |    2 +-
6304  drivers/gpu/drm/vmwgfx/vmwgfx_fence.c              |    9 +-
6305  drivers/gpu/drm/vmwgfx/vmwgfx_irq.c                |    2 +-
6306  drivers/gpu/drm/vmwgfx/vmwgfx_kms.c                |   30 +-
6307  drivers/gpu/drm/vmwgfx/vmwgfx_surface.c            |    3 +-
6308  drivers/gpu/host1x/Kconfig                         |    2 +-
6309  drivers/gpu/host1x/Makefile                        |    4 +-
6310  drivers/gpu/host1x/bus.c                           |    2 +
6311  drivers/gpu/host1x/channel.c                       |    5 +
6312  drivers/gpu/host1x/debug.c                         |   13 +-
6313  drivers/gpu/host1x/dev.c                           |   28 +-
6314  drivers/gpu/host1x/dev.h                           |    2 +
6315  drivers/gpu/host1x/hw/host1x02.c                   |    4 +-
6316  drivers/gpu/host1x/hw/host1x02_hardware.h          |  142 +++
6317  drivers/gpu/host1x/hw/host1x04.c                   |   42 +
6318  drivers/gpu/host1x/hw/host1x04.h                   |   26 +
6319  drivers/gpu/host1x/hw/host1x04_hardware.h          |  142 +++
6320  drivers/gpu/host1x/hw/hw_host1x02_uclass.h         |    6 +
6321  drivers/gpu/host1x/hw/hw_host1x04_channel.h        |  121 +++
6322  drivers/gpu/host1x/hw/hw_host1x04_sync.h           |  243 +++++
6323  drivers/gpu/host1x/hw/hw_host1x04_uclass.h         |  181 ++++
6324  drivers/gpu/host1x/job.c                           |    6 +
6325  drivers/gpu/host1x/mipi.c                          |  275 ++++++
6326  drivers/gpu/host1x/syncpt.c                        |    9 +
6327  drivers/staging/imx-drm/imx-drm-core.c             |    4 +-
6328  drivers/video/fbmem.c                              |   31 +-
6329  include/drm/drmP.h                                 |   73 +-
6330  include/drm/drm_agpsupport.h                       |   33 +-
6331  include/drm/drm_dp_helper.h                        |   35 +-
6332  include/drm/drm_mipi_dsi.h                         |  158 +++
6333  include/drm/drm_os_linux.h                         |   37 -
6334  include/drm/drm_panel.h                            |   82 ++
6335  include/drm/ttm/ttm_bo_driver.h                    |    9 +
6336  include/drm/ttm/ttm_object.h                       |   18 +-
6337  include/linux/fb.h                                 |    4 +-
6338  include/linux/host1x.h                             |    6 +
6339  include/uapi/drm/drm.h                             |    1 -
6340  include/uapi/drm/i915_drm.h                        |   19 +
6341  344 files changed, 16561 insertions(+), 4057 deletions(-)
6342  create mode 100644 Documentation/devicetree/bindings/mipi/dsi/mipi-dsi-bus.txt
6343  create mode 100644 Documentation/devicetree/bindings/mipi/nvidia,tegra114-mipi.txt
6344  create mode 100644 Documentation/devicetree/bindings/panel/auo,b101aw03.txt
6345  create mode 100644 Documentation/devicetree/bindings/panel/chunghwa,claa101wb03.txt
6346  create mode 100644 Documentation/devicetree/bindings/panel/panasonic,vvx10f004b00.txt
6347  create mode 100644 Documentation/devicetree/bindings/panel/simple-panel.txt
6348  create mode 100644 drivers/gpu/drm/bochs/Kconfig
6349  create mode 100644 drivers/gpu/drm/bochs/Makefile
6350  create mode 100644 drivers/gpu/drm/bochs/bochs.h
6351  create mode 100644 drivers/gpu/drm/bochs/bochs_drv.c
6352  create mode 100644 drivers/gpu/drm/bochs/bochs_fbdev.c
6353  create mode 100644 drivers/gpu/drm/bochs/bochs_hw.c
6354  create mode 100644 drivers/gpu/drm/bochs/bochs_kms.c
6355  create mode 100644 drivers/gpu/drm/bochs/bochs_mm.c
6356  create mode 100644 drivers/gpu/drm/drm_mipi_dsi.c
6357  create mode 100644 drivers/gpu/drm/drm_panel.c
6358  create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_phy_8x74.c
6359  rename drivers/gpu/drm/msm/{ => mdp}/mdp4/mdp4.xml.h (94%)
6360  rename drivers/gpu/drm/msm/{ => mdp}/mdp4/mdp4_crtc.c (96%)
6361  rename drivers/gpu/drm/msm/{ => mdp}/mdp4/mdp4_dtv_encoder.c (98%)
6362  create mode 100644 drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c
6363  rename drivers/gpu/drm/msm/{ => mdp}/mdp4/mdp4_kms.c (89%)
6364  rename drivers/gpu/drm/msm/{ => mdp}/mdp4/mdp4_kms.h (79%)
6365  rename drivers/gpu/drm/msm/{ => mdp}/mdp4/mdp4_plane.c (98%)
6366  create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h
6367  create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
6368  create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c
6369  create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c
6370  create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
6371  create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h
6372  create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
6373  create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c
6374  create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.h
6375  create mode 100644 drivers/gpu/drm/msm/mdp/mdp_common.xml.h
6376  rename drivers/gpu/drm/msm/{mdp4/mdp4_format.c => mdp/mdp_format.c} (85%)
6377  create mode 100644 drivers/gpu/drm/msm/mdp/mdp_kms.c
6378  create mode 100644 drivers/gpu/drm/msm/mdp/mdp_kms.h
6379  delete mode 100644 drivers/gpu/drm/msm/mdp4/mdp4_irq.c
6380  create mode 100644 drivers/gpu/drm/msm/msm_iommu.c
6381  create mode 100644 drivers/gpu/drm/msm/msm_kms.h
6382  create mode 100644 drivers/gpu/drm/msm/msm_mmu.h
6383  create mode 100644 drivers/gpu/drm/panel/Kconfig
6384  create mode 100644 drivers/gpu/drm/panel/Makefile
6385  create mode 100644 drivers/gpu/drm/panel/panel-simple.c
6386  create mode 100644 drivers/gpu/drm/tegra/dsi.c
6387  create mode 100644 drivers/gpu/drm/tegra/dsi.h
6388  create mode 100644 drivers/gpu/drm/tegra/mipi-phy.c
6389  create mode 100644 drivers/gpu/drm/tegra/mipi-phy.h
6390  create mode 100644 drivers/gpu/host1x/hw/host1x02_hardware.h
6391  create mode 100644 drivers/gpu/host1x/hw/host1x04.c
6392  create mode 100644 drivers/gpu/host1x/hw/host1x04.h
6393  create mode 100644 drivers/gpu/host1x/hw/host1x04_hardware.h
6394  create mode 100644 drivers/gpu/host1x/hw/hw_host1x04_channel.h
6395  create mode 100644 drivers/gpu/host1x/hw/hw_host1x04_sync.h
6396  create mode 100644 drivers/gpu/host1x/hw/hw_host1x04_uclass.h
6397  create mode 100644 drivers/gpu/host1x/mipi.c
6398  create mode 100644 include/drm/drm_mipi_dsi.h
6399  create mode 100644 include/drm/drm_panel.h
6400 Merging drm-intel/for-linux-next (f1fcde49872f i915: send D1 opregion notification)
6401 $ git merge drm-intel/for-linux-next
6402 Resolved 'drivers/gpu/drm/i915/intel_pm.c' using previous resolution.
6403 Auto-merging drivers/gpu/drm/i915/intel_pm.c
6404 CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
6405 Auto-merging drivers/gpu/drm/i915/intel_drv.h
6406 Auto-merging drivers/gpu/drm/i915/intel_display.c
6407 Auto-merging drivers/gpu/drm/i915/i915_irq.c
6408 Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
6409 Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c
6410 Auto-merging drivers/gpu/drm/i915/i915_gem.c
6411 Auto-merging drivers/gpu/drm/i915/i915_drv.h
6412 Auto-merging drivers/gpu/drm/i915/i915_drv.c
6413 Auto-merging drivers/gpu/drm/i915/i915_dma.c
6414 Auto-merging drivers/gpu/drm/i915/Makefile
6415 Automatic merge failed; fix conflicts and then commit the result.
6416 $ git commit -v -a
6417 [master ad625666d3f7] Merge remote-tracking branch 'drm-intel/for-linux-next'
6418 $ git diff -M --stat --summary HEAD^..
6419  drivers/gpu/drm/i915/Makefile              |    3 +-
6420  drivers/gpu/drm/i915/i915_debugfs.c        |   80 ++-
6421  drivers/gpu/drm/i915/i915_dma.c            |    2 +-
6422  drivers/gpu/drm/i915/i915_drv.c            |   23 +-
6423  drivers/gpu/drm/i915/i915_drv.h            |   15 +-
6424  drivers/gpu/drm/i915/i915_gem.c            |   18 +-
6425  drivers/gpu/drm/i915/i915_gem_execbuffer.c |   14 +-
6426  drivers/gpu/drm/i915/i915_gem_gtt.c        |   37 +-
6427  drivers/gpu/drm/i915/i915_gem_stolen.c     |    1 +
6428  drivers/gpu/drm/i915/i915_irq.c            |   15 +-
6429  drivers/gpu/drm/i915/i915_reg.h            |   92 +--
6430  drivers/gpu/drm/i915/i915_suspend.c        |    4 +-
6431  drivers/gpu/drm/i915/intel_bios.c          |   29 +
6432  drivers/gpu/drm/i915/intel_bios.h          |   16 +
6433  drivers/gpu/drm/i915/intel_display.c       |  281 ++++++--
6434  drivers/gpu/drm/i915/intel_drv.h           |    8 +-
6435  drivers/gpu/drm/i915/intel_fbdev.c         |    2 -
6436  drivers/gpu/drm/i915/intel_overlay.c       |    2 +-
6437  drivers/gpu/drm/i915/intel_pm.c            | 1040 +++++++---------------------
6438  drivers/gpu/drm/i915/intel_ringbuffer.c    |   33 +-
6439  drivers/gpu/drm/i915/intel_sprite.c        |   50 +-
6440  include/uapi/drm/i915_drm.h                |    2 +-
6441  22 files changed, 732 insertions(+), 1035 deletions(-)
6442 Merging drm-tegra/drm/for-next (70bf6878a874 drm/panel: update EDID BLOB in panel_simple_get_modes())
6443 $ git merge drm-tegra/drm/for-next
6444 Auto-merging drivers/gpu/drm/i915/intel_display.c
6445 Auto-merging drivers/gpu/drm/drm_crtc.c
6446 Merge made by the 'recursive' strategy.
6447  .../bindings/panel/chunghwa,claa101wa01a.txt       |  7 +++
6448  .../bindings/panel/samsung,ltn101nt05.txt          |  7 +++
6449  drivers/gpu/drm/drm_crtc.c                         | 23 ++++++++++
6450  drivers/gpu/drm/drm_crtc_helper.c                  | 29 ------------
6451  drivers/gpu/drm/i915/intel_display.c               | 26 +----------
6452  drivers/gpu/drm/panel/panel-simple.c               | 51 ++++++++++++++++++++++
6453  drivers/gpu/drm/tegra/hdmi.c                       |  3 --
6454  drivers/gpu/drm/tegra/output.c                     |  7 ++-
6455  drivers/gpu/drm/tegra/rgb.c                        |  2 +-
6456  drivers/gpu/host1x/hw/intr_hw.c                    |  1 -
6457  include/drm/drm_crtc.h                             | 26 +++++++++++
6458  11 files changed, 122 insertions(+), 60 deletions(-)
6459  create mode 100644 Documentation/devicetree/bindings/panel/chunghwa,claa101wa01a.txt
6460  create mode 100644 Documentation/devicetree/bindings/panel/samsung,ltn101nt05.txt
6461 Merging sound/for-next (cdef2e5f358d sound: oss: remove last sleep_on users)
6462 $ git merge sound/for-next
6463 Resolved 'sound/soc/fsl/fsl_ssi.c' using previous resolution.
6464 Auto-merging sound/soc/tegra/tegra_pcm.c
6465 Auto-merging sound/soc/tegra/tegra20_ac97.c
6466 Auto-merging sound/soc/tegra/Kconfig
6467 Removing sound/soc/jz4740/jz4740-pcm.h
6468 Removing sound/soc/jz4740/jz4740-pcm.c
6469 Auto-merging sound/soc/fsl/fsl_ssi.c
6470 CONFLICT (content): Merge conflict in sound/soc/fsl/fsl_ssi.c
6471 Removing sound/pci/cs46xx/imgs/cwcsnoop.h
6472 Removing sound/pci/cs46xx/imgs/cwcdma.h
6473 Removing sound/pci/cs46xx/imgs/cwcdma.asp
6474 Removing sound/pci/cs46xx/imgs/cwcbinhack.h
6475 Removing sound/pci/cs46xx/imgs/cwcasync.h
6476 Removing sound/pci/cs46xx/imgs/cwc4630.h
6477 Removing sound/pci/cs46xx/cs46xx_image.h
6478 Auto-merging include/sound/rcar_snd.h
6479 Automatic merge failed; fix conflicts and then commit the result.
6480 $ git commit -v -a
6481 [master adcd78b5bab2] Merge remote-tracking branch 'sound/for-next'
6482 $ git diff -M --stat --summary HEAD^..
6483  .../devicetree/bindings/sound/adi,axi-i2s.txt      |   31 +
6484  .../devicetree/bindings/sound/adi,axi-spdif-tx.txt |   30 +
6485  .../devicetree/bindings/sound/bcm2835-i2s.txt      |   25 +
6486  .../devicetree/bindings/sound/cs42l52.txt          |   46 +
6487  .../bindings/sound/davinci-mcasp-audio.txt         |    6 +-
6488  .../devicetree/bindings/sound/fsl-sai.txt          |   40 +
6489  Documentation/devicetree/bindings/sound/hdmi.txt   |   17 +
6490  .../devicetree/bindings/sound/max98090.txt         |   43 +
6491  .../bindings/sound/nvidia,tegra-audio-max98090.txt |   51 +
6492  .../devicetree/bindings/sound/simple-card.txt      |   77 +
6493  drivers/mfd/twl6040.c                              |   92 +-
6494  drivers/mfd/wm5110-tables.c                        |  139 +-
6495  include/linux/mfd/arizona/registers.h              |  162 +
6496  include/linux/platform_data/asoc-ti-mcbsp.h        |    6 +-
6497  include/linux/platform_data/davinci_asp.h          |    1 +
6498  include/sound/cs42l52.h                            |   14 +-
6499  include/sound/hda_verbs.h                          |  554 ++++
6500  include/sound/memalloc.h                           |    7 -
6501  include/sound/pcm.h                                |    1 -
6502  include/sound/pcm_params.h                         |   12 +
6503  include/sound/rcar_snd.h                           |    3 +-
6504  include/sound/soc-dai.h                            |    6 +
6505  include/sound/soc.h                                |   17 +-
6506  include/sound/spear_dma.h                          |    1 -
6507  include/uapi/sound/compress_params.h               |   10 +-
6508  sound/arm/aaci.c                                   |   23 +-
6509  sound/atmel/abdac.c                                |    2 +-
6510  sound/core/Makefile                                |   10 +-
6511  sound/core/compress_offload.c                      |    3 -
6512  sound/core/memalloc.c                              |  309 +-
6513  sound/core/pcm_memory.c                            |   24 +-
6514  sound/oss/dmabuf.c                                 |   14 +-
6515  sound/oss/dmasound/dmasound.h                      |    1 -
6516  sound/oss/dmasound/dmasound_core.c                 |   28 +-
6517  sound/oss/midibuf.c                                |   18 +-
6518  sound/oss/msnd_pinnacle.c                          |   31 +-
6519  sound/oss/sequencer.c                              |   16 +-
6520  sound/oss/sleep.h                                  |   18 +
6521  sound/oss/swarm_cs4297a.c                          |   14 +-
6522  sound/oss/vwsnd.c                                  |   14 +-
6523  sound/pci/Kconfig                                  |   13 +
6524  sound/pci/cs46xx/cs46xx.h                          |    5 +
6525  sound/pci/cs46xx/cs46xx_image.h                    | 3468 --------------------
6526  sound/pci/cs46xx/cs46xx_lib.c                      |  265 +-
6527  sound/pci/cs46xx/imgs/cwc4630.h                    |  320 --
6528  sound/pci/cs46xx/imgs/cwcasync.h                   |  176 -
6529  sound/pci/cs46xx/imgs/cwcbinhack.h                 |   48 -
6530  sound/pci/cs46xx/imgs/cwcdma.asp                   |  170 -
6531  sound/pci/cs46xx/imgs/cwcdma.h                     |   68 -
6532  sound/pci/cs46xx/imgs/cwcsnoop.h                   |   46 -
6533  sound/pci/cs5535audio/cs5535audio.c                |    2 +-
6534  sound/pci/ctxfi/ctatc.c                            |    5 +
6535  sound/pci/es1968.c                                 |   28 +-
6536  sound/pci/hda/Kconfig                              |  129 +-
6537  sound/pci/hda/Makefile                             |   49 +-
6538  sound/pci/hda/hda_auto_parser.c                    |   18 +-
6539  sound/pci/hda/hda_beep.c                           |   10 +-
6540  sound/pci/hda/hda_codec.c                          |  411 ++-
6541  sound/pci/hda/hda_codec.h                          |  566 +---
6542  sound/pci/hda/hda_generic.c                        |   99 +-
6543  sound/pci/hda/hda_generic.h                        |    3 +
6544  sound/pci/hda/hda_hwdep.c                          |   62 +-
6545  sound/pci/hda/hda_intel.c                          |   56 +-
6546  sound/pci/hda/hda_jack.c                           |   30 +-
6547  sound/pci/hda/hda_local.h                          |    8 +-
6548  sound/pci/hda/patch_analog.c                       |   23 +-
6549  sound/pci/hda/patch_conexant.c                     |  100 +-
6550  sound/pci/hda/patch_hdmi.c                         |   51 +-
6551  sound/pci/hda/patch_realtek.c                      |  246 +-
6552  sound/pci/hda/patch_sigmatel.c                     |   36 +-
6553  sound/pci/hda/patch_via.c                          |    1 +
6554  sound/pci/hda/thinkpad_helper.c                    |   99 +
6555  sound/pci/rme9652/hdsp.c                           |   10 +-
6556  sound/pci/rme9652/rme9652.c                        |   12 +-
6557  sound/soc/Kconfig                                  |    4 +-
6558  sound/soc/Makefile                                 |    4 +-
6559  sound/soc/adi/Kconfig                              |   21 +
6560  sound/soc/adi/Makefile                             |    5 +
6561  sound/soc/adi/axi-i2s.c                            |  277 ++
6562  sound/soc/adi/axi-spdif.c                          |  272 ++
6563  sound/soc/atmel/sam9x5_wm8731.c                    |    2 -
6564  sound/soc/au1x/dbdma2.c                            |    9 -
6565  sound/soc/au1x/dma.c                               |   14 -
6566  sound/soc/bcm/Kconfig                              |   10 +
6567  sound/soc/bcm/Makefile                             |    5 +
6568  sound/soc/bcm/bcm2835-i2s.c                        |  879 +++++
6569  sound/soc/blackfin/bf5xx-ac97-pcm.c                |    1 -
6570  sound/soc/blackfin/bf5xx-i2s-pcm.c                 |    3 -
6571  sound/soc/cirrus/edb93xx.c                         |    2 +-
6572  sound/soc/cirrus/ep93xx-ac97.c                     |   20 +-
6573  sound/soc/cirrus/ep93xx-i2s.c                      |   22 +-
6574  sound/soc/cirrus/ep93xx-pcm.c                      |   48 +-
6575  sound/soc/cirrus/ep93xx-pcm.h                      |   22 +
6576  sound/soc/cirrus/simone.c                          |    2 +-
6577  sound/soc/cirrus/snappercl15.c                     |    2 +-
6578  sound/soc/codecs/Kconfig                           |    2 +
6579  sound/soc/codecs/ad1836.c                          |    2 +
6580  sound/soc/codecs/ad193x.c                          |    6 +-
6581  sound/soc/codecs/adav80x.c                         |    6 +-
6582  sound/soc/codecs/ak4641.c                          |   38 +-
6583  sound/soc/codecs/ak4642.c                          |  138 +-
6584  sound/soc/codecs/arizona.c                         |  204 +-
6585  sound/soc/codecs/arizona.h                         |    5 +-
6586  sound/soc/codecs/cs4271.c                          |    8 +-
6587  sound/soc/codecs/cs42l52.c                         |  105 +-
6588  sound/soc/codecs/da7210.c                          |    6 +-
6589  sound/soc/codecs/hdmi.c                            |   12 +-
6590  sound/soc/codecs/sgtl5000.c                        |   76 +-
6591  sound/soc/codecs/ssm2518.c                         |    8 +-
6592  sound/soc/codecs/ssm2602.c                         |   56 +-
6593  sound/soc/codecs/tlv320aic3x.c                     |  126 +-
6594  sound/soc/codecs/twl6040.c                         |  227 +-
6595  sound/soc/codecs/uda1380.c                         |    6 +-
6596  sound/soc/codecs/wm5102.c                          |    4 +-
6597  sound/soc/codecs/wm5110.c                          |  379 ++-
6598  sound/soc/codecs/wm8510.c                          |    6 +-
6599  sound/soc/codecs/wm8523.c                          |    6 +-
6600  sound/soc/codecs/wm8580.c                          |    6 +-
6601  sound/soc/codecs/wm8711.c                          |    6 +-
6602  sound/soc/codecs/wm8728.c                          |    6 +-
6603  sound/soc/codecs/wm8731.c                          |    6 +-
6604  sound/soc/codecs/wm8741.c                          |    6 +-
6605  sound/soc/codecs/wm8750.c                          |    6 +-
6606  sound/soc/codecs/wm8753.c                          |    6 +-
6607  sound/soc/codecs/wm8776.c                          |    6 +-
6608  sound/soc/codecs/wm8804.c                          |    6 +-
6609  sound/soc/codecs/wm8900.c                          |    6 +-
6610  sound/soc/codecs/wm8940.c                          |  221 +-
6611  sound/soc/codecs/wm8962.c                          |    4 +-
6612  sound/soc/codecs/wm8974.c                          |   54 +-
6613  sound/soc/codecs/wm8985.c                          |    6 +-
6614  sound/soc/codecs/wm8988.c                          |    6 +-
6615  sound/soc/codecs/wm8990.c                          |  258 +-
6616  sound/soc/codecs/wm8990.h                          |    9 -
6617  sound/soc/codecs/wm8991.c                          |  293 +-
6618  sound/soc/codecs/wm8991.h                          |    9 -
6619  sound/soc/codecs/wm8994.c                          |   11 +-
6620  sound/soc/codecs/wm8995.c                          |    6 +-
6621  sound/soc/codecs/wm8997.c                          |    4 +-
6622  sound/soc/codecs/wm9081.c                          |    2 +-
6623  sound/soc/codecs/wm_adsp.c                         |   20 +-
6624  sound/soc/davinci/Kconfig                          |   29 +-
6625  sound/soc/davinci/Makefile                         |    8 +-
6626  sound/soc/davinci/davinci-evm.c                    |   48 +-
6627  sound/soc/davinci/davinci-mcasp.c                  | 1016 +++---
6628  sound/soc/davinci/davinci-mcasp.h                  |  304 +-
6629  sound/soc/davinci/davinci-pcm.c                    |   28 -
6630  sound/soc/fsl/Kconfig                              |    5 +-
6631  sound/soc/fsl/Makefile                             |    4 +-
6632  sound/soc/fsl/fsl_dma.c                            |    2 +-
6633  sound/soc/fsl/fsl_sai.c                            |  460 +++
6634  sound/soc/fsl/fsl_sai.h                            |  114 +
6635  sound/soc/fsl/fsl_spdif.c                          |    8 -
6636  sound/soc/fsl/fsl_ssi.c                            |  435 ++-
6637  sound/soc/fsl/fsl_ssi.h                            |    2 +
6638  sound/soc/fsl/imx-pcm-dma.c                        |    9 +-
6639  sound/soc/fsl/imx-pcm.h                            |    5 -
6640  sound/soc/fsl/imx-spdif.c                          |   85 +-
6641  sound/soc/fsl/imx-ssi.c                            |   12 +-
6642  sound/soc/fsl/imx-ssi.h                            |    1 -
6643  sound/soc/generic/simple-card.c                    |  193 +-
6644  sound/soc/{mid-x86 => intel}/Kconfig               |    0
6645  sound/soc/{mid-x86 => intel}/Makefile              |    0
6646  sound/soc/{mid-x86 => intel}/mfld_machine.c        |    0
6647  sound/soc/{mid-x86 => intel}/sst_dsp.h             |    0
6648  sound/soc/{mid-x86 => intel}/sst_platform.c        |    0
6649  sound/soc/{mid-x86 => intel}/sst_platform.h        |    0
6650  sound/soc/jz4740/Kconfig                           |    1 +
6651  sound/soc/jz4740/jz4740-i2s.c                      |  135 +-
6652  sound/soc/jz4740/jz4740-pcm.c                      |  358 --
6653  sound/soc/jz4740/jz4740-pcm.h                      |   20 -
6654  sound/soc/jz4740/qi_lb60.c                         |    2 +-
6655  sound/soc/mxs/mxs-pcm.c                            |    8 +-
6656  sound/soc/mxs/mxs-pcm.h                            |    1 -
6657  sound/soc/mxs/mxs-saif.c                           |   18 +-
6658  sound/soc/omap/mcbsp.c                             |   12 +-
6659  sound/soc/omap/omap-dmic.c                         |    4 +-
6660  sound/soc/omap/omap-mcpdm.c                        |    4 +-
6661  sound/soc/omap/omap-pcm.c                          |    2 -
6662  sound/soc/pxa/Kconfig                              |    2 +-
6663  sound/soc/pxa/mmp-pcm.c                            |   24 +-
6664  sound/soc/s6000/s6000-pcm.c                        |    7 -
6665  sound/soc/samsung/Kconfig                          |   13 +-
6666  sound/soc/samsung/Makefile                         |    6 +-
6667  sound/soc/samsung/ac97.c                           |   51 +-
6668  sound/soc/samsung/dma.c                            |   14 +-
6669  sound/soc/samsung/dma.h                            |    6 +
6670  sound/soc/samsung/dmaengine.c                      |   84 +
6671  sound/soc/samsung/i2s.c                            |    9 +-
6672  sound/soc/samsung/idma.c                           |    8 -
6673  sound/soc/samsung/pcm.c                            |   18 +-
6674  sound/soc/samsung/regs-ac97.h                      |    9 +-
6675  sound/soc/samsung/regs-iis.h                       |    9 +-
6676  sound/soc/sh/fsi.c                                 |   36 +-
6677  sound/soc/sh/rcar/adg.c                            |  151 +-
6678  sound/soc/sh/rcar/gen.c                            |  256 +-
6679  sound/soc/sh/rcar/rsnd.h                           |   46 +-
6680  sound/soc/sh/rcar/scu.c                            |  181 +-
6681  sound/soc/sh/rcar/ssi.c                            |   19 +-
6682  sound/soc/soc-core.c                               |   10 +-
6683  sound/soc/soc-dapm.c                               |   28 +-
6684  sound/soc/soc-generic-dmaengine-pcm.c              |    4 +-
6685  sound/soc/soc-io.c                                 |    4 +-
6686  sound/soc/soc-pcm.c                                |  156 +-
6687  sound/soc/soc-utils.c                              |    4 -
6688  sound/soc/spear/spdif_in.c                         |   17 +-
6689  sound/soc/spear/spdif_out.c                        |   18 +-
6690  sound/soc/spear/spear_pcm.c                        |   42 +-
6691  sound/soc/spear/spear_pcm.h                        |   24 +
6692  sound/soc/tegra/Kconfig                            |   10 +
6693  sound/soc/tegra/Makefile                           |    2 +
6694  sound/soc/tegra/tegra20_ac97.c                     |    6 +-
6695  sound/soc/tegra/tegra_max98090.c                   |  275 ++
6696  sound/soc/tegra/tegra_pcm.c                        |    3 -
6697  sound/soc/tegra/tegra_wm9712.c                     |    1 -
6698  sound/soc/txx9/txx9aclc.c                          |    5 -
6699  sound/spi/at73c213.c                               |    2 +-
6700  sound/usb/format.c                                 |    6 +-
6701  sound/usb/mixer_maps.c                             |   10 +
6702  sound/usb/quirks-table.h                           |  176 +-
6703  sound/usb/quirks.c                                 |   23 +-
6704  221 files changed, 8647 insertions(+), 9023 deletions(-)
6705  create mode 100644 Documentation/devicetree/bindings/sound/adi,axi-i2s.txt
6706  create mode 100644 Documentation/devicetree/bindings/sound/adi,axi-spdif-tx.txt
6707  create mode 100644 Documentation/devicetree/bindings/sound/bcm2835-i2s.txt
6708  create mode 100644 Documentation/devicetree/bindings/sound/cs42l52.txt
6709  create mode 100644 Documentation/devicetree/bindings/sound/fsl-sai.txt
6710  create mode 100644 Documentation/devicetree/bindings/sound/hdmi.txt
6711  create mode 100644 Documentation/devicetree/bindings/sound/max98090.txt
6712  create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt
6713  create mode 100644 Documentation/devicetree/bindings/sound/simple-card.txt
6714  create mode 100644 include/sound/hda_verbs.h
6715  create mode 100644 sound/oss/sleep.h
6716  delete mode 100644 sound/pci/cs46xx/cs46xx_image.h
6717  delete mode 100644 sound/pci/cs46xx/imgs/cwc4630.h
6718  delete mode 100644 sound/pci/cs46xx/imgs/cwcasync.h
6719  delete mode 100644 sound/pci/cs46xx/imgs/cwcbinhack.h
6720  delete mode 100644 sound/pci/cs46xx/imgs/cwcdma.asp
6721  delete mode 100644 sound/pci/cs46xx/imgs/cwcdma.h
6722  delete mode 100644 sound/pci/cs46xx/imgs/cwcsnoop.h
6723  create mode 100644 sound/pci/hda/thinkpad_helper.c
6724  create mode 100644 sound/soc/adi/Kconfig
6725  create mode 100644 sound/soc/adi/Makefile
6726  create mode 100644 sound/soc/adi/axi-i2s.c
6727  create mode 100644 sound/soc/adi/axi-spdif.c
6728  create mode 100644 sound/soc/bcm/Kconfig
6729  create mode 100644 sound/soc/bcm/Makefile
6730  create mode 100644 sound/soc/bcm/bcm2835-i2s.c
6731  create mode 100644 sound/soc/cirrus/ep93xx-pcm.h
6732  create mode 100644 sound/soc/fsl/fsl_sai.c
6733  create mode 100644 sound/soc/fsl/fsl_sai.h
6734  rename sound/soc/{mid-x86 => intel}/Kconfig (100%)
6735  rename sound/soc/{mid-x86 => intel}/Makefile (100%)
6736  rename sound/soc/{mid-x86 => intel}/mfld_machine.c (100%)
6737  rename sound/soc/{mid-x86 => intel}/sst_dsp.h (100%)
6738  rename sound/soc/{mid-x86 => intel}/sst_platform.c (100%)
6739  rename sound/soc/{mid-x86 => intel}/sst_platform.h (100%)
6740  delete mode 100644 sound/soc/jz4740/jz4740-pcm.c
6741  delete mode 100644 sound/soc/jz4740/jz4740-pcm.h
6742  create mode 100644 sound/soc/samsung/dmaengine.c
6743  create mode 100644 sound/soc/spear/spear_pcm.h
6744  create mode 100644 sound/soc/tegra/tegra_max98090.c
6745 Merging sound-asoc/for-next (c66acefdf4c5 Merge remote-tracking branches 'asoc/topic/ad1836', 'asoc/topic/ad193x', 'asoc/topic/adav80x', 'asoc/topic/adsp', 'asoc/topic/ak4641', 'asoc/topic/ak4642', 'asoc/topic/arizona', 'asoc/topic/atmel', 'asoc/topic/au1x', 'asoc/topic/bcm2835', 'asoc/topic/blackfin', 'asoc/topic/cs4271', 'asoc/topic/cs42l52', 'asoc/topic/da7210', 'asoc/topic/davinci', 'asoc/topic/docs', 'asoc/topic/ep93xx', 'asoc/topic/fsl', 'asoc/topic/fsl-mxs', 'asoc/topic/generic', 'asoc/topic/hdmi', 'asoc/topic/jack', 'asoc/topic/jz4740', 'asoc/topic/kirkwood', 'asoc/topic/max98090', 'asoc/topic/mc13783', 'asoc/topic/mxs', 'asoc/topic/nuc900', 'asoc/topic/omap', 'asoc/topic/pxa', 'asoc/topic/rcar', 'asoc/topic/s6000', 'asoc/topic/sai', 'asoc/topic/sgtl5000', 'asoc/topic/sh', 'asoc/topic/spear', 'asoc/topic/ssm2518', 'asoc/topic/ssm2602', 'asoc/topic/tegra', 'asoc/topic/tlv320aic3x', 'asoc/topic/twl4030', 'asoc/topic/twl6040', 'asoc/topic/txx9', 'asoc/topic/uda1380', 'asoc/topic/ux500', 'asoc/topic/width', 'asoc/topic/wm8510', 'asoc/topic/wm8523', 'asoc/topic/wm8580', 'asoc/topic/wm8711', 'asoc/topic/wm8728', 'asoc/topic/wm8731', 'asoc/topic/wm8741', 'asoc/topic/wm8750', 'asoc/topic/wm8753', 'asoc/topic/wm8776', 'asoc/topic/wm8804', 'asoc/topic/wm8900', 'asoc/topic/wm8901', 'asoc/topic/wm8940', 'asoc/topic/wm8962', 'asoc/topic/wm8974', 'asoc/topic/wm8985', 'asoc/topic/wm8988', 'asoc/topic/wm8990', 'asoc/topic/wm8991', 'asoc/topic/wm8994', 'asoc/topic/wm8995', 'asoc/topic/wm9081' and 'asoc/topic/x86' into asoc-next)
6746 $ git merge sound-asoc/for-next
6747 Resolved 'sound/soc/fsl/fsl_ssi.c' using previous resolution.
6748 Auto-merging sound/soc/fsl/fsl_ssi.c
6749 CONFLICT (content): Merge conflict in sound/soc/fsl/fsl_ssi.c
6750 Auto-merging include/sound/pcm.h
6751 Auto-merging include/linux/dmaengine.h
6752 Auto-merging drivers/mfd/twl-core.c
6753 Auto-merging drivers/dma/pl330.c
6754 Auto-merging arch/arm/mach-ux500/board-mop500-audio.c
6755 Automatic merge failed; fix conflicts and then commit the result.
6756 $ git commit -v -a
6757 [master 6fe8c0fa4e4d] Merge remote-tracking branch 'sound-asoc/for-next'
6758 $ git diff -M --stat --summary HEAD^..
6759  .../devicetree/bindings/sound/fsl,esai.txt         |  50 ++
6760  .../devicetree/bindings/sound/fsl,ssi.txt          |   7 +-
6761  .../devicetree/bindings/sound/simple-card.txt      |   2 +-
6762  .../devicetree/bindings/sound/tlv320aic3x.txt      |   1 +
6763  Documentation/sound/alsa/soc/overview.txt          |  27 +-
6764  arch/arm/mach-ux500/board-mop500-audio.c           |   8 +-
6765  drivers/dma/pl330.c                                |   1 +
6766  drivers/mfd/twl-core.c                             | 190 ++++-
6767  drivers/mfd/wm5110-tables.c                        |   6 +
6768  include/linux/dmaengine.h                          |  28 +
6769  include/linux/i2c/twl.h                            |   5 +-
6770  include/linux/mfd/arizona/registers.h              |  27 +
6771  include/linux/platform_data/asoc-ux500-msp.h       |   9 +-
6772  include/sound/pcm.h                                |   2 +
6773  include/sound/soc-dai.h                            |   2 +
6774  include/sound/soc-dapm.h                           |   1 +
6775  include/sound/soc.h                                |   4 +
6776  sound/core/pcm_misc.c                              |  39 +
6777  sound/soc/adi/axi-i2s.c                            |   3 +-
6778  sound/soc/adi/axi-spdif.c                          |   3 +-
6779  sound/soc/atmel/atmel-pcm-dma.c                    |   1 -
6780  sound/soc/atmel/atmel-pcm-pdc.c                    |   1 -
6781  sound/soc/bcm/Kconfig                              |   1 -
6782  sound/soc/codecs/ad1836.c                          |  10 +-
6783  sound/soc/codecs/ad193x.c                          |  10 +-
6784  sound/soc/codecs/adau1373.c                        |  10 +-
6785  sound/soc/codecs/adau1701.c                        |  36 +-
6786  sound/soc/codecs/adav80x.c                         |  30 +-
6787  sound/soc/codecs/alc5623.c                         |  10 +-
6788  sound/soc/codecs/alc5632.c                         |   8 +-
6789  sound/soc/codecs/arizona.h                         |  17 +-
6790  sound/soc/codecs/cs42l51.c                         |  14 +-
6791  sound/soc/codecs/da7210.c                          |  10 +-
6792  sound/soc/codecs/da7213.c                          |  10 +-
6793  sound/soc/codecs/da732x.c                          |  10 +-
6794  sound/soc/codecs/da9055.c                          |  10 +-
6795  sound/soc/codecs/isabelle.c                        |   6 +-
6796  sound/soc/codecs/max98088.c                        |   6 +-
6797  sound/soc/codecs/max98090.c                        |   4 +-
6798  sound/soc/codecs/max98095.c                        |   6 +-
6799  sound/soc/codecs/max9850.c                         |   8 +-
6800  sound/soc/codecs/mc13783.c                         |  34 +-
6801  sound/soc/codecs/ssm2602.c                         |  14 +-
6802  sound/soc/codecs/tlv320aic32x4.c                   |   2 +-
6803  sound/soc/codecs/twl4030.c                         | 376 ++++------
6804  sound/soc/codecs/wm5110.c                          |   7 +
6805  sound/soc/codecs/wm_adsp.c                         | 199 +++--
6806  sound/soc/codecs/wm_adsp.h                         |  12 +-
6807  sound/soc/fsl/Kconfig                              |   3 +
6808  sound/soc/fsl/Makefile                             |   2 +
6809  sound/soc/fsl/fsl_dma.c                            |   7 -
6810  sound/soc/fsl/fsl_esai.c                           | 815 +++++++++++++++++++++
6811  sound/soc/fsl/fsl_esai.h                           | 354 +++++++++
6812  sound/soc/fsl/fsl_sai.c                            |   7 +-
6813  sound/soc/fsl/fsl_ssi.c                            | 586 ++++++++++-----
6814  sound/soc/fsl/imx-pcm-dma.c                        |   3 -
6815  sound/soc/fsl/imx-pcm-fiq.c                        |   3 -
6816  sound/soc/fsl/mpc5200_dma.c                        |   4 -
6817  sound/soc/fsl/mpc5200_psc_i2s.c                    |   3 +-
6818  sound/soc/generic/simple-card.c                    |  70 +-
6819  sound/soc/intel/sst_platform.c                     |  10 -
6820  sound/soc/intel/sst_platform.h                     |   4 -
6821  sound/soc/kirkwood/kirkwood-dma.c                  |  16 -
6822  sound/soc/mxs/mxs-pcm.c                            |   6 -
6823  sound/soc/nuc900/nuc900-pcm.c                      |   3 -
6824  sound/soc/s6000/s6000-i2s.c                        |   3 +-
6825  sound/soc/samsung/dmaengine.c                      |   1 -
6826  sound/soc/sh/dma-sh7760.c                          |  17 -
6827  sound/soc/sh/fsi.c                                 |   6 -
6828  sound/soc/sh/rcar/core.c                           |   6 -
6829  sound/soc/soc-core.c                               |   1 +
6830  sound/soc/soc-dapm.c                               |  75 +-
6831  sound/soc/soc-generic-dmaengine-pcm.c              |  66 +-
6832  sound/soc/soc-pcm.c                                |  58 +-
6833  sound/soc/soc-utils.c                              |   7 +
6834  sound/soc/ux500/mop500.c                           |   2 +
6835  sound/soc/ux500/ux500_msp_dai.c                    | 146 ++--
6836  sound/soc/ux500/ux500_msp_i2s.c                    |  56 +-
6837  sound/soc/ux500/ux500_msp_i2s.h                    |   2 +-
6838  sound/soc/ux500/ux500_pcm.c                        |  65 +-
6839  80 files changed, 2653 insertions(+), 1031 deletions(-)
6840  create mode 100644 Documentation/devicetree/bindings/sound/fsl,esai.txt
6841  create mode 100644 sound/soc/fsl/fsl_esai.c
6842  create mode 100644 sound/soc/fsl/fsl_esai.h
6843 Merging modules/modules-next (74e22fac8858 module.h: Remove unnecessary semicolon)
6844 $ git merge modules/modules-next
6845 Resolved 'Documentation/module-signing.txt' using previous resolution.
6846 Auto-merging Documentation/module-signing.txt
6847 CONFLICT (add/add): Merge conflict in Documentation/module-signing.txt
6848 Automatic merge failed; fix conflicts and then commit the result.
6849 $ git commit -v -a
6850 [master cb486fc0925f] Merge remote-tracking branch 'modules/modules-next'
6851 $ git diff -M --stat --summary HEAD^..
6852  include/linux/module.h |  2 +-
6853  kernel/params.c        | 25 +++++++++----------------
6854  2 files changed, 10 insertions(+), 17 deletions(-)
6855 Merging virtio/virtio-next (7d2dddda5c92 virtio: pci: remove unnecessary pci_set_drvdata())
6856 $ git merge virtio/virtio-next
6857 Merge made by the 'recursive' strategy.
6858  drivers/virtio/virtio_pci.c | 2 --
6859  1 file changed, 2 deletions(-)
6860 Merging input/next (c3c4d99485ea Input: hyperv-keyboard - pass through 0xE1 prefix)
6861 $ git merge input/next
6862 Auto-merging drivers/input/touchscreen/zforce_ts.c
6863 Auto-merging drivers/input/serio/ambakmi.c
6864 Auto-merging drivers/input/misc/atlas_btns.c
6865 Auto-merging drivers/input/joystick/xpad.c
6866 Auto-merging drivers/input/input.c
6867 Auto-merging arch/x86/Kconfig
6868 Auto-merging arch/powerpc/Kconfig
6869 Auto-merging arch/mips/Kconfig
6870 Auto-merging arch/ia64/Kconfig
6871 Merge made by the 'recursive' strategy.
6872  .../devicetree/bindings/input/gpio-beeper.txt      |  13 ++
6873  .../bindings/input/touchscreen/tsc2007.txt         |  41 ++++
6874  .../devicetree/bindings/input/twl4030-keypad.txt   |  27 +++
6875  .../bindings/input/twl4030-pwrbutton.txt           |  21 ++
6876  Documentation/input/gamepad.txt                    |   6 +-
6877  Documentation/input/joystick-api.txt               |  38 ++--
6878  Documentation/input/joystick.txt                   |   8 +-
6879  arch/alpha/Kconfig                                 |   1 +
6880  arch/arm/mach-footbridge/Kconfig                   |   1 +
6881  arch/arm/mach-imx/mach-cpuimx35.c                  |   2 +-
6882  arch/arm/mach-imx/mach-cpuimx51sd.c                |   2 +-
6883  arch/ia64/Kconfig                                  |   1 +
6884  arch/mips/Kconfig                                  |   1 +
6885  arch/powerpc/Kconfig                               |   1 +
6886  arch/sh/boards/Kconfig                             |   1 +
6887  arch/sh/boards/mach-ecovec24/setup.c               |   2 +-
6888  arch/sparc/Kconfig                                 |   1 +
6889  arch/unicore32/Kconfig                             |   1 +
6890  arch/x86/Kconfig                                   |   1 +
6891  drivers/input/gameport/emu10k1-gp.c                |   1 -
6892  drivers/input/gameport/fm801-gp.c                  |   1 -
6893  drivers/input/input.c                              |  76 +++++--
6894  drivers/input/joystick/a3d.c                       |   1 -
6895  drivers/input/joystick/adi.c                       |   1 -
6896  drivers/input/joystick/cobra.c                     |   1 -
6897  drivers/input/joystick/gf2k.c                      |   1 -
6898  drivers/input/joystick/grip.c                      |   1 -
6899  drivers/input/joystick/grip_mp.c                   |   1 -
6900  drivers/input/joystick/guillemot.c                 |   1 -
6901  drivers/input/joystick/iforce/iforce.h             |   1 -
6902  drivers/input/joystick/interact.c                  |   1 -
6903  drivers/input/joystick/joydump.c                   |   1 -
6904  drivers/input/joystick/magellan.c                  |   1 -
6905  drivers/input/joystick/sidewinder.c                |   1 -
6906  drivers/input/joystick/spaceball.c                 |   1 -
6907  drivers/input/joystick/spaceorb.c                  |   1 -
6908  drivers/input/joystick/stinger.c                   |   1 -
6909  drivers/input/joystick/tmdc.c                      |   1 -
6910  drivers/input/joystick/twidjoy.c                   |   1 -
6911  drivers/input/joystick/warrior.c                   |   1 -
6912  drivers/input/joystick/xpad.c                      |   1 -
6913  drivers/input/joystick/zhenhua.c                   |   1 -
6914  drivers/input/keyboard/Kconfig                     |   2 +-
6915  drivers/input/keyboard/adp5520-keys.c              |   3 +-
6916  drivers/input/keyboard/adp5588-keys.c              |  11 +-
6917  drivers/input/keyboard/adp5589-keys.c              |   9 +-
6918  drivers/input/keyboard/bf54x-keys.c                |   5 +-
6919  drivers/input/keyboard/cros_ec_keyb.c              |  15 +-
6920  drivers/input/keyboard/davinci_keyscan.c           |   2 +-
6921  drivers/input/keyboard/ep93xx_keypad.c             |   2 +-
6922  drivers/input/keyboard/goldfish_events.c           |   1 -
6923  drivers/input/keyboard/gpio_keys_polled.c          |   1 -
6924  drivers/input/keyboard/hil_kbd.c                   |   1 -
6925  drivers/input/keyboard/imx_keypad.c                |   4 +-
6926  drivers/input/keyboard/jornada680_kbd.c            |   1 -
6927  drivers/input/keyboard/jornada720_kbd.c            |   1 -
6928  drivers/input/keyboard/lkkbd.c                     |   1 -
6929  drivers/input/keyboard/lm8323.c                    |   2 +-
6930  drivers/input/keyboard/lm8333.c                    |   3 +-
6931  drivers/input/keyboard/matrix_keypad.c             |   1 -
6932  drivers/input/keyboard/max7359_keypad.c            |   3 +-
6933  drivers/input/keyboard/mcs_touchkey.c              |   3 +-
6934  drivers/input/keyboard/mpr121_touchkey.c           |   4 +-
6935  drivers/input/keyboard/newtonkbd.c                 |   1 -
6936  drivers/input/keyboard/nomadik-ske-keypad.c        |   3 +-
6937  drivers/input/keyboard/omap-keypad.c               |   3 +-
6938  drivers/input/keyboard/omap4-keypad.c              |   1 -
6939  drivers/input/keyboard/pxa27x_keypad.c             |   1 -
6940  drivers/input/keyboard/pxa930_rotary.c             |   4 +-
6941  drivers/input/keyboard/qt1070.c                    |   1 -
6942  drivers/input/keyboard/qt2160.c                    |   1 -
6943  drivers/input/keyboard/samsung-keypad.c            |  37 ++--
6944  drivers/input/keyboard/sh_keysc.c                  |   5 +-
6945  drivers/input/keyboard/spear-keyboard.c            |   1 -
6946  drivers/input/keyboard/stmpe-keypad.c              |   1 -
6947  drivers/input/keyboard/stowaway.c                  |   1 -
6948  drivers/input/keyboard/sunkbd.c                    |   1 -
6949  drivers/input/keyboard/tc3589x-keypad.c            |   1 -
6950  drivers/input/keyboard/tca6416-keypad.c            |   2 +-
6951  drivers/input/keyboard/tnetv107x-keypad.c          |   2 +-
6952  drivers/input/keyboard/twl4030_keypad.c            | 122 +++++------
6953  drivers/input/keyboard/w90p910_keypad.c            |   3 +-
6954  drivers/input/keyboard/xtkbd.c                     |   1 -
6955  drivers/input/misc/Kconfig                         |   9 +
6956  drivers/input/misc/Makefile                        |   1 +
6957  drivers/input/misc/ad714x.c                        |   5 +-
6958  drivers/input/misc/adxl34x.c                       |   3 +-
6959  drivers/input/misc/atlas_btns.c                    |   1 -
6960  drivers/input/misc/bfin_rotary.c                   |   3 +-
6961  drivers/input/misc/bma150.c                        |   3 +-
6962  drivers/input/misc/cma3000_d0x.c                   |   2 +-
6963  drivers/input/misc/cobalt_btns.c                   |   1 -
6964  drivers/input/misc/da9052_onkey.c                  |   1 -
6965  drivers/input/misc/da9055_onkey.c                  |   1 -
6966  drivers/input/misc/dm355evm_keys.c                 |   1 -
6967  drivers/input/misc/gp2ap002a00f.c                  |   2 +-
6968  drivers/input/misc/gpio-beeper.c                   | 127 ++++++++++++
6969  drivers/input/misc/gpio_tilt_polled.c              |   4 +-
6970  drivers/input/misc/keyspan_remote.c                |   1 -
6971  drivers/input/misc/kxtj9.c                         |   3 +-
6972  drivers/input/misc/max8997_haptic.c                |   1 -
6973  drivers/input/misc/mc13783-pwrbutton.c             |   1 -
6974  drivers/input/misc/mpu3050.c                       |   1 -
6975  drivers/input/misc/pcap_keys.c                     |   1 -
6976  drivers/input/misc/pcf50633-input.c                |   1 -
6977  drivers/input/misc/pcf8574_keypad.c                |   1 -
6978  drivers/input/misc/pcspkr.c                        |   1 -
6979  drivers/input/misc/pm8xxx-vibrator.c               | 107 +++-------
6980  drivers/input/misc/pmic8xxx-pwrkey.c               | 106 ++++------
6981  drivers/input/misc/powermate.c                     |   1 -
6982  drivers/input/misc/pwm-beeper.c                    |   2 +-
6983  drivers/input/misc/retu-pwrbutton.c                |   1 -
6984  drivers/input/misc/rotary_encoder.c                |   1 -
6985  drivers/input/misc/sgi_btns.c                      |   1 -
6986  drivers/input/misc/sirfsoc-onkey.c                 |   1 -
6987  drivers/input/misc/twl4030-pwrbutton.c             |  46 ++---
6988  drivers/input/misc/twl4030-vibra.c                 |   6 +-
6989  drivers/input/misc/twl6040-vibra.c                 |   8 +-
6990  drivers/input/misc/wm831x-on.c                     |   1 -
6991  drivers/input/misc/yealink.c                       |   1 -
6992  drivers/input/mouse/alps.c                         | 214 +++++++++++++++----
6993  drivers/input/mouse/alps.h                         |   7 +-
6994  drivers/input/mouse/appletouch.c                   |   1 -
6995  drivers/input/mouse/bcm5974.c                      |   1 -
6996  drivers/input/mouse/cypress_ps2.c                  |   1 -
6997  drivers/input/mouse/elantech.c                     |  45 +++-
6998  drivers/input/mouse/gpio_mouse.c                   |   3 +-
6999  drivers/input/mouse/logips2pp.c                    |   2 +-
7000  drivers/input/mouse/navpoint.c                     |   1 -
7001  drivers/input/mouse/pxa930_trkball.c               |   3 +-
7002  drivers/input/mouse/sermouse.c                     |   1 -
7003  drivers/input/mouse/synaptics_usb.c                |   1 -
7004  drivers/input/mouse/vsxxxaa.c                      |   1 -
7005  drivers/input/serio/Kconfig                        |  11 +-
7006  drivers/input/serio/altera_ps2.c                   |   1 -
7007  drivers/input/serio/ambakmi.c                      |   1 -
7008  drivers/input/serio/hyperv-keyboard.c              |   4 +-
7009  drivers/input/serio/libps2.c                       |   1 -
7010  drivers/input/serio/olpc_apsp.c                    |   1 -
7011  drivers/input/serio/pcips2.c                       |   2 -
7012  drivers/input/serio/q40kbd.c                       |   1 -
7013  drivers/input/serio/rpckbd.c                       |   1 -
7014  drivers/input/serio/serio_raw.c                    |   1 -
7015  drivers/input/serio/xilinx_ps2.c                   |   1 -
7016  drivers/input/tablet/acecad.c                      |   1 -
7017  drivers/input/tablet/aiptek.c                      |   1 -
7018  drivers/input/tablet/gtco.c                        |   1 -
7019  drivers/input/tablet/hanwang.c                     |   1 -
7020  drivers/input/tablet/kbtab.c                       |   1 -
7021  drivers/input/tablet/wacom.h                       |   1 -
7022  drivers/input/tablet/wacom_sys.c                   |  23 ++-
7023  drivers/input/tablet/wacom_wac.c                   |  93 +++++++--
7024  drivers/input/tablet/wacom_wac.h                   |   7 +
7025  drivers/input/touchscreen/88pm860x-ts.c            |   2 +-
7026  drivers/input/touchscreen/ad7877.c                 |   3 +-
7027  drivers/input/touchscreen/ad7879.c                 |   5 +-
7028  drivers/input/touchscreen/ads7846.c                |  86 +++-----
7029  drivers/input/touchscreen/atmel_mxt_ts.c           |   3 +-
7030  drivers/input/touchscreen/atmel_tsadcc.c           |   3 +-
7031  drivers/input/touchscreen/cy8ctmg110_ts.c          |   2 +-
7032  drivers/input/touchscreen/cyttsp_core.c            |   4 +-
7033  drivers/input/touchscreen/cyttsp_i2c_common.c      |   2 +
7034  drivers/input/touchscreen/da9034-ts.c              |   3 +-
7035  drivers/input/touchscreen/dynapro.c                |   1 -
7036  drivers/input/touchscreen/edt-ft5x06.c             |   2 +-
7037  drivers/input/touchscreen/eeti_ts.c                |   2 +-
7038  drivers/input/touchscreen/egalax_ts.c              |   1 -
7039  drivers/input/touchscreen/elo.c                    |   1 -
7040  drivers/input/touchscreen/fujitsu_ts.c             |   1 -
7041  drivers/input/touchscreen/gunze.c                  |   1 -
7042  drivers/input/touchscreen/hampshire.c              |   1 -
7043  drivers/input/touchscreen/ili210x.c                |   2 +-
7044  drivers/input/touchscreen/inexio.c                 |   1 -
7045  drivers/input/touchscreen/intel-mid-touch.c        |   1 -
7046  drivers/input/touchscreen/jornada720_ts.c          |   1 -
7047  drivers/input/touchscreen/lpc32xx_ts.c             |   1 -
7048  drivers/input/touchscreen/mainstone-wm97xx.c       |   1 -
7049  drivers/input/touchscreen/max11801_ts.c            |   1 -
7050  drivers/input/touchscreen/mcs5000_ts.c             |   5 +-
7051  drivers/input/touchscreen/mms114.c                 |   1 -
7052  drivers/input/touchscreen/mtouch.c                 |   1 -
7053  drivers/input/touchscreen/pcap_ts.c                |   1 -
7054  drivers/input/touchscreen/penmount.c               |   1 -
7055  drivers/input/touchscreen/pixcir_i2c_ts.c          |   3 +-
7056  drivers/input/touchscreen/s3c2410_ts.c             |   5 +-
7057  drivers/input/touchscreen/st1232.c                 |   2 +-
7058  drivers/input/touchscreen/stmpe-ts.c               |   1 -
7059  drivers/input/touchscreen/ti_am335x_tsc.c          |   1 -
7060  drivers/input/touchscreen/touchit213.c             |   1 -
7061  drivers/input/touchscreen/touchright.c             |   1 -
7062  drivers/input/touchscreen/touchwin.c               |   1 -
7063  drivers/input/touchscreen/tsc2005.c                |   2 +-
7064  drivers/input/touchscreen/tsc2007.c                | 230 ++++++++++++++-------
7065  drivers/input/touchscreen/tsc40.c                  |   1 -
7066  drivers/input/touchscreen/ucb1400_ts.c             |   9 +-
7067  drivers/input/touchscreen/usbtouchscreen.c         |   1 -
7068  drivers/input/touchscreen/wacom_w8001.c            |   1 -
7069  drivers/input/touchscreen/wm831x-ts.c              |   1 -
7070  drivers/input/touchscreen/wm97xx-core.c            |   2 +-
7071  drivers/input/touchscreen/zforce_ts.c              |   3 +-
7072  drivers/input/touchscreen/zylonite-wm97xx.c        |   1 -
7073  include/linux/i2c/tsc2007.h                        |   8 +-
7074  include/linux/platform_data/keypad-ep93xx.h        |  10 +-
7075  include/linux/platform_data/keypad-omap.h          |   6 +-
7076  204 files changed, 1137 insertions(+), 719 deletions(-)
7077  create mode 100644 Documentation/devicetree/bindings/input/gpio-beeper.txt
7078  create mode 100644 Documentation/devicetree/bindings/input/touchscreen/tsc2007.txt
7079  create mode 100644 Documentation/devicetree/bindings/input/twl4030-keypad.txt
7080  create mode 100644 Documentation/devicetree/bindings/input/twl4030-pwrbutton.txt
7081  create mode 100644 drivers/input/misc/gpio-beeper.c
7082 Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
7083 $ git merge input-mt/for-next
7084 Already up-to-date.
7085 Merging cgroup/for-next (d0cb1a84439e Merge branch 'for-3.14' into for-next)
7086 $ git merge cgroup/for-next
7087 Auto-merging net/core/netprio_cgroup.c
7088 Auto-merging mm/memcontrol.c
7089 Auto-merging kernel/sched/core.c
7090 Auto-merging init/Kconfig
7091 Auto-merging Documentation/cgroups/resource_counter.txt
7092 Merge made by the 'recursive' strategy.
7093  Documentation/cgroups/cgroups.txt          |   20 -
7094  Documentation/cgroups/memory.txt           |    4 +-
7095  Documentation/cgroups/resource_counter.txt |    4 +-
7096  block/blk-throttle.c                       |   35 +-
7097  block/cfq-iosched.c                        |  131 ++-
7098  drivers/md/bcache/request.c                |    1 -
7099  include/linux/cgroup.h                     |  112 +--
7100  include/linux/vmpressure.h                 |    8 +-
7101  init/Kconfig                               |    3 +-
7102  kernel/cgroup.c                            | 1197 +++++++++++-----------------
7103  kernel/cgroup_freezer.c                    |    7 +-
7104  kernel/cpuset.c                            |   71 +-
7105  kernel/sched/core.c                        |   13 +-
7106  kernel/sched/cpuacct.c                     |   18 +-
7107  mm/hugetlb_cgroup.c                        |   22 +-
7108  mm/memcontrol.c                            |  426 ++++++++--
7109  mm/page_cgroup.c                           |    2 +-
7110  mm/vmpressure.c                            |   26 +-
7111  net/core/netprio_cgroup.c                  |    8 +-
7112  security/device_cgroup.c                   |    7 +-
7113  20 files changed, 1019 insertions(+), 1096 deletions(-)
7114 Merging block/for-next (454e2c4cbd66 Merge branch 'for-3.14/core' into for-next)
7115 $ git merge block/for-next
7116 Resolved 'drivers/md/raid1.c' using previous resolution.
7117 Resolved 'drivers/md/raid10.c' using previous resolution.
7118 Resolved 'fs/btrfs/extent_io.c' using previous resolution.
7119 Resolved 'fs/f2fs/data.c' using previous resolution.
7120 Resolved 'fs/f2fs/segment.c' using previous resolution.
7121 Resolved 'include/trace/events/f2fs.h' using previous resolution.
7122 Auto-merging include/trace/events/f2fs.h
7123 CONFLICT (content): Merge conflict in include/trace/events/f2fs.h
7124 Auto-merging fs/xfs/xfs_buf.c
7125 Auto-merging fs/xfs/xfs_aops.c
7126 Auto-merging fs/gfs2/ops_fstype.c
7127 Auto-merging fs/gfs2/lops.c
7128 Auto-merging fs/f2fs/segment.c
7129 CONFLICT (content): Merge conflict in fs/f2fs/segment.c
7130 Auto-merging fs/f2fs/data.c
7131 CONFLICT (content): Merge conflict in fs/f2fs/data.c
7132 Auto-merging fs/btrfs/volumes.c
7133 Auto-merging fs/btrfs/scrub.c
7134 Auto-merging fs/btrfs/inode.c
7135 Auto-merging fs/btrfs/file-item.c
7136 Auto-merging fs/btrfs/extent_io.c
7137 CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
7138 Auto-merging fs/btrfs/disk-io.c
7139 Auto-merging fs/btrfs/compression.c
7140 Auto-merging fs/btrfs/check-integrity.c
7141 Auto-merging drivers/md/raid5.c
7142 Auto-merging drivers/md/raid10.c
7143 CONFLICT (content): Merge conflict in drivers/md/raid10.c
7144 Auto-merging drivers/md/raid1.c
7145 CONFLICT (content): Merge conflict in drivers/md/raid1.c
7146 Auto-merging drivers/md/md.c
7147 Auto-merging drivers/md/bcache/request.c
7148 Auto-merging block/blk-throttle.c
7149 Automatic merge failed; fix conflicts and then commit the result.
7150 $ git commit -v -a
7151 [master fd89282a9df5] Merge remote-tracking branch 'block/for-next'
7152 $ git diff -M --stat --summary HEAD^..
7153  Documentation/block/biodoc.txt              |   7 +-
7154  Documentation/block/biovecs.txt             | 111 ++++
7155  arch/m68k/emu/nfblock.c                     |  13 +-
7156  arch/powerpc/sysdev/axonram.c               |  21 +-
7157  block/blk-core.c                            |  61 +-
7158  block/blk-exec.c                            |   4 +
7159  block/blk-flush.c                           |  10 +-
7160  block/blk-integrity.c                       |  40 +-
7161  block/blk-lib.c                             |  12 +-
7162  block/blk-map.c                             |   6 +-
7163  block/blk-merge.c                           |  66 +-
7164  block/blk-mq-cpu.c                          |  31 -
7165  block/blk-mq.c                              | 169 +++---
7166  block/blk-mq.h                              |   3 +-
7167  block/blk-settings.c                        |   4 +
7168  block/blk-sysfs.c                           |   1 +
7169  block/blk-throttle.c                        |  14 +-
7170  block/elevator.c                            |   2 +-
7171  drivers/block/aoe/aoe.h                     |  10 +-
7172  drivers/block/aoe/aoecmd.c                  | 153 ++---
7173  drivers/block/brd.c                         |  16 +-
7174  drivers/block/drbd/drbd_actlog.c            |   2 +-
7175  drivers/block/drbd/drbd_bitmap.c            |   2 +-
7176  drivers/block/drbd/drbd_main.c              |  27 +-
7177  drivers/block/drbd/drbd_receiver.c          |  19 +-
7178  drivers/block/drbd/drbd_req.c               |   6 +-
7179  drivers/block/drbd/drbd_req.h               |   2 +-
7180  drivers/block/drbd/drbd_worker.c            |   8 +-
7181  drivers/block/floppy.c                      |  16 +-
7182  drivers/block/loop.c                        |  27 +-
7183  drivers/block/mtip32xx/mtip32xx.c           |  20 +-
7184  drivers/block/nbd.c                         |  14 +-
7185  drivers/block/nvme-core.c                   | 142 +----
7186  drivers/block/pktcdvd.c                     | 186 +++---
7187  drivers/block/ps3disk.c                     |  17 +-
7188  drivers/block/ps3vram.c                     |  12 +-
7189  drivers/block/rbd.c                         |  91 +--
7190  drivers/block/rsxx/dev.c                    |   6 +-
7191  drivers/block/rsxx/dma.c                    |  15 +-
7192  drivers/block/umem.c                        |  53 +-
7193  drivers/block/xen-blkback/blkback.c         |   2 +-
7194  drivers/block/xen-blkfront.c                |   2 +-
7195  drivers/cdrom/gdrom.c                       |   4 +-
7196  drivers/md/bcache/Makefile                  |   5 +-
7197  drivers/md/bcache/alloc.c                   |  89 ++-
7198  drivers/md/bcache/bcache.h                  |  84 ++-
7199  drivers/md/bcache/bset.c                    | 904 ++++++++++++++++------------
7200  drivers/md/bcache/bset.h                    | 440 +++++++++-----
7201  drivers/md/bcache/btree.c                   | 682 ++++++++-------------
7202  drivers/md/bcache/btree.h                   |  62 +-
7203  drivers/md/bcache/closure.c                 |  90 +--
7204  drivers/md/bcache/closure.h                 | 355 ++++-------
7205  drivers/md/bcache/debug.c                   | 268 +++------
7206  drivers/md/bcache/debug.h                   |  27 +-
7207  drivers/md/bcache/extents.c                 | 616 +++++++++++++++++++
7208  drivers/md/bcache/extents.h                 |  13 +
7209  drivers/md/bcache/io.c                      | 196 +-----
7210  drivers/md/bcache/journal.c                 |  87 +--
7211  drivers/md/bcache/journal.h                 |   1 +
7212  drivers/md/bcache/movinggc.c                |   6 +-
7213  drivers/md/bcache/request.c                 | 197 +++---
7214  drivers/md/bcache/request.h                 |  21 +-
7215  drivers/md/bcache/super.c                   | 123 ++--
7216  drivers/md/bcache/sysfs.c                   |  79 +--
7217  drivers/md/bcache/util.c                    |   4 +-
7218  drivers/md/bcache/util.h                    |   8 +
7219  drivers/md/bcache/writeback.c               |   6 +-
7220  drivers/md/bcache/writeback.h               |   2 +-
7221  drivers/md/dm-bio-record.h                  |  37 +-
7222  drivers/md/dm-bufio.c                       |   2 +-
7223  drivers/md/dm-cache-policy-mq.c             |   4 +-
7224  drivers/md/dm-cache-target.c                |  28 +-
7225  drivers/md/dm-crypt.c                       |  64 +-
7226  drivers/md/dm-delay.c                       |   7 +-
7227  drivers/md/dm-flakey.c                      |   7 +-
7228  drivers/md/dm-io.c                          |  37 +-
7229  drivers/md/dm-linear.c                      |   3 +-
7230  drivers/md/dm-raid1.c                       |  20 +-
7231  drivers/md/dm-region-hash.c                 |   3 +-
7232  drivers/md/dm-snap.c                        |  19 +-
7233  drivers/md/dm-stripe.c                      |  13 +-
7234  drivers/md/dm-switch.c                      |   4 +-
7235  drivers/md/dm-thin.c                        |  30 +-
7236  drivers/md/dm-verity.c                      |  62 +-
7237  drivers/md/dm.c                             | 189 +-----
7238  drivers/md/faulty.c                         |  19 +-
7239  drivers/md/linear.c                         |  96 +--
7240  drivers/md/md.c                             |  12 +-
7241  drivers/md/multipath.c                      |  13 +-
7242  drivers/md/raid0.c                          |  79 +--
7243  drivers/md/raid1.c                          |  73 +--
7244  drivers/md/raid10.c                         | 194 +++---
7245  drivers/md/raid5.c                          |  85 +--
7246  drivers/message/fusion/mptsas.c             |   8 +-
7247  drivers/s390/block/dasd_diag.c              |  10 +-
7248  drivers/s390/block/dasd_eckd.c              |  48 +-
7249  drivers/s390/block/dasd_fba.c               |  26 +-
7250  drivers/s390/block/dcssblk.c                |  21 +-
7251  drivers/s390/block/scm_blk.c                |   8 +-
7252  drivers/s390/block/scm_blk_cluster.c        |   4 +-
7253  drivers/s390/block/xpram.c                  |  19 +-
7254  drivers/scsi/libsas/sas_expander.c          |   8 +-
7255  drivers/scsi/mpt2sas/mpt2sas_transport.c    |  41 +-
7256  drivers/scsi/mpt3sas/mpt3sas_transport.c    |  39 +-
7257  drivers/scsi/osd/osd_initiator.c            |   2 +-
7258  drivers/scsi/sd.c                           |   2 +-
7259  drivers/scsi/sd_dif.c                       |  30 +-
7260  drivers/staging/lustre/lustre/llite/lloop.c |  26 +-
7261  drivers/staging/zram/zram_drv.c             |  33 +-
7262  drivers/target/target_core_iblock.c         |   2 +-
7263  fs/bio-integrity.c                          | 179 ++----
7264  fs/bio.c                                    | 502 +++++++--------
7265  fs/btrfs/check-integrity.c                  |   8 +-
7266  fs/btrfs/compression.c                      |  27 +-
7267  fs/btrfs/disk-io.c                          |  13 +-
7268  fs/btrfs/extent_io.c                        |  49 +-
7269  fs/btrfs/file-item.c                        |  19 +-
7270  fs/btrfs/inode.c                            |  37 +-
7271  fs/btrfs/raid56.c                           |  22 +-
7272  fs/btrfs/scrub.c                            |  12 +-
7273  fs/btrfs/volumes.c                          |  19 +-
7274  fs/buffer.c                                 |  14 +-
7275  fs/direct-io.c                              |   4 +-
7276  fs/ext4/page-io.c                           |   8 +-
7277  fs/f2fs/data.c                              |  31 +-
7278  fs/gfs2/lops.c                              |   2 +-
7279  fs/gfs2/ops_fstype.c                        |   2 +-
7280  fs/hfsplus/wrapper.c                        |   2 +-
7281  fs/jfs/jfs_logmgr.c                         |  12 +-
7282  fs/jfs/jfs_metapage.c                       |   9 +-
7283  fs/logfs/dev_bdev.c                         |  38 +-
7284  fs/mpage.c                                  |  19 +-
7285  fs/nfs/blocklayout/blocklayout.c            |  43 +-
7286  fs/nilfs2/segbuf.c                          |   3 +-
7287  fs/ocfs2/cluster/heartbeat.c                |   2 +-
7288  fs/xfs/xfs_aops.c                           |   2 +-
7289  fs/xfs/xfs_buf.c                            |   4 +-
7290  include/linux/bio.h                         | 283 +++++----
7291  include/linux/blk-mq.h                      |   4 +-
7292  include/linux/blk_types.h                   |  24 +-
7293  include/linux/blkdev.h                      |  10 +-
7294  include/linux/ceph/messenger.h              |   4 +-
7295  include/linux/dm-io.h                       |   4 +-
7296  include/trace/events/bcache.h               |  36 +-
7297  include/trace/events/block.h                |  26 +-
7298  include/trace/events/f2fs.h                 |   4 +-
7299  include/uapi/linux/bcache.h                 |   3 +-
7300  kernel/power/block_io.c                     |   2 +-
7301  kernel/trace/blktrace.c                     |  15 +-
7302  lib/percpu_ida.c                            |   7 +-
7303  mm/bounce.c                                 |  44 +-
7304  mm/page_io.c                                |  10 +-
7305  net/ceph/messenger.c                        |  43 +-
7306  153 files changed, 4382 insertions(+), 4438 deletions(-)
7307  create mode 100644 Documentation/block/biovecs.txt
7308  create mode 100644 drivers/md/bcache/extents.c
7309  create mode 100644 drivers/md/bcache/extents.h
7310 Merging device-mapper/for-next (2995fa78e423 dm sysfs: fix a module unload race)
7311 $ git merge device-mapper/for-next
7312 Resolved 'drivers/md/dm-thin.c' using previous resolution.
7313 Auto-merging drivers/md/dm.c
7314 Auto-merging drivers/md/dm-thin.c
7315 CONFLICT (content): Merge conflict in drivers/md/dm-thin.c
7316 Auto-merging drivers/md/dm-snap.c
7317 Auto-merging drivers/md/dm-delay.c
7318 Auto-merging drivers/md/dm-cache-target.c
7319 Auto-merging drivers/md/dm-cache-policy-mq.c
7320 Auto-merging drivers/md/dm-bufio.c
7321 Automatic merge failed; fix conflicts and then commit the result.
7322 $ git commit -v -a
7323 [master f4580a5ac044] Merge remote-tracking branch 'device-mapper/for-next'
7324 $ git diff -M --stat --summary HEAD^..
7325  Documentation/device-mapper/cache-policies.txt     |  16 +-
7326  Documentation/device-mapper/cache.txt              |  50 ++--
7327  Documentation/device-mapper/thin-provisioning.txt  |   7 +
7328  drivers/md/Kconfig                                 |  11 +-
7329  drivers/md/Makefile                                |   1 +
7330  drivers/md/dm-bufio.c                              |  36 ++-
7331  drivers/md/dm-bufio.h                              |  12 +
7332  drivers/md/dm-builtin.c                            |  48 ++++
7333  drivers/md/dm-cache-policy-mq.c                    |  67 +++--
7334  drivers/md/dm-cache-target.c                       |  16 +-
7335  drivers/md/dm-delay.c                              |  35 +--
7336  drivers/md/dm-snap-persistent.c                    |  87 +++++--
7337  drivers/md/dm-snap.c                               |  10 +-
7338  drivers/md/dm-sysfs.c                              |   5 +-
7339  drivers/md/dm-table.c                              |  22 +-
7340  drivers/md/dm-thin-metadata.c                      |  20 ++
7341  drivers/md/dm-thin-metadata.h                      |   4 +-
7342  drivers/md/dm-thin.c                               | 282 +++++++++++++--------
7343  drivers/md/dm.c                                    |  15 +-
7344  drivers/md/dm.h                                    |  17 ++
7345  drivers/md/persistent-data/dm-block-manager.c      |   2 +-
7346  drivers/md/persistent-data/dm-btree.c              |  33 ++-
7347  drivers/md/persistent-data/dm-btree.h              |   8 +
7348  drivers/md/persistent-data/dm-space-map-common.c   |   6 +-
7349  drivers/md/persistent-data/dm-space-map-metadata.c |  22 +-
7350  25 files changed, 564 insertions(+), 268 deletions(-)
7351  create mode 100644 drivers/md/dm-builtin.c
7352 Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence)
7353 $ git merge embedded/master
7354 Already up-to-date.
7355 Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3)
7356 $ git merge firmware/master
7357 Already up-to-date.
7358 Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage)
7359 $ git merge pcmcia/master
7360 Already up-to-date.
7361 Merging mmc/mmc-next (85136b74dc7f mmc: dw_mmc: fix sparse non static symbol warning)
7362 $ git merge mmc/mmc-next
7363 Resolved 'MAINTAINERS' using previous resolution.
7364 Auto-merging drivers/mmc/host/Kconfig
7365 Auto-merging MAINTAINERS
7366 CONFLICT (content): Merge conflict in MAINTAINERS
7367 Automatic merge failed; fix conflicts and then commit the result.
7368 $ git commit -v -a
7369 [master 214c3f1d6dac] Merge remote-tracking branch 'mmc/mmc-next'
7370 $ git diff -M --stat --summary HEAD^..
7371  .../devicetree/bindings/mmc/arasan,sdhci.txt       |  27 ++
7372  .../devicetree/bindings/mmc/k3-dw-mshc.txt         |  60 ++++
7373  MAINTAINERS                                        |   6 +-
7374  drivers/mmc/card/block.c                           |   7 +-
7375  drivers/mmc/core/core.c                            |   3 +-
7376  drivers/mmc/core/mmc.c                             |   8 +-
7377  drivers/mmc/core/sd.c                              |  37 ++-
7378  drivers/mmc/host/Kconfig                           |  28 +-
7379  drivers/mmc/host/Makefile                          |   3 +
7380  drivers/mmc/host/atmel-mci.c                       |  20 +-
7381  drivers/mmc/host/dw_mmc-k3.c                       | 132 +++++++++
7382  drivers/mmc/host/dw_mmc.c                          |  48 ++-
7383  drivers/mmc/host/mxs-mmc.c                         |  60 ++--
7384  drivers/mmc/host/sdhci-acpi.c                      |   2 +
7385  drivers/mmc/host/sdhci-esdhc-imx.c                 | 122 ++++++--
7386  drivers/mmc/host/sdhci-of-arasan.c                 | 224 ++++++++++++++
7387  drivers/mmc/host/sdhci-pci-o2micro.c               | 321 +++++++++++++++++++++
7388  drivers/mmc/host/sdhci-pci-o2micro.h               |  72 +++++
7389  drivers/mmc/host/sdhci-pci.c                       | 180 +++---------
7390  drivers/mmc/host/sdhci-pci.h                       |  77 +++++
7391  drivers/mmc/host/sdhci-pltfm.c                     |   6 +-
7392  drivers/mmc/host/sdhci-pltfm.h                     |   2 +
7393  drivers/mmc/host/sdhci-tegra.c                     |   1 +
7394  drivers/mmc/host/sdhci.c                           |  17 +-
7395  drivers/mmc/host/sh_mmcif.c                        | 100 +++----
7396  drivers/mmc/host/sh_mobile_sdhi.c                  |  23 +-
7397  drivers/mmc/host/tmio_mmc.c                        |   9 +
7398  drivers/mmc/host/tmio_mmc.h                        |  17 +-
7399  drivers/mmc/host/tmio_mmc_dma.c                    |   2 +-
7400  drivers/mmc/host/tmio_mmc_pio.c                    |  38 +--
7401  include/linux/mfd/tmio.h                           |   8 +
7402  include/linux/mmc/sdhci.h                          |   2 +
7403  include/linux/mmc/tmio.h                           |   1 +
7404  33 files changed, 1337 insertions(+), 326 deletions(-)
7405  create mode 100644 Documentation/devicetree/bindings/mmc/arasan,sdhci.txt
7406  create mode 100644 Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
7407  create mode 100644 drivers/mmc/host/dw_mmc-k3.c
7408  create mode 100644 drivers/mmc/host/sdhci-of-arasan.c
7409  create mode 100644 drivers/mmc/host/sdhci-pci-o2micro.c
7410  create mode 100644 drivers/mmc/host/sdhci-pci-o2micro.h
7411  create mode 100644 drivers/mmc/host/sdhci-pci.h
7412 Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command)
7413 $ git merge kgdb/kgdb-next
7414 Resolved 'kernel/debug/debug_core.h' using previous resolution.
7415 Auto-merging kernel/debug/debug_core.h
7416 CONFLICT (content): Merge conflict in kernel/debug/debug_core.h
7417 Automatic merge failed; fix conflicts and then commit the result.
7418 $ git commit -v -a
7419 [master 39d6d2c5ea4d] Merge remote-tracking branch 'kgdb/kgdb-next'
7420 $ git diff -M --stat --summary HEAD^..
7421 Merging slab/for-next (26e4f2057516 slub: Fix possible format string bug.)
7422 $ git merge slab/for-next
7423 Merge made by the 'recursive' strategy.
7424  mm/slub.c | 50 ++++++++++++++++++++++++++++----------------------
7425  1 file changed, 28 insertions(+), 22 deletions(-)
7426 Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
7427 $ git merge uclinux/for-next
7428 Already up-to-date.
7429 Merging md/for-next (830778a180f2 md: ensure metadata is writen after raid level change.)
7430 $ git merge md/for-next
7431 Auto-merging drivers/md/raid10.c
7432 Auto-merging drivers/md/md.c
7433 Merge made by the 'recursive' strategy.
7434  drivers/md/md.c                | 47 ++++++++++++++++++++++++------------------
7435  drivers/md/raid10.c            |  3 ++-
7436  include/uapi/linux/raid/md_p.h |  6 +++++-
7437  3 files changed, 34 insertions(+), 22 deletions(-)
7438 Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.linaro.org/people/ljones/mfd)
7439 $ git merge mfd/master
7440 Already up-to-date.
7441 Merging mfd-lj/for-mfd-next (d6f06deb424e mfd: wm5110: Add register patch for rev D chip)
7442 $ git merge mfd-lj/for-mfd-next
7443 Auto-merging sound/soc/fsl/Kconfig
7444 Removing include/linux/mfd/abx500/ab8500-gpio.h
7445 Auto-merging drivers/staging/nvec/nvec.c
7446 Auto-merging drivers/mfd/wm5110-tables.c
7447 Auto-merging drivers/mfd/twl-core.c
7448 Auto-merging drivers/mfd/rtsx_pcr.c
7449 Auto-merging drivers/input/touchscreen/ti_am335x_tsc.c
7450 Auto-merging drivers/input/misc/Kconfig
7451 Auto-merging drivers/gpio/Makefile
7452 Auto-merging drivers/gpio/Kconfig
7453 Auto-merging arch/arm/boot/dts/tegra20-colibri-512.dtsi
7454 Merge made by the 'recursive' strategy.
7455  .../devicetree/bindings/gpio/gpio-lp3943.txt       |  37 +++
7456  Documentation/devicetree/bindings/mfd/cros-ec.txt  |   9 +
7457  Documentation/devicetree/bindings/mfd/lp3943.txt   |  33 +++
7458  Documentation/devicetree/bindings/mfd/s2mps11.txt  |   2 +-
7459  .../devicetree/bindings/pwm/pwm-lp3943.txt         |  58 ++++
7460  arch/arm/boot/dts/tegra20-colibri-512.dtsi         |   4 +-
7461  drivers/gpio/Kconfig                               |   8 +
7462  drivers/gpio/Makefile                              |   1 +
7463  drivers/gpio/gpio-lp3943.c                         | 242 +++++++++++++++
7464  drivers/iio/adc/ti_am335x_adc.c                    |  68 +++--
7465  drivers/input/misc/Kconfig                         |   2 +-
7466  drivers/input/touchscreen/Kconfig                  |   2 +-
7467  drivers/input/touchscreen/ti_am335x_tsc.c          |   4 +-
7468  drivers/mfd/88pm800.c                              |   4 +-
7469  drivers/mfd/88pm805.c                              |   2 +-
7470  drivers/mfd/Kconfig                                |  30 +-
7471  drivers/mfd/Makefile                               |   2 +
7472  drivers/mfd/ab8500-core.c                          |  16 +-
7473  drivers/mfd/ab8500-debugfs.c                       |   5 +-
7474  drivers/mfd/arizona-core.c                         |   8 +-
7475  drivers/mfd/as3722.c                               |   5 +-
7476  drivers/mfd/asic3.c                                |   4 +-
7477  drivers/mfd/cros_ec.c                              |   2 +-
7478  drivers/mfd/cros_ec_i2c.c                          |   8 +-
7479  drivers/mfd/cros_ec_spi.c                          |  56 +++-
7480  drivers/mfd/cs5535-mfd.c                           |   2 +-
7481  drivers/mfd/da9052-core.c                          |   2 +-
7482  drivers/mfd/da9055-core.c                          |   2 +-
7483  drivers/mfd/da9063-core.c                          |   2 +-
7484  drivers/mfd/db8500-prcmu.c                         |   4 +-
7485  drivers/mfd/htc-pasic3.c                           |   2 +-
7486  drivers/mfd/intel_msic.c                           |   2 +-
7487  drivers/mfd/janz-cmodio.c                          |   2 +-
7488  drivers/mfd/jz4740-adc.c                           |   2 +-
7489  drivers/mfd/lp3943.c                               | 167 +++++++++++
7490  drivers/mfd/lp8788.c                               |   2 +-
7491  drivers/mfd/lpc_ich.c                              |   2 +-
7492  drivers/mfd/lpc_sch.c                              |   2 +-
7493  drivers/mfd/max14577.c                             | 245 +++++++++++++++
7494  drivers/mfd/max77686.c                             |   4 +-
7495  drivers/mfd/max77693.c                             |  10 +-
7496  drivers/mfd/max8907.c                              |   2 +-
7497  drivers/mfd/max8925-core.c                         |   8 +-
7498  drivers/mfd/max8997.c                              |  25 +-
7499  drivers/mfd/max8998.c                              |   4 +-
7500  drivers/mfd/mc13xxx-core.c                         |  41 ++-
7501  drivers/mfd/mc13xxx-i2c.c                          |  18 +-
7502  drivers/mfd/mc13xxx-spi.c                          |  20 +-
7503  drivers/mfd/mc13xxx.h                              |   6 +-
7504  drivers/mfd/omap-usb-host.c                        |   8 +-
7505  drivers/mfd/omap-usb-tll.c                         |  44 +--
7506  drivers/mfd/rc5t583.c                              |   2 +-
7507  drivers/mfd/rdc321x-southbridge.c                  |   4 +-
7508  drivers/mfd/retu-mfd.c                             |   6 +-
7509  drivers/mfd/rtl8411.c                              | 101 ++++---
7510  drivers/mfd/rtsx_pcr.c                             |   7 +-
7511  drivers/mfd/rtsx_pcr.h                             |   9 +
7512  drivers/mfd/sec-core.c                             |  62 +++-
7513  drivers/mfd/sec-irq.c                              |  12 +-
7514  drivers/mfd/sm501.c                                |   2 +-
7515  drivers/mfd/ssbi.c                                 |  16 +-
7516  drivers/mfd/sta2x11-mfd.c                          |   6 +-
7517  drivers/mfd/stmpe.c                                |  10 +-
7518  drivers/mfd/stmpe.h                                |   2 +-
7519  drivers/mfd/tc3589x.c                              |   4 +-
7520  drivers/mfd/tc6387xb.c                             |   2 +-
7521  drivers/mfd/ti_am335x_tscadc.c                     |  71 ++++-
7522  drivers/mfd/timberdale.c                           |  14 +-
7523  drivers/mfd/tps6507x.c                             |   2 +-
7524  drivers/mfd/tps65090.c                             |   2 +-
7525  drivers/mfd/tps65217.c                             |   2 +-
7526  drivers/mfd/tps6586x.c                             |  52 +++-
7527  drivers/mfd/tps65910.c                             |   2 +-
7528  drivers/mfd/tps65912-core.c                        |   2 +-
7529  drivers/mfd/tps80031.c                             |   2 +-
7530  drivers/mfd/twl-core.c                             | 198 -------------
7531  drivers/mfd/twl6030-irq.c                          |   8 +-
7532  drivers/mfd/twl6040.c                              |   2 +-
7533  drivers/mfd/viperboard.c                           |   2 +-
7534  drivers/mfd/vx855.c                                |   4 +-
7535  drivers/mfd/wm5110-tables.c                        |  32 +-
7536  drivers/mfd/wm831x-core.c                          |  14 +-
7537  drivers/mfd/wm831x-i2c.c                           |   8 +-
7538  drivers/mfd/wm831x-spi.c                           |   8 +-
7539  drivers/mfd/wm8994-core.c                          |   4 +-
7540  drivers/pinctrl/pinctrl-abx500.c                   |  37 +--
7541  drivers/pinctrl/pinctrl-abx500.h                   |  12 +
7542  drivers/pwm/Kconfig                                |  10 +
7543  drivers/pwm/Makefile                               |   1 +
7544  drivers/pwm/pwm-lp3943.c                           | 314 ++++++++++++++++++++
7545  drivers/regulator/Kconfig                          |   2 +-
7546  drivers/regulator/tps6586x-regulator.c             |  93 ++++--
7547  drivers/staging/nvec/nvec.c                        |   2 +-
7548  include/linux/mfd/abx500/ab8500-gpio.h             |  33 ---
7549  include/linux/mfd/abx500/ab8500.h                  |   2 -
7550  include/linux/mfd/lp3943.h                         | 114 +++++++
7551  include/linux/mfd/max14577-private.h               | 330 +++++++++++++++++++++
7552  include/linux/mfd/max14577.h                       |  69 +++++
7553  include/linux/mfd/max77686-private.h               |   2 +-
7554  include/linux/mfd/max8997-private.h                |   2 +-
7555  include/linux/mfd/max8998-private.h                |   2 +-
7556  include/linux/mfd/mc13xxx.h                        |   2 -
7557  include/linux/mfd/ti_am335x_tscadc.h               |   8 +-
7558  include/linux/mfd/tps6586x.h                       |   7 +
7559  include/linux/platform_data/mfd-mcp-sa11x0.h       |   6 +-
7560  include/linux/ssbi.h                               |  19 +-
7561  sound/soc/fsl/Kconfig                              |   2 +-
7562  107 files changed, 2332 insertions(+), 651 deletions(-)
7563  create mode 100644 Documentation/devicetree/bindings/gpio/gpio-lp3943.txt
7564  create mode 100644 Documentation/devicetree/bindings/mfd/lp3943.txt
7565  create mode 100644 Documentation/devicetree/bindings/pwm/pwm-lp3943.txt
7566  create mode 100644 drivers/gpio/gpio-lp3943.c
7567  create mode 100644 drivers/mfd/lp3943.c
7568  create mode 100644 drivers/mfd/max14577.c
7569  create mode 100644 drivers/pwm/pwm-lp3943.c
7570  delete mode 100644 include/linux/mfd/abx500/ab8500-gpio.h
7571  create mode 100644 include/linux/mfd/lp3943.h
7572  create mode 100644 include/linux/mfd/max14577-private.h
7573  create mode 100644 include/linux/mfd/max14577.h
7574 Merging battery/master (26740dbb50f2 max17042_battery: Add IRQF_ONESHOT flag to use default irq handler)
7575 $ git merge battery/master
7576 Merge made by the 'recursive' strategy.
7577  Documentation/devicetree/bindings/mfd/as3722.txt   |  11 +
7578  .../devicetree/bindings/power/isp1704.txt          |  17 ++
7579  .../bindings/power_supply/charger-manager.txt      |  81 ++++++
7580  drivers/power/Kconfig                              |   7 +
7581  drivers/power/Makefile                             |   1 +
7582  drivers/power/bq2415x_charger.c                    | 121 ++++++--
7583  drivers/power/charger-manager.c                    | 299 +++++++++++++++++---
7584  drivers/power/gpio-charger.c                       |  19 +-
7585  drivers/power/isp1704_charger.c                    |  54 +++-
7586  drivers/power/max14577_charger.c                   | 311 +++++++++++++++++++++
7587  drivers/power/max17042_battery.c                   |   6 +-
7588  drivers/power/power_supply_core.c                  |  44 +++
7589  drivers/power/reset/Kconfig                        |   6 +
7590  drivers/power/reset/Makefile                       |   1 +
7591  drivers/power/reset/as3722-poweroff.c              |  96 +++++++
7592  include/linux/power/bq2415x_charger.h              |  48 +---
7593  include/linux/power/charger-manager.h              |  34 ++-
7594  include/linux/power/isp1704_charger.h              |   1 +
7595  include/linux/power_supply.h                       |  16 ++
7596  19 files changed, 1042 insertions(+), 131 deletions(-)
7597  create mode 100644 Documentation/devicetree/bindings/power/isp1704.txt
7598  create mode 100644 Documentation/devicetree/bindings/power_supply/charger-manager.txt
7599  create mode 100644 drivers/power/max14577_charger.c
7600  create mode 100644 drivers/power/reset/as3722-poweroff.c
7601 Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path)
7602 $ git merge fbdev/for-next
7603 Already up-to-date.
7604 Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par)
7605 $ git merge viafb/viafb-next
7606 Already up-to-date.
7607 Merging omap_dss2/for-next (07bda89b96e2 Merge branches '3.14/fbdev', '3.14/dss-misc' and '3.14/dss-fclk' into for-next)
7608 $ git merge omap_dss2/for-next
7609 Auto-merging drivers/video/fbmem.c
7610 Merge made by the 'recursive' strategy.
7611  drivers/video/Kconfig                              |  27 +-
7612  drivers/video/Makefile                             |   1 +
7613  drivers/video/asiliantfb.c                         |   1 -
7614  drivers/video/console/Kconfig                      |   3 +-
7615  drivers/video/console/fbcon.c                      |   5 +-
7616  drivers/video/fbmem.c                              |   3 +
7617  drivers/video/i810/i810_main.c                     |   4 +-
7618  drivers/video/logo/logo.c                          |   4 -
7619  drivers/video/mmp/core.c                           |   9 +-
7620  drivers/video/mx3fb.c                              |   2 +-
7621  drivers/video/mxsfb.c                              | 126 +++---
7622  drivers/video/nvidia/nvidia.c                      |   1 -
7623  drivers/video/ocfb.c                               | 440 +++++++++++++++++++++
7624  .../omap2/displays-new/panel-sony-acx565akm.c      |  44 ++-
7625  drivers/video/omap2/dss/apply.c                    |  11 +-
7626  drivers/video/omap2/dss/dispc.c                    |  55 ++-
7627  drivers/video/omap2/dss/dispc.h                    |  20 +
7628  drivers/video/omap2/dss/display-sysfs.c            |   4 +-
7629  drivers/video/omap2/dss/dpi.c                      |  18 +-
7630  drivers/video/omap2/dss/dsi.c                      | 223 +++++++----
7631  drivers/video/omap2/dss/dss.c                      | 163 +++-----
7632  drivers/video/omap2/dss/dss.h                      |  17 +-
7633  drivers/video/omap2/dss/dss_features.c             |   1 +
7634  drivers/video/omap2/dss/dss_features.h             |   1 +
7635  drivers/video/omap2/dss/hdmi.h                     |  16 +-
7636  drivers/video/omap2/dss/hdmi4.c                    |  22 +-
7637  drivers/video/omap2/dss/hdmi4_core.c               |  18 +-
7638  drivers/video/omap2/dss/hdmi_common.c              |   2 +
7639  drivers/video/omap2/dss/hdmi_phy.c                 |   2 +-
7640  drivers/video/omap2/dss/hdmi_pll.c                 |  18 +-
7641  drivers/video/omap2/dss/hdmi_wp.c                  |  16 +-
7642  drivers/video/omap2/dss/overlay.c                  |   5 -
7643  drivers/video/omap2/dss/sdi.c                      |  24 +-
7644  drivers/video/omap2/dss/venc.c                     |   3 +-
7645  drivers/video/omap2/omapfb/omapfb-main.c           |  19 +
7646  drivers/video/riva/fbdev.c                         |   1 -
7647  drivers/video/sh_mobile_lcdcfb.c                   |   2 +-
7648  drivers/video/tgafb.c                              |  21 +-
7649  drivers/video/vermilion/vermilion.c                |   1 -
7650  include/linux/platform_data/video-ep93xx.h         |  10 +-
7651  include/linux/platform_data/video-msm_fb.h         |   3 +-
7652  include/linux/platform_data/video-pxafb.h          |   2 -
7653  include/video/pxa168fb.h                           |   2 -
7654  43 files changed, 954 insertions(+), 416 deletions(-)
7655  create mode 100644 drivers/video/ocfb.c
7656 Merging regulator/for-next (616f8a482a7c Merge remote-tracking branches 'regulator/topic/ab8500', 'regulator/topic/act8865', 'regulator/topic/anatop', 'regulator/topic/arizona', 'regulator/topic/as3722', 'regulator/topic/db8500', 'regulator/topic/gpio', 'regulator/topic/lp3971', 'regulator/topic/lp3972', 'regulator/topic/max14577', 'regulator/topic/max77693', 'regulator/topic/mc13892', 'regulator/topic/pcf50633', 'regulator/topic/pfuze100', 'regulator/topic/s2mps11', 'regulator/topic/s5m8767', 'regulator/topic/stw481x-vmmc', 'regulator/topic/tps51632', 'regulator/topic/tps62360', 'regulator/topic/tps65910', 'regulator/topic/twl' and 'regulator/topic/wm831x' into regulator-next)
7657 $ git merge regulator/for-next
7658 Auto-merging drivers/regulator/Kconfig
7659 Auto-merging drivers/mfd/sec-core.c
7660 Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
7661 Merge made by the 'recursive' strategy.
7662  Documentation/devicetree/bindings/mfd/tps65910.txt |   4 +-
7663  .../bindings/regulator/act8865-regulator.txt       |  60 ++++
7664  .../bindings/regulator/s5m8767-regulator.txt       |   2 +-
7665  .../devicetree/bindings/vendor-prefixes.txt        |   1 +
7666  drivers/mfd/pcf50633-core.c                        |   2 +-
7667  drivers/mfd/sec-core.c                             |  30 --
7668  drivers/regulator/Kconfig                          |  17 +-
7669  drivers/regulator/Makefile                         |   2 +
7670  drivers/regulator/ab8500.c                         | 126 +-------
7671  drivers/regulator/act8865-regulator.c              | 349 +++++++++++++++++++++
7672  drivers/regulator/anatop-regulator.c               |  36 +--
7673  drivers/regulator/arizona-micsupp.c                |  52 +--
7674  drivers/regulator/as3722-regulator.c               |  34 +-
7675  drivers/regulator/core.c                           |  15 +-
7676  drivers/regulator/db8500-prcmu.c                   |  20 +-
7677  drivers/regulator/gpio-regulator.c                 |  17 +-
7678  drivers/regulator/lp3971.c                         |  43 +--
7679  drivers/regulator/lp3972.c                         |  41 +--
7680  drivers/regulator/max14577.c                       | 273 ++++++++++++++++
7681  drivers/regulator/max77693.c                       |   1 +
7682  drivers/regulator/mc13892-regulator.c              |  24 +-
7683  drivers/regulator/pcf50633-regulator.c             |   2 +-
7684  drivers/regulator/pfuze100-regulator.c             |  39 +--
7685  drivers/regulator/s2mps11.c                        |   2 -
7686  drivers/regulator/s5m8767.c                        |  99 +++---
7687  drivers/regulator/stw481x-vmmc.c                   |  12 +-
7688  drivers/regulator/tps51632-regulator.c             |  30 +-
7689  drivers/regulator/tps62360-regulator.c             |   2 +-
7690  drivers/regulator/tps65910-regulator.c             |  40 +++
7691  drivers/regulator/twl-regulator.c                  |   4 +-
7692  drivers/regulator/wm831x-dcdc.c                    |  10 +-
7693  include/linux/mfd/as3722.h                         |   4 +
7694  include/linux/mfd/samsung/core.h                   |   6 -
7695  include/linux/mfd/samsung/s5m8767.h                |  18 +-
7696  include/linux/mfd/tps65910.h                       |   5 +-
7697  include/linux/regulator/act8865.h                  |  53 ++++
7698  36 files changed, 1016 insertions(+), 459 deletions(-)
7699  create mode 100644 Documentation/devicetree/bindings/regulator/act8865-regulator.txt
7700  create mode 100644 drivers/regulator/act8865-regulator.c
7701  create mode 100644 drivers/regulator/max14577.c
7702  create mode 100644 include/linux/regulator/act8865.h
7703 Merging security/next (923b49ff69fc Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next)
7704 $ git merge security/next
7705 Resolved 'drivers/char/tpm/tpm_ppi.c' using previous resolution.
7706 Auto-merging security/selinux/hooks.c
7707 Auto-merging drivers/char/tpm/tpm_ppi.c
7708 CONFLICT (content): Merge conflict in drivers/char/tpm/tpm_ppi.c
7709 Auto-merging MAINTAINERS
7710 Automatic merge failed; fix conflicts and then commit the result.
7711 $ git commit -v -a
7712 [master e48a018aa7cb] Merge remote-tracking branch 'security/next'
7713 $ git diff -M --stat --summary HEAD^..
7714  Documentation/security/IMA-templates.txt  |   6 +-
7715  MAINTAINERS                               |   8 +-
7716  drivers/char/tpm/Makefile                 |   2 +-
7717  drivers/char/tpm/tpm-dev.c                | 213 +++++++++++++
7718  drivers/char/tpm/tpm-interface.c          | 488 ++----------------------------
7719  drivers/char/tpm/tpm-sysfs.c              | 318 +++++++++++++++++++
7720  drivers/char/tpm/tpm.h                    |  83 +++--
7721  drivers/char/tpm/tpm_atmel.c              |  28 +-
7722  drivers/char/tpm/tpm_i2c_atmel.c          |  44 +--
7723  drivers/char/tpm/tpm_i2c_infineon.c       |  42 +--
7724  drivers/char/tpm/tpm_i2c_nuvoton.c        |  43 +--
7725  drivers/char/tpm/tpm_i2c_stm_st33.c       |  48 +--
7726  drivers/char/tpm/tpm_ibmvtpm.c            |  41 +--
7727  drivers/char/tpm/tpm_infineon.c           |  28 +-
7728  drivers/char/tpm/tpm_nsc.c                |  28 +-
7729  drivers/char/tpm/tpm_tis.c                |  49 +--
7730  drivers/char/tpm/xen-tpmfront.c           |  45 +--
7731  include/linux/tpm.h                       |  12 +
7732  security/integrity/ima/ima_template_lib.c |  18 +-
7733  security/selinux/hooks.c                  |   7 +-
7734  security/selinux/include/security.h       |   3 +-
7735  security/selinux/netlabel.c               |  31 +-
7736  security/selinux/ss/constraint.h          |   1 +
7737  security/selinux/ss/policydb.c            | 110 ++++++-
7738  security/selinux/ss/policydb.h            |  11 +
7739  security/selinux/ss/services.c            |  54 ++--
7740  security/smack/smack.h                    |   5 +-
7741  security/smack/smack_lsm.c                | 140 ++++-----
7742  security/smack/smackfs.c                  | 134 ++++++--
7743  29 files changed, 1003 insertions(+), 1037 deletions(-)
7744  create mode 100644 drivers/char/tpm/tpm-dev.c
7745  create mode 100644 drivers/char/tpm/tpm-sysfs.c
7746 Merging selinux/master (8ed814602876 SELinux: Fix memory leak upon loading policy)
7747 $ git merge selinux/master
7748 Already up-to-date.
7749 Merging lblnet/master (07bc9dc1b01b Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc)
7750 $ git merge lblnet/master
7751 Already up-to-date.
7752 Merging watchdog/master (d63182e8c021 watchdog: mpc8xxx_wdt convert to watchdog core)
7753 $ git merge watchdog/master
7754 Auto-merging arch/arm/configs/bcm_defconfig
7755 Merge made by the 'recursive' strategy.
7756  .../devicetree/bindings/watchdog/davinci-wdt.txt   |  16 +-
7757  .../devicetree/bindings/watchdog/gpio-wdt.txt      |  23 ++
7758  .../devicetree/bindings/watchdog/samsung-wdt.txt   |  21 +-
7759  arch/arm/configs/bcm_defconfig                     |   3 +
7760  drivers/watchdog/Kconfig                           |  40 ++-
7761  drivers/watchdog/Makefile                          |   2 +
7762  drivers/watchdog/alim1535_wdt.c                    |   2 +-
7763  drivers/watchdog/alim7101_wdt.c                    |   2 +-
7764  drivers/watchdog/bcm_kona_wdt.c                    | 368 +++++++++++++++++++++
7765  drivers/watchdog/davinci_wdt.c                     | 221 ++++++-------
7766  drivers/watchdog/dw_wdt.c                          |   2 +-
7767  drivers/watchdog/gpio_wdt.c                        | 254 ++++++++++++++
7768  drivers/watchdog/hpwdt.c                           |  13 +-
7769  drivers/watchdog/i6300esb.c                        |   2 +-
7770  drivers/watchdog/imx2_wdt.c                        |   4 +
7771  drivers/watchdog/mpc8xxx_wdt.c                     | 110 +++---
7772  drivers/watchdog/nv_tco.c                          |   2 +-
7773  drivers/watchdog/pcwd_pci.c                        |   2 +-
7774  drivers/watchdog/s3c2410_wdt.c                     | 203 +++++++++++-
7775  drivers/watchdog/sirfsoc_wdt.c                     |   2 +-
7776  drivers/watchdog/sp5100_tco.c                      |   2 +-
7777  drivers/watchdog/via_wdt.c                         |   2 +-
7778  drivers/watchdog/watchdog_core.c                   |   4 +-
7779  drivers/watchdog/wdt_pci.c                         |   2 +-
7780  24 files changed, 1063 insertions(+), 239 deletions(-)
7781  create mode 100644 Documentation/devicetree/bindings/watchdog/gpio-wdt.txt
7782  create mode 100644 drivers/watchdog/bcm_kona_wdt.c
7783  create mode 100644 drivers/watchdog/gpio_wdt.c
7784 Merging dwmw2-iommu/master (e5d0c874391a Merge tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu)
7785 $ git merge dwmw2-iommu/master
7786 Already up-to-date.
7787 Merging iommu/next (dd1a175695ed Merge branches 'arm/smmu', 'core', 'x86/vt-d', 'arm/shmobile', 'x86/amd', 'ppc/pamu', 'iommu/fixes' and 'arm/msm' into next)
7788 $ git merge iommu/next
7789 Resolved 'drivers/gpu/drm/msm/Kconfig' using previous resolution.
7790 Auto-merging drivers/iommu/intel_irq_remapping.c
7791 Auto-merging drivers/gpu/drm/msm/Kconfig
7792 CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/Kconfig
7793 Automatic merge failed; fix conflicts and then commit the result.
7794 $ git commit -v -a
7795 [master 8dbcf5dfd278] Merge remote-tracking branch 'iommu/next'
7796 $ git diff -M --stat --summary HEAD^..
7797  drivers/gpu/drm/msm/Kconfig         |   1 +
7798  drivers/iommu/Kconfig               |   1 +
7799  drivers/iommu/amd_iommu.c           |   4 +-
7800  drivers/iommu/arm-smmu.c            |  33 ++++--
7801  drivers/iommu/dmar.c                | 135 +++++++++++++---------
7802  drivers/iommu/fsl_pamu_domain.c     |   6 +-
7803  drivers/iommu/intel-iommu.c         | 216 +++++++++++++++---------------------
7804  drivers/iommu/intel_irq_remapping.c | 105 ++++++++----------
7805  drivers/iommu/irq_remapping.c       |   6 +-
7806  drivers/iommu/of_iommu.c            |   1 +
7807  drivers/iommu/shmobile-iommu.c      |   3 +-
7808  drivers/iommu/shmobile-ipmmu.c      |  10 +-
7809  drivers/iommu/shmobile-ipmmu.h      |   2 +-
7810  include/linux/dma_remapping.h       |   4 -
7811  include/linux/dmar.h                |  13 ++-
7812  include/linux/intel-iommu.h         |   3 +-
7813  include/linux/iommu.h               |  16 ++-
7814  17 files changed, 279 insertions(+), 280 deletions(-)
7815 Merging vfio/next (3be3a074cf5b vfio-pci: Don't use device_lock around AER interrupt setup)
7816 $ git merge vfio/next
7817 Auto-merging drivers/vfio/pci/vfio_pci.c
7818 Merge made by the 'recursive' strategy.
7819  Documentation/devices.txt         |  1 +
7820  drivers/vfio/pci/vfio_pci.c       |  4 +++
7821  drivers/vfio/pci/vfio_pci_intrs.c | 17 ----------
7822  drivers/vfio/vfio.c               | 70 ++++++++++++++++++---------------------
7823  include/linux/miscdevice.h        |  1 +
7824  5 files changed, 39 insertions(+), 54 deletions(-)
7825 Merging osd/linux-next (ec15cd5a0b73 exofs: Print less in r4w)
7826 $ git merge osd/linux-next
7827 Merge made by the 'recursive' strategy.
7828  fs/exofs/inode.c       | 31 +++++++++++++++++++------------
7829  fs/exofs/ore.c         | 43 +++++++++++++++++++++++++++++--------------
7830  include/scsi/osd_ore.h |  1 +
7831  3 files changed, 49 insertions(+), 26 deletions(-)
7832 Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document)
7833 $ git merge jc_docs/docs-next
7834 Already up-to-date.
7835 Merging trivial/for-next (9c8f6820f0d7 doc: Fix typo in USB Gadget Documentation)
7836 $ git merge trivial/for-next
7837 Resolved 'drivers/gpu/drm/qxl/Kconfig' using previous resolution.
7838 Auto-merging net/nfc/digital_dep.c
7839 Auto-merging net/core/dev.c
7840 Auto-merging init/Kconfig
7841 Auto-merging drivers/net/wan/lmc/lmc_main.c
7842 Auto-merging drivers/media/platform/ti-vpe/vpdma.c
7843 Auto-merging drivers/leds/leds-lp5523.c
7844 Auto-merging drivers/gpu/drm/qxl/Kconfig
7845 CONFLICT (content): Merge conflict in drivers/gpu/drm/qxl/Kconfig
7846 Auto-merging drivers/gpu/drm/exynos/exynos_drm_gem.h
7847 Auto-merging drivers/gpu/drm/exynos/exynos_drm_gem.c
7848 Auto-merging drivers/devfreq/exynos/exynos4_bus.c
7849 Auto-merging drivers/char/Makefile
7850 Auto-merging arch/x86/Kconfig
7851 Auto-merging arch/powerpc/platforms/powernv/opal-flash.c
7852 Auto-merging arch/arm/mach-ixp4xx/common.c
7853 Auto-merging arch/arm/mach-at91/Kconfig.non_dt
7854 Auto-merging Documentation/kernel-parameters.txt
7855 Automatic merge failed; fix conflicts and then commit the result.
7856 $ git commit -v -a
7857 [master fbf6af038fd9] Merge remote-tracking branch 'trivial/for-next'
7858 $ git diff -M --stat --summary HEAD^..
7859  Documentation/DocBook/.gitignore              |  1 +
7860  Documentation/DocBook/Makefile                |  5 +++--
7861  Documentation/DocBook/kernel-api.tmpl         |  1 +
7862  Documentation/IRQ-domain.txt                  |  2 +-
7863  Documentation/driver-model/platform.txt       |  2 +-
7864  Documentation/efi-stub.txt                    |  2 +-
7865  Documentation/email-clients.txt               |  2 +-
7866  Documentation/filesystems/Locking             |  2 +-
7867  Documentation/filesystems/proc.txt            |  2 +-
7868  Documentation/io-mapping.txt                  |  2 +-
7869  Documentation/kernel-parameters.txt           |  9 ++++++++-
7870  Documentation/laptops/hpfall.c                |  2 +-
7871  Documentation/md.txt                          |  2 +-
7872  Documentation/rfkill.txt                      |  2 +-
7873  Documentation/rt-mutex-design.txt             |  2 +-
7874  Documentation/static-keys.txt                 |  4 ++--
7875  Documentation/usb/gadget_multi.txt            |  2 +-
7876  Documentation/x86/x86_64/boot-options.txt     | 23 -----------------------
7877  arch/arm/mach-at91/Kconfig.non_dt             |  2 +-
7878  arch/arm/mach-imx/mach-pca100.c               |  2 +-
7879  arch/arm/mach-ixp4xx/common.c                 |  2 +-
7880  arch/arm64/kvm/handle_exit.c                  |  2 +-
7881  arch/mips/ralink/cevt-rt3352.c                |  2 +-
7882  arch/mips/ralink/timer.c                      |  2 +-
7883  arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c |  2 +-
7884  arch/powerpc/platforms/powernv/opal-flash.c   |  4 ++--
7885  arch/x86/Kconfig                              |  2 +-
7886  drivers/base/Kconfig                          |  2 +-
7887  drivers/block/Makefile                        |  1 -
7888  drivers/cdrom/Makefile                        |  1 -
7889  drivers/char/Makefile                         |  1 -
7890  drivers/char/msm_smd_pkt.c                    |  2 +-
7891  drivers/devfreq/exynos/exynos4_bus.c          |  2 +-
7892  drivers/devfreq/exynos/exynos5_bus.c          |  2 +-
7893  drivers/gpu/drm/exynos/exynos_drm_crtc.c      |  4 ++--
7894  drivers/gpu/drm/exynos/exynos_drm_fimc.c      |  2 +-
7895  drivers/gpu/drm/exynos/exynos_drm_g2d.c       |  2 +-
7896  drivers/gpu/drm/exynos/exynos_drm_gem.c       |  2 +-
7897  drivers/gpu/drm/exynos/exynos_drm_gem.h       |  2 +-
7898  drivers/gpu/drm/exynos/exynos_drm_gsc.c       |  4 ++--
7899  drivers/gpu/drm/exynos/exynos_drm_ipp.c       |  2 +-
7900  drivers/gpu/drm/exynos/exynos_drm_ipp.h       |  4 ++--
7901  drivers/gpu/drm/qxl/Kconfig                   |  8 +++++---
7902  drivers/gpu/drm/radeon/mkregtable.c           |  2 +-
7903  drivers/i2c/busses/i2c-exynos5.c              |  2 +-
7904  drivers/i2c/busses/i2c-stu300.c               |  2 +-
7905  drivers/iio/adc/twl6030-gpadc.c               |  2 +-
7906  drivers/isdn/hisax/hfc4s8s_l1.c               |  2 +-
7907  drivers/isdn/mISDN/Kconfig                    |  2 +-
7908  drivers/leds/leds-lp5523.c                    | 10 +++++++++-
7909  drivers/leds/leds-lp8501.c                    |  2 +-
7910  drivers/media/platform/ti-vpe/vpdma.c         |  4 ++--
7911  drivers/misc/fsa9480.c                        |  2 +-
7912  drivers/misc/mei/nfc.c                        |  2 +-
7913  drivers/net/wan/lmc/lmc_main.c                |  2 +-
7914  drivers/net/wireless/libertas/cmdresp.c       |  2 +-
7915  drivers/scsi/Kconfig                          |  4 ++--
7916  drivers/scsi/qla2xxx/qla_nx2.c                |  2 +-
7917  drivers/scsi/qla4xxx/ql4_83xx.c               |  2 +-
7918  drivers/staging/usbip/usbip_common.c          |  1 -
7919  drivers/thermal/rcar_thermal.c                |  2 +-
7920  drivers/tty/serial/crisv10.c                  |  2 +-
7921  drivers/usb/serial/kobil_sct.c                |  2 +-
7922  drivers/video/udlfb.c                         |  2 +-
7923  drivers/xen/Kconfig                           |  2 +-
7924  fs/btrfs/tests/free-space-tests.c             |  4 ++--
7925  include/asm-generic/uaccess.h                 |  2 +-
7926  include/linux/amba/sp810.h                    |  8 +++-----
7927  include/linux/tracepoint.h                    |  2 +-
7928  init/Kconfig                                  |  2 +-
7929  net/core/dev.c                                |  2 +-
7930  net/netfilter/ipset/Kconfig                   |  2 +-
7931  net/nfc/digital_dep.c                         |  2 +-
7932  73 files changed, 99 insertions(+), 108 deletions(-)
7933 Merging audit/master (06bdadd76345 audit: correct a type mismatch in audit_syscall_exit())
7934 $ git merge audit/master
7935 Resolved 'include/net/xfrm.h' using previous resolution.
7936 Auto-merging security/smack/smack_lsm.c
7937 Auto-merging security/selinux/ss/services.c
7938 Auto-merging net/xfrm/xfrm_user.c
7939 Auto-merging net/xfrm/xfrm_state.c
7940 Auto-merging net/xfrm/xfrm_policy.c
7941 Auto-merging include/uapi/linux/audit.h
7942 Auto-merging include/net/xfrm.h
7943 CONFLICT (content): Merge conflict in include/net/xfrm.h
7944 Auto-merging include/net/netlabel.h
7945 Auto-merging include/linux/init_task.h
7946 Auto-merging MAINTAINERS
7947 Auto-merging Documentation/kernel-parameters.txt
7948 Automatic merge failed; fix conflicts and then commit the result.
7949 $ git commit -v -a
7950 [master 5aeeec9f5f56] Merge remote-tracking branch 'audit/master'
7951 $ git diff -M --stat --summary HEAD^..
7952  Documentation/kernel-parameters.txt |  16 ++
7953  MAINTAINERS                         |   3 +-
7954  drivers/tty/tty_audit.c             |   2 +-
7955  include/linux/audit.h               |  20 +--
7956  include/linux/init_task.h           |   2 +-
7957  include/net/netlabel.h              |   2 +-
7958  include/net/xfrm.h                  |  20 +--
7959  include/uapi/linux/audit.h          |   8 +
7960  kernel/audit.c                      | 305 ++++++++++++++++++++++++------------
7961  kernel/audit.h                      |  13 +-
7962  kernel/auditfilter.c                |  93 ++++++-----
7963  kernel/auditsc.c                    |  44 +++---
7964  kernel/capability.c                 |   2 +-
7965  net/xfrm/xfrm_policy.c              |   8 +-
7966  net/xfrm/xfrm_state.c               |   6 +-
7967  net/xfrm/xfrm_user.c                |  12 +-
7968  security/selinux/ss/services.c      |  12 +-
7969  security/smack/smack_lsm.c          |   5 +-
7970  18 files changed, 366 insertions(+), 207 deletions(-)
7971 Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
7972 $ git merge fsnotify/for-next
7973 Already up-to-date.
7974 Merging devicetree/devicetree/next (355e62f5ad12 of/irq: Fix potential buffer overflow)
7975 $ git merge devicetree/devicetree/next
7976 Already up-to-date.
7977 Merging dt-rh/for-next (1ca56e7dcadd of: irq: Ignore disabled intc's when searching map)
7978 $ git merge dt-rh/for-next
7979 Auto-merging drivers/of/irq.c
7980 Merge made by the 'recursive' strategy.
7981  Documentation/devicetree/bindings/arm/gic.txt |  1 +
7982  drivers/of/base.c                             | 53 +++++++++++++++++++--------
7983  drivers/of/irq.c                              |  6 ++-
7984  3 files changed, 43 insertions(+), 17 deletions(-)
7985 Merging spi/for-next (d6fa5d7c08a8 Merge remote-tracking branches 'spi/topic/altera', 'spi/topic/ath79', 'spi/topic/atmel', 'spi/topic/bcm2835', 'spi/topic/bcm63xx', 'spi/topic/bcm63xx-hsspi', 'spi/topic/bitbang', 'spi/topic/clps711x', 'spi/topic/coldfire', 'spi/topic/davinci', 'spi/topic/dw', 'spi/topic/falcon', 'spi/topic/fsl-espi', 'spi/topic/gpio', 'spi/topic/hspi', 'spi/topic/mpc512x', 'spi/topic/msiof', 'spi/topic/nuc900', 'spi/topic/oc-tiny', 'spi/topic/omap', 'spi/topic/orion', 'spi/topic/pci', 'spi/topic/qspi', 'spi/topic/rspi', 'spi/topic/s3c24xx', 'spi/topic/s3c64xx', 'spi/topic/sc18is602', 'spi/topic/sh', 'spi/topic/tegra114', 'spi/topic/tegra20-sflash', 'spi/topic/tegra20-slink', 'spi/topic/txx9' and 'spi/topic/xcomm' into spi-next)
7986 $ git merge spi/for-next
7987 Resolved 'drivers/spi/spi-mpc512x-psc.c' using previous resolution.
7988 Auto-merging drivers/spi/spi-tegra20-slink.c
7989 Auto-merging drivers/spi/spi-tegra20-sflash.c
7990 Auto-merging drivers/spi/spi-tegra114.c
7991 Auto-merging drivers/spi/spi-mpc512x-psc.c
7992 CONFLICT (content): Merge conflict in drivers/spi/spi-mpc512x-psc.c
7993 Auto-merging drivers/spi/Kconfig
7994 Removing arch/arm/plat-samsung/include/plat/fiq.h
7995 Automatic merge failed; fix conflicts and then commit the result.
7996 $ git commit -v -a
7997 [master 441ed680b88b] Merge remote-tracking branch 'spi/for-next'
7998 $ git diff -M --stat --summary HEAD^..
7999  Documentation/devicetree/bindings/spi/spi-bus.txt |   2 +-
8000  Documentation/devicetree/bindings/spi/ti_qspi.txt |   8 +-
8001  Documentation/spi/spi-summary                     |   8 +-
8002  arch/arm/plat-samsung/include/plat/fiq.h          |  13 -
8003  drivers/spi/Kconfig                               |  14 +-
8004  drivers/spi/Makefile                              |   1 +
8005  drivers/spi/spi-altera.c                          |   2 -
8006  drivers/spi/spi-ath79.c                           |  14 +-
8007  drivers/spi/spi-atmel.c                           | 778 ++++++++--------------
8008  drivers/spi/spi-bcm2835.c                         |  10 +-
8009  drivers/spi/spi-bcm63xx-hsspi.c                   | 475 +++++++++++++
8010  drivers/spi/spi-bcm63xx.c                         |  48 +-
8011  drivers/spi/spi-bitbang-txrx.h                    |   2 +-
8012  drivers/spi/spi-clps711x.c                        |  23 +-
8013  drivers/spi/spi-coldfire-qspi.c                   |  53 +-
8014  drivers/spi/spi-davinci.c                         |  45 +-
8015  drivers/spi/spi-dw-mmio.c                         |  74 +-
8016  drivers/spi/spi-dw-pci.c                          |  47 +-
8017  drivers/spi/spi-dw.c                              |  26 +-
8018  drivers/spi/spi-dw.h                              |   5 +-
8019  drivers/spi/spi-falcon.c                          |  12 +-
8020  drivers/spi/spi-fsl-dspi.c                        |   2 +
8021  drivers/spi/spi-fsl-espi.c                        |  63 +-
8022  drivers/spi/spi-gpio.c                            |   8 +-
8023  drivers/spi/spi-imx.c                             |  27 +-
8024  drivers/spi/spi-mpc512x-psc.c                     |  18 +-
8025  drivers/spi/spi-nuc900.c                          |  56 +-
8026  drivers/spi/spi-oc-tiny.c                         |  62 +-
8027  drivers/spi/spi-omap-100k.c                       |  20 -
8028  drivers/spi/spi-omap2-mcspi.c                     |  38 +-
8029  drivers/spi/spi-orion.c                           |   4 +-
8030  drivers/spi/spi-pxa2xx-pci.c                      |   2 +-
8031  drivers/spi/spi-pxa2xx.c                          |   2 +
8032  drivers/spi/spi-rspi.c                            | 361 +++++-----
8033  drivers/spi/spi-s3c24xx.c                         |  74 +-
8034  drivers/spi/spi-s3c64xx.c                         |   5 +-
8035  drivers/spi/spi-sc18is602.c                       |  13 +-
8036  drivers/spi/spi-sh-hspi.c                         |   4 +-
8037  drivers/spi/spi-sh-msiof.c                        |  62 +-
8038  drivers/spi/spi-sh.c                              |  10 +-
8039  drivers/spi/spi-tegra114.c                        |  98 +--
8040  drivers/spi/spi-tegra20-sflash.c                  |  22 +-
8041  drivers/spi/spi-tegra20-slink.c                   |  97 ++-
8042  drivers/spi/spi-ti-qspi.c                         | 129 ++--
8043  drivers/spi/spi-topcliff-pch.c                    |   2 +-
8044  drivers/spi/spi-txx9.c                            |   8 +-
8045  drivers/spi/spi-xcomm.c                           |  12 +-
8046  drivers/spi/spi.c                                 |  68 +-
8047  include/linux/platform_data/spi-nuc900.h          |   8 +-
8048  include/linux/spi/s3c24xx.h                       |   2 +
8049  include/linux/spi/spi.h                           |   8 +-
8050  51 files changed, 1478 insertions(+), 1467 deletions(-)
8051  delete mode 100644 arch/arm/plat-samsung/include/plat/fiq.h
8052  create mode 100644 drivers/spi/spi-bcm63xx-hsspi.c
8053 Merging tip/auto-latest (8723822a0fdf Merge branch 'x86/x32')
8054 $ git merge tip/auto-latest
8055 Resolved 'arch/mips/Kconfig' using previous resolution.
8056 Resolved 'arch/mips/netlogic/xlp/setup.c' using previous resolution.
8057 Resolved 'arch/xtensa/include/asm/barrier.h' using previous resolution.
8058 Resolved 'drivers/acpi/acpi_extlog.c' using previous resolution.
8059 Resolved 'drivers/acpi/apei/einj.c' using previous resolution.
8060 Resolved 'drivers/acpi/processor_idle.c' using previous resolution.
8061 Auto-merging tools/perf/perf-completion.sh
8062 Removing tools/perf/config/feature-checks/test-stackprotector.c
8063 Auto-merging tools/lib/api/fs/debugfs.h
8064 Auto-merging tools/lib/api/Makefile
8065 Auto-merging net/ipv4/tcp.c
8066 Auto-merging lib/Kconfig.debug
8067 Auto-merging kernel/sched/core.c
8068 Auto-merging include/linux/init_task.h
8069 Auto-merging include/linux/compiler.h
8070 Auto-merging drivers/thermal/intel_powerclamp.c
8071 Auto-merging drivers/net/bonding/bond_main.c
8072 Auto-merging drivers/idle/intel_idle.c
8073 Auto-merging drivers/clocksource/nomadik-mtu.c
8074 Auto-merging drivers/clocksource/Makefile
8075 Auto-merging drivers/acpi/processor_idle.c
8076 CONFLICT (content): Merge conflict in drivers/acpi/processor_idle.c
8077 Auto-merging drivers/acpi/apei/ghes.c
8078 Auto-merging drivers/acpi/apei/einj.c
8079 CONFLICT (content): Merge conflict in drivers/acpi/apei/einj.c
8080 Auto-merging drivers/acpi/apei/apei-base.c
8081 Auto-merging drivers/acpi/acpi_pad.c
8082 Auto-merging drivers/acpi/acpi_extlog.c
8083 CONFLICT (content): Merge conflict in drivers/acpi/acpi_extlog.c
8084 Auto-merging arch/xtensa/include/asm/barrier.h
8085 CONFLICT (content): Merge conflict in arch/xtensa/include/asm/barrier.h
8086 Auto-merging arch/x86/kernel/cpu/microcode/intel_early.c
8087 Auto-merging arch/x86/kernel/cpu/microcode/amd_early.c
8088 Auto-merging arch/x86/kernel/cpu/microcode/amd.c
8089 Auto-merging arch/x86/kernel/apic/io_apic.c
8090 Auto-merging arch/x86/kernel/apic/apic_flat_64.c
8091 Auto-merging arch/x86/Kconfig
8092 Removing arch/score/include/asm/barrier.h
8093 Auto-merging arch/score/include/asm/Kbuild
8094 Auto-merging arch/powerpc/platforms/pseries/setup.c
8095 Auto-merging arch/powerpc/kernel/setup_64.c
8096 Auto-merging arch/powerpc/Kconfig
8097 Removing arch/parisc/include/asm/barrier.h
8098 Auto-merging arch/parisc/include/asm/Kbuild
8099 Removing arch/mn10300/include/asm/barrier.h
8100 Auto-merging arch/mn10300/include/asm/Kbuild
8101 Auto-merging arch/mips/netlogic/xlr/setup.c
8102 Auto-merging arch/mips/netlogic/xlp/setup.c
8103 CONFLICT (content): Merge conflict in arch/mips/netlogic/xlp/setup.c
8104 Auto-merging arch/mips/Makefile
8105 Auto-merging arch/mips/Kconfig
8106 CONFLICT (content): Merge conflict in arch/mips/Kconfig
8107 Removing arch/microblaze/include/asm/barrier.h
8108 Auto-merging arch/microblaze/include/asm/Kbuild
8109 Auto-merging arch/hexagon/include/asm/Kbuild
8110 Removing arch/cris/include/asm/barrier.h
8111 Auto-merging arch/cris/include/asm/Kbuild
8112 Auto-merging arch/arm/mach-sunxi/Kconfig
8113 Auto-merging arch/arm/boot/dts/sun7i-a20.dtsi
8114 Auto-merging arch/arm/boot/dts/sun5i-a13.dtsi
8115 Auto-merging arch/arm/boot/dts/sun5i-a10s.dtsi
8116 Auto-merging arch/arm/Makefile
8117 Auto-merging arch/arm/Kconfig
8118 Auto-merging arch/arc/include/asm/Kbuild
8119 Auto-merging Makefile
8120 Auto-merging MAINTAINERS
8121 Auto-merging Documentation/kernel-parameters.txt
8122 Automatic merge failed; fix conflicts and then commit the result.
8123 $ git commit -v -a
8124 [master eeaf4f8d0fbc] Merge remote-tracking branch 'tip/auto-latest'
8125 $ git diff -M --stat --summary HEAD^..
8126  Documentation/ABI/testing/sysfs-firmware-efi       |   20 +
8127  .../ABI/testing/sysfs-firmware-efi-runtime-map     |   34 +
8128  Documentation/ABI/testing/sysfs-kernel-boot_params |   38 +
8129  Documentation/RCU/trace.txt                        |   22 +-
8130  Documentation/acpi/apei/einj.txt                   |   19 +-
8131  Documentation/circular-buffers.txt                 |   45 +-
8132  .../bindings/timer/allwinner,sun5i-a13-hstimer.txt |   22 +
8133  Documentation/kernel-parameters.txt                |   27 +-
8134  Documentation/memory-barriers.txt                  |  922 ++++++++---
8135  Documentation/robust-futex-ABI.txt                 |    4 +-
8136  Documentation/sysctl/kernel.txt                    |    5 -
8137  Documentation/x86/boot.txt                         |    3 +
8138  Documentation/x86/x86_64/mm.txt                    |    7 +
8139  MAINTAINERS                                        |   11 +
8140  Makefile                                           |   20 +-
8141  arch/Kconfig                                       |   67 +
8142  arch/alpha/include/asm/barrier.h                   |   25 +-
8143  arch/arc/include/asm/Kbuild                        |    1 +
8144  arch/arc/include/asm/atomic.h                      |    5 +
8145  arch/arc/include/asm/barrier.h                     |    5 -
8146  arch/arm/Kconfig                                   |   13 +-
8147  arch/arm/Makefile                                  |    4 -
8148  arch/arm/boot/compressed/misc.c                    |   14 +
8149  arch/arm/boot/dts/sun5i-a10s.dtsi                  |    7 +
8150  arch/arm/boot/dts/sun5i-a13.dtsi                   |    7 +
8151  arch/arm/boot/dts/sun7i-a20.dtsi                   |   10 +
8152  arch/arm/include/asm/barrier.h                     |   15 +
8153  arch/arm/include/asm/unistd.h                      |    2 +-
8154  arch/arm/include/uapi/asm/unistd.h                 |    2 +
8155  arch/arm/kernel/calls.S                            |    2 +
8156  arch/arm/kernel/perf_event.c                       |    4 -
8157  arch/arm/mach-sunxi/Kconfig                        |    1 +
8158  arch/arm64/include/asm/barrier.h                   |   50 +
8159  arch/avr32/include/asm/barrier.h                   |   17 +-
8160  arch/blackfin/include/asm/barrier.h                |   18 +-
8161  arch/cris/include/asm/Kbuild                       |    1 +
8162  arch/cris/include/asm/barrier.h                    |   25 -
8163  arch/frv/include/asm/barrier.h                     |    8 +-
8164  arch/hexagon/include/asm/Kbuild                    |    1 +
8165  arch/hexagon/include/asm/atomic.h                  |    6 +-
8166  arch/hexagon/include/asm/barrier.h                 |    4 -
8167  arch/ia64/include/asm/barrier.h                    |   23 +
8168  arch/m32r/include/asm/barrier.h                    |   80 +-
8169  arch/m68k/include/asm/barrier.h                    |   14 +-
8170  arch/metag/include/asm/barrier.h                   |   15 +
8171  arch/microblaze/include/asm/Kbuild                 |    1 +
8172  arch/microblaze/include/asm/barrier.h              |   27 -
8173  arch/mips/Kconfig                                  |   14 +-
8174  arch/mips/Makefile                                 |    4 -
8175  arch/mips/ar7/setup.c                              |    1 -
8176  arch/mips/emma/markeins/setup.c                    |    3 -
8177  arch/mips/include/asm/barrier.h                    |   15 +
8178  arch/mips/netlogic/xlp/setup.c                     |    1 -
8179  arch/mips/netlogic/xlr/setup.c                     |    1 -
8180  arch/mips/sibyte/swarm/setup.c                     |    2 -
8181  arch/mn10300/include/asm/Kbuild                    |    1 +
8182  arch/mn10300/include/asm/barrier.h                 |   37 -
8183  arch/parisc/include/asm/Kbuild                     |    1 +
8184  arch/parisc/include/asm/barrier.h                  |   35 -
8185  arch/powerpc/Kconfig                               |    4 +
8186  arch/powerpc/include/asm/barrier.h                 |   21 +-
8187  arch/powerpc/include/asm/setup.h                   |    1 +
8188  arch/powerpc/include/asm/spinlock.h                |    2 +
8189  arch/powerpc/include/asm/uprobes.h                 |    5 +-
8190  arch/powerpc/kernel/setup_32.c                     |    3 -
8191  arch/powerpc/kernel/setup_64.c                     |    3 -
8192  arch/powerpc/kernel/uprobes.c                      |    2 +-
8193  arch/powerpc/platforms/pseries/setup.c             |    2 +-
8194  arch/s390/include/asm/barrier.h                    |   15 +
8195  arch/score/include/asm/Kbuild                      |    1 +
8196  arch/score/include/asm/barrier.h                   |   16 -
8197  arch/sh/Kconfig                                    |   15 +-
8198  arch/sh/Makefile                                   |    4 -
8199  arch/sh/include/asm/barrier.h                      |   21 +-
8200  arch/sparc/include/asm/barrier_32.h                |   12 +-
8201  arch/sparc/include/asm/barrier_64.h                |   15 +
8202  arch/tile/include/asm/barrier.h                    |   68 +-
8203  arch/unicore32/include/asm/barrier.h               |   11 +-
8204  arch/x86/Kconfig                                   |   81 +-
8205  arch/x86/Makefile                                  |    8 +-
8206  arch/x86/boot/Makefile                             |    2 +-
8207  arch/x86/boot/bioscall.S                           |    6 +-
8208  arch/x86/boot/boot.h                               |   10 +-
8209  arch/x86/boot/compressed/Makefile                  |    2 +-
8210  arch/x86/boot/compressed/aslr.c                    |  317 ++++
8211  arch/x86/boot/compressed/cmdline.c                 |    2 +-
8212  arch/x86/boot/compressed/cpuflags.c                |   12 +
8213  arch/x86/boot/compressed/head_32.S                 |   10 +-
8214  arch/x86/boot/compressed/head_64.S                 |   16 +-
8215  arch/x86/boot/compressed/misc.c                    |   18 +-
8216  arch/x86/boot/compressed/misc.h                    |   37 +-
8217  arch/x86/boot/copy.S                               |   22 +-
8218  arch/x86/boot/cpucheck.c                           |  100 +-
8219  arch/x86/boot/cpuflags.c                           |  104 ++
8220  arch/x86/boot/cpuflags.h                           |   19 +
8221  arch/x86/boot/header.S                             |    9 +-
8222  arch/x86/include/asm/archrandom.h                  |   21 +
8223  arch/x86/include/asm/barrier.h                     |   43 +-
8224  arch/x86/include/asm/cpufeature.h                  |    1 +
8225  arch/x86/include/asm/efi.h                         |   78 +-
8226  arch/x86/include/asm/futex.h                       |   21 +-
8227  arch/x86/include/asm/hw_irq.h                      |    3 +
8228  arch/x86/include/asm/iosf_mbi.h                    |   90 ++
8229  arch/x86/include/asm/mce.h                         |    1 -
8230  arch/x86/include/asm/microcode.h                   |   15 +
8231  arch/x86/include/asm/microcode_amd.h               |    7 +-
8232  arch/x86/include/asm/mpspec.h                      |    1 -
8233  arch/x86/include/asm/mwait.h                       |   43 +
8234  arch/x86/include/asm/page.h                        |    1 +
8235  arch/x86/include/asm/page_32.h                     |    4 -
8236  arch/x86/include/asm/page_64_types.h               |   15 +-
8237  arch/x86/include/asm/pgtable-2level.h              |  100 +-
8238  arch/x86/include/asm/pgtable_64_types.h            |    2 +-
8239  arch/x86/include/asm/pgtable_types.h               |    3 +-
8240  arch/x86/include/asm/processor.h                   |   48 +-
8241  arch/x86/include/asm/ptrace.h                      |    1 -
8242  arch/x86/include/asm/setup.h                       |    3 +-
8243  arch/x86/include/asm/smp.h                         |    1 -
8244  arch/x86/include/asm/timer.h                       |   78 +-
8245  arch/x86/include/asm/uaccess.h                     |  124 +-
8246  arch/x86/include/asm/uaccess_64.h                  |    4 +-
8247  arch/x86/include/asm/xsave.h                       |   14 +-
8248  arch/x86/include/uapi/asm/bootparam.h              |    2 +
8249  arch/x86/include/uapi/asm/stat.h                   |   42 +-
8250  arch/x86/kernel/Makefile                           |   11 +-
8251  arch/x86/kernel/acpi/cstate.c                      |   23 -
8252  arch/x86/kernel/apic/apic.c                        |   17 +-
8253  arch/x86/kernel/apic/apic_flat_64.c                |    1 -
8254  arch/x86/kernel/apic/apic_noop.c                   |    1 -
8255  arch/x86/kernel/apic/io_apic.c                     |   20 +-
8256  arch/x86/kernel/apic/ipi.c                         |    1 -
8257  arch/x86/kernel/apic/summit_32.c                   |    1 -
8258  arch/x86/kernel/apic/x2apic_cluster.c              |    1 -
8259  arch/x86/kernel/apic/x2apic_phys.c                 |    1 -
8260  arch/x86/kernel/cpu/Makefile                       |    3 +-
8261  arch/x86/kernel/cpu/amd.c                          |    3 +-
8262  arch/x86/kernel/cpu/centaur.c                      |    1 -
8263  arch/x86/kernel/cpu/common.c                       |    7 +-
8264  arch/x86/kernel/cpu/cyrix.c                        |    1 -
8265  arch/x86/kernel/cpu/intel.c                        |   29 +-
8266  arch/x86/kernel/cpu/mcheck/mce-apei.c              |   14 +-
8267  arch/x86/kernel/cpu/mcheck/mce.c                   |   12 +-
8268  arch/x86/kernel/cpu/mcheck/mce_intel.c             |    1 -
8269  arch/x86/kernel/cpu/mcheck/p5.c                    |    1 -
8270  arch/x86/kernel/cpu/mcheck/winchip.c               |    1 -
8271  arch/x86/kernel/cpu/microcode/Makefile             |    7 +
8272  .../{microcode_amd.c => cpu/microcode/amd.c}       |   13 +-
8273  .../microcode/amd_early.c}                         |  239 ++-
8274  .../{microcode_core.c => cpu/microcode/core.c}     |    0
8275  .../microcode/core_early.c}                        |    0
8276  .../{microcode_intel.c => cpu/microcode/intel.c}   |    0
8277  .../microcode/intel_early.c}                       |   10 -
8278  .../microcode/intel_lib.c}                         |    0
8279  arch/x86/kernel/cpu/perf_event.c                   |   16 +-
8280  arch/x86/kernel/cpu/perf_event_intel_rapl.c        |  679 ++++++++
8281  arch/x86/kernel/cpu/rdrand.c                       |   14 -
8282  arch/x86/kernel/cpu/transmeta.c                    |    1 -
8283  arch/x86/kernel/cpu/umc.c                          |    1 -
8284  arch/x86/kernel/crash.c                            |    1 -
8285  arch/x86/kernel/doublefault.c                      |    1 -
8286  arch/x86/kernel/hw_breakpoint.c                    |    1 -
8287  arch/x86/kernel/iosf_mbi.c                         |  226 +++
8288  arch/x86/kernel/irq.c                              |   19 +-
8289  arch/x86/kernel/irqinit.c                          |    4 +-
8290  arch/x86/kernel/kgdb.c                             |    1 -
8291  arch/x86/kernel/ksysfs.c                           |  340 ++++
8292  arch/x86/kernel/machine_kexec_32.c                 |    1 -
8293  arch/x86/kernel/pci-nommu.c                        |    1 -
8294  arch/x86/kernel/process_32.c                       |    1 -
8295  arch/x86/kernel/setup.c                            |   52 +-
8296  arch/x86/kernel/smpboot.c                          |    2 +
8297  arch/x86/kernel/traps.c                            |   22 +-
8298  arch/x86/kernel/tsc.c                              |  318 +++-
8299  arch/x86/kernel/tsc_sync.c                         |    1 -
8300  arch/x86/kernel/xsave.c                            |   10 +
8301  arch/x86/lib/copy_user_64.S                        |   12 +-
8302  arch/x86/lib/delay.c                               |    1 -
8303  arch/x86/mm/hugetlbpage.c                          |    9 +-
8304  arch/x86/mm/init_32.c                              |    3 +
8305  arch/x86/mm/kmmio.c                                |    1 -
8306  arch/x86/mm/numa.c                                 |   10 +-
8307  arch/x86/mm/pageattr-test.c                        |    1 -
8308  arch/x86/mm/pageattr.c                             |  461 +++++-
8309  arch/x86/pci/fixup.c                               |    1 -
8310  arch/x86/platform/efi/efi.c                        |  355 ++++-
8311  arch/x86/platform/efi/efi_32.c                     |   12 +-
8312  arch/x86/platform/efi/efi_64.c                     |  120 ++
8313  arch/x86/platform/efi/efi_stub_64.S                |   54 +
8314  .../platform/intel-mid/early_printk_intel_mid.c    |    1 -
8315  arch/x86/platform/iris/iris.c                      |    1 -
8316  arch/x86/platform/uv/tlb_uv.c                      |   66 +-
8317  arch/x86/realmode/init.c                           |   26 +-
8318  arch/x86/realmode/rm/reboot.S                      |    1 -
8319  arch/x86/realmode/rm/trampoline_32.S               |    1 -
8320  arch/x86/realmode/rm/trampoline_64.S               |    1 -
8321  arch/x86/syscalls/syscall_32.tbl                   |    2 +
8322  arch/x86/syscalls/syscall_64.tbl                   |    2 +
8323  arch/x86/tools/relocs.c                            |   20 +-
8324  arch/x86/vdso/vclock_gettime.c                     |    8 +-
8325  arch/x86/vdso/vdso.S                               |    1 -
8326  arch/x86/vdso/vdsox32.S                            |    1 -
8327  arch/xtensa/include/asm/barrier.h                  |   15 +-
8328  drivers/acpi/acpi_extlog.c                         |   18 +-
8329  drivers/acpi/acpi_pad.c                            |    5 +-
8330  drivers/acpi/apei/apei-base.c                      |    4 +-
8331  drivers/acpi/apei/einj.c                           |   58 +-
8332  drivers/acpi/apei/erst.c                           |    2 +-
8333  drivers/acpi/apei/ghes.c                           |   39 +-
8334  drivers/acpi/processor_idle.c                      |   15 -
8335  drivers/clocksource/Kconfig                        |    4 +
8336  drivers/clocksource/Makefile                       |    1 +
8337  drivers/clocksource/arm_global_timer.c             |    4 +-
8338  drivers/clocksource/bcm_kona_timer.c               |    6 -
8339  drivers/clocksource/cadence_ttc_timer.c            |    7 +-
8340  drivers/clocksource/clksrc-of.c                    |    4 +
8341  drivers/clocksource/cs5535-clockevt.c              |    2 +-
8342  drivers/clocksource/dw_apb_timer.c                 |    3 +-
8343  drivers/clocksource/nomadik-mtu.c                  |    2 +-
8344  drivers/clocksource/samsung_pwm_timer.c            |    2 +-
8345  drivers/clocksource/sh_cmt.c                       |    3 +-
8346  drivers/clocksource/sh_mtu2.c                      |    4 +-
8347  drivers/clocksource/sh_tmu.c                       |    4 +-
8348  drivers/clocksource/sun4i_timer.c                  |   11 +-
8349  drivers/clocksource/tegra20_timer.c                |    2 +-
8350  drivers/clocksource/time-armada-370-xp.c           |   18 +-
8351  drivers/clocksource/time-orion.c                   |    4 +-
8352  drivers/clocksource/timer-sun5i.c                  |  192 +++
8353  drivers/clocksource/vt8500_timer.c                 |    2 +-
8354  drivers/edac/edac_stub.c                           |   19 +
8355  drivers/edac/sb_edac.c                             |    6 +-
8356  drivers/firmware/efi/Kconfig                       |   11 +
8357  drivers/firmware/efi/Makefile                      |    1 +
8358  drivers/firmware/efi/efi.c                         |   45 +-
8359  drivers/firmware/efi/runtime-map.c                 |  181 +++
8360  drivers/idle/intel_idle.c                          |   11 +-
8361  drivers/net/bonding/bond_main.c                    |    2 +-
8362  drivers/rtc/rtc-cmos.c                             |   52 +-
8363  drivers/thermal/intel_powerclamp.c                 |    6 +-
8364  include/asm-generic/barrier.h                      |   55 +-
8365  include/linux/bottom_half.h                        |   32 +-
8366  include/linux/compiler.h                           |    9 +
8367  include/linux/context_tracking.h                   |   10 +-
8368  include/linux/context_tracking_state.h             |   11 +-
8369  include/linux/edac.h                               |   28 +
8370  include/linux/efi.h                                |   17 +
8371  include/linux/hardirq.h                            |    1 +
8372  include/linux/init_task.h                          |   10 +
8373  include/linux/kernel.h                             |    9 +
8374  include/linux/perf_event.h                         |    1 +
8375  include/linux/preempt.h                            |   37 +-
8376  include/linux/preempt_mask.h                       |   16 +-
8377  include/linux/rculist.h                            |    4 +-
8378  include/linux/rcupdate.h                           |  153 +-
8379  include/linux/rcutiny.h                            |    2 +-
8380  include/linux/rcutree.h                            |   36 +-
8381  include/linux/rtmutex.h                            |   18 +-
8382  include/linux/rwlock_api_smp.h                     |   12 +-
8383  include/linux/sched.h                              |  141 +-
8384  include/linux/sched/deadline.h                     |   24 +
8385  include/linux/sched/rt.h                           |    5 +
8386  include/linux/sched/sysctl.h                       |    1 -
8387  include/linux/seqlock.h                            |   27 +-
8388  include/linux/spinlock.h                           |   10 +
8389  include/linux/spinlock_api_smp.h                   |   12 +-
8390  include/linux/spinlock_api_up.h                    |   16 +-
8391  include/linux/syscalls.h                           |    6 +
8392  include/linux/tick.h                               |    8 +-
8393  include/linux/uaccess.h                            |    5 +-
8394  include/linux/uprobes.h                            |   52 +-
8395  include/linux/vtime.h                              |    4 +-
8396  include/net/busy_poll.h                            |   19 +-
8397  include/trace/events/ras.h                         |   10 +-
8398  include/uapi/asm-generic/statfs.h                  |    2 +-
8399  include/uapi/linux/perf_event.h                    |    1 +
8400  include/uapi/linux/sched.h                         |    1 +
8401  kernel/context_tracking.c                          |    8 +-
8402  kernel/cpu/idle.c                                  |   17 +-
8403  kernel/events/core.c                               |   31 +-
8404  kernel/events/ring_buffer.c                        |   42 +-
8405  kernel/events/uprobes.c                            |   60 +-
8406  kernel/fork.c                                      |   12 +-
8407  kernel/futex.c                                     |  201 ++-
8408  kernel/hrtimer.c                                   |    3 +-
8409  kernel/locking/lockdep.c                           |    4 +
8410  kernel/locking/mutex-debug.c                       |    7 +-
8411  kernel/locking/rtmutex-debug.c                     |    8 +-
8412  kernel/locking/rtmutex.c                           |  166 +-
8413  kernel/locking/rtmutex_common.h                    |   23 +-
8414  kernel/panic.c                                     |    2 +-
8415  kernel/posix-cpu-timers.c                          |  327 ++--
8416  kernel/rcu/rcu.h                                   |    5 +-
8417  kernel/rcu/srcu.c                                  |   57 +-
8418  kernel/rcu/torture.c                               |   75 +-
8419  kernel/rcu/tree.c                                  |   97 +-
8420  kernel/rcu/tree.h                                  |   12 +-
8421  kernel/rcu/tree_plugin.h                           |  102 +-
8422  kernel/rcu/tree_trace.c                            |    3 +-
8423  kernel/rcu/update.c                                |    5 +
8424  kernel/sched/Makefile                              |    5 +-
8425  kernel/sched/clock.c                               |   78 +-
8426  kernel/sched/core.c                                |  801 ++++++++--
8427  kernel/sched/cpudeadline.c                         |  216 +++
8428  kernel/sched/cpudeadline.h                         |   33 +
8429  kernel/sched/deadline.c                            | 1641 ++++++++++++++++++++
8430  kernel/sched/debug.c                               |    4 +-
8431  kernel/sched/fair.c                                |   85 +-
8432  kernel/sched/rt.c                                  |    2 +-
8433  kernel/sched/sched.h                               |  146 +-
8434  kernel/sched/stop_task.c                           |    2 +-
8435  kernel/softirq.c                                   |   92 +-
8436  kernel/sysctl.c                                    |    7 -
8437  kernel/time/sched_clock.c                          |    6 +-
8438  kernel/time/tick-broadcast.c                       |    6 +-
8439  kernel/time/tick-common.c                          |    1 +
8440  kernel/time/tick-internal.h                        |    5 +-
8441  kernel/time/tick-sched.c                           |   42 +-
8442  kernel/time/timekeeping.c                          |   53 +-
8443  kernel/trace/ring_buffer.c                         |    2 +-
8444  kernel/trace/trace_sched_wakeup.c                  |   65 +-
8445  kernel/trace/trace_selftest.c                      |   33 +-
8446  lib/Kconfig.debug                                  |    9 +
8447  net/ipv4/tcp.c                                     |    4 +-
8448  tools/Makefile                                     |   12 +-
8449  tools/lib/{lk => api}/Makefile                     |   18 +-
8450  tools/lib/{lk => api/fs}/debugfs.c                 |    0
8451  tools/lib/{lk => api/fs}/debugfs.h                 |    6 +-
8452  tools/lib/lockdep/Makefile                         |  251 +++
8453  tools/lib/lockdep/common.c                         |   33 +
8454  tools/lib/lockdep/include/liblockdep/common.h      |   50 +
8455  tools/lib/lockdep/include/liblockdep/mutex.h       |   70 +
8456  tools/lib/lockdep/include/liblockdep/rwlock.h      |   86 +
8457  tools/lib/lockdep/lockdep                          |    3 +
8458  tools/lib/lockdep/lockdep.c                        |    2 +
8459  tools/lib/lockdep/lockdep_internals.h              |    1 +
8460  tools/lib/lockdep/lockdep_states.h                 |    1 +
8461  tools/lib/lockdep/preload.c                        |  447 ++++++
8462  tools/lib/lockdep/rbtree.c                         |    1 +
8463  tools/lib/lockdep/run_tests.sh                     |   27 +
8464  tools/lib/lockdep/tests/AA.c                       |   13 +
8465  tools/lib/lockdep/tests/ABBA.c                     |   13 +
8466  tools/lib/lockdep/tests/ABBCCA.c                   |   15 +
8467  tools/lib/lockdep/tests/ABBCCDDA.c                 |   17 +
8468  tools/lib/lockdep/tests/ABCABC.c                   |   15 +
8469  tools/lib/lockdep/tests/ABCDBCDA.c                 |   17 +
8470  tools/lib/lockdep/tests/ABCDBDDA.c                 |   17 +
8471  tools/lib/lockdep/tests/WW.c                       |   13 +
8472  tools/lib/lockdep/tests/common.h                   |   12 +
8473  tools/lib/lockdep/tests/unlock_balance.c           |   12 +
8474  tools/lib/lockdep/uinclude/asm/hweight.h           |    3 +
8475  tools/lib/lockdep/uinclude/asm/sections.h          |    3 +
8476  tools/lib/lockdep/uinclude/linux/bitops.h          |    3 +
8477  tools/lib/lockdep/uinclude/linux/compiler.h        |    7 +
8478  tools/lib/lockdep/uinclude/linux/debug_locks.h     |   12 +
8479  tools/lib/lockdep/uinclude/linux/delay.h           |    3 +
8480  tools/lib/lockdep/uinclude/linux/export.h          |    7 +
8481  tools/lib/lockdep/uinclude/linux/ftrace.h          |    3 +
8482  tools/lib/lockdep/uinclude/linux/gfp.h             |    3 +
8483  tools/lib/lockdep/uinclude/linux/hardirq.h         |   11 +
8484  tools/lib/lockdep/uinclude/linux/hash.h            |    1 +
8485  tools/lib/lockdep/uinclude/linux/interrupt.h       |    3 +
8486  tools/lib/lockdep/uinclude/linux/irqflags.h        |   38 +
8487  tools/lib/lockdep/uinclude/linux/kallsyms.h        |   32 +
8488  tools/lib/lockdep/uinclude/linux/kern_levels.h     |   25 +
8489  tools/lib/lockdep/uinclude/linux/kernel.h          |   44 +
8490  tools/lib/lockdep/uinclude/linux/kmemcheck.h       |    8 +
8491  tools/lib/lockdep/uinclude/linux/linkage.h         |    3 +
8492  tools/lib/lockdep/uinclude/linux/list.h            |    1 +
8493  tools/lib/lockdep/uinclude/linux/lockdep.h         |   55 +
8494  tools/lib/lockdep/uinclude/linux/module.h          |    6 +
8495  tools/lib/lockdep/uinclude/linux/mutex.h           |    3 +
8496  tools/lib/lockdep/uinclude/linux/poison.h          |    1 +
8497  tools/lib/lockdep/uinclude/linux/prefetch.h        |    6 +
8498  tools/lib/lockdep/uinclude/linux/proc_fs.h         |    3 +
8499  tools/lib/lockdep/uinclude/linux/rbtree.h          |    1 +
8500  .../lib/lockdep/uinclude/linux/rbtree_augmented.h  |    2 +
8501  tools/lib/lockdep/uinclude/linux/rcu.h             |   16 +
8502  tools/lib/lockdep/uinclude/linux/seq_file.h        |    3 +
8503  tools/lib/lockdep/uinclude/linux/spinlock.h        |   25 +
8504  tools/lib/lockdep/uinclude/linux/stacktrace.h      |   32 +
8505  tools/lib/lockdep/uinclude/linux/stringify.h       |    7 +
8506  tools/lib/lockdep/uinclude/linux/types.h           |   58 +
8507  tools/lib/lockdep/uinclude/trace/events/lock.h     |    3 +
8508  tools/lib/symbol/kallsyms.c                        |   58 +
8509  tools/lib/symbol/kallsyms.h                        |   24 +
8510  tools/lib/traceevent/Makefile                      |  134 +-
8511  tools/lib/traceevent/event-parse.c                 |  108 +-
8512  tools/lib/traceevent/event-parse.h                 |   69 +-
8513  tools/lib/traceevent/event-plugin.c                |  215 +++
8514  tools/lib/traceevent/parse-filter.c                |  673 ++++----
8515  tools/lib/traceevent/plugin_cfg80211.c             |   24 +
8516  tools/lib/traceevent/plugin_function.c             |  160 ++
8517  tools/lib/traceevent/plugin_hrtimer.c              |   78 +
8518  tools/lib/traceevent/plugin_jbd2.c                 |   68 +
8519  tools/lib/traceevent/plugin_kmem.c                 |   72 +
8520  tools/lib/traceevent/plugin_kvm.c                  |  436 ++++++
8521  tools/lib/traceevent/plugin_mac80211.c             |   95 ++
8522  tools/lib/traceevent/plugin_sched_switch.c         |  148 ++
8523  tools/lib/traceevent/plugin_scsi.c                 |  423 +++++
8524  tools/lib/traceevent/plugin_xen.c                  |  130 ++
8525  tools/perf/Documentation/perf-archive.txt          |    6 +-
8526  tools/perf/Documentation/perf-kvm.txt              |   34 +-
8527  tools/perf/Documentation/perf-record.txt           |   12 +-
8528  tools/perf/Documentation/perf-report.txt           |    9 +
8529  tools/perf/Documentation/perf-script.txt           |   14 +-
8530  tools/perf/Documentation/perf-timechart.txt        |   42 +-
8531  tools/perf/Documentation/perf-top.txt              |    5 +-
8532  tools/perf/MANIFEST                                |    2 +
8533  tools/perf/Makefile                                |    7 +-
8534  tools/perf/Makefile.perf                           |   61 +-
8535  tools/perf/arch/common.c                           |    3 +-
8536  tools/perf/builtin-annotate.c                      |   15 +-
8537  tools/perf/builtin-diff.c                          |    5 +-
8538  tools/perf/builtin-inject.c                        |   65 +-
8539  tools/perf/builtin-kvm.c                           |   19 +-
8540  tools/perf/builtin-mem.c                           |    5 +-
8541  tools/perf/builtin-probe.c                         |   19 +-
8542  tools/perf/builtin-record.c                        |  117 +-
8543  tools/perf/builtin-report.c                        |  281 ++--
8544  tools/perf/builtin-sched.c                         |    2 +-
8545  tools/perf/builtin-script.c                        |  261 +++-
8546  tools/perf/builtin-stat.c                          |  120 +-
8547  tools/perf/builtin-timechart.c                     |  754 +++++----
8548  tools/perf/builtin-top.c                           |   52 +-
8549  tools/perf/builtin-trace.c                         |   66 +-
8550  tools/perf/config/Makefile                         |   71 +-
8551  tools/perf/config/feature-checks/.gitignore        |    2 +
8552  tools/perf/config/feature-checks/Makefile          |  120 +-
8553  tools/perf/config/feature-checks/test-all.c        |    5 +
8554  .../config/feature-checks/test-stackprotector.c    |    6 -
8555  tools/perf/config/utilities.mak                    |    7 -
8556  tools/perf/{bash_completion => perf-completion.sh} |  104 +-
8557  tools/perf/perf.c                                  |    2 +-
8558  tools/perf/perf.h                                  |    3 +-
8559  tools/perf/tests/attr/test-record-no-inherit       |    2 +-
8560  tools/perf/tests/code-reading.c                    |    2 +-
8561  tools/perf/tests/keep-tracking.c                   |    2 +-
8562  tools/perf/tests/make                              |   38 +-
8563  tools/perf/tests/open-syscall-tp-fields.c          |    2 +-
8564  tools/perf/tests/parse-events.c                    |    2 +-
8565  tools/perf/tests/perf-record.c                     |    2 +-
8566  tools/perf/tests/perf-time-to-tsc.c                |    2 +-
8567  tools/perf/ui/browser.c                            |    8 +-
8568  tools/perf/ui/browser.h                            |    2 +
8569  tools/perf/ui/browsers/header.c                    |  127 ++
8570  tools/perf/ui/browsers/hists.c                     |   63 +-
8571  tools/perf/ui/browsers/scripts.c                   |    3 +-
8572  tools/perf/ui/gtk/util.c                           |    3 +-
8573  tools/perf/ui/stdio/hist.c                         |    2 +-
8574  tools/perf/ui/tui/util.c                           |   19 +-
8575  tools/perf/util/alias.c                            |    6 +-
8576  tools/perf/util/annotate.c                         |   75 +-
8577  tools/perf/util/annotate.h                         |    9 +-
8578  tools/perf/util/build-id.c                         |    2 +-
8579  tools/perf/util/build-id.h                         |    2 +-
8580  tools/perf/util/callchain.h                        |    2 +-
8581  tools/perf/util/cgroup.c                           |    2 +-
8582  tools/perf/util/comm.c                             |    2 +-
8583  tools/perf/util/data.c                             |    6 +
8584  tools/perf/util/data.h                             |   14 +-
8585  tools/perf/util/debug.c                            |   31 +-
8586  tools/perf/util/debug.h                            |    2 +
8587  tools/perf/util/dso.c                              |  134 +-
8588  tools/perf/util/dso.h                              |   31 +-
8589  tools/perf/util/event.c                            |   49 +-
8590  tools/perf/util/evlist.c                           |   47 +-
8591  tools/perf/util/evlist.h                           |   12 +-
8592  tools/perf/util/evsel.c                            |   70 +-
8593  tools/perf/util/evsel.h                            |    7 +-
8594  tools/perf/util/header.c                           |   50 +-
8595  tools/perf/util/help.c                             |    7 +-
8596  tools/perf/util/hist.c                             |   27 +-
8597  tools/perf/util/hist.h                             |    3 -
8598  tools/perf/util/machine.c                          |   33 +-
8599  tools/perf/util/map.c                              |   17 +
8600  tools/perf/util/map.h                              |    2 +
8601  tools/perf/util/parse-events.c                     |   38 +-
8602  tools/perf/util/parse-options.c                    |   21 +
8603  tools/perf/util/parse-options.h                    |    8 +
8604  tools/perf/util/pmu.c                              |  140 +-
8605  tools/perf/util/pmu.h                              |    3 +-
8606  tools/perf/util/probe-event.c                      |  238 ++-
8607  tools/perf/util/probe-event.h                      |    1 +
8608  tools/perf/util/probe-finder.c                     |   33 +-
8609  tools/perf/util/python-ext-sources                 |    1 +
8610  tools/perf/util/record.c                           |   46 +-
8611  .../perf/util/scripting-engines/trace-event-perl.c |   22 +-
8612  .../util/scripting-engines/trace-event-python.c    |   28 +-
8613  tools/perf/util/session.c                          |  104 +-
8614  tools/perf/util/session.h                          |   10 +-
8615  tools/perf/util/setup.py                           |    4 +-
8616  tools/perf/util/sort.c                             |   22 +-
8617  tools/perf/util/srcline.c                          |   72 +-
8618  tools/perf/util/strbuf.c                           |    2 +-
8619  tools/perf/util/strfilter.c                        |    2 +-
8620  tools/perf/util/string.c                           |    2 +-
8621  tools/perf/util/strlist.c                          |    3 +-
8622  tools/perf/util/svghelper.c                        |  235 ++-
8623  tools/perf/util/svghelper.h                        |   17 +-
8624  tools/perf/util/symbol-elf.c                       |    3 +-
8625  tools/perf/util/symbol-minimal.c                   |    4 +-
8626  tools/perf/util/symbol.c                           |  165 +-
8627  tools/perf/util/symbol.h                           |   11 +-
8628  tools/perf/util/target.c                           |   11 +-
8629  tools/perf/util/target.h                           |   17 +-
8630  tools/perf/util/thread.c                           |    2 +-
8631  tools/perf/util/thread.h                           |   12 +
8632  tools/perf/util/thread_map.c                       |   20 +-
8633  tools/perf/util/top.c                              |    2 +-
8634  tools/perf/util/top.h                              |    2 +-
8635  tools/perf/util/trace-event-info.c                 |   12 +-
8636  tools/perf/util/trace-event-parse.c                |   13 -
8637  tools/perf/util/trace-event-read.c                 |   20 +-
8638  tools/perf/util/trace-event-scripting.c            |    3 +-
8639  tools/perf/util/trace-event.c                      |   82 +
8640  tools/perf/util/trace-event.h                      |   16 +-
8641  tools/perf/util/util.c                             |  136 +-
8642  tools/perf/util/util.h                             |   26 +-
8643  tools/perf/util/values.c                           |   14 +-
8644  tools/perf/util/vdso.c                             |    2 +-
8645  tools/scripts/Makefile.include                     |    4 +
8646  tools/testing/selftests/rcutorture/.gitignore      |    6 +
8647  .../selftests/rcutorture/bin/config2frag.sh        |   25 +
8648  .../selftests/rcutorture/bin/configNR_CPUS.sh      |   45 +
8649  .../selftests/rcutorture/bin/configcheck.sh        |   54 +
8650  .../testing/selftests/rcutorture/bin/configinit.sh |   74 +
8651  tools/testing/selftests/rcutorture/bin/cpus2use.sh |   41 +
8652  .../testing/selftests/rcutorture/bin/functions.sh  |  198 +++
8653  .../testing/selftests/rcutorture/bin/kvm-build.sh  |   71 +
8654  .../selftests/rcutorture/bin/kvm-recheck.sh        |   44 +
8655  .../selftests/rcutorture/bin/kvm-test-1-rcu.sh     |  192 +++
8656  tools/testing/selftests/rcutorture/bin/kvm.sh      |  210 +++
8657  .../selftests/rcutorture/bin/parse-build.sh        |   57 +
8658  .../selftests/rcutorture/bin/parse-console.sh      |   41 +
8659  .../selftests/rcutorture/bin/parse-rcutorture.sh   |  106 ++
8660  tools/testing/selftests/rcutorture/configs/CFLIST  |   13 +
8661  tools/testing/selftests/rcutorture/configs/SRCU-N  |    8 +
8662  .../selftests/rcutorture/configs/SRCU-N.boot       |    1 +
8663  tools/testing/selftests/rcutorture/configs/SRCU-P  |    8 +
8664  .../selftests/rcutorture/configs/SRCU-P.boot       |    1 +
8665  tools/testing/selftests/rcutorture/configs/TINY01  |   13 +
8666  tools/testing/selftests/rcutorture/configs/TINY02  |   13 +
8667  tools/testing/selftests/rcutorture/configs/TREE01  |   23 +
8668  .../selftests/rcutorture/configs/TREE01.boot       |    1 +
8669  tools/testing/selftests/rcutorture/configs/TREE02  |   26 +
8670  tools/testing/selftests/rcutorture/configs/TREE03  |   23 +
8671  tools/testing/selftests/rcutorture/configs/TREE04  |   25 +
8672  .../selftests/rcutorture/configs/TREE04.boot       |    1 +
8673  tools/testing/selftests/rcutorture/configs/TREE05  |   25 +
8674  .../selftests/rcutorture/configs/TREE05.boot       |    1 +
8675  tools/testing/selftests/rcutorture/configs/TREE06  |   26 +
8676  tools/testing/selftests/rcutorture/configs/TREE07  |   24 +
8677  tools/testing/selftests/rcutorture/configs/TREE08  |   26 +
8678  .../testing/selftests/rcutorture/configs/TREE08-T  |   26 +
8679  tools/testing/selftests/rcutorture/configs/TREE09  |   21 +
8680  .../selftests/rcutorture/configs/v0.0/CFLIST       |   14 +
8681  .../rcutorture/configs/v0.0/N1-S-T-NH-SD-SMP-HP    |   18 +
8682  .../rcutorture/configs/v0.0/N2-2-t-nh-sd-SMP-hp    |   20 +
8683  .../rcutorture/configs/v0.0/N3-3-T-nh-SD-SMP-hp    |   22 +
8684  .../rcutorture/configs/v0.0/N4-A-t-NH-sd-SMP-HP    |   18 +
8685  .../rcutorture/configs/v0.0/N5-U-T-NH-sd-SMP-hp    |   22 +
8686  .../selftests/rcutorture/configs/v0.0/NT1-nh       |   23 +
8687  .../selftests/rcutorture/configs/v0.0/NT3-NH       |   20 +
8688  .../rcutorture/configs/v0.0/P1-S-T-NH-SD-SMP-HP    |   19 +
8689  .../rcutorture/configs/v0.0/P2-2-t-nh-sd-SMP-hp    |   20 +
8690  .../rcutorture/configs/v0.0/P3-3-T-nh-SD-SMP-hp    |   20 +
8691  .../rcutorture/configs/v0.0/P4-A-t-NH-sd-SMP-HP    |   22 +
8692  .../rcutorture/configs/v0.0/P5-U-T-NH-sd-SMP-hp    |   28 +
8693  .../selftests/rcutorture/configs/v0.0/PT1-nh       |   23 +
8694  .../selftests/rcutorture/configs/v0.0/PT2-NH       |   22 +
8695  .../rcutorture/configs/v0.0/ver_functions.sh       |   35 +
8696  .../selftests/rcutorture/configs/v3.12/CFLIST      |   17 +
8697  .../rcutorture/configs/v3.12/N1-S-T-NH-SD-SMP-HP   |   19 +
8698  .../rcutorture/configs/v3.12/N2-2-t-nh-sd-SMP-hp   |   20 +
8699  .../rcutorture/configs/v3.12/N3-3-T-nh-SD-SMP-hp   |   22 +
8700  .../rcutorture/configs/v3.12/N4-A-t-NH-sd-SMP-HP   |   18 +
8701  .../rcutorture/configs/v3.12/N5-U-T-NH-sd-SMP-hp   |   22 +
8702  .../rcutorture/configs/v3.12/N6---t-nh-SD-smp-hp   |   19 +
8703  .../rcutorture/configs/v3.12/N7-4-T-NH-SD-SMP-HP   |   26 +
8704  .../rcutorture/configs/v3.12/N8-2-T-NH-SD-SMP-HP   |   22 +
8705  .../selftests/rcutorture/configs/v3.12/NT1-nh      |   23 +
8706  .../selftests/rcutorture/configs/v3.12/NT3-NH      |   20 +
8707  .../rcutorture/configs/v3.12/P1-S-T-NH-SD-SMP-HP   |   20 +
8708  .../rcutorture/configs/v3.12/P2-2-t-nh-sd-SMP-hp   |   20 +
8709  .../rcutorture/configs/v3.12/P3-3-T-nh-SD-SMP-hp   |   20 +
8710  .../rcutorture/configs/v3.12/P4-A-t-NH-sd-SMP-HP   |   22 +
8711  .../rcutorture/configs/v3.12/P5-U-T-NH-sd-SMP-hp   |   28 +
8712  .../rcutorture/configs/v3.12/P6---t-nh-SD-smp-hp   |   18 +
8713  .../rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP   |   30 +
8714  .../configs/v3.12/P7-4-T-NH-SD-SMP-HP-all          |   30 +
8715  .../configs/v3.12/P7-4-T-NH-SD-SMP-HP-none         |   30 +
8716  .../rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-hp   |   30 +
8717  .../selftests/rcutorture/configs/v3.12/PT1-nh      |   23 +
8718  .../selftests/rcutorture/configs/v3.12/PT2-NH      |   22 +
8719  .../selftests/rcutorture/configs/v3.3/CFLIST       |   14 +
8720  .../rcutorture/configs/v3.3/N1-S-T-NH-SD-SMP-HP    |   19 +
8721  .../rcutorture/configs/v3.3/N2-2-t-nh-sd-SMP-hp    |   20 +
8722  .../rcutorture/configs/v3.3/N3-3-T-nh-SD-SMP-hp    |   22 +
8723  .../rcutorture/configs/v3.3/N4-A-t-NH-sd-SMP-HP    |   18 +
8724  .../rcutorture/configs/v3.3/N5-U-T-NH-sd-SMP-hp    |   22 +
8725  .../selftests/rcutorture/configs/v3.3/NT1-nh       |   23 +
8726  .../selftests/rcutorture/configs/v3.3/NT3-NH       |   20 +
8727  .../rcutorture/configs/v3.3/P1-S-T-NH-SD-SMP-HP    |   20 +
8728  .../rcutorture/configs/v3.3/P2-2-t-nh-sd-SMP-hp    |   20 +
8729  .../rcutorture/configs/v3.3/P3-3-T-nh-SD-SMP-hp    |   20 +
8730  .../rcutorture/configs/v3.3/P4-A-t-NH-sd-SMP-HP    |   22 +
8731  .../rcutorture/configs/v3.3/P5-U-T-NH-sd-SMP-hp    |   28 +
8732  .../selftests/rcutorture/configs/v3.3/PT1-nh       |   23 +
8733  .../selftests/rcutorture/configs/v3.3/PT2-NH       |   22 +
8734  .../rcutorture/configs/v3.3/ver_functions.sh       |   41 +
8735  .../selftests/rcutorture/configs/v3.5/CFLIST       |   14 +
8736  .../rcutorture/configs/v3.5/N1-S-T-NH-SD-SMP-HP    |   19 +
8737  .../rcutorture/configs/v3.5/N2-2-t-nh-sd-SMP-hp    |   20 +
8738  .../rcutorture/configs/v3.5/N3-3-T-nh-SD-SMP-hp    |   22 +
8739  .../rcutorture/configs/v3.5/N4-A-t-NH-sd-SMP-HP    |   18 +
8740  .../rcutorture/configs/v3.5/N5-U-T-NH-sd-SMP-hp    |   22 +
8741  .../selftests/rcutorture/configs/v3.5/NT1-nh       |   23 +
8742  .../selftests/rcutorture/configs/v3.5/NT3-NH       |   20 +
8743  .../rcutorture/configs/v3.5/P1-S-T-NH-SD-SMP-HP    |   20 +
8744  .../rcutorture/configs/v3.5/P2-2-t-nh-sd-SMP-hp    |   20 +
8745  .../rcutorture/configs/v3.5/P3-3-T-nh-SD-SMP-hp    |   20 +
8746  .../rcutorture/configs/v3.5/P4-A-t-NH-sd-SMP-HP    |   22 +
8747  .../rcutorture/configs/v3.5/P5-U-T-NH-sd-SMP-hp    |   28 +
8748  .../selftests/rcutorture/configs/v3.5/PT1-nh       |   23 +
8749  .../selftests/rcutorture/configs/v3.5/PT2-NH       |   22 +
8750  .../rcutorture/configs/v3.5/ver_functions.sh       |   46 +
8751  .../selftests/rcutorture/configs/ver_functions.sh  |   46 +
8752  .../testing/selftests/rcutorture/doc/TINY_RCU.txt  |   40 +
8753  .../selftests/rcutorture/doc/TREE_RCU-Kconfig.txt  |   95 ++
8754  tools/testing/selftests/rcutorture/doc/initrd.txt  |   90 ++
8755  .../selftests/rcutorture/doc/rcu-test-image.txt    |   42 +
8756  tools/vm/Makefile                                  |   14 +-
8757  tools/vm/page-types.c                              |    2 +-
8758  632 files changed, 21021 insertions(+), 4728 deletions(-)
8759  create mode 100644 Documentation/ABI/testing/sysfs-firmware-efi
8760  create mode 100644 Documentation/ABI/testing/sysfs-firmware-efi-runtime-map
8761  create mode 100644 Documentation/ABI/testing/sysfs-kernel-boot_params
8762  create mode 100644 Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.txt
8763  delete mode 100644 arch/cris/include/asm/barrier.h
8764  delete mode 100644 arch/microblaze/include/asm/barrier.h
8765  delete mode 100644 arch/mn10300/include/asm/barrier.h
8766  delete mode 100644 arch/parisc/include/asm/barrier.h
8767  delete mode 100644 arch/score/include/asm/barrier.h
8768  create mode 100644 arch/x86/boot/compressed/aslr.c
8769  create mode 100644 arch/x86/boot/compressed/cpuflags.c
8770  create mode 100644 arch/x86/boot/cpuflags.c
8771  create mode 100644 arch/x86/boot/cpuflags.h
8772  create mode 100644 arch/x86/include/asm/iosf_mbi.h
8773  create mode 100644 arch/x86/kernel/cpu/microcode/Makefile
8774  rename arch/x86/kernel/{microcode_amd.c => cpu/microcode/amd.c} (96%)
8775  rename arch/x86/kernel/{microcode_amd_early.c => cpu/microcode/amd_early.c} (55%)
8776  rename arch/x86/kernel/{microcode_core.c => cpu/microcode/core.c} (100%)
8777  rename arch/x86/kernel/{microcode_core_early.c => cpu/microcode/core_early.c} (100%)
8778  rename arch/x86/kernel/{microcode_intel.c => cpu/microcode/intel.c} (100%)
8779  rename arch/x86/kernel/{microcode_intel_early.c => cpu/microcode/intel_early.c} (98%)
8780  rename arch/x86/kernel/{microcode_intel_lib.c => cpu/microcode/intel_lib.c} (100%)
8781  create mode 100644 arch/x86/kernel/cpu/perf_event_intel_rapl.c
8782  create mode 100644 arch/x86/kernel/iosf_mbi.c
8783  create mode 100644 arch/x86/kernel/ksysfs.c
8784  create mode 100644 drivers/clocksource/timer-sun5i.c
8785  create mode 100644 drivers/firmware/efi/runtime-map.c
8786  create mode 100644 include/linux/sched/deadline.h
8787  create mode 100644 kernel/sched/cpudeadline.c
8788  create mode 100644 kernel/sched/cpudeadline.h
8789  create mode 100644 kernel/sched/deadline.c
8790  rename tools/lib/{lk => api}/Makefile (66%)
8791  rename tools/lib/{lk => api/fs}/debugfs.c (100%)
8792  rename tools/lib/{lk => api/fs}/debugfs.h (86%)
8793  create mode 100644 tools/lib/lockdep/Makefile
8794  create mode 100644 tools/lib/lockdep/common.c
8795  create mode 100644 tools/lib/lockdep/include/liblockdep/common.h
8796  create mode 100644 tools/lib/lockdep/include/liblockdep/mutex.h
8797  create mode 100644 tools/lib/lockdep/include/liblockdep/rwlock.h
8798  create mode 100755 tools/lib/lockdep/lockdep
8799  create mode 100644 tools/lib/lockdep/lockdep.c
8800  create mode 100644 tools/lib/lockdep/lockdep_internals.h
8801  create mode 100644 tools/lib/lockdep/lockdep_states.h
8802  create mode 100644 tools/lib/lockdep/preload.c
8803  create mode 100644 tools/lib/lockdep/rbtree.c
8804  create mode 100644 tools/lib/lockdep/run_tests.sh
8805  create mode 100644 tools/lib/lockdep/tests/AA.c
8806  create mode 100644 tools/lib/lockdep/tests/ABBA.c
8807  create mode 100644 tools/lib/lockdep/tests/ABBCCA.c
8808  create mode 100644 tools/lib/lockdep/tests/ABBCCDDA.c
8809  create mode 100644 tools/lib/lockdep/tests/ABCABC.c
8810  create mode 100644 tools/lib/lockdep/tests/ABCDBCDA.c
8811  create mode 100644 tools/lib/lockdep/tests/ABCDBDDA.c
8812  create mode 100644 tools/lib/lockdep/tests/WW.c
8813  create mode 100644 tools/lib/lockdep/tests/common.h
8814  create mode 100644 tools/lib/lockdep/tests/unlock_balance.c
8815  create mode 100644 tools/lib/lockdep/uinclude/asm/hweight.h
8816  create mode 100644 tools/lib/lockdep/uinclude/asm/sections.h
8817  create mode 100644 tools/lib/lockdep/uinclude/linux/bitops.h
8818  create mode 100644 tools/lib/lockdep/uinclude/linux/compiler.h
8819  create mode 100644 tools/lib/lockdep/uinclude/linux/debug_locks.h
8820  create mode 100644 tools/lib/lockdep/uinclude/linux/delay.h
8821  create mode 100644 tools/lib/lockdep/uinclude/linux/export.h
8822  create mode 100644 tools/lib/lockdep/uinclude/linux/ftrace.h
8823  create mode 100644 tools/lib/lockdep/uinclude/linux/gfp.h
8824  create mode 100644 tools/lib/lockdep/uinclude/linux/hardirq.h
8825  create mode 100644 tools/lib/lockdep/uinclude/linux/hash.h
8826  create mode 100644 tools/lib/lockdep/uinclude/linux/interrupt.h
8827  create mode 100644 tools/lib/lockdep/uinclude/linux/irqflags.h
8828  create mode 100644 tools/lib/lockdep/uinclude/linux/kallsyms.h
8829  create mode 100644 tools/lib/lockdep/uinclude/linux/kern_levels.h
8830  create mode 100644 tools/lib/lockdep/uinclude/linux/kernel.h
8831  create mode 100644 tools/lib/lockdep/uinclude/linux/kmemcheck.h
8832  create mode 100644 tools/lib/lockdep/uinclude/linux/linkage.h
8833  create mode 100644 tools/lib/lockdep/uinclude/linux/list.h
8834  create mode 100644 tools/lib/lockdep/uinclude/linux/lockdep.h
8835  create mode 100644 tools/lib/lockdep/uinclude/linux/module.h
8836  create mode 100644 tools/lib/lockdep/uinclude/linux/mutex.h
8837  create mode 100644 tools/lib/lockdep/uinclude/linux/poison.h
8838  create mode 100644 tools/lib/lockdep/uinclude/linux/prefetch.h
8839  create mode 100644 tools/lib/lockdep/uinclude/linux/proc_fs.h
8840  create mode 100644 tools/lib/lockdep/uinclude/linux/rbtree.h
8841  create mode 100644 tools/lib/lockdep/uinclude/linux/rbtree_augmented.h
8842  create mode 100644 tools/lib/lockdep/uinclude/linux/rcu.h
8843  create mode 100644 tools/lib/lockdep/uinclude/linux/seq_file.h
8844  create mode 100644 tools/lib/lockdep/uinclude/linux/spinlock.h
8845  create mode 100644 tools/lib/lockdep/uinclude/linux/stacktrace.h
8846  create mode 100644 tools/lib/lockdep/uinclude/linux/stringify.h
8847  create mode 100644 tools/lib/lockdep/uinclude/linux/types.h
8848  create mode 100644 tools/lib/lockdep/uinclude/trace/events/lock.h
8849  create mode 100644 tools/lib/symbol/kallsyms.c
8850  create mode 100644 tools/lib/symbol/kallsyms.h
8851  create mode 100644 tools/lib/traceevent/event-plugin.c
8852  create mode 100644 tools/lib/traceevent/plugin_cfg80211.c
8853  create mode 100644 tools/lib/traceevent/plugin_function.c
8854  create mode 100644 tools/lib/traceevent/plugin_hrtimer.c
8855  create mode 100644 tools/lib/traceevent/plugin_jbd2.c
8856  create mode 100644 tools/lib/traceevent/plugin_kmem.c
8857  create mode 100644 tools/lib/traceevent/plugin_kvm.c
8858  create mode 100644 tools/lib/traceevent/plugin_mac80211.c
8859  create mode 100644 tools/lib/traceevent/plugin_sched_switch.c
8860  create mode 100644 tools/lib/traceevent/plugin_scsi.c
8861  create mode 100644 tools/lib/traceevent/plugin_xen.c
8862  create mode 100644 tools/perf/config/feature-checks/.gitignore
8863  delete mode 100644 tools/perf/config/feature-checks/test-stackprotector.c
8864  rename tools/perf/{bash_completion => perf-completion.sh} (63%)
8865  create mode 100644 tools/perf/ui/browsers/header.c
8866  create mode 100644 tools/perf/util/trace-event.c
8867  create mode 100644 tools/testing/selftests/rcutorture/.gitignore
8868  create mode 100644 tools/testing/selftests/rcutorture/bin/config2frag.sh
8869  create mode 100755 tools/testing/selftests/rcutorture/bin/configNR_CPUS.sh
8870  create mode 100755 tools/testing/selftests/rcutorture/bin/configcheck.sh
8871  create mode 100755 tools/testing/selftests/rcutorture/bin/configinit.sh
8872  create mode 100755 tools/testing/selftests/rcutorture/bin/cpus2use.sh
8873  create mode 100644 tools/testing/selftests/rcutorture/bin/functions.sh
8874  create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-build.sh
8875  create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck.sh
8876  create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh
8877  create mode 100644 tools/testing/selftests/rcutorture/bin/kvm.sh
8878  create mode 100755 tools/testing/selftests/rcutorture/bin/parse-build.sh
8879  create mode 100755 tools/testing/selftests/rcutorture/bin/parse-console.sh
8880  create mode 100755 tools/testing/selftests/rcutorture/bin/parse-rcutorture.sh
8881  create mode 100644 tools/testing/selftests/rcutorture/configs/CFLIST
8882  create mode 100644 tools/testing/selftests/rcutorture/configs/SRCU-N
8883  create mode 100644 tools/testing/selftests/rcutorture/configs/SRCU-N.boot
8884  create mode 100644 tools/testing/selftests/rcutorture/configs/SRCU-P
8885  create mode 100644 tools/testing/selftests/rcutorture/configs/SRCU-P.boot
8886  create mode 100644 tools/testing/selftests/rcutorture/configs/TINY01
8887  create mode 100644 tools/testing/selftests/rcutorture/configs/TINY02
8888  create mode 100644 tools/testing/selftests/rcutorture/configs/TREE01
8889  create mode 100644 tools/testing/selftests/rcutorture/configs/TREE01.boot
8890  create mode 100644 tools/testing/selftests/rcutorture/configs/TREE02
8891  create mode 100644 tools/testing/selftests/rcutorture/configs/TREE03
8892  create mode 100644 tools/testing/selftests/rcutorture/configs/TREE04
8893  create mode 100644 tools/testing/selftests/rcutorture/configs/TREE04.boot
8894  create mode 100644 tools/testing/selftests/rcutorture/configs/TREE05
8895  create mode 100644 tools/testing/selftests/rcutorture/configs/TREE05.boot
8896  create mode 100644 tools/testing/selftests/rcutorture/configs/TREE06
8897  create mode 100644 tools/testing/selftests/rcutorture/configs/TREE07
8898  create mode 100644 tools/testing/selftests/rcutorture/configs/TREE08
8899  create mode 100644 tools/testing/selftests/rcutorture/configs/TREE08-T
8900  create mode 100644 tools/testing/selftests/rcutorture/configs/TREE09
8901  create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/CFLIST
8902  create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N1-S-T-NH-SD-SMP-HP
8903  create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N2-2-t-nh-sd-SMP-hp
8904  create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N3-3-T-nh-SD-SMP-hp
8905  create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N4-A-t-NH-sd-SMP-HP
8906  create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N5-U-T-NH-sd-SMP-hp
8907  create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/NT1-nh
8908  create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/NT3-NH
8909  create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P1-S-T-NH-SD-SMP-HP
8910  create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P2-2-t-nh-sd-SMP-hp
8911  create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P3-3-T-nh-SD-SMP-hp
8912  create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P4-A-t-NH-sd-SMP-HP
8913  create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P5-U-T-NH-sd-SMP-hp
8914  create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/PT1-nh
8915  create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/PT2-NH
8916  create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/ver_functions.sh
8917  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/CFLIST
8918  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N1-S-T-NH-SD-SMP-HP
8919  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N2-2-t-nh-sd-SMP-hp
8920  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N3-3-T-nh-SD-SMP-hp
8921  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N4-A-t-NH-sd-SMP-HP
8922  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N5-U-T-NH-sd-SMP-hp
8923  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N6---t-nh-SD-smp-hp
8924  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N7-4-T-NH-SD-SMP-HP
8925  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N8-2-T-NH-SD-SMP-HP
8926  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/NT1-nh
8927  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/NT3-NH
8928  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P1-S-T-NH-SD-SMP-HP
8929  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P2-2-t-nh-sd-SMP-hp
8930  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P3-3-T-nh-SD-SMP-hp
8931  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P4-A-t-NH-sd-SMP-HP
8932  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P5-U-T-NH-sd-SMP-hp
8933  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P6---t-nh-SD-smp-hp
8934  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP
8935  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-all
8936  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-none
8937  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-hp
8938  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/PT1-nh
8939  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/PT2-NH
8940  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/CFLIST
8941  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N1-S-T-NH-SD-SMP-HP
8942  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N2-2-t-nh-sd-SMP-hp
8943  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N3-3-T-nh-SD-SMP-hp
8944  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N4-A-t-NH-sd-SMP-HP
8945  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N5-U-T-NH-sd-SMP-hp
8946  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/NT1-nh
8947  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/NT3-NH
8948  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P1-S-T-NH-SD-SMP-HP
8949  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P2-2-t-nh-sd-SMP-hp
8950  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P3-3-T-nh-SD-SMP-hp
8951  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P4-A-t-NH-sd-SMP-HP
8952  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P5-U-T-NH-sd-SMP-hp
8953  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/PT1-nh
8954  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/PT2-NH
8955  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/ver_functions.sh
8956  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/CFLIST
8957  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N1-S-T-NH-SD-SMP-HP
8958  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N2-2-t-nh-sd-SMP-hp
8959  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N3-3-T-nh-SD-SMP-hp
8960  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N4-A-t-NH-sd-SMP-HP
8961  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N5-U-T-NH-sd-SMP-hp
8962  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/NT1-nh
8963  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/NT3-NH
8964  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P1-S-T-NH-SD-SMP-HP
8965  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P2-2-t-nh-sd-SMP-hp
8966  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P3-3-T-nh-SD-SMP-hp
8967  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P4-A-t-NH-sd-SMP-HP
8968  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P5-U-T-NH-sd-SMP-hp
8969  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/PT1-nh
8970  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/PT2-NH
8971  create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/ver_functions.sh
8972  create mode 100644 tools/testing/selftests/rcutorture/configs/ver_functions.sh
8973  create mode 100644 tools/testing/selftests/rcutorture/doc/TINY_RCU.txt
8974  create mode 100644 tools/testing/selftests/rcutorture/doc/TREE_RCU-Kconfig.txt
8975  create mode 100644 tools/testing/selftests/rcutorture/doc/initrd.txt
8976  create mode 100644 tools/testing/selftests/rcutorture/doc/rcu-test-image.txt
8977 $ git revert 7760518cce95
8978 [master 4673f2b89de4] Revert "x86 idle: restore mwait_idle()"
8979  1 file changed, 46 deletions(-)
8980 Merging clockevents/clockevents/next (36489c2b3e5b clocksource: arch_timer: Set dynamic irq affinity on mmio clockevent)
8981 $ git merge clockevents/clockevents/next
8982 Auto-merging drivers/clocksource/Makefile
8983 Merge made by the 'recursive' strategy.
8984  .../bindings/timer/ti,keystone-timer.txt           |  29 +++
8985  drivers/clocksource/Makefile                       |   1 +
8986  drivers/clocksource/arm_arch_timer.c               |   1 +
8987  drivers/clocksource/clksrc-of.c.rej                |   9 +
8988  drivers/clocksource/timer-keystone.c               | 233 +++++++++++++++++++++
8989  5 files changed, 273 insertions(+)
8990  create mode 100644 Documentation/devicetree/bindings/timer/ti,keystone-timer.txt
8991  create mode 100644 drivers/clocksource/clksrc-of.c.rej
8992  create mode 100644 drivers/clocksource/timer-keystone.c
8993 Merging edac/linux_next (3e45588825c1 cell_edac: fix missing of_node_put)
8994 $ git merge edac/linux_next
8995 Already up-to-date.
8996 Merging edac-amd/for-next (881f0fcef999 EDAC: Don't try to cancel workqueue when it's never setup)
8997 $ git merge edac-amd/for-next
8998 Auto-merging drivers/edac/sb_edac.c
8999 Merge made by the 'recursive' strategy.
9000  drivers/edac/amd64_edac.c      | 135 +++++++++++++++++++----------------------
9001  drivers/edac/amd76x_edac.c     |   2 +-
9002  drivers/edac/e752x_edac.c      |   6 +-
9003  drivers/edac/e7xxx_edac.c      |   2 +-
9004  drivers/edac/edac_device.c     |   3 +
9005  drivers/edac/edac_mc_sysfs.c   |   2 +-
9006  drivers/edac/i3000_edac.c      |   2 +-
9007  drivers/edac/i3200_edac.c      |   2 +-
9008  drivers/edac/i5000_edac.c      |   2 +-
9009  drivers/edac/i5100_edac.c      |   2 +-
9010  drivers/edac/i5400_edac.c      |   2 +-
9011  drivers/edac/i7300_edac.c      |   2 +-
9012  drivers/edac/i7core_edac.c     |   2 +-
9013  drivers/edac/i82443bxgx_edac.c |   2 +-
9014  drivers/edac/i82860_edac.c     |   2 +-
9015  drivers/edac/i82875p_edac.c    |   2 +-
9016  drivers/edac/i82975x_edac.c    |   2 +-
9017  drivers/edac/mpc85xx_edac.c    |  98 ++++++++++++++++++++++++++----
9018  drivers/edac/mpc85xx_edac.h    |   7 +++
9019  drivers/edac/r82600_edac.c     |   2 +-
9020  drivers/edac/sb_edac.c         |   4 +-
9021  drivers/edac/x38_edac.c        |   2 +-
9022  22 files changed, 181 insertions(+), 104 deletions(-)
9023 Merging ftrace/for-next (a4c35ed24112 ftrace: Fix synchronization location disabling and freeing ftrace_ops)
9024 $ git merge ftrace/for-next
9025 Auto-merging kernel/trace/ftrace.c
9026 Auto-merging kernel/events/uprobes.c
9027 Merge made by the 'recursive' strategy.
9028  Documentation/trace/events.txt       |  207 +++++
9029  Documentation/trace/uprobetracer.txt |   36 +-
9030  include/linux/ftrace.h               |    2 -
9031  include/linux/ftrace_event.h         |  139 ++++
9032  include/trace/ftrace.h               |   29 +-
9033  kernel/events/uprobes.c              |    4 +
9034  kernel/trace/Makefile                |    1 +
9035  kernel/trace/ftrace.c                |  215 +++--
9036  kernel/trace/trace.c                 |   47 +-
9037  kernel/trace/trace.h                 |  193 +++++
9038  kernel/trace/trace_events.c          |   49 +-
9039  kernel/trace/trace_events_filter.c   |   12 +
9040  kernel/trace/trace_events_trigger.c  | 1437 ++++++++++++++++++++++++++++++++++
9041  kernel/trace/trace_kprobe.c          |  838 +++++++++++---------
9042  kernel/trace/trace_probe.c           |  440 ++++-------
9043  kernel/trace/trace_probe.h           |  224 ++++++
9044  kernel/trace/trace_stack.c           |    2 +-
9045  kernel/trace/trace_syscalls.c        |   14 +-
9046  kernel/trace/trace_uprobe.c          |  487 ++++++++----
9047  19 files changed, 3460 insertions(+), 916 deletions(-)
9048  create mode 100644 kernel/trace/trace_events_trigger.c
9049 Merging rcu/rcu/next (98cbc61863d3 Merge commit '0d3c55bc9fd58393bd3bd9974991ec1f815e1326' into HEAD)
9050 $ git merge rcu/rcu/next
9051 Merge made by the 'recursive' strategy.
9052  Documentation/memory-barriers.txt | 17 +++++++++++++++++
9053  include/linux/rcupdate.h          |  8 ++------
9054  2 files changed, 19 insertions(+), 6 deletions(-)
9055 Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
9056 $ git merge uprobes/for-next
9057 Already up-to-date.
9058 Merging kvm/linux-next (26a865f4aa8e KVM: VMX: fix use after free of vmx->loaded_vmcs)
9059 $ git merge kvm/linux-next
9060 Auto-merging virt/kvm/kvm_main.c
9061 Auto-merging arch/x86/kvm/x86.c
9062 Auto-merging arch/x86/kvm/vmx.c
9063 Auto-merging arch/x86/kvm/lapic.c
9064 Auto-merging arch/powerpc/kvm/book3s_hv.c
9065 Auto-merging arch/arm64/kvm/handle_exit.c
9066 Auto-merging arch/arm/kvm/arm.c
9067 Auto-merging MAINTAINERS
9068 Merge made by the 'recursive' strategy.
9069  Documentation/virtual/kvm/api.txt              |  11 +-
9070  Documentation/virtual/kvm/devices/arm-vgic.txt |  73 ++++
9071  Documentation/virtual/kvm/hypercalls.txt       |   5 +-
9072  Documentation/virtual/kvm/locking.txt          |   4 +-
9073  Documentation/virtual/kvm/ppc-pv.txt           |   2 +-
9074  Documentation/virtual/kvm/s390-diag.txt        |  80 ++++
9075  Documentation/virtual/kvm/timekeeping.txt      |   2 +-
9076  MAINTAINERS                                    |   2 +-
9077  arch/arm/include/asm/kvm_host.h                |   3 +
9078  arch/arm/include/uapi/asm/kvm.h                |  28 ++
9079  arch/arm/kvm/arm.c                             |  19 +-
9080  arch/arm/kvm/guest.c                           |  92 +++-
9081  arch/arm64/include/asm/kvm_host.h              |   7 +-
9082  arch/arm64/include/uapi/asm/kvm.h              |  21 +-
9083  arch/arm64/kvm/Kconfig                         |  11 +
9084  arch/arm64/kvm/guest.c                         |  32 +-
9085  arch/arm64/kvm/handle_exit.c                   |   3 -
9086  arch/arm64/kvm/sys_regs_generic_v8.c           |   3 +
9087  arch/ia64/kvm/kvm-ia64.c                       |   2 +-
9088  arch/powerpc/kvm/book3s_hv.c                   |   2 +-
9089  arch/s390/include/asm/sigp.h                   |   2 +
9090  arch/s390/kvm/diag.c                           |   4 +-
9091  arch/s390/kvm/kvm-s390.c                       |  53 +--
9092  arch/s390/kvm/kvm-s390.h                       |  10 +-
9093  arch/s390/kvm/priv.c                           |   4 +-
9094  arch/s390/kvm/sigp.c                           | 120 ++++-
9095  arch/s390/kvm/trace.h                          |   1 +
9096  arch/x86/include/asm/vmx.h                     |   1 +
9097  arch/x86/kvm/lapic.c                           |   6 +-
9098  arch/x86/kvm/mmu.c                             |   3 +
9099  arch/x86/kvm/vmx.c                             | 141 ++++--
9100  arch/x86/kvm/x86.c                             |   7 +-
9101  include/kvm/arm_vgic.h                         |   2 +-
9102  include/linux/irqchip/arm-gic.h                |  12 +
9103  include/linux/kvm_host.h                       |  20 +-
9104  include/uapi/linux/kvm.h                       |   1 +
9105  virt/kvm/arm/arch_timer.c                      |  34 ++
9106  virt/kvm/arm/vgic.c                            | 584 +++++++++++++++++++++++--
9107  virt/kvm/ioapic.c                              |   2 +-
9108  virt/kvm/ioapic.h                              |   1 -
9109  virt/kvm/kvm_main.c                            |  75 +---
9110  41 files changed, 1245 insertions(+), 240 deletions(-)
9111  create mode 100644 Documentation/virtual/kvm/devices/arm-vgic.txt
9112  create mode 100644 Documentation/virtual/kvm/s390-diag.txt
9113 $ git reset --hard HEAD^
9114 HEAD is now at c3419fc32e2d Merge remote-tracking branch 'rcu/rcu/next'
9115 Merging next-20140109 version of kvm
9116 $ git merge -m next-20140109/kvm 989c6b34f6a9480e397b170cc62237e89bf4fdb9
9117 Auto-merging virt/kvm/kvm_main.c
9118 Auto-merging arch/x86/kvm/x86.c
9119 Auto-merging arch/x86/kvm/vmx.c
9120 Auto-merging arch/powerpc/kvm/book3s_hv.c
9121 Auto-merging MAINTAINERS
9122 Merge made by the 'recursive' strategy.
9123  Documentation/virtual/kvm/hypercalls.txt |   3 +
9124  Documentation/virtual/kvm/s390-diag.txt  |  80 ++++++++++++++++++
9125  MAINTAINERS                              |   2 +-
9126  arch/ia64/kvm/kvm-ia64.c                 |   2 +-
9127  arch/powerpc/kvm/book3s_hv.c             |   2 +-
9128  arch/s390/include/asm/sigp.h             |   2 +
9129  arch/s390/kvm/diag.c                     |   4 +-
9130  arch/s390/kvm/kvm-s390.c                 |  53 ++++++------
9131  arch/s390/kvm/kvm-s390.h                 |  10 +--
9132  arch/s390/kvm/priv.c                     |   4 +-
9133  arch/s390/kvm/sigp.c                     | 120 ++++++++++++++++++++++-----
9134  arch/s390/kvm/trace.h                    |   1 +
9135  arch/x86/include/asm/vmx.h               |   1 +
9136  arch/x86/kvm/mmu.c                       |   3 +
9137  arch/x86/kvm/vmx.c                       | 134 ++++++++++++++++++++++++-------
9138  arch/x86/kvm/x86.c                       |   7 +-
9139  include/linux/kvm_host.h                 |   1 -
9140  virt/kvm/kvm_main.c                      |   8 --
9141  18 files changed, 333 insertions(+), 104 deletions(-)
9142  create mode 100644 Documentation/virtual/kvm/s390-diag.txt
9143 Merging kvm-arm/kvm-arm-next (61466710de07 KVM: ARM: Remove duplicate include)
9144 $ git merge kvm-arm/kvm-arm-next
9145 Auto-merging arch/arm/kvm/arm.c
9146 Merge made by the 'recursive' strategy.
9147  Documentation/virtual/kvm/api.txt |  2 +-
9148  arch/arm/include/asm/kvm_mmu.h    |  1 +
9149  arch/arm/kvm/arm.c                | 30 +++++++++++++++++++-----------
9150  arch/arm/kvm/handle_exit.c        |  2 --
9151  arch/arm/kvm/mmu.c                | 24 +++++++++++++-----------
9152  arch/arm/kvm/psci.c               | 11 ++++++-----
9153  arch/arm64/include/asm/kvm_mmu.h  |  1 +
9154  7 files changed, 41 insertions(+), 30 deletions(-)
9155 Merging kvm-ppc/kvm-ppc-next (27025a602cb9 powerpc: kvm: optimize "sc 1" as fast return)
9156 $ git merge kvm-ppc/kvm-ppc-next
9157 Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S
9158 Auto-merging arch/powerpc/kvm/book3s_hv.c
9159 Merge made by the 'recursive' strategy.
9160  arch/powerpc/kvm/book3s_hv.c            | 10 ++++------
9161  arch/powerpc/kvm/book3s_hv_rmhandlers.S | 19 ++++++++++++++++++-
9162  2 files changed, 22 insertions(+), 7 deletions(-)
9163 Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1)
9164 $ git merge oprofile/for-next
9165 Already up-to-date.
9166 Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work)
9167 $ git merge fw-nohz/nohz/next
9168 Already up-to-date.
9169 Merging xen-tip/linux-next (54d44eb3c7f6 xen/pvh: Use 'depend' instead of 'select'.)
9170 $ git merge xen-tip/linux-next
9171 Resolved 'arch/arm/include/asm/xen/page.h' using previous resolution.
9172 Auto-merging drivers/xen/events/events_base.c
9173 Auto-merging drivers/xen/Kconfig
9174 Auto-merging drivers/pci/xen-pcifront.c
9175 Auto-merging drivers/net/xen-netfront.c
9176 Auto-merging drivers/char/tpm/xen-tpmfront.c
9177 Auto-merging drivers/block/xen-blkfront.c
9178 Auto-merging arch/arm/include/asm/xen/page.h
9179 CONFLICT (content): Merge conflict in arch/arm/include/asm/xen/page.h
9180 Automatic merge failed; fix conflicts and then commit the result.
9181 $ git commit -v -a
9182 [master 2a6c7d4a6a6b] Merge remote-tracking branch 'xen-tip/linux-next'
9183 $ git diff -M --stat --summary HEAD^..
9184  arch/arm/include/asm/xen/page.h                |   3 +-
9185  arch/arm/xen/enlighten.c                       |   9 +-
9186  arch/x86/include/asm/xen/page.h                |   8 +-
9187  arch/x86/xen/Kconfig                           |   4 +
9188  arch/x86/xen/enlighten.c                       |  99 ++-
9189  arch/x86/xen/grant-table.c                     |  63 ++
9190  arch/x86/xen/irq.c                             |   5 +-
9191  arch/x86/xen/mmu.c                             | 166 ++---
9192  arch/x86/xen/p2m.c                             |  15 +-
9193  arch/x86/xen/platform-pci-unplug.c             |  79 ++-
9194  arch/x86/xen/setup.c                           |  40 +-
9195  arch/x86/xen/smp.c                             |  49 +-
9196  arch/x86/xen/time.c                            |   1 +
9197  arch/x86/xen/xen-head.S                        |  25 +-
9198  arch/x86/xen/xen-ops.h                         |   1 +
9199  drivers/block/xen-blkfront.c                   |   4 +-
9200  drivers/char/tpm/xen-tpmfront.c                |   4 +
9201  drivers/input/misc/xen-kbdfront.c              |   4 +
9202  drivers/net/xen-netfront.c                     |   2 +-
9203  drivers/pci/xen-pcifront.c                     |   4 +
9204  drivers/video/xen-fbfront.c                    |   6 +-
9205  drivers/xen/Kconfig                            |   1 -
9206  drivers/xen/Makefile                           |   3 +-
9207  drivers/xen/balloon.c                          |   9 +-
9208  drivers/xen/dbgp.c                             |   2 +-
9209  drivers/xen/events/Makefile                    |   5 +
9210  drivers/xen/events/events_2l.c                 | 372 ++++++++++++
9211  drivers/xen/{events.c => events/events_base.c} | 797 +++++++++----------------
9212  drivers/xen/events/events_fifo.c               | 428 +++++++++++++
9213  drivers/xen/events/events_internal.h           | 150 +++++
9214  drivers/xen/evtchn.c                           |   2 +-
9215  drivers/xen/gntdev.c                           |   2 +-
9216  drivers/xen/grant-table.c                      |  90 ++-
9217  drivers/xen/pci.c                              |   2 +
9218  drivers/xen/platform-pci.c                     |  11 +-
9219  drivers/xen/xenbus/xenbus_client.c             |   3 +-
9220  drivers/xen/xenbus/xenbus_probe_frontend.c     |   2 +-
9221  include/xen/events.h                           |   9 +
9222  include/xen/grant_table.h                      |   9 +-
9223  include/xen/interface/elfnote.h                |  13 +
9224  include/xen/interface/event_channel.h          |  68 +++
9225  include/xen/interface/xen.h                    |   6 -
9226  include/xen/platform_pci.h                     |  25 +-
9227  include/xen/xen.h                              |  14 +
9228  44 files changed, 1924 insertions(+), 690 deletions(-)
9229  create mode 100644 drivers/xen/events/Makefile
9230  create mode 100644 drivers/xen/events/events_2l.c
9231  rename drivers/xen/{events.c => events/events_base.c} (70%)
9232  create mode 100644 drivers/xen/events/events_fifo.c
9233  create mode 100644 drivers/xen/events/events_internal.h
9234 Merging percpu/for-next (3e7da78e081e percpu: use VMALLOC_TOTAL instead of VMALLOC_END - VMALLOC_START)
9235 $ git merge percpu/for-next
9236 Merge made by the 'recursive' strategy.
9237  lib/percpu-refcount.c | 3 +++
9238  mm/percpu.c           | 4 ++--
9239  2 files changed, 5 insertions(+), 2 deletions(-)
9240 Merging workqueues/for-next (9af16df84f0c Merge branch 'for-3.14' into for-next)
9241 $ git merge workqueues/for-next
9242 Resolved 'kernel/workqueue.c' using previous resolution.
9243 Auto-merging kernel/workqueue.c
9244 CONFLICT (content): Merge conflict in kernel/workqueue.c
9245 Automatic merge failed; fix conflicts and then commit the result.
9246 $ git commit -v -a
9247 [master 84f46e5b4bc6] Merge remote-tracking branch 'workqueues/for-next'
9248 $ git diff -M --stat --summary HEAD^..
9249  kernel/workqueue.c | 2 ++
9250  1 file changed, 2 insertions(+)
9251 Merging drivers-x86/linux-next (a80e1053aaa3 x86, wmi fix modalias_show return values)
9252 $ git merge drivers-x86/linux-next
9253 Already up-to-date.
9254 Merging chrome-platform/for-next (2b8454a75b90 platform/chrome: unregister platform driver/device when module exit)
9255 $ git merge chrome-platform/for-next
9256 Merge made by the 'recursive' strategy.
9257  drivers/platform/chrome/Kconfig           |  14 ++
9258  drivers/platform/chrome/Makefile          |   1 +
9259  drivers/platform/chrome/chromeos_laptop.c | 298 +++++++++++++++++++++---------
9260  drivers/platform/chrome/chromeos_pstore.c | 101 ++++++++++
9261  4 files changed, 323 insertions(+), 91 deletions(-)
9262  create mode 100644 drivers/platform/chrome/chromeos_pstore.c
9263 Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away)
9264 $ git merge sysctl/master
9265 Already up-to-date.
9266 Merging regmap/for-next (86776fc17497 Merge remote-tracking branch 'regmap/topic/ack' into regmap-next)
9267 $ git merge regmap/for-next
9268 Merge made by the 'recursive' strategy.
9269  drivers/base/regmap/regmap-irq.c |  6 ++--
9270  drivers/base/regmap/regmap.c     | 72 +++++++++++++++++++++++-----------------
9271  include/linux/regmap.h           | 15 +++++----
9272  3 files changed, 54 insertions(+), 39 deletions(-)
9273 Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt)
9274 $ git merge hsi/for-next
9275 Already up-to-date.
9276 Merging leds/for-next (44f17fa9218b leds: s3c24xx: Remove hardware.h inclusion)
9277 $ git merge leds/for-next
9278 Auto-merging include/linux/mfd/mc13xxx.h
9279 Auto-merging drivers/leds/leds-lp5523.c
9280 Merge made by the 'recursive' strategy.
9281  Documentation/devicetree/bindings/leds/tca6507.txt |  16 ++
9282  Documentation/leds/leds-lp55xx.txt                 |  10 +-
9283  arch/arm/mach-imx/mach-mx31moboard.c               |  16 +-
9284  drivers/leds/led-triggers.c                        |  15 +-
9285  drivers/leds/leds-lp5521.c                         |  18 +-
9286  drivers/leds/leds-lp5523.c                         |  20 +-
9287  drivers/leds/leds-lp55xx-common.c                  |   2 +
9288  drivers/leds/leds-mc13783.c                        |  89 +--------
9289  drivers/leds/leds-pwm.c                            |   9 +-
9290  drivers/leds/leds-s3c24xx.c                        |   3 +-
9291  drivers/leds/leds-tca6507.c                        | 207 ++++++++++++---------
9292  include/linux/mfd/mc13xxx.h                        |  37 +++-
9293  .../linux/platform_data/leds-kirkwood-netxbig.h    |   8 +-
9294  include/linux/platform_data/leds-kirkwood-ns2.h    |   8 +-
9295  14 files changed, 227 insertions(+), 231 deletions(-)
9296 Merging driver-core/driver-core-next (bb305947bdbb kernfs: fix get_active failure handling in kernfs_seq_*())
9297 $ git merge driver-core/driver-core-next
9298 Auto-merging lib/kobject.c
9299 Removing include/linux/kobj_completion.h
9300 Removing fs/sysfs/inode.c
9301 Auto-merging drivers/md/md.h
9302 Auto-merging drivers/base/Makefile
9303 Auto-merging arch/x86/kernel/cpu/microcode/intel.c
9304 Auto-merging arch/x86/kernel/cpu/microcode/amd.c
9305 Merge made by the 'recursive' strategy.
9306  Documentation/driver-model/design-patterns.txt |  116 +++
9307  Documentation/kobject.txt                      |    5 +-
9308  arch/x86/kernel/cpu/microcode/amd.c            |    2 +-
9309  arch/x86/kernel/cpu/microcode/intel.c          |    2 +-
9310  drivers/base/Makefile                          |    2 +-
9311  drivers/base/bus.c                             |   13 +-
9312  drivers/base/component.c                       |  382 +++++++++
9313  drivers/base/core.c                            |    7 +-
9314  drivers/base/devtmpfs.c                        |    2 +-
9315  drivers/base/firmware_class.c                  |   93 +-
9316  drivers/firmware/dmi-sysfs.c                   |    3 +-
9317  drivers/gpio/gpiolib.c                         |    4 +-
9318  drivers/md/bitmap.c                            |    2 +-
9319  drivers/md/bitmap.h                            |    2 +-
9320  drivers/md/md.h                                |   10 +-
9321  drivers/misc/mic/host/mic_device.h             |    2 +-
9322  fs/Makefile                                    |    2 +-
9323  fs/kernfs/Makefile                             |    5 +
9324  fs/kernfs/dir.c                                | 1061 +++++++++++++++++++++++
9325  fs/kernfs/file.c                               |  868 +++++++++++++++++++
9326  fs/kernfs/inode.c                              |  377 +++++++++
9327  fs/kernfs/kernfs-internal.h                    |  122 +++
9328  fs/kernfs/mount.c                              |  165 ++++
9329  fs/kernfs/symlink.c                            |  152 ++++
9330  fs/namespace.c                                 |    2 +
9331  fs/sysfs/Makefile                              |    2 +-
9332  fs/sysfs/dir.c                                 | 1075 +-----------------------
9333  fs/sysfs/file.c                                |  961 ++++-----------------
9334  fs/sysfs/group.c                               |  102 +--
9335  fs/sysfs/inode.c                               |  331 --------
9336  fs/sysfs/mount.c                               |  184 +---
9337  fs/sysfs/symlink.c                             |  219 +----
9338  fs/sysfs/sysfs.h                               |  236 +-----
9339  include/linux/component.h                      |   32 +
9340  include/linux/firmware.h                       |    7 +
9341  include/linux/kernfs.h                         |  375 +++++++++
9342  include/linux/kobj_completion.h                |   18 -
9343  include/linux/kobject.h                        |    2 +-
9344  include/linux/memory.h                         |    1 +
9345  include/linux/sysfs.h                          |   47 +-
9346  lib/kobject.c                                  |   95 +--
9347  samples/kobject/kset-example.c                 |    1 +
9348  42 files changed, 4175 insertions(+), 2914 deletions(-)
9349  create mode 100644 Documentation/driver-model/design-patterns.txt
9350  create mode 100644 drivers/base/component.c
9351  create mode 100644 fs/kernfs/Makefile
9352  create mode 100644 fs/kernfs/dir.c
9353  create mode 100644 fs/kernfs/file.c
9354  create mode 100644 fs/kernfs/inode.c
9355  create mode 100644 fs/kernfs/kernfs-internal.h
9356  create mode 100644 fs/kernfs/mount.c
9357  create mode 100644 fs/kernfs/symlink.c
9358  delete mode 100644 fs/sysfs/inode.c
9359  create mode 100644 include/linux/component.h
9360  create mode 100644 include/linux/kernfs.h
9361  delete mode 100644 include/linux/kobj_completion.h
9362 Merging tty/tty-next (8bc661bfc0c2 tty/serial: at91: disable uart timer at start of shutdown)
9363 $ git merge tty/tty-next
9364 Removing drivers/tty/serial/sc26xx.c
9365 Auto-merging drivers/tty/serial/Kconfig
9366 Merge made by the 'recursive' strategy.
9367  .../devicetree/bindings/serial/atmel-usart.txt     |   7 +
9368  .../bindings/serial/cirrus,clps711x-uart.txt       |  28 +
9369  arch/arm/mach-clps711x/devices.c                   |  21 +
9370  drivers/char/pcmcia/synclink_cs.c                  |   4 +-
9371  drivers/input/serio/serport.c                      |  28 +-
9372  drivers/parport/parport_serial.c                   |   5 -
9373  drivers/staging/fwserial/Kconfig                   |  20 +
9374  drivers/staging/fwserial/fwserial.c                | 151 ++---
9375  drivers/staging/fwserial/fwserial.h                |  24 +-
9376  drivers/tty/amiserial.c                            |  26 +-
9377  drivers/tty/cyclades.c                             |   2 +
9378  drivers/tty/goldfish.c                             |   1 -
9379  drivers/tty/hvc/hvc_console.c                      |   2 +-
9380  drivers/tty/hvc/hvsi_lib.c                         |   1 -
9381  drivers/tty/ipwireless/tty.c                       |   1 -
9382  drivers/tty/n_gsm.c                                |  63 +-
9383  drivers/tty/n_r3964.c                              |   2 +-
9384  drivers/tty/n_tty.c                                | 113 ++--
9385  drivers/tty/rocket.c                               |   2 +-
9386  drivers/tty/serial/8250/8250_core.c                |   4 +
9387  drivers/tty/serial/8250/8250_dw.c                  |   9 -
9388  drivers/tty/serial/8250/8250_em.c                  |   1 -
9389  drivers/tty/serial/8250/8250_pci.c                 |   9 +-
9390  drivers/tty/serial/8250/8250_pnp.c                 |   1 -
9391  drivers/tty/serial/8250/serial_cs.c                |   1 -
9392  drivers/tty/serial/Kconfig                         |  21 +-
9393  drivers/tty/serial/Makefile                        |   1 -
9394  drivers/tty/serial/amba-pl010.c                    |  15 +-
9395  drivers/tty/serial/amba-pl011.c                    |  84 +--
9396  drivers/tty/serial/atmel_serial.c                  |  45 +-
9397  drivers/tty/serial/clps711x.c                      | 454 +++++++------
9398  drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c        |   1 -
9399  drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c        |   1 -
9400  drivers/tty/serial/imx.c                           |   8 +
9401  drivers/tty/serial/kgdb_nmi.c                      |   1 -
9402  drivers/tty/serial/mxs-auart.c                     |   9 +-
9403  drivers/tty/serial/of_serial.c                     |   1 -
9404  drivers/tty/serial/pch_uart.c                      |   3 +-
9405  drivers/tty/serial/rp2.c                           |   2 +-
9406  drivers/tty/serial/sc26xx.c                        | 749 ---------------------
9407  drivers/tty/serial/serial_core.c                   |   8 +-
9408  drivers/tty/serial/sirfsoc_uart.c                  |  39 +-
9409  drivers/tty/synclink.c                             |   4 +-
9410  drivers/tty/synclink_gt.c                          |   4 +-
9411  drivers/tty/synclinkmp.c                           |   4 +-
9412  drivers/tty/tty_buffer.c                           | 111 +--
9413  drivers/tty/tty_ldisc.c                            |   1 -
9414  drivers/tty/tty_port.c                             |   1 -
9415  include/linux/init.h                               |   2 +
9416  include/linux/tty.h                                |   8 +-
9417  include/linux/tty_flip.h                           |  11 +-
9418  include/linux/tty_ldisc.h                          |   6 +-
9419  52 files changed, 752 insertions(+), 1368 deletions(-)
9420  create mode 100644 Documentation/devicetree/bindings/serial/cirrus,clps711x-uart.txt
9421  delete mode 100644 drivers/tty/serial/sc26xx.c
9422 Merging usb/usb-next (2fc5a7dace3c usb: chipidea: udc: using MultO at TD as real mult value for ISO-TX)
9423 $ git merge usb/usb-next
9424 Auto-merging include/linux/usb/otg-fsm.h
9425 Auto-merging include/linux/tty.h
9426 Auto-merging drivers/usb/serial/kobil_sct.c
9427 Auto-merging drivers/usb/phy/phy-msm-usb.c
9428 Auto-merging drivers/usb/host/r8a66597-hcd.c
9429 Auto-merging drivers/usb/host/ehci-tegra.c
9430 Auto-merging drivers/usb/gadget/atmel_usba_udc.c
9431 Auto-merging drivers/usb/core/usb-acpi.c
9432 Merge made by the 'recursive' strategy.
9433  Documentation/ABI/testing/configfs-usb-gadget-ffs  |     9 +
9434  .../ABI/testing/configfs-usb-gadget-loopback       |     8 +
9435  .../ABI/testing/configfs-usb-gadget-sourcesink     |    12 +
9436  Documentation/ABI/testing/sysfs-bus-usb            |    10 +-
9437  Documentation/ABI/testing/sysfs-platform-tahvo-usb |    16 +
9438  Documentation/devicetree/bindings/phy/bcm-phy.txt  |    15 +
9439  Documentation/devicetree/bindings/staging/dwc2.txt |    12 +
9440  .../usb/{ci13xxx-imx.txt => ci-hdrc-imx.txt}       |     0
9441  Documentation/devicetree/bindings/usb/gr-udc.txt   |    28 +
9442  Documentation/devicetree/bindings/usb/omap-usb.txt |     2 +
9443  arch/arm/mach-omap1/include/mach/usb.h             |    38 +-
9444  drivers/phy/Kconfig                                |     6 +
9445  drivers/phy/Makefile                               |     1 +
9446  drivers/phy/phy-bcm-kona-usb2.c                    |   158 +
9447  drivers/staging/dwc2/hcd.c                         |     2 +
9448  drivers/staging/octeon-usb/octeon-hcd.c            |     1 +
9449  drivers/staging/ozwpan/ozhcd.c                     |     2 +
9450  drivers/usb/Kconfig                                |     4 +-
9451  drivers/usb/atm/cxacru.c                           |     1 -
9452  drivers/usb/atm/speedtch.c                         |     1 -
9453  drivers/usb/atm/ueagle-atm.c                       |     1 -
9454  drivers/usb/atm/usbatm.c                           |     8 +-
9455  drivers/usb/c67x00/Makefile                        |     2 -
9456  drivers/usb/c67x00/c67x00-hcd.c                    |     2 +
9457  drivers/usb/c67x00/c67x00-hcd.h                    |     2 +-
9458  drivers/usb/c67x00/c67x00-ll-hpi.c                 |    14 +-
9459  drivers/usb/c67x00/c67x00-sched.c                  |    33 +-
9460  drivers/usb/chipidea/Makefile                      |     2 +-
9461  drivers/usb/chipidea/ci.h                          |    89 +-
9462  drivers/usb/chipidea/ci_hdrc_imx.c                 |    32 +-
9463  drivers/usb/chipidea/ci_hdrc_imx.h                 |     5 +
9464  drivers/usb/chipidea/ci_hdrc_pci.c                 |     2 +-
9465  drivers/usb/chipidea/core.c                        |   105 +-
9466  drivers/usb/chipidea/host.c                        |     1 +
9467  drivers/usb/chipidea/otg.h                         |     6 +-
9468  drivers/usb/chipidea/udc.c                         |    23 +-
9469  drivers/usb/chipidea/usbmisc_imx.c                 |    46 +
9470  drivers/usb/class/cdc-acm.c                        |   116 +-
9471  drivers/usb/class/cdc-acm.h                        |     3 +
9472  drivers/usb/class/cdc-wdm.c                        |    70 +-
9473  drivers/usb/class/usblp.c                          |     1 -
9474  drivers/usb/class/usbtmc.c                         |     1 -
9475  drivers/usb/core/Makefile                          |     2 -
9476  drivers/usb/core/buffer.c                          |     2 +-
9477  drivers/usb/core/config.c                          |     8 -
9478  drivers/usb/core/devio.c                           |     2 +-
9479  drivers/usb/core/driver.c                          |    33 +-
9480  drivers/usb/core/hcd-pci.c                         |     1 +
9481  drivers/usb/core/hcd.c                             |    40 +-
9482  drivers/usb/core/hub.c                             |   116 +-
9483  drivers/usb/core/hub.h                             |     2 +-
9484  drivers/usb/core/message.c                         |     5 +-
9485  drivers/usb/core/quirks.c                          |     3 -
9486  drivers/usb/core/sysfs.c                           |     2 +-
9487  drivers/usb/core/urb.c                             |    25 +-
9488  drivers/usb/core/usb-acpi.c                        |     2 +-
9489  drivers/usb/dwc3/Kconfig                           |     7 +
9490  drivers/usb/dwc3/Makefile                          |     1 +
9491  drivers/usb/dwc3/dwc3-exynos.c                     |     1 +
9492  drivers/usb/dwc3/dwc3-keystone.c                   |   202 +
9493  drivers/usb/dwc3/dwc3-omap.c                       |    12 +-
9494  drivers/usb/dwc3/dwc3-pci.c                        |     3 +-
9495  drivers/usb/dwc3/gadget.c                          |    10 +-
9496  drivers/usb/gadget/Kconfig                         |    54 +-
9497  drivers/usb/gadget/Makefile                        |     9 +-
9498  drivers/usb/gadget/acm_ms.c                        |     2 +-
9499  drivers/usb/gadget/amd5536udc.c                    |    18 +-
9500  drivers/usb/gadget/at91_udc.c                      |    17 +-
9501  drivers/usb/gadget/atmel_usba_udc.c                |    71 +-
9502  drivers/usb/gadget/bcm63xx_udc.c                   |     5 +-
9503  drivers/usb/gadget/composite.c                     |    18 +-
9504  drivers/usb/gadget/configfs.c                      |     8 +
9505  drivers/usb/gadget/dummy_hcd.c                     |     2 +-
9506  drivers/usb/gadget/epautoconf.c                    |     9 +-
9507  drivers/usb/gadget/f_ecm.c                         |    73 +-
9508  drivers/usb/gadget/f_fs.c                          |  1012 +-
9509  drivers/usb/gadget/f_hid.c                         |    18 +-
9510  drivers/usb/gadget/f_loopback.c                    |   144 +-
9511  drivers/usb/gadget/f_midi.c                        |    22 +-
9512  drivers/usb/gadget/f_ncm.c                         |     2 +-
9513  drivers/usb/gadget/f_obex.c                        |     2 +-
9514  drivers/usb/gadget/f_phonet.c                      |     2 +-
9515  drivers/usb/gadget/f_rndis.c                       |    94 +-
9516  drivers/usb/gadget/f_serial.c                      |     2 +-
9517  drivers/usb/gadget/f_sourcesink.c                  |   349 +-
9518  drivers/usb/gadget/f_subset.c                      |    60 +-
9519  drivers/usb/gadget/fotg210-udc.c                   |     3 +-
9520  drivers/usb/gadget/fsl_qe_udc.c                    |     5 +-
9521  drivers/usb/gadget/fsl_udc_core.c                  |     7 +-
9522  drivers/usb/gadget/fusb300_udc.c                   |     4 +-
9523  drivers/usb/gadget/g_ffs.c                         |   466 +-
9524  drivers/usb/gadget/g_zero.h                        |    24 +-
9525  drivers/usb/gadget/goku_udc.c                      |    17 +-
9526  drivers/usb/gadget/gr_udc.c                        |  2238 ++++
9527  drivers/usb/gadget/gr_udc.h                        |   220 +
9528  drivers/usb/gadget/lpc32xx_udc.c                   |     2 +-
9529  drivers/usb/gadget/m66592-udc.c                    |     4 +-
9530  drivers/usb/gadget/multi.c                         |     2 +-
9531  drivers/usb/gadget/mv_u3d_core.c                   |     5 +-
9532  drivers/usb/gadget/mv_udc_core.c                   |     5 +-
9533  drivers/usb/gadget/net2272.c                       |     4 +-
9534  drivers/usb/gadget/net2280.c                       |     8 +-
9535  drivers/usb/gadget/nokia.c                         |     6 +-
9536  drivers/usb/gadget/omap_udc.c                      |     4 +-
9537  drivers/usb/gadget/pch_udc.c                       |     8 +-
9538  drivers/usb/gadget/pxa25x_udc.c                    |     2 +-
9539  drivers/usb/gadget/pxa27x_udc.c                    |     5 +-
9540  drivers/usb/gadget/r8a66597-udc.c                  |    10 +-
9541  drivers/usb/gadget/rndis.c                         |     8 +-
9542  drivers/usb/gadget/s3c-hsotg.c                     |    80 +-
9543  drivers/usb/gadget/s3c-hsotg.h                     |     1 +
9544  drivers/usb/gadget/s3c-hsudc.c                     |     2 +-
9545  drivers/usb/gadget/s3c2410_udc.c                   |     1 +
9546  drivers/usb/gadget/u_ether.c                       |     2 +-
9547  drivers/usb/gadget/u_ether.h                       |    43 +-
9548  drivers/usb/gadget/u_f.c                           |    32 +
9549  drivers/usb/gadget/u_f.h                           |    26 +
9550  drivers/usb/gadget/u_fs.h                          |   267 +
9551  drivers/usb/gadget/u_rndis.h                       |     2 +
9552  drivers/usb/gadget/usbstring.c                     |     1 -
9553  drivers/usb/gadget/zero.c                          |     8 +-
9554  drivers/usb/host/Makefile                          |     2 -
9555  drivers/usb/host/ehci-atmel.c                      |     1 +
9556  drivers/usb/host/ehci-dbg.c                        |    10 +-
9557  drivers/usb/host/ehci-exynos.c                     |     1 +
9558  drivers/usb/host/ehci-fsl.c                        |    33 +-
9559  drivers/usb/host/ehci-grlib.c                      |     4 +-
9560  drivers/usb/host/ehci-hcd.c                        |    14 +-
9561  drivers/usb/host/ehci-hub.c                        |     6 +-
9562  drivers/usb/host/ehci-mv.c                         |     3 +-
9563  drivers/usb/host/ehci-mxc.c                        |     1 +
9564  drivers/usb/host/ehci-octeon.c                     |    24 +-
9565  drivers/usb/host/ehci-omap.c                       |     1 +
9566  drivers/usb/host/ehci-orion.c                      |    46 +-
9567  drivers/usb/host/ehci-platform.c                   |     1 +
9568  drivers/usb/host/ehci-pmcmsp.c                     |     4 +-
9569  drivers/usb/host/ehci-ppc-of.c                     |     4 +-
9570  drivers/usb/host/ehci-ps3.c                        |     1 +
9571  drivers/usb/host/ehci-q.c                          |     4 +-
9572  drivers/usb/host/ehci-sead3.c                      |     1 +
9573  drivers/usb/host/ehci-sh.c                         |     1 +
9574  drivers/usb/host/ehci-spear.c                      |     1 +
9575  drivers/usb/host/ehci-tegra.c                      |     1 +
9576  drivers/usb/host/ehci-tilegx.c                     |     1 +
9577  drivers/usb/host/ehci-w90x900.c                    |    22 +-
9578  drivers/usb/host/ehci-xilinx-of.c                  |     7 +-
9579  drivers/usb/host/ehci.h                            |    26 +-
9580  drivers/usb/host/fhci-hcd.c                        |     2 +
9581  drivers/usb/host/fotg210-hcd.c                     |    96 +-
9582  drivers/usb/host/fotg210.h                         |     8 -
9583  drivers/usb/host/fusbh200-hcd.c                    |    98 +-
9584  drivers/usb/host/fusbh200.h                        |    12 -
9585  drivers/usb/host/hwa-hc.c                          |    24 +-
9586  drivers/usb/host/imx21-dbg.c                       |     4 +
9587  drivers/usb/host/imx21-hcd.c                       |     7 +-
9588  drivers/usb/host/imx21-hcd.h                       |     4 +
9589  drivers/usb/host/isp116x-hcd.c                     |     5 +-
9590  drivers/usb/host/isp1362-hcd.c                     |     5 +-
9591  drivers/usb/host/isp1760-hcd.c                     |     1 +
9592  drivers/usb/host/ohci-at91.c                       |    82 +-
9593  drivers/usb/host/ohci-da8xx.c                      |    73 +-
9594  drivers/usb/host/ohci-dbg.c                        |    69 -
9595  drivers/usb/host/ohci-exynos.c                     |    23 +-
9596  drivers/usb/host/ohci-hcd.c                        |    29 +-
9597  drivers/usb/host/ohci-hub.c                        |     6 +-
9598  drivers/usb/host/ohci-jz4740.c                     |    40 +-
9599  drivers/usb/host/ohci-nxp.c                        |    30 +-
9600  drivers/usb/host/ohci-octeon.c                     |    25 +-
9601  drivers/usb/host/ohci-omap.c                       |     5 +-
9602  drivers/usb/host/ohci-omap3.c                      |     1 +
9603  drivers/usb/host/ohci-platform.c                   |     2 +
9604  drivers/usb/host/ohci-ppc-of.c                     |    28 +-
9605  drivers/usb/host/ohci-ps3.c                        |     1 +
9606  drivers/usb/host/ohci-pxa27x.c                     |    42 +-
9607  drivers/usb/host/ohci-q.c                          |    12 +-
9608  drivers/usb/host/ohci-s3c2410.c                    |    22 +-
9609  drivers/usb/host/ohci-sa1111.c                     |     4 +-
9610  drivers/usb/host/ohci-sm501.c                      |     1 +
9611  drivers/usb/host/ohci-spear.c                      |    29 +-
9612  drivers/usb/host/ohci-tilegx.c                     |     1 +
9613  drivers/usb/host/ohci-tmio.c                       |     2 +-
9614  drivers/usb/host/ohci.h                            |    13 +-
9615  drivers/usb/host/oxu210hp-hcd.c                    |     6 +-
9616  drivers/usb/host/pci-quirks.c                      |     1 -
9617  drivers/usb/host/r8a66597-hcd.c                    |     4 +-
9618  drivers/usb/host/sl811-hcd.c                       |     3 +-
9619  drivers/usb/host/sl811_cs.c                        |     1 -
9620  drivers/usb/host/u132-hcd.c                        |     3 +-
9621  drivers/usb/host/uhci-debug.c                      |     4 +-
9622  drivers/usb/host/uhci-grlib.c                      |     1 +
9623  drivers/usb/host/uhci-hcd.c                        |    44 +-
9624  drivers/usb/host/uhci-pci.c                        |     2 +-
9625  drivers/usb/host/uhci-platform.c                   |     1 +
9626  drivers/usb/host/whci/hcd.c                        |     1 +
9627  drivers/usb/host/whci/int.c                        |     1 -
9628  drivers/usb/host/whci/wusb.c                       |     1 -
9629  drivers/usb/host/xhci-dbg.c                        |    42 +-
9630  drivers/usb/host/xhci-hub.c                        |   106 +-
9631  drivers/usb/host/xhci-mem.c                        |    68 +-
9632  drivers/usb/host/xhci-pci.c                        |     1 +
9633  drivers/usb/host/xhci-plat.c                       |     2 +
9634  drivers/usb/host/xhci-ring.c                       |    50 +-
9635  drivers/usb/host/xhci-trace.h                      |     6 +-
9636  drivers/usb/host/xhci.c                            |   227 +-
9637  drivers/usb/host/xhci.h                            |    67 +-
9638  drivers/usb/image/mdc800.c                         |     2 +-
9639  drivers/usb/image/microtek.c                       |     1 -
9640  drivers/usb/misc/adutux.c                          |     1 -
9641  drivers/usb/misc/cypress_cy7c63.c                  |     1 -
9642  drivers/usb/misc/cytherm.c                         |     1 -
9643  drivers/usb/misc/emi26.c                           |     1 -
9644  drivers/usb/misc/emi62.c                           |     1 -
9645  drivers/usb/misc/ezusb.c                           |     1 -
9646  drivers/usb/misc/idmouse.c                         |     3 +-
9647  drivers/usb/misc/iowarrior.c                       |     3 +-
9648  drivers/usb/misc/ldusb.c                           |     1 -
9649  drivers/usb/misc/legousbtower.c                    |     1 -
9650  drivers/usb/misc/rio500.c                          |     1 -
9651  drivers/usb/misc/sisusbvga/sisusb_init.c           |     1 -
9652  drivers/usb/misc/trancevibrator.c                  |     1 -
9653  drivers/usb/misc/usblcd.c                          |     1 -
9654  drivers/usb/misc/usbled.c                          |     1 -
9655  drivers/usb/misc/usbsevseg.c                       |     3 +-
9656  drivers/usb/misc/usbtest.c                         |    42 +-
9657  drivers/usb/misc/yurex.c                           |     3 +-
9658  drivers/usb/musb/Kconfig                           |    16 +-
9659  drivers/usb/musb/Makefile                          |     1 +
9660  drivers/usb/musb/am35x.c                           |     1 -
9661  drivers/usb/musb/blackfin.c                        |     5 +-
9662  drivers/usb/musb/da8xx.c                           |     1 -
9663  drivers/usb/musb/davinci.c                         |     1 -
9664  drivers/usb/musb/jz4740.c                          |   201 +
9665  drivers/usb/musb/musb_am335x.c                     |     1 -
9666  drivers/usb/musb/musb_core.c                       |    74 +-
9667  drivers/usb/musb/musb_core.h                       |     3 +
9668  drivers/usb/musb/musb_cppi41.c                     |     2 +-
9669  drivers/usb/musb/musb_dsps.c                       |   118 +-
9670  drivers/usb/musb/musb_gadget.c                     |    16 +-
9671  drivers/usb/musb/musb_host.c                       |    13 +-
9672  drivers/usb/musb/musb_host.h                       |     6 +
9673  drivers/usb/musb/musb_virthub.c                    |    70 +-
9674  drivers/usb/musb/tusb6010.c                        |     1 -
9675  drivers/usb/musb/tusb6010_omap.c                   |     1 -
9676  drivers/usb/musb/ux500.c                           |     1 -
9677  drivers/usb/musb/ux500_dma.c                       |     4 +-
9678  drivers/usb/phy/Kconfig                            |    52 +-
9679  drivers/usb/phy/Makefile                           |     7 +-
9680  drivers/usb/phy/phy-ab8500-usb.c                   |     2 -
9681  drivers/usb/phy/phy-am335x-control.c               |     6 +-
9682  drivers/usb/phy/phy-am335x.c                       |    39 +-
9683  drivers/usb/phy/phy-fsl-usb.c                      |     8 +-
9684  drivers/usb/phy/phy-fsl-usb.h                      |     2 +-
9685  drivers/usb/phy/phy-fsm-usb.c                      |    14 +-
9686  drivers/usb/phy/phy-generic.c                      |     1 -
9687  drivers/usb/phy/phy-gpio-vbus-usb.c                |     2 -
9688  drivers/usb/phy/phy-isp1301-omap.c                 |     9 +-
9689  drivers/usb/phy/phy-keystone.c                     |   136 +
9690  drivers/usb/phy/phy-msm-usb.c                      |     1 +
9691  drivers/usb/phy/phy-mv-usb.c                       |     7 +-
9692  drivers/usb/phy/phy-mxs-usb.c                      |    13 +-
9693  drivers/usb/phy/phy-omap-control.c                 |    19 +
9694  drivers/usb/phy/phy-omap-otg.c                     |   169 +
9695  drivers/usb/phy/phy-rcar-gen2-usb.c                |     2 +-
9696  drivers/usb/phy/phy-tahvo.c                        |   457 +
9697  drivers/usb/phy/phy-twl6030-usb.c                  |     2 +-
9698  drivers/usb/phy/phy.c                              |     4 +
9699  drivers/usb/renesas_usbhs/fifo.c                   |    18 +-
9700  drivers/usb/renesas_usbhs/mod_gadget.c             |     4 +-
9701  drivers/usb/renesas_usbhs/mod_host.c               |     1 +
9702  drivers/usb/serial/Kconfig                         |    29 +
9703  drivers/usb/serial/Makefile                        |     1 +
9704  drivers/usb/serial/aircable.c                      |    10 +-
9705  drivers/usb/serial/ark3116.c                       |     5 +-
9706  drivers/usb/serial/belkin_sa.c                     |     3 +-
9707  drivers/usb/serial/bus.c                           |     4 +-
9708  drivers/usb/serial/ch341.c                         |   135 +-
9709  drivers/usb/serial/console.c                       |     3 -
9710  drivers/usb/serial/cp210x.c                        |     8 +-
9711  drivers/usb/serial/cyberjack.c                     |     3 +-
9712  drivers/usb/serial/cypress_m8.c                    |    67 +-
9713  drivers/usb/serial/cypress_m8.h                    |    30 +-
9714  drivers/usb/serial/digi_acceleport.c               |     1 -
9715  drivers/usb/serial/empeg.c                         |     1 -
9716  drivers/usb/serial/f81232.c                        |    55 +-
9717  drivers/usb/serial/ftdi_sio.c                      |    33 +-
9718  drivers/usb/serial/garmin_gps.c                    |    20 +-
9719  drivers/usb/serial/io_edgeport.c                   |    51 +-
9720  drivers/usb/serial/io_ti.c                         |    59 +-
9721  drivers/usb/serial/ipaq.c                          |     3 +-
9722  drivers/usb/serial/ipw.c                           |     1 -
9723  drivers/usb/serial/ir-usb.c                        |     9 +-
9724  drivers/usb/serial/iuu_phoenix.c                   |     3 +-
9725  drivers/usb/serial/keyspan.c                       |    11 +-
9726  drivers/usb/serial/keyspan_pda.c                   |     1 -
9727  drivers/usb/serial/keyspan_usa26msg.h              |     2 +-
9728  drivers/usb/serial/kl5kusb105.c                    |    17 +-
9729  drivers/usb/serial/kobil_sct.c                     |     1 -
9730  drivers/usb/serial/mct_u232.c                      |     1 -
9731  drivers/usb/serial/metro-usb.c                     |     5 +-
9732  drivers/usb/serial/mos7720.c                       |    37 +-
9733  drivers/usb/serial/mos7840.c                       |    21 +-
9734  drivers/usb/serial/mxuport.c                       |  1393 +++
9735  drivers/usb/serial/navman.c                        |     1 -
9736  drivers/usb/serial/omninet.c                       |     1 -
9737  drivers/usb/serial/opticon.c                       |    11 +-
9738  drivers/usb/serial/option.c                        |    15 +
9739  drivers/usb/serial/oti6858.c                       |    73 +-
9740  drivers/usb/serial/pl2303.c                        |   511 +-
9741  drivers/usb/serial/qcaux.c                         |     3 +-
9742  drivers/usb/serial/quatech2.c                      |     9 +-
9743  drivers/usb/serial/safe_serial.c                   |     3 +-
9744  drivers/usb/serial/sierra.c                        |    10 +-
9745  drivers/usb/serial/spcp8x5.c                       |     1 -
9746  drivers/usb/serial/ssu100.c                        |     5 -
9747  drivers/usb/serial/symbolserial.c                  |     1 -
9748  drivers/usb/serial/ti_usb_3410_5052.c              |    27 +-
9749  drivers/usb/serial/usb-serial-simple.c             |     1 -
9750  drivers/usb/serial/usb-serial.c                    |     2 +-
9751  drivers/usb/serial/usb_debug.c                     |     1 -
9752  drivers/usb/serial/usb_wwan.c                      |     6 +-
9753  drivers/usb/serial/visor.c                         |    19 +-
9754  drivers/usb/serial/visor.h                         |     2 +-
9755  drivers/usb/serial/whiteheat.c                     |     9 +-
9756  drivers/usb/serial/wishbone-serial.c               |     1 -
9757  drivers/usb/serial/xsens_mt.c                      |     1 -
9758  drivers/usb/serial/zte_ev.c                        |    21 +-
9759  drivers/usb/storage/onetouch.c                     |     1 -
9760  drivers/usb/storage/protocol.c                     |    81 +-
9761  drivers/usb/storage/unusual_devs.h                 |     7 +
9762  drivers/usb/storage/usb.c                          |     1 -
9763  drivers/usb/usb-skeleton.c                         |     1 -
9764  drivers/usb/wusbcore/cbaf.c                        |    22 +-
9765  drivers/usb/wusbcore/crypto.c                      |     2 +-
9766  drivers/usb/wusbcore/devconnect.c                  |     4 +-
9767  drivers/usb/wusbcore/mmc.c                         |     9 +-
9768  drivers/usb/wusbcore/pal.c                         |     1 +
9769  drivers/usb/wusbcore/reservation.c                 |     1 +
9770  drivers/usb/wusbcore/security.c                    |    42 +-
9771  drivers/usb/wusbcore/wa-hc.h                       |    25 +-
9772  drivers/usb/wusbcore/wa-nep.c                      |    10 +-
9773  drivers/usb/wusbcore/wa-rpipe.c                    |    19 +-
9774  drivers/usb/wusbcore/wa-xfer.c                     |   513 +-
9775  drivers/usb/wusbcore/wusbhc.c                      |    17 +-
9776  drivers/usb/wusbcore/wusbhc.h                      |     7 +-
9777  drivers/uwb/beacon.c                               |     9 +-
9778  drivers/uwb/radio.c                                |     6 +-
9779  drivers/uwb/rsv.c                                  |    16 +-
9780  drivers/uwb/umc-bus.c                              |     2 +-
9781  drivers/uwb/umc-dev.c                              |     1 +
9782  drivers/watchdog/pcwd_usb.c                        |    40 +-
9783  firmware/emi62/bitstream.HEX                       | 10325 +++++++++++--------
9784  include/linux/phy/phy.h                            |    28 +
9785  include/linux/platform_data/usb-ehci-orion.h       |     6 +-
9786  include/linux/platform_data/usb-omap1.h            |    53 +
9787  include/linux/scatterlist.h                        |     1 +
9788  include/linux/tty.h                                |     1 +
9789  include/linux/usb.h                                |     1 +
9790  include/linux/usb/chipidea.h                       |     1 +
9791  include/linux/usb/composite.h                      |     2 +
9792  include/linux/usb/functionfs.h                     |    30 -
9793  include/linux/usb/gadget.h                         |    58 +-
9794  include/linux/usb/hcd.h                            |     3 +
9795  include/linux/usb/musb.h                           |     3 +
9796  include/linux/usb/omap_control_usb.h               |     6 +
9797  .../phy-fsm-usb.h => include/linux/usb/otg-fsm.h   |    10 +-
9798  include/linux/uwb/umc.h                            |     2 +-
9799  lib/scatterlist.c                                  |     3 +-
9800  367 files changed, 16189 insertions(+), 8071 deletions(-)
9801  create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-ffs
9802  create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-loopback
9803  create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-sourcesink
9804  create mode 100644 Documentation/ABI/testing/sysfs-platform-tahvo-usb
9805  create mode 100644 Documentation/devicetree/bindings/phy/bcm-phy.txt
9806  rename Documentation/devicetree/bindings/usb/{ci13xxx-imx.txt => ci-hdrc-imx.txt} (100%)
9807  create mode 100644 Documentation/devicetree/bindings/usb/gr-udc.txt
9808  create mode 100644 drivers/phy/phy-bcm-kona-usb2.c
9809  create mode 100644 drivers/usb/dwc3/dwc3-keystone.c
9810  create mode 100644 drivers/usb/gadget/gr_udc.c
9811  create mode 100644 drivers/usb/gadget/gr_udc.h
9812  create mode 100644 drivers/usb/gadget/u_f.c
9813  create mode 100644 drivers/usb/gadget/u_f.h
9814  create mode 100644 drivers/usb/gadget/u_fs.h
9815  create mode 100644 drivers/usb/musb/jz4740.c
9816  create mode 100644 drivers/usb/phy/phy-keystone.c
9817  create mode 100644 drivers/usb/phy/phy-omap-otg.c
9818  create mode 100644 drivers/usb/phy/phy-tahvo.c
9819  create mode 100644 drivers/usb/serial/mxuport.c
9820  create mode 100644 include/linux/platform_data/usb-omap1.h
9821  rename drivers/usb/phy/phy-fsm-usb.h => include/linux/usb/otg-fsm.h (96%)
9822 Merging usb-gadget/next (836a2164491b usb: phy: keystone: remove redundant return value check of platform_get_resource())
9823 $ git merge usb-gadget/next
9824 Already up-to-date.
9825 Merging staging/staging-next (aa3bee0daa38 lustre: delete linux/lustre_debug.h)
9826 $ git merge staging/staging-next
9827 Resolved 'drivers/staging/imx-drm/imx-drm-core.c' using previous resolution.
9828 Auto-merging drivers/usb/dwc2/platform.c
9829 Auto-merging drivers/usb/dwc2/pci.c
9830 Auto-merging drivers/usb/dwc2/hcd_queue.c
9831 Auto-merging drivers/usb/dwc2/hcd_intr.c
9832 Auto-merging drivers/usb/dwc2/hcd_ddma.c
9833 Auto-merging drivers/usb/dwc2/hcd.h
9834 Auto-merging drivers/usb/dwc2/hcd.c
9835 Auto-merging drivers/usb/dwc2/core_intr.c
9836 Auto-merging drivers/usb/dwc2/core.h
9837 Auto-merging drivers/usb/dwc2/core.c
9838 Auto-merging drivers/usb/Kconfig
9839 Removing drivers/staging/wlags49_h2/wl_pci.h
9840 Removing drivers/staging/wlags49_h2/wl_pci.c
9841 Removing drivers/staging/vt6656/mib.h
9842 Removing drivers/staging/vt6656/mib.c
9843 Auto-merging drivers/staging/usbip/usbip_common.c
9844 Removing drivers/staging/tidspbridge/gen/uuidutil.c
9845 Auto-merging drivers/staging/rtl8188eu/os_dep/os_intfs.c
9846 Auto-merging drivers/staging/ozwpan/ozproto.c
9847 Auto-merging drivers/staging/media/lirc/lirc_serial.c
9848 Auto-merging drivers/staging/media/go7007/go7007-usb.c
9849 Auto-merging drivers/staging/media/as102/as102_drv.c
9850 Removing drivers/staging/lustre/lustre/ptlrpc/wirehdr.c
9851 Removing drivers/staging/lustre/lustre/ptlrpc/llog_server.c
9852 Removing drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c
9853 Auto-merging drivers/staging/lustre/lustre/llite/lloop.c
9854 Removing drivers/staging/lustre/lustre/libcfs/lwt.c
9855 Removing drivers/staging/lustre/lustre/include/lustre/lustreapi.h
9856 Removing drivers/staging/lustre/lustre/include/lustre/liblustreapi.h
9857 Removing drivers/staging/lustre/lustre/include/lu_target.h
9858 Removing drivers/staging/lustre/lustre/include/linux/lustre_debug.h
9859 Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h
9860 Auto-merging drivers/staging/imx-drm/imx-drm-core.c
9861 CONFLICT (content): Merge conflict in drivers/staging/imx-drm/imx-drm-core.c
9862 Removing drivers/staging/dwc2/TODO
9863 Removing drivers/staging/btmtk_usb/btmtk_usb.h
9864 Removing drivers/staging/btmtk_usb/btmtk_usb.c
9865 Removing drivers/staging/btmtk_usb/TODO
9866 Removing drivers/staging/btmtk_usb/README
9867 Removing drivers/staging/btmtk_usb/Makefile
9868 Removing drivers/staging/btmtk_usb/Kconfig
9869 Auto-merging MAINTAINERS
9870 Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
9871 Auto-merging Documentation/devicetree/bindings/usb/dwc2.txt
9872 Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt
9873 Automatic merge failed; fix conflicts and then commit the result.
9874 $ git commit -v -a
9875 [master c42a82aa8c38] Merge remote-tracking branch 'staging/staging-next'
9876 $ git diff -M --stat --summary HEAD^..
9877  Documentation/ABI/testing/sysfs-bus-iio            |   13 +
9878  .../devicetree/bindings/i2c/trivial-devices.txt    |    1 +
9879  .../devicetree/bindings/iio/humidity/dht11.txt     |   14 +
9880  .../devicetree/bindings/iio/light/tsl2563.txt      |   19 +
9881  .../bindings/iio/magnetometer/hmc5843.txt          |   17 +
9882  .../devicetree/bindings/staging/xillybus.txt       |   20 +
9883  .../devicetree/bindings/{staging => usb}/dwc2.txt  |    4 +-
9884  .../devicetree/bindings/vendor-prefixes.txt        |    1 +
9885  Documentation/driver-model/devres.txt              |    2 +
9886  Documentation/vme_api.txt                          |   12 +-
9887  MAINTAINERS                                        |    2 +-
9888  drivers/iio/Kconfig                                |    2 +
9889  drivers/iio/Makefile                               |    2 +
9890  drivers/iio/accel/bma180.c                         |    7 +-
9891  drivers/iio/accel/hid-sensor-accel-3d.c            |   12 +
9892  drivers/iio/adc/ad7266.c                           |   21 +-
9893  drivers/iio/adc/max1363.c                          |    8 +-
9894  drivers/iio/adc/mcp3422.c                          |    9 +-
9895  drivers/iio/adc/viperboard_adc.c                   |   20 +-
9896  drivers/iio/dac/ad5064.c                           |    7 +-
9897  drivers/iio/dac/ad5360.c                           |    7 +-
9898  drivers/iio/dac/ad5380.c                           |    7 +-
9899  drivers/iio/dac/ad5421.c                           |   26 +-
9900  drivers/iio/dac/ad5446.c                           |    9 +-
9901  drivers/iio/dac/ad5449.c                           |    7 +-
9902  drivers/iio/dac/ad5504.c                           |   46 +-
9903  drivers/iio/dac/ad5624r_spi.c                      |    7 +-
9904  drivers/iio/dac/ad5686.c                           |   11 +-
9905  drivers/iio/dac/ad5755.c                           |   21 +-
9906  drivers/iio/dac/ad5764.c                           |    7 +-
9907  drivers/iio/dac/ad5791.c                           |   55 +-
9908  drivers/iio/dac/max517.c                           |    1 -
9909  drivers/iio/dac/mcp4725.c                          |    1 -
9910  drivers/iio/gyro/adis16130.c                       |    9 +-
9911  drivers/iio/gyro/adxrs450.c                        |   14 +-
9912  drivers/iio/gyro/hid-sensor-gyro-3d.c              |   11 +
9913  drivers/iio/humidity/Kconfig                       |   15 +
9914  drivers/iio/humidity/Makefile                      |    5 +
9915  drivers/iio/humidity/dht11.c                       |  294 ++
9916  drivers/iio/industrialio-buffer.c                  |   33 +-
9917  drivers/iio/industrialio-core.c                    |  102 +
9918  drivers/iio/industrialio-event.c                   |  160 +-
9919  drivers/iio/industrialio-trigger.c                 |   40 +-
9920  drivers/iio/kfifo_buf.c                            |   23 +-
9921  drivers/iio/light/Kconfig                          |   11 +
9922  drivers/iio/light/Makefile                         |    1 +
9923  drivers/iio/light/adjd_s311.c                      |    7 +-
9924  drivers/iio/light/apds9300.c                       |    8 +-
9925  drivers/iio/light/cm32181.c                        |  379 ++
9926  drivers/iio/light/cm36651.c                        |   35 +-
9927  drivers/iio/light/gp2ap020a00f.c                   |    8 +-
9928  drivers/iio/light/hid-sensor-als.c                 |   11 +
9929  drivers/iio/light/tcs3472.c                        |    7 +-
9930  drivers/iio/light/tsl2563.c                        |   12 +-
9931  drivers/iio/light/vcnl4000.c                       |   11 +-
9932  drivers/iio/magnetometer/hid-sensor-magn-3d.c      |   12 +
9933  drivers/iio/magnetometer/mag3110.c                 |    6 +-
9934  drivers/iio/orientation/Kconfig                    |   19 +
9935  drivers/iio/orientation/Makefile                   |    6 +
9936  drivers/iio/orientation/hid-sensor-incl-3d.c       |  428 ++
9937  drivers/iio/pressure/Kconfig                       |   12 +
9938  drivers/iio/pressure/Makefile                      |    1 +
9939  drivers/iio/pressure/mpl3115.c                     |  329 ++
9940  drivers/staging/Kconfig                            |    6 +-
9941  drivers/staging/Makefile                           |    3 +-
9942  drivers/staging/android/Kconfig                    |    2 +
9943  drivers/staging/android/Makefile                   |    2 +
9944  drivers/staging/android/alarm-dev.c                |    8 +-
9945  drivers/staging/android/ion/Kconfig                |   35 +
9946  drivers/staging/android/ion/Makefile               |   10 +
9947  drivers/staging/android/ion/compat_ion.c           |  177 +
9948  drivers/staging/android/ion/compat_ion.h           |   30 +
9949  drivers/staging/android/ion/ion.c                  | 1549 +++++++
9950  drivers/staging/android/ion/ion.h                  |  204 +
9951  drivers/staging/android/ion/ion_carveout_heap.c    |  194 +
9952  drivers/staging/android/ion/ion_chunk_heap.c       |  195 +
9953  drivers/staging/android/ion/ion_cma_heap.c         |  218 +
9954  drivers/staging/android/ion/ion_dummy_driver.c     |  158 +
9955  drivers/staging/android/ion/ion_heap.c             |  318 ++
9956  drivers/staging/android/ion/ion_page_pool.c        |  195 +
9957  drivers/staging/android/ion/ion_priv.h             |  360 ++
9958  drivers/staging/android/ion/ion_system_heap.c      |  488 +++
9959  drivers/staging/android/ion/ion_test.c             |  282 ++
9960  drivers/staging/android/ion/tegra/Makefile         |    1 +
9961  drivers/staging/android/ion/tegra/tegra_ion.c      |   84 +
9962  drivers/staging/android/sync.h                     |   50 +-
9963  drivers/staging/android/uapi/ion.h                 |  196 +
9964  drivers/staging/android/uapi/ion_test.h            |   70 +
9965  drivers/staging/bcm/Adapter.h                      |    2 +-
9966  drivers/staging/bcm/Bcmchar.c                      |  142 +-
9967  drivers/staging/bcm/DDRInit.c                      | 2042 +++++----
9968  drivers/staging/bcm/InterfaceDld.c                 |  140 +-
9969  drivers/staging/bcm/InterfaceIdleMode.c            |  230 +-
9970  drivers/staging/bcm/InterfaceInit.c                |   10 +-
9971  drivers/staging/bcm/InterfaceRx.c                  |  187 +-
9972  drivers/staging/bcm/InterfaceTx.c                  |  151 +-
9973  drivers/staging/bcm/PHSModule.c                    |    4 +-
9974  drivers/staging/bcm/Qos.c                          |    6 +-
9975  drivers/staging/bcm/nvm.c                          |   80 +-
9976  drivers/staging/btmtk_usb/Kconfig                  |   11 -
9977  drivers/staging/btmtk_usb/Makefile                 |    1 -
9978  drivers/staging/btmtk_usb/README                   |   14 -
9979  drivers/staging/btmtk_usb/TODO                     |   10 -
9980  drivers/staging/btmtk_usb/btmtk_usb.c              | 1810 --------
9981  drivers/staging/btmtk_usb/btmtk_usb.h              |  138 -
9982  drivers/staging/ced1401/ced_ioc.c                  |    3 +-
9983  drivers/staging/ced1401/usb1401.c                  |    1 -
9984  drivers/staging/comedi/Kconfig                     |    6 +
9985  drivers/staging/comedi/Makefile                    |    2 +
9986  drivers/staging/comedi/comedi_buf.c                |   99 +-
9987  drivers/staging/comedi/comedi_fops.c               |  527 ++-
9988  drivers/staging/comedi/comedi_internal.h           |    4 +
9989  drivers/staging/comedi/comedidev.h                 |   40 +-
9990  drivers/staging/comedi/drivers.c                   |   34 +-
9991  drivers/staging/comedi/drivers/8255.c              |    6 +-
9992  drivers/staging/comedi/drivers/8255_pci.c          |    2 +-
9993  drivers/staging/comedi/drivers/Makefile            |    2 +
9994  .../comedi/drivers/addi-data/hwdrv_apci3120.c      |    6 +-
9995  .../comedi/drivers/addi-data/hwdrv_apci3200.c      |    2 +-
9996  drivers/staging/comedi/drivers/addi_apci_035.c     |    2 +-
9997  drivers/staging/comedi/drivers/addi_apci_1032.c    |    6 +-
9998  drivers/staging/comedi/drivers/addi_apci_1500.c    |    2 +-
9999  drivers/staging/comedi/drivers/addi_apci_1516.c    |    2 +-
10000  drivers/staging/comedi/drivers/addi_apci_1564.c    |    2 +-
10001  drivers/staging/comedi/drivers/addi_apci_16xx.c    |    2 +-
10002  drivers/staging/comedi/drivers/addi_apci_2032.c    |    2 +-
10003  drivers/staging/comedi/drivers/addi_apci_2200.c    |    2 +-
10004  drivers/staging/comedi/drivers/addi_apci_3120.c    |    2 +-
10005  drivers/staging/comedi/drivers/addi_apci_3200.c    |    2 +-
10006  drivers/staging/comedi/drivers/addi_apci_3501.c    |    2 +-
10007  drivers/staging/comedi/drivers/addi_apci_3xxx.c    |    2 +-
10008  drivers/staging/comedi/drivers/adl_pci6208.c       |    2 +-
10009  drivers/staging/comedi/drivers/adl_pci7x3x.c       |    2 +-
10010  drivers/staging/comedi/drivers/adl_pci8164.c       |    2 +-
10011  drivers/staging/comedi/drivers/adl_pci9111.c       |   36 +-
10012  drivers/staging/comedi/drivers/adl_pci9118.c       |   89 +-
10013  drivers/staging/comedi/drivers/adq12b.c            |   29 +-
10014  drivers/staging/comedi/drivers/adv_pci1710.c       |  128 +-
10015  drivers/staging/comedi/drivers/adv_pci1723.c       |    2 +-
10016  drivers/staging/comedi/drivers/adv_pci1724.c       |    6 +-
10017  drivers/staging/comedi/drivers/adv_pci_dio.c       |    2 +-
10018  drivers/staging/comedi/drivers/aio_aio12_8.c       |   13 +-
10019  drivers/staging/comedi/drivers/amcc_s5933.h        |    8 +-
10020  .../staging/comedi/drivers/amplc_dio200_common.c   |    2 +-
10021  drivers/staging/comedi/drivers/amplc_dio200_pci.c  |    2 +-
10022  drivers/staging/comedi/drivers/amplc_pc236.c       |    4 +-
10023  drivers/staging/comedi/drivers/amplc_pci224.c      |   62 +-
10024  drivers/staging/comedi/drivers/amplc_pci230.c      |  109 +-
10025  drivers/staging/comedi/drivers/amplc_pci263.c      |    2 +-
10026  drivers/staging/comedi/drivers/c6xdigio.c          |   54 -
10027  drivers/staging/comedi/drivers/cb_pcidas.c         |   57 +-
10028  drivers/staging/comedi/drivers/cb_pcidas64.c       |  270 +-
10029  drivers/staging/comedi/drivers/cb_pcidda.c         |    2 +-
10030  drivers/staging/comedi/drivers/cb_pcimdas.c        |   19 +-
10031  drivers/staging/comedi/drivers/cb_pcimdda.c        |    2 +-
10032  drivers/staging/comedi/drivers/comedi_test.c       |    9 +-
10033  drivers/staging/comedi/drivers/contec_pci_dio.c    |    2 +-
10034  drivers/staging/comedi/drivers/daqboard2000.c      |    2 +-
10035  drivers/staging/comedi/drivers/das08.c             |   75 +-
10036  drivers/staging/comedi/drivers/das08_pci.c         |    2 +-
10037  drivers/staging/comedi/drivers/das16m1.c           |  107 +-
10038  drivers/staging/comedi/drivers/das1800.c           |  139 +-
10039  drivers/staging/comedi/drivers/das6402.c           |   11 +-
10040  drivers/staging/comedi/drivers/dmm32at.c           |   94 +-
10041  drivers/staging/comedi/drivers/dt2801.c            |  109 +-
10042  drivers/staging/comedi/drivers/dt2811.c            |  149 +-
10043  drivers/staging/comedi/drivers/dt2814.c            |   70 +-
10044  drivers/staging/comedi/drivers/dt2815.c            |   19 +-
10045  drivers/staging/comedi/drivers/dt282x.c            |  188 +-
10046  drivers/staging/comedi/drivers/dt3000.c            |   54 +-
10047  drivers/staging/comedi/drivers/dt9812.c            |    1 -
10048  drivers/staging/comedi/drivers/dyna_pci10xx.c      |   16 +-
10049  drivers/staging/comedi/drivers/fl512.c             |   21 +-
10050  drivers/staging/comedi/drivers/gsc_hpdi.c          |   80 +-
10051  drivers/staging/comedi/drivers/icp_multi.c         |   15 +-
10052  drivers/staging/comedi/drivers/jr3_pci.c           |    2 +-
10053  drivers/staging/comedi/drivers/ke_counter.c        |    2 +-
10054  drivers/staging/comedi/drivers/me4000.c            |   52 +-
10055  drivers/staging/comedi/drivers/me_daq.c            |    2 +-
10056  drivers/staging/comedi/drivers/mf6x4.c             |  354 ++
10057  drivers/staging/comedi/drivers/mite.c              |  145 +-
10058  drivers/staging/comedi/drivers/mite.h              |   12 -
10059  drivers/staging/comedi/drivers/mpc624.c            |   19 +-
10060  drivers/staging/comedi/drivers/ni_6527.c           |    2 +-
10061  drivers/staging/comedi/drivers/ni_65xx.c           |    7 +-
10062  drivers/staging/comedi/drivers/ni_660x.c           |  708 ++-
10063  drivers/staging/comedi/drivers/ni_670x.c           |    2 +-
10064  drivers/staging/comedi/drivers/ni_at_a2150.c       |  111 +-
10065  drivers/staging/comedi/drivers/ni_atmio.c          |   15 -
10066  drivers/staging/comedi/drivers/ni_atmio16d.c       |   95 +-
10067  drivers/staging/comedi/drivers/ni_labpc_pci.c      |    2 +-
10068  drivers/staging/comedi/drivers/ni_mio_common.c     |  631 +--
10069  drivers/staging/comedi/drivers/ni_mio_cs.c         |    2 -
10070  drivers/staging/comedi/drivers/ni_pcidio.c         |  179 +-
10071  drivers/staging/comedi/drivers/ni_pcimio.c         |   63 +-
10072  drivers/staging/comedi/drivers/ni_tio.c            |  315 +-
10073  drivers/staging/comedi/drivers/ni_tio.h            |  209 +-
10074  drivers/staging/comedi/drivers/ni_tio_internal.h   |  431 +-
10075  drivers/staging/comedi/drivers/ni_tiocmd.c         |   88 +-
10076  drivers/staging/comedi/drivers/pcl812.c            |  330 +-
10077  drivers/staging/comedi/drivers/pcl816.c            |  195 +-
10078  drivers/staging/comedi/drivers/pcl818.c            |  249 +-
10079  drivers/staging/comedi/drivers/pcm3724.c           |    6 -
10080  drivers/staging/comedi/drivers/pcmmio.c            | 1476 +++----
10081  drivers/staging/comedi/drivers/pcmuio.c            |  428 +-
10082  drivers/staging/comedi/drivers/plx9080.h           |   13 +-
10083  drivers/staging/comedi/drivers/rtd520.c            |    7 +-
10084  drivers/staging/comedi/drivers/s626.c              |   21 +-
10085  drivers/staging/comedi/drivers/skel.c              |    2 +-
10086  drivers/staging/comedi/drivers/unioxx5.c           |   68 +-
10087  drivers/staging/comedi/drivers/usbdux.c            |    1 -
10088  drivers/staging/comedi/drivers/usbduxfast.c        |    6 +-
10089  drivers/staging/comedi/drivers/usbduxsigma.c       |    9 +-
10090  drivers/staging/comedi/kcomedilib/Makefile         |    2 +
10091  .../staging/comedi/kcomedilib/kcomedilib_main.c    |   74 +-
10092  drivers/staging/comedi/proc.c                      |    6 +-
10093  drivers/staging/comedi/range.c                     |    9 +-
10094  drivers/staging/crystalhd/bc_dts_glob_lnx.h        |    2 +-
10095  drivers/staging/crystalhd/crystalhd_cmds.c         |    4 +-
10096  drivers/staging/crystalhd/crystalhd_cmds.h         |    2 +-
10097  drivers/staging/crystalhd/crystalhd_fw_if.h        |    2 +-
10098  drivers/staging/crystalhd/crystalhd_hw.c           |    2 +-
10099  drivers/staging/crystalhd/crystalhd_hw.h           |    6 +-
10100  drivers/staging/crystalhd/crystalhd_lnx.c          |    2 +-
10101  drivers/staging/crystalhd/crystalhd_lnx.h          |    3 +-
10102  drivers/staging/crystalhd/crystalhd_misc.c         |    4 +-
10103  drivers/staging/crystalhd/crystalhd_misc.h         |    2 +-
10104  drivers/staging/cxt1e1/comet.c                     |   60 +-
10105  drivers/staging/cxt1e1/comet.h                     |  601 +--
10106  drivers/staging/cxt1e1/functions.c                 |    2 +-
10107  drivers/staging/cxt1e1/musycc.c                    |    4 +-
10108  drivers/staging/cxt1e1/pmcc4_drv.c                 |   10 +-
10109  drivers/staging/cxt1e1/pmcc4_private.h             |    2 +-
10110  drivers/staging/cxt1e1/sbeid.c                     |  323 +-
10111  drivers/staging/dgap/dgap_conf.h                   |    6 +-
10112  drivers/staging/dgap/dgap_driver.c                 |   18 +-
10113  drivers/staging/dgap/dgap_driver.h                 |    1 -
10114  drivers/staging/dgap/dgap_fep5.c                   |  112 +-
10115  drivers/staging/dgap/dgap_parse.c                  |    1 +
10116  drivers/staging/dgap/dgap_trace.c                  |   17 +-
10117  drivers/staging/dgap/dgap_tty.c                    |  180 +-
10118  drivers/staging/dgap/downld.c                      |  168 +-
10119  drivers/staging/dgnc/dgnc_cls.c                    |  253 +-
10120  drivers/staging/dgnc/dgnc_trace.c                  |   19 +-
10121  drivers/staging/dgrp/dgrp_driver.c                 |    1 -
10122  drivers/staging/dgrp/dgrp_net_ops.c                |  330 +-
10123  drivers/staging/dgrp/dgrp_tty.c                    |    4 +-
10124  drivers/staging/dwc2/TODO                          |   33 -
10125  drivers/staging/et131x/README                      |    4 -
10126  drivers/staging/et131x/et131x.c                    |  841 ++--
10127  drivers/staging/et131x/et131x.h                    |   40 -
10128  drivers/staging/frontier/alphatrack.c              |    1 -
10129  drivers/staging/frontier/tranzport.c               |    1 -
10130  drivers/staging/ft1000/ft1000-pcmcia/boot.h        |  304 +-
10131  drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c   |  766 ++--
10132  drivers/staging/ft1000/ft1000-usb/ft1000_debug.c   |    2 +
10133  .../staging/ft1000/ft1000-usb/ft1000_download.c    |  133 +-
10134  drivers/staging/ft1000/ft1000-usb/ft1000_hw.c      | 1309 +++---
10135  drivers/staging/ft1000/ft1000-usb/ft1000_proc.c    |   14 +-
10136  drivers/staging/ft1000/ft1000-usb/ft1000_usb.c     |    5 +-
10137  drivers/staging/ft1000/ft1000-usb/ft1000_usb.h     |    5 -
10138  drivers/staging/gdm724x/gdm_lte.c                  |   44 +-
10139  drivers/staging/gdm724x/gdm_mux.c                  |    8 +-
10140  drivers/staging/gdm724x/gdm_tty.c                  |    1 -
10141  drivers/staging/gdm724x/gdm_usb.c                  |   40 +-
10142  drivers/staging/gdm72xx/gdm_qos.c                  |    2 +-
10143  drivers/staging/gdm72xx/gdm_usb.c                  |    5 +-
10144  drivers/staging/gdm72xx/sdio_boot.c                |    1 -
10145  drivers/staging/goldfish/goldfish_nand.c           |    1 -
10146  drivers/staging/iio/accel/adis16220_core.c         |    7 +-
10147  drivers/staging/iio/accel/lis3l02dq_core.c         |    8 +-
10148  drivers/staging/iio/accel/sca3000_core.c           |   16 +-
10149  drivers/staging/iio/adc/ad7280a.c                  |   28 +-
10150  drivers/staging/iio/adc/ad7291.c                   |    8 +-
10151  drivers/staging/iio/adc/ad7606_core.c              |    7 +-
10152  drivers/staging/iio/adc/ad7816.c                   |   12 +-
10153  drivers/staging/iio/adc/ad799x_core.c              |    6 +-
10154  drivers/staging/iio/adc/lpc32xx_adc.c              |   12 +-
10155  drivers/staging/iio/adc/mxs-lradc.c                |  311 +-
10156  drivers/staging/iio/addac/adt7316-i2c.c            |    6 -
10157  drivers/staging/iio/addac/adt7316-spi.c            |    6 -
10158  drivers/staging/iio/addac/adt7316.c                |   12 +-
10159  drivers/staging/iio/addac/adt7316.h                |    1 -
10160  drivers/staging/iio/cdc/ad7150.c                   |    8 +-
10161  drivers/staging/iio/cdc/ad7746.c                   |   14 +-
10162  drivers/staging/iio/frequency/ad9832.h             |    6 +-
10163  drivers/staging/iio/frequency/ad9834.h             |    4 +-
10164  drivers/staging/iio/gyro/adis16060_core.c          |   10 +-
10165  drivers/staging/iio/iio_simple_dummy.c             |    8 +-
10166  drivers/staging/iio/light/isl29018.c               |   13 +-
10167  drivers/staging/iio/light/tsl2x7x_core.c           |   40 +-
10168  drivers/staging/iio/magnetometer/hmc5843.c         |    7 +
10169  drivers/staging/iio/resolver/ad2s1200.c            |   10 +-
10170  drivers/staging/imx-drm/Kconfig                    |    6 +
10171  drivers/staging/imx-drm/Makefile                   |    1 +
10172  drivers/staging/imx-drm/imx-hdmi.c                 | 1916 +++++++++
10173  drivers/staging/imx-drm/imx-hdmi.h                 | 1032 +++++
10174  drivers/staging/imx-drm/imx-ldb.c                  |    5 +-
10175  drivers/staging/imx-drm/imx-tve.c                  |    2 +-
10176  drivers/staging/imx-drm/ipu-v3/ipu-common.c        |    1 -
10177  drivers/staging/imx-drm/ipuv3-crtc.c               |    3 +-
10178  drivers/staging/imx-drm/ipuv3-plane.c              |   12 +-
10179  drivers/staging/imx-drm/parallel-display.c         |    3 +-
10180  drivers/staging/keucr/smcommon.h                   |    2 +-
10181  drivers/staging/keucr/smil.h                       |    8 +-
10182  drivers/staging/keucr/smilecc.c                    |    2 +-
10183  drivers/staging/keucr/smilmain.c                   |  101 +-
10184  drivers/staging/keucr/smilsub.c                    |   37 +-
10185  drivers/staging/keucr/smscsi.c                     |   28 +-
10186  drivers/staging/keucr/usb.c                        |    1 -
10187  drivers/staging/line6/driver.c                     |    7 +
10188  drivers/staging/line6/pcm.c                        |    1 +
10189  drivers/staging/line6/usbdefs.h                    |    7 +-
10190  .../staging/lustre/include/linux/libcfs/curproc.h  |    1 -
10191  .../staging/lustre/include/linux/libcfs/libcfs.h   |    2 -
10192  .../lustre/include/linux/libcfs/libcfs_debug.h     |  210 +-
10193  .../lustre/include/linux/libcfs/libcfs_ioctl.h     |   64 +-
10194  .../lustre/include/linux/libcfs/linux/kp30.h       |  150 +-
10195  .../lustre/include/linux/libcfs/linux/libcfs.h     |    1 -
10196  .../lustre/include/linux/libcfs/linux/linux-fs.h   |   92 -
10197  .../lustre/include/linux/libcfs/linux/linux-prim.h |    1 -
10198  .../staging/lustre/include/linux/lnet/lib-lnet.h   |    5 +-
10199  .../staging/lustre/include/linux/lnet/lib-types.h  |    2 +-
10200  drivers/staging/lustre/include/linux/lnet/types.h  |   11 -
10201  .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c    |    1 -
10202  .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h    |    4 -
10203  .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c |    3 +-
10204  .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c  |  358 +-
10205  .../staging/lustre/lnet/klnds/socklnd/socklnd.c    |    1 -
10206  .../staging/lustre/lnet/klnds/socklnd/socklnd.h    |    6 -
10207  .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.c  |  307 --
10208  .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.h  |    1 -
10209  .../lustre/lnet/klnds/socklnd/socklnd_modparams.c  |  124 +-
10210  drivers/staging/lustre/lnet/lnet/acceptor.c        |   16 +-
10211  drivers/staging/lustre/lnet/lnet/api-ni.c          |   21 +-
10212  drivers/staging/lustre/lnet/lnet/config.c          |   39 +-
10213  drivers/staging/lustre/lnet/lnet/lib-move.c        |   10 +-
10214  drivers/staging/lustre/lnet/lnet/lib-msg.c         |    8 +-
10215  drivers/staging/lustre/lnet/lnet/lib-ptl.c         |    4 +-
10216  drivers/staging/lustre/lnet/lnet/module.c          |    4 +-
10217  drivers/staging/lustre/lnet/lnet/router.c          |   63 +-
10218  drivers/staging/lustre/lnet/lnet/router_proc.c     |   30 +-
10219  drivers/staging/lustre/lnet/selftest/brw_test.c    |    7 +-
10220  drivers/staging/lustre/lnet/selftest/conctl.c      |   64 +-
10221  drivers/staging/lustre/lnet/selftest/conrpc.c      |    2 +-
10222  drivers/staging/lustre/lnet/selftest/console.c     |  105 +-
10223  drivers/staging/lustre/lnet/selftest/console.h     |    8 +-
10224  drivers/staging/lustre/lnet/selftest/framework.c   |    8 +-
10225  drivers/staging/lustre/lnet/selftest/ping_test.c   |    5 +-
10226  drivers/staging/lustre/lnet/selftest/rpc.c         |    4 +-
10227  drivers/staging/lustre/lnet/selftest/selftest.h    |    5 +-
10228  drivers/staging/lustre/lnet/selftest/timer.c       |   11 +-
10229  drivers/staging/lustre/lustre/Kconfig              |    2 +-
10230  drivers/staging/lustre/lustre/fid/Makefile         |    3 +-
10231  drivers/staging/lustre/lustre/fid/lproc_fid.c      |    2 -
10232  drivers/staging/lustre/lustre/fld/Makefile         |    3 +-
10233  drivers/staging/lustre/lustre/fld/fld_cache.c      |    2 +-
10234  drivers/staging/lustre/lustre/fld/fld_internal.h   |    1 -
10235  drivers/staging/lustre/lustre/fld/fld_request.c    |    7 +-
10236  drivers/staging/lustre/lustre/fld/lproc_fld.c      |    3 -
10237  drivers/staging/lustre/lustre/include/cl_object.h  |    6 +-
10238  drivers/staging/lustre/lustre/include/dt_object.h  |    2 +-
10239  .../lustre/lustre/include/linux/lustre_acl.h       |   18 +-
10240  .../lustre/lustre/include/linux/lustre_debug.h     |   47 -
10241  .../lustre/lustre/include/linux/lustre_intent.h    |    2 +-
10242  .../lustre/lustre/include/linux/lustre_lite.h      |    1 +
10243  .../staging/lustre/lustre/include/lprocfs_status.h |    8 +-
10244  drivers/staging/lustre/lustre/include/lu_object.h  |   19 -
10245  drivers/staging/lustre/lustre/include/lu_target.h  |   91 -
10246  .../lustre/lustre/include/lustre/liblustreapi.h    |   43 -
10247  .../lustre/lustre/include/lustre/lustre_idl.h      |   72 +-
10248  .../lustre/lustre/include/lustre/lustre_user.h     |   42 +-
10249  .../lustre/lustre/include/lustre/lustreapi.h       |  310 --
10250  .../staging/lustre/lustre/include/lustre_debug.h   |   19 -
10251  .../staging/lustre/lustre/include/lustre_disk.h    |    1 +
10252  drivers/staging/lustre/lustre/include/lustre_dlm.h |    3 +-
10253  .../lustre/lustre/include/lustre_dlm_flags.h       |   90 +-
10254  drivers/staging/lustre/lustre/include/lustre_fid.h |    6 -
10255  drivers/staging/lustre/lustre/include/lustre_ha.h  |    3 -
10256  drivers/staging/lustre/lustre/include/lustre_lib.h |   11 +-
10257  drivers/staging/lustre/lustre/include/lustre_log.h |   13 +-
10258  drivers/staging/lustre/lustre/include/lustre_mdc.h |    9 +-
10259  drivers/staging/lustre/lustre/include/lustre_net.h |  245 --
10260  .../lustre/lustre/include/lustre_req_layout.h      |    7 +
10261  drivers/staging/lustre/lustre/include/lustre_sec.h |   17 +-
10262  drivers/staging/lustre/lustre/include/md_object.h  |    4 +-
10263  drivers/staging/lustre/lustre/include/obd.h        |   15 +-
10264  .../staging/lustre/lustre/include/obd_support.h    |   12 +-
10265  drivers/staging/lustre/lustre/lclient/lcommon_cl.c |   18 +-
10266  .../staging/lustre/lustre/lclient/lcommon_misc.c   |    4 +-
10267  drivers/staging/lustre/lustre/ldlm/ldlm_flock.c    |   45 +-
10268  drivers/staging/lustre/lustre/ldlm/ldlm_lock.c     |   15 +-
10269  drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c    |   57 +-
10270  drivers/staging/lustre/lustre/ldlm/ldlm_pool.c     |    9 +
10271  drivers/staging/lustre/lustre/ldlm/ldlm_request.c  |   49 +-
10272  drivers/staging/lustre/lustre/ldlm/ldlm_resource.c |   23 +-
10273  drivers/staging/lustre/lustre/libcfs/debug.c       |   42 +-
10274  drivers/staging/lustre/lustre/libcfs/hash.c        |   12 +-
10275  .../lustre/lustre/libcfs/kernel_user_comm.c        |    7 +-
10276  .../staging/lustre/lustre/libcfs/linux/linux-cpu.c |    6 +-
10277  .../lustre/lustre/libcfs/linux/linux-curproc.c     |   13 -
10278  .../lustre/lustre/libcfs/linux/linux-prim.c        |   11 +-
10279  .../lustre/lustre/libcfs/linux/linux-proc.c        |   36 +-
10280  drivers/staging/lustre/lustre/libcfs/lwt.c         |  266 --
10281  drivers/staging/lustre/lustre/libcfs/module.c      |   55 +-
10282  drivers/staging/lustre/lustre/libcfs/nidstrings.c  |   34 +-
10283  drivers/staging/lustre/lustre/libcfs/tracefile.c   |   22 +-
10284  drivers/staging/lustre/lustre/llite/Makefile       |    5 +-
10285  drivers/staging/lustre/lustre/llite/dcache.c       |   34 +-
10286  drivers/staging/lustre/lustre/llite/dir.c          |   24 +-
10287  drivers/staging/lustre/lustre/llite/file.c         |  657 ++-
10288  .../staging/lustre/lustre/llite/llite_internal.h   |   76 +-
10289  drivers/staging/lustre/lustre/llite/llite_lib.c    |   76 +-
10290  drivers/staging/lustre/lustre/llite/lloop.c        |    3 +-
10291  drivers/staging/lustre/lustre/llite/lproc_llite.c  |   41 +-
10292  drivers/staging/lustre/lustre/llite/namei.c        |   14 +-
10293  drivers/staging/lustre/lustre/llite/super25.c      |    4 +
10294  drivers/staging/lustre/lustre/llite/vvp_io.c       |   61 +-
10295  drivers/staging/lustre/lustre/llite/vvp_object.c   |    2 +-
10296  drivers/staging/lustre/lustre/llite/xattr.c        |  104 +-
10297  drivers/staging/lustre/lustre/llite/xattr_cache.c  |  617 +++
10298  drivers/staging/lustre/lustre/lmv/Makefile         |    4 +-
10299  drivers/staging/lustre/lustre/lmv/lmv_fld.c        |    1 -
10300  drivers/staging/lustre/lustre/lmv/lmv_intent.c     |    1 -
10301  drivers/staging/lustre/lustre/lmv/lmv_obd.c        |    6 +-
10302  drivers/staging/lustre/lustre/lmv/lproc_lmv.c      |    5 -
10303  drivers/staging/lustre/lustre/lov/Makefile         |    3 +-
10304  .../staging/lustre/lustre/lov/lov_cl_internal.h    |   16 +
10305  drivers/staging/lustre/lustre/lov/lov_internal.h   |    2 +-
10306  drivers/staging/lustre/lustre/lov/lov_io.c         |   15 +-
10307  drivers/staging/lustre/lustre/lov/lov_lock.c       |    2 +-
10308  drivers/staging/lustre/lustre/lov/lov_merge.c      |    2 +-
10309  drivers/staging/lustre/lustre/lov/lov_obd.c        |    2 +-
10310  drivers/staging/lustre/lustre/lov/lov_object.c     |   35 +-
10311  drivers/staging/lustre/lustre/lov/lov_pack.c       |   20 +-
10312  drivers/staging/lustre/lustre/lov/lov_pool.c       |    2 +-
10313  drivers/staging/lustre/lustre/lov/lov_request.c    |   14 +-
10314  drivers/staging/lustre/lustre/lov/lproc_lov.c      |   40 +-
10315  drivers/staging/lustre/lustre/lvfs/Makefile        |    3 +-
10316  drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c   |  760 ----
10317  drivers/staging/lustre/lustre/lvfs/lvfs_lib.c      |    2 -
10318  drivers/staging/lustre/lustre/lvfs/lvfs_linux.c    |    1 -
10319  drivers/staging/lustre/lustre/mdc/Makefile         |    3 +-
10320  drivers/staging/lustre/lustre/mdc/lproc_mdc.c      |    3 -
10321  drivers/staging/lustre/lustre/mdc/mdc_internal.h   |    3 +-
10322  drivers/staging/lustre/lustre/mdc/mdc_lib.c        |   31 +-
10323  drivers/staging/lustre/lustre/mdc/mdc_locks.c      |  113 +-
10324  drivers/staging/lustre/lustre/mdc/mdc_request.c    |   86 +-
10325  drivers/staging/lustre/lustre/mgc/Makefile         |    3 +-
10326  drivers/staging/lustre/lustre/mgc/libmgc.c         |    3 -
10327  drivers/staging/lustre/lustre/mgc/lproc_mgc.c      |    3 -
10328  drivers/staging/lustre/lustre/mgc/mgc_internal.h   |    2 +-
10329  drivers/staging/lustre/lustre/mgc/mgc_request.c    |  416 +-
10330  drivers/staging/lustre/lustre/obdclass/capa.c      |    5 +-
10331  drivers/staging/lustre/lustre/obdclass/class_obd.c |   20 +-
10332  drivers/staging/lustre/lustre/obdclass/genops.c    |    3 +-
10333  .../lustre/lustre/obdclass/linux/linux-module.c    |    6 +-
10334  .../lustre/lustre/obdclass/linux/linux-sysctl.c    |   21 +-
10335  drivers/staging/lustre/lustre/obdclass/llog.c      |  214 +-
10336  drivers/staging/lustre/lustre/obdclass/llog_test.c |    6 +-
10337  .../staging/lustre/lustre/obdclass/local_storage.c |   11 +-
10338  .../staging/lustre/lustre/obdclass/local_storage.h |    3 +
10339  .../lustre/lustre/obdclass/lprocfs_status.c        |  356 +-
10340  drivers/staging/lustre/lustre/obdclass/lu_object.c |   30 +-
10341  drivers/staging/lustre/lustre/obdclass/obd_mount.c |    3 +
10342  .../staging/lustre/lustre/obdecho/echo_client.c    |    2 +-
10343  drivers/staging/lustre/lustre/osc/Makefile         |    3 +-
10344  drivers/staging/lustre/lustre/osc/lproc_osc.c      |    2 -
10345  drivers/staging/lustre/lustre/osc/osc_cache.c      |    6 +-
10346  .../staging/lustre/lustre/osc/osc_cl_internal.h    |    2 +-
10347  drivers/staging/lustre/lustre/osc/osc_lock.c       |    2 +-
10348  drivers/staging/lustre/lustre/osc/osc_page.c       |    4 +-
10349  drivers/staging/lustre/lustre/osc/osc_request.c    |   14 +-
10350  drivers/staging/lustre/lustre/ptlrpc/Makefile      |    5 +-
10351  drivers/staging/lustre/lustre/ptlrpc/client.c      |   25 +-
10352  drivers/staging/lustre/lustre/ptlrpc/events.c      |   75 +-
10353  .../staging/lustre/lustre/ptlrpc/gss/gss_asn1.h    |    6 +-
10354  .../staging/lustre/lustre/ptlrpc/gss/gss_bulk.c    |    1 -
10355  drivers/staging/lustre/lustre/ptlrpc/gss/gss_err.h |   10 +-
10356  .../lustre/lustre/ptlrpc/gss/gss_generic_token.c   |    1 -
10357  .../staging/lustre/lustre/ptlrpc/gss/gss_keyring.c |    2 +-
10358  .../lustre/lustre/ptlrpc/gss/gss_krb5_mech.c       |    2 +-
10359  .../lustre/lustre/ptlrpc/gss/gss_mech_switch.c     |    1 -
10360  .../staging/lustre/lustre/ptlrpc/gss/lproc_gss.c   |    1 -
10361  drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c |   14 +-
10362  drivers/staging/lustre/lustre/ptlrpc/import.c      |   40 +-
10363  drivers/staging/lustre/lustre/ptlrpc/layout.c      |   73 +-
10364  drivers/staging/lustre/lustre/ptlrpc/llog_client.c |    6 +-
10365  drivers/staging/lustre/lustre/ptlrpc/llog_server.c |  450 --
10366  .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c    |   14 +-
10367  drivers/staging/lustre/lustre/ptlrpc/niobuf.c      |   81 +-
10368  .../staging/lustre/lustre/ptlrpc/pack_generic.c    |  375 +-
10369  drivers/staging/lustre/lustre/ptlrpc/pinger.c      |   70 +-
10370  .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h |   16 +-
10371  .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c   |    2 +-
10372  drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c     |   50 +-
10373  drivers/staging/lustre/lustre/ptlrpc/service.c     |   77 +-
10374  drivers/staging/lustre/lustre/ptlrpc/wirehdr.c     |   47 -
10375  drivers/staging/lustre/lustre/ptlrpc/wiretest.c    |   86 +-
10376  drivers/staging/media/as102/as102_drv.c            |    1 -
10377  drivers/staging/media/cxd2099/cxd2099.c            |    1 -
10378  drivers/staging/media/dt3155v4l/dt3155v4l.c        |    2 +-
10379  drivers/staging/media/go7007/go7007-driver.c       |    1 -
10380  drivers/staging/media/go7007/go7007-fw.c           |    4 +-
10381  drivers/staging/media/go7007/go7007-i2c.c          |    1 -
10382  drivers/staging/media/go7007/go7007-loader.c       |    1 -
10383  drivers/staging/media/go7007/go7007-usb.c          |    1 -
10384  drivers/staging/media/go7007/go7007-v4l2.c         |    1 -
10385  drivers/staging/media/go7007/s2250-board.c         |    1 -
10386  drivers/staging/media/go7007/saa7134-go7007.c      |    2 +-
10387  drivers/staging/media/go7007/snd-go7007.c          |    1 -
10388  drivers/staging/media/lirc/lirc_igorplugusb.c      |    4 +-
10389  drivers/staging/media/lirc/lirc_imon.c             |   12 +-
10390  drivers/staging/media/lirc/lirc_sasem.c            |    1 -
10391  drivers/staging/media/lirc/lirc_serial.c           |    6 +-
10392  drivers/staging/media/lirc/lirc_zilog.c            |    4 +-
10393  drivers/staging/media/solo6x10/solo6x10-core.c     |    2 +-
10394  drivers/staging/octeon/ethernet-mdio.h             |    1 -
10395  drivers/staging/octeon/ethernet-rx.c               |    1 -
10396  drivers/staging/octeon/ethernet-tx.c               |    1 -
10397  drivers/staging/octeon/ethernet.c                  |    1 -
10398  drivers/staging/olpc_dcon/olpc_dcon.c              |    6 +-
10399  drivers/staging/ozwpan/ozeltbuf.c                  |    3 +-
10400  drivers/staging/ozwpan/ozpd.c                      |    1 -
10401  drivers/staging/ozwpan/ozproto.c                   |    3 +-
10402  drivers/staging/ozwpan/ozusbsvc.c                  |    1 -
10403  drivers/staging/ozwpan/ozusbsvc1.c                 |    1 -
10404  drivers/staging/panel/panel.c                      |    4 +-
10405  drivers/staging/phison/phison.c                    |    3 +-
10406  drivers/staging/rtl8187se/ieee80211/dot11d.c       |  132 +-
10407  drivers/staging/rtl8187se/ieee80211/dot11d.h       |   66 +-
10408  drivers/staging/rtl8187se/ieee80211/ieee80211.h    |  125 +-
10409  .../staging/rtl8187se/ieee80211/ieee80211_crypt.c  |    4 +-
10410  .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c     |   13 +-
10411  .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c     |   53 +-
10412  .../rtl8187se/ieee80211/ieee80211_crypt_wep.c      |    1 -
10413  drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c |   39 +-
10414  .../rtl8187se/ieee80211/ieee80211_softmac.c        |  188 +-
10415  .../rtl8187se/ieee80211/ieee80211_softmac_wx.c     |   64 +-
10416  drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c |   13 +-
10417  drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c |    8 +-
10418  drivers/staging/rtl8187se/r8180.h                  |   35 +-
10419  drivers/staging/rtl8187se/r8180_core.c             |   43 +-
10420  drivers/staging/rtl8187se/r8180_dm.h               |    2 +-
10421  drivers/staging/rtl8187se/r8180_hw.h               |    4 +-
10422  drivers/staging/rtl8187se/r8180_rtl8225.h          |    3 +-
10423  drivers/staging/rtl8187se/r8180_wx.c               |  257 +-
10424  drivers/staging/rtl8187se/r8185b_init.c            |   17 +-
10425  drivers/staging/rtl8188eu/core/rtw_ap.c            |   92 +-
10426  drivers/staging/rtl8188eu/core/rtw_br_ext.c        |   87 +-
10427  drivers/staging/rtl8188eu/core/rtw_cmd.c           |   67 +-
10428  drivers/staging/rtl8188eu/core/rtw_debug.c         |    5 +-
10429  drivers/staging/rtl8188eu/core/rtw_efuse.c         |    2 +-
10430  drivers/staging/rtl8188eu/core/rtw_io.c            |   14 +-
10431  drivers/staging/rtl8188eu/core/rtw_ioctl_set.c     |   36 +-
10432  drivers/staging/rtl8188eu/core/rtw_mlme.c          |  163 +-
10433  drivers/staging/rtl8188eu/core/rtw_mlme_ext.c      |   99 +-
10434  drivers/staging/rtl8188eu/core/rtw_mp.c            |   23 +-
10435  drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c      |    6 +-
10436  drivers/staging/rtl8188eu/core/rtw_p2p.c           |   27 +-
10437  drivers/staging/rtl8188eu/core/rtw_pwrctrl.c       |   33 +-
10438  drivers/staging/rtl8188eu/core/rtw_recv.c          |   71 +-
10439  drivers/staging/rtl8188eu/core/rtw_sreset.c        |    2 +-
10440  drivers/staging/rtl8188eu/core/rtw_sta_mgt.c       |  122 +-
10441  drivers/staging/rtl8188eu/core/rtw_xmit.c          |  136 +-
10442  .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c   |    4 +-
10443  drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c   |    4 +-
10444  drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c     |  292 +-
10445  drivers/staging/rtl8188eu/hal/HalPwrSeqCmd.c       |    6 +-
10446  drivers/staging/rtl8188eu/hal/odm.c                |  918 +---
10447  drivers/staging/rtl8188eu/hal/odm_HWConfig.c       |  361 +-
10448  drivers/staging/rtl8188eu/hal/odm_RTL8188E.c       |  163 +-
10449  drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c |   62 +-
10450  drivers/staging/rtl8188eu/hal/odm_interface.c      |  102 -
10451  drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c       |    4 +-
10452  drivers/staging/rtl8188eu/hal/rtl8188e_dm.c        |    5 -
10453  drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c  |   16 +-
10454  drivers/staging/rtl8188eu/hal/rtl8188e_mp.c        |   40 +-
10455  drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c    |    6 +-
10456  drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c    |   12 +-
10457  drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c    |    2 +-
10458  drivers/staging/rtl8188eu/hal/rtl8188e_sreset.c    |    2 +-
10459  drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c     |    2 +-
10460  drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c     |   12 +-
10461  drivers/staging/rtl8188eu/hal/usb_halinit.c        |    6 +-
10462  drivers/staging/rtl8188eu/hal/usb_ops_linux.c      |    1 -
10463  drivers/staging/rtl8188eu/include/Hal8188EPwrSeq.h |    2 +-
10464  drivers/staging/rtl8188eu/include/drv_types.h      |    4 +-
10465  drivers/staging/rtl8188eu/include/hal_intf.h       |   29 -
10466  drivers/staging/rtl8188eu/include/odm.h            |   90 +-
10467  drivers/staging/rtl8188eu/include/odm_HWConfig.h   |    4 +-
10468  .../staging/rtl8188eu/include/odm_RegConfig8188E.h |    2 +-
10469  drivers/staging/rtl8188eu/include/odm_debug.h      |   15 +-
10470  drivers/staging/rtl8188eu/include/odm_interface.h  |   54 +-
10471  drivers/staging/rtl8188eu/include/odm_precomp.h    |    7 -
10472  drivers/staging/rtl8188eu/include/osdep_service.h  |  143 +-
10473  drivers/staging/rtl8188eu/include/rtl8188e_hal.h   |    4 +-
10474  drivers/staging/rtl8188eu/include/rtl8188e_recv.h  |    6 +-
10475  drivers/staging/rtl8188eu/include/rtl8188e_spec.h  |   70 +-
10476  drivers/staging/rtl8188eu/include/rtw_cmd.h        |  105 +-
10477  drivers/staging/rtl8188eu/include/rtw_eeprom.h     |    2 +-
10478  drivers/staging/rtl8188eu/include/rtw_efuse.h      |    2 +-
10479  drivers/staging/rtl8188eu/include/rtw_io.h         |   36 +-
10480  drivers/staging/rtl8188eu/include/rtw_ioctl_set.h  |    4 +-
10481  drivers/staging/rtl8188eu/include/rtw_iol.h        |    8 +-
10482  drivers/staging/rtl8188eu/include/rtw_led.h        |    6 +-
10483  drivers/staging/rtl8188eu/include/rtw_mlme.h       |   62 +-
10484  drivers/staging/rtl8188eu/include/rtw_mlme_ext.h   |   14 +-
10485  drivers/staging/rtl8188eu/include/rtw_mp.h         |   10 +-
10486  drivers/staging/rtl8188eu/include/rtw_mp_ioctl.h   |    2 +-
10487  drivers/staging/rtl8188eu/include/rtw_pwrctrl.h    |   10 +-
10488  drivers/staging/rtl8188eu/include/rtw_security.h   |    2 +-
10489  drivers/staging/rtl8188eu/include/usb_ops.h        |    4 +-
10490  drivers/staging/rtl8188eu/include/wifi.h           |    2 +-
10491  drivers/staging/rtl8188eu/os_dep/ioctl_linux.c     |  125 +-
10492  drivers/staging/rtl8188eu/os_dep/os_intfs.c        |   13 +-
10493  drivers/staging/rtl8188eu/os_dep/osdep_service.c   |  139 +-
10494  drivers/staging/rtl8188eu/os_dep/recv_linux.c      |    6 +-
10495  drivers/staging/rtl8188eu/os_dep/rtw_android.c     |    2 -
10496  drivers/staging/rtl8188eu/os_dep/usb_intf.c        |   22 +-
10497  drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c   |    8 +-
10498  drivers/staging/rtl8188eu/os_dep/xmit_linux.c      |   12 +-
10499  drivers/staging/rtl8192e/dot11d.c                  |    2 +-
10500  drivers/staging/rtl8192e/dot11d.h                  |    5 +-
10501  drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c     |   13 +-
10502  drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c     |    2 +-
10503  drivers/staging/rtl8192e/rtl8192e/rtl_cam.c        |    1 -
10504  drivers/staging/rtl8192e/rtl8192e/rtl_core.c       |   24 +-
10505  drivers/staging/rtl8192e/rtl8192e/rtl_core.h       |    3 +-
10506  drivers/staging/rtl8192e/rtl819x_BAProc.c          |   10 +-
10507  drivers/staging/rtl8192e/rtl819x_Qos.h             |   37 -
10508  drivers/staging/rtl8192e/rtllib.h                  |    2 +-
10509  drivers/staging/rtl8192e/rtllib_crypt.c            |    2 +-
10510  drivers/staging/rtl8192e/rtllib_crypt_ccmp.c       |    4 +-
10511  drivers/staging/rtl8192e/rtllib_crypt_tkip.c       |    8 +-
10512  drivers/staging/rtl8192e/rtllib_crypt_wep.c        |    4 +-
10513  drivers/staging/rtl8192e/rtllib_debug.h            |    6 +-
10514  drivers/staging/rtl8192e/rtllib_endianfree.h       |   44 +-
10515  drivers/staging/rtl8192e/rtllib_module.c           |    4 +-
10516  drivers/staging/rtl8192e/rtllib_rx.c               |   76 +-
10517  drivers/staging/rtl8192e/rtllib_softmac.c          |   32 +-
10518  drivers/staging/rtl8192e/rtllib_tx.c               |   16 +-
10519  drivers/staging/rtl8192u/r8192U.h                  |    1 -
10520  drivers/staging/rtl8712/os_intfs.c                 |    1 -
10521  drivers/staging/rtl8712/rtl8712_cmd.c              |    1 -
10522  drivers/staging/rtl8712/rtl871x_cmd.c              |    1 -
10523  drivers/staging/rtl8712/rtl871x_ioctl_linux.c      |    1 -
10524  drivers/staging/rtl8712/rtl871x_mlme.c             |    3 -
10525  drivers/staging/rtl8712/rtl871x_security.c         |    1 -
10526  drivers/staging/rtl8712/usb_intf.c                 |    5 +
10527  drivers/staging/rts5139/ms.c                       |    2 +-
10528  drivers/staging/rts5139/rts51x.c                   |    1 -
10529  drivers/staging/rts5139/rts51x_card.c              |   10 +-
10530  drivers/staging/rts5139/rts51x_card.h              |    8 +-
10531  drivers/staging/rts5139/rts51x_scsi.c              |    1 -
10532  drivers/staging/rts5208/Kconfig                    |   15 +
10533  drivers/staging/rts5208/Makefile                   |    6 +
10534  drivers/staging/rts5208/TODO                       |    7 +
10535  drivers/staging/rts5208/debug.h                    |   43 +
10536  drivers/staging/rts5208/general.c                  |   35 +
10537  drivers/staging/rts5208/general.h                  |   31 +
10538  drivers/staging/rts5208/ms.c                       | 4208 ++++++++++++++++++
10539  drivers/staging/rts5208/ms.h                       |  227 +
10540  drivers/staging/rts5208/rtsx.c                     | 1071 +++++
10541  drivers/staging/rts5208/rtsx.h                     |  185 +
10542  drivers/staging/rts5208/rtsx_card.c                | 1126 +++++
10543  drivers/staging/rts5208/rtsx_card.h                | 1098 +++++
10544  drivers/staging/rts5208/rtsx_chip.c                | 1979 +++++++++
10545  drivers/staging/rts5208/rtsx_chip.h                | 1002 +++++
10546  drivers/staging/rts5208/rtsx_scsi.c                | 3370 +++++++++++++++
10547  drivers/staging/rts5208/rtsx_scsi.h                |  143 +
10548  drivers/staging/rts5208/rtsx_sys.h                 |   50 +
10549  drivers/staging/rts5208/rtsx_transport.c           |  769 ++++
10550  drivers/staging/rts5208/rtsx_transport.h           |   66 +
10551  drivers/staging/rts5208/sd.c                       | 4525 ++++++++++++++++++++
10552  drivers/staging/rts5208/sd.h                       |  301 ++
10553  drivers/staging/rts5208/spi.c                      |  877 ++++
10554  drivers/staging/rts5208/spi.h                      |   65 +
10555  drivers/staging/rts5208/trace.h                    |   93 +
10556  drivers/staging/rts5208/xd.c                       | 2088 +++++++++
10557  drivers/staging/rts5208/xd.h                       |  188 +
10558  drivers/staging/sb105x/sb_mp_register.h            |    8 +-
10559  drivers/staging/sb105x/sb_pci_mp.c                 |    4 +-
10560  drivers/staging/sb105x/sb_pci_mp.h                 |    1 -
10561  drivers/staging/sbe-2t3e3/ctrl.c                   |   14 +-
10562  drivers/staging/sep/sep_crypto.c                   |    3 +-
10563  drivers/staging/sep/sep_main.c                     |    3 +-
10564  drivers/staging/serqt_usb2/serqt_usb2.c            |   18 +-
10565  drivers/staging/silicom/bpctl_mod.c                |    2 -
10566  drivers/staging/silicom/bypasslib/bypass.c         |  170 +-
10567  drivers/staging/slicoss/README                     |    1 -
10568  drivers/staging/slicoss/slicoss.c                  |   23 +-
10569  drivers/staging/sm7xxfb/sm7xxfb.c                  |    4 +-
10570  drivers/staging/speakup/main.c                     |    2 -
10571  drivers/staging/speakup/serialio.c                 |    4 +
10572  drivers/staging/speakup/serialio.h                 |   26 -
10573  drivers/staging/tidspbridge/Makefile               |    2 +-
10574  drivers/staging/tidspbridge/gen/gh.c               |  148 +-
10575  drivers/staging/tidspbridge/gen/uuidutil.c         |   85 -
10576  drivers/staging/tidspbridge/include/dspbridge/gh.h |   12 +-
10577  .../tidspbridge/include/dspbridge/uuidutil.h       |   18 -
10578  drivers/staging/tidspbridge/pmgr/cmm.c             |    7 +-
10579  drivers/staging/tidspbridge/pmgr/dbll.c            |   98 +-
10580  drivers/staging/tidspbridge/pmgr/dev.c             |    6 +-
10581  drivers/staging/tidspbridge/pmgr/dmm.c             |   20 +-
10582  drivers/staging/tidspbridge/pmgr/dspapi.c          |   12 +-
10583  drivers/staging/tidspbridge/rmgr/dbdcd.c           |  108 +-
10584  drivers/staging/tidspbridge/rmgr/drv_interface.c   |   33 +-
10585  drivers/staging/usbip/stub_rx.c                    |   20 +-
10586  drivers/staging/usbip/usbip_common.c               |    5 +-
10587  .../staging/usbip/userspace/libsrc/usbip_common.c  |    2 +-
10588  .../staging/usbip/userspace/libsrc/vhci_driver.c   |   69 +-
10589  .../staging/usbip/userspace/libsrc/vhci_driver.h   |    2 +
10590  drivers/staging/usbip/userspace/src/Makefile.am    |    2 +-
10591  drivers/staging/usbip/userspace/src/usbip.c        |    6 +
10592  drivers/staging/usbip/userspace/src/usbip.h        |    1 +
10593  drivers/staging/usbip/userspace/src/usbip_port.c   |   57 +
10594  drivers/staging/usbip/vhci_hcd.c                   |   15 +-
10595  drivers/staging/vme/devices/vme_user.c             |   14 +-
10596  drivers/staging/vme/devices/vme_user.h             |   26 +-
10597  drivers/staging/vt6655/80211hdr.h                  |    2 +-
10598  drivers/staging/vt6655/baseband.c                  |    4 +-
10599  drivers/staging/vt6655/bssdb.c                     |  354 +-
10600  drivers/staging/vt6655/card.c                      |   10 +-
10601  drivers/staging/vt6655/channel.c                   |   16 +-
10602  drivers/staging/vt6655/datarate.c                  |    8 +-
10603  drivers/staging/vt6655/device.h                    |    1 -
10604  drivers/staging/vt6655/device_main.c               |   62 +-
10605  drivers/staging/vt6655/dpc.c                       |   40 +-
10606  drivers/staging/vt6655/hostap.c                    |   14 +-
10607  drivers/staging/vt6655/iwctl.c                     |    4 +-
10608  drivers/staging/vt6655/key.c                       |   44 +-
10609  drivers/staging/vt6655/mac.c                       |    4 +-
10610  drivers/staging/vt6655/power.c                     |    9 +-
10611  drivers/staging/vt6655/rf.c                        |    2 +-
10612  drivers/staging/vt6655/rxtx.c                      |   12 +-
10613  drivers/staging/vt6655/vntwifi.c                   |    6 +-
10614  drivers/staging/vt6655/wcmd.c                      |   22 +-
10615  drivers/staging/vt6655/wctl.c                      |    6 +-
10616  drivers/staging/vt6655/wmgr.c                      |  125 +-
10617  drivers/staging/vt6655/wpa.c                       |    2 +-
10618  drivers/staging/vt6655/wpa2.c                      |   18 +-
10619  drivers/staging/vt6655/wpactl.c                    |   44 +-
10620  drivers/staging/vt6655/wpactl.h                    |   12 +-
10621  drivers/staging/vt6655/wroute.c                    |   50 +-
10622  drivers/staging/vt6656/Makefile                    |    1 -
10623  drivers/staging/vt6656/aes_ccmp.c                  |   16 +-
10624  drivers/staging/vt6656/baseband.c                  |  335 +-
10625  drivers/staging/vt6656/bssdb.c                     | 2271 +++++-----
10626  drivers/staging/vt6656/bssdb.h                     |    4 +-
10627  drivers/staging/vt6656/card.c                      |  108 +-
10628  drivers/staging/vt6656/channel.c                   |    3 +-
10629  drivers/staging/vt6656/datarate.c                  |    2 +-
10630  drivers/staging/vt6656/datarate.h                  |    1 -
10631  drivers/staging/vt6656/desc.h                      |    8 -
10632  drivers/staging/vt6656/device.h                    |   30 +-
10633  drivers/staging/vt6656/device_cfg.h                |    2 +
10634  drivers/staging/vt6656/dpc.c                       |   49 +-
10635  drivers/staging/vt6656/int.c                       |   60 +-
10636  drivers/staging/vt6656/iwctl.c                     |   20 +-
10637  drivers/staging/vt6656/main_usb.c                  |  553 ++-
10638  drivers/staging/vt6656/mib.c                       |  489 ---
10639  drivers/staging/vt6656/mib.h                       |  378 --
10640  drivers/staging/vt6656/rf.c                        |    7 +-
10641  drivers/staging/vt6656/rndis.h                     |   30 +-
10642  drivers/staging/vt6656/rxtx.c                      |  344 +-
10643  drivers/staging/vt6656/rxtx.h                      |   12 +-
10644  drivers/staging/vt6656/tkip.c                      |    4 +-
10645  drivers/staging/vt6656/usbpipe.c                   |   10 -
10646  drivers/staging/vt6656/wcmd.c                      | 1712 ++++----
10647  drivers/staging/vt6656/wmgr.c                      |   10 +-
10648  drivers/staging/vt6656/wpa.c                       |   12 +-
10649  drivers/staging/vt6656/wpa2.c                      |   16 +-
10650  drivers/staging/vt6656/wpactl.c                    |    2 +-
10651  drivers/staging/winbond/mds.c                      |  101 +-
10652  drivers/staging/wlags49_h2/debug.h                 |   56 +-
10653  drivers/staging/wlags49_h2/sta_h25.c               |    6 +-
10654  drivers/staging/wlags49_h2/wl_cs.c                 |   67 +-
10655  drivers/staging/wlags49_h2/wl_cs.h                 |    2 +-
10656  drivers/staging/wlags49_h2/wl_enc.c                |   15 -
10657  drivers/staging/wlags49_h2/wl_enc.h                |    4 +-
10658  drivers/staging/wlags49_h2/wl_main.c               |  155 +-
10659  drivers/staging/wlags49_h2/wl_main.h               |    2 +-
10660  drivers/staging/wlags49_h2/wl_netdev.c             |   97 +-
10661  drivers/staging/wlags49_h2/wl_pci.c                | 1578 -------
10662  drivers/staging/wlags49_h2/wl_pci.h                |  109 -
10663  drivers/staging/wlags49_h2/wl_priv.c               |  134 -
10664  drivers/staging/wlags49_h2/wl_profile.c            |   17 -
10665  drivers/staging/wlags49_h2/wl_util.c               |   59 -
10666  drivers/staging/wlags49_h2/wl_version.h            |   34 +-
10667  drivers/staging/wlags49_h2/wl_wext.c               |  188 +-
10668  drivers/staging/wlags49_h2/wl_wext.h               |    2 +-
10669  drivers/staging/wlan-ng/cfg80211.c                 |   18 +-
10670  drivers/staging/wlan-ng/hfa384x.h                  |    4 +-
10671  drivers/staging/wlan-ng/prism2mgmt.c               |    4 +-
10672  drivers/staging/wlan-ng/prism2mgmt.h               |    6 +-
10673  drivers/staging/wlan-ng/prism2mib.c                |    6 +-
10674  drivers/staging/wlan-ng/prism2sta.c                |    7 +-
10675  drivers/staging/wlan-ng/prism2usb.c                |   10 +-
10676  drivers/staging/xgifb/XGI_main.h                   |    2 +-
10677  drivers/staging/xillybus/Kconfig                   |    2 +-
10678  drivers/staging/xillybus/xillybus_of.c             |   26 +-
10679  drivers/staging/xillybus/xillybus_pcie.c           |    4 +-
10680  drivers/staging/zsmalloc/Kconfig                   |   13 +
10681  drivers/staging/zsmalloc/zsmalloc-main.c           |   86 +-
10682  drivers/staging/zsmalloc/zsmalloc.h                |    9 +-
10683  drivers/usb/Kconfig                                |    2 +
10684  drivers/usb/Makefile                               |    1 +
10685  drivers/{staging => usb}/dwc2/Kconfig              |    0
10686  drivers/{staging => usb}/dwc2/Makefile             |    0
10687  drivers/{staging => usb}/dwc2/core.c               |  378 +-
10688  drivers/{staging => usb}/dwc2/core.h               |   62 +-
10689  drivers/{staging => usb}/dwc2/core_intr.c          |   10 +-
10690  drivers/{staging => usb}/dwc2/hcd.c                |   22 +-
10691  drivers/{staging => usb}/dwc2/hcd.h                |    4 +-
10692  drivers/{staging => usb}/dwc2/hcd_ddma.c           |    8 +-
10693  drivers/{staging => usb}/dwc2/hcd_intr.c           |    6 +-
10694  drivers/{staging => usb}/dwc2/hcd_queue.c          |  195 +-
10695  drivers/{staging => usb}/dwc2/hw.h                 |    0
10696  drivers/{staging => usb}/dwc2/pci.c                |    2 +-
10697  drivers/{staging => usb}/dwc2/platform.c           |   60 +-
10698  drivers/vme/Kconfig                                |    2 +-
10699  drivers/vme/boards/vme_vmivme7805.c                |    2 +-
10700  drivers/vme/bridges/vme_ca91cx42.c                 |    2 +-
10701  drivers/vme/bridges/vme_tsi148.c                   |    2 +-
10702  drivers/vme/vme.c                                  |   25 +-
10703  include/linux/hid-sensor-ids.h                     |   12 +
10704  include/linux/iio/buffer.h                         |    3 +
10705  include/linux/iio/events.h                         |    4 -
10706  include/linux/iio/iio.h                            |  115 +-
10707  include/linux/iio/types.h                          |    1 +
10708  include/linux/mfd/syscon/imx6q-iomuxc-gpr.h        |    1 +
10709  include/linux/vme.h                                |    3 +-
10710  833 files changed, 51727 insertions(+), 29517 deletions(-)
10711  create mode 100644 Documentation/devicetree/bindings/iio/humidity/dht11.txt
10712  create mode 100644 Documentation/devicetree/bindings/iio/light/tsl2563.txt
10713  create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/hmc5843.txt
10714  create mode 100644 Documentation/devicetree/bindings/staging/xillybus.txt
10715  rename Documentation/devicetree/bindings/{staging => usb}/dwc2.txt (82%)
10716  create mode 100644 drivers/iio/humidity/Kconfig
10717  create mode 100644 drivers/iio/humidity/Makefile
10718  create mode 100644 drivers/iio/humidity/dht11.c
10719  create mode 100644 drivers/iio/light/cm32181.c
10720  create mode 100644 drivers/iio/orientation/Kconfig
10721  create mode 100644 drivers/iio/orientation/Makefile
10722  create mode 100644 drivers/iio/orientation/hid-sensor-incl-3d.c
10723  create mode 100644 drivers/iio/pressure/mpl3115.c
10724  create mode 100644 drivers/staging/android/ion/Kconfig
10725  create mode 100644 drivers/staging/android/ion/Makefile
10726  create mode 100644 drivers/staging/android/ion/compat_ion.c
10727  create mode 100644 drivers/staging/android/ion/compat_ion.h
10728  create mode 100644 drivers/staging/android/ion/ion.c
10729  create mode 100644 drivers/staging/android/ion/ion.h
10730  create mode 100644 drivers/staging/android/ion/ion_carveout_heap.c
10731  create mode 100644 drivers/staging/android/ion/ion_chunk_heap.c
10732  create mode 100644 drivers/staging/android/ion/ion_cma_heap.c
10733  create mode 100644 drivers/staging/android/ion/ion_dummy_driver.c
10734  create mode 100644 drivers/staging/android/ion/ion_heap.c
10735  create mode 100644 drivers/staging/android/ion/ion_page_pool.c
10736  create mode 100644 drivers/staging/android/ion/ion_priv.h
10737  create mode 100644 drivers/staging/android/ion/ion_system_heap.c
10738  create mode 100644 drivers/staging/android/ion/ion_test.c
10739  create mode 100644 drivers/staging/android/ion/tegra/Makefile
10740  create mode 100644 drivers/staging/android/ion/tegra/tegra_ion.c
10741  create mode 100644 drivers/staging/android/uapi/ion.h
10742  create mode 100644 drivers/staging/android/uapi/ion_test.h
10743  delete mode 100644 drivers/staging/btmtk_usb/Kconfig
10744  delete mode 100644 drivers/staging/btmtk_usb/Makefile
10745  delete mode 100644 drivers/staging/btmtk_usb/README
10746  delete mode 100644 drivers/staging/btmtk_usb/TODO
10747  delete mode 100644 drivers/staging/btmtk_usb/btmtk_usb.c
10748  delete mode 100644 drivers/staging/btmtk_usb/btmtk_usb.h
10749  create mode 100644 drivers/staging/comedi/drivers/mf6x4.c
10750  delete mode 100644 drivers/staging/dwc2/TODO
10751  create mode 100644 drivers/staging/imx-drm/imx-hdmi.c
10752  create mode 100644 drivers/staging/imx-drm/imx-hdmi.h
10753  delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h
10754  delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_debug.h
10755  delete mode 100644 drivers/staging/lustre/lustre/include/lu_target.h
10756  delete mode 100644 drivers/staging/lustre/lustre/include/lustre/liblustreapi.h
10757  delete mode 100644 drivers/staging/lustre/lustre/include/lustre/lustreapi.h
10758  delete mode 100644 drivers/staging/lustre/lustre/libcfs/lwt.c
10759  create mode 100644 drivers/staging/lustre/lustre/llite/xattr_cache.c
10760  delete mode 100644 drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c
10761  delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/llog_server.c
10762  delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/wirehdr.c
10763  create mode 100644 drivers/staging/rts5208/Kconfig
10764  create mode 100644 drivers/staging/rts5208/Makefile
10765  create mode 100644 drivers/staging/rts5208/TODO
10766  create mode 100644 drivers/staging/rts5208/debug.h
10767  create mode 100644 drivers/staging/rts5208/general.c
10768  create mode 100644 drivers/staging/rts5208/general.h
10769  create mode 100644 drivers/staging/rts5208/ms.c
10770  create mode 100644 drivers/staging/rts5208/ms.h
10771  create mode 100644 drivers/staging/rts5208/rtsx.c
10772  create mode 100644 drivers/staging/rts5208/rtsx.h
10773  create mode 100644 drivers/staging/rts5208/rtsx_card.c
10774  create mode 100644 drivers/staging/rts5208/rtsx_card.h
10775  create mode 100644 drivers/staging/rts5208/rtsx_chip.c
10776  create mode 100644 drivers/staging/rts5208/rtsx_chip.h
10777  create mode 100644 drivers/staging/rts5208/rtsx_scsi.c
10778  create mode 100644 drivers/staging/rts5208/rtsx_scsi.h
10779  create mode 100644 drivers/staging/rts5208/rtsx_sys.h
10780  create mode 100644 drivers/staging/rts5208/rtsx_transport.c
10781  create mode 100644 drivers/staging/rts5208/rtsx_transport.h
10782  create mode 100644 drivers/staging/rts5208/sd.c
10783  create mode 100644 drivers/staging/rts5208/sd.h
10784  create mode 100644 drivers/staging/rts5208/spi.c
10785  create mode 100644 drivers/staging/rts5208/spi.h
10786  create mode 100644 drivers/staging/rts5208/trace.h
10787  create mode 100644 drivers/staging/rts5208/xd.c
10788  create mode 100644 drivers/staging/rts5208/xd.h
10789  delete mode 100644 drivers/staging/tidspbridge/gen/uuidutil.c
10790  create mode 100644 drivers/staging/usbip/userspace/src/usbip_port.c
10791  delete mode 100644 drivers/staging/vt6656/mib.c
10792  delete mode 100644 drivers/staging/vt6656/mib.h
10793  delete mode 100644 drivers/staging/wlags49_h2/wl_pci.c
10794  delete mode 100644 drivers/staging/wlags49_h2/wl_pci.h
10795  rename drivers/{staging => usb}/dwc2/Kconfig (100%)
10796  rename drivers/{staging => usb}/dwc2/Makefile (100%)
10797  rename drivers/{staging => usb}/dwc2/core.c (92%)
10798  rename drivers/{staging => usb}/dwc2/core.h (94%)
10799  rename drivers/{staging => usb}/dwc2/core_intr.c (98%)
10800  rename drivers/{staging => usb}/dwc2/hcd.c (99%)
10801  rename drivers/{staging => usb}/dwc2/hcd.h (99%)
10802  rename drivers/{staging => usb}/dwc2/hcd_ddma.c (99%)
10803  rename drivers/{staging => usb}/dwc2/hcd_intr.c (99%)
10804  rename drivers/{staging => usb}/dwc2/hcd_queue.c (89%)
10805  rename drivers/{staging => usb}/dwc2/hw.h (100%)
10806  rename drivers/{staging => usb}/dwc2/pci.c (99%)
10807  rename drivers/{staging => usb}/dwc2/platform.c (77%)
10808 Merging char-misc/char-misc-next (6adb8efb024a mei: limit the number of consecutive resets)
10809 $ git merge char-misc/char-misc-next
10810 Auto-merging include/linux/mfd/arizona/registers.h
10811 Auto-merging drivers/phy/Makefile
10812 Auto-merging drivers/phy/Kconfig
10813 Auto-merging drivers/misc/mic/host/mic_device.h
10814 Auto-merging drivers/misc/mei/nfc.c
10815 Auto-merging drivers/char/agp/amd64-agp.c
10816 Auto-merging MAINTAINERS
10817 Auto-merging Documentation/devicetree/bindings/arm/atmel-at91.txt
10818 Merge made by the 'recursive' strategy.
10819  Documentation/ABI/testing/debugfs-driver-genwqe    |   91 ++
10820  Documentation/ABI/testing/sysfs-driver-genwqe      |   62 +
10821  Documentation/HOWTO                                |    4 +-
10822  .../devicetree/bindings/arm/atmel-at91.txt         |    8 +
10823  .../devicetree/bindings/extcon/extcon-palmas.txt   |    6 +-
10824  .../devicetree/bindings/misc/atmel-ssc.txt         |    5 +
10825  Documentation/devicetree/bindings/misc/bmp085.txt  |    4 +
10826  Documentation/extcon/porting-android-switch-class  |    9 +-
10827  Documentation/ja_JP/HOWTO                          |    4 +-
10828  Documentation/ko_KR/HOWTO                          |  130 +-
10829  Documentation/misc-devices/mei/mei-amt-version.c   |    2 -
10830  Documentation/zh_CN/HOWTO                          |    4 +-
10831  MAINTAINERS                                        |    3 +-
10832  drivers/char/agp/amd64-agp.c                       |    2 +-
10833  drivers/char/i8k.c                                 |  358 ++---
10834  drivers/char/lp.c                                  |    2 +
10835  drivers/char/nwbutton.c                            |    5 +-
10836  drivers/char/ttyprintk.c                           |    2 +-
10837  drivers/extcon/Kconfig                             |   10 +
10838  drivers/extcon/Makefile                            |    1 +
10839  drivers/extcon/extcon-arizona.c                    |   73 +-
10840  drivers/extcon/extcon-gpio.c                       |   32 +-
10841  drivers/extcon/extcon-max14577.c                   |  752 +++++++++++
10842  drivers/extcon/extcon-palmas.c                     |   17 +-
10843  drivers/hv/hv.c                                    |    2 +-
10844  drivers/misc/Kconfig                               |    1 +
10845  drivers/misc/Makefile                              |    1 +
10846  drivers/misc/ad525x_dpot.c                         |    4 +-
10847  drivers/misc/bmp085-i2c.c                          |    2 +-
10848  drivers/misc/bmp085-spi.c                          |    2 +-
10849  drivers/misc/bmp085.c                              |   39 +-
10850  drivers/misc/bmp085.h                              |    2 +-
10851  drivers/misc/eeprom/eeprom_93xx46.c                |    1 -
10852  drivers/misc/genwqe/Kconfig                        |   13 +
10853  drivers/misc/genwqe/Makefile                       |    7 +
10854  drivers/misc/genwqe/card_base.c                    | 1205 +++++++++++++++++
10855  drivers/misc/genwqe/card_base.h                    |  557 ++++++++
10856  drivers/misc/genwqe/card_ddcb.c                    | 1376 +++++++++++++++++++
10857  drivers/misc/genwqe/card_ddcb.h                    |  188 +++
10858  drivers/misc/genwqe/card_debugfs.c                 |  500 +++++++
10859  drivers/misc/genwqe/card_dev.c                     | 1414 ++++++++++++++++++++
10860  drivers/misc/genwqe/card_sysfs.c                   |  288 ++++
10861  drivers/misc/genwqe/card_utils.c                   |  944 +++++++++++++
10862  drivers/misc/genwqe/genwqe_driver.h                |   77 ++
10863  drivers/misc/lkdtm.c                               |    7 +-
10864  drivers/misc/mei/amthif.c                          |    6 +-
10865  drivers/misc/mei/client.c                          |   27 +-
10866  drivers/misc/mei/debugfs.c                         |    4 +-
10867  drivers/misc/mei/hbm.c                             |  239 ++--
10868  drivers/misc/mei/hbm.h                             |    7 +-
10869  drivers/misc/mei/hw-me.c                           |   40 +-
10870  drivers/misc/mei/hw.h                              |    3 +-
10871  drivers/misc/mei/init.c                            |  278 ++--
10872  drivers/misc/mei/interrupt.c                       |  122 +-
10873  drivers/misc/mei/main.c                            |    2 +-
10874  drivers/misc/mei/mei_dev.h                         |   33 +-
10875  drivers/misc/mei/nfc.c                             |   18 +-
10876  drivers/misc/mei/pci-me.c                          |   27 +-
10877  drivers/misc/mei/wd.c                              |    1 +
10878  drivers/misc/mic/host/mic_device.h                 |    3 +
10879  drivers/misc/mic/host/mic_main.c                   |    2 +-
10880  drivers/misc/mic/host/mic_virtio.c                 |    2 +-
10881  drivers/misc/mic/host/mic_x100.c                   |   36 +-
10882  drivers/misc/sgi-xp/xpc_channel.c                  |    5 +-
10883  drivers/misc/ti-st/st_core.c                       |    2 +-
10884  drivers/misc/ti-st/st_kim.c                        |    1 -
10885  drivers/misc/vmw_vmci/vmci_guest.c                 |   10 +-
10886  drivers/parport/parport_pc.c                       |   20 +-
10887  drivers/pcmcia/bfin_cf_pcmcia.c                    |    2 +-
10888  drivers/pcmcia/electra_cf.c                        |    2 +-
10889  drivers/phy/Kconfig                                |    6 +
10890  drivers/phy/Makefile                               |    1 +
10891  drivers/phy/phy-core.c                             |   44 +-
10892  drivers/phy/phy-mvebu-sata.c                       |  137 ++
10893  drivers/uio/uio.c                                  |    2 +-
10894  drivers/uio/uio_mf624.c                            |    2 +-
10895  drivers/w1/masters/mxc_w1.c                        |   31 +-
10896  include/linux/extcon/extcon-gpio.h                 |    1 +
10897  include/linux/mfd/arizona/registers.h              |    9 +
10898  include/uapi/linux/genwqe/genwqe_card.h            |  500 +++++++
10899  tools/hv/hv_kvp_daemon.c                           |    1 -
10900  tools/hv/hv_vss_daemon.c                           |    1 -
10901  82 files changed, 9169 insertions(+), 674 deletions(-)
10902  create mode 100644 Documentation/ABI/testing/debugfs-driver-genwqe
10903  create mode 100644 Documentation/ABI/testing/sysfs-driver-genwqe
10904  create mode 100644 drivers/extcon/extcon-max14577.c
10905  create mode 100644 drivers/misc/genwqe/Kconfig
10906  create mode 100644 drivers/misc/genwqe/Makefile
10907  create mode 100644 drivers/misc/genwqe/card_base.c
10908  create mode 100644 drivers/misc/genwqe/card_base.h
10909  create mode 100644 drivers/misc/genwqe/card_ddcb.c
10910  create mode 100644 drivers/misc/genwqe/card_ddcb.h
10911  create mode 100644 drivers/misc/genwqe/card_debugfs.c
10912  create mode 100644 drivers/misc/genwqe/card_dev.c
10913  create mode 100644 drivers/misc/genwqe/card_sysfs.c
10914  create mode 100644 drivers/misc/genwqe/card_utils.c
10915  create mode 100644 drivers/misc/genwqe/genwqe_driver.h
10916  create mode 100644 drivers/phy/phy-mvebu-sata.c
10917  create mode 100644 include/uapi/linux/genwqe/genwqe_card.h
10918 Merging scsi/for-next (81286dea29d1 Merge branch 'fixes' into for-next)
10919 $ git merge scsi/for-next
10920 Auto-merging drivers/scsi/sd.c
10921 Auto-merging drivers/scsi/qla2xxx/qla_nx2.c
10922 Removing drivers/scsi/aic7xxx_old/sequencer.h
10923 Removing drivers/scsi/aic7xxx_old/scsi_message.h
10924 Removing drivers/scsi/aic7xxx_old/aic7xxx_seq.c
10925 Removing drivers/scsi/aic7xxx_old/aic7xxx_reg.h
10926 Removing drivers/scsi/aic7xxx_old/aic7xxx_proc.c
10927 Removing drivers/scsi/aic7xxx_old/aic7xxx.seq
10928 Removing drivers/scsi/aic7xxx_old/aic7xxx.reg
10929 Removing drivers/scsi/aic7xxx_old/aic7xxx.h
10930 Removing drivers/scsi/aic7xxx_old.c
10931 Auto-merging drivers/scsi/Kconfig
10932 Auto-merging MAINTAINERS
10933 Removing Documentation/scsi/aic7xxx_old.txt
10934 Merge made by the 'recursive' strategy.
10935  Documentation/scsi/00-INDEX               |     2 -
10936  Documentation/scsi/aic7xxx_old.txt        |   511 --
10937  Documentation/scsi/scsi_eh.txt            |    69 +-
10938  Documentation/scsi/scsi_mid_low_api.txt   |     9 +-
10939  MAINTAINERS                               |     7 +-
10940  drivers/scsi/Kconfig                      |    41 -
10941  drivers/scsi/Makefile                     |     1 -
10942  drivers/scsi/aic7xxx_old.c                | 11149 ----------------------------
10943  drivers/scsi/aic7xxx_old/aic7xxx.h        |    28 -
10944  drivers/scsi/aic7xxx_old/aic7xxx.reg      |  1401 ----
10945  drivers/scsi/aic7xxx_old/aic7xxx.seq      |  1539 ----
10946  drivers/scsi/aic7xxx_old/aic7xxx_proc.c   |   270 -
10947  drivers/scsi/aic7xxx_old/aic7xxx_reg.h    |   629 --
10948  drivers/scsi/aic7xxx_old/aic7xxx_seq.c    |   817 --
10949  drivers/scsi/aic7xxx_old/scsi_message.h   |    49 -
10950  drivers/scsi/aic7xxx_old/sequencer.h      |   135 -
10951  drivers/scsi/be2iscsi/be_iscsi.c          |     8 +-
10952  drivers/scsi/bfa/bfa_core.c               |     8 +-
10953  drivers/scsi/bfa/bfa_defs.h               |     1 +
10954  drivers/scsi/bfa/bfa_fc.h                 |     2 +-
10955  drivers/scsi/bfa/bfa_fcs_lport.c          |    15 +-
10956  drivers/scsi/bfa/bfa_ioc.c                |   727 +-
10957  drivers/scsi/bfa/bfa_ioc.h                |     7 +-
10958  drivers/scsi/bfa/bfa_ioc_cb.c             |    23 +
10959  drivers/scsi/bfa/bfa_svc.c                |     2 +-
10960  drivers/scsi/bfa/bfad.c                   |    97 +-
10961  drivers/scsi/bfa/bfad_bsg.c               |    15 +
10962  drivers/scsi/bfa/bfad_bsg.h               |     1 +
10963  drivers/scsi/bfa/bfad_drv.h               |     6 +-
10964  drivers/scsi/bfa/bfi.h                    |    42 +-
10965  drivers/scsi/hosts.c                      |    31 +-
10966  drivers/scsi/hpsa.c                       |   308 +-
10967  drivers/scsi/hpsa.h                       |    20 +
10968  drivers/scsi/ipr.c                        |     2 +-
10969  drivers/scsi/ipr.h                        |     2 +-
10970  drivers/scsi/libiscsi.c                   |     6 +
10971  drivers/scsi/lpfc/lpfc_debugfs.c          |     2 +-
10972  drivers/scsi/mac_scsi.c                   |     2 +
10973  drivers/scsi/megaraid/megaraid_sas.h      |     1 -
10974  drivers/scsi/megaraid/megaraid_sas_base.c |     5 +-
10975  drivers/scsi/pm8001/pm8001_ctl.c          |    26 +-
10976  drivers/scsi/pm8001/pm8001_hwi.c          |    15 +-
10977  drivers/scsi/qla1280.c                    |     2 +-
10978  drivers/scsi/qla2xxx/qla_attr.c           |   116 +-
10979  drivers/scsi/qla2xxx/qla_bsg.c            |    44 +
10980  drivers/scsi/qla2xxx/qla_bsg.h            |    13 +
10981  drivers/scsi/qla2xxx/qla_dbg.c            |     7 +-
10982  drivers/scsi/qla2xxx/qla_def.h            |    22 +-
10983  drivers/scsi/qla2xxx/qla_gbl.h            |    15 +-
10984  drivers/scsi/qla2xxx/qla_init.c           |     2 +
10985  drivers/scsi/qla2xxx/qla_inline.h         |    19 -
10986  drivers/scsi/qla2xxx/qla_isr.c            |    82 +-
10987  drivers/scsi/qla2xxx/qla_mbx.c            |    73 +-
10988  drivers/scsi/qla2xxx/qla_mr.c             |    39 +-
10989  drivers/scsi/qla2xxx/qla_mr.h             |    12 +-
10990  drivers/scsi/qla2xxx/qla_nx.c             |    22 +-
10991  drivers/scsi/qla2xxx/qla_nx2.c            |    33 +-
10992  drivers/scsi/qla2xxx/qla_os.c             |   368 +-
10993  drivers/scsi/qla2xxx/qla_version.h        |     2 +-
10994  drivers/scsi/qla4xxx/ql4_bsg.c            |   360 +
10995  drivers/scsi/qla4xxx/ql4_bsg.h            |    13 +
10996  drivers/scsi/qla4xxx/ql4_def.h            |    40 +
10997  drivers/scsi/qla4xxx/ql4_fw.h             |   140 +-
10998  drivers/scsi/qla4xxx/ql4_glbl.h           |     3 +
10999  drivers/scsi/qla4xxx/ql4_isr.c            |    51 +-
11000  drivers/scsi/qla4xxx/ql4_mbx.c            |   154 +-
11001  drivers/scsi/qla4xxx/ql4_os.c             |  2330 ++++--
11002  drivers/scsi/qla4xxx/ql4_version.h        |     2 +-
11003  drivers/scsi/scsi.c                       |     9 +-
11004  drivers/scsi/scsi_debug.c                 |   266 +-
11005  drivers/scsi/scsi_error.c                 |   229 +-
11006  drivers/scsi/scsi_pm.c                    |    62 +-
11007  drivers/scsi/scsi_priv.h                  |     2 +
11008  drivers/scsi/scsi_sysfs.c                 |    36 +-
11009  drivers/scsi/scsi_transport_iscsi.c       |   414 +-
11010  drivers/scsi/sd.c                         |    28 +-
11011  drivers/scsi/sr.c                         |    37 +-
11012  drivers/scsi/st.c                         |     5 +-
11013  include/scsi/iscsi_if.h                   |   230 +-
11014  include/scsi/libiscsi.h                   |     1 +
11015  include/scsi/scsi_cmnd.h                  |     1 +
11016  include/scsi/scsi_driver.h                |     2 +-
11017  include/scsi/scsi_host.h                  |    10 +
11018  include/scsi/scsi_transport_iscsi.h       |     4 +
11019  84 files changed, 5245 insertions(+), 18086 deletions(-)
11020  delete mode 100644 Documentation/scsi/aic7xxx_old.txt
11021  delete mode 100644 drivers/scsi/aic7xxx_old.c
11022  delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx.h
11023  delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx.reg
11024  delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx.seq
11025  delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx_proc.c
11026  delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx_reg.h
11027  delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx_seq.c
11028  delete mode 100644 drivers/scsi/aic7xxx_old/scsi_message.h
11029  delete mode 100644 drivers/scsi/aic7xxx_old/sequencer.h
11030 Merging target-updates/for-next (b2ec6d36d271 IB/isert: pass scatterlist instead of cmd to fast_reg_mr routine)
11031 $ git merge target-updates/for-next
11032 Resolved 'drivers/target/target_core_tpg.c' using previous resolution.
11033 Auto-merging include/target/target_core_base.h
11034 Auto-merging drivers/vhost/scsi.c
11035 Auto-merging drivers/target/target_core_tpg.c
11036 CONFLICT (content): Merge conflict in drivers/target/target_core_tpg.c
11037 Auto-merging drivers/target/target_core_iblock.c
11038 Auto-merging drivers/target/target_core_device.c
11039 Auto-merging drivers/infiniband/ulp/isert/ib_isert.c
11040 Automatic merge failed; fix conflicts and then commit the result.
11041 $ git commit -v -a
11042 [master 04ea4f1cab51] Merge remote-tracking branch 'target-updates/for-next'
11043 $ git diff -M --stat --summary HEAD^..
11044  drivers/infiniband/ulp/isert/ib_isert.c      | 208 +++++-----
11045  drivers/infiniband/ulp/isert/ib_isert.h      |  10 +-
11046  drivers/target/Kconfig                       |   1 +
11047  drivers/target/loopback/tcm_loop.c           |  20 +-
11048  drivers/target/target_core_alua.c            | 558 ++++++++++++++++++++++-----
11049  drivers/target/target_core_alua.h            |  15 +-
11050  drivers/target/target_core_configfs.c        | 190 ++++++++-
11051  drivers/target/target_core_device.c          |  65 +++-
11052  drivers/target/target_core_fabric_configfs.c |   2 +-
11053  drivers/target/target_core_iblock.c          |   2 +-
11054  drivers/target/target_core_internal.h        |   7 +-
11055  drivers/target/target_core_pr.h              |   5 +
11056  drivers/target/target_core_rd.c              | 258 ++++++++++---
11057  drivers/target/target_core_rd.h              |   4 +
11058  drivers/target/target_core_sbc.c             | 225 ++++++++++-
11059  drivers/target/target_core_spc.c             | 114 +++++-
11060  drivers/target/target_core_tpg.c             |  10 +-
11061  drivers/target/target_core_transport.c       |  74 +++-
11062  drivers/target/target_core_ua.c              |   1 -
11063  drivers/target/target_core_xcopy.c           |   4 -
11064  drivers/target/tcm_fc/tfc_conf.c             |   6 +-
11065  drivers/vhost/scsi.c                         |   2 +-
11066  include/scsi/scsi.h                          |   1 +
11067  include/target/target_core_backend.h         |   6 +
11068  include/target/target_core_base.h            |  90 ++++-
11069  include/target/target_core_fabric.h          |   3 +-
11070  26 files changed, 1579 insertions(+), 302 deletions(-)
11071 Merging target-merge/for-next-merge (374b105797c3 Linux 3.13-rc3)
11072 $ git merge target-merge/for-next-merge
11073 Already up-to-date.
11074 Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS)
11075 $ git merge writeback/writeback-for-next
11076 Merge made by the 'recursive' strategy.
11077  fs/fs-writeback.c | 15 +++++++++------
11078  1 file changed, 9 insertions(+), 6 deletions(-)
11079 Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries)
11080 $ git merge hwspinlock/linux-next
11081 Already up-to-date.
11082 Merging pinctrl/for-next (f8720e5ec752 pinctrl: as3722: Set pin to output mode for some function)
11083 $ git merge pinctrl/for-next
11084 Auto-merging include/linux/mfd/as3722.h
11085 Auto-merging drivers/pinctrl/sh-pfc/sh_pfc.h
11086 Auto-merging drivers/pinctrl/sh-pfc/pfc-sh7372.c
11087 Auto-merging drivers/pinctrl/sh-pfc/pfc-r8a7740.c
11088 Auto-merging Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt
11089 Merge made by the 'recursive' strategy.
11090  .../bindings/pinctrl/nvidia,tegra124-pinmux.txt    |  144 +
11091  .../bindings/pinctrl/pinctrl-bindings.txt          |    3 +
11092  ...sm8x74-pinctrl.txt => qcom,msm8974-pinctrl.txt} |    4 +-
11093  drivers/pinctrl/Kconfig                            |   13 +-
11094  drivers/pinctrl/Makefile                           |    1 +
11095  drivers/pinctrl/pinconf-generic.c                  |    4 +
11096  drivers/pinctrl/pinconf.c                          |    2 -
11097  drivers/pinctrl/pinctrl-as3722.c                   |   20 +
11098  drivers/pinctrl/pinctrl-at91.c                     |   39 +-
11099  drivers/pinctrl/pinctrl-msm.c                      |  134 +-
11100  drivers/pinctrl/pinctrl-msm8x74.c                  |    6 +-
11101  drivers/pinctrl/pinctrl-sunxi-pins.h               |    2 +
11102  drivers/pinctrl/pinctrl-tegra124.c                 | 3137 ++++++++++++++++++++
11103  drivers/pinctrl/pinctrl-xway.c                     |    4 +-
11104  drivers/pinctrl/sh-pfc/gpio.c                      |    2 +-
11105  drivers/pinctrl/sh-pfc/pfc-r8a73a4.c               |    2 +-
11106  drivers/pinctrl/sh-pfc/pfc-r8a7740.c               |    2 +-
11107  drivers/pinctrl/sh-pfc/pfc-r8a7778.c               |    4 +-
11108  drivers/pinctrl/sh-pfc/pfc-r8a7779.c               |    2 +-
11109  drivers/pinctrl/sh-pfc/pfc-r8a7790.c               |    6 +-
11110  drivers/pinctrl/sh-pfc/pfc-r8a7791.c               |  598 +++-
11111  drivers/pinctrl/sh-pfc/pfc-sh7203.c                |    2 +-
11112  drivers/pinctrl/sh-pfc/pfc-sh7264.c                |    2 +-
11113  drivers/pinctrl/sh-pfc/pfc-sh7269.c                |    2 +-
11114  drivers/pinctrl/sh-pfc/pfc-sh7372.c                |    2 +-
11115  drivers/pinctrl/sh-pfc/pfc-sh73a0.c                |    2 +-
11116  drivers/pinctrl/sh-pfc/pfc-sh7720.c                |    2 +-
11117  drivers/pinctrl/sh-pfc/pfc-sh7722.c                |    2 +-
11118  drivers/pinctrl/sh-pfc/pfc-sh7723.c                |    2 +-
11119  drivers/pinctrl/sh-pfc/pfc-sh7724.c                |    2 +-
11120  drivers/pinctrl/sh-pfc/pfc-sh7734.c                |    2 +-
11121  drivers/pinctrl/sh-pfc/pfc-sh7757.c                |    2 +-
11122  drivers/pinctrl/sh-pfc/pfc-sh7785.c                |    2 +-
11123  drivers/pinctrl/sh-pfc/pfc-sh7786.c                |    2 +-
11124  drivers/pinctrl/sh-pfc/pfc-shx3.c                  |    2 +-
11125  drivers/pinctrl/sh-pfc/sh_pfc.h                    |   13 +-
11126  drivers/pinctrl/sirf/pinctrl-atlas6.c              |   24 +
11127  drivers/pinctrl/sirf/pinctrl-prima2.c              |   48 +-
11128  include/linux/mfd/as3722.h                         |    1 +
11129  include/linux/pinctrl/pinconf-generic.h            |    4 +
11130  40 files changed, 4075 insertions(+), 172 deletions(-)
11131  create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-pinmux.txt
11132  rename Documentation/devicetree/bindings/pinctrl/{qcom,msm8x74-pinctrl.txt => qcom,msm8974-pinctrl.txt} (97%)
11133  create mode 100644 drivers/pinctrl/pinctrl-tegra124.c
11134 Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak)
11135 $ git merge vhost/linux-next
11136 Already up-to-date.
11137 Merging remoteproc/for-next (b9777859ec01 remoteproc: fix kconfig dependencies for VIRTIO)
11138 $ git merge remoteproc/for-next
11139 Already up-to-date.
11140 Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO)
11141 $ git merge rpmsg/for-next
11142 Already up-to-date.
11143 Merging gpio/for-next (785acec3eecf ARM: S5P[v210|c100|64x0]: Fix build error)
11144 $ git merge gpio/for-next
11145 Resolved 'arch/xtensa/Kconfig' using previous resolution.
11146 Resolved 'drivers/leds/leds-s3c24xx.c' using previous resolution.
11147 Removing include/linux/spi/74x164.h
11148 Removing include/linux/acpi_gpio.h
11149 Auto-merging drivers/pinctrl/pinctrl-nomadik.c
11150 Auto-merging drivers/pinctrl/pinctrl-baytrail.c
11151 Auto-merging drivers/pinctrl/pinctrl-at91.c
11152 Auto-merging drivers/pinctrl/pinctrl-as3722.c
11153 Auto-merging drivers/mmc/host/sdhci-acpi.c
11154 Auto-merging drivers/leds/leds-s3c24xx.c
11155 CONFLICT (content): Merge conflict in drivers/leds/leds-s3c24xx.c
11156 Auto-merging drivers/gpio/gpiolib.c
11157 Auto-merging drivers/gpio/gpio-twl4030.c
11158 Auto-merging drivers/gpio/gpio-rcar.c
11159 Auto-merging drivers/gpio/gpio-msm-v2.c
11160 Auto-merging drivers/gpio/Makefile
11161 Auto-merging drivers/gpio/Kconfig
11162 Auto-merging arch/xtensa/Kconfig
11163 CONFLICT (content): Merge conflict in arch/xtensa/Kconfig
11164 Auto-merging arch/arm/mach-s3c64xx/mach-smartq.c
11165 Auto-merging arch/arm/mach-s3c64xx/mach-mini6410.c
11166 Auto-merging arch/arm/mach-s3c64xx/include/mach/gpio-samsung.h
11167 Auto-merging arch/arm/mach-s3c64xx/Kconfig
11168 Auto-merging arch/arm/mach-s3c24xx/simtec-usb.c
11169 Auto-merging arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h
11170 Removing arch/arm/mach-mv78xx0/include/mach/gpio.h
11171 Removing arch/arm/mach-lpc32xx/include/mach/gpio.h
11172 Removing arch/arm/mach-ks8695/include/mach/gpio.h
11173 Auto-merging arch/arm/Kconfig
11174 Automatic merge failed; fix conflicts and then commit the result.
11175 $ git commit -v -a
11176 [master a1588ff8e38c] Merge remote-tracking branch 'gpio/for-next'
11177 $ git diff -M --stat --summary HEAD^..
11178  Documentation/acpi/enumeration.txt                 |  36 +-
11179  Documentation/arm/Samsung-S3C24XX/GPIO.txt         |  13 +-
11180  .../devicetree/bindings/gpio/moxa,moxart-gpio.txt  |  19 +
11181  .../devicetree/bindings/gpio/renesas,gpio-rcar.txt |   3 +-
11182  Documentation/gpio/board.txt                       |  28 +-
11183  Documentation/gpio/consumer.txt                    |   6 +-
11184  arch/arm/Kconfig                                   |   4 +-
11185  arch/arm/mach-ks8695/include/mach/gpio.h           |  19 -
11186  arch/arm/mach-lpc32xx/include/mach/gpio.h          |   6 -
11187  arch/arm/mach-lpc32xx/phy3250.c                    |   2 +-
11188  arch/arm/mach-mv78xx0/include/mach/gpio.h          |   9 -
11189  arch/arm/mach-s3c24xx/Kconfig                      |  21 -
11190  arch/arm/mach-s3c24xx/common-smdk.c                |   2 +-
11191  arch/arm/mach-s3c24xx/h1940-bluetooth.c            |   2 +
11192  .../include/mach/{gpio.h => gpio-samsung.h}        |  26 +-
11193  arch/arm/mach-s3c24xx/mach-amlm5900.c              |   1 +
11194  arch/arm/mach-s3c24xx/mach-anubis.c                |   1 +
11195  arch/arm/mach-s3c24xx/mach-at2440evb.c             |   1 +
11196  arch/arm/mach-s3c24xx/mach-bast.c                  |   1 +
11197  arch/arm/mach-s3c24xx/mach-gta02.c                 |   1 +
11198  arch/arm/mach-s3c24xx/mach-h1940.c                 |   1 +
11199  arch/arm/mach-s3c24xx/mach-jive.c                  |   1 +
11200  arch/arm/mach-s3c24xx/mach-mini2440.c              |   1 +
11201  arch/arm/mach-s3c24xx/mach-n30.c                   |   1 +
11202  arch/arm/mach-s3c24xx/mach-nexcoder.c              |   1 +
11203  arch/arm/mach-s3c24xx/mach-osiris-dvs.c            |   1 +
11204  arch/arm/mach-s3c24xx/mach-osiris.c                |   1 +
11205  arch/arm/mach-s3c24xx/mach-qt2410.c                |   1 +
11206  arch/arm/mach-s3c24xx/mach-rx1950.c                |   2 +
11207  arch/arm/mach-s3c24xx/mach-rx3715.c                |   1 +
11208  arch/arm/mach-s3c24xx/mach-smdk2413.c              |   1 +
11209  arch/arm/mach-s3c24xx/mach-smdk2416.c              |   1 +
11210  arch/arm/mach-s3c24xx/mach-vr1000.c                |   1 +
11211  arch/arm/mach-s3c24xx/pm-s3c2410.c                 |   2 +
11212  arch/arm/mach-s3c24xx/pm.c                         |   1 +
11213  arch/arm/mach-s3c24xx/s3c2410.c                    |   1 +
11214  arch/arm/mach-s3c24xx/s3c2416.c                    |   1 +
11215  arch/arm/mach-s3c24xx/s3c2440.c                    |   1 +
11216  arch/arm/mach-s3c24xx/s3c2442.c                    |   1 +
11217  arch/arm/mach-s3c24xx/s3c2443.c                    |   1 +
11218  arch/arm/mach-s3c24xx/setup-i2c.c                  |   1 +
11219  arch/arm/mach-s3c24xx/setup-sdhci-gpio.c           |   1 +
11220  arch/arm/mach-s3c24xx/setup-ts.c                   |   2 +
11221  arch/arm/mach-s3c24xx/simtec-usb.c                 |   1 +
11222  arch/arm/mach-s3c64xx/Kconfig                      |   3 -
11223  arch/arm/mach-s3c64xx/common.c                     |   1 +
11224  arch/arm/mach-s3c64xx/crag6410.h                   |   2 +-
11225  arch/arm/mach-s3c64xx/dev-audio.c                  |   1 +
11226  .../include/mach/{gpio.h => gpio-samsung.h}        |   9 +-
11227  arch/arm/mach-s3c64xx/mach-anw6410.c               |   1 +
11228  arch/arm/mach-s3c64xx/mach-crag6410.c              |   2 +-
11229  arch/arm/mach-s3c64xx/mach-hmt.c                   |   1 +
11230  arch/arm/mach-s3c64xx/mach-mini6410.c              |   1 +
11231  arch/arm/mach-s3c64xx/mach-real6410.c              |   1 +
11232  arch/arm/mach-s3c64xx/mach-smartq.c                |   1 +
11233  arch/arm/mach-s3c64xx/mach-smartq5.c               |   1 +
11234  arch/arm/mach-s3c64xx/mach-smartq7.c               |   1 +
11235  arch/arm/mach-s3c64xx/mach-smdk6400.c              |   1 +
11236  arch/arm/mach-s3c64xx/mach-smdk6410.c              |   1 +
11237  arch/arm/mach-s3c64xx/pm.c                         |   1 +
11238  arch/arm/mach-s3c64xx/setup-fb-24bpp.c             |   1 +
11239  arch/arm/mach-s3c64xx/setup-i2c0.c                 |   1 +
11240  arch/arm/mach-s3c64xx/setup-i2c1.c                 |   1 +
11241  arch/arm/mach-s3c64xx/setup-ide.c                  |   1 +
11242  arch/arm/mach-s3c64xx/setup-keypad.c               |   1 +
11243  arch/arm/mach-s3c64xx/setup-sdhci-gpio.c           |   1 +
11244  arch/arm/mach-s3c64xx/setup-spi.c                  |   1 +
11245  arch/arm/mach-tegra/board-paz00.c                  |  11 +
11246  arch/arm/plat-samsung/pm-gpio.c                    |   4 +
11247  arch/arm/plat-samsung/setup-camif.c                |   1 +
11248  arch/xtensa/Kconfig                                |   6 +
11249  drivers/gpio/Kconfig                               |  35 +-
11250  drivers/gpio/Makefile                              |   3 +
11251  drivers/gpio/gpio-74x164.c                         |  59 +--
11252  drivers/gpio/gpio-adnp.c                           |  25 +-
11253  drivers/gpio/gpio-adp5520.c                        |   2 +-
11254  drivers/gpio/gpio-adp5588.c                        |   2 +-
11255  drivers/gpio/gpio-amd8111.c                        |   2 +-
11256  drivers/gpio/gpio-arizona.c                        |   2 +-
11257  drivers/gpio/gpio-bcm-kona.c                       |  22 ++
11258  drivers/gpio/gpio-bt8xx.c                          |   4 +-
11259  drivers/gpio/gpio-clps711x.c                       |   4 +-
11260  drivers/gpio/gpio-da9052.c                         |   2 +-
11261  drivers/gpio/gpio-da9055.c                         |   2 +-
11262  drivers/gpio/gpio-em.c                             |  28 +-
11263  drivers/gpio/gpio-f7188x.c                         |   1 +
11264  drivers/gpio/gpio-ich.c                            |   2 +-
11265  drivers/gpio/gpio-intel-mid.c                      |  30 +-
11266  drivers/gpio/gpio-kempld.c                         |   2 +-
11267  drivers/gpio/gpio-ks8695.c                         |   2 +-
11268  drivers/gpio/gpio-lpc32xx.c                        |  14 +-
11269  drivers/gpio/gpio-lynxpoint.c                      |  39 +-
11270  drivers/gpio/gpio-max730x.c                        |   5 +-
11271  drivers/gpio/gpio-max732x.c                        |   2 +-
11272  drivers/gpio/gpio-mc33880.c                        |   2 +-
11273  drivers/gpio/gpio-mc9s08dz60.c                     |   2 +-
11274  drivers/gpio/gpio-mcp23s08.c                       |   2 +-
11275  drivers/gpio/gpio-ml-ioh.c                         |   4 +-
11276  drivers/gpio/gpio-moxart.c                         | 156 ++++++++
11277  drivers/gpio/gpio-msic.c                           |   9 +-
11278  drivers/gpio/gpio-msm-v2.c                         |   3 +-
11279  drivers/gpio/gpio-mvebu.c                          |   4 +-
11280  drivers/gpio/gpio-mxc.c                            |   2 +-
11281  drivers/gpio/gpio-octeon.c                         |   2 +-
11282  drivers/gpio/gpio-omap.c                           | 188 ++++-----
11283  drivers/gpio/gpio-palmas.c                         |   2 +-
11284  drivers/gpio/gpio-pca953x.c                        |   2 +-
11285  drivers/gpio/gpio-pcf857x.c                        |   2 +-
11286  drivers/gpio/gpio-pch.c                            |   4 +-
11287  drivers/gpio/gpio-pxa.c                            |   3 +-
11288  drivers/gpio/gpio-rc5t583.c                        |   2 +-
11289  drivers/gpio/gpio-rcar.c                           |  61 ++-
11290  drivers/gpio/gpio-samsung.c                        |  11 +-
11291  drivers/gpio/gpio-sch311x.c                        | 432 +++++++++++++++++++++
11292  drivers/gpio/gpio-sodaville.c                      |  10 +-
11293  drivers/gpio/gpio-sta2x11.c                        |   2 +-
11294  drivers/gpio/gpio-stmpe.c                          |   2 +-
11295  drivers/gpio/gpio-sx150x.c                         |   2 +-
11296  drivers/gpio/gpio-tb10x.c                          |   4 +-
11297  drivers/gpio/gpio-tc3589x.c                        |   2 +-
11298  drivers/gpio/gpio-tegra.c                          |   7 +-
11299  drivers/gpio/gpio-timberdale.c                     |   6 +-
11300  drivers/gpio/gpio-tnetv107x.c                      |   2 +-
11301  drivers/gpio/gpio-tps6586x.c                       |   2 +-
11302  drivers/gpio/gpio-tps65910.c                       |   2 +-
11303  drivers/gpio/gpio-tps65912.c                       |   2 +-
11304  drivers/gpio/gpio-twl4030.c                        |   2 +-
11305  drivers/gpio/gpio-twl6040.c                        |   2 +-
11306  drivers/gpio/gpio-ucb1400.c                        |   2 +-
11307  drivers/gpio/gpio-viperboard.c                     |   4 +-
11308  drivers/gpio/gpio-vx855.c                          |   2 +-
11309  drivers/gpio/gpio-wm831x.c                         |   2 +-
11310  drivers/gpio/gpio-wm8350.c                         |   2 +-
11311  drivers/gpio/gpio-wm8994.c                         |   2 +-
11312  drivers/gpio/gpio-xtensa.c                         | 163 ++++++++
11313  drivers/gpio/gpiolib-acpi.c                        |  23 +-
11314  drivers/gpio/gpiolib.c                             | 251 ++++++------
11315  drivers/gpio/gpiolib.h                             |  46 +++
11316  drivers/leds/leds-s3c24xx.c                        |   1 +
11317  drivers/mmc/host/s3cmci.c                          |   2 +
11318  drivers/mmc/host/sdhci-acpi.c                      |  29 +-
11319  drivers/pinctrl/pinctrl-as3722.c                   |   2 +-
11320  drivers/pinctrl/pinctrl-at91.c                     |   2 +-
11321  drivers/pinctrl/pinctrl-baytrail.c                 |   6 +-
11322  drivers/pinctrl/pinctrl-bcm2835.c                  |   2 +-
11323  drivers/pinctrl/pinctrl-nomadik.c                  |   2 +-
11324  drivers/pinctrl/pinctrl-sunxi.c                    |   2 +-
11325  drivers/pinctrl/vt8500/pinctrl-wmt.c               |   2 +-
11326  include/linux/acpi_gpio.h                          |  51 ---
11327  include/linux/gpio.h                               |   1 -
11328  include/linux/gpio/driver.h                        |  56 ++-
11329  .../linux/platform_data}/gpio-lpc32xx.h            |   0
11330  include/linux/spi/74x164.h                         |   9 -
11331  net/rfkill/rfkill-gpio.c                           |  77 ++--
11332  154 files changed, 1586 insertions(+), 669 deletions(-)
11333  create mode 100644 Documentation/devicetree/bindings/gpio/moxa,moxart-gpio.txt
11334  delete mode 100644 arch/arm/mach-ks8695/include/mach/gpio.h
11335  delete mode 100644 arch/arm/mach-lpc32xx/include/mach/gpio.h
11336  delete mode 100644 arch/arm/mach-mv78xx0/include/mach/gpio.h
11337  rename arch/arm/mach-s3c24xx/include/mach/{gpio.h => gpio-samsung.h} (85%)
11338  rename arch/arm/mach-s3c64xx/include/mach/{gpio.h => gpio-samsung.h} (95%)
11339  create mode 100644 drivers/gpio/gpio-moxart.c
11340  create mode 100644 drivers/gpio/gpio-sch311x.c
11341  create mode 100644 drivers/gpio/gpio-xtensa.c
11342  create mode 100644 drivers/gpio/gpiolib.h
11343  delete mode 100644 include/linux/acpi_gpio.h
11344  rename {arch/arm/mach-lpc32xx/include/mach => include/linux/platform_data}/gpio-lpc32xx.h (100%)
11345  delete mode 100644 include/linux/spi/74x164.h
11346 Merging dma-mapping/dma-mapping-next (5e01dc7b26d9 Linux 3.12)
11347 $ git merge dma-mapping/dma-mapping-next
11348 Already up-to-date.
11349 Merging pwm/for-next (82569e5b2236 pwm: tiehrpwm: use dev_err() instead of pr_err())
11350 $ git merge pwm/for-next
11351 Auto-merging drivers/pwm/Makefile
11352 Auto-merging drivers/pwm/Kconfig
11353 Merge made by the 'recursive' strategy.
11354  .../devicetree/bindings/pwm/atmel-pwm.txt          |  33 ++
11355  Documentation/devicetree/bindings/pwm/pxa-pwm.txt  |  30 ++
11356  drivers/pwm/Kconfig                                |  14 +-
11357  drivers/pwm/Makefile                               |   1 +
11358  drivers/pwm/core.c                                 |   6 +-
11359  drivers/pwm/pwm-atmel.c                            | 395 +++++++++++++++++++++
11360  drivers/pwm/pwm-ep93xx.c                           |   4 +-
11361  drivers/pwm/pwm-jz4740.c                           |  20 +-
11362  drivers/pwm/pwm-pxa.c                              |  55 ++-
11363  drivers/pwm/pwm-tiehrpwm.c                         |   4 +-
11364  drivers/pwm/sysfs.c                                |  12 +-
11365  drivers/video/backlight/pwm_bl.c                   |   1 -
11366  12 files changed, 537 insertions(+), 38 deletions(-)
11367  create mode 100644 Documentation/devicetree/bindings/pwm/atmel-pwm.txt
11368  create mode 100644 Documentation/devicetree/bindings/pwm/pxa-pwm.txt
11369  create mode 100644 drivers/pwm/pwm-atmel.c
11370 Merging dma-buf/for-next (17b2112f332d Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc)
11371 $ git merge dma-buf/for-next
11372 Already up-to-date.
11373 Merging userns/for-next (41301ae78a99 vfs: Fix a regression in mounting proc)
11374 $ git merge userns/for-next
11375 Auto-merging kernel/fork.c
11376 Auto-merging fs/namespace.c
11377 Auto-merging fs/dcache.c
11378 Merge made by the 'recursive' strategy.
11379  fs/dcache.c    | 7 ++++++-
11380  fs/namespace.c | 2 +-
11381  kernel/fork.c  | 2 +-
11382  3 files changed, 8 insertions(+), 3 deletions(-)
11383 Merging ktest/for-next (c75d22d9c675 ktest: Add eval '=~' command to modify variables in config file)
11384 $ git merge ktest/for-next
11385 Auto-merging tools/testing/ktest/ktest.pl
11386 Merge made by the 'recursive' strategy.
11387  tools/testing/ktest/ktest.pl    | 134 +++++++++++++++++++++++++++++++---------
11388  tools/testing/ktest/sample.conf |   7 +++
11389  2 files changed, 111 insertions(+), 30 deletions(-)
11390 Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
11391 $ git merge signal/for-next
11392 Already up-to-date.
11393 Merging clk/clk-next (119754e57609 Merge branch 'clk-next-shmobile' into clk-next)
11394 $ git merge clk/clk-next
11395 Resolved 'MAINTAINERS' using previous resolution.
11396 Resolved 'drivers/clk/samsung/clk-exynos4.c' using previous resolution.
11397 Auto-merging include/linux/clk-provider.h
11398 Auto-merging drivers/clk/tegra/clk-periph.c
11399 Auto-merging drivers/clk/samsung/clk-exynos4.c
11400 CONFLICT (content): Merge conflict in drivers/clk/samsung/clk-exynos4.c
11401 Auto-merging drivers/clk/Makefile
11402 Auto-merging arch/arm/boot/dts/exynos5420.dtsi
11403 Auto-merging arch/arm/boot/dts/exynos5250.dtsi
11404 Auto-merging arch/arm/boot/dts/exynos5250-cros-common.dtsi
11405 Auto-merging arch/arm/boot/dts/exynos4412-trats2.dts
11406 Auto-merging arch/arm/boot/dts/exynos4412-odroidx.dts
11407 Auto-merging MAINTAINERS
11408 CONFLICT (content): Merge conflict in MAINTAINERS
11409 Auto-merging Documentation/devicetree/bindings/clock/exynos5250-clock.txt
11410 Automatic merge failed; fix conflicts and then commit the result.
11411 $ git commit -v -a
11412 [master a1d765c00f0f] Merge remote-tracking branch 'clk/clk-next'
11413 $ git diff -M --stat --summary HEAD^..
11414  Documentation/clk.txt                              |   4 +
11415  .../devicetree/bindings/clock/clk-exynos-audss.txt |  39 +-
11416  .../devicetree/bindings/clock/exynos5250-clock.txt |   1 +
11417  .../devicetree/bindings/clock/fixed-clock.txt      |   3 +
11418  .../bindings/clock/fixed-factor-clock.txt          |   4 +-
11419  .../devicetree/bindings/clock/keystone-pll.txt     |   8 +-
11420  .../devicetree/bindings/clock/maxim,max77686.txt   |  38 +
11421  .../devicetree/bindings/clock/silabs,si570.txt     |  39 +
11422  Documentation/devicetree/bindings/clock/sunxi.txt  |  10 +-
11423  .../devicetree/bindings/clock/zynq-7000.txt        |   4 +
11424  Documentation/devicetree/bindings/mfd/max77686.txt |   3 +
11425  MAINTAINERS                                        |  14 +
11426  arch/arm/boot/dts/exynos4412-odroidx.dts           |   1 +
11427  arch/arm/boot/dts/exynos4412-trats2.dts            |   1 +
11428  arch/arm/boot/dts/exynos5250-cros-common.dtsi      |   1 +
11429  arch/arm/boot/dts/exynos5250.dtsi                  |   2 +
11430  arch/arm/boot/dts/exynos5420.dtsi                  |   4 +-
11431  arch/arm/include/asm/clkdev.h                      |   2 +
11432  arch/blackfin/include/asm/clkdev.h                 |   2 +
11433  arch/mips/include/asm/clkdev.h                     |   2 +
11434  arch/sh/include/asm/clkdev.h                       |   2 +
11435  drivers/clk/Kconfig                                |  20 +-
11436  drivers/clk/Makefile                               |   1 +
11437  drivers/clk/clk-composite.c                        |  28 +
11438  drivers/clk/clk-fixed-rate.c                       |  43 +-
11439  drivers/clk/clk-max77686.c                         |  97 ++-
11440  drivers/clk/clk-si570.c                            | 531 +++++++++++++
11441  drivers/clk/clk-vt8500.c                           |   2 +-
11442  drivers/clk/clk.c                                  | 293 ++++++-
11443  drivers/clk/clk.h                                  |  16 +
11444  drivers/clk/clkdev.c                               |  12 +-
11445  drivers/clk/keystone/gate.c                        |  12 +-
11446  drivers/clk/keystone/pll.c                         |  24 +-
11447  drivers/clk/samsung/clk-exynos-audss.c             | 159 +++-
11448  drivers/clk/samsung/clk-exynos4.c                  | 857 ++++++++++-----------
11449  drivers/clk/samsung/clk-exynos5250.c               | 699 ++++++++++-------
11450  drivers/clk/samsung/clk-exynos5420.c               | 650 ++++++++--------
11451  drivers/clk/samsung/clk-exynos5440.c               |  81 +-
11452  drivers/clk/shmobile/clk-mstp.c                    |  12 +-
11453  drivers/clk/socfpga/clk.c                          |   6 +-
11454  drivers/clk/spear/clk-frac-synth.c                 |   2 +-
11455  drivers/clk/sunxi/clk-factors.c                    |  67 +-
11456  drivers/clk/sunxi/clk-factors.h                    |  16 +-
11457  drivers/clk/sunxi/clk-sunxi.c                      | 493 +++++++++++-
11458  drivers/clk/tegra/clk-periph.c                     |   2 +-
11459  drivers/clk/tegra/clk-pll.c                        |  12 +-
11460  drivers/clk/ux500/clk-prcmu.c                      |   2 +-
11461  drivers/clk/versatile/clk-sp810.c                  |   2 +-
11462  drivers/clk/zynq/clkc.c                            |  18 +-
11463  include/dt-bindings/clk/exynos-audss-clk.h         |   3 +-
11464  include/dt-bindings/clock/exynos4.h                | 244 ++++++
11465  include/dt-bindings/clock/exynos5250.h             | 160 ++++
11466  include/dt-bindings/clock/exynos5420.h             | 188 +++++
11467  include/dt-bindings/clock/exynos5440.h             |  42 +
11468  include/linux/clk-private.h                        |   8 +-
11469  include/linux/clk-provider.h                       |  15 +
11470  include/linux/clk.h                                |  17 +
11471  include/linux/clkdev.h                             |   5 +
11472  58 files changed, 3645 insertions(+), 1378 deletions(-)
11473  create mode 100644 Documentation/devicetree/bindings/clock/maxim,max77686.txt
11474  create mode 100644 Documentation/devicetree/bindings/clock/silabs,si570.txt
11475  create mode 100644 drivers/clk/clk-si570.c
11476  create mode 100644 drivers/clk/clk.h
11477  create mode 100644 include/dt-bindings/clock/exynos4.h
11478  create mode 100644 include/dt-bindings/clock/exynos5250.h
11479  create mode 100644 include/dt-bindings/clock/exynos5420.h
11480  create mode 100644 include/dt-bindings/clock/exynos5440.h
11481 Merging random/dev (a9f069e38cc3 random: use the architectural HWRNG for the SHA's IV in extract_buf())
11482 $ git merge random/dev
11483 Merge made by the 'recursive' strategy.
11484  drivers/char/random.c | 192 ++++++++++++++++++++++----------------------------
11485  1 file changed, 84 insertions(+), 108 deletions(-)
11486 Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
11487 $ git merge lzo-update/lzo-update
11488 Merge made by the 'recursive' strategy.
11489  lib/lzo/lzo1x_decompress_safe.c | 4 ++++
11490  lib/lzo/lzodefs.h               | 6 ++++++
11491  2 files changed, 10 insertions(+)
11492 Merging arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP support.)
11493 $ git merge arm64-hugepages/for-next/hugepages
11494 Already up-to-date.
11495 Merging aio/master (8e321fefb0e6 aio/migratepages: make aio migrate pages sane)
11496 $ git merge aio/master
11497 Already up-to-date.
11498 Merging akpm-current/current (0fc6f4e2e3d5 splice: fix unexpected size truncation)
11499 $ git merge --no-ff akpm-current/current
11500 Auto-merging scripts/checkpatch.pl
11501 Auto-merging mm/util.c
11502 Auto-merging mm/slub.c
11503 Auto-merging mm/percpu.c
11504 Auto-merging mm/page_io.c
11505 Auto-merging mm/page_cgroup.c
11506 Auto-merging mm/mempolicy.c
11507 Auto-merging mm/memcontrol.c
11508 Auto-merging mm/hugetlb_cgroup.c
11509 Auto-merging mm/huge_memory.c
11510 Auto-merging lib/swiotlb.c
11511 Auto-merging lib/Makefile
11512 Auto-merging lib/Kconfig.debug
11513 Auto-merging kernel/time/sched_clock.c
11514 Auto-merging kernel/sysctl.c
11515 Auto-merging kernel/sched/fair.c
11516 Auto-merging kernel/sched/core.c
11517 Auto-merging kernel/fork.c
11518 Auto-merging include/linux/sched/sysctl.h
11519 Auto-merging include/linux/sched.h
11520 Auto-merging include/linux/printk.h
11521 Auto-merging include/linux/mm.h
11522 Auto-merging include/linux/kernel.h
11523 Auto-merging include/linux/init_task.h
11524 Removing include/asm-generic/int-l64.h
11525 Removing fs/ocfs2/ver.h
11526 Removing fs/ocfs2/ver.c
11527 Removing fs/ocfs2/dlmfs/dlmfsver.h
11528 Removing fs/ocfs2/dlmfs/dlmfsver.c
11529 Removing fs/ocfs2/dlm/dlmver.h
11530 Removing fs/ocfs2/dlm/dlmver.c
11531 Removing fs/ocfs2/cluster/ver.h
11532 Removing fs/ocfs2/cluster/ver.c
11533 Removing fs/coredump.h
11534 Auto-merging drivers/tty/Kconfig
11535 Auto-merging drivers/rtc/rtc-cmos.c
11536 Auto-merging drivers/rtc/Makefile
11537 Auto-merging drivers/rtc/Kconfig
11538 Auto-merging drivers/misc/ti-st/st_core.c
11539 Auto-merging drivers/mfd/tps65217.c
11540 Auto-merging drivers/mfd/max8998.c
11541 Auto-merging drivers/iommu/intel-iommu.c
11542 Auto-merging drivers/input/input.c
11543 Auto-merging drivers/gpu/drm/nouveau/nouveau_acpi.c
11544 Auto-merging drivers/gpu/drm/drm_fb_helper.c
11545 Auto-merging drivers/gpu/drm/cirrus/cirrus_mode.c
11546 Auto-merging drivers/firmware/Kconfig
11547 Auto-merging drivers/block/loop.c
11548 Auto-merging arch/x86/mm/numa.c
11549 Auto-merging arch/x86/mm/init_32.c
11550 Auto-merging arch/x86/kernel/setup.c
11551 Auto-merging arch/x86/kernel/cpu/intel.c
11552 Auto-merging arch/x86/kernel/cpu/amd.c
11553 Auto-merging arch/x86/Kconfig
11554 Auto-merging arch/sparc/Kconfig
11555 Auto-merging arch/sh/Kconfig
11556 Auto-merging arch/powerpc/mm/numa.c
11557 Auto-merging arch/powerpc/mm/mem.c
11558 Auto-merging arch/powerpc/Kconfig
11559 Auto-merging arch/mips/Kconfig
11560 Auto-merging arch/ia64/Kconfig
11561 Auto-merging arch/arm/mm/init.c
11562 Auto-merging arch/arm/kernel/setup.c
11563 Auto-merging arch/arm/kernel/devtree.c
11564 Auto-merging arch/arm/Kconfig
11565 Auto-merging arch/alpha/Kconfig
11566 Auto-merging MAINTAINERS
11567 Removing Documentation/vm/locking
11568 Auto-merging Documentation/sysctl/kernel.txt
11569 Auto-merging Documentation/kernel-parameters.txt
11570 Auto-merging Documentation/filesystems/proc.txt
11571 Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
11572 Merge made by the 'recursive' strategy.
11573  Documentation/blockdev/ramdisk.txt                 |  21 +-
11574  .../devicetree/bindings/rtc/haoyu,hym8563.txt      |  27 +
11575  .../devicetree/bindings/rtc/maxim,ds1742.txt       |  12 +
11576  .../devicetree/bindings/vendor-prefixes.txt        |   1 +
11577  Documentation/dynamic-debug-howto.txt              |   9 +
11578  Documentation/filesystems/00-INDEX                 |  58 +-
11579  Documentation/filesystems/nilfs2.txt               |  56 ++
11580  Documentation/filesystems/proc.txt                 |   9 +
11581  Documentation/filesystems/sysfs.txt                |   6 +-
11582  Documentation/filesystems/vfat.txt                 |  10 +
11583  Documentation/kernel-parameters.txt                |  11 +-
11584  Documentation/leds/leds-class.txt                  |   3 -
11585  Documentation/printk-formats.txt                   |  17 +-
11586  Documentation/sysctl/kernel.txt                    |  15 +-
11587  Documentation/sysctl/vm.txt                        |  12 +
11588  .../trace/postprocess/trace-vmscan-postprocess.pl  |  18 +-
11589  Documentation/vm/locking                           | 130 -----
11590  Documentation/vm/overcommit-accounting             |   7 +-
11591  MAINTAINERS                                        |  11 +
11592  arch/alpha/Kconfig                                 |   8 +-
11593  arch/arc/Kconfig                                   |   4 +-
11594  arch/arm/Kconfig                                   |  12 +-
11595  arch/arm/include/asm/dma.h                         |   4 +-
11596  arch/arm/include/asm/fixmap.h                      |  29 +-
11597  arch/arm/kernel/devtree.c                          |   2 +-
11598  arch/arm/kernel/setup.c                            |   2 +-
11599  arch/arm/mach-omap2/omap_hwmod.c                   |   8 +-
11600  arch/arm/mm/init.c                                 |   7 +-
11601  arch/hexagon/include/asm/fixmap.h                  |  40 +-
11602  arch/ia64/Kconfig                                  |   1 +
11603  arch/ia64/include/asm/dmi.h                        |   8 +-
11604  arch/ia64/include/asm/processor.h                  |   1 +
11605  arch/ia64/mm/contig.c                              |  68 ---
11606  arch/ia64/mm/discontig.c                           |  63 ---
11607  arch/ia64/mm/init.c                                |  48 ++
11608  arch/m32r/Kconfig                                  |   8 +-
11609  arch/metag/include/asm/fixmap.h                    |  32 +-
11610  arch/metag/mm/init.c                               |   3 +-
11611  arch/metag/mm/numa.c                               |   3 +-
11612  arch/microblaze/Kconfig                            |   1 +
11613  arch/microblaze/include/asm/fixmap.h               |  44 +-
11614  arch/microblaze/mm/init.c                          |   3 +-
11615  arch/mips/Kconfig                                  |  10 +-
11616  arch/mips/include/asm/fixmap.h                     |  33 +-
11617  arch/mn10300/Kconfig                               |   8 +-
11618  arch/parisc/Kconfig                                |   8 +-
11619  arch/parisc/mm/init.c                              |  59 +-
11620  arch/powerpc/Kconfig                               |   4 +-
11621  arch/powerpc/include/asm/fixmap.h                  |  44 +-
11622  arch/powerpc/mm/mem.c                              |   2 +-
11623  arch/powerpc/mm/numa.c                             |   8 +-
11624  arch/s390/Kconfig                                  |   4 +-
11625  arch/sh/Kconfig                                    |   8 +-
11626  arch/sh/include/asm/fixmap.h                       |  39 +-
11627  arch/sh/kernel/dwarf.c                             |  18 +-
11628  arch/sh/kernel/setup.c                             |   4 +-
11629  arch/sparc/Kconfig                                 |   4 +-
11630  arch/sparc/mm/init_64.c                            |   5 +-
11631  arch/tile/include/asm/fixmap.h                     |  33 +-
11632  arch/um/include/asm/fixmap.h                       |  40 +-
11633  arch/unicore32/mm/init.c                           |   3 -
11634  arch/x86/Kconfig                                   |   9 +-
11635  arch/x86/include/asm/dmi.h                         |   6 +-
11636  arch/x86/include/asm/fixmap.h                      |  59 +-
11637  arch/x86/include/asm/page_types.h                  |   4 +-
11638  arch/x86/include/asm/tlbflush.h                    |   6 +-
11639  arch/x86/kernel/check.c                            |   2 +-
11640  arch/x86/kernel/cpu/amd.c                          |   5 +-
11641  arch/x86/kernel/cpu/intel.c                        |  10 +-
11642  arch/x86/kernel/cpu/mtrr/generic.c                 |   4 +-
11643  arch/x86/kernel/e820.c                             |   2 +-
11644  arch/x86/kernel/setup.c                            |   2 +-
11645  arch/x86/mm/gup.c                                  |   8 +-
11646  arch/x86/mm/init_32.c                              |   2 +-
11647  arch/x86/mm/init_64.c                              |   2 +-
11648  arch/x86/mm/memtest.c                              |   2 +-
11649  arch/x86/mm/numa.c                                 |  52 +-
11650  arch/x86/mm/srat.c                                 |  21 +-
11651  arch/x86/mm/tlb.c                                  |  52 +-
11652  block/cmdline-parser.c                             |  18 +-
11653  block/genhd.c                                      |   2 +-
11654  drivers/block/Kconfig                              |   3 +-
11655  drivers/block/cciss.c                              |   4 +-
11656  drivers/block/loop.c                               |   2 +-
11657  drivers/block/paride/pg.c                          |   2 +-
11658  drivers/block/sx8.c                                |  16 +-
11659  drivers/char/mem.c                                 |   1 -
11660  drivers/firmware/Kconfig                           |   3 +
11661  drivers/firmware/dmi_scan.c                        |  20 +-
11662  drivers/firmware/memmap.c                          |   2 +-
11663  drivers/gpu/drm/cirrus/cirrus_mode.c               |   4 +-
11664  drivers/gpu/drm/drm_fb_helper.c                    |   8 +
11665  drivers/gpu/drm/gma500/backlight.c                 |   4 +-
11666  drivers/gpu/drm/nouveau/nouveau_acpi.c             |   6 +
11667  drivers/input/Kconfig                              |   9 +
11668  drivers/input/Makefile                             |   3 +
11669  drivers/input/input.c                              |   6 +
11670  drivers/input/leds.c                               | 249 +++++++++
11671  drivers/iommu/intel-iommu.c                        |   2 +-
11672  drivers/leds/Kconfig                               |   3 -
11673  drivers/mailbox/omap-mbox.h                        |   2 +-
11674  drivers/memstick/host/rtsx_pci_ms.c                |  30 +-
11675  drivers/mfd/max8998.c                              |   2 +-
11676  drivers/mfd/tps65217.c                             |   2 +-
11677  drivers/misc/ti-st/st_core.c                       |   2 +-
11678  drivers/net/irda/donauboe.c                        |  15 +-
11679  drivers/pps/pps.c                                  |  57 +-
11680  drivers/rtc/Kconfig                                |  13 +-
11681  drivers/rtc/Makefile                               |   1 +
11682  drivers/rtc/class.c                                |  24 +-
11683  drivers/rtc/rtc-as3722.c                           |  19 +-
11684  drivers/rtc/rtc-cmos.c                             |   8 +-
11685  drivers/rtc/rtc-ds1305.c                           |   1 -
11686  drivers/rtc/rtc-ds1742.c                           |  10 +-
11687  drivers/rtc/rtc-hym8563.c                          | 606 +++++++++++++++++++++
11688  drivers/rtc/rtc-max8907.c                          |  11 +-
11689  drivers/rtc/rtc-mxc.c                              |  10 +-
11690  drivers/rtc/rtc-pcf2127.c                          |   5 +-
11691  drivers/rtc/rtc-s5m.c                              |   2 +
11692  drivers/rtc/rtc-twl.c                              |  38 +-
11693  drivers/rtc/rtc-vr41xx.c                           |  50 +-
11694  drivers/scsi/megaraid/megaraid_mm.c                |   2 +
11695  drivers/tty/Kconfig                                |   4 +
11696  drivers/tty/vt/keyboard.c                          | 110 +++-
11697  drivers/video/aty/aty128fb.c                       |   4 +
11698  drivers/video/backlight/backlight.c                |   2 -
11699  drivers/video/backlight/hp680_bl.c                 |   6 +-
11700  drivers/video/backlight/jornada720_bl.c            |  15 +-
11701  drivers/video/backlight/jornada720_lcd.c           |  13 +-
11702  drivers/video/backlight/kb3886_bl.c                |   2 +-
11703  drivers/video/backlight/l4f00242t03.c              |   6 +-
11704  drivers/video/backlight/lp855x_bl.c                |   2 +-
11705  drivers/video/backlight/lp8788_bl.c                |   6 +-
11706  drivers/video/backlight/omap1_bl.c                 |  14 +-
11707  drivers/video/backlight/ot200_bl.c                 |   9 +-
11708  drivers/video/backlight/tosa_bl.c                  |   7 +-
11709  drivers/video/backlight/tosa_lcd.c                 |   6 +-
11710  drivers/vlynq/vlynq.c                              |   3 +-
11711  drivers/w1/masters/w1-gpio.c                       |  22 +
11712  drivers/w1/w1_int.c                                |  12 -
11713  fs/afs/proc.c                                      |   4 +-
11714  fs/autofs4/autofs_i.h                              |   4 +-
11715  fs/autofs4/dev-ioctl.c                             |  16 +-
11716  fs/autofs4/expire.c                                |  14 +
11717  fs/autofs4/inode.c                                 |  49 +-
11718  fs/autofs4/root.c                                  |   6 +-
11719  fs/autofs4/symlink.c                               |   4 +
11720  fs/autofs4/waitq.c                                 |  16 +-
11721  fs/binfmt_elf.c                                    |  24 +-
11722  fs/compat_ioctl.c                                  |   3 +-
11723  fs/coredump.c                                      |   1 -
11724  fs/coredump.h                                      |   6 -
11725  fs/exec.c                                          | 120 +---
11726  fs/ext3/dir.c                                      |  44 +-
11727  fs/ext4/block_validity.c                           |  33 +-
11728  fs/ext4/dir.c                                      |  35 +-
11729  fs/fat/cache.c                                     |  19 +-
11730  fs/fat/fat.h                                       |   6 +-
11731  fs/fat/file.c                                      |  78 ++-
11732  fs/fat/inode.c                                     |  57 +-
11733  fs/hfsplus/inode.c                                 |  59 --
11734  fs/jffs2/fs.c                                      |   9 +-
11735  fs/jffs2/nodelist.c                                |  28 +-
11736  fs/jffs2/readinode.c                               |  26 +-
11737  fs/logfs/segment.c                                 |   3 +-
11738  fs/nilfs2/ioctl.c                                  | 371 ++++++++++++-
11739  fs/notify/dnotify/dnotify.c                        |  34 +-
11740  fs/notify/fanotify/fanotify.c                      | 224 ++++----
11741  fs/notify/fanotify/fanotify.h                      |  23 +
11742  fs/notify/fanotify/fanotify_user.c                 |  41 +-
11743  fs/notify/fsnotify.c                               |  42 +-
11744  fs/notify/group.c                                  |   1 +
11745  fs/notify/inotify/inotify.h                        |  21 +-
11746  fs/notify/inotify/inotify_fsnotify.c               | 149 ++---
11747  fs/notify/inotify/inotify_user.c                   | 119 ++--
11748  fs/notify/notification.c                           | 334 +-----------
11749  fs/ocfs2/Makefile                                  |   1 -
11750  fs/ocfs2/alloc.c                                   |  50 +-
11751  fs/ocfs2/cluster/Makefile                          |   2 +-
11752  fs/ocfs2/cluster/nodemanager.c                     |   4 +-
11753  fs/ocfs2/cluster/tcp.c                             |  35 +-
11754  fs/ocfs2/cluster/ver.c                             |  42 --
11755  fs/ocfs2/cluster/ver.h                             |  31 --
11756  fs/ocfs2/dlm/Makefile                              |   2 +-
11757  fs/ocfs2/dlm/dlmdomain.c                           |   5 +-
11758  fs/ocfs2/dlm/dlmver.c                              |  42 --
11759  fs/ocfs2/dlm/dlmver.h                              |  31 --
11760  fs/ocfs2/dlmfs/Makefile                            |   2 +-
11761  fs/ocfs2/dlmfs/dlmfs.c                             |   4 +-
11762  fs/ocfs2/dlmfs/dlmfsver.c                          |  42 --
11763  fs/ocfs2/dlmfs/dlmfsver.h                          |  31 --
11764  fs/ocfs2/dlmglue.c                                 |   4 +-
11765  fs/ocfs2/file.c                                    |  66 ++-
11766  fs/ocfs2/ioctl.c                                   |   7 +
11767  fs/ocfs2/localalloc.c                              |  40 ++
11768  fs/ocfs2/localalloc.h                              |   6 +
11769  fs/ocfs2/move_extents.c                            |  77 ---
11770  fs/ocfs2/namei.c                                   | 122 ++++-
11771  fs/ocfs2/ocfs2.h                                   |   1 +
11772  fs/ocfs2/stack_o2cb.c                              |   3 +-
11773  fs/ocfs2/stack_user.c                              | 308 +++++++++--
11774  fs/ocfs2/stackglue.c                               |  16 +-
11775  fs/ocfs2/stackglue.h                               |  15 +-
11776  fs/ocfs2/suballoc.c                                |  12 +-
11777  fs/ocfs2/suballoc.h                                |  12 +
11778  fs/ocfs2/super.c                                   |  20 +-
11779  fs/ocfs2/ver.c                                     |  43 --
11780  fs/ocfs2/ver.h                                     |  31 --
11781  fs/pipe.c                                          |   3 +-
11782  fs/posix_acl.c                                     |  94 +++-
11783  fs/proc/array.c                                    |  18 +-
11784  fs/proc/base.c                                     |  69 +--
11785  fs/proc/cmdline.c                                  |   2 +-
11786  fs/proc/consoles.c                                 |   2 +-
11787  fs/proc/cpuinfo.c                                  |   2 +-
11788  fs/proc/devices.c                                  |   2 +-
11789  fs/proc/generic.c                                  |   3 +-
11790  fs/proc/interrupts.c                               |   2 +-
11791  fs/proc/kcore.c                                    |   2 +-
11792  fs/proc/kmsg.c                                     |   2 +-
11793  fs/proc/loadavg.c                                  |   2 +-
11794  fs/proc/meminfo.c                                  |  39 +-
11795  fs/proc/nommu.c                                    |   2 +-
11796  fs/proc/page.c                                     |  10 +-
11797  fs/proc/proc_devtree.c                             |   5 +-
11798  fs/proc/softirqs.c                                 |   2 +-
11799  fs/proc/stat.c                                     |   2 +-
11800  fs/proc/uptime.c                                   |   2 +-
11801  fs/proc/version.c                                  |   2 +-
11802  fs/proc/vmcore.c                                   |   2 +-
11803  fs/proc_namespace.c                                |   7 +-
11804  fs/ramfs/file-mmu.c                                |   7 -
11805  fs/ramfs/file-nommu.c                              |  17 +-
11806  fs/ramfs/inode.c                                   |   9 +-
11807  fs/ramfs/internal.h                                |   1 -
11808  fs/read_write.c                                    |   4 -
11809  fs/reiserfs/reiserfs.h                             |   2 -
11810  fs/romfs/super.c                                   |   6 +-
11811  fs/super.c                                         |   3 +-
11812  fs/ubifs/debug.c                                   |  22 +-
11813  fs/ubifs/log.c                                     |  21 +-
11814  fs/ubifs/orphan.c                                  |  21 +-
11815  fs/ubifs/recovery.c                                |  21 +-
11816  fs/ubifs/super.c                                   |  24 +-
11817  fs/ubifs/tnc.c                                     |  22 +-
11818  fs/ufs/balloc.c                                    |  30 +-
11819  fs/ufs/ialloc.c                                    |  17 +-
11820  fs/ufs/super.c                                     |  13 +-
11821  fs/ufs/ufs.h                                       |   1 -
11822  include/asm-generic/fixmap.h                       |  97 ++++
11823  include/asm-generic/int-l64.h                      |  49 --
11824  include/linux/bootmem.h                            | 153 +++++-
11825  include/linux/cache.h                              |   4 +-
11826  include/linux/ceph/decode.h                        |  17 -
11827  include/linux/cmdline-parser.h                     |   8 +-
11828  include/linux/compaction.h                         |  16 +
11829  include/linux/crc64_ecma.h                         |  56 ++
11830  include/linux/dma-debug.h                          |   6 +
11831  include/linux/fsnotify_backend.h                   | 118 +---
11832  include/linux/genalloc.h                           |   2 +
11833  include/linux/gfp.h                                |   1 +
11834  include/linux/huge_mm.h                            |  23 +
11835  include/linux/hugetlb.h                            |   8 +-
11836  include/linux/hugetlb_cgroup.h                     |   5 +-
11837  include/linux/init_task.h                          |   2 +
11838  include/linux/input.h                              |  21 +
11839  include/linux/ipc.h                                |   2 +-
11840  include/linux/ipc_namespace.h                      |   1 -
11841  include/linux/kernel.h                             |  13 +
11842  include/linux/kexec.h                              |   1 +
11843  include/linux/ksm.h                                |  15 +-
11844  include/linux/kthread.h                            |   1 +
11845  include/linux/memblock.h                           |  55 +-
11846  include/linux/memcontrol.h                         |  23 +-
11847  include/linux/mempolicy.h                          |  32 --
11848  include/linux/migrate.h                            |   6 -
11849  include/linux/mm.h                                 |  80 ++-
11850  include/linux/mman.h                               |   1 +
11851  include/linux/mmdebug.h                            |   9 +
11852  include/linux/mmzone.h                             |  11 +-
11853  include/linux/msg.h                                |   2 +-
11854  include/linux/of.h                                 |   7 +-
11855  include/linux/page-flags.h                         |  14 +-
11856  include/linux/pagemap.h                            |  10 +-
11857  include/linux/parser.h                             |   1 +
11858  include/linux/percpu.h                             |   1 +
11859  include/linux/posix_acl.h                          |  78 +--
11860  include/linux/printk.h                             |  19 +-
11861  include/linux/ramfs.h                              |   7 -
11862  include/linux/rmap.h                               |  27 +-
11863  include/linux/sched.h                              |  42 +-
11864  include/linux/sched/sysctl.h                       |   4 +
11865  include/linux/shm.h                                |   2 +-
11866  include/linux/slab.h                               |   9 +-
11867  include/linux/splice.h                             |   3 +-
11868  include/linux/vm_event_item.h                      |   4 +-
11869  include/linux/vmstat.h                             |   8 +
11870  include/linux/w1-gpio.h                            |   1 +
11871  include/trace/events/compaction.h                  |  42 ++
11872  include/trace/events/migrate.h                     |  26 +
11873  include/trace/events/sched.h                       |  87 +++
11874  include/uapi/asm-generic/types.h                   |   3 +-
11875  init/initramfs.c                                   |   2 +-
11876  init/main.c                                        |  21 +-
11877  ipc/compat.c                                       |  28 +-
11878  ipc/compat_mq.c                                    |   2 +-
11879  ipc/ipc_sysctl.c                                   |  14 +-
11880  ipc/mqueue.c                                       |  22 +-
11881  ipc/msg.c                                          |  44 +-
11882  ipc/sem.c                                          | 178 +++---
11883  ipc/shm.c                                          |  49 +-
11884  ipc/util.c                                         | 350 ++++++------
11885  ipc/util.h                                         |  28 +-
11886  kernel/audit_tree.c                                |  20 +-
11887  kernel/audit_watch.c                               |  24 +-
11888  kernel/exit.c                                      |   1 +
11889  kernel/fork.c                                      |  17 +-
11890  kernel/hung_task.c                                 |   3 +-
11891  kernel/kexec.c                                     |   7 +-
11892  kernel/kmod.c                                      |  11 +-
11893  kernel/ksysfs.c                                    |   2 +-
11894  kernel/kthread.c                                   |   9 +
11895  kernel/power/snapshot.c                            |   2 +-
11896  kernel/printk/printk.c                             |  19 +-
11897  kernel/profile.c                                   |   2 +-
11898  kernel/sched/core.c                                |  26 +-
11899  kernel/sched/fair.c                                |   6 +-
11900  kernel/sched/stats.c                               |   2 +-
11901  kernel/signal.c                                    |   7 +-
11902  kernel/sys.c                                       |   8 +-
11903  kernel/sysctl.c                                    |  33 +-
11904  kernel/time/sched_clock.c                          |   4 +
11905  kernel/user.c                                      |   3 +-
11906  kernel/user_namespace.c                            |   2 +-
11907  kernel/watchdog.c                                  |  26 +-
11908  lib/Kconfig                                        |   7 +
11909  lib/Kconfig.debug                                  |  39 +-
11910  lib/Makefile                                       |   3 +
11911  lib/assoc_array.c                                  |   2 +-
11912  lib/cmdline.c                                      |  14 +-
11913  lib/cpumask.c                                      |   4 +-
11914  lib/crc64_ecma.c                                   | 341 ++++++++++++
11915  lib/decompress_unlz4.c                             |   1 +
11916  lib/dma-debug.c                                    | 193 ++++++-
11917  lib/dynamic_debug.c                                |  15 +-
11918  lib/kstrtox.c                                      |   1 -
11919  lib/parser.c                                       |  62 ++-
11920  lib/rbtree_test.c                                  |  13 +-
11921  lib/show_mem.c                                     |   6 +-
11922  lib/swiotlb.c                                      |  35 +-
11923  lib/test_module.c                                  |  33 ++
11924  lib/test_user_copy.c                               | 110 ++++
11925  lib/vsprintf.c                                     |  53 +-
11926  mm/balloon_compaction.c                            |   4 +-
11927  mm/cleancache.c                                    |   6 +-
11928  mm/compaction.c                                    |  63 ++-
11929  mm/filemap.c                                       |  16 +-
11930  mm/huge_memory.c                                   |  46 +-
11931  mm/hugetlb.c                                       |  56 +-
11932  mm/hugetlb_cgroup.c                                |   2 +-
11933  mm/hwpoison-inject.c                               |   2 +-
11934  mm/internal.h                                      |  15 +-
11935  mm/ksm.c                                           | 135 +----
11936  mm/memblock.c                                      | 390 +++++++++++--
11937  mm/memcontrol.c                                    | 482 ++++++++--------
11938  mm/memory-failure.c                                |  31 +-
11939  mm/memory.c                                        |  26 +-
11940  mm/memory_hotplug.c                                |  13 +-
11941  mm/mempolicy.c                                     |   8 +-
11942  mm/migrate.c                                       |  97 ++--
11943  mm/mincore.c                                       |   7 -
11944  mm/mlock.c                                         | 128 +++--
11945  mm/mm_init.c                                       |   3 +-
11946  mm/mmap.c                                          |  52 +-
11947  mm/mmu_notifier.c                                  |   3 +-
11948  mm/mprotect.c                                      |   3 +-
11949  mm/nobootmem.c                                     |  24 +-
11950  mm/nommu.c                                         |   1 +
11951  mm/oom_kill.c                                      |  51 +-
11952  mm/page_alloc.c                                    | 208 +++++--
11953  mm/page_cgroup.c                                   |   5 +-
11954  mm/page_io.c                                       |   4 +-
11955  mm/percpu.c                                        |  38 +-
11956  mm/rmap.c                                          | 590 +++++++++-----------
11957  mm/shmem.c                                         |   8 +-
11958  mm/slab.h                                          |  26 +-
11959  mm/slab_common.c                                   |  90 +--
11960  mm/slub.c                                          |  12 +-
11961  mm/sparse-vmemmap.c                                |   6 +-
11962  mm/sparse.c                                        |  27 +-
11963  mm/swap.c                                          | 294 +++++-----
11964  mm/swap_state.c                                    |  79 ++-
11965  mm/swapfile.c                                      |  19 +-
11966  mm/util.c                                          |  36 +-
11967  mm/vmalloc.c                                       |  20 +-
11968  mm/vmscan.c                                        | 136 ++---
11969  mm/zswap.c                                         |   4 +-
11970  net/ipv4/tcp_illinois.c                            |   1 -
11971  net/netfilter/ipset/ip_set_hash_netiface.c         |  27 +-
11972  scripts/checkpatch.pl                              | 170 +++++-
11973  scripts/get_maintainer.pl                          |  91 +++-
11974  scripts/sortextable.c                              |   5 +
11975  tools/testing/selftests/Makefile                   |   1 +
11976  tools/testing/selftests/user/Makefile              |  13 +
11977  404 files changed, 7969 insertions(+), 5323 deletions(-)
11978  create mode 100644 Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt
11979  create mode 100644 Documentation/devicetree/bindings/rtc/maxim,ds1742.txt
11980  delete mode 100644 Documentation/vm/locking
11981  create mode 100644 drivers/input/leds.c
11982  create mode 100644 drivers/rtc/rtc-hym8563.c
11983  delete mode 100644 fs/coredump.h
11984  create mode 100644 fs/notify/fanotify/fanotify.h
11985  delete mode 100644 fs/ocfs2/cluster/ver.c
11986  delete mode 100644 fs/ocfs2/cluster/ver.h
11987  delete mode 100644 fs/ocfs2/dlm/dlmver.c
11988  delete mode 100644 fs/ocfs2/dlm/dlmver.h
11989  delete mode 100644 fs/ocfs2/dlmfs/dlmfsver.c
11990  delete mode 100644 fs/ocfs2/dlmfs/dlmfsver.h
11991  delete mode 100644 fs/ocfs2/ver.c
11992  delete mode 100644 fs/ocfs2/ver.h
11993  create mode 100644 include/asm-generic/fixmap.h
11994  delete mode 100644 include/asm-generic/int-l64.h
11995  create mode 100644 include/linux/crc64_ecma.h
11996  create mode 100644 lib/crc64_ecma.c
11997  create mode 100644 lib/test_module.c
11998  create mode 100644 lib/test_user_copy.c
11999  create mode 100644 tools/testing/selftests/user/Makefile
12000 $ git clone -s -l -n -q . ../rebase-tmp
12001 $ cd ../rebase-tmp
12002 $ git checkout -b akpm remotes/origin/akpm/master
12003 Switched to a new branch 'akpm'
12004 $ git rebase --onto master remotes/origin/akpm/master-base
12005 First, rewinding head to replay your work on top of it...
12006 Applying: kernel/kexec.c: use vscnprintf() instead of vsnprintf() in vmcoreinfo_append_str()
12007 Applying: softirq: use ffs() in __do_softirq()
12008 Applying: softirq: convert printks to pr_<level>
12009 Applying: softirq: use const char * const for softirq_to_name, whitespace neatening
12010 Applying: mm/migrate.c: fix setting of cpupid on page migration twice against normal page
12011 Applying: zsmalloc: move it under mm
12012 Applying: zram: promote zram from staging
12013 Applying: drivers/w1/w1_int.c: call put_device if device_register fails
12014 Applying: drivers/video/backlight/lcd.c: call put_device if device_register fails
12015 Applying: drivers/net/phy/mdio_bus.c: call put_device on device_register() failure
12016 Applying: checkpatch.pl: check for function declarations without arguments
12017 Applying: zram: remove old private project comment
12018 Applying: zram: add copyright
12019 Applying: zsmalloc: add copyright
12020 Applying: zram: add zram maintainers
12021 Applying: zsmalloc: add maintainers
12022 Applying: block/blk-mq-cpu.c: use hotcpu_notifier()
12023 Applying: kernel: use lockless list for smp_call_function_single
12024 Applying: kernel/smp.c: remove cpumask_ipi
12025 Applying: arm: move arm_dma_limit to setup_dma_zone
12026 Using index info to reconstruct a base tree...
12027 M       arch/arm/mm/init.c
12028 Falling back to patching base and 3-way merge...
12029 Auto-merging arch/arm/mm/init.c
12030 Applying: zram: fix race between reset and flushing pending work
12031 Applying: zram: delay pending free request in read path
12032 Applying: zram: remove unnecessary free
12033 Applying: zram: use atomic operation for stat
12034 Applying: zram: introduce zram->tb_lock
12035 Applying: zram: remove workqueue for freeing removed pending slot
12036 Applying: zram: remove zram->lock in read path and change it with mutex
12037 Applying: mm: add strictlimit knob
12038 $ cd ../next
12039 $ git fetch -f ../rebase-tmp akpm:akpm/master
12040 From ../rebase-tmp
12041  + 4f1ad818147d...7f8c1e382d68 akpm       -> akpm/master  (forced update)
12042 $ rm -rf ../rebase-tmp
12043 Merging akpm/master (7f8c1e382d68 mm: add strictlimit knob)
12044 $ git merge --no-ff akpm/master
12045 Auto-merging mm/zsmalloc.c
12046 Auto-merging include/linux/zsmalloc.h
12047 Removing drivers/staging/zsmalloc/Makefile
12048 Removing drivers/staging/zsmalloc/Kconfig
12049 Auto-merging drivers/block/zram/zram_drv.h
12050 Auto-merging drivers/block/zram/zram_drv.c
12051 Auto-merging drivers/block/zram/Kconfig
12052 Auto-merging Documentation/blockdev/zram.txt
12053 Merge made by the 'recursive' strategy.
12054  Documentation/ABI/testing/sysfs-class-bdi          |   8 ++
12055  .../zram => Documentation/blockdev}/zram.txt       |   6 -
12056  MAINTAINERS                                        |  16 +++
12057  arch/arm/mm/init.c                                 |   6 +-
12058  arch/arm/mm/mm.h                                   |   2 -
12059  block/blk-mq-cpu.c                                 |   6 +-
12060  drivers/block/Kconfig                              |   2 +
12061  drivers/block/Makefile                             |   1 +
12062  drivers/{staging => block}/zram/Kconfig            |   1 -
12063  drivers/{staging => block}/zram/Makefile           |   0
12064  drivers/{staging => block}/zram/zram_drv.c         | 128 ++++++++-------------
12065  drivers/{staging => block}/zram/zram_drv.h         |  32 ++----
12066  drivers/net/phy/mdio_bus.c                         |   1 +
12067  drivers/staging/Kconfig                            |   4 -
12068  drivers/staging/Makefile                           |   2 -
12069  drivers/staging/zsmalloc/Kconfig                   |  24 ----
12070  drivers/staging/zsmalloc/Makefile                  |   3 -
12071  drivers/video/backlight/lcd.c                      |   2 +-
12072  drivers/w1/w1_int.c                                |   5 +-
12073  include/linux/blkdev.h                             |   5 +-
12074  include/linux/interrupt.h                          |   2 +-
12075  include/linux/smp.h                                |   6 +-
12076  .../staging/zsmalloc => include/linux}/zsmalloc.h  |   1 +
12077  kernel/kexec.c                                     |   2 +-
12078  kernel/smp.c                                       |  68 +++--------
12079  kernel/softirq.c                                   |  72 ++++++------
12080  mm/Kconfig                                         |  25 ++++
12081  mm/Makefile                                        |   1 +
12082  mm/backing-dev.c                                   |  35 ++++++
12083  mm/migrate.c                                       |   2 -
12084  .../zsmalloc/zsmalloc-main.c => mm/zsmalloc.c      |   4 +-
12085  scripts/checkpatch.pl                              |   9 ++
12086  32 files changed, 219 insertions(+), 262 deletions(-)
12087  rename {drivers/staging/zram => Documentation/blockdev}/zram.txt (90%)
12088  rename drivers/{staging => block}/zram/Kconfig (93%)
12089  rename drivers/{staging => block}/zram/Makefile (100%)
12090  rename drivers/{staging => block}/zram/zram_drv.c (90%)
12091  rename drivers/{staging => block}/zram/zram_drv.h (74%)
12092  delete mode 100644 drivers/staging/zsmalloc/Kconfig
12093  delete mode 100644 drivers/staging/zsmalloc/Makefile
12094  rename {drivers/staging/zsmalloc => include/linux}/zsmalloc.h (97%)
12095  rename drivers/staging/zsmalloc/zsmalloc-main.c => mm/zsmalloc.c (99%)