path: root/Next/merge.log

$ date
Thursday 28 November  10:42:41 EST 2013
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 0e4b0743bbe5 Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Merging origin/master (8ae516aa8b81 Merge tag 'trace-fixes-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
$ git merge origin/master
Updating 0e4b0743bbe5..8ae516aa8b81
Fast-forward
 fs/ceph/addr.c         |  2 +-
 fs/ceph/cache.c        |  3 +++
 fs/ceph/caps.c         | 27 +++++++++++++--------
 fs/ceph/dir.c          | 11 ++++++++-
 fs/ceph/inode.c        | 49 +++++++++++++++++++++++++++++++++-----
 fs/ceph/mds_client.c   | 61 ++++++++++++++++++++++++++++++++++-------------
 fs/ceph/mds_client.h   |  1 +
 fs/ceph/super.h        |  8 +------
 include/trace/ftrace.h |  5 ++--
 kernel/trace/ftrace.c  | 64 +++++++++++++++++++++++++++-----------------------
 10 files changed, 159 insertions(+), 72 deletions(-)
Merging fixes/master (8ae516aa8b81 Merge tag 'trace-fixes-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
$ git merge fixes/master
Already up-to-date.
Merging kbuild-current/rc-fixes (19514fc665ff arm, kbuild: make "make install" not depend on vmlinux)
$ git merge kbuild-current/rc-fixes
Already up-to-date.
Merging arc-current/for-curr (97bc386fc12d ARC: Add guard macro to uapi/asm/unistd.h)
$ git merge arc-current/for-curr
Merge made by the 'recursive' strategy.
 arch/arc/Kconfig                   | 1 +
 arch/arc/include/uapi/asm/unistd.h | 5 +++++
 scripts/sortextable.c              | 5 +++++
 3 files changed, 11 insertions(+)
Merging arm-current/fixes (476d1c03d202 ARM: dma-mapping: check DMA mask against available memory)
$ git merge arm-current/fixes
Merge made by the 'recursive' strategy.
 arch/arm/mm/dma-mapping.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
Merging m68k-current/for-linus (77a42796786c m68k: Remove deprecated IRQF_DISABLED)
$ git merge m68k-current/for-linus
Already up-to-date.
Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2)
$ git merge metag-fixes/fixes
Already up-to-date.
Merging powerpc-merge/merge (721cb59e9d95 powerpc/windfarm: Fix XServe G5 fan control Makefile issue)
$ git merge powerpc-merge/merge
Merge made by the 'recursive' strategy.
 arch/powerpc/Makefile                     |  7 +++++++
 arch/powerpc/boot/dts/xcalibur1501.dts    |  4 ++--
 arch/powerpc/boot/dts/xpedite5301.dts     |  4 ++--
 arch/powerpc/boot/dts/xpedite5330.dts     |  4 ++--
 arch/powerpc/boot/dts/xpedite5370.dts     |  4 ++--
 arch/powerpc/boot/util.S                  | 14 ++++++++++++++
 arch/powerpc/include/asm/pgalloc-64.h     |  1 +
 arch/powerpc/include/asm/ppc_asm.h        |  2 ++
 arch/powerpc/include/asm/reg.h            |  7 +++++++
 arch/powerpc/include/asm/timex.h          |  8 ++++++++
 arch/powerpc/kernel/machine_kexec.c       | 12 ++++++++++++
 arch/powerpc/kernel/nvram_64.c            |  2 +-
 arch/powerpc/kernel/signal_32.c           | 16 +++++++---------
 arch/powerpc/kernel/signal_64.c           |  6 ++++++
 arch/powerpc/kernel/vdso32/gettimeofday.S |  6 ++++++
 arch/powerpc/mm/hugetlbpage-book3e.c      |  3 +--
 arch/powerpc/mm/tlb_nohash.c              |  2 +-
 arch/powerpc/platforms/Kconfig.cputype    | 20 +++++++++++++++++---
 drivers/macintosh/Makefile                |  1 +
 19 files changed, 99 insertions(+), 24 deletions(-)
Merging sparc/master (b4789b8e6be3 aacraid: prevent invalid pointer dereference)
$ git merge sparc/master
Already up-to-date.
Merging net/master (2c7a9dc16416 be2net: Avoid programming permenant MAC by BE3-R VFs)
$ git merge net/master
Merge made by the 'recursive' strategy.
 drivers/net/ethernet/emulex/benet/be.h      |  1 +
 drivers/net/ethernet/emulex/benet/be_cmds.c |  7 +++++
 drivers/net/ethernet/emulex/benet/be_main.c | 12 ++++----
 include/net/ip.h                            |  2 +-
 include/net/ipv6.h                          |  6 ++--
 include/net/ping.h                          |  3 +-
 net/ipv4/ip_sockglue.c                      |  3 +-
 net/ipv4/ping.c                             |  5 ++--
 net/ipv4/raw.c                              |  2 +-
 net/ipv4/tcp_memcontrol.c                   |  2 --
 net/ipv4/tcp_offload.c                      | 31 ++++++++++----------
 net/ipv4/udp.c                              |  2 +-
 net/ipv6/datagram.c                         |  8 ++++--
 net/ipv6/ping.c                             |  3 +-
 net/ipv6/raw.c                              |  4 +--
 net/ipv6/sit.c                              | 44 +++++++++++++++++++++++++----
 net/ipv6/tcpv6_offload.c                    | 32 ++++++++++-----------
 net/ipv6/udp.c                              |  4 +--
 net/l2tp/l2tp_ip6.c                         |  2 +-
 net/sched/sch_tbf.c                         | 32 ++++++++++++++++-----
 net/sctp/outqueue.c                         |  3 +-
 21 files changed, 136 insertions(+), 72 deletions(-)
Merging ipsec/master (be408cd3e1fe Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge ipsec/master
Already up-to-date.
Merging sound-current/for-linus (16c0cefe8951 ALSA: hda - Fix hp-mic mode without VREF bits)
$ git merge sound-current/for-linus
Merge made by the 'recursive' strategy.
 sound/firewire/amdtp.c         | 15 ++++++---------
 sound/pci/hda/hda_codec.h      |  1 -
 sound/pci/hda/hda_generic.c    | 22 +++++++++++++---------
 sound/pci/hda/hda_intel.c      |  3 +--
 sound/pci/hda/patch_conexant.c | 23 +++++++++++++++++++++++
 sound/pci/hda/patch_realtek.c  |  2 ++
 sound/pci/hda/patch_sigmatel.c |  3 ++-
 sound/usb/endpoint.c           | 16 +++++++++++++++-
 8 files changed, 62 insertions(+), 23 deletions(-)
Merging pci-current/for-linus (4bff6749905d PCI: Move device_del() from pci_stop_dev() to pci_destroy_dev())
$ git merge pci-current/for-linus
Merge made by the 'recursive' strategy.
 drivers/pci/pci-driver.c | 26 +++++++++++++++++++++-----
 drivers/pci/remove.c     |  4 +++-
 kernel/workqueue.c       | 32 ++++++++++----------------------
 3 files changed, 34 insertions(+), 28 deletions(-)
Merging wireless/master (d5aedd7e1b2f Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211)
$ git merge wireless/master
Merge made by the 'recursive' strategy.
 drivers/net/wireless/brcm80211/Kconfig   |  2 ++
 drivers/net/wireless/mac80211_hwsim.c    | 16 ++++++---
 drivers/net/wireless/mwifiex/sta_ioctl.c |  4 +--
 net/mac80211/cfg.c                       | 15 +++++---
 net/mac80211/ieee80211_i.h               |  1 +
 net/mac80211/iface.c                     |  1 -
 net/mac80211/main.c                      |  3 ++
 net/mac80211/mesh.c                      | 20 ++++++-----
 net/mac80211/mlme.c                      |  2 ++
 net/mac80211/rc80211_minstrel_ht.c       |  7 ++--
 net/mac80211/rx.c                        |  3 +-
 net/mac80211/scan.c                      |  2 +-
 net/mac80211/spectmgmt.c                 |  2 ++
 net/mac80211/util.c                      | 11 ++----
 net/wireless/core.c                      |  3 ++
 net/wireless/ibss.c                      | 18 +++++-----
 net/wireless/nl80211.c                   | 60 ++++++++++++++++++++------------
 17 files changed, 105 insertions(+), 65 deletions(-)
Merging driver-core.current/driver-core-linus (81440e737444 Revert "sysfs: handle duplicate removal attempts in sysfs_remove_group()")
$ git merge driver-core.current/driver-core-linus
Merge made by the 'recursive' strategy.
 fs/sysfs/file.c | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)
Merging tty.current/tty-linus (c42b4e6501cd Revert "n_gsm: race between ld close and gsmtty open")
$ git merge tty.current/tty-linus
Merge made by the 'recursive' strategy.
 drivers/tty/amiserial.c         |  3 +++
 drivers/tty/n_tty.c             | 16 ++++++++++------
 drivers/tty/serial/8250/Kconfig |  2 +-
 drivers/tty/serial/pmac_zilog.c |  3 +++
 drivers/tty/tty_io.c            |  1 +
 5 files changed, 18 insertions(+), 7 deletions(-)
Merging usb.current/usb-linus (c24cb6c8b501 Merge tag 'fixes-for-v3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus)
$ git merge usb.current/usb-linus
Merge made by the 'recursive' strategy.
 drivers/usb/dwc3/ep0.c              |   2 +
 drivers/usb/dwc3/gadget.c           |   5 +-
 drivers/usb/gadget/Kconfig          |   1 +
 drivers/usb/gadget/composite.c      |   1 +
 drivers/usb/gadget/f_fs.c           |   2 +-
 drivers/usb/gadget/f_mass_storage.c |  27 +++---
 drivers/usb/gadget/pxa25x_udc.c     |   1 +
 drivers/usb/gadget/s3c-hsotg.c      |   7 +-
 drivers/usb/gadget/storage_common.h |   4 -
 drivers/usb/gadget/tcm_usb_gadget.c |   2 +-
 drivers/usb/gadget/zero.c           |   6 +-
 drivers/usb/musb/musb_core.c        |   9 +-
 drivers/usb/musb/musb_cppi41.c      | 164 ++++++++++++++++++++++++++++++------
 drivers/usb/musb/musb_gadget.c      |   4 +
 drivers/usb/phy/phy-am335x.c        |   5 +-
 drivers/usb/phy/phy-generic.c       |  68 +++++++--------
 drivers/usb/phy/phy-generic.h       |   4 +-
 drivers/usb/phy/phy-mxs-usb.c       |   2 +-
 drivers/usb/phy/phy-rcar-gen2-usb.c |   4 +-
 drivers/usb/serial/generic.c        |  12 +--
 20 files changed, 223 insertions(+), 107 deletions(-)
Merging staging.current/staging-linus (930ba4a374b9 Staging: tidspbridge: disable driver)
$ git merge staging.current/staging-linus
Merge made by the 'recursive' strategy.
 drivers/iio/accel/hid-sensor-accel-3d.c            |  5 ++--
 drivers/iio/accel/kxsd9.c                          |  7 +++---
 drivers/iio/adc/at91_adc.c                         |  1 +
 drivers/iio/adc/mcp3422.c                          |  8 +++----
 drivers/iio/adc/ti_am335x_adc.c                    |  7 ++++--
 .../iio/common/hid-sensors/hid-sensor-trigger.c    |  9 ++++---
 .../iio/common/hid-sensors/hid-sensor-trigger.h    |  2 +-
 drivers/iio/gyro/hid-sensor-gyro-3d.c              |  5 ++--
 drivers/iio/light/Kconfig                          |  2 ++
 drivers/iio/light/hid-sensor-als.c                 |  5 ++--
 drivers/iio/magnetometer/Kconfig                   |  2 ++
 drivers/iio/magnetometer/hid-sensor-magn-3d.c      |  5 ++--
 drivers/iio/magnetometer/mag3110.c                 |  7 +++++-
 drivers/staging/btmtk_usb/btmtk_usb.c              |  3 +--
 drivers/staging/comedi/drivers/pcl730.c            |  6 ++---
 drivers/staging/comedi/drivers/s626.c              |  2 +-
 drivers/staging/comedi/drivers/vmk80xx.c           |  2 +-
 .../staging/ft1000/ft1000-usb/ft1000_download.c    |  3 +--
 drivers/staging/iio/magnetometer/Kconfig           |  2 ++
 drivers/staging/imx-drm/Makefile                   |  4 +++-
 drivers/staging/imx-drm/imx-drm-core.c             |  1 +
 drivers/staging/lustre/lustre/ptlrpc/pinger.c      |  4 ++--
 drivers/staging/media/go7007/go7007-usb.c          | 28 ++++++++++++----------
 drivers/staging/nvec/nvec.c                        |  3 ++-
 drivers/staging/rtl8188eu/core/rtw_ap.c            |  3 +++
 drivers/staging/tidspbridge/Kconfig                |  2 +-
 drivers/staging/vt6655/hostap.c                    |  3 ++-
 drivers/staging/vt6656/baseband.c                  | 11 +++++++++
 drivers/staging/vt6656/hostap.c                    |  3 ++-
 drivers/staging/vt6656/rndis.h                     |  2 ++
 drivers/staging/zram/zram_drv.c                    | 19 +++++++++++----
 drivers/staging/zsmalloc/zsmalloc-main.c           | 17 +++++++++----
 include/linux/hid-sensor-hub.h                     |  3 +++
 33 files changed, 124 insertions(+), 62 deletions(-)
Merging char-misc.current/char-misc-linus (d0b00d3fb96d Merge tag 'extcon-linus-for-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-linus)
$ git merge char-misc.current/char-misc-linus
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 CREDITS                            |  5 +++++
 Documentation/mic/mpssd/mpssd.c    | 18 +++++++++++------
 MAINTAINERS                        |  8 ++++++++
 drivers/extcon/extcon-arizona.c    |  4 +---
 drivers/extcon/extcon-class.c      |  3 ++-
 drivers/misc/mic/card/mic_virtio.c | 33 +++++++++++++++++--------------
 drivers/misc/mic/card/mic_virtio.h |  7 +++----
 drivers/misc/mic/host/mic_boot.c   |  2 +-
 drivers/misc/mic/host/mic_virtio.c | 30 ++++++++++++++--------------
 drivers/misc/mic/host/mic_x100.c   |  4 ++--
 include/uapi/linux/mic_common.h    | 40 +++++++++++++++-----------------------
 11 files changed, 83 insertions(+), 71 deletions(-)
Merging input-current/for-linus (e4cfb034e89a Input: keyboard - "keycode & KEY_MAX" changes some keycode values)
$ git merge input-current/for-linus
Merge made by the 'recursive' strategy.
 drivers/input/keyboard/adp5588-keys.c | 3 ++-
 drivers/input/keyboard/adp5589-keys.c | 3 ++-
 drivers/input/keyboard/bf54x-keys.c   | 3 ++-
 drivers/input/misc/pcf8574_keypad.c   | 7 +++++--
 4 files changed, 11 insertions(+), 5 deletions(-)
Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
$ git merge md-current/for-linus
Already up-to-date.
Merging crypto-current/master (6c5dc7f8afbd crypto: caam - Add missing Job Ring include)
$ git merge crypto-current/master
Merge made by the 'recursive' strategy.
 drivers/crypto/caam/jr.c | 1 +
 1 file changed, 1 insertion(+)
Merging ide/master (c2f7d1e103ef ide: pmac: remove unnecessary pci_set_drvdata())
$ git merge ide/master
Already up-to-date.
Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
$ git merge dwmw2/master
Already up-to-date.
Merging sh-current/sh-fixes-for-linus (44033109e99c SH: Convert out[bwl] macros to inline functions)
$ git merge sh-current/sh-fixes-for-linus
Already up-to-date.
Merging devicetree-current/devicetree/merge (1931ee143b0a Revert "drivers: of: add initialization code for dma reserved memory")
$ git merge devicetree-current/devicetree/merge
Already up-to-date.
Merging rr-fixes/fixes (f6537f2f0eba scripts/kallsyms: filter symbols not in kernel address space)
$ git merge rr-fixes/fixes
Already up-to-date.
Merging mfd-fixes/master (88ec6a4d8369 Merge tag 'mfd-lee-3.13-fixes-1' of git://git.linaro.org/people/ljones/mfd)
$ git merge mfd-fixes/master
Merge made by the 'recursive' strategy.
 drivers/mfd/Kconfig   | 2 +-
 drivers/mfd/lpc_ich.c | 2 +-
 drivers/mfd/ti-ssp.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
Merging vfio-fixes/for-linus (d93b3ac0edb8 VFIO: vfio_iommu_type1: fix bug caused by break in nested loop)
$ git merge vfio-fixes/for-linus
Already up-to-date.
Merging drm-intel-fixes/for-linux-next-fixes (1fbc0d789d12 drm/i915: Fix the PPT fdi lane bifurcate state handling on ivb)
$ git merge drm-intel-fixes/for-linux-next-fixes
Already up-to-date.
Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu)
$ git merge asm-generic/master
Already up-to-date.
Merging arc/for-next (962648beb7db ARC: [SMP] optimize the IPI send path)
$ git merge arc/for-next
Merge made by the 'recursive' strategy.
 arch/arc/include/asm/smp.h  |  4 ++--
 arch/arc/kernel/smp.c       | 23 ++++++++++++++---------
 arch/arc/plat-arcfpga/smp.c |  8 ++------
 3 files changed, 18 insertions(+), 17 deletions(-)
Merging arm/for-next (e69662a3b19d Merge branches 'fixes', 'kees' and 'misc' into for-next)
$ git merge arm/for-next
Auto-merging arch/arm/mach-omap2/omap4-common.c
Merge made by the 'recursive' strategy.
 arch/arm/Kconfig.debug                |  23 +++
 arch/arm/include/asm/cacheflush.h     |   5 +
 arch/arm/include/asm/io.h             |   2 +-
 arch/arm/include/asm/mach/map.h       |  27 +--
 arch/arm/include/asm/pgtable-2level.h |   1 +
 arch/arm/include/asm/pgtable-3level.h |   1 +
 arch/arm/include/asm/pgtable.h        |   2 +
 arch/arm/include/asm/xen/page.h       |   2 +-
 arch/arm/kernel/tcm.c                 |   4 +-
 arch/arm/kernel/traps.c               |   2 +-
 arch/arm/lib/backtrace.S              |  20 +-
 arch/arm/mach-at91/setup.c            |   2 +-
 arch/arm/mach-omap2/io.c              |   4 +-
 arch/arm/mach-omap2/omap4-common.c    |   2 +-
 arch/arm/mach-ux500/setup.h           |   2 +-
 arch/arm/mm/Makefile                  |   1 +
 arch/arm/mm/dma-mapping.c             |   6 +-
 arch/arm/mm/dump.c                    | 343 ++++++++++++++++++++++++++++++++++
 arch/arm/mm/ioremap.c                 |   4 +-
 arch/arm/mm/mmu.c                     | 126 ++++++++++---
 drivers/mtd/maps/pxa2xx-flash.c       |   2 +-
 21 files changed, 522 insertions(+), 59 deletions(-)
 create mode 100644 arch/arm/mm/dump.c
Merging arm-perf/for-next/perf (6ce4eac1f600 Linux 3.13-rc1)
$ git merge arm-perf/for-next/perf
Already up-to-date.
Merging arm-soc/for-next (9f6f9eb67d48 Merge branch 'fixes' into for-next)
$ git merge arm-soc/for-next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/cpus.txt    |   8 ++
 Documentation/devicetree/bindings/mmc/ti-omap.txt |  54 +++++++++++
 arch/arm/arm-soc-for-next-contents.txt            |   8 ++
 arch/arm/boot/dts/am335x-base0033.dts             |  79 ++++++++++++++++
 arch/arm/boot/dts/am335x-igep0033.dtsi            |  29 ++++++
 arch/arm/boot/dts/omap3-beagle-xm.dts             |   7 ++
 arch/arm/boot/dts/omap3-beagle.dts                |   7 ++
 arch/arm/boot/dts/omap3-igep.dtsi                 |  85 +++++++++++++++--
 arch/arm/boot/dts/omap3-igep0020.dts              |  50 +++++++++-
 arch/arm/boot/dts/omap3-igep0030.dts              |   4 +-
 arch/arm/boot/dts/omap3-n900.dts                  |  23 ++++-
 arch/arm/boot/dts/omap3.dtsi                      |  42 +++++++++
 arch/arm/configs/omap2plus_defconfig              |   1 +
 arch/arm/configs/u8500_defconfig                  |   3 +
 arch/arm/mach-ep93xx/Kconfig                      |   1 +
 arch/arm/mach-ep93xx/core.c                       | 110 +++++++++++++++++++++-
 arch/arm/mach-ep93xx/include/mach/platform.h      |   3 +-
 arch/arm/mach-omap2/dss-common.c                  |   2 +-
 arch/arm/mach-omap2/pdata-quirks.c                |   1 +
 arch/arm/mach-ux500/cpu-db8500.c                  |   4 +
 arch/arm/plat-omap/include/plat/dmtimer.h         |   5 +-
 drivers/mmc/host/omap.c                           |  45 +++++----
 22 files changed, 530 insertions(+), 41 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mmc/ti-omap.txt
 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
Merging arm-v7-cache-opt/v7-cache-opt (e11d68fee368 arm: mm: refactor v7 cache cleaning ops to use way/index sequence)
$ git merge arm-v7-cache-opt/v7-cache-opt
Merge made by the 'recursive' strategy.
 arch/arm/mm/cache-v7.S | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
Merging bcm2835/for-next (7d132055814e Linux 3.10-rc6)
$ git merge bcm2835/for-next
Already up-to-date.
Merging cortex-m/for-next (9c031a483646 ARM: v7-M: drop using mach/entry-macro.S)
$ git merge cortex-m/for-next
Merge made by the 'recursive' strategy.
 arch/arm/kernel/entry-v7m.S | 2 --
 1 file changed, 2 deletions(-)
Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
$ git merge ep93xx/ep93xx-for-next
Merge made by the 'recursive' strategy.
Merging imx-mxs/for-next (8bb2a9b78b11 Merge branches 'imx/soc' and 'imx/dt' into for-next)
$ git merge imx-mxs/for-next
Auto-merging arch/arm/boot/dts/imx6qdl.dtsi
Auto-merging arch/arm/Kconfig.debug
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/clock/imx5-clock.txt       | 195 +----
 .../bindings/pinctrl/fsl,imx27-pinctrl.txt         |  22 +
 .../devicetree/bindings/vendor-prefixes.txt        |   3 +
 arch/arm/Kconfig.debug                             |   9 +
 arch/arm/boot/dts/Makefile                         |  15 +
 arch/arm/boot/dts/imx23-evk.dts                    |   8 +-
 arch/arm/boot/dts/imx23-olinuxino.dts              |   5 +-
 arch/arm/boot/dts/imx23-stmp378x_devb.dts          |   5 +-
 arch/arm/boot/dts/imx25-pinfunc.h                  | 494 +++++++++++
 arch/arm/boot/dts/imx25-pingrp.h                   |  79 ++
 arch/arm/boot/dts/imx25.dtsi                       |  19 +-
 arch/arm/boot/dts/imx27-apf27dev.dts               |  10 +-
 arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts   |  48 +-
 arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts   |  16 +
 arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts     |  23 +
 arch/arm/boot/dts/imx27-phytec-phycore-som.dts     |  20 +-
 arch/arm/boot/dts/imx27-pinfunc.h                  | 526 ++++++++++++
 arch/arm/boot/dts/imx27-pingrp.h                   |  71 ++
 arch/arm/boot/dts/imx27.dtsi                       | 125 +--
 arch/arm/boot/dts/imx28-apf28dev.dts               |   5 +-
 arch/arm/boot/dts/imx28-apx4devkit.dts             |   5 +-
 arch/arm/boot/dts/imx28-cfa10036.dts               |   2 +
 arch/arm/boot/dts/imx28-cfa10037.dts               |   5 +-
 arch/arm/boot/dts/imx28-cfa10049.dts               |  29 +-
 arch/arm/boot/dts/imx28-cfa10057.dts               |   5 +-
 arch/arm/boot/dts/imx28-cfa10058.dts               |   5 +-
 arch/arm/boot/dts/imx28-duckbill.dts               | 121 +++
 arch/arm/boot/dts/imx28-evk.dts                    |  24 +-
 arch/arm/boot/dts/imx28-m28cu3.dts                 |  14 +-
 arch/arm/boot/dts/imx28-m28evk.dts                 |  14 +-
 arch/arm/boot/dts/imx28-sps1.dts                   |   5 +-
 arch/arm/boot/dts/imx28-tx28.dts                   |  23 +-
 arch/arm/boot/dts/imx28.dtsi                       |  13 +
 arch/arm/boot/dts/imx50-evk.dts                    |  97 +++
 arch/arm/boot/dts/imx50-pinfunc.h                  | 923 +++++++++++++++++++++
 arch/arm/boot/dts/imx50-pingrp.h                   | 144 ++++
 arch/arm/boot/dts/imx50.dtsi                       | 476 +++++++++++
 arch/arm/boot/dts/imx51-apf51.dts                  |  18 +-
 arch/arm/boot/dts/imx51-apf51dev.dts               |  50 +-
 arch/arm/boot/dts/imx51-babbage.dts                |  95 ++-
 arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi       |  71 ++
 .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts  | 144 ++++
 arch/arm/boot/dts/imx51-pingrp.h                   | 247 ++++++
 arch/arm/boot/dts/imx51.dtsi                       | 455 ++--------
 arch/arm/boot/dts/imx53-ard.dts                    |  19 +-
 arch/arm/boot/dts/imx53-evk.dts                    |  38 +-
 arch/arm/boot/dts/imx53-m53evk.dts                 | 133 ++-
 arch/arm/boot/dts/imx53-mba53.dts                  |  40 +-
 arch/arm/boot/dts/imx53-pingrp.h                   | 350 ++++++++
 arch/arm/boot/dts/imx53-qsb.dts                    |  61 +-
 arch/arm/boot/dts/imx53-smd.dts                    |  62 +-
 arch/arm/boot/dts/imx53-tqma53.dtsi                | 112 ++-
 arch/arm/boot/dts/imx53-tx53.dtsi                  |   5 +-
 arch/arm/boot/dts/imx53-voipac-bsb.dts             | 144 ++++
 arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi        | 212 +++++
 arch/arm/boot/dts/imx53.dtsi                       | 648 +++------------
 arch/arm/boot/dts/imx6dl-gw51xx.dts                |  19 +
 arch/arm/boot/dts/imx6dl-gw52xx.dts                |  19 +
 arch/arm/boot/dts/imx6dl-gw53xx.dts                |  19 +
 arch/arm/boot/dts/imx6dl-gw54xx.dts                |  19 +
 arch/arm/boot/dts/imx6dl-pinfunc.h                 |   1 +
 arch/arm/boot/dts/imx6dl.dtsi                      |  10 +-
 arch/arm/boot/dts/imx6q-arm2.dts                   |  71 +-
 arch/arm/boot/dts/imx6q-cm-fx6.dts                 |  69 ++
 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts            | 178 ++++
 arch/arm/boot/dts/imx6q-gw51xx.dts                 |  19 +
 arch/arm/boot/dts/imx6q-gw52xx.dts                 |  23 +
 arch/arm/boot/dts/imx6q-gw53xx.dts                 |  23 +
 arch/arm/boot/dts/imx6q-gw5400-a.dts               | 493 +++++++++++
 arch/arm/boot/dts/imx6q-gw54xx.dts                 |  23 +
 arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi         |  44 +-
 arch/arm/boot/dts/imx6q-pinfunc.h                  |   1 +
 arch/arm/boot/dts/imx6q-sabrelite.dts              |  69 +-
 arch/arm/boot/dts/imx6q-sbc6x.dts                  |  29 +-
 arch/arm/boot/dts/imx6q-udoo.dts                   |  27 +-
 arch/arm/boot/dts/imx6q.dtsi                       |   9 +-
 arch/arm/boot/dts/imx6qdl-gw51xx.dtsi              | 317 +++++++
 arch/arm/boot/dts/imx6qdl-gw52xx.dtsi              | 424 ++++++++++
 arch/arm/boot/dts/imx6qdl-gw53xx.dtsi              | 484 +++++++++++
 arch/arm/boot/dts/imx6qdl-gw54xx.dtsi              | 511 ++++++++++++
 arch/arm/boot/dts/imx6qdl-pingrp.h                 | 526 ++++++++++++
 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi           |  58 +-
 arch/arm/boot/dts/imx6qdl-sabresd.dtsi             |  74 +-
 arch/arm/boot/dts/imx6qdl-wandboard.dtsi           |  70 +-
 arch/arm/boot/dts/imx6qdl.dtsi                     | 904 +++-----------------
 arch/arm/boot/dts/imx6sl-evk.dts                   |  88 +-
 arch/arm/boot/dts/imx6sl-pingrp.h                  | 148 ++++
 arch/arm/boot/dts/imx6sl.dtsi                      | 339 ++------
 arch/arm/configs/imx_v4_v5_defconfig               |   2 +
 arch/arm/configs/imx_v6_v7_defconfig               |   4 +
 arch/arm/include/debug/imx-uart.h                  |  10 +
 arch/arm/mach-imx/Kconfig                          |  27 +-
 arch/arm/mach-imx/Makefile                         |   1 +
 arch/arm/mach-imx/avic.c                           |  25 -
 arch/arm/mach-imx/clk-imx51-imx53.c                | 801 +++++++++---------
 arch/arm/mach-imx/clk-imx6q.c                      |   2 +-
 arch/arm/mach-imx/clk-imx6sl.c                     |   2 +-
 arch/arm/mach-imx/clk-vf610.c                      |   5 +
 arch/arm/mach-imx/common.h                         |   1 +
 arch/arm/mach-imx/irq-common.h                     |   1 -
 arch/arm/mach-imx/mach-imx50.c                     |  38 +
 arch/arm/mach-imx/mach-imx6q.c                     |  30 +
 arch/arm/mach-imx/mm-imx5.c                        |   8 -
 arch/arm/mach-mxs/mach-mxs.c                       |  13 +
 drivers/pinctrl/Kconfig                            |   8 -
 drivers/pinctrl/pinctrl-imx1-core.c                |   7 +
 drivers/pinctrl/pinctrl-nomadik.c                  |   6 +-
 drivers/pinctrl/sh-pfc/pfc-r8a7791.c               |  36 +-
 include/dt-bindings/clock/imx5-clock.h             | 203 +++++
 include/dt-bindings/clock/imx6sl-clock.h           |   2 +-
 include/dt-bindings/clock/vf610-clock.h            |   6 +-
 111 files changed, 9846 insertions(+), 3007 deletions(-)
 create mode 100644 arch/arm/boot/dts/imx25-pinfunc.h
 create mode 100644 arch/arm/boot/dts/imx25-pingrp.h
 create mode 100644 arch/arm/boot/dts/imx27-pinfunc.h
 create mode 100644 arch/arm/boot/dts/imx27-pingrp.h
 create mode 100644 arch/arm/boot/dts/imx28-duckbill.dts
 create mode 100644 arch/arm/boot/dts/imx50-evk.dts
 create mode 100644 arch/arm/boot/dts/imx50-pinfunc.h
 create mode 100644 arch/arm/boot/dts/imx50-pingrp.h
 create mode 100644 arch/arm/boot/dts/imx50.dtsi
 create mode 100644 arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi
 create mode 100644 arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
 create mode 100644 arch/arm/boot/dts/imx51-pingrp.h
 create mode 100644 arch/arm/boot/dts/imx53-pingrp.h
 create mode 100644 arch/arm/boot/dts/imx53-voipac-bsb.dts
 create mode 100644 arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi
 create mode 100644 arch/arm/boot/dts/imx6dl-gw51xx.dts
 create mode 100644 arch/arm/boot/dts/imx6dl-gw52xx.dts
 create mode 100644 arch/arm/boot/dts/imx6dl-gw53xx.dts
 create mode 100644 arch/arm/boot/dts/imx6dl-gw54xx.dts
 create mode 100644 arch/arm/boot/dts/imx6q-cm-fx6.dts
 create mode 100644 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
 create mode 100644 arch/arm/boot/dts/imx6q-gw51xx.dts
 create mode 100644 arch/arm/boot/dts/imx6q-gw52xx.dts
 create mode 100644 arch/arm/boot/dts/imx6q-gw53xx.dts
 create mode 100644 arch/arm/boot/dts/imx6q-gw5400-a.dts
 create mode 100644 arch/arm/boot/dts/imx6q-gw54xx.dts
 create mode 100644 arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
 create mode 100644 arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
 create mode 100644 arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
 create mode 100644 arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
 create mode 100644 arch/arm/boot/dts/imx6qdl-pingrp.h
 create mode 100644 arch/arm/boot/dts/imx6sl-pingrp.h
 create mode 100644 arch/arm/mach-imx/mach-imx50.c
 create mode 100644 include/dt-bindings/clock/imx5-clock.h
Merging ixp4xx/next (19f949f52599 Linux 3.8)
$ git merge ixp4xx/next
Already up-to-date.
Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
$ git merge msm/for-next
Already up-to-date.
Merging mvebu/for-next (2a569e214131 Merge branch 'mvebu/dt' into for-next)
$ git merge mvebu/for-next
Merge made by the 'recursive' strategy.
 .../interrupt-controller/marvell,dove-pmu-intc.txt |  17 ++
 arch/arm/boot/dts/armada-370-db.dts                |  28 +--
 arch/arm/boot/dts/armada-370-mirabox.dts           |  25 ++-
 arch/arm/boot/dts/armada-370-netgear-rn102.dts     |   2 +-
 arch/arm/boot/dts/armada-370-netgear-rn104.dts     |  32 +++
 arch/arm/boot/dts/armada-370-xp.dtsi               |  11 +-
 arch/arm/boot/dts/armada-xp-gp.dts                 |   8 +
 arch/arm/boot/dts/armada-xp-mv78230.dtsi           |  24 +--
 arch/arm/boot/dts/armada-xp-mv78260.dtsi           | 109 +++++++---
 arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts   |   3 +-
 arch/arm/boot/dts/dove-cubox.dts                   |   2 +-
 arch/arm/boot/dts/dove.dtsi                        |  13 +-
 arch/arm/boot/dts/kirkwood-6281.dtsi               |   2 +
 arch/arm/boot/dts/kirkwood-6282.dtsi               |   2 +
 arch/arm/boot/dts/kirkwood-dns320.dts              |   2 +-
 arch/arm/boot/dts/kirkwood-dns325.dts              |   2 +-
 arch/arm/boot/dts/kirkwood-dockstar.dts            |   2 +-
 arch/arm/boot/dts/kirkwood-goflexnet.dts           |   2 +-
 .../arm/boot/dts/kirkwood-guruplug-server-plus.dts |   4 +-
 arch/arm/boot/dts/kirkwood-ib62x0.dts              |   2 +-
 arch/arm/boot/dts/kirkwood-iconnect.dts            |   4 +-
 arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts      |   2 +-
 arch/arm/boot/dts/kirkwood-lsxl.dtsi               |   2 +-
 .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts  |  14 +-
 arch/arm/boot/dts/kirkwood-ns2lite.dts             |   2 +-
 arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi  |   2 +-
 arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts    |   2 +-
 arch/arm/boot/dts/kirkwood-sheevaplug.dts          |   4 +-
 .../dts/orion5x-lacie-ethernet-disk-mini-v2.dts    |   2 +-
 arch/arm/configs/kirkwood_defconfig                |   1 +
 arch/arm/configs/mvebu_defconfig                   |   1 +
 arch/arm/mach-dove/common.c                        |  15 +-
 arch/arm/mach-kirkwood/board-dt.c                  |  40 +---
 arch/arm/mach-mvebu/coherency.c                    |   1 +
 arch/arm/mach-mvebu/coherency.h                    |   4 +-
 arch/arm/mach-mvebu/common.h                       |   1 -
 arch/arm/mach-mvebu/hotplug.c                      |   1 +
 arch/arm/mach-mvebu/platsmp.c                      |   4 +-
 arch/arm/mach-mvebu/pmsu.c                         |   3 +-
 arch/arm/mach-mvebu/system-controller.c            |   5 +-
 arch/arm/mach-orion5x/board-dt.c                   |   2 +-
 arch/arm/mach-orion5x/common.c                     |   7 +-
 arch/arm/mach-orion5x/db88f5281-setup.c            |   2 +-
 arch/arm/mach-orion5x/irq.c                        |   1 +
 arch/arm/mach-orion5x/pci.c                        |   4 +-
 arch/arm/mach-orion5x/rd88f5182-setup.c            |   2 +-
 arch/arm/mach-orion5x/terastation_pro2-setup.c     |   2 +-
 arch/arm/mach-orion5x/ts209-setup.c                |   2 +-
 arch/arm/mach-orion5x/ts78xx-setup.c               |   2 +-
 arch/arm/plat-orion/common.c                       |   9 +-
 arch/arm/plat-orion/time.c                         |   3 +-
 drivers/bus/mvebu-mbus.c                           |  10 +-
 drivers/clk/mvebu/Kconfig                          |   5 +
 drivers/clk/mvebu/Makefile                         |   1 +
 drivers/clk/mvebu/clk-corediv.c                    | 223 +++++++++++++++++++++
 drivers/clk/mvebu/clk-cpu.c                        |   2 +-
 drivers/dma/mv_xor.c                               |   6 -
 drivers/irqchip/Makefile                           |   1 +
 drivers/irqchip/irq-dove.c                         | 126 ++++++++++++
 59 files changed, 647 insertions(+), 165 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,dove-pmu-intc.txt
 create mode 100644 drivers/clk/mvebu/clk-corediv.c
 create mode 100644 drivers/irqchip/irq-dove.c
Merging renesas/next (4c92422b0a8c Merge tag 'renesas-clocksource-for-v3.13' into devel)
$ git merge renesas/next
Removing arch/arm/mach-shmobile/board-kzm9d.c
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 arch/arm/Kconfig                                   |  14 +-
 arch/arm/Makefile                                  |   1 -
 arch/arm/boot/compressed/Makefile                  |   2 +-
 arch/arm/boot/dts/Makefile                         |   3 +-
 arch/arm/boot/dts/emev2-kzm9d.dts                  |  39 ++++-
 arch/arm/boot/dts/emev2.dtsi                       |  86 ++++++++++-
 arch/arm/boot/dts/r7s72100-genmai.dts              |   2 +-
 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts    |  10 +-
 arch/arm/boot/dts/r8a73a4-ape6evm.dts              |   5 +-
 arch/arm/boot/dts/r8a73a4.dtsi                     | 118 +++++++++-----
 .../boot/dts/r8a7740-armadillo800eva-reference.dts |  13 +-
 arch/arm/boot/dts/r8a7740-armadillo800eva.dts      |   2 +-
 arch/arm/boot/dts/r8a7740.dtsi                     | 118 +++++++-------
 arch/arm/boot/dts/r8a7778-bockw-reference.dts      |  57 ++++++-
 arch/arm/boot/dts/r8a7778-bockw.dts                |   2 +-
 arch/arm/boot/dts/r8a7778.dtsi                     | 170 +++++++++++++++++++--
 arch/arm/boot/dts/r8a7779-marzen-reference.dts     |  25 ++-
 arch/arm/boot/dts/r8a7779-marzen.dts               |   2 +-
 arch/arm/boot/dts/r8a7779.dtsi                     |  82 +++++++---
 arch/arm/boot/dts/r8a7790-lager-reference.dts      |  41 ++++-
 arch/arm/boot/dts/r8a7790-lager.dts                |   2 +-
 arch/arm/boot/dts/r8a7790.dtsi                     |  73 +++++----
 arch/arm/boot/dts/r8a7791-koelsch-reference.dts    |  47 ++++++
 arch/arm/boot/dts/r8a7791-koelsch.dts              |   2 +-
 arch/arm/boot/dts/r8a7791.dtsi                     | 144 +++++++++++++++--
 arch/arm/boot/dts/sh7372-mackerel.dts              |   2 +-
 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts       |  13 +-
 arch/arm/boot/dts/sh73a0-kzm9g.dts                 |   2 +-
 arch/arm/boot/dts/sh73a0.dtsi                      | 142 ++++++++---------
 arch/arm/configs/ape6evm_defconfig                 |   2 +-
 arch/arm/configs/armadillo800eva_defconfig         |   2 +-
 arch/arm/configs/bockw_defconfig                   |  12 +-
 arch/arm/configs/genmai_defconfig                  | 116 ++++++++++++++
 arch/arm/configs/koelsch_defconfig                 |   2 +-
 arch/arm/configs/kzm9d_defconfig                   |   3 +-
 arch/arm/configs/kzm9g_defconfig                   |   2 +-
 arch/arm/configs/lager_defconfig                   |   2 +-
 arch/arm/configs/mackerel_defconfig                |   2 +-
 arch/arm/configs/marzen_defconfig                  |  12 +-
 arch/arm/mach-shmobile/Kconfig                     |  18 ++-
 arch/arm/mach-shmobile/Makefile                    |   1 -
 arch/arm/mach-shmobile/Makefile.boot               |   1 -
 arch/arm/mach-shmobile/board-ape6evm.c             |   6 +-
 arch/arm/mach-shmobile/board-bockw-reference.c     |  13 --
 arch/arm/mach-shmobile/board-kzm9d.c               |  92 -----------
 arch/arm/mach-shmobile/board-lager-reference.c     |   5 +-
 arch/arm/mach-shmobile/board-lager.c               |   6 +-
 arch/arm/mach-shmobile/board-marzen.c              |  27 +++-
 arch/arm/mach-shmobile/clock-r7s72100.c            |   4 +
 arch/arm/mach-shmobile/clock-r8a73a4.c             |  10 +-
 arch/arm/mach-shmobile/clock-r8a7740.c             |   8 +-
 arch/arm/mach-shmobile/clock-r8a7778.c             |  11 ++
 arch/arm/mach-shmobile/clock-r8a7779.c             |   8 +
 arch/arm/mach-shmobile/clock-r8a7790.c             |  47 +++---
 arch/arm/mach-shmobile/clock-r8a7791.c             |  14 +-
 arch/arm/mach-shmobile/clock-sh7372.c              |   9 +-
 arch/arm/mach-shmobile/clock-sh73a0.c              |  22 +--
 arch/arm/mach-shmobile/include/mach/emev2.h        |   5 -
 arch/arm/mach-shmobile/include/mach/r8a7779.h      |   5 -
 arch/arm/mach-shmobile/include/mach/r8a7791.h      |   1 +
 arch/arm/mach-shmobile/setup-emev2.c               | 163 ++------------------
 arch/arm/mach-shmobile/setup-r7s72100.c            |  22 +++
 arch/arm/mach-shmobile/setup-r8a73a4.c             |   2 +-
 arch/arm/mach-shmobile/setup-r8a7779.c             |  57 -------
 arch/arm/mach-shmobile/setup-r8a7790.c             |   7 +-
 arch/arm/mach-shmobile/setup-r8a7791.c             |  65 ++++++++
 arch/arm/mach-shmobile/setup-sh73a0.c              |  16 +-
 drivers/Makefile                                   |   2 +-
 drivers/irqchip/irq-renesas-intc-irqpin.c          |   8 +-
 69 files changed, 1324 insertions(+), 705 deletions(-)
 create mode 100644 arch/arm/boot/dts/r8a7791-koelsch-reference.dts
 create mode 100644 arch/arm/configs/genmai_defconfig
 delete mode 100644 arch/arm/mach-shmobile/board-kzm9d.c
Merging samsung/for-next (6ce4eac1f600 Linux 3.13-rc1)
$ git merge samsung/for-next
Already up-to-date.
Merging tegra/for-next (6ce4eac1f600 Linux 3.13-rc1)
$ git merge tegra/for-next
Already up-to-date.
Merging arm64/upstream (67317c268956 ARM64: /proc/interrupts: display IPIs of online CPUs only)
$ git merge arm64/upstream
Already up-to-date.
Merging blackfin/for-linus (36855dcfc980 blackfin: fix build warning for unused variable)
$ git merge blackfin/for-linus
Already up-to-date.
Merging c6x/for-linux-next (546153d75a48 c6x: fix build failure caused by cache.h)
$ git merge c6x/for-linux-next
Merge made by the 'recursive' strategy.
 arch/c6x/include/asm/cache.h | 1 +
 1 file changed, 1 insertion(+)
Merging cris/for-next (be8cb7f42ab9 CRIS: drop unused Kconfig symbols)
$ git merge cris/for-next
Already up-to-date.
Merging hexagon/linux-next (de44443a45e3 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD)
$ git merge hexagon/linux-next
Already up-to-date.
Merging ia64/next (959f58544b7f Linux 3.12-rc7)
$ git merge ia64/next
Already up-to-date.
Merging m68k/for-next (50190edb2a56 m68k/amiga: Provide mach_random_get_entropy())
$ git merge m68k/for-next
Merge made by the 'recursive' strategy.
 Documentation/zorro.txt                      |   5 +-
 arch/m68k/amiga/chipram.c                    |   2 +-
 arch/m68k/amiga/config.c                     |  44 ++--
 arch/m68k/amiga/platform.c                   |   9 +-
 arch/m68k/apollo/config.c                    |  26 +-
 arch/m68k/atari/config.c                     |  10 +-
 arch/m68k/bvme6000/config.c                  |   6 +-
 arch/m68k/configs/amiga_defconfig            |   2 +-
 arch/m68k/configs/apollo_defconfig           |   2 +-
 arch/m68k/configs/atari_defconfig            |   2 +-
 arch/m68k/configs/bvme6000_defconfig         |   2 +-
 arch/m68k/configs/hp300_defconfig            |   2 +-
 arch/m68k/configs/mac_defconfig              |   2 +-
 arch/m68k/configs/multi_defconfig            |   2 +-
 arch/m68k/configs/mvme147_defconfig          |   2 +-
 arch/m68k/configs/mvme16x_defconfig          |   2 +-
 arch/m68k/configs/q40_defconfig              |   2 +-
 arch/m68k/configs/sun3_defconfig             |   2 +-
 arch/m68k/configs/sun3x_defconfig            |   2 +-
 arch/m68k/emu/natfeat.c                      |   3 +-
 arch/m68k/hp300/config.c                     |  10 +-
 arch/m68k/include/asm/amigahw.h              |  28 +--
 arch/m68k/include/asm/apollohw.h             |  11 +-
 arch/m68k/include/asm/atarihw.h              |   2 +-
 arch/m68k/include/asm/bootinfo.h             | 364 +--------------------------
 arch/m68k/include/asm/hp300hw.h              |  20 +-
 arch/m68k/include/asm/macintosh.h            |  83 ++----
 arch/m68k/include/asm/mvme16xhw.h            |  17 --
 arch/m68k/include/asm/setup.h                |   5 +-
 arch/m68k/include/asm/timex.h                |  10 +
 arch/m68k/include/uapi/asm/Kbuild            |   8 +
 arch/m68k/include/uapi/asm/bootinfo-amiga.h  |  63 +++++
 arch/m68k/include/uapi/asm/bootinfo-apollo.h |  28 +++
 arch/m68k/include/uapi/asm/bootinfo-atari.h  |  44 ++++
 arch/m68k/include/uapi/asm/bootinfo-hp300.h  |  50 ++++
 arch/m68k/include/uapi/asm/bootinfo-mac.h    | 119 +++++++++
 arch/m68k/include/uapi/asm/bootinfo-q40.h    |  16 ++
 arch/m68k/include/uapi/asm/bootinfo-vme.h    |  70 ++++++
 arch/m68k/include/uapi/asm/bootinfo.h        | 174 +++++++++++++
 arch/m68k/include/uapi/asm/setup.h           |  87 -------
 arch/m68k/kernel/head.S                      |  12 +-
 arch/m68k/kernel/setup_mm.c                  |  60 +++--
 arch/m68k/kernel/time.c                      |   4 +
 arch/m68k/mac/config.c                       |  34 +--
 arch/m68k/mac/iop.c                          |   5 +-
 arch/m68k/mac/misc.c                         |   2 -
 arch/m68k/mac/oss.c                          |   1 -
 arch/m68k/mac/psc.c                          |   3 +-
 arch/m68k/mac/via.c                          |   1 -
 arch/m68k/mm/init.c                          |   2 +-
 arch/m68k/mm/motorola.c                      |   2 +-
 arch/m68k/mvme147/config.c                   |   7 +-
 arch/m68k/mvme16x/config.c                   |  30 ++-
 arch/m68k/q40/config.c                       |   4 +-
 arch/m68k/sun3/dvma.c                        |   6 +-
 arch/m68k/sun3/mmu_emu.c                     |   3 +-
 arch/m68k/sun3/sun3dvma.c                    |   8 +-
 arch/m68k/sun3x/prom.c                       |   1 -
 drivers/block/z2ram.c                        |   7 +-
 drivers/ide/buddha.c                         |   2 +-
 drivers/net/ethernet/8390/hydra.c            |   2 +-
 drivers/net/ethernet/8390/zorro8390.c        |   4 +-
 drivers/net/ethernet/amd/a2065.c             |  13 +-
 drivers/net/ethernet/amd/ariadne.c           |  13 +-
 drivers/net/ethernet/natsemi/macsonic.c      |   1 -
 drivers/parport/parport_mfc3.c               |   2 +-
 drivers/scsi/a2091.c                         |   2 +-
 drivers/scsi/a3000.c                         |   2 +-
 drivers/scsi/a4000t.c                        |   2 +-
 drivers/scsi/gvp11.c                         |   2 +-
 drivers/scsi/zorro7xx.c                      |   2 +-
 drivers/video/amifb.c                        |   2 +-
 drivers/video/cirrusfb.c                     |   4 +-
 drivers/video/macfb.c                        |   1 -
 drivers/video/valkyriefb.c                   |   1 -
 drivers/zorro/Makefile                       |   3 +-
 drivers/zorro/names.c                        |  11 -
 drivers/zorro/proc.c                         |  10 +-
 drivers/zorro/zorro-driver.c                 |  11 +-
 drivers/zorro/zorro-sysfs.c                  |  22 +-
 drivers/zorro/zorro.c                        |  27 +-
 drivers/zorro/zorro.h                        |   5 +
 include/linux/zorro.h                        | 121 ++-------
 include/uapi/linux/Kbuild                    |   2 +
 include/uapi/linux/zorro.h                   | 113 +++++++++
 include/{ => uapi}/linux/zorro_ids.h         |   0
 86 files changed, 1025 insertions(+), 885 deletions(-)
 create mode 100644 arch/m68k/include/uapi/asm/bootinfo-amiga.h
 create mode 100644 arch/m68k/include/uapi/asm/bootinfo-apollo.h
 create mode 100644 arch/m68k/include/uapi/asm/bootinfo-atari.h
 create mode 100644 arch/m68k/include/uapi/asm/bootinfo-hp300.h
 create mode 100644 arch/m68k/include/uapi/asm/bootinfo-mac.h
 create mode 100644 arch/m68k/include/uapi/asm/bootinfo-q40.h
 create mode 100644 arch/m68k/include/uapi/asm/bootinfo-vme.h
 create mode 100644 arch/m68k/include/uapi/asm/bootinfo.h
 create mode 100644 include/uapi/linux/zorro.h
 rename include/{ => uapi}/linux/zorro_ids.h (100%)
Merging m68knommu/for-next (959f58544b7f Linux 3.12-rc7)
$ git merge m68knommu/for-next
Already up-to-date.
Merging metag/for-next (cdf8d75818e3 metag: dma: remove dead code in dma_alloc_init())
$ git merge metag/for-next
Merge made by the 'recursive' strategy.
 arch/metag/kernel/dma.c | 5 -----
 1 file changed, 5 deletions(-)
Merging microblaze/next (a1dd107fcafa microblaze: Remove duplicate declarations of _stext[] and _etext[])
$ git merge microblaze/next
Merge made by the 'recursive' strategy.
 arch/microblaze/Makefile               | 2 ++
 arch/microblaze/include/asm/sections.h | 1 -
 arch/microblaze/kernel/setup.c         | 5 ++---
 3 files changed, 4 insertions(+), 4 deletions(-)
Merging mips/mips-for-linux-next (6ca0bf323c14 Merge branch '3.13-fixes' into mips-for-linux-next)
$ git merge mips/mips-for-linux-next
Merge made by the 'recursive' strategy.
 arch/mips/lasat/picvue_proc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Merging openrisc/for-upstream (60a9dd5a10a1 openrisc: Use get_signal() signal_setup_done())
$ git merge openrisc/for-upstream
Merge made by the 'recursive' strategy.
 arch/openrisc/kernel/entry.S  |  59 ++++++-----
 arch/openrisc/kernel/signal.c | 233 +++++++++++++++++++++---------------------
 2 files changed, 149 insertions(+), 143 deletions(-)
Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
$ git merge parisc/for-next
Already up-to-date.
Merging parisc-hd/for-next (82023bb7f75b Merge tag 'pm+acpi-2-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
$ git merge parisc-hd/for-next
Already up-to-date.
Merging powerpc/next (280270828f10 powerpc: Wrong DWARF CFI in the kernel vdso for little-endian / ELFv2)
$ git merge powerpc/next
Already up-to-date.
Merging mpc5xxx/next (7e198197ec87 powerpc/mpc512x: remove unnecessary #if)
$ git merge mpc5xxx/next
Already up-to-date.
Merging galak/next (9e2ecdbba3b0 powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
$ git merge galak/next
Already up-to-date.
Merging s390/features (a2b4a29b41c2 s390/zcrypt: add support for EP11 coprocessor cards)
$ git merge s390/features
Merge made by the 'recursive' strategy.
 Documentation/kmsg/s390/zcrypt          |  20 +++
 arch/s390/Kconfig                       |   2 +-
 arch/s390/include/asm/page.h            |  38 ++---
 arch/s390/include/asm/vdso.h            |   5 +-
 arch/s390/include/uapi/asm/zcrypt.h     |  44 ++++++
 arch/s390/kernel/asm-offsets.c          |   3 +-
 arch/s390/kernel/compat_signal.c        |   2 +-
 arch/s390/kernel/pgm_check.S            |   2 +-
 arch/s390/kernel/signal.c               |   2 +-
 arch/s390/kernel/time.c                 |  46 +++---
 arch/s390/kernel/vdso32/clock_gettime.S |  30 ++--
 arch/s390/kernel/vdso32/gettimeofday.S  |   9 +-
 arch/s390/kernel/vdso64/clock_gettime.S |  22 +--
 arch/s390/kernel/vdso64/gettimeofday.S  |   9 +-
 arch/s390/lib/uaccess_pt.c              |   3 +
 drivers/s390/block/dasd_eckd.c          |   2 +
 drivers/s390/crypto/ap_bus.c            |  31 +++-
 drivers/s390/crypto/ap_bus.h            |   4 +-
 drivers/s390/crypto/zcrypt_api.c        | 101 ++++++++++++-
 drivers/s390/crypto/zcrypt_api.h        |   2 +
 drivers/s390/crypto/zcrypt_cex4.c       |  20 ++-
 drivers/s390/crypto/zcrypt_error.h      |  18 ++-
 drivers/s390/crypto/zcrypt_msgtype50.c  |  12 ++
 drivers/s390/crypto/zcrypt_msgtype6.c   | 256 ++++++++++++++++++++++++++++++++
 drivers/s390/crypto/zcrypt_msgtype6.h   |   2 +
 drivers/s390/crypto/zcrypt_pcica.c      |  11 ++
 drivers/s390/crypto/zcrypt_pcicc.c      |  12 ++
 27 files changed, 606 insertions(+), 102 deletions(-)
 create mode 100644 Documentation/kmsg/s390/zcrypt
Merging sh/sh-latest (37284bd93103 Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest)
$ git merge sh/sh-latest
Resolved 'arch/sh/kernel/cpu/sh2a/Makefile' using previous resolution.
Resolved 'drivers/tty/serial/sh-sci.c' using previous resolution.
Resolved 'include/linux/serial_sci.h' using previous resolution.
Auto-merging include/linux/serial_sci.h
CONFLICT (content): Merge conflict in include/linux/serial_sci.h
Auto-merging drivers/tty/serial/sh-sci.c
CONFLICT (content): Merge conflict in drivers/tty/serial/sh-sci.c
Auto-merging arch/sh/kernel/cpu/sh2a/Makefile
CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 2ab07c6cfae0] Merge remote-tracking branch 'sh/sh-latest'
$ git diff -M --stat --summary HEAD^..
 .../bindings/tty/serial/renesas,sci-serial.txt     |  53 +++++++
 arch/sh/include/asm/hw_breakpoint.h                |  12 +-
 arch/sh/include/cpu-common/cpu/ubc.h               |  17 +++
 arch/sh/include/cpu-sh2a/cpu/ubc.h                 |  14 ++
 arch/sh/kernel/cpu/sh2a/Makefile                   |   1 +
 arch/sh/kernel/cpu/sh2a/ubc.c                      | 154 +++++++++++++++++++++
 arch/sh/kernel/hw_breakpoint.c                     |   8 ++
 drivers/tty/serial/sh-sci.c                        | 127 ++++++++++++++++-
 include/linux/serial_sci.h                         |   4 +
 9 files changed, 375 insertions(+), 15 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/tty/serial/renesas,sci-serial.txt
 create mode 100644 arch/sh/include/cpu-common/cpu/ubc.h
 create mode 100644 arch/sh/include/cpu-sh2a/cpu/ubc.h
 create mode 100644 arch/sh/kernel/cpu/sh2a/ubc.c
Merging sparc-next/master (049ffa8ab33a Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux)
$ git merge sparc-next/master
Already up-to-date.
Merging tile/master (9248053f80fd tile: Remove tile-specific _sinitdata and _einitdata)
$ git merge tile/master
Merge made by the 'recursive' strategy.
 arch/tile/include/asm/sections.h |  3 ---
 arch/tile/kernel/vmlinux.lds.S   |  2 --
 arch/tile/mm/init.c              | 12 ++++++------
 3 files changed, 6 insertions(+), 11 deletions(-)
Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXPERIMENTAL)
$ git merge unicore32/unicore32
Already up-to-date.
Merging xtensa/for_next (dcc345a63b61 xtensa: implement CPU hotplug)
$ git merge xtensa/for_next
Auto-merging drivers/irqchip/Makefile
Merge made by the 'recursive' strategy.
 arch/xtensa/Kconfig                                |  47 +-
 arch/xtensa/include/asm/Kbuild                     |   1 -
 arch/xtensa/include/asm/barrier.h                  |   4 +-
 arch/xtensa/include/asm/bitops.h                   |   8 +-
 arch/xtensa/include/asm/cacheflush.h               |  40 +-
 arch/xtensa/include/asm/delay.h                    |   9 +-
 arch/xtensa/include/asm/ftrace.h                   |   2 +-
 arch/xtensa/include/asm/futex.h                    | 147 +++++
 arch/xtensa/include/asm/irq.h                      |   9 +
 arch/xtensa/include/asm/mmu.h                      |  10 +-
 arch/xtensa/include/asm/mmu_context.h              | 106 ++--
 arch/xtensa/include/asm/mxregs.h                   |  46 ++
 arch/xtensa/include/asm/processor.h                |  20 +
 arch/xtensa/include/asm/ptrace.h                   |   8 +
 arch/xtensa/include/asm/smp.h                      |  38 +-
 arch/xtensa/include/asm/spinlock.h                 |  31 +-
 arch/xtensa/include/asm/spinlock_types.h           |  20 +
 arch/xtensa/include/asm/timex.h                    |  14 +-
 arch/xtensa/include/asm/tlbflush.h                 |  42 +-
 arch/xtensa/include/asm/traps.h                    |   1 +
 arch/xtensa/include/asm/vectors.h                  |  12 +-
 arch/xtensa/kernel/Makefile                        |   1 +
 arch/xtensa/kernel/head.S                          | 181 +++++--
 arch/xtensa/kernel/irq.c                           | 207 ++++----
 arch/xtensa/kernel/mxhead.S                        |  85 +++
 arch/xtensa/kernel/setup.c                         |  92 ++--
 arch/xtensa/kernel/smp.c                           | 591 +++++++++++++++++++++
 arch/xtensa/kernel/time.c                          |  56 +-
 arch/xtensa/kernel/traps.c                         |  56 +-
 arch/xtensa/kernel/vmlinux.lds.S                   |  26 +
 arch/xtensa/mm/cache.c                             |   7 +-
 arch/xtensa/mm/fault.c                             |   2 +-
 arch/xtensa/mm/misc.S                              |   4 +-
 arch/xtensa/mm/mmu.c                               |   4 +-
 arch/xtensa/mm/tlb.c                               |  37 +-
 arch/xtensa/platforms/iss/network.c                | 290 ++++------
 .../platforms/xtfpga/include/platform/hardware.h   |   6 +-
 arch/xtensa/variants/s6000/include/variant/irq.h   |   1 -
 drivers/irqchip/Kconfig                            |   4 +
 drivers/irqchip/Makefile                           |   2 +
 drivers/irqchip/irq-xtensa-mx.c                    | 166 ++++++
 drivers/irqchip/irq-xtensa-pic.c                   | 108 ++++
 include/linux/irqchip/xtensa-mx.h                  |  17 +
 include/linux/irqchip/xtensa-pic.h                 |  18 +
 44 files changed, 1988 insertions(+), 588 deletions(-)
 create mode 100644 arch/xtensa/include/asm/futex.h
 create mode 100644 arch/xtensa/include/asm/mxregs.h
 create mode 100644 arch/xtensa/include/asm/spinlock_types.h
 create mode 100644 arch/xtensa/kernel/mxhead.S
 create mode 100644 arch/xtensa/kernel/smp.c
 create mode 100644 drivers/irqchip/irq-xtensa-mx.c
 create mode 100644 drivers/irqchip/irq-xtensa-pic.c
 create mode 100644 include/linux/irqchip/xtensa-mx.h
 create mode 100644 include/linux/irqchip/xtensa-pic.h
Merging btrfs/next (91aef86f3b8a Btrfs: rename btrfs_start_all_delalloc_inodes)
$ git merge btrfs/next
Already up-to-date.
Merging ceph/master (02d794b3142e ceph: allocate non-zero page to fscache in readpage())
$ git merge ceph/master
Auto-merging fs/ceph/super.h
Merge made by the 'recursive' strategy.
 fs/ceph/file.c  | 435 ++++++++++++++++++++++++++++++++++++++++----------------
 fs/ceph/inode.c |  10 ++
 fs/ceph/super.c |   1 +
 fs/ceph/super.h |   1 +
 4 files changed, 321 insertions(+), 126 deletions(-)
Merging cifs/for-next (f19e84df37bd [CIFS] Do not use btrfs refcopy ioctl for SMB2 copy offload)
$ git merge cifs/for-next
Merge made by the 'recursive' strategy.
 fs/cifs/cifsglob.h  |  1 +
 fs/cifs/ioctl.c     |  6 ++--
 fs/cifs/smb2ops.c   | 99 ++++++++++++++++++++++++++++++++++++++++++++++-------
 fs/cifs/smb2pdu.c   | 92 ++++++++++++++++++++++++++++++++++++++++++++++---
 fs/cifs/smb2pdu.h   | 12 +++++--
 fs/cifs/smb2proto.h |  1 +
 fs/cifs/smbfsctl.h  |  2 +-
 7 files changed, 189 insertions(+), 24 deletions(-)
Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
$ git merge configfs/linux-next
Already up-to-date.
Merging ecryptfs/next (2000f5beabc9 eCryptfs: file->private_data is always valid)
$ git merge ecryptfs/next
Already up-to-date.
Merging ext3/for_next (7ba3ec5749dd ext2: Fix fs corruption in ext2_get_xip_mem())
$ git merge ext3/for_next
Already up-to-date.
Merging ext4/dev (3f61c0cc706d ext4: add prototypes for macro-generated functions)
$ git merge ext4/dev
Already up-to-date.
Merging f2fs/dev (4607fbf82668 f2fs: send REQ_META or REQ_PRIO when reading meta area)
$ git merge f2fs/dev
Merge made by the 'recursive' strategy.
 fs/f2fs/checkpoint.c        |  57 +++---
 fs/f2fs/data.c              | 132 ++++++++++----
 fs/f2fs/f2fs.h              |  75 +++++---
 fs/f2fs/file.c              |  38 +---
 fs/f2fs/node.c              |  29 ++-
 fs/f2fs/segment.c           | 431 +++++++++++++++++++++++++++++++++++++-------
 fs/f2fs/segment.h           |  11 +-
 fs/f2fs/super.c             |  16 +-
 include/trace/events/f2fs.h | 115 +++++++++---
 9 files changed, 665 insertions(+), 239 deletions(-)
Merging fscache/fscache (7c604e5d6e56 FS-Cache: Fix handling of an attempt to store a page that is now beyond EOF)
$ git merge fscache/fscache
Merge made by the 'recursive' strategy.
 fs/fscache/page.c | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)
Merging fuse/for-next (ce128de6260f fuse: writepages: protect secondary requests from fuse file release)
$ git merge fuse/for-next
Already up-to-date.
Merging gfs2/master (2d7e8aac458f GFS2: Implement a "rgrp has no extents longer than X" scheme)
$ git merge gfs2/master
Merge made by the 'recursive' strategy.
 fs/gfs2/incore.h |   1 +
 fs/gfs2/lops.c   |   1 +
 fs/gfs2/rgrp.c   | 103 ++++++++++++++++++++++++++++++++++++++++++-------------
 3 files changed, 81 insertions(+), 24 deletions(-)
Merging jfs/jfs-next (8660998608cf jfs: fix error path in ialloc)
$ git merge jfs/jfs-next
Already up-to-date.
Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found)
$ git merge logfs/master
Auto-merging fs/logfs/super.c
Merge made by the 'recursive' strategy.
 fs/logfs/dev_mtd.c | 2 +-
 fs/logfs/super.c   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
Merging nfs/linux-next (c97cf606e43b NFSv4: Update list of irrecoverable errors on DELEGRETURN)
$ git merge nfs/linux-next
Auto-merging include/linux/nfs4.h
Auto-merging fs/nfs/nfs4proc.c
Merge made by the 'recursive' strategy.
 fs/nfs/blocklayout/blocklayout.h |  1 +
 fs/nfs/dns_resolve.c             |  2 ++
 fs/nfs/inode.c                   |  2 +-
 fs/nfs/internal.h                | 15 +++++++++++++++
 fs/nfs/nfs4_fs.h                 |  8 ++++++++
 fs/nfs/nfs4proc.c                | 12 +++++++++---
 include/linux/nfs4.h             | 10 ----------
 include/linux/nfs_fs.h           | 18 ------------------
 8 files changed, 36 insertions(+), 32 deletions(-)
Merging nfsd/nfsd-next (d2c2ad54c485 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge nfsd/nfsd-next
Already up-to-date.
Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
$ git merge omfs/for-next
Already up-to-date.
Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error)
$ git merge squashfs/master
Merge made by the 'recursive' strategy.
 fs/squashfs/file_direct.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Merging v9fs/for-next (f94741fd2832 net/9p: remove virtio default hack and set appropriate bits instead)
$ git merge v9fs/for-next
Merge made by the 'recursive' strategy.
 fs/9p/cache.c          |  3 +--
 fs/9p/vfs_file.c       |  2 --
 fs/9p/vfs_inode.c      |  4 +---
 fs/9p/vfs_inode_dotl.c |  8 --------
 fs/9p/xattr.c          | 10 ++++++----
 net/9p/client.c        |  3 ---
 net/9p/trans_fd.c      |  2 +-
 net/9p/trans_virtio.c  |  2 +-
 8 files changed, 10 insertions(+), 24 deletions(-)
Merging ubifs/linux-next (58a4e23703b2 UBIFS: correct data corruption range)
$ git merge ubifs/linux-next
Already up-to-date.
Merging xfs/for-next (2fe8c1c08b3f xfs: open code inc_inode_iversion when logging an inode)
$ git merge xfs/for-next
Already up-to-date.
Merging vfs/for-next (27ac0ffeac80 locks: break delegations on any attribute modification)
$ git merge vfs/for-next
Already up-to-date.
Merging pci/next (6ce4eac1f600 Linux 3.13-rc1)
$ git merge pci/next
Already up-to-date.
Merging hid/for-next (9ac5fb6d7fc1 Merge branch 'for-3.14/i2c-hid' into for-next)
$ git merge hid/for-next
Auto-merging drivers/hid/i2c-hid/i2c-hid.c
Merge made by the 'recursive' strategy.
 drivers/hid/hid-core.c         |   1 -
 drivers/hid/hid-ids.h          |   1 -
 drivers/hid/hid-sony.c         | 225 +++++++++++++++++++++++------------------
 drivers/hid/hid-wiimote-core.c |   5 +-
 drivers/hid/i2c-hid/i2c-hid.c  |   2 +
 drivers/hid/usbhid/usbkbd.c    |   2 +-
 6 files changed, 132 insertions(+), 104 deletions(-)
Merging i2c/i2c/for-next (6ce4eac1f600 Linux 3.13-rc1)
$ git merge i2c/i2c/for-next
Already up-to-date.
Merging jdelvare-hwmon/master (b16f9771248b hwmon: (it87) Print proper names for the IT8771E and IT8772E)
$ git merge jdelvare-hwmon/master
Auto-merging drivers/hwmon/Kconfig
Merge made by the 'recursive' strategy.
 Documentation/hwmon/it87 |  27 +++++++++----
 drivers/hwmon/Kconfig    |   4 +-
 drivers/hwmon/it87.c     | 101 +++++++++++++++++++++++++++++++++++++++--------
 3 files changed, 105 insertions(+), 27 deletions(-)
Merging hwmon-staging/hwmon-next (6ce4eac1f600 Linux 3.13-rc1)
$ git merge hwmon-staging/hwmon-next
Already up-to-date.
Merging v4l-dvb/master (52eca34d5e35 Merge branch 'patchwork' into to_next)
$ git merge v4l-dvb/master
Merge made by the 'recursive' strategy.
Merging kbuild/for-next (e6483a58eca6 Merge branch 'kbuild/misc' into kbuild/for-next)
$ git merge kbuild/for-next
Merge made by the 'recursive' strategy.
 scripts/package/builddeb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
Merging kconfig/for-next (4eae518d4b01 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
$ git merge kconfig/for-next
Already up-to-date.
Merging libata/for-next (d665f5f731f0 Merge branch 'for-3.13-fixes' into for-next)
$ git merge libata/for-next
Merge made by the 'recursive' strategy.
 drivers/ata/ahci.c           | 62 +++++++++++++++++++++++++++++++++++++-------
 drivers/ata/ahci_platform.c  |  1 +
 drivers/ata/ata_generic.c    |  7 -----
 drivers/ata/libata-core.c    |  3 +--
 drivers/ata/libata-eh.c      |  5 ++--
 drivers/ata/libata-zpodd.c   |  4 +--
 drivers/ata/pata_arasan_cf.c |  1 +
 7 files changed, 59 insertions(+), 24 deletions(-)
Merging pstore/master (bd08ec33b5c2 pstore/ram: Restore ecc information block)
$ git merge pstore/master
Already up-to-date.
Merging pm/linux-next (c20243148ace Merge branch 'acpi-hotplug-next' into linux-next)
$ git merge pm/linux-next
Merge made by the 'recursive' strategy.
 Documentation/acpi/namespace.txt              |   9 +-
 drivers/acpi/acpica/acresrc.h                 |   6 +-
 drivers/acpi/acpica/nsalloc.c                 |  18 +-
 drivers/acpi/acpica/nsutils.c                 |  18 +-
 drivers/acpi/acpica/rscalc.c                  |   9 +-
 drivers/acpi/acpica/rscreate.c                |  36 +-
 drivers/acpi/acpica/rsutils.c                 |   2 +-
 drivers/acpi/acpica/utdebug.c                 |  31 +-
 drivers/acpi/bus.c                            |  75 +---
 drivers/acpi/container.c                      |  11 +-
 drivers/acpi/device_pm.c                      |  22 +-
 drivers/acpi/dock.c                           |   9 +-
 drivers/acpi/glue.c                           | 151 ++++----
 drivers/acpi/internal.h                       |   7 +-
 drivers/acpi/nvs.c                            |   1 -
 drivers/acpi/osl.c                            |   6 +-
 drivers/acpi/pci_root.c                       | 123 +------
 drivers/acpi/scan.c                           | 480 ++++++++++++++------------
 drivers/acpi/sleep.c                          |   2 +-
 drivers/acpi/sysfs.c                          |  54 +--
 drivers/ata/libata-acpi.c                     |  26 +-
 drivers/cpufreq/exynos4210-cpufreq.c          |   1 -
 drivers/cpufreq/exynos4x12-cpufreq.c          |   1 -
 drivers/cpufreq/exynos5250-cpufreq.c          |   1 -
 drivers/cpufreq/tegra-cpufreq.c               |   4 +-
 drivers/hwmon/asus_atk0110.c                  |   1 -
 drivers/mmc/core/sdio_bus.c                   |   2 +-
 drivers/pci/hotplug/acpiphp_glue.c            |   2 +-
 drivers/pci/pci-acpi.c                        |  16 +-
 drivers/xen/xen-acpi-cpuhotplug.c             |   8 +-
 drivers/xen/xen-acpi-memhotplug.c             |   7 +-
 include/acpi/acconfig.h                       |   2 +
 include/acpi/acpi_bus.h                       |  33 +-
 include/acpi/acpixf.h                         |   2 +-
 include/linux/acpi.h                          |   6 +
 kernel/power/hibernate.c                      |   1 +
 tools/power/cpupower/man/cpupower-idle-info.1 |   3 +-
 tools/power/cpupower/man/cpupower-idle-set.1  |  71 ++++
 tools/power/cpupower/utils/helpers/sysfs.c    |   4 +-
 39 files changed, 618 insertions(+), 643 deletions(-)
 create mode 100644 tools/power/cpupower/man/cpupower-idle-set.1
Merging idle/next (8de8187d167c Merge branches 'acpi-blacklist-year' and 'avn-upstream' into release)
$ git merge idle/next
Resolved 'drivers/idle/intel_idle.c' using previous resolution.
Auto-merging drivers/idle/intel_idle.c
CONFLICT (content): Merge conflict in drivers/idle/intel_idle.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 015777a9ea3c] Merge remote-tracking branch 'idle/next'
$ git diff -M --stat --summary HEAD^..
Merging apm/for-next (fb9d78aca709 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
$ git merge apm/for-next
Already up-to-date.
Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
$ git merge cpupowerutils/master
Already up-to-date.
Merging thermal/next (86e0a0bdf81c Merge branches 'intel_powerclamp', 'tmon' and 'misc' of .git into next)
$ git merge thermal/next
Already up-to-date.
Merging ieee1394/for-next (db9ae8fec7b1 firewire: ohci: Fix deadlock at bus reset)
$ git merge ieee1394/for-next
Already up-to-date.
Merging ubi/linux-next (ae0d14695566 UBI: Add some asserts to ubi_attach_fastmap())
$ git merge ubi/linux-next
Already up-to-date.
Merging dlm/next (a97f4a66d8ee dlm: Avoid that dlm_release_lockspace() incorrectly returns -EBUSY)
$ git merge dlm/next
Already up-to-date.
Merging swiotlb/linux-next (af51a9f1848f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
$ git merge swiotlb/linux-next
Already up-to-date.
Merging slave-dma/next (6ce4eac1f600 Linux 3.13-rc1)
$ git merge slave-dma/next
Already up-to-date.
Merging dmaengine/next (82a1402eaee5 dma: mv_xor: Fix mis-usage of mmio 'base' and 'high_base' registers)
$ git merge dmaengine/next
Already up-to-date.
Merging net-next/master (42a2d923cc34 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next)
$ git merge net-next/master
Already up-to-date.
Merging ipsec-next/master (9bb8ca86075f virtio-net: switch to use XPS to choose txq)
$ git merge ipsec-next/master
Already up-to-date.
Merging wireless-next/master (9d8506cc2d7e gso: handle new frag_list of frags GRO packets)
$ git merge wireless-next/master
Already up-to-date.
Merging bluetooth/master (c2e1182218ac Bluetooth: Enable autosuspend for Intel Bluetooth device)
$ git merge bluetooth/master
Auto-merging net/bluetooth/smp.c
Merge made by the 'recursive' strategy.
 drivers/bluetooth/ath3k.c       |   4 ++
 drivers/bluetooth/btmrvl_drv.h  |  25 ++++----
 drivers/bluetooth/btmrvl_main.c | 130 ++++++++++------------------------------
 drivers/bluetooth/btmrvl_sdio.c |   9 +--
 drivers/bluetooth/btmrvl_sdio.h |   2 -
 drivers/bluetooth/btusb.c       |   7 ++-
 net/bluetooth/hci_core.c        |  20 ++++---
 net/bluetooth/hci_event.c       |  72 ++++++++++------------
 net/bluetooth/mgmt.c            |  17 +++++-
 net/bluetooth/smp.c             |  16 ++---
 10 files changed, 121 insertions(+), 181 deletions(-)
Merging infiniband/for-next (b4fdf52b3fc8 Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', 'qib' and 'srp' into for-next)
$ git merge infiniband/for-next
Already up-to-date.
Merging mtd/master (6ce4eac1f600 Linux 3.13-rc1)
$ git merge mtd/master
Already up-to-date.
Merging l2-mtd/master (e2b856498bb0 mtd: dataflash: remove unnecessary spi_set_drvdata())
$ git merge l2-mtd/master
Auto-merging drivers/mtd/maps/pxa2xx-flash.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/mtd/gpmi-nand.txt          |   8 +
 .../devicetree/bindings/mtd/pxa3xx-nand.txt        |   6 +-
 Documentation/mtd/nand/pxa3xx-nand.txt             | 113 ++++
 drivers/mtd/devices/m25p80.c                       | 210 ++++++-
 drivers/mtd/devices/ms02-nv.c                      |   2 +-
 drivers/mtd/devices/mtd_dataflash.c                |   5 +-
 drivers/mtd/maps/pxa2xx-flash.c                    |   2 +-
 drivers/mtd/maps/sun_uflash.c                      |   2 +-
 drivers/mtd/mtdpart.c                              |   2 +-
 drivers/mtd/nand/Kconfig                           |   6 +-
 drivers/mtd/nand/diskonchip.c                      |  10 +-
 drivers/mtd/nand/gpmi-nand/gpmi-lib.c              | 127 ++--
 drivers/mtd/nand/gpmi-nand/gpmi-nand.c             | 165 ++---
 drivers/mtd/nand/gpmi-nand/gpmi-nand.h             |   2 -
 drivers/mtd/nand/mpc5121_nfc.c                     |   6 -
 drivers/mtd/nand/pasemi_nand.c                     |   2 +-
 drivers/mtd/nand/pxa3xx_nand.c                     | 688 ++++++++++++++++-----
 drivers/mtd/ofpart.c                               |   4 +-
 include/linux/mtd/partitions.h                     |   4 +-
 include/linux/platform_data/mtd-nand-pxa3xx.h      |   3 +
 20 files changed, 1005 insertions(+), 362 deletions(-)
 create mode 100644 Documentation/mtd/nand/pxa3xx-nand.txt
Merging crypto/master (f262f0f5cad0 crypto: s390 - Fix aes-cbc IV corruption)
$ git merge crypto/master
Already up-to-date.
Merging drm/drm-next (a3483353ca4e drm: check for !kdev in drm_unplug_minor())
$ git merge drm/drm-next
Already up-to-date.
Merging drm-intel/for-linux-next (fec8cba306f9 drm/i915: use crtc_htotal in watermark calculations to match fastboot v2)
$ git merge drm-intel/for-linux-next
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/i915/i915_drv.c            |  2 +
 drivers/gpu/drm/i915/i915_gem_execbuffer.c | 60 ++++++++++++++++--------------
 drivers/gpu/drm/i915/i915_gem_gtt.c        |  6 ++-
 drivers/gpu/drm/i915/intel_ddi.c           |  3 +-
 drivers/gpu/drm/i915/intel_pm.c            | 15 ++++----
 5 files changed, 48 insertions(+), 38 deletions(-)
Merging drm-tegra/drm/for-next (977386a04bae drm/tegra: Reserve syncpoint base for gr3d)
$ git merge drm-tegra/drm/for-next
Already up-to-date.
Merging sound/for-next (12edb893082b ALSA: hda - resume codecs in parallel)
$ git merge sound/for-next
Auto-merging sound/pci/hda/hda_generic.c
Removing sound/pci/cs46xx/imgs/cwcsnoop.h
Removing sound/pci/cs46xx/imgs/cwcdma.h
Removing sound/pci/cs46xx/imgs/cwcdma.asp
Removing sound/pci/cs46xx/imgs/cwcbinhack.h
Removing sound/pci/cs46xx/imgs/cwcasync.h
Removing sound/pci/cs46xx/imgs/cwc4630.h
Removing sound/pci/cs46xx/cs46xx_image.h
Merge made by the 'recursive' strategy.
 sound/pci/Kconfig                  |    1 +
 sound/pci/cs46xx/cs46xx.h          |    5 +
 sound/pci/cs46xx/cs46xx_image.h    | 3468 ------------------------------------
 sound/pci/cs46xx/cs46xx_lib.c      |  265 ++-
 sound/pci/cs46xx/imgs/cwc4630.h    |  320 ----
 sound/pci/cs46xx/imgs/cwcasync.h   |  176 --
 sound/pci/cs46xx/imgs/cwcbinhack.h |   48 -
 sound/pci/cs46xx/imgs/cwcdma.asp   |  170 --
 sound/pci/cs46xx/imgs/cwcdma.h     |   68 -
 sound/pci/cs46xx/imgs/cwcsnoop.h   |   46 -
 sound/pci/hda/Makefile             |    5 +-
 sound/pci/hda/hda_codec.c          |  204 ++-
 sound/pci/hda/hda_codec.h          |   10 +-
 sound/pci/hda/hda_generic.c        |    4 +
 sound/pci/hda/hda_intel.c          |    2 +-
 sound/pci/hda/hda_local.h          |    8 +-
 sound/pci/hda/patch_hdmi.c         |   24 +-
 17 files changed, 412 insertions(+), 4412 deletions(-)
 delete mode 100644 sound/pci/cs46xx/cs46xx_image.h
 delete mode 100644 sound/pci/cs46xx/imgs/cwc4630.h
 delete mode 100644 sound/pci/cs46xx/imgs/cwcasync.h
 delete mode 100644 sound/pci/cs46xx/imgs/cwcbinhack.h
 delete mode 100644 sound/pci/cs46xx/imgs/cwcdma.asp
 delete mode 100644 sound/pci/cs46xx/imgs/cwcdma.h
 delete mode 100644 sound/pci/cs46xx/imgs/cwcsnoop.h
Merging sound-asoc/for-next (e8bc1f16895a Merge remote-tracking branches 'asoc/topic/ad193x', 'asoc/topic/adav80x', 'asoc/topic/ak4641', 'asoc/topic/ak4642', 'asoc/topic/arizona', 'asoc/topic/bcm2835', 'asoc/topic/cs4271', 'asoc/topic/cs42l52', 'asoc/topic/da7210', 'asoc/topic/fsl', 'asoc/topic/hdmi', 'asoc/topic/jack', 'asoc/topic/omap', 'asoc/topic/rcar', 'asoc/topic/ssm2602', 'asoc/topic/uda1380', 'asoc/topic/wm8510', 'asoc/topic/wm8523', 'asoc/topic/wm8580', 'asoc/topic/wm8711', 'asoc/topic/wm8728', 'asoc/topic/wm8731', 'asoc/topic/wm8741', 'asoc/topic/wm8750', 'asoc/topic/wm8753', 'asoc/topic/wm8776', 'asoc/topic/wm8804', 'asoc/topic/wm8900', 'asoc/topic/wm8901', 'asoc/topic/wm8940', 'asoc/topic/wm8962', 'asoc/topic/wm8974', 'asoc/topic/wm8985', 'asoc/topic/wm8988', 'asoc/topic/wm8990', 'asoc/topic/wm8991', 'asoc/topic/wm8994', 'asoc/topic/wm8995', 'asoc/topic/wm9081' and 'asoc/topic/x86' into asoc-next)
$ git merge sound-asoc/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/sound/bcm2835-i2s.txt      |  25 +
 drivers/mfd/wm5110-tables.c                        |  73 +-
 include/linux/mfd/arizona/registers.h              | 158 ++++
 include/sound/rcar_snd.h                           |   2 +-
 include/sound/soc-dai.h                            |   6 +
 include/sound/soc-dapm.h                           |   3 +-
 include/sound/soc.h                                |  17 +-
 sound/soc/Kconfig                                  |   3 +-
 sound/soc/Makefile                                 |   3 +-
 sound/soc/atmel/sam9x5_wm8731.c                    |   2 +
 sound/soc/bcm/Kconfig                              |  10 +
 sound/soc/bcm/Makefile                             |   5 +
 sound/soc/bcm/bcm2835-i2s.c                        | 886 +++++++++++++++++++++
 sound/soc/codecs/Kconfig                           |   2 +
 sound/soc/codecs/ad193x.c                          |   6 +-
 sound/soc/codecs/adav80x.c                         |   6 +-
 sound/soc/codecs/ak4641.c                          |  38 +-
 sound/soc/codecs/ak4642.c                          |   6 +-
 sound/soc/codecs/arizona.c                         |  18 +
 sound/soc/codecs/arizona.h                         |   3 +-
 sound/soc/codecs/cs4271.c                          |   8 +-
 sound/soc/codecs/cs42l52.c                         |   4 +-
 sound/soc/codecs/da7210.c                          |   6 +-
 sound/soc/codecs/hdmi.c                            |   2 +-
 sound/soc/codecs/ssm2602.c                         |   6 +-
 sound/soc/codecs/uda1380.c                         |   6 +-
 sound/soc/codecs/wm5110.c                          | 389 ++++++++-
 sound/soc/codecs/wm8510.c                          |   6 +-
 sound/soc/codecs/wm8523.c                          |   6 +-
 sound/soc/codecs/wm8580.c                          |   6 +-
 sound/soc/codecs/wm8711.c                          |   6 +-
 sound/soc/codecs/wm8728.c                          |   6 +-
 sound/soc/codecs/wm8731.c                          |   6 +-
 sound/soc/codecs/wm8741.c                          |   6 +-
 sound/soc/codecs/wm8750.c                          |   6 +-
 sound/soc/codecs/wm8753.c                          |   6 +-
 sound/soc/codecs/wm8776.c                          |   6 +-
 sound/soc/codecs/wm8804.c                          |   6 +-
 sound/soc/codecs/wm8900.c                          |   6 +-
 sound/soc/codecs/wm8940.c                          | 221 ++---
 sound/soc/codecs/wm8962.c                          |   4 +-
 sound/soc/codecs/wm8974.c                          |  54 +-
 sound/soc/codecs/wm8985.c                          |   6 +-
 sound/soc/codecs/wm8988.c                          |   6 +-
 sound/soc/codecs/wm8990.c                          | 258 +++---
 sound/soc/codecs/wm8990.h                          |   9 -
 sound/soc/codecs/wm8991.c                          | 293 +++----
 sound/soc/codecs/wm8991.h                          |   9 -
 sound/soc/codecs/wm8994.c                          |  11 +-
 sound/soc/codecs/wm8995.c                          |   6 +-
 sound/soc/codecs/wm9081.c                          |   2 +-
 sound/soc/fsl/fsl_ssi.c                            |  57 +-
 sound/soc/{mid-x86 => intel}/Kconfig               |   0
 sound/soc/{mid-x86 => intel}/Makefile              |   0
 sound/soc/{mid-x86 => intel}/mfld_machine.c        |   0
 sound/soc/{mid-x86 => intel}/sst_dsp.h             |   0
 sound/soc/{mid-x86 => intel}/sst_platform.c        |   0
 sound/soc/{mid-x86 => intel}/sst_platform.h        |   0
 sound/soc/kirkwood/kirkwood-i2s.c                  |  22 +-
 sound/soc/omap/mcbsp.c                             |  12 +-
 sound/soc/omap/omap-dmic.c                         |   4 +-
 sound/soc/omap/omap-mcpdm.c                        |   4 +-
 sound/soc/sh/Kconfig                               |   1 +
 sound/soc/sh/rcar/rsnd.h                           |  10 +-
 sound/soc/soc-io.c                                 |   4 +-
 sound/soc/soc-pcm.c                                | 158 +++-
 66 files changed, 2273 insertions(+), 643 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/sound/bcm2835-i2s.txt
 create mode 100644 sound/soc/bcm/Kconfig
 create mode 100644 sound/soc/bcm/Makefile
 create mode 100644 sound/soc/bcm/bcm2835-i2s.c
 rename sound/soc/{mid-x86 => intel}/Kconfig (100%)
 rename sound/soc/{mid-x86 => intel}/Makefile (100%)
 rename sound/soc/{mid-x86 => intel}/mfld_machine.c (100%)
 rename sound/soc/{mid-x86 => intel}/sst_dsp.h (100%)
 rename sound/soc/{mid-x86 => intel}/sst_platform.c (100%)
 rename sound/soc/{mid-x86 => intel}/sst_platform.h (100%)
Merging modules/modules-next (b6568b1a19ad modpost: fix bogus 'exported twice' warnings.)
$ git merge modules/modules-next
Already up-to-date.
Merging virtio/virtio-next (cdd77e87eae5 x86, asmlinkage, lguest: Pass in globals into assembler statement)
$ git merge virtio/virtio-next
Already up-to-date.
Merging input/next (b5fd2a3e92ca Input: wacom - add support for three new Intuos devices)
$ git merge input/next
Auto-merging drivers/input/tablet/wacom_wac.c
Auto-merging drivers/input/tablet/wacom_sys.c
Auto-merging arch/sh/boards/mach-ecovec24/setup.c
Merge made by the 'recursive' strategy.
 .../bindings/input/touchscreen/tsc2007.txt         |  41 ++++
 .../bindings/input/twl4030-pwrbutton.txt           |  21 ++
 arch/arm/mach-imx/mach-cpuimx35.c                  |   2 +-
 arch/arm/mach-imx/mach-cpuimx51sd.c                |   2 +-
 arch/sh/boards/mach-ecovec24/setup.c               |   2 +-
 drivers/input/misc/twl4030-pwrbutton.c             |  46 ++---
 drivers/input/serio/pcips2.c                       |   1 -
 drivers/input/tablet/wacom_sys.c                   |  13 +-
 drivers/input/tablet/wacom_wac.c                   |  65 ++++--
 drivers/input/tablet/wacom_wac.h                   |   2 +
 drivers/input/touchscreen/tsc2007.c                | 230 ++++++++++++++-------
 include/linux/i2c/tsc2007.h                        |   8 +-
 12 files changed, 305 insertions(+), 128 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/input/touchscreen/tsc2007.txt
 create mode 100644 Documentation/devicetree/bindings/input/twl4030-pwrbutton.txt
Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
$ git merge input-mt/for-next
Already up-to-date.
Merging cgroup/for-next (f28a2cfe2871 Merge branch 'for-3.14' into for-next)
$ git merge cgroup/for-next
Merge made by the 'recursive' strategy.
 Documentation/cgroups/cgroups.txt |  20 ---
 include/linux/cgroup.h            |  24 ---
 include/linux/vmpressure.h        |   8 +-
 init/Kconfig                      |   3 +-
 kernel/cgroup.c                   | 294 ++++---------------------------
 kernel/cpuset.c                   |   8 +-
 mm/memcontrol.c                   | 353 ++++++++++++++++++++++++++++++++++----
 mm/vmpressure.c                   |  26 +--
 8 files changed, 371 insertions(+), 365 deletions(-)
Merging block/for-next (3bca3547dd4a Merge branch 'for-3.14/core' into for-next)
$ git merge block/for-next
Resolved 'fs/f2fs/segment.c' using previous resolution.
Resolved 'include/trace/events/f2fs.h' using previous resolution.
Auto-merging include/trace/events/f2fs.h
CONFLICT (content): Merge conflict in include/trace/events/f2fs.h
Auto-merging fs/gfs2/lops.c
Auto-merging fs/f2fs/segment.c
CONFLICT (content): Merge conflict in fs/f2fs/segment.c
Auto-merging fs/f2fs/data.c
Auto-merging drivers/staging/zram/zram_drv.c
Auto-merging drivers/s390/block/dasd_eckd.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 5f2dcac23f18] Merge remote-tracking branch 'block/for-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/block/biodoc.txt              |   7 +-
 Documentation/block/biovecs.txt             | 111 ++++++
 arch/m68k/emu/nfblock.c                     |  13 +-
 arch/powerpc/sysdev/axonram.c               |  21 +-
 block/blk-core.c                            |  40 +--
 block/blk-flush.c                           |  21 +-
 block/blk-integrity.c                       |  40 ++-
 block/blk-lib.c                             |  12 +-
 block/blk-map.c                             |   6 +-
 block/blk-merge.c                           |  72 ++--
 block/blk-mq.c                              |   2 +-
 block/blk-throttle.c                        |  14 +-
 block/elevator.c                            |   2 +-
 drivers/block/aoe/aoe.h                     |  10 +-
 drivers/block/aoe/aoecmd.c                  | 153 ++++-----
 drivers/block/brd.c                         |  16 +-
 drivers/block/drbd/drbd_actlog.c            |   2 +-
 drivers/block/drbd/drbd_bitmap.c            |   2 +-
 drivers/block/drbd/drbd_main.c              |  27 +-
 drivers/block/drbd/drbd_receiver.c          |  19 +-
 drivers/block/drbd/drbd_req.c               |   6 +-
 drivers/block/drbd/drbd_req.h               |   2 +-
 drivers/block/drbd/drbd_worker.c            |   8 +-
 drivers/block/floppy.c                      |  16 +-
 drivers/block/loop.c                        |  27 +-
 drivers/block/mtip32xx/mtip32xx.c           |  20 +-
 drivers/block/nbd.c                         |  14 +-
 drivers/block/nvme-core.c                   | 142 ++------
 drivers/block/pktcdvd.c                     | 182 +++++-----
 drivers/block/ps3disk.c                     |  17 +-
 drivers/block/ps3vram.c                     |  12 +-
 drivers/block/rbd.c                         |  91 +----
 drivers/block/rsxx/dev.c                    |   6 +-
 drivers/block/rsxx/dma.c                    |  15 +-
 drivers/block/umem.c                        |  53 ++-
 drivers/block/xen-blkback/blkback.c         |   2 +-
 drivers/block/xen-blkfront.c                |   2 +-
 drivers/md/bcache/bcache.h                  |   2 -
 drivers/md/bcache/btree.c                   |   8 +-
 drivers/md/bcache/debug.c                   |  21 +-
 drivers/md/bcache/io.c                      | 196 ++---------
 drivers/md/bcache/journal.c                 |  12 +-
 drivers/md/bcache/movinggc.c                |   4 +-
 drivers/md/bcache/request.c                 | 131 +++-----
 drivers/md/bcache/super.c                   |  20 +-
 drivers/md/bcache/util.c                    |   4 +-
 drivers/md/bcache/writeback.c               |   6 +-
 drivers/md/bcache/writeback.h               |   2 +-
 drivers/md/dm-bio-record.h                  |  37 +-
 drivers/md/dm-bufio.c                       |   2 +-
 drivers/md/dm-cache-policy-mq.c             |   4 +-
 drivers/md/dm-cache-target.c                |  28 +-
 drivers/md/dm-crypt.c                       |  64 ++--
 drivers/md/dm-delay.c                       |   7 +-
 drivers/md/dm-flakey.c                      |   7 +-
 drivers/md/dm-io.c                          |  37 +-
 drivers/md/dm-linear.c                      |   3 +-
 drivers/md/dm-raid1.c                       |  20 +-
 drivers/md/dm-region-hash.c                 |   3 +-
 drivers/md/dm-snap.c                        |  19 +-
 drivers/md/dm-stripe.c                      |  13 +-
 drivers/md/dm-switch.c                      |   4 +-
 drivers/md/dm-thin.c                        |  30 +-
 drivers/md/dm-verity.c                      |  62 ++--
 drivers/md/dm.c                             | 189 ++---------
 drivers/md/faulty.c                         |  19 +-
 drivers/md/linear.c                         |  96 +++---
 drivers/md/md.c                             |  24 +-
 drivers/md/multipath.c                      |  13 +-
 drivers/md/raid0.c                          |  79 ++---
 drivers/md/raid1.c                          |  75 +++--
 drivers/md/raid10.c                         | 194 +++++------
 drivers/md/raid5.c                          |  84 ++---
 drivers/message/fusion/mptsas.c             |   8 +-
 drivers/s390/block/dasd_diag.c              |  10 +-
 drivers/s390/block/dasd_eckd.c              |  48 +--
 drivers/s390/block/dasd_fba.c               |  26 +-
 drivers/s390/block/dcssblk.c                |  21 +-
 drivers/s390/block/scm_blk.c                |   8 +-
 drivers/s390/block/scm_blk_cluster.c        |   4 +-
 drivers/s390/block/xpram.c                  |  19 +-
 drivers/scsi/libsas/sas_expander.c          |   8 +-
 drivers/scsi/mpt2sas/mpt2sas_transport.c    |  41 +--
 drivers/scsi/mpt3sas/mpt3sas_transport.c    |  39 +--
 drivers/scsi/osd/osd_initiator.c            |   2 +-
 drivers/scsi/sd.c                           |   2 +-
 drivers/scsi/sd_dif.c                       |  30 +-
 drivers/staging/lustre/lustre/llite/lloop.c |  26 +-
 drivers/staging/zram/zram_drv.c             |  33 +-
 drivers/target/target_core_iblock.c         |   2 +-
 fs/bio-integrity.c                          | 179 +++-------
 fs/bio.c                                    | 502 +++++++++++++---------------
 fs/btrfs/check-integrity.c                  |  40 +--
 fs/btrfs/check-integrity.h                  |   2 +
 fs/btrfs/compression.c                      |  27 +-
 fs/btrfs/disk-io.c                          |  11 +-
 fs/btrfs/extent_io.c                        |  61 ++--
 fs/btrfs/file-item.c                        |  19 +-
 fs/btrfs/inode.c                            |  37 +-
 fs/btrfs/raid56.c                           |  22 +-
 fs/btrfs/scrub.c                            |  45 +--
 fs/btrfs/volumes.c                          |  12 +-
 fs/buffer.c                                 |  12 +-
 fs/direct-io.c                              |   4 +-
 fs/ext4/page-io.c                           |   8 +-
 fs/f2fs/data.c                              |  15 +-
 fs/f2fs/segment.c                           |  14 +-
 fs/gfs2/lops.c                              |   2 +-
 fs/gfs2/ops_fstype.c                        |   2 +-
 fs/hfsplus/wrapper.c                        |  19 +-
 fs/jfs/jfs_logmgr.c                         |  12 +-
 fs/jfs/jfs_metapage.c                       |   9 +-
 fs/logfs/dev_bdev.c                         |  53 ++-
 fs/mpage.c                                  |  19 +-
 fs/nfs/blocklayout/blocklayout.c            |  43 +--
 fs/nilfs2/segbuf.c                          |   3 +-
 fs/ocfs2/cluster/heartbeat.c                |   2 +-
 fs/xfs/xfs_aops.c                           |   2 +-
 fs/xfs/xfs_buf.c                            |   4 +-
 include/linux/bio.h                         | 283 ++++++++++------
 include/linux/blk_types.h                   |  24 +-
 include/linux/blkdev.h                      |   9 +-
 include/linux/ceph/messenger.h              |   4 +-
 include/linux/dm-io.h                       |   4 +-
 include/trace/events/bcache.h               |  26 +-
 include/trace/events/block.h                |  26 +-
 include/trace/events/f2fs.h                 |   4 +-
 kernel/power/block_io.c                     |   2 +-
 kernel/trace/blktrace.c                     |  15 +-
 mm/bounce.c                                 |  44 ++-
 mm/page_io.c                                |  10 +-
 net/ceph/messenger.c                        |  43 +--
 132 files changed, 2069 insertions(+), 2656 deletions(-)
 create mode 100644 Documentation/block/biovecs.txt
$ git am -3 ../patches/0001-f2fs-cope-with-bvec-iterator-abstraction.patch
Applying: f2fs: cope with bvec iterator abstraction
$ git reset HEAD^
Unstaged changes after reset:
M	fs/f2fs/data.c
$ git add -A .
$ git commit -v -a --amend
[master 35f7295dc8f9] Merge remote-tracking branch 'block/for-next'
Merging device-mapper/for-next (f0417b93a59e dm cache: update Documentation for invalidate_cblocks's range syntax)
$ git merge device-mapper/for-next
Auto-merging drivers/md/dm-delay.c
Auto-merging drivers/md/dm-cache-policy-mq.c
Merge made by the 'recursive' strategy.
 Documentation/device-mapper/cache.txt | 10 ++++---
 drivers/md/dm-cache-policy-mq.c       | 16 ++++++-----
 drivers/md/dm-delay.c                 | 52 ++++++++++-------------------------
 3 files changed, 30 insertions(+), 48 deletions(-)
Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence)
$ git merge embedded/master
Already up-to-date.
Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3)
$ git merge firmware/master
Already up-to-date.
Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage)
$ git merge pcmcia/master
Already up-to-date.
Merging mmc/mmc-next (e395c4387c74 mmc: wbsd: Silence compiler warning)
$ git merge mmc/mmc-next
Already up-to-date.
Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command)
$ git merge kgdb/kgdb-next
Resolved 'kernel/debug/debug_core.h' using previous resolution.
Auto-merging kernel/debug/debug_core.h
CONFLICT (content): Merge conflict in kernel/debug/debug_core.h
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 3519c51af20b] Merge remote-tracking branch 'kgdb/kgdb-next'
$ git diff -M --stat --summary HEAD^..
Merging slab/for-next (a8c0b0837359 Merge branch 'slab/next' into for-next)
$ git merge slab/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
$ git merge uclinux/for-next
Already up-to-date.
Merging md/for-next (60aaf9338545 md/raid5: Use conf->device_lock protect changing of multi-thread resources.)
$ git merge md/for-next
Already up-to-date.
Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.linaro.org/people/ljones/mfd)
$ git merge mfd/master
Already up-to-date.
Merging mfd-lj/for-mfd-next (d0436a3dab1f Merge branch 'ib-asoc' into for-mfd-next)
$ git merge mfd-lj/for-mfd-next
Resolved 'drivers/mfd/arizona-core.c' using previous resolution.
Auto-merging drivers/staging/nvec/nvec.c
Auto-merging drivers/mfd/tps65910.c
Auto-merging drivers/mfd/db8500-prcmu.c
Auto-merging drivers/mfd/as3722.c
Auto-merging drivers/mfd/arizona-core.c
CONFLICT (content): Merge conflict in drivers/mfd/arizona-core.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 1c772cd0dc3a] Merge remote-tracking branch 'mfd-lj/for-mfd-next'
$ git diff -M --stat --summary HEAD^..
 drivers/mfd/88pm800.c             |  4 ++--
 drivers/mfd/88pm805.c             |  2 +-
 drivers/mfd/ab8500-core.c         | 14 +++++++-------
 drivers/mfd/ab8500-debugfs.c      |  5 +++--
 drivers/mfd/arizona-core.c        |  8 ++++----
 drivers/mfd/as3722.c              |  5 ++++-
 drivers/mfd/asic3.c               |  4 ++--
 drivers/mfd/cros_ec.c             |  2 +-
 drivers/mfd/cros_ec_spi.c         | 11 +++++++----
 drivers/mfd/da9052-core.c         |  2 +-
 drivers/mfd/da9055-core.c         |  2 +-
 drivers/mfd/da9063-core.c         |  2 +-
 drivers/mfd/db8500-prcmu.c        |  4 ++--
 drivers/mfd/htc-pasic3.c          |  2 +-
 drivers/mfd/intel_msic.c          |  2 +-
 drivers/mfd/jz4740-adc.c          |  2 +-
 drivers/mfd/lp8788.c              |  2 +-
 drivers/mfd/max77686.c            |  2 +-
 drivers/mfd/max77693.c            |  2 +-
 drivers/mfd/max8907.c             |  2 +-
 drivers/mfd/max8925-core.c        |  8 ++++----
 drivers/mfd/max8997.c             |  2 +-
 drivers/mfd/max8998.c             |  4 ++--
 drivers/mfd/omap-usb-host.c       |  8 ++++----
 drivers/mfd/omap-usb-tll.c        |  8 ++++----
 drivers/mfd/rc5t583.c             |  2 +-
 drivers/mfd/rdc321x-southbridge.c |  2 +-
 drivers/mfd/retu-mfd.c            |  6 +++---
 drivers/mfd/sec-core.c            |  8 ++++----
 drivers/mfd/stmpe.c               | 10 +++++-----
 drivers/mfd/stmpe.h               |  2 +-
 drivers/mfd/tc3589x.c             |  4 ++--
 drivers/mfd/tc6387xb.c            |  2 +-
 drivers/mfd/timberdale.c          | 12 ++++++------
 drivers/mfd/tps6507x.c            |  2 +-
 drivers/mfd/tps65090.c            |  2 +-
 drivers/mfd/tps65217.c            |  2 +-
 drivers/mfd/tps6586x.c            |  2 +-
 drivers/mfd/tps65910.c            |  2 +-
 drivers/mfd/tps65912-core.c       |  2 +-
 drivers/mfd/tps80031.c            |  2 +-
 drivers/mfd/viperboard.c          |  2 +-
 drivers/mfd/vx855.c               |  2 +-
 drivers/mfd/wm5110-tables.c       |  2 +-
 drivers/mfd/wm831x-core.c         | 14 +++++++-------
 drivers/mfd/wm8994-core.c         |  4 ++--
 drivers/staging/nvec/nvec.c       |  2 +-
 47 files changed, 102 insertions(+), 95 deletions(-)
Merging battery/master (c8024234c20e pm2301-charger: Remove unneeded NULL checks)
$ git merge battery/master
Already up-to-date.
Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path)
$ git merge fbdev/for-next
Already up-to-date.
Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par)
$ git merge viafb/viafb-next
Already up-to-date.
Merging omap_dss2/for-next (3a41c5dbe8bc fb: reorder the lock sequence to fix potential dead lock)
$ git merge omap_dss2/for-next
Already up-to-date.
Merging regulator/for-next (5192e9dcd845 Merge remote-tracking branches 'regulator/topic/arizona', 'regulator/topic/lp3971', 'regulator/topic/lp3972' and 'regulator/topic/tps51632' into regulator-next)
$ git merge regulator/for-next
Merge made by the 'recursive' strategy.
 drivers/regulator/arizona-micsupp.c    | 52 +++++++---------------------------
 drivers/regulator/core.c               | 11 +++++--
 drivers/regulator/lp3971.c             | 43 ++++------------------------
 drivers/regulator/lp3972.c             | 41 ++++-----------------------
 drivers/regulator/tps51632-regulator.c |  2 +-
 5 files changed, 32 insertions(+), 117 deletions(-)
Merging security/next (217091dd7a7a ima: define '_ima' as a builtin 'trusted' keyring)
$ git merge security/next
Already up-to-date.
Merging selinux/master (94851b18d4eb Merge tag 'v3.12')
$ git merge selinux/master
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging lblnet/master (07bc9dc1b01b Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc)
$ git merge lblnet/master
Already up-to-date.
Merging watchdog/master (608564867a38 watchdog: Drop unnecessary include of miscdevice.h)
$ git merge watchdog/master
Resolved 'drivers/watchdog/rt2880_wdt.c' using previous resolution.
Auto-merging drivers/watchdog/ux500_wdt.c
Auto-merging drivers/watchdog/txx9wdt.c
Auto-merging drivers/watchdog/stmp3xxx_rtc_wdt.c
Auto-merging drivers/watchdog/softdog.c
Auto-merging drivers/watchdog/shwdt.c
Auto-merging drivers/watchdog/rt2880_wdt.c
CONFLICT (add/add): Merge conflict in drivers/watchdog/rt2880_wdt.c
Auto-merging drivers/watchdog/pnx4008_wdt.c
Auto-merging drivers/watchdog/orion_wdt.c
Auto-merging drivers/watchdog/max63xx_wdt.c
Auto-merging drivers/watchdog/kempld_wdt.c
Auto-merging drivers/watchdog/jz4740_wdt.c
Auto-merging drivers/watchdog/ie6xx_wdt.c
Auto-merging drivers/watchdog/ep93xx_wdt.c
Auto-merging drivers/watchdog/bcm2835_wdt.c
Auto-merging arch/arm/boot/dts/sama5d3.dtsi
Auto-merging arch/arm/boot/dts/at91sam9x5.dtsi
Auto-merging arch/arm/boot/dts/at91sam9n12.dtsi
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master dd7687ccf819] Merge remote-tracking branch 'watchdog/master'
$ git diff -M --stat --summary HEAD^..
 .../devicetree/bindings/watchdog/atmel-wdt.txt     |  30 +-
 arch/arm/boot/dts/at91sam9260.dtsi                 |   5 +
 arch/arm/boot/dts/at91sam9263.dtsi                 |   5 +
 arch/arm/boot/dts/at91sam9g45.dtsi                 |   5 +
 arch/arm/boot/dts/at91sam9n12.dtsi                 |   5 +
 arch/arm/boot/dts/at91sam9x5.dtsi                  |   5 +
 arch/arm/boot/dts/kizbox.dts                       |   6 +
 arch/arm/boot/dts/sama5d3.dtsi                     |   5 +
 drivers/watchdog/at91sam9_wdt.c                    | 309 +++++++++++++++------
 drivers/watchdog/bcm2835_wdt.c                     |   1 -
 drivers/watchdog/ep93xx_wdt.c                      |   1 -
 drivers/watchdog/ie6xx_wdt.c                       |   1 -
 drivers/watchdog/jz4740_wdt.c                      |   1 -
 drivers/watchdog/kempld_wdt.c                      |   1 -
 drivers/watchdog/max63xx_wdt.c                     |   1 -
 drivers/watchdog/orion_wdt.c                       |   1 -
 drivers/watchdog/pnx4008_wdt.c                     |   1 -
 drivers/watchdog/rt2880_wdt.c                      |   1 -
 drivers/watchdog/shwdt.c                           |   1 -
 drivers/watchdog/softdog.c                         |   1 -
 drivers/watchdog/stmp3xxx_rtc_wdt.c                |   1 -
 drivers/watchdog/txx9wdt.c                         |   1 -
 drivers/watchdog/ux500_wdt.c                       |   1 -
 23 files changed, 287 insertions(+), 102 deletions(-)
Merging dwmw2-iommu/master (e5d0c874391a Merge tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu)
$ git merge dwmw2-iommu/master
Already up-to-date.
Merging iommu/next (e6ca48d995e4 Merge branches 'iommu/fixes', 'tracing', 'core', 'arm/tegra' and 'x86/vt-d' into next)
$ git merge iommu/next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging vfio/next (15c03dd4859a Linux 3.12-rc3)
$ git merge vfio/next
Already up-to-date.
Merging osd/linux-next (861d66601acd exofs: don't leak io_state and pages on read error)
$ git merge osd/linux-next
Already up-to-date.
Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document)
$ git merge jc_docs/docs-next
Already up-to-date.
Merging trivial/for-next (2bb9936beac2 doc: usb: Fix typo in Documentation/usb/gadget_configs.txt)
$ git merge trivial/for-next
Already up-to-date.
Merging audit/master (fc582aef7dcc Merge tag 'v3.12')
$ git merge audit/master
Merge made by the 'recursive' strategy.
Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
$ git merge fsnotify/for-next
Already up-to-date.
Merging devicetree/devicetree/next (355e62f5ad12 of/irq: Fix potential buffer overflow)
$ git merge devicetree/devicetree/next
Already up-to-date.
Merging dt-rh/for-next (c11eede69b6a powerpc: add missing explicit OF includes for ppc)
$ git merge dt-rh/for-next
Already up-to-date.
Merging spi/for-next (5906fd01cdfc Merge remote-tracking branches 'spi/topic/davinci', 'spi/topic/gpio', 'spi/topic/msiof', 'spi/topic/omap' and 'spi/topic/rcar' into spi-next)
$ git merge spi/for-next
Merge made by the 'recursive' strategy.
 drivers/spi/Kconfig           |  4 +++-
 drivers/spi/spi-bcm2835.c     |  2 +-
 drivers/spi/spi-bcm63xx.c     |  2 +-
 drivers/spi/spi-davinci.c     |  4 ++--
 drivers/spi/spi-gpio.c        |  8 ++++----
 drivers/spi/spi-mpc512x-psc.c |  2 +-
 drivers/spi/spi-mxs.c         |  2 +-
 drivers/spi/spi-omap2-mcspi.c | 38 +++++++++++++++++++-------------------
 drivers/spi/spi-pxa2xx.c      |  2 ++
 drivers/spi/spi-rspi.c        | 43 +++++++++++++++----------------------------
 drivers/spi/spi-sh-msiof.c    |  2 +-
 drivers/spi/spi-ti-qspi.c     | 23 +++++++++++++++++++----
 drivers/spi/spi-txx9.c        |  2 +-
 drivers/spi/spi.c             | 28 ++++++++++++++++++++++------
 14 files changed, 92 insertions(+), 70 deletions(-)
Merging tip/auto-latest (6a4d0941dae2 Merge branch 'x86/mm')
$ git merge tip/auto-latest
Auto-merging include/trace/ftrace.h
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/kernel-parameters.txt      |  10 +
 Documentation/memory-barriers.txt        |  42 +--
 Documentation/x86/x86_64/mm.txt          |   7 +
 MAINTAINERS                              |   3 +-
 arch/mips/ar7/setup.c                    |   1 -
 arch/mips/emma/markeins/setup.c          |   3 -
 arch/mips/netlogic/xlp/setup.c           |   1 -
 arch/mips/netlogic/xlr/setup.c           |   1 -
 arch/mips/sibyte/swarm/setup.c           |   2 -
 arch/powerpc/Kconfig                     |   4 +
 arch/powerpc/include/asm/setup.h         |   1 +
 arch/powerpc/include/asm/uprobes.h       |   5 +-
 arch/powerpc/kernel/setup_32.c           |   3 -
 arch/powerpc/kernel/setup_64.c           |   3 -
 arch/powerpc/kernel/uprobes.c            |   2 +-
 arch/powerpc/platforms/pseries/setup.c   |   2 +-
 arch/x86/Kconfig                         |  52 +++-
 arch/x86/boot/Makefile                   |   2 +-
 arch/x86/boot/boot.h                     |  10 +-
 arch/x86/boot/compressed/Makefile        |   2 +-
 arch/x86/boot/compressed/aslr.c          | 317 +++++++++++++++++++++
 arch/x86/boot/compressed/cmdline.c       |   2 +-
 arch/x86/boot/compressed/cpuflags.c      |  12 +
 arch/x86/boot/compressed/head_32.S       |  10 +-
 arch/x86/boot/compressed/head_64.S       |  16 +-
 arch/x86/boot/compressed/misc.c          |  18 +-
 arch/x86/boot/compressed/misc.h          |  37 ++-
 arch/x86/boot/cpucheck.c                 | 100 +------
 arch/x86/boot/cpuflags.c                 | 104 +++++++
 arch/x86/boot/cpuflags.h                 |  19 ++
 arch/x86/include/asm/archrandom.h        |  21 ++
 arch/x86/include/asm/efi.h               |  64 +++--
 arch/x86/include/asm/page.h              |   1 +
 arch/x86/include/asm/page_32.h           |   4 -
 arch/x86/include/asm/page_64_types.h     |  15 +-
 arch/x86/include/asm/pgtable-2level.h    | 100 ++++---
 arch/x86/include/asm/pgtable_64_types.h  |   2 +-
 arch/x86/include/asm/pgtable_types.h     |   3 +-
 arch/x86/include/asm/trace/irq_vectors.h |  11 +
 arch/x86/kernel/cpu/rdrand.c             |  14 -
 arch/x86/kernel/setup.c                  |  26 ++
 arch/x86/lib/copy_user_64.S              |  12 +-
 arch/x86/mm/hugetlbpage.c                |   9 +-
 arch/x86/mm/init_32.c                    |   3 +
 arch/x86/mm/pageattr.c                   | 461 +++++++++++++++++++++++++++++--
 arch/x86/platform/efi/efi.c              | 111 +++++---
 arch/x86/platform/efi/efi_32.c           |   9 +-
 arch/x86/platform/efi/efi_64.c           | 109 ++++++++
 arch/x86/platform/efi/efi_stub_64.S      |  54 ++++
 arch/x86/tools/relocs.c                  |  20 +-
 include/linux/efi.h                      |   1 +
 include/linux/ftrace_event.h             |  16 ++
 include/linux/irqreturn.h                |   2 +-
 include/linux/kernel.h                   |   9 +
 include/linux/sched.h                    |   2 -
 include/linux/tracepoint.h               |   4 +
 include/linux/uprobes.h                  |  52 ++--
 include/trace/ftrace.h                   |   7 +
 kernel/events/core.c                     |   8 -
 kernel/events/uprobes.c                  |  60 ++--
 kernel/irq/pm.c                          |   2 +-
 kernel/panic.c                           |   2 +-
 kernel/rcu/tree_plugin.h                 |   4 +-
 kernel/sched/core.c                      |   5 +-
 kernel/sched/fair.c                      |  27 +-
 kernel/softirq.c                         |  54 +++-
 kernel/time/tick-common.c                |  15 +
 kernel/time/tick-sched.c                 |  21 +-
 kernel/time/timekeeping.c                |   2 +-
 kernel/timer.c                           |   5 +-
 kernel/trace/trace_event_perf.c          |   8 +-
 lib/Kconfig                              |   3 +-
 lib/Kconfig.debug                        |   9 +
 tools/lib/traceevent/event-parse.c       |  25 +-
 tools/perf/util/header.c                 |   6 +-
 tools/perf/util/thread.c                 |  11 +-
 76 files changed, 1764 insertions(+), 436 deletions(-)
 create mode 100644 arch/x86/boot/compressed/aslr.c
 create mode 100644 arch/x86/boot/compressed/cpuflags.c
 create mode 100644 arch/x86/boot/cpuflags.c
 create mode 100644 arch/x86/boot/cpuflags.h
Merging edac/linux_next (3e45588825c1 cell_edac: fix missing of_node_put)
$ git merge edac/linux_next
Already up-to-date.
Merging edac-amd/for-next (c92132f59806 edac/85xx: Add PCIe error interrupt edac support)
$ git merge edac-amd/for-next
Merge made by the 'recursive' strategy.
 drivers/edac/mpc85xx_edac.c | 98 ++++++++++++++++++++++++++++++++++++++++-----
 drivers/edac/mpc85xx_edac.h |  7 ++++
 2 files changed, 94 insertions(+), 11 deletions(-)
Merging ftrace/for-next (8a56d7761d2d ftrace: Fix function graph with loading of modules)
$ git merge ftrace/for-next
Already up-to-date.
Merging rcu/rcu/next (4102adab9189 rcu: Move RCU-related source code to kernel/rcu directory)
$ git merge rcu/rcu/next
Already up-to-date.
Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
$ git merge uprobes/for-next
Already up-to-date.
Merging kvm/linux-next (0a00a775d2a4 KVM: Change maintainer email address)
$ git merge kvm/linux-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging kvm-arm/kvm-arm-next (ede582224231 Merge tag 'kvm-arm64/for-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into kvm-next)
$ git merge kvm-arm/kvm-arm-next
Already up-to-date.
Merging kvm-ppc/kvm-ppc-next (27025a602cb9 powerpc: kvm: optimize "sc 1" as fast return)
$ git merge kvm-ppc/kvm-ppc-next
Merge made by the 'recursive' strategy.
 arch/powerpc/kvm/book3s_hv.c            | 10 ++++------
 arch/powerpc/kvm/book3s_hv_rmhandlers.S | 19 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 7 deletions(-)
Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1)
$ git merge oprofile/for-next
Already up-to-date.
Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work)
$ git merge fw-nohz/nohz/next
Already up-to-date.
Merging xen-tip/linux-next (2b347c70b36f Merge branch 'stable/for-linus-3.13' into linux-next)
$ git merge xen-tip/linux-next
Merge made by the 'recursive' strategy.
 arch/arm/xen/p2m.c        | 5 +++--
 drivers/xen/grant-table.c | 6 ++++--
 drivers/xen/swiotlb-xen.c | 5 +++++
 3 files changed, 12 insertions(+), 4 deletions(-)
Merging percpu/for-next (90f2492cf9c8 x86: remove this_cpu_xor() implementation)
$ git merge percpu/for-next
Already up-to-date.
Merging workqueues/for-next (4e8b22bd1a37 workqueue: fix pool ID allocation leakage and remove BUILD_BUG_ON() in init_workqueues)
$ git merge workqueues/for-next
Auto-merging kernel/workqueue.c
Merge made by the 'recursive' strategy.
 kernel/workqueue.c | 50 +++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 13 deletions(-)
Merging drivers-x86/linux-next (a80e1053aaa3 x86, wmi fix modalias_show return values)
$ git merge drivers-x86/linux-next
Already up-to-date.
Merging chrome-platform/for-next (2b8454a75b90 platform/chrome: unregister platform driver/device when module exit)
$ git merge chrome-platform/for-next
Merge made by the 'recursive' strategy.
 drivers/platform/chrome/Kconfig           |  14 ++
 drivers/platform/chrome/Makefile          |   1 +
 drivers/platform/chrome/chromeos_laptop.c | 298 +++++++++++++++++++++---------
 drivers/platform/chrome/chromeos_pstore.c | 101 ++++++++++
 4 files changed, 323 insertions(+), 91 deletions(-)
 create mode 100644 drivers/platform/chrome/chromeos_pstore.c
Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away)
$ git merge sysctl/master
Already up-to-date.
Merging regmap/for-next (d929555edfba Merge remote-tracking branch 'regmap/topic/core' into regmap-next)
$ git merge regmap/for-next
Merge made by the 'recursive' strategy.
 drivers/base/regmap/regmap-mmio.c | 11 ++++++-----
 drivers/base/regmap/regmap.c      | 12 ++++++++----
 2 files changed, 14 insertions(+), 9 deletions(-)
Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt)
$ git merge hsi/for-next
Already up-to-date.
Merging leds/for-next (07d0ea496eec LEDS: tca6507 - fix up some comments.)
$ git merge leds/for-next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/leds/tca6507.txt |  16 ++
 drivers/leds/leds-tca6507.c                        | 204 +++++++++++----------
 2 files changed, 128 insertions(+), 92 deletions(-)
Merging driver-core/driver-core-next (5d60418e5475 sysfs, kernfs: introduce kernfs_setattr())
$ git merge driver-core/driver-core-next
Auto-merging fs/sysfs/file.c
Merge made by the 'recursive' strategy.
 fs/Makefile            |   2 +-
 fs/kernfs/Makefile     |   5 ++
 fs/kernfs/dir.c        |   9 ++++
 fs/kernfs/file.c       |   9 ++++
 fs/kernfs/inode.c      |   9 ++++
 fs/kernfs/mount.c      |   9 ++++
 fs/kernfs/symlink.c    |   9 ++++
 fs/sysfs/dir.c         | 138 +++++++++++++++++++++++--------------------------
 fs/sysfs/file.c        |  19 +++----
 fs/sysfs/group.c       |  15 +++---
 fs/sysfs/inode.c       |  21 +++++++-
 fs/sysfs/mount.c       |  24 +++------
 fs/sysfs/symlink.c     |  98 ++++++++++++++++++-----------------
 fs/sysfs/sysfs.h       |  32 +++---------
 include/linux/kernfs.h |  60 +++++++++++++++++++++
 include/linux/sysfs.h  |   9 +++-
 lib/kobject.c          |  27 ++++++++--
 17 files changed, 301 insertions(+), 194 deletions(-)
 create mode 100644 fs/kernfs/Makefile
 create mode 100644 fs/kernfs/dir.c
 create mode 100644 fs/kernfs/file.c
 create mode 100644 fs/kernfs/inode.c
 create mode 100644 fs/kernfs/mount.c
 create mode 100644 fs/kernfs/symlink.c
 create mode 100644 include/linux/kernfs.h
Merging tty/tty-next (6ce4eac1f600 Linux 3.13-rc1)
$ git merge tty/tty-next
Already up-to-date.
Merging usb/usb-next (6ce4eac1f600 Linux 3.13-rc1)
$ git merge usb/usb-next
Already up-to-date.
Merging usb-gadget/next (989c78dd5630 usb: gadget: r8a66597-udc: convert to clk_prepare/unprepare)
$ git merge usb-gadget/next
Merge made by the 'recursive' strategy.
 drivers/usb/gadget/r8a66597-udc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Merging staging/staging-next (931cf48d2db6 staging: comedi: unionxx5: tidy up some dev_{level} messages)
$ git merge staging/staging-next
Auto-merging drivers/staging/vt6656/rndis.h
Auto-merging drivers/staging/vt6656/baseband.c
Auto-merging drivers/staging/vt6655/hostap.c
Auto-merging drivers/staging/lustre/lustre/ptlrpc/pinger.c
Removing drivers/staging/lustre/lustre/ptlrpc/llog_server.c
Removing drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c
Auto-merging drivers/staging/lustre/lustre/llite/lloop.c
Removing drivers/staging/lustre/lustre/libcfs/lwt.c
Removing drivers/staging/lustre/lustre/include/lustre/lustreapi.h
Removing drivers/staging/lustre/lustre/include/lustre/liblustreapi.h
Removing drivers/staging/lustre/lustre/include/lu_target.h
Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h
Auto-merging drivers/staging/imx-drm/imx-drm-core.c
Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_download.c
Auto-merging drivers/iio/magnetometer/hid-sensor-magn-3d.c
Auto-merging drivers/iio/light/hid-sensor-als.c
Auto-merging drivers/iio/gyro/hid-sensor-gyro-3d.c
Auto-merging drivers/iio/adc/mcp3422.c
Auto-merging drivers/iio/accel/hid-sensor-accel-3d.c
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/iio/light/tsl2563.txt      |   19 +
 .../bindings/iio/magnetometer/hmc5843.txt          |   17 +
 .../devicetree/bindings/vendor-prefixes.txt        |    1 +
 Documentation/driver-model/devres.txt              |    2 +
 drivers/iio/accel/hid-sensor-accel-3d.c            |   12 +
 drivers/iio/adc/mcp3422.c                          |    9 +-
 drivers/iio/adc/viperboard_adc.c                   |   20 +-
 drivers/iio/dac/ad5421.c                           |   12 +-
 drivers/iio/dac/ad5755.c                           |   12 +-
 drivers/iio/gyro/adis16130.c                       |    9 +-
 drivers/iio/gyro/adxrs450.c                        |   14 +-
 drivers/iio/gyro/hid-sensor-gyro-3d.c              |   11 +
 drivers/iio/industrialio-core.c                    |  101 +
 drivers/iio/industrialio-event.c                   |    6 +
 drivers/iio/industrialio-trigger.c                 |   28 +-
 drivers/iio/light/hid-sensor-als.c                 |   11 +
 drivers/iio/light/tsl2563.c                        |    4 +
 drivers/iio/light/vcnl4000.c                       |    9 +-
 drivers/iio/magnetometer/hid-sensor-magn-3d.c      |   12 +
 drivers/iio/pressure/Kconfig                       |   12 +
 drivers/iio/pressure/Makefile                      |    1 +
 drivers/iio/pressure/mpl3115.c                     |  329 ++
 drivers/staging/Kconfig                            |    2 +
 drivers/staging/Makefile                           |    1 +
 drivers/staging/android/alarm-dev.c                |    8 +-
 drivers/staging/android/sync.h                     |   50 +-
 drivers/staging/bcm/Bcmchar.c                      |  136 +-
 drivers/staging/bcm/DDRInit.c                      | 1501 ++++---
 drivers/staging/ced1401/ced_ioc.c                  |    2 +-
 drivers/staging/comedi/Makefile                    |    2 +
 drivers/staging/comedi/comedi_buf.c                |   99 +-
 drivers/staging/comedi/comedi_fops.c               |  488 ++-
 drivers/staging/comedi/comedi_internal.h           |    4 +
 drivers/staging/comedi/comedidev.h                 |   39 +-
 drivers/staging/comedi/drivers.c                   |   14 +-
 drivers/staging/comedi/drivers/Makefile            |    1 +
 .../staging/comedi/drivers/amplc_dio200_common.c   |    2 +-
 drivers/staging/comedi/drivers/amplc_pci224.c      |   14 +-
 drivers/staging/comedi/drivers/amplc_pci230.c      |   52 +-
 drivers/staging/comedi/drivers/c6xdigio.c          |    9 -
 drivers/staging/comedi/drivers/cb_pcidas64.c       |  126 +-
 drivers/staging/comedi/drivers/cb_pcimdas.c        |    3 -
 drivers/staging/comedi/drivers/das6402.c           |    9 -
 drivers/staging/comedi/drivers/dmm32at.c           |    6 -
 drivers/staging/comedi/drivers/dt2801.c            |    9 -
 drivers/staging/comedi/drivers/dt2814.c            |   26 -
 drivers/staging/comedi/drivers/dt282x.c            |   10 -
 drivers/staging/comedi/drivers/dt3000.c            |   23 -
 drivers/staging/comedi/drivers/dyna_pci10xx.c      |    3 +-
 drivers/staging/comedi/drivers/fl512.c             |    2 -
 drivers/staging/comedi/drivers/gsc_hpdi.c          |   78 -
 drivers/staging/comedi/drivers/mite.c              |  145 +-
 drivers/staging/comedi/drivers/mite.h              |   12 -
 drivers/staging/comedi/drivers/ni_65xx.c           |    3 -
 drivers/staging/comedi/drivers/ni_at_a2150.c       |   25 -
 drivers/staging/comedi/drivers/ni_atmio.c          |   15 -
 drivers/staging/comedi/drivers/ni_mio_common.c     |  157 +-
 drivers/staging/comedi/drivers/ni_mio_cs.c         |    2 -
 drivers/staging/comedi/drivers/ni_pcidio.c         |  137 +-
 drivers/staging/comedi/drivers/ni_pcimio.c         |    2 -
 drivers/staging/comedi/drivers/pcl816.c            |   46 +-
 drivers/staging/comedi/drivers/pcl818.c            |    4 +-
 drivers/staging/comedi/drivers/pcmmio.c            |   35 +-
 drivers/staging/comedi/drivers/unioxx5.c           |   68 +-
 drivers/staging/comedi/kcomedilib/Makefile         |    2 +
 .../staging/comedi/kcomedilib/kcomedilib_main.c    |   74 +-
 drivers/staging/comedi/proc.c                      |    6 +-
 drivers/staging/comedi/range.c                     |    9 +-
 drivers/staging/crystalhd/crystalhd_cmds.c         |    2 +-
 drivers/staging/cxt1e1/comet.c                     |   60 +-
 drivers/staging/cxt1e1/comet.h                     |  601 +--
 drivers/staging/cxt1e1/functions.c                 |    2 +-
 drivers/staging/cxt1e1/musycc.c                    |    4 +-
 drivers/staging/cxt1e1/pmcc4_drv.c                 |   10 +-
 drivers/staging/cxt1e1/pmcc4_private.h             |    2 +-
 drivers/staging/cxt1e1/sbeid.c                     |  323 +-
 drivers/staging/dgrp/dgrp_net_ops.c                |  330 +-
 drivers/staging/dwc2/core.c                        |  312 +-
 drivers/staging/dwc2/core.h                        |   62 +-
 drivers/staging/dwc2/core_intr.c                   |   10 +-
 drivers/staging/dwc2/hcd.c                         |    6 +-
 drivers/staging/dwc2/hcd.h                         |    4 +-
 drivers/staging/dwc2/hcd_ddma.c                    |    4 +-
 drivers/staging/dwc2/hcd_intr.c                    |    4 +-
 drivers/staging/dwc2/hcd_queue.c                   |  195 +-
 drivers/staging/dwc2/platform.c                    |    2 +-
 drivers/staging/ft1000/ft1000-pcmcia/boot.h        |  252 +-
 .../staging/ft1000/ft1000-usb/ft1000_download.c    |  106 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c      | 1308 +++---
 drivers/staging/ft1000/ft1000-usb/ft1000_proc.c    |   14 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.c     |    4 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.h     |    5 -
 drivers/staging/gdm724x/gdm_lte.c                  |   44 +-
 drivers/staging/gdm724x/gdm_mux.c                  |    8 +-
 drivers/staging/gdm724x/gdm_usb.c                  |   40 +-
 drivers/staging/iio/accel/adis16220_core.c         |    7 +-
 drivers/staging/iio/adc/ad7816.c                   |   12 +-
 drivers/staging/iio/adc/lpc32xx_adc.c              |   12 +-
 drivers/staging/iio/addac/adt7316-i2c.c            |    6 -
 drivers/staging/iio/addac/adt7316-spi.c            |    6 -
 drivers/staging/iio/addac/adt7316.c                |   12 +-
 drivers/staging/iio/addac/adt7316.h                |    1 -
 drivers/staging/iio/gyro/adis16060_core.c          |   10 +-
 drivers/staging/iio/light/isl29018.c               |   13 +-
 drivers/staging/iio/magnetometer/hmc5843.c         |    7 +
 drivers/staging/iio/resolver/ad2s1200.c            |   10 +-
 drivers/staging/imx-drm/imx-drm-core.c             |    4 +-
 drivers/staging/imx-drm/imx-ldb.c                  |    5 +-
 drivers/staging/keucr/smil.h                       |    6 -
 drivers/staging/keucr/smilmain.c                   |   99 +-
 drivers/staging/keucr/smilsub.c                    |   37 +-
 drivers/staging/keucr/smscsi.c                     |   28 +-
 .../staging/lustre/include/linux/libcfs/curproc.h  |    1 -
 .../lustre/include/linux/libcfs/libcfs_ioctl.h     |   63 +-
 .../lustre/include/linux/libcfs/linux/kp30.h       |  149 +-
 .../lustre/include/linux/libcfs/linux/libcfs.h     |    1 -
 .../lustre/include/linux/libcfs/linux/linux-fs.h   |   92 -
 drivers/staging/lustre/include/linux/lnet/types.h  |   11 -
 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c    |    1 -
 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h    |    3 -
 .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c  |  358 +-
 .../staging/lustre/lnet/klnds/socklnd/socklnd.c    |    1 -
 .../staging/lustre/lnet/klnds/socklnd/socklnd.h    |    6 -
 .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.c  |  307 --
 .../lustre/lnet/klnds/socklnd/socklnd_modparams.c  |  124 +-
 drivers/staging/lustre/lnet/lnet/acceptor.c        |   16 +-
 drivers/staging/lustre/lnet/lnet/api-ni.c          |   16 +-
 drivers/staging/lustre/lnet/lnet/lib-move.c        |    4 +-
 drivers/staging/lustre/lnet/lnet/lib-ptl.c         |    4 +-
 drivers/staging/lustre/lnet/lnet/module.c          |    4 +-
 drivers/staging/lustre/lnet/lnet/router.c          |   44 +-
 drivers/staging/lustre/lnet/lnet/router_proc.c     |   10 -
 drivers/staging/lustre/lnet/selftest/brw_test.c    |    7 +-
 drivers/staging/lustre/lnet/selftest/conctl.c      |   56 +-
 drivers/staging/lustre/lnet/selftest/conrpc.c      |    2 +-
 drivers/staging/lustre/lnet/selftest/console.c     |  103 +-
 drivers/staging/lustre/lnet/selftest/console.h     |    6 +-
 drivers/staging/lustre/lnet/selftest/framework.c   |    8 +-
 drivers/staging/lustre/lnet/selftest/ping_test.c   |    3 +-
 drivers/staging/lustre/lustre/fld/fld_request.c    |    5 +-
 drivers/staging/lustre/lustre/include/cl_object.h  |    6 +-
 .../lustre/lustre/include/linux/lustre_intent.h    |    2 +-
 drivers/staging/lustre/lustre/include/lu_object.h  |   19 -
 drivers/staging/lustre/lustre/include/lu_target.h  |   91 -
 .../lustre/lustre/include/lustre/liblustreapi.h    |   43 -
 .../lustre/lustre/include/lustre/lustre_idl.h      |   31 +-
 .../lustre/lustre/include/lustre/lustre_user.h     |   10 +-
 .../lustre/lustre/include/lustre/lustreapi.h       |  310 --
 .../staging/lustre/lustre/include/lustre_disk.h    |    1 +
 .../lustre/lustre/include/lustre_dlm_flags.h       |   90 +-
 drivers/staging/lustre/lustre/include/lustre_lib.h |   11 +-
 drivers/staging/lustre/lustre/include/lustre_net.h |    9 -
 .../lustre/lustre/include/lustre_req_layout.h      |    2 +
 .../staging/lustre/lustre/include/obd_support.h    |    7 +
 drivers/staging/lustre/lustre/lclient/lcommon_cl.c |    6 +
 drivers/staging/lustre/lustre/ldlm/ldlm_flock.c    |   45 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_lock.c     |    5 +
 drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c    |   55 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_request.c  |   40 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_resource.c |   19 +-
 drivers/staging/lustre/lustre/libcfs/debug.c       |   42 +-
 drivers/staging/lustre/lustre/libcfs/hash.c        |    4 +-
 .../staging/lustre/lustre/libcfs/linux/linux-cpu.c |    6 +-
 .../lustre/lustre/libcfs/linux/linux-curproc.c     |   13 -
 .../lustre/lustre/libcfs/linux/linux-proc.c        |   28 +-
 drivers/staging/lustre/lustre/libcfs/lwt.c         |  266 --
 drivers/staging/lustre/lustre/libcfs/module.c      |   53 +-
 drivers/staging/lustre/lustre/libcfs/nidstrings.c  |   34 +-
 drivers/staging/lustre/lustre/libcfs/tracefile.c   |   22 +-
 drivers/staging/lustre/lustre/llite/file.c         |  416 +-
 .../staging/lustre/lustre/llite/llite_internal.h   |   19 +-
 drivers/staging/lustre/lustre/llite/llite_lib.c    |   36 +
 drivers/staging/lustre/lustre/llite/lloop.c        |    3 +-
 drivers/staging/lustre/lustre/llite/namei.c        |    5 +-
 drivers/staging/lustre/lustre/llite/vvp_io.c       |   54 +-
 drivers/staging/lustre/lustre/lov/lov_io.c         |   15 +-
 drivers/staging/lustre/lustre/lov/lov_pack.c       |   20 +-
 drivers/staging/lustre/lustre/lov/lproc_lov.c      |   36 +-
 drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c   |  760 ----
 drivers/staging/lustre/lustre/mdc/mdc_internal.h   |    2 +-
 drivers/staging/lustre/lustre/mdc/mdc_lib.c        |    7 +-
 drivers/staging/lustre/lustre/mdc/mdc_locks.c      |   49 +-
 drivers/staging/lustre/lustre/mdc/mdc_request.c    |   31 +-
 drivers/staging/lustre/lustre/mgc/mgc_request.c    |    4 +-
 .../lustre/lustre/obdclass/linux/linux-sysctl.c    |   21 +-
 drivers/staging/lustre/lustre/obdclass/llog.c      |    2 +-
 .../staging/lustre/lustre/obdclass/local_storage.c |    2 +-
 .../lustre/lustre/obdclass/lprocfs_status.c        |    4 +-
 drivers/staging/lustre/lustre/obdclass/lu_object.c |   28 +-
 .../staging/lustre/lustre/obdecho/echo_client.c    |    2 +-
 drivers/staging/lustre/lustre/osc/osc_request.c    |    4 -
 drivers/staging/lustre/lustre/ptlrpc/Makefile      |    2 +-
 drivers/staging/lustre/lustre/ptlrpc/client.c      |   25 +-
 drivers/staging/lustre/lustre/ptlrpc/events.c      |   75 +-
 .../staging/lustre/lustre/ptlrpc/gss/gss_asn1.h    |    6 +-
 drivers/staging/lustre/lustre/ptlrpc/gss/gss_err.h |   10 +-
 .../staging/lustre/lustre/ptlrpc/gss/gss_keyring.c |    2 +-
 .../lustre/lustre/ptlrpc/gss/gss_krb5_mech.c       |    2 +-
 drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c |   14 +-
 drivers/staging/lustre/lustre/ptlrpc/import.c      |   38 +-
 drivers/staging/lustre/lustre/ptlrpc/layout.c      |   11 +-
 drivers/staging/lustre/lustre/ptlrpc/llog_client.c |    6 +-
 drivers/staging/lustre/lustre/ptlrpc/llog_server.c |  450 --
 .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c    |   14 +-
 drivers/staging/lustre/lustre/ptlrpc/niobuf.c      |   75 +-
 .../staging/lustre/lustre/ptlrpc/pack_generic.c    |  368 +-
 drivers/staging/lustre/lustre/ptlrpc/pinger.c      |    5 +-
 .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h |   10 +-
 .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c   |    2 +-
 drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c     |    8 +-
 drivers/staging/lustre/lustre/ptlrpc/service.c     |   77 +-
 drivers/staging/lustre/lustre/ptlrpc/wiretest.c    |   18 +-
 drivers/staging/media/davinci_vpfe/dm365_ipipe.c   |    2 +-
 .../staging/media/davinci_vpfe/dm365_ipipe_hw.c    |    4 +-
 drivers/staging/media/go7007/go7007-fw.c           |    3 +-
 drivers/staging/media/go7007/saa7134-go7007.c      |    2 +-
 drivers/staging/media/lirc/lirc_igorplugusb.c      |    4 +-
 drivers/staging/media/lirc/lirc_imon.c             |   11 +-
 drivers/staging/media/lirc/lirc_serial.c           |    6 +-
 drivers/staging/media/lirc/lirc_zilog.c            |    4 +-
 drivers/staging/olpc_dcon/olpc_dcon.c              |    6 +-
 drivers/staging/ozwpan/ozeltbuf.c                  |    2 +-
 drivers/staging/ozwpan/ozproto.c                   |    2 +-
 drivers/staging/rtl8187se/ieee80211/dot11d.c       |  132 +-
 drivers/staging/rtl8187se/ieee80211/dot11d.h       |   66 +-
 drivers/staging/rtl8187se/ieee80211/ieee80211.h    |  125 +-
 .../staging/rtl8187se/ieee80211/ieee80211_crypt.c  |    3 +-
 .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c     |   12 +-
 .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c     |   52 +-
 drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c |   39 +-
 .../rtl8187se/ieee80211/ieee80211_softmac.c        |  134 +-
 .../rtl8187se/ieee80211/ieee80211_softmac_wx.c     |   64 +-
 drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c |   13 +-
 drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c |    8 +-
 drivers/staging/rtl8187se/r8180.h                  |   32 +-
 drivers/staging/rtl8187se/r8180_core.c             |   29 +-
 drivers/staging/rtl8187se/r8180_dm.h               |    2 +-
 drivers/staging/rtl8187se/r8180_rtl8225.h          |    3 +-
 drivers/staging/rtl8187se/r8180_wx.c               |  202 +-
 drivers/staging/rtl8187se/r8185b_init.c            |   17 +-
 drivers/staging/rtl8188eu/core/rtw_io.c            |    2 +-
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c      |    2 +-
 drivers/staging/rtl8188eu/core/rtw_xmit.c          |    2 +-
 drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c  |    2 +-
 drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c    |    2 +-
 drivers/staging/rtl8188eu/os_dep/ioctl_linux.c     |   34 +-
 drivers/staging/rtl8188eu/os_dep/osdep_service.c   |    2 +-
 drivers/staging/rtl8188eu/os_dep/usb_intf.c        |    2 +-
 drivers/staging/rtl8192e/dot11d.c                  |    2 +-
 drivers/staging/rtl8192e/dot11d.h                  |    5 +-
 drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c     |   13 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_cam.c        |    1 -
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c       |   24 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_core.h       |    2 +
 drivers/staging/rtl8192e/rtl819x_BAProc.c          |   10 +-
 drivers/staging/rtl8192e/rtllib_crypt_ccmp.c       |    4 +-
 drivers/staging/rtl8192e/rtllib_crypt_tkip.c       |    6 +-
 drivers/staging/rtl8192e/rtllib_crypt_wep.c        |    4 +-
 drivers/staging/rtl8192e/rtllib_module.c           |    4 +-
 drivers/staging/rtl8192e/rtllib_rx.c               |   74 +-
 drivers/staging/rtl8192e/rtllib_softmac.c          |   28 +-
 drivers/staging/rtl8192e/rtllib_tx.c               |   16 +-
 drivers/staging/rtl8712/rtl871x_mlme.c             |    3 -
 drivers/staging/rts5208/Kconfig                    |   15 +
 drivers/staging/rts5208/Makefile                   |    6 +
 drivers/staging/rts5208/TODO                       |    7 +
 drivers/staging/rts5208/debug.h                    |   43 +
 drivers/staging/rts5208/general.c                  |   35 +
 drivers/staging/rts5208/general.h                  |   31 +
 drivers/staging/rts5208/ms.c                       | 4208 ++++++++++++++++++
 drivers/staging/rts5208/ms.h                       |  227 +
 drivers/staging/rts5208/rtsx.c                     | 1069 +++++
 drivers/staging/rts5208/rtsx.h                     |  186 +
 drivers/staging/rts5208/rtsx_card.c                | 1126 +++++
 drivers/staging/rts5208/rtsx_card.h                | 1098 +++++
 drivers/staging/rts5208/rtsx_chip.c                | 1979 +++++++++
 drivers/staging/rts5208/rtsx_chip.h                | 1002 +++++
 drivers/staging/rts5208/rtsx_scsi.c                | 3370 +++++++++++++++
 drivers/staging/rts5208/rtsx_scsi.h                |  143 +
 drivers/staging/rts5208/rtsx_sys.h                 |   50 +
 drivers/staging/rts5208/rtsx_transport.c           |  769 ++++
 drivers/staging/rts5208/rtsx_transport.h           |   66 +
 drivers/staging/rts5208/sd.c                       | 4525 ++++++++++++++++++++
 drivers/staging/rts5208/sd.h                       |  301 ++
 drivers/staging/rts5208/spi.c                      |  877 ++++
 drivers/staging/rts5208/spi.h                      |   65 +
 drivers/staging/rts5208/trace.h                    |   93 +
 drivers/staging/rts5208/xd.c                       | 2088 +++++++++
 drivers/staging/rts5208/xd.h                       |  188 +
 drivers/staging/silicom/bypasslib/bypass.c         |   14 +-
 drivers/staging/speakup/main.c                     |    2 -
 drivers/staging/speakup/serialio.c                 |    4 +
 drivers/staging/speakup/serialio.h                 |   26 -
 drivers/staging/tidspbridge/pmgr/cmm.c             |    7 +-
 drivers/staging/tidspbridge/pmgr/dbll.c            |   21 +-
 drivers/staging/tidspbridge/pmgr/dev.c             |    6 +-
 drivers/staging/tidspbridge/pmgr/dmm.c             |   20 +-
 drivers/staging/tidspbridge/pmgr/dspapi.c          |   12 +-
 drivers/staging/usbip/stub_rx.c                    |   20 +-
 drivers/staging/usbip/usbip_common.c               |    5 +-
 drivers/staging/usbip/vhci_hcd.c                   |   13 +-
 drivers/staging/vt6655/baseband.c                  |    4 +-
 drivers/staging/vt6655/bssdb.c                     |  354 +-
 drivers/staging/vt6655/card.c                      |   10 +-
 drivers/staging/vt6655/channel.c                   |   16 +-
 drivers/staging/vt6655/datarate.c                  |    8 +-
 drivers/staging/vt6655/device_main.c               |   60 +-
 drivers/staging/vt6655/dpc.c                       |   40 +-
 drivers/staging/vt6655/hostap.c                    |   12 +-
 drivers/staging/vt6655/iwctl.c                     |    2 +-
 drivers/staging/vt6655/key.c                       |   44 +-
 drivers/staging/vt6655/mac.c                       |    4 +-
 drivers/staging/vt6655/power.c                     |    9 +-
 drivers/staging/vt6655/rf.c                        |    2 +-
 drivers/staging/vt6655/rxtx.c                      |   12 +-
 drivers/staging/vt6655/vntwifi.c                   |    6 +-
 drivers/staging/vt6655/wcmd.c                      |   22 +-
 drivers/staging/vt6655/wctl.c                      |    6 +-
 drivers/staging/vt6655/wmgr.c                      |  125 +-
 drivers/staging/vt6655/wpa.c                       |    2 +-
 drivers/staging/vt6655/wpa2.c                      |   18 +-
 drivers/staging/vt6655/wpactl.c                    |   12 +-
 drivers/staging/vt6656/aes_ccmp.c                  |   16 +-
 drivers/staging/vt6656/baseband.c                  |    8 +-
 drivers/staging/vt6656/bssdb.c                     |    4 +-
 drivers/staging/vt6656/card.c                      |    4 +-
 drivers/staging/vt6656/channel.c                   |    3 +-
 drivers/staging/vt6656/datarate.c                  |    2 +-
 drivers/staging/vt6656/desc.h                      |    8 -
 drivers/staging/vt6656/device.h                    |   16 +-
 drivers/staging/vt6656/dpc.c                       |    2 +-
 drivers/staging/vt6656/main_usb.c                  |  543 ++-
 drivers/staging/vt6656/rf.c                        |    7 +-
 drivers/staging/vt6656/rndis.h                     |   30 +-
 drivers/staging/vt6656/rxtx.c                      |  168 +-
 drivers/staging/vt6656/rxtx.h                      |   12 +-
 drivers/staging/vt6656/tkip.c                      |    4 +-
 drivers/staging/vt6656/wcmd.c                      | 1712 ++++----
 drivers/staging/vt6656/wmgr.c                      |   10 +-
 drivers/staging/vt6656/wpa.c                       |   12 +-
 drivers/staging/vt6656/wpa2.c                      |   16 +-
 drivers/staging/winbond/mds.c                      |  101 +-
 drivers/staging/wlags49_h2/sta_h25.c               |    6 +-
 drivers/staging/wlan-ng/cfg80211.c                 |   18 +-
 drivers/staging/wlan-ng/hfa384x.h                  |    4 +-
 drivers/staging/wlan-ng/prism2mgmt.c               |    4 +-
 drivers/staging/wlan-ng/prism2mgmt.h               |    6 +-
 drivers/staging/wlan-ng/prism2mib.c                |    6 +-
 drivers/staging/wlan-ng/prism2sta.c                |    6 +-
 include/linux/hid-sensor-ids.h                     |    8 +
 include/linux/iio/iio.h                            |   81 +-
 351 files changed, 31133 insertions(+), 10906 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/iio/light/tsl2563.txt
 create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/hmc5843.txt
 create mode 100644 drivers/iio/pressure/mpl3115.c
 delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h
 delete mode 100644 drivers/staging/lustre/lustre/include/lu_target.h
 delete mode 100644 drivers/staging/lustre/lustre/include/lustre/liblustreapi.h
 delete mode 100644 drivers/staging/lustre/lustre/include/lustre/lustreapi.h
 delete mode 100644 drivers/staging/lustre/lustre/libcfs/lwt.c
 delete mode 100644 drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c
 delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/llog_server.c
 create mode 100644 drivers/staging/rts5208/Kconfig
 create mode 100644 drivers/staging/rts5208/Makefile
 create mode 100644 drivers/staging/rts5208/TODO
 create mode 100644 drivers/staging/rts5208/debug.h
 create mode 100644 drivers/staging/rts5208/general.c
 create mode 100644 drivers/staging/rts5208/general.h
 create mode 100644 drivers/staging/rts5208/ms.c
 create mode 100644 drivers/staging/rts5208/ms.h
 create mode 100644 drivers/staging/rts5208/rtsx.c
 create mode 100644 drivers/staging/rts5208/rtsx.h
 create mode 100644 drivers/staging/rts5208/rtsx_card.c
 create mode 100644 drivers/staging/rts5208/rtsx_card.h
 create mode 100644 drivers/staging/rts5208/rtsx_chip.c
 create mode 100644 drivers/staging/rts5208/rtsx_chip.h
 create mode 100644 drivers/staging/rts5208/rtsx_scsi.c
 create mode 100644 drivers/staging/rts5208/rtsx_scsi.h
 create mode 100644 drivers/staging/rts5208/rtsx_sys.h
 create mode 100644 drivers/staging/rts5208/rtsx_transport.c
 create mode 100644 drivers/staging/rts5208/rtsx_transport.h
 create mode 100644 drivers/staging/rts5208/sd.c
 create mode 100644 drivers/staging/rts5208/sd.h
 create mode 100644 drivers/staging/rts5208/spi.c
 create mode 100644 drivers/staging/rts5208/spi.h
 create mode 100644 drivers/staging/rts5208/trace.h
 create mode 100644 drivers/staging/rts5208/xd.c
 create mode 100644 drivers/staging/rts5208/xd.h
Merging char-misc/char-misc-next (10ee90743e99 mei: cleanup mei_irq_read_handler)
$ git merge char-misc/char-misc-next
Merge made by the 'recursive' strategy.
 drivers/misc/mei/client.c    |  2 --
 drivers/misc/mei/init.c      | 17 +++++++---
 drivers/misc/mei/interrupt.c | 79 ++++++++++++++++++++++----------------------
 drivers/misc/mei/mei_dev.h   | 13 +++++++-
 drivers/misc/mei/nfc.c       |  6 +++-
 drivers/misc/mei/pci-me.c    |  2 +-
 6 files changed, 70 insertions(+), 49 deletions(-)
Merging scsi/for-next (2aee240c68ed Merge branch 'misc' into for-next)
$ git merge scsi/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging target-updates/for-next (86784c6bdeee iscsi-target: chap auth shouldn't match username with trailing garbage)
$ git merge target-updates/for-next
Already up-to-date.
Merging target-merge/for-next-merge (15c03dd4859a Linux 3.12-rc3)
$ git merge target-merge/for-next-merge
Already up-to-date.
Merging writeback/writeback-for-next (a8855990e382 writeback: Do not sort b_io list only because of block device inode)
$ git merge writeback/writeback-for-next
Already up-to-date.
Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries)
$ git merge hwspinlock/linux-next
Already up-to-date.
Merging pinctrl/for-next (b221209faa58 Merge branch 'devel' into for-next)
$ git merge pinctrl/for-next
Merge made by the 'recursive' strategy.
 .../bindings/pinctrl/fsl,imx25-pinctrl.txt         |  23 ++
 drivers/pinctrl/Kconfig                            |   9 +
 drivers/pinctrl/Makefile                           |   1 +
 drivers/pinctrl/pinctrl-abx500.c                   |   6 +-
 drivers/pinctrl/pinctrl-imx25.c                    | 351 +++++++++++++++++++++
 drivers/pinctrl/pinctrl-rockchip.c                 |   5 +-
 6 files changed, 390 insertions(+), 5 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx25-pinctrl.txt
 create mode 100644 drivers/pinctrl/pinctrl-imx25.c
Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak)
$ git merge vhost/linux-next
Already up-to-date.
Merging remoteproc/for-next (b9777859ec01 remoteproc: fix kconfig dependencies for VIRTIO)
$ git merge remoteproc/for-next
Already up-to-date.
Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO)
$ git merge rpmsg/for-next
Already up-to-date.
Merging gpio/for-next (d46f1531b7c0 Merge branch 'devel' into for-next)
$ git merge gpio/for-next
Merge made by the 'recursive' strategy.
 Documentation/gpio/board.txt                     | 115 +++++++++++++
 Documentation/gpio/consumer.txt                  | 197 +++++++++++++++++++++++
 Documentation/gpio/driver.txt                    |  75 +++++++++
 Documentation/{gpio.txt => gpio/gpio-legacy.txt} |   0
 Documentation/gpio/gpio.txt                      | 119 ++++++++++++++
 Documentation/gpio/sysfs.txt                     | 155 ++++++++++++++++++
 drivers/gpio/gpio-em.c                           |   5 +-
 drivers/gpio/gpio-intel-mid.c                    |   3 +-
 drivers/gpio/gpio-lynxpoint.c                    |   4 +-
 drivers/gpio/gpio-msic.c                         |   7 +-
 drivers/gpio/gpio-msm-v2.c                       |   2 +-
 drivers/gpio/gpio-mvebu.c                        |   2 +-
 drivers/gpio/gpio-omap.c                         | 188 ++++++++++-----------
 drivers/gpio/gpio-pl061.c                        |  10 +-
 drivers/gpio/gpio-rcar.c                         |   7 +-
 drivers/gpio/gpio-tb10x.c                        |   1 +
 drivers/gpio/gpio-timberdale.c                   |   4 +-
 drivers/gpio/gpio-ucb1400.c                      |   1 +
 drivers/gpio/gpiolib.c                           |  58 ++++---
 include/linux/gpio.h                             |   1 -
 include/linux/gpio/driver.h                      |  11 +-
 21 files changed, 818 insertions(+), 147 deletions(-)
 create mode 100644 Documentation/gpio/board.txt
 create mode 100644 Documentation/gpio/consumer.txt
 create mode 100644 Documentation/gpio/driver.txt
 rename Documentation/{gpio.txt => gpio/gpio-legacy.txt} (100%)
 create mode 100644 Documentation/gpio/gpio.txt
 create mode 100644 Documentation/gpio/sysfs.txt
Merging dma-mapping/dma-mapping-next (5e01dc7b26d9 Linux 3.12)
$ git merge dma-mapping/dma-mapping-next
Already up-to-date.
Merging pwm/for-next (1b3f25ce991d Documentation/pwm: Update supported SoC name for pwm-samsung)
$ git merge pwm/for-next
Already up-to-date.
Merging dma-buf/for-next (19e8697ba45e dma-buf: Expose buffer size to userspace (v2))
$ git merge dma-buf/for-next
Already up-to-date.
Merging userns/for-next (41301ae78a99 vfs: Fix a regression in mounting proc)
$ git merge userns/for-next
Merge made by the 'recursive' strategy.
 fs/dcache.c    | 7 ++++++-
 fs/namespace.c | 2 +-
 kernel/fork.c  | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
Merging ktest/for-next (df5f7c66013c ktest: Reset grub menu cache with different machines)
$ git merge ktest/for-next
Already up-to-date.
Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge signal/for-next
Already up-to-date.
Merging clk/clk-next (9ed9c07d9b7d clk: new driver for efm32 SoC)
$ git merge clk/clk-next
Already up-to-date.
Merging random/dev (392a546dc836 random: add debugging code to detect early use of get_random_bytes())
$ git merge random/dev
Already up-to-date.
Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
$ git merge lzo-update/lzo-update
Merge made by the 'recursive' strategy.
 lib/lzo/lzo1x_decompress_safe.c | 4 ++++
 lib/lzo/lzodefs.h               | 6 ++++++
 2 files changed, 10 insertions(+)
Merging arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP support.)
$ git merge arm64-hugepages/for-next/hugepages
Already up-to-date.
Merging aio/master (ddb8c45ba151 aio: nullify aio->ring_pages after freeing it)
$ git merge aio/master
Already up-to-date.
Merging akpm-current/current (6e7ebeb1cb49 lib/decompress_unlz4.c: always set an error return code on failures)
$ git merge --no-ff akpm-current/current
Auto-merging mm/memcontrol.c
Auto-merging lib/Kconfig
Auto-merging kernel/fork.c
Auto-merging include/linux/sched.h
Auto-merging include/linux/blkdev.h
Removing include/asm-generic/int-l64.h
Removing fs/coredump.h
Auto-merging drivers/scsi/sd.c
Auto-merging block/blk-mq.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/DocBook/device-drivers.tmpl  |   2 +-
 Documentation/dynamic-debug-howto.txt      |   9 +
 Documentation/filesystems/proc.txt         |   9 +
 Documentation/filesystems/sysfs.txt        |   6 +-
 Documentation/leds/leds-class.txt          |   3 -
 MAINTAINERS                                |   6 +
 arch/ia64/include/asm/processor.h          |   1 +
 arch/sh/kernel/dwarf.c                     |  18 +-
 arch/um/kernel/sysrq.c                     |   4 +-
 block/blk-mq-cpu.c                         |  37 +---
 block/blk-mq.c                             |  68 +-----
 block/blk-mq.h                             |   1 -
 block/cmdline-parser.c                     | 107 ++++++---
 block/genhd.c                              |   2 +-
 drivers/block/cciss.c                      |   4 +-
 drivers/block/paride/pg.c                  |   2 +-
 drivers/block/sx8.c                        |  16 +-
 drivers/cdrom/gdrom.c                      |   4 +-
 drivers/gpu/drm/cirrus/cirrus_mode.c       |   4 +-
 drivers/gpu/drm/drm_edid_load.c            |   4 +-
 drivers/gpu/drm/drm_fb_helper.c            |   8 +
 drivers/gpu/drm/nouveau/nouveau_acpi.c     |   6 +
 drivers/input/Kconfig                      |   9 +
 drivers/input/Makefile                     |   3 +
 drivers/input/input.c                      |   6 +
 drivers/input/leds.c                       | 247 +++++++++++++++++++++
 drivers/leds/Kconfig                       |   3 -
 drivers/mailbox/omap-mbox.h                |   2 +-
 drivers/memstick/host/rtsx_pci_ms.c        |  30 ++-
 drivers/misc/ti-st/st_core.c               |   2 +-
 drivers/mtd/ubi/attach.c                   |  49 +----
 drivers/mtd/ubi/wl.c                       |  25 +--
 drivers/net/irda/donauboe.c                |  15 +-
 drivers/pps/pps.c                          |  57 ++---
 drivers/rtc/rtc-as3722.c                   |  19 +-
 drivers/rtc/rtc-at91rm9200.c               |   2 +
 drivers/rtc/rtc-at91sam9.c                 |   2 +-
 drivers/rtc/rtc-s5m.c                      |  54 ++---
 drivers/scsi/hpsa.c                        |   2 +-
 drivers/scsi/megaraid/megaraid_mm.c        |   2 +
 drivers/scsi/sd.c                          |   2 +-
 drivers/tty/Kconfig                        |   4 +
 drivers/tty/vt/keyboard.c                  | 110 +++++++---
 drivers/w1/masters/w1-gpio.c               |  22 ++
 drivers/w1/w1_int.c                        |  12 -
 fs/autofs4/autofs_i.h                      |   4 +-
 fs/autofs4/dev-ioctl.c                     |  16 +-
 fs/autofs4/inode.c                         |  36 ++-
 fs/autofs4/waitq.c                         |  16 +-
 fs/binfmt_elf.c                            |  21 +-
 fs/coredump.c                              |   1 -
 fs/coredump.h                              |   6 -
 fs/exec.c                                  | 115 ++--------
 fs/ext3/dir.c                              |  36 +--
 fs/ext4/block_validity.c                   |  33 +--
 fs/ext4/dir.c                              |  35 +--
 fs/fat/cache.c                             |  25 ++-
 fs/fat/fat.h                               |   3 +-
 fs/fat/file.c                              |  91 +++++++-
 fs/fat/inode.c                             |  35 ++-
 fs/jffs2/nodelist.c                        |  28 +--
 fs/jffs2/readinode.c                       |  26 +--
 fs/ocfs2/alloc.c                           |  40 +++-
 fs/ocfs2/cluster/tcp.c                     |  13 +-
 fs/ocfs2/file.c                            |  60 +++--
 fs/ocfs2/localalloc.c                      |  40 ++++
 fs/ocfs2/localalloc.h                      |   6 +
 fs/ocfs2/namei.c                           |  12 +-
 fs/posix_acl.c                             |  84 ++++++-
 fs/proc/array.c                            |  18 +-
 fs/proc/base.c                             |  69 +++---
 fs/proc/meminfo.c                          |  37 ++++
 fs/ramfs/file-mmu.c                        |   7 -
 fs/ramfs/file-nommu.c                      |  17 +-
 fs/ramfs/inode.c                           |   7 +
 fs/ramfs/internal.h                        |   1 -
 fs/ubifs/debug.c                           |  22 +-
 fs/ubifs/log.c                             |  21 +-
 fs/ubifs/orphan.c                          |  21 +-
 fs/ubifs/recovery.c                        |  21 +-
 fs/ubifs/super.c                           |  24 +-
 fs/ubifs/tnc.c                             |  22 +-
 fs/xfs/xfs_ioctl.c                         |   3 +-
 fs/xfs/xfs_ioctl32.c                       |   3 +-
 include/asm-generic/int-l64.h              |  49 -----
 include/linux/blkdev.h                     |   5 +-
 include/linux/cache.h                      |   4 +-
 include/linux/cmdline-parser.h             |   8 +-
 include/linux/crc64_ecma.h                 |  56 +++++
 include/linux/huge_mm.h                    |  23 ++
 include/linux/hugetlb.h                    |  12 +-
 include/linux/input.h                      |  21 ++
 include/linux/kthread.h                    |   1 +
 include/linux/mm.h                         |  41 +++-
 include/linux/mmzone.h                     |   6 +
 include/linux/page-flags.h                 |   4 +-
 include/linux/parser.h                     |   1 +
 include/linux/posix_acl.h                  |  78 +------
 include/linux/printk.h                     |  19 +-
 include/linux/ramfs.h                      |   7 -
 include/linux/reboot.h                     |   1 +
 include/linux/sched.h                      |  29 ++-
 include/linux/smp.h                        |   6 +-
 include/linux/w1-gpio.h                    |   1 +
 include/uapi/asm-generic/types.h           |   3 +-
 init/main.c                                |   6 +-
 kernel/fork.c                              |   5 +-
 kernel/kexec.c                             |   3 +-
 kernel/kmod.c                              |  11 +-
 kernel/kthread.c                           |   9 +
 kernel/params.c                            |  25 +--
 kernel/reboot.c                            |   2 +-
 kernel/signal.c                            |   7 +-
 kernel/smp.c                               |  51 ++---
 kernel/sys.c                               |   8 +-
 kernel/time/sched_clock.c                  |   4 +
 kernel/watchdog.c                          |  10 +-
 lib/Kconfig                                |   7 +
 lib/Makefile                               |   1 +
 lib/cmdline.c                              |  14 +-
 lib/crc64_ecma.c                           | 341 +++++++++++++++++++++++++++++
 lib/decompress_unlz4.c                     |   1 +
 lib/dma-debug.c                            |   7 +
 lib/dynamic_debug.c                        |  15 +-
 lib/kstrtox.c                              |   1 -
 lib/parser.c                               |  62 +++++-
 lib/rbtree_test.c                          |  13 +-
 mm/hugetlb.c                               |  36 +--
 mm/internal.h                              |   3 +-
 mm/memcontrol.c                            |  23 +-
 mm/memory-failure.c                        |   2 +-
 mm/memory.c                                |  11 +-
 mm/page_alloc.c                            |  13 ++
 mm/swap.c                                  | 278 ++++++++++++-----------
 mm/swap_state.c                            |  63 +++++-
 mm/swapfile.c                              |  20 +-
 net/netfilter/ipset/ip_set_hash_netiface.c |  27 +--
 scripts/checkpatch.pl                      |   9 +
 scripts/get_maintainer.pl                  |  91 +++++++-
 139 files changed, 2309 insertions(+), 1320 deletions(-)
 create mode 100644 drivers/input/leds.c
 delete mode 100644 fs/coredump.h
 delete mode 100644 include/asm-generic/int-l64.h
 create mode 100644 include/linux/crc64_ecma.h
 create mode 100644 lib/crc64_ecma.c
$ git clone -s -l -n -q . ../rebase-tmp
$ cd ../rebase-tmp
$ git checkout -b akpm remotes/origin/akpm/master
Switched to a new branch 'akpm'
$ git rebase --onto master remotes/origin/akpm/master-base
First, rewinding head to replay your work on top of it...
Applying: mm: add strictlimit knob
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
 + cc0af2d10e70...bee1070cd449 akpm       -> akpm/master  (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (bee1070cd449 mm: add strictlimit knob)
$ git merge --no-ff akpm/master
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-class-bdi |  8 +++++++
 mm/backing-dev.c                          | 35 +++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)