path: root/Next/merge.log

$ date
Friday 5 July  10:21:05 EST 2013
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 7f0ef02 Merge branch 'akpm' (updates from Andrew Morton)
Merging origin/master (74b9272 Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux)
$ git merge --no-ff origin/master
Removing sound/soc/pxa/tavorevb3.c
Removing sound/soc/pxa/saarb.c
Removing sound/soc/fsl/imx-pcm.c
Removing sound/soc/davinci/davinci-sffsdr.c
Auto-merging sound/soc/codecs/spdif_transmitter.c
Auto-merging sound/soc/codecs/hdmi.c
Auto-merging sound/soc/codecs/bt-sco.c
Removing sound/soc/blackfin/bf5xx-tdm.h
Removing sound/soc/blackfin/bf5xx-tdm.c
Removing sound/soc/blackfin/bf5xx-tdm-pcm.h
Removing sound/soc/blackfin/bf5xx-tdm-pcm.c
Removing sound/soc/blackfin/bf5xx-ac97-pcm.h
Removing drivers/s390/scsi/zfcp_cfdc.c
Removing drivers/i2c/busses/i2c-intel-mid.c
Removing drivers/hid/hid-wiimote-ext.c
Removing drivers/hid/hid-ps3remote.c
Auto-merging arch/powerpc/kernel/eeh_sysfs.c
Auto-merging arch/powerpc/kernel/eeh_pe.c
Auto-merging arch/powerpc/kernel/eeh_event.c
Auto-merging arch/powerpc/kernel/eeh_driver.c
Auto-merging arch/powerpc/kernel/eeh_cache.c
Auto-merging arch/powerpc/kernel/eeh.c
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-driver-hid-wiimote |   39 +-
 Documentation/DocBook/drm.tmpl                     |    6 +-
 Documentation/DocBook/media/dvb/frontend.xml       |    2 +-
 Documentation/DocBook/media/v4l/controls.xml       |    2 +-
 Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml  |    2 +-
 Documentation/DocBook/writing_usb_driver.tmpl      |    2 +-
 Documentation/arm/IXP4xx                           |    2 +-
 Documentation/bcache.txt                           |   10 +-
 Documentation/block/queue-sysfs.txt                |    2 +-
 Documentation/cgroups/memory.txt                   |    6 +-
 Documentation/clk.txt                              |    2 +-
 Documentation/device-mapper/cache.txt              |    2 +-
 Documentation/device-mapper/dm-raid.txt            |    2 +
 .../bindings/arm/samsung/interrupt-combiner.txt    |    6 +-
 .../devicetree/bindings/arm/spear/shirq.txt        |    2 +-
 .../devicetree/bindings/ata/ahci-platform.txt      |    5 +
 .../devicetree/bindings/clock/silabs,si5351.txt    |    2 +-
 Documentation/devicetree/bindings/hwmon/g762.txt   |   47 +
 .../devicetree/bindings/i2c/i2c-designware.txt     |   15 +
 .../devicetree/bindings/i2c/i2c-mv64xxx.txt        |    6 +-
 .../devicetree/bindings/i2c/i2c-vt8500.txt         |   24 +
 Documentation/devicetree/bindings/i2c/ina2xx.txt   |   22 +
 .../devicetree/bindings/input/pxa27x-keypad.txt    |   60 +
 .../devicetree/bindings/input/samsung-keypad.txt   |   24 +-
 .../devicetree/bindings/input/ti,nspire-keypad.txt |   60 +
 .../devicetree/bindings/leds/leds-lp55xx.txt       |  147 +
 Documentation/devicetree/bindings/mfd/arizona.txt  |   62 +
 Documentation/devicetree/bindings/mfd/palmas.txt   |   49 +
 .../devicetree/bindings/mmc/synopsis-dw-mshc.txt   |    2 +-
 .../devicetree/bindings/powerpc/4xx/emac.txt       |    2 +-
 .../bindings/powerpc/fsl/interlaken-lac.txt        |  309 ++
 .../devicetree/bindings/regulator/palmas-pmic.txt  |   72 +
 .../devicetree/bindings/serio/olpc,ap-sp.txt       |   13 +
 .../devicetree/bindings/sound/adi,adau1701.txt     |   35 +
 .../devicetree/bindings/sound/imx-audio-wm8962.txt |   46 +
 .../devicetree/bindings/sound/mxs-saif.txt         |   17 +-
 .../bindings/sound/nvidia,tegra-audio-rt5640.txt   |   71 +
 Documentation/devicetree/bindings/sound/rt5640.txt |   30 +
 .../devicetree/bindings/sound/sgtl5000.txt         |    3 +
 .../devicetree/bindings/sound/spdif-receiver.txt   |   10 +
 .../bindings/sound/spdif-transmitter.txt           |   10 +
 .../devicetree/bindings/sound/ssm2518.txt          |   20 +
 .../devicetree/bindings/sound/ti,tas5086.txt       |   11 +
 Documentation/devicetree/bindings/sound/wm8962.txt |   23 +
 .../devicetree/bindings/spi/brcm,bcm2835-spi.txt   |    2 +-
 .../bindings/timer/samsung,exynos4210-mct.txt      |    2 +-
 .../devicetree/bindings/ufs/ufshcd-pltfrm.txt      |   16 +
 .../devicetree/bindings/usb/am33xx-usb.txt         |    2 +-
 Documentation/devicetree/bindings/usb/omap-usb.txt |    2 +-
 Documentation/devicetree/usage-model.txt           |   11 +-
 Documentation/dynamic-debug-howto.txt              |    2 +-
 Documentation/early-userspace/README               |    2 +-
 Documentation/fb/cirrusfb.txt                      |    2 +-
 Documentation/filesystems/jfs.txt                  |    2 +-
 Documentation/filesystems/qnx6.txt                 |    2 +-
 Documentation/filesystems/vfat.txt                 |    2 +-
 Documentation/hwmon/ds1621                         |  144 +-
 Documentation/hwmon/g762                           |   65 +
 Documentation/hwmon/ina2xx                         |    4 +-
 Documentation/i2c/busses/i2c-i801                  |    1 +
 Documentation/input/multi-touch-protocol.txt       |    2 +
 Documentation/kdump/kdump.txt                      |    8 -
 Documentation/kernel-doc-nano-HOWTO.txt            |   11 +-
 Documentation/kernel-parameters.txt                |    2 +
 Documentation/kernel-per-CPU-kthreads.txt          |    2 +-
 Documentation/laptops/dslm.c                       |    2 +-
 Documentation/md.txt                               |   13 +-
 Documentation/media-framework.txt                  |    2 +-
 Documentation/metag/kernel-ABI.txt                 |    2 +-
 Documentation/misc-devices/mei/mei.txt             |    2 +-
 Documentation/networking/ieee802154.txt            |    2 +-
 Documentation/networking/ip-sysctl.txt             |    2 +-
 Documentation/networking/netlink_mmap.txt          |   12 +-
 Documentation/pinctrl.txt                          |    2 +-
 Documentation/powerpc/00-INDEX                     |    2 +
 Documentation/powerpc/pmu-ebb.txt                  |  137 +
 Documentation/scsi/ChangeLog.megaraid_sas          |   22 +
 Documentation/sound/alsa/HD-Audio-Models.txt       |   40 +-
 Documentation/sysctl/net.txt                       |    6 +-
 Documentation/thermal/exynos_thermal_emulation     |    2 +-
 Documentation/vfio.txt                             |   63 +
 Documentation/video4linux/si476x.txt               |    2 +-
 Documentation/video4linux/soc-camera.txt           |    2 +-
 Documentation/virtual/kvm/api.txt                  |    8 +-
 Documentation/vm/pagemap.txt                       |    2 +-
 Documentation/w1/slaves/w1_ds28e04                 |    2 +-
 MAINTAINERS                                        |   16 +-
 Makefile                                           |    2 +-
 arch/arc/Kconfig                                   |    1 +
 arch/arc/Kconfig.debug                             |    7 -
 arch/arc/boot/dts/abilis_tb100_dvk.dts             |   10 +-
 arch/arc/boot/dts/abilis_tb101_dvk.dts             |   10 +-
 arch/arm/boot/dts/ecx-common.dtsi                  |    2 +
 arch/arm/boot/dts/omap3-devkit8000.dts             |   29 +-
 arch/arm/mach-davinci/board-da850-evm.c            |    1 -
 arch/arm/mach-imx/mach-mx31moboard.c               |    9 +-
 arch/arm/mach-mmp/aspenite.c                       |   10 +-
 arch/arm/mach-mmp/teton_bga.c                      |    8 +-
 arch/arm/mach-pxa/em-x270.c                        |   20 +-
 arch/arm/mach-pxa/ezx.c                            |   60 +-
 arch/arm/mach-pxa/littleton.c                      |   10 +-
 arch/arm/mach-pxa/mainstone.c                      |   10 +-
 arch/arm/mach-pxa/mioa701.c                        |   11 +-
 arch/arm/mach-pxa/palmld.c                         |   10 +-
 arch/arm/mach-pxa/palmt5.c                         |   10 +-
 arch/arm/mach-pxa/palmtreo.c                       |   23 +-
 arch/arm/mach-pxa/palmtx.c                         |   10 +-
 arch/arm/mach-pxa/palmz72.c                        |   10 +-
 arch/arm/mach-pxa/tavorevb.c                       |   10 +-
 arch/arm/mach-pxa/z2.c                             |   10 +-
 arch/arm/mach-pxa/zylonite.c                       |   10 +-
 arch/blackfin/Kconfig                              |    1 +
 arch/blackfin/Kconfig.debug                        |    7 -
 arch/blackfin/mach-bf527/boards/ad7160eval.c       |   12 -
 arch/blackfin/mach-bf527/boards/ezkit.c            |   32 +-
 arch/blackfin/mach-bf533/boards/ezkit.c            |   12 -
 arch/blackfin/mach-bf533/boards/stamp.c            |   35 +-
 arch/blackfin/mach-bf537/boards/stamp.c            |   30 +-
 arch/blackfin/mach-bf548/boards/ezkit.c            |   28 +-
 arch/blackfin/mach-bf561/boards/ezkit.c            |   14 +-
 arch/blackfin/mach-bf609/boards/ezkit.c            |    2 +-
 arch/frv/Kconfig                                   |    1 +
 arch/frv/Kconfig.debug                             |    4 -
 arch/frv/kernel/pm.c                               |    8 +-
 arch/frv/kernel/sysctl.c                           |    4 +-
 arch/m32r/Kconfig                                  |    1 +
 arch/m32r/Kconfig.debug                            |    7 -
 arch/metag/Kconfig                                 |    1 +
 arch/metag/Kconfig.debug                           |    7 -
 arch/mips/Kconfig                                  |    1 +
 arch/mips/Kconfig.debug                            |    9 -
 arch/mn10300/Kconfig                               |    1 +
 arch/mn10300/Kconfig.debug                         |    4 -
 arch/openrisc/Kconfig                              |   11 +-
 arch/parisc/Kconfig                                |    1 +
 arch/parisc/Kconfig.debug                          |   11 -
 arch/powerpc/Kconfig                               |   18 +-
 arch/powerpc/Kconfig.debug                         |   14 +-
 arch/powerpc/boot/dts/currituck.dts                |    5 +
 .../boot/dts/fsl/interlaken-lac-portals.dtsi       |  156 +
 arch/powerpc/boot/dts/fsl/interlaken-lac.dtsi      |   45 +
 arch/powerpc/configs/c2k_defconfig                 |    2 +
 arch/powerpc/configs/g5_defconfig                  |    2 +
 arch/powerpc/configs/maple_defconfig               |    2 +
 arch/powerpc/configs/mpc512x_defconfig             |   27 +-
 arch/powerpc/configs/mpc85xx_smp_defconfig         |    1 +
 arch/powerpc/configs/pmac32_defconfig              |    2 +
 arch/powerpc/configs/ppc64_defconfig               |    2 +
 arch/powerpc/configs/ppc6xx_defconfig              |    2 +
 arch/powerpc/configs/pseries_defconfig             |    1 +
 arch/powerpc/include/asm/eeh.h                     |   36 +-
 arch/powerpc/include/asm/eeh_event.h               |    2 +
 arch/powerpc/include/asm/exception-64s.h           |    8 +-
 arch/powerpc/include/asm/hugetlb.h                 |    8 +-
 arch/powerpc/include/asm/ibmebus.h                 |    4 +-
 arch/powerpc/include/asm/iommu.h                   |   33 +-
 arch/powerpc/include/asm/kvm_book3s_64.h           |   58 +-
 arch/powerpc/include/asm/lppaca.h                  |    3 +-
 arch/powerpc/include/asm/machdep.h                 |   11 +-
 arch/powerpc/include/asm/mmu-hash64.h              |   14 +
 arch/powerpc/include/asm/mpc5121.h                 |    1 -
 arch/powerpc/include/asm/mpic.h                    |    5 +
 arch/powerpc/include/asm/mpic_timer.h              |   46 +
 arch/powerpc/include/asm/opal.h                    |  140 +-
 arch/powerpc/include/asm/perf_event_server.h       |    6 +
 arch/powerpc/include/asm/pgalloc-64.h              |    6 +-
 arch/powerpc/include/asm/pgtable-ppc64-64k.h       |    3 +-
 arch/powerpc/include/asm/pgtable-ppc64.h           |  241 +-
 arch/powerpc/include/asm/pgtable.h                 |    6 +
 arch/powerpc/include/asm/probes.h                  |   25 +
 arch/powerpc/include/asm/processor.h               |   16 +-
 arch/powerpc/include/asm/reg.h                     |    9 +
 arch/powerpc/include/asm/rtas.h                    |    4 +-
 arch/powerpc/include/asm/switch_to.h               |   14 +
 arch/powerpc/include/asm/tlbflush.h                |    3 +-
 arch/powerpc/include/asm/vdso.h                    |    2 +-
 arch/powerpc/kernel/Makefile                       |    4 +-
 arch/powerpc/kernel/asm-offsets.c                  |    7 +-
 arch/powerpc/kernel/cacheinfo.c                    |   36 +-
 arch/powerpc/{platforms/pseries => kernel}/eeh.c   |  196 +-
 .../{platforms/pseries => kernel}/eeh_cache.c      |    5 +-
 .../{platforms/pseries => kernel}/eeh_dev.c        |    0
 .../{platforms/pseries => kernel}/eeh_driver.c     |  169 +-
 .../{platforms/pseries => kernel}/eeh_event.c      |  134 +-
 .../powerpc/{platforms/pseries => kernel}/eeh_pe.c |  237 +-
 .../{platforms/pseries => kernel}/eeh_sysfs.c      |    1 -
 arch/powerpc/kernel/entry_64.S                     |   30 +-
 arch/powerpc/kernel/exceptions-64s.S               |   56 +-
 arch/powerpc/kernel/hw_breakpoint.c                |    3 +-
 arch/powerpc/kernel/ibmebus.c                      |   22 +-
 arch/powerpc/kernel/idle.c                         |    4 +-
 arch/powerpc/kernel/io-workarounds.c               |   11 +-
 arch/powerpc/kernel/iommu.c                        |  323 ++
 arch/powerpc/kernel/irq.c                          |    2 -
 arch/powerpc/kernel/kprobes.c                      |   20 +-
 arch/powerpc/kernel/nvram_64.c                     |   20 +-
 arch/powerpc/kernel/pci-hotplug.c                  |  111 +
 arch/powerpc/kernel/process.c                      |    4 +
 arch/powerpc/kernel/prom.c                         |   42 +-
 arch/powerpc/kernel/ptrace.c                       |    4 +-
 arch/powerpc/kernel/reloc_32.S                     |    3 +-
 arch/powerpc/kernel/rtas.c                         |    4 +-
 arch/powerpc/kernel/setup_64.c                     |    2 +-
 arch/powerpc/kernel/signal_32.c                    |   70 +-
 arch/powerpc/kernel/signal_64.c                    |    8 +-
 arch/powerpc/kernel/smp.c                          |   12 +-
 arch/powerpc/kernel/sysfs.c                        |    6 +-
 arch/powerpc/kernel/time.c                         |    1 -
 arch/powerpc/kernel/tm.S                           |   18 +-
 arch/powerpc/kernel/traps.c                        |   79 +-
 arch/powerpc/kernel/udbg.c                         |    2 +-
 arch/powerpc/kernel/vdso.c                         |    2 +-
 arch/powerpc/kvm/book3s_64_mmu_host.c              |    2 +-
 arch/powerpc/kvm/book3s_64_mmu_hv.c                |    8 +-
 arch/powerpc/kvm/book3s_hv_rm_mmu.c                |   14 +-
 arch/powerpc/lib/sstep.c                           |    2 +-
 arch/powerpc/math-emu/Makefile                     |    3 +-
 arch/powerpc/math-emu/fre.c                        |   11 +
 arch/powerpc/math-emu/frsqrtes.c                   |   11 +
 arch/powerpc/math-emu/math.c                       |   14 +-
 arch/powerpc/mm/44x_mmu.c                          |    6 +-
 arch/powerpc/mm/Makefile                           |    8 +-
 arch/powerpc/mm/gup.c                              |   18 +-
 arch/powerpc/mm/hash_low_64.S                      |   21 +-
 arch/powerpc/mm/hash_native_64.c                   |  195 +-
 arch/powerpc/mm/hash_utils_64.c                    |   67 +-
 arch/powerpc/mm/hugepage-hash64.c                  |  175 +
 arch/powerpc/mm/hugetlbpage-hash64.c               |    2 +-
 arch/powerpc/mm/hugetlbpage.c                      |  299 +-
 arch/powerpc/mm/init_64.c                          |    9 +-
 arch/powerpc/mm/mem.c                              |    4 +
 arch/powerpc/mm/{mmap_64.c => mmap.c}              |    0
 arch/powerpc/mm/mmu_context_nohash.c               |   15 +-
 arch/powerpc/mm/numa.c                             |   12 +-
 arch/powerpc/mm/pgtable.c                          |    8 +
 arch/powerpc/mm/pgtable_64.c                       |  414 ++
 arch/powerpc/mm/subpage-prot.c                     |   48 +
 arch/powerpc/mm/tlb_hash64.c                       |   36 +-
 arch/powerpc/mm/tlb_nohash.c                       |    2 +-
 arch/powerpc/perf/core-book3s.c                    |  201 +-
 arch/powerpc/perf/power8-pmu.c                     |   62 +-
 arch/powerpc/platforms/44x/currituck.c             |   43 +-
 arch/powerpc/platforms/44x/iss4xx.c                |    4 +-
 arch/powerpc/platforms/512x/mpc5121_ads.c          |    6 +-
 arch/powerpc/platforms/512x/mpc512x.h              |   12 +-
 arch/powerpc/platforms/512x/mpc512x_generic.c      |    4 +-
 arch/powerpc/platforms/512x/mpc512x_shared.c       |   31 +-
 arch/powerpc/platforms/512x/pdm360ng.c             |    4 +-
 arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c     |   12 +-
 arch/powerpc/platforms/85xx/p5020_ds.c             |    5 -
 arch/powerpc/platforms/85xx/p5040_ds.c             |    5 -
 arch/powerpc/platforms/85xx/smp.c                  |    6 +-
 arch/powerpc/platforms/85xx/t4240_qds.c            |    5 -
 arch/powerpc/platforms/8xx/m8xx_setup.c            |   14 +-
 arch/powerpc/platforms/Kconfig                     |   26 +
 arch/powerpc/platforms/Kconfig.cputype             |    1 +
 arch/powerpc/platforms/cell/beat_htab.c            |   16 +-
 arch/powerpc/platforms/cell/smp.c                  |    2 +-
 arch/powerpc/platforms/powermac/smp.c              |    2 +-
 arch/powerpc/platforms/powernv/Makefile            |    1 +
 arch/powerpc/platforms/powernv/eeh-ioda.c          |  916 ++++
 arch/powerpc/platforms/powernv/eeh-powernv.c       |  379 ++
 arch/powerpc/platforms/powernv/opal-wrappers.S     |    3 +
 arch/powerpc/platforms/powernv/opal.c              |   69 +-
 arch/powerpc/platforms/powernv/pci-ioda.c          |   62 +-
 arch/powerpc/platforms/powernv/pci-p5ioc2.c        |   11 +-
 arch/powerpc/platforms/powernv/pci.c               |  139 +-
 arch/powerpc/platforms/powernv/pci.h               |   35 +
 arch/powerpc/platforms/powernv/setup.c             |    4 +
 arch/powerpc/platforms/powernv/smp.c               |    4 +-
 arch/powerpc/platforms/ps3/htab.c                  |    5 +-
 arch/powerpc/platforms/pseries/Kconfig             |    5 -
 arch/powerpc/platforms/pseries/Makefile            |    4 +-
 arch/powerpc/platforms/pseries/io_event_irq.c      |    2 +-
 arch/powerpc/platforms/pseries/iommu.c             |    4 +
 arch/powerpc/platforms/pseries/lpar.c              |  142 +-
 arch/powerpc/platforms/pseries/nvram.c             |  554 ++-
 arch/powerpc/platforms/pseries/pci_dlpar.c         |   85 -
 arch/powerpc/platforms/pseries/ras.c               |    8 +-
 arch/powerpc/platforms/pseries/smp.c               |    2 +-
 arch/powerpc/relocs_check.pl                       |   10 +-
 arch/powerpc/sysdev/Makefile                       |    2 +
 arch/powerpc/sysdev/cpm1.c                         |    1 +
 arch/powerpc/sysdev/fsl_mpic_timer_wakeup.c        |  161 +
 arch/powerpc/sysdev/mpic.c                         |   58 +-
 arch/powerpc/sysdev/mpic_timer.c                   |  593 +++
 arch/s390/include/asm/pgtable.h                    |    5 +-
 arch/s390/mm/pgtable.c                             |    5 +-
 arch/sparc/include/asm/pgtable_64.h                |    5 +-
 arch/sparc/mm/tlb.c                                |    5 +-
 arch/tile/Kconfig                                  |    1 +
 arch/tile/Kconfig.debug                            |    7 -
 arch/x86/Kconfig                                   |    1 +
 arch/x86/Kconfig.debug                             |   10 -
 arch/x86/kernel/cpu/powerflags.c                   |    8 +-
 drivers/acpi/apei/erst.c                           |    4 +-
 drivers/ata/Kconfig                                |    1 -
 drivers/ata/acard-ahci.c                           |    4 +-
 drivers/ata/ahci.c                                 |   11 +-
 drivers/ata/ahci.h                                 |    2 +
 drivers/ata/ahci_platform.c                        |    1 +
 drivers/ata/ata_piix.c                             |    8 +-
 drivers/ata/libahci.c                              |   26 +-
 drivers/ata/libata-core.c                          |    9 +-
 drivers/ata/libata-pmp.c                           |   33 +-
 drivers/ata/libata-scsi.c                          |   37 +-
 drivers/ata/libata-transport.c                     |    4 +-
 drivers/ata/libata-zpodd.c                         |    7 +-
 drivers/ata/pata_ali.c                             |    2 +-
 drivers/ata/pata_amd.c                             |    2 +-
 drivers/ata/pata_arasan_cf.c                       |    2 +-
 drivers/ata/pata_artop.c                           |    2 +-
 drivers/ata/pata_at91.c                            |    2 +-
 drivers/ata/pata_atp867x.c                         |    2 +-
 drivers/ata/pata_bf54x.c                           |   10 +-
 drivers/ata/pata_cmd640.c                          |    2 +-
 drivers/ata/pata_cmd64x.c                          |    2 +-
 drivers/ata/pata_cs5520.c                          |    4 +-
 drivers/ata/pata_cs5530.c                          |    2 +-
 drivers/ata/pata_hpt366.c                          |    2 +-
 drivers/ata/pata_hpt3x3.c                          |    2 +-
 drivers/ata/pata_imx.c                             |    2 +-
 drivers/ata/pata_it821x.c                          |    2 +-
 drivers/ata/pata_macio.c                           |    6 +-
 drivers/ata/pata_mpc52xx.c                         |    4 +-
 drivers/ata/pata_ninja32.c                         |    2 +-
 drivers/ata/pata_ns87415.c                         |    2 +-
 drivers/ata/pata_pdc2027x.c                        |    2 +-
 drivers/ata/pata_pxa.c                             |    2 +-
 drivers/ata/pata_rdc.c                             |    2 +-
 drivers/ata/pata_rz1000.c                          |    2 +-
 drivers/ata/pata_serverworks.c                     |    2 +-
 drivers/ata/pata_sil680.c                          |    2 +-
 drivers/ata/pata_sis.c                             |    2 +-
 drivers/ata/pata_sl82c105.c                        |    2 +-
 drivers/ata/pata_triflex.c                         |    2 +-
 drivers/ata/pata_via.c                             |    2 +-
 drivers/ata/sata_fsl.c                             |   14 +-
 drivers/ata/sata_highbank.c                        |  181 +-
 drivers/ata/sata_inic162x.c                        |    2 +-
 drivers/ata/sata_nv.c                              |    2 +-
 drivers/ata/sata_rcar.c                            |  138 +-
 drivers/ata/sata_sil.c                             |    2 +-
 drivers/ata/sata_sil24.c                           |    2 +-
 drivers/base/platform.c                            |    3 -
 drivers/cpufreq/s3c2416-cpufreq.c                  |    2 +-
 drivers/firmware/efi/efi-pstore.c                  |    2 +-
 drivers/gpu/drm/drm_fb_cma_helper.c                |    4 +-
 drivers/gpu/drm/radeon/radeon_fb.c                 |    2 +-
 drivers/hid/Kconfig                                |   63 +-
 drivers/hid/Makefile                               |    9 +-
 drivers/hid/hid-apple.c                            |    6 +
 drivers/hid/hid-core.c                             |   18 +-
 drivers/hid/hid-elo.c                              |  273 ++
 drivers/hid/hid-holtek-mouse.c                     |   77 +
 drivers/hid/hid-huion.c                            |  177 +
 drivers/hid/hid-hyperv.c                           |    4 +-
 drivers/hid/hid-ids.h                              |   25 +-
 drivers/hid/hid-input.c                            |   11 +-
 drivers/hid/hid-kye.c                              |   21 +
 drivers/hid/hid-multitouch.c                       |   34 +-
 drivers/hid/hid-ps3remote.c                        |  204 -
 drivers/hid/hid-roccat.c                           |   16 +-
 drivers/hid/hid-sony.c                             |  473 ++-
 drivers/hid/hid-wacom.c                            |   14 +-
 drivers/hid/hid-wiimote-core.c                     | 1658 +++++---
 drivers/hid/hid-wiimote-debug.c                    |   14 +-
 drivers/hid/hid-wiimote-ext.c                      |  849 ----
 drivers/hid/hid-wiimote-modules.c                  | 2086 +++++++++
 drivers/hid/hid-wiimote.h                          |  217 +-
 drivers/hid/i2c-hid/i2c-hid.c                      |   20 +-
 drivers/hwmon/Kconfig                              |   21 +-
 drivers/hwmon/Makefile                             |    1 +
 drivers/hwmon/abituguru3.c                         |    1 -
 drivers/hwmon/adm1021.c                            |   32 +-
 drivers/hwmon/coretemp.c                           |    2 -
 drivers/hwmon/ds1621.c                             |  226 +-
 drivers/hwmon/g762.c                               | 1149 +++++
 drivers/hwmon/i5k_amb.c                            |    2 -
 drivers/hwmon/iio_hwmon.c                          |    1 +
 drivers/hwmon/ina2xx.c                             |    5 +
 drivers/hwmon/nct6775.c                            |   92 +-
 drivers/hwmon/ntc_thermistor.c                     |    1 -
 drivers/hwmon/w83627ehf.c                          |    2 -
 drivers/i2c/busses/Kconfig                         |   34 +-
 drivers/i2c/busses/Makefile                        |    3 +-
 drivers/i2c/busses/i2c-bfin-twi.c                  |   47 +-
 drivers/i2c/busses/i2c-cpm.c                       |   12 +-
 drivers/i2c/busses/i2c-davinci.c                   |    8 +-
 drivers/i2c/busses/i2c-designware-core.c           |   30 +-
 drivers/i2c/busses/i2c-designware-core.h           |    1 +
 drivers/i2c/busses/i2c-designware-platdrv.c        |   19 +-
 drivers/i2c/busses/i2c-i801.c                      |    3 +
 drivers/i2c/busses/i2c-ibm_iic.c                   |    4 +-
 drivers/i2c/busses/i2c-imx.c                       |   15 +-
 drivers/i2c/busses/i2c-intel-mid.c                 | 1121 -----
 drivers/i2c/busses/i2c-iop3xx.c                    |    2 +-
 drivers/i2c/busses/i2c-kempld.c                    |  410 ++
 drivers/i2c/busses/i2c-mpc.c                       |    4 +-
 drivers/i2c/busses/i2c-mv64xxx.c                   |  321 +-
 drivers/i2c/busses/i2c-mxs.c                       |    6 -
 drivers/i2c/busses/i2c-nomadik.c                   |   52 +-
 drivers/i2c/busses/i2c-omap.c                      |   23 +-
 drivers/i2c/busses/i2c-pxa.c                       |    6 +-
 drivers/i2c/busses/i2c-rcar.c                      |    7 +-
 drivers/i2c/busses/i2c-wmt.c                       |  479 +++
 drivers/infiniband/hw/ehca/ehca_main.c             |    5 +-
 drivers/infiniband/ulp/isert/ib_isert.c            |    2 +-
 drivers/input/evdev.c                              |  133 +-
 drivers/input/keyboard/Kconfig                     |   11 +
 drivers/input/keyboard/Makefile                    |    1 +
 drivers/input/keyboard/amikbd.c                    |    1 -
 drivers/input/keyboard/bf54x-keys.c                |    2 -
 drivers/input/keyboard/davinci_keyscan.c           |    2 -
 drivers/input/keyboard/ep93xx_keypad.c             |    7 +-
 drivers/input/keyboard/gpio_keys.c                 |    1 -
 drivers/input/keyboard/gpio_keys_polled.c          |    2 -
 drivers/input/keyboard/jornada680_kbd.c            |    2 -
 drivers/input/keyboard/jornada720_kbd.c            |    2 -
 drivers/input/keyboard/matrix_keypad.c             |    2 -
 drivers/input/keyboard/nspire-keypad.c             |  283 ++
 drivers/input/keyboard/omap4-keypad.c              |    2 -
 drivers/input/keyboard/opencores-kbd.c             |    2 -
 drivers/input/keyboard/pmic8xxx-keypad.c           |    2 -
 drivers/input/keyboard/pxa27x_keypad.c             |  312 +-
 drivers/input/keyboard/pxa930_rotary.c             |    1 -
 drivers/input/keyboard/samsung-keypad.c            |   54 +-
 drivers/input/keyboard/sh_keysc.c                  |    2 -
 drivers/input/keyboard/spear-keyboard.c            |    1 -
 drivers/input/keyboard/tnetv107x-keypad.c          |    2 -
 drivers/input/keyboard/twl4030_keypad.c            |    3 +-
 drivers/input/keyboard/w90p910_keypad.c            |    5 +-
 drivers/input/misc/Kconfig                         |   10 +
 drivers/input/misc/Makefile                        |    1 +
 drivers/input/misc/ab8500-ponkey.c                 |    2 -
 drivers/input/misc/bfin_rotary.c                   |    1 -
 drivers/input/misc/da9055_onkey.c                  |    2 +-
 drivers/input/misc/gpio_tilt_polled.c              |    2 -
 drivers/input/misc/ixp4xx-beeper.c                 |    5 +-
 drivers/input/misc/m68kspkr.c                      |    1 -
 drivers/input/misc/max8925_onkey.c                 |    2 -
 drivers/input/misc/mc13783-pwrbutton.c             |    1 -
 drivers/input/misc/pcspkr.c                        |    1 -
 drivers/input/misc/pm8xxx-vibrator.c               |    2 -
 drivers/input/misc/pmic8xxx-pwrkey.c               |    4 +-
 drivers/input/misc/pwm-beeper.c                    |    1 -
 drivers/input/misc/rotary_encoder.c                |    2 -
 drivers/input/misc/sgi_btns.c                      |    7 +-
 drivers/input/misc/sirfsoc-onkey.c                 |  165 +
 drivers/input/misc/sparcspkr.c                     |   14 +-
 drivers/input/mouse/amimouse.c                     |    1 -
 drivers/input/mouse/bcm5974.c                      |   36 +-
 drivers/input/mouse/gpio_mouse.c                   |    3 -
 drivers/input/mouse/navpoint.c                     |    2 +-
 drivers/input/serio/Kconfig                        |   10 +
 drivers/input/serio/Makefile                       |    1 +
 drivers/input/serio/altera_ps2.c                   |    1 -
 drivers/input/serio/at32psif.c                     |    2 -
 drivers/input/serio/olpc_apsp.c                    |  287 ++
 drivers/input/serio/q40kbd.c                       |    1 -
 drivers/input/serio/xilinx_ps2.c                   |    2 -
 drivers/input/touchscreen/88pm860x-ts.c            |    3 +-
 drivers/input/touchscreen/Kconfig                  |   31 +
 drivers/input/touchscreen/Makefile                 |    5 +-
 drivers/input/touchscreen/atmel-wm97xx.c           |    2 -
 drivers/input/touchscreen/atmel_tsadcc.c           |   10 +-
 drivers/input/touchscreen/cyttsp4_core.c           | 2166 ++++++++++
 drivers/input/touchscreen/cyttsp4_core.h           |  472 +++
 drivers/input/touchscreen/cyttsp4_i2c.c            |   90 +
 drivers/input/touchscreen/cyttsp4_spi.c            |  205 +
 drivers/input/touchscreen/cyttsp_core.c            |    6 +-
 drivers/input/touchscreen/cyttsp_core.h            |   11 +-
 drivers/input/touchscreen/cyttsp_i2c.c             |   50 +-
 drivers/input/touchscreen/cyttsp_i2c_common.c      |   79 +
 drivers/input/touchscreen/cyttsp_spi.c             |   38 +-
 drivers/input/touchscreen/da9052_tsi.c             |    2 -
 drivers/input/touchscreen/egalax_ts.c              |   53 +-
 drivers/input/touchscreen/intel-mid-touch.c        |    2 -
 drivers/input/touchscreen/jornada720_ts.c          |    2 -
 drivers/input/touchscreen/mc13783_ts.c             |    2 -
 drivers/input/touchscreen/ti_am335x_tsc.c          |    1 -
 drivers/input/touchscreen/tnetv107x-ts.c           |    2 -
 drivers/input/touchscreen/tps6507x-ts.c            |  158 +-
 drivers/input/touchscreen/w90p910_ts.c             |    2 -
 drivers/input/touchscreen/wacom_i2c.c              |   14 +-
 drivers/iommu/Kconfig                              |    8 +
 drivers/leds/Kconfig                               |    6 +-
 drivers/leds/led-class.c                           |   10 +-
 drivers/leds/leds-88pm860x.c                       |    2 +-
 drivers/leds/leds-atmel-pwm.c                      |    1 -
 drivers/leds/leds-gpio.c                           |    8 -
 drivers/leds/leds-lp5521.c                         |   28 +-
 drivers/leds/leds-lp5523.c                         |   28 +-
 drivers/leds/leds-lp5562.c                         |   28 +-
 drivers/leds/leds-lp55xx-common.c                  |   45 +
 drivers/leds/leds-lp55xx-common.h                  |    4 +
 drivers/leds/leds-mc13783.c                        |  467 +-
 drivers/leds/leds-ns2.c                            |    2 -
 drivers/leds/leds-renesas-tpu.c                    |    8 +-
 drivers/leds/leds-sunfire.c                        |    4 +-
 drivers/leds/leds-wm831x-status.c                  |    2 +-
 drivers/lguest/page_tables.c                       |    2 +-
 drivers/macintosh/adb.c                            |    2 +-
 drivers/macintosh/mac_hid.c                        |    8 +-
 drivers/macintosh/via-cuda.c                       |    2 +-
 drivers/macintosh/windfarm_pm121.c                 |    6 +-
 drivers/macintosh/windfarm_pm81.c                  |    6 +-
 drivers/macintosh/windfarm_pm91.c                  |    6 +-
 drivers/macintosh/windfarm_smu_sat.c               |    1 -
 drivers/md/bcache/bset.c                           |    4 +-
 drivers/md/bitmap.c                                |    8 +-
 drivers/md/dm-raid.c                               |   76 +-
 drivers/md/md.c                                    |   53 +-
 drivers/md/md.h                                    |    8 +
 drivers/md/raid0.c                                 |    1 +
 drivers/md/raid1.c                                 |    7 +-
 drivers/md/raid10.c                                |   83 +-
 drivers/md/raid5.c                                 |    6 +-
 drivers/media/dvb-frontends/stv0367.c              |    2 +-
 drivers/media/platform/exynos4-is/Kconfig          |    2 +-
 drivers/media/platform/s5p-mfc/s5p_mfc_dec.c       |    2 +-
 drivers/mfd/arizona-core.c                         |  234 +-
 drivers/mfd/arizona-i2c.c                          |   10 +-
 drivers/mfd/arizona-spi.c                          |   10 +-
 drivers/mfd/arizona.h                              |   12 +
 drivers/mfd/wm5102-tables.c                        |    9 +-
 drivers/mfd/wm5110-tables.c                        |    8 +
 drivers/misc/atmel-ssc.c                           |    8 +-
 drivers/misc/dummy-irq.c                           |    2 +-
 drivers/misc/lattice-ecp3-config.c                 |    2 +-
 drivers/misc/mei/hbm.c                             |    2 +-
 drivers/misc/mei/init.c                            |    2 +-
 drivers/misc/sgi-xp/xpc_main.c                     |    6 +-
 drivers/net/ethernet/ibm/ehea/ehea_main.c          |    8 +-
 drivers/net/ethernet/intel/igb/e1000_phy.c         |    2 +-
 drivers/net/ethernet/mellanox/mlx4/main.c          |    2 +-
 drivers/net/ethernet/neterion/vxge/vxge-main.c     |    2 +-
 .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c   |    2 +-
 drivers/net/wireless/ath/ath9k/Kconfig             |    2 +-
 drivers/nfc/pn533.c                                |    2 +-
 drivers/of/Kconfig                                 |    3 -
 drivers/of/Makefile                                |    3 +-
 drivers/of/address.c                               |    8 +-
 drivers/of/base.c                                  |   12 +-
 drivers/of/fdt.c                                   |    2 +-
 drivers/of/pdt.c                                   |    2 +-
 drivers/s390/char/vmur.c                           |    2 +-
 drivers/s390/scsi/Makefile                         |    2 +-
 drivers/s390/scsi/zfcp_aux.c                       |   36 +-
 drivers/s390/scsi/zfcp_ccw.c                       |   13 +-
 drivers/s390/scsi/zfcp_cfdc.c                      |  446 --
 drivers/s390/scsi/zfcp_dbf.c                       |   11 +-
 drivers/s390/scsi/zfcp_def.h                       |    4 -
 drivers/s390/scsi/zfcp_erp.c                       |    3 +-
 drivers/s390/scsi/zfcp_ext.h                       |   20 +-
 drivers/s390/scsi/zfcp_fc.c                        |    2 +-
 drivers/s390/scsi/zfcp_fsf.c                       |  154 +-
 drivers/s390/scsi/zfcp_fsf.h                       |   26 -
 drivers/s390/scsi/zfcp_scsi.c                      |   10 +-
 drivers/s390/scsi/zfcp_sysfs.c                     |   27 +-
 drivers/s390/scsi/zfcp_unit.c                      |    9 +-
 drivers/scsi/3w-xxxx.c                             |    4 +-
 drivers/scsi/BusLogic.c                            | 4452 +++++++++++---------
 drivers/scsi/BusLogic.h                            | 1487 ++++---
 drivers/scsi/FlashPoint.c                          |  626 ++-
 drivers/scsi/Kconfig                               |    2 +-
 drivers/scsi/aacraid/src.c                         |    3 +
 drivers/scsi/aic7xxx_old/aic7xxx.seq               |    2 +-
 drivers/scsi/aic94xx/aic94xx_task.c                |    3 +-
 drivers/scsi/bfa/bfa_core.c                        |    3 +-
 drivers/scsi/bfa/bfa_defs.h                        |  103 +-
 drivers/scsi/bfa/bfa_defs_svc.h                    |   77 +-
 drivers/scsi/bfa/bfa_fc.h                          |   15 +
 drivers/scsi/bfa/bfa_fcpim.c                       |    2 +-
 drivers/scsi/bfa/bfa_fcs.c                         |   62 +-
 drivers/scsi/bfa/bfa_fcs.h                         |   34 +-
 drivers/scsi/bfa/bfa_fcs_lport.c                   |  209 +-
 drivers/scsi/bfa/bfa_fcs_rport.c                   |   11 +-
 drivers/scsi/bfa/bfa_ioc.c                         |   74 +-
 drivers/scsi/bfa/bfa_ioc.h                         |    9 +-
 drivers/scsi/bfa/bfa_ioc_cb.c                      |   86 +-
 drivers/scsi/bfa/bfa_ioc_ct.c                      |   46 +
 drivers/scsi/bfa/bfa_svc.c                         |  700 ++-
 drivers/scsi/bfa/bfa_svc.h                         |   34 +-
 drivers/scsi/bfa/bfad.c                            |   14 +-
 drivers/scsi/bfa/bfad_attr.c                       |   33 +-
 drivers/scsi/bfa/bfad_bsg.c                        |  137 +-
 drivers/scsi/bfa/bfad_bsg.h                        |   52 +-
 drivers/scsi/bfa/bfad_drv.h                        |    2 +-
 drivers/scsi/bfa/bfad_im.c                         |   10 +-
 drivers/scsi/bfa/bfi.h                             |   78 +-
 drivers/scsi/bfa/bfi_ms.h                          |    5 +-
 drivers/scsi/csiostor/csio_hw.c                    |   91 -
 drivers/scsi/csiostor/csio_hw.h                    |   11 -
 drivers/scsi/csiostor/csio_mb.c                    |   77 -
 drivers/scsi/csiostor/csio_mb.h                    |   11 -
 drivers/scsi/csiostor/csio_scsi.c                  |    4 +-
 drivers/scsi/cxgbi/cxgb4i/cxgb4i.c                 |  159 +-
 drivers/scsi/fnic/fnic_scsi.c                      |    6 +-
 drivers/scsi/ipr.c                                 |   58 +-
 drivers/scsi/isci/request.c                        |    4 +-
 drivers/scsi/libfc/fc_fcp.c                        |    2 +-
 drivers/scsi/libiscsi.c                            |   18 +
 drivers/scsi/libiscsi_tcp.c                        |    2 +-
 drivers/scsi/libsas/sas_scsi_host.c                |    2 +-
 drivers/scsi/lpfc/lpfc.h                           |    2 +-
 drivers/scsi/lpfc/lpfc_attr.c                      |   23 +-
 drivers/scsi/lpfc/lpfc_bsg.c                       |    4 +-
 drivers/scsi/lpfc/lpfc_crtn.h                      |    2 +-
 drivers/scsi/lpfc/lpfc_ct.c                        |    2 +-
 drivers/scsi/lpfc/lpfc_els.c                       |    2 +-
 drivers/scsi/lpfc/lpfc_hbadisc.c                   |   38 +-
 drivers/scsi/lpfc/lpfc_hw.h                        |    2 +-
 drivers/scsi/lpfc/lpfc_hw4.h                       |    2 +-
 drivers/scsi/lpfc/lpfc_init.c                      |  129 +-
 drivers/scsi/lpfc/lpfc_mbox.c                      |    2 +-
 drivers/scsi/lpfc/lpfc_nportdisc.c                 |    2 +-
 drivers/scsi/lpfc/lpfc_scsi.c                      |  125 +-
 drivers/scsi/lpfc/lpfc_scsi.h                      |    2 +-
 drivers/scsi/lpfc/lpfc_sli.c                       |   52 +-
 drivers/scsi/lpfc/lpfc_sli4.h                      |    3 +-
 drivers/scsi/lpfc/lpfc_version.h                   |    6 +-
 drivers/scsi/megaraid/megaraid_sas.h               |  186 +-
 drivers/scsi/megaraid/megaraid_sas_base.c          |  226 +-
 drivers/scsi/megaraid/megaraid_sas_fp.c            |  784 +++-
 drivers/scsi/megaraid/megaraid_sas_fusion.c        |  148 +-
 drivers/scsi/megaraid/megaraid_sas_fusion.h        |   35 +-
 drivers/scsi/mpt2sas/mpi/mpi2.h                    |    6 +-
 drivers/scsi/mpt2sas/mpi/mpi2_init.h               |    4 +-
 drivers/scsi/mpt2sas/mpi/mpi2_ioc.h                |    8 +-
 drivers/scsi/mpt2sas/mpi/mpi2_raid.h               |    9 +-
 drivers/scsi/mpt2sas/mpi/mpi2_tool.h               |   10 +-
 drivers/scsi/mpt2sas/mpt2sas_base.c                |   59 +-
 drivers/scsi/mpt2sas/mpt2sas_base.h                |    7 +-
 drivers/scsi/mpt2sas/mpt2sas_scsih.c               |  143 +-
 drivers/scsi/mvsas/mv_sas.c                        |    3 +-
 drivers/scsi/pm8001/pm8001_hwi.c                   |    5 +-
 drivers/scsi/pm8001/pm80xx_hwi.c                   |   23 +-
 drivers/scsi/pmcraid.c                             |    2 +-
 drivers/scsi/scsi.c                                |    8 +-
 drivers/scsi/scsi_devinfo.c                        |    1 +
 drivers/scsi/scsi_error.c                          |    9 +-
 drivers/scsi/scsi_scan.c                           |    5 +
 drivers/scsi/scsi_sysfs.c                          |   30 +
 drivers/scsi/scsi_transport_iscsi.c                |   12 +
 drivers/scsi/sd.c                                  |   77 +-
 drivers/scsi/sd.h                                  |    1 +
 drivers/scsi/storvsc_drv.c                         |  210 +-
 drivers/scsi/ufs/Kconfig                           |    2 +-
 drivers/scsi/ufs/ufshcd-pci.c                      |    1 -
 drivers/scsi/ufs/ufshcd-pltfrm.c                   |   76 +-
 drivers/scsi/ufs/ufshcd.c                          |  537 ++-
 drivers/scsi/ufs/ufshcd.h                          |   21 +-
 drivers/scsi/ufs/ufshci.h                          |    5 +-
 drivers/tty/serial/serial-tegra.c                  |    2 +-
 drivers/tty/sysrq.c                                |   19 +-
 drivers/usb/chipidea/Makefile                      |    2 +-
 drivers/usb/musb/musb_dsps.c                       |    2 +-
 drivers/usb/musb/omap2430.c                        |    2 +-
 drivers/vfio/Kconfig                               |    6 +
 drivers/vfio/Makefile                              |    1 +
 drivers/vfio/vfio.c                                |    1 +
 drivers/vfio/vfio_iommu_spapr_tce.c                |  377 ++
 drivers/video/omap2/displays/panel-n8x0.c          |    2 +-
 drivers/watchdog/booke_wdt.c                       |    8 +
 fs/btrfs/ctree.c                                   |    2 +-
 fs/btrfs/free-space-cache.c                        |    2 +-
 fs/hpfs/buffer.c                                   |   33 +
 fs/hpfs/file.c                                     |   40 +-
 fs/hpfs/hpfs_fn.h                                  |    7 +-
 fs/hpfs/map.c                                      |   22 +-
 fs/hpfs/super.c                                    |   17 +-
 fs/pstore/ftrace.c                                 |    2 +-
 fs/pstore/inode.c                                  |    9 +
 fs/pstore/platform.c                               |   10 +-
 fs/pstore/ram.c                                    |    3 +-
 include/asm-generic/pgtable.h                      |    5 +-
 include/linux/cpu.h                                |    3 +-
 include/linux/huge_mm.h                            |    6 +-
 include/linux/input/tps6507x-ts.h                  |    1 -
 include/linux/kernel.h                             |    5 +-
 include/linux/libata.h                             |    5 +
 include/linux/mfd/arizona/core.h                   |    2 +
 include/linux/mfd/arizona/pdata.h                  |    2 +-
 include/linux/mfd/arizona/registers.h              |   47 +
 include/linux/mfd/mc13xxx.h                        |  100 +-
 include/linux/mfd/tps6507x.h                       |    1 -
 include/linux/mfd/twl6040.h                        |    7 +
 include/linux/mfd/wm8994/pdata.h                   |    5 +
 include/linux/mfd/wm8994/registers.h               |    8 +
 include/linux/of_device.h                          |    6 +-
 include/linux/of_platform.h                        |   35 +-
 include/linux/platform_data/cyttsp4.h              |   76 +
 include/linux/platform_data/g762.h                 |   37 +
 include/linux/platform_data/keypad-pxa27x.h        |    3 +-
 include/linux/platform_data/ssm2518.h              |   22 +
 include/linux/platform_device.h                    |    3 +
 include/linux/pstore.h                             |   12 +-
 include/linux/spinlock_api_smp.h                   |    2 +-
 include/scsi/iscsi_if.h                            |    5 +
 include/scsi/libiscsi.h                            |    4 +
 include/scsi/libsas.h                              |    2 +-
 include/scsi/scsi.h                                |    5 +
 include/scsi/scsi_device.h                         |    1 +
 include/scsi/scsi_devinfo.h                        |    1 +
 include/sound/control.h                            |    3 +-
 include/sound/core.h                               |    2 +-
 include/sound/pcm.h                                |    5 +-
 include/sound/rt5640.h                             |   22 +
 include/sound/soc-dapm.h                           |    3 +-
 include/sound/soc.h                                |    4 +-
 include/uapi/linux/input.h                         |   17 +-
 include/uapi/linux/vfio.h                          |   34 +
 include/uapi/sound/asound.h                        |    2 +
 kernel/irq/generic-chip.c                          |    2 +-
 lib/Kconfig.debug                                  | 1196 +++---
 lib/Kconfig.kgdb                                   |    4 +-
 lib/vsprintf.c                                     |    2 +-
 mm/huge_memory.c                                   |   28 +-
 mm/mmu_notifier.c                                  |    2 +-
 mm/pgtable-generic.c                               |    5 +-
 mm/sparse.c                                        |    3 +-
 net/bluetooth/hidp/core.c                          |   56 +-
 net/bluetooth/hidp/hidp.h                          |    2 +
 sound/arm/aaci.c                                   |    2 -
 sound/arm/pxa2xx-ac97.c                            |    1 -
 sound/core/Kconfig                                 |    9 +
 sound/core/init.c                                  |   55 +-
 sound/core/pcm_lib.c                               |    3 +-
 sound/core/vmaster.c                               |   65 +-
 sound/drivers/aloop.c                              |    1 -
 sound/drivers/dummy.c                              |    1 -
 sound/drivers/ml403-ac97cr.c                       |    1 -
 sound/drivers/mpu401/mpu401.c                      |    1 -
 sound/drivers/mtpav.c                              |    1 -
 sound/drivers/pcsp/pcsp.c                          |    1 -
 sound/drivers/serial-u16550.c                      |    1 -
 sound/drivers/virmidi.c                            |    1 -
 sound/drivers/vx/vx_core.c                         |    2 +-
 sound/firewire/amdtp.h                             |    1 -
 sound/firewire/scs1x.c                             |    4 +-
 sound/i2c/other/ak4xxx-adda.c                      |    2 +-
 sound/isa/ad1848/ad1848.c                          |    1 -
 sound/isa/adlib.c                                  |    1 -
 sound/isa/cmi8328.c                                |    1 -
 sound/isa/cmi8330.c                                |    1 -
 sound/isa/cs423x/cs4231.c                          |    1 -
 sound/isa/cs423x/cs4236.c                          |    2 -
 sound/isa/es1688/es1688.c                          |    1 -
 sound/isa/es18xx.c                                 |    2 -
 sound/isa/galaxy/galaxy.c                          |    1 -
 sound/isa/gus/gusclassic.c                         |    1 -
 sound/isa/gus/gusextreme.c                         |    1 -
 sound/isa/gus/gusmax.c                             |    1 -
 sound/isa/gus/interwave.c                          |    1 -
 sound/isa/msnd/msnd_pinnacle.c                     |    1 -
 sound/isa/opl3sa2.c                                |    2 -
 sound/isa/opti9xx/miro.c                           |    1 -
 sound/isa/opti9xx/opti92x-ad1848.c                 |    1 -
 sound/isa/sb/jazz16.c                              |    1 -
 sound/isa/sb/sb16.c                                |    1 -
 sound/isa/sb/sb8.c                                 |    1 -
 sound/isa/sc6000.c                                 |    1 -
 sound/isa/sscape.c                                 |    1 -
 sound/isa/wavefront/wavefront.c                    |    1 -
 sound/oss/kahlua.c                                 |    2 -
 sound/parisc/harmony.c                             |    3 -
 sound/pci/ac97/ac97_codec.c                        |    2 +-
 sound/pci/ad1889.c                                 |    1 -
 sound/pci/ali5451/ali5451.c                        |    1 -
 sound/pci/als300.c                                 |    1 -
 sound/pci/als4000.c                                |    1 -
 sound/pci/asihpi/asihpi.c                          |    2 +-
 sound/pci/asihpi/hpioctl.c                         |    1 -
 sound/pci/atiixp.c                                 |    1 -
 sound/pci/atiixp_modem.c                           |    1 -
 sound/pci/au88x0/au88x0.c                          |    1 -
 sound/pci/aw2/aw2-alsa.c                           |    1 -
 sound/pci/azt3328.c                                |    1 -
 sound/pci/bt87x.c                                  |    1 -
 sound/pci/ca0106/ca0106_main.c                     |    1 -
 sound/pci/cmipci.c                                 |    1 -
 sound/pci/cs4281.c                                 |    3 +-
 sound/pci/cs46xx/cs46xx.c                          |    1 -
 sound/pci/cs5530.c                                 |    1 -
 sound/pci/cs5535audio/cs5535audio.c                |    1 -
 sound/pci/ctxfi/xfi.c                              |    1 -
 sound/pci/echoaudio/echoaudio.c                    |    1 -
 sound/pci/emu10k1/emu10k1.c                        |    1 -
 sound/pci/emu10k1/emu10k1x.c                       |    1 -
 sound/pci/ens1370.c                                |    3 +-
 sound/pci/es1938.c                                 |    1 -
 sound/pci/es1968.c                                 |   74 +-
 sound/pci/fm801.c                                  |    1 -
 sound/pci/hda/Kconfig                              |    1 -
 sound/pci/hda/hda_codec.c                          |   69 +-
 sound/pci/hda/hda_codec.h                          |   11 +-
 sound/pci/hda/hda_generic.c                        |   59 +-
 sound/pci/hda/hda_generic.h                        |    4 +
 sound/pci/hda/hda_intel.c                          |   53 +-
 sound/pci/hda/hda_jack.c                           |    2 +-
 sound/pci/hda/hda_local.h                          |   10 +-
 sound/pci/hda/hda_proc.c                           |   15 +
 sound/pci/hda/patch_ca0132.c                       |    8 +-
 sound/pci/hda/patch_conexant.c                     |    2 +-
 sound/pci/hda/patch_hdmi.c                         |  128 +-
 sound/pci/hda/patch_realtek.c                      |  117 +
 sound/pci/hda/patch_sigmatel.c                     |   14 +-
 sound/pci/hda/patch_via.c                          |   15 +-
 sound/pci/ice1712/ice1712.c                        |    1 -
 sound/pci/ice1712/ice1724.c                        |    1 -
 sound/pci/intel8x0.c                               |    1 -
 sound/pci/intel8x0m.c                              |    1 -
 sound/pci/korg1212/korg1212.c                      |    1 -
 sound/pci/lola/lola.c                              |    1 -
 sound/pci/lx6464es/lx6464es.c                      |    1 -
 sound/pci/maestro3.c                               |    1 -
 sound/pci/mixart/mixart.c                          |    1 -
 sound/pci/nm256/nm256.c                            |    1 -
 sound/pci/oxygen/oxygen_lib.c                      |    1 -
 sound/pci/pcxhr/pcxhr.c                            |    1 -
 sound/pci/riptide/riptide.c                        |    2 -
 sound/pci/rme32.c                                  |    1 -
 sound/pci/rme96.c                                  |    1 -
 sound/pci/rme9652/hdsp.c                           |    1 -
 sound/pci/rme9652/hdspm.c                          |   59 +-
 sound/pci/rme9652/rme9652.c                        |    1 -
 sound/pci/sis7019.c                                |    1 -
 sound/pci/sonicvibes.c                             |    1 -
 sound/pci/trident/trident.c                        |    1 -
 sound/pci/via82xx.c                                |    1 -
 sound/pci/via82xx_modem.c                          |    1 -
 sound/pci/vx222/vx222.c                            |    1 -
 sound/pci/ymfpci/ymfpci.c                          |    1 -
 sound/pci/ymfpci/ymfpci_main.c                     |    2 +-
 sound/ppc/powermac.c                               |    1 -
 sound/sh/aica.c                                    |    1 -
 sound/sh/sh_dac_audio.c                            |    2 -
 sound/soc/Kconfig                                  |    1 +
 sound/soc/Makefile                                 |    1 +
 sound/soc/atmel/sam9g20_wm8731.c                   |    9 -
 sound/soc/au1x/ac97c.c                             |   21 +-
 sound/soc/au1x/psc-ac97.c                          |   33 +-
 sound/soc/blackfin/Kconfig                         |   47 +-
 sound/soc/blackfin/Makefile                        |    4 -
 sound/soc/blackfin/bf5xx-ac97-pcm.c                |    1 -
 sound/soc/blackfin/bf5xx-ac97-pcm.h                |   26 -
 sound/soc/blackfin/bf5xx-ac97.c                    |   37 +-
 sound/soc/blackfin/bf5xx-ad1836.c                  |   19 +-
 sound/soc/blackfin/bf5xx-ad193x.c                  |   40 +-
 sound/soc/blackfin/bf5xx-ad1980.c                  |    1 -
 sound/soc/blackfin/bf5xx-ad73311.c                 |    1 -
 sound/soc/blackfin/bf5xx-i2s-pcm.c                 |  183 +-
 sound/soc/blackfin/bf5xx-i2s-pcm.h                 |   21 +-
 sound/soc/blackfin/bf5xx-i2s.c                     |  129 +-
 sound/soc/blackfin/bf5xx-sport.c                   |   10 +-
 sound/soc/blackfin/bf5xx-sport.h                   |    2 +-
 sound/soc/blackfin/bf5xx-ssm2602.c                 |    1 -
 sound/soc/blackfin/bf5xx-tdm-pcm.c                 |  345 --
 sound/soc/blackfin/bf5xx-tdm-pcm.h                 |   18 -
 sound/soc/blackfin/bf5xx-tdm.c                     |  328 --
 sound/soc/blackfin/bf5xx-tdm.h                     |   23 -
 sound/soc/cirrus/Kconfig                           |    2 +-
 sound/soc/cirrus/ep93xx-ac97.c                     |   28 +-
 sound/soc/cirrus/ep93xx-i2s.c                      |   16 +-
 sound/soc/cirrus/ep93xx-pcm.c                      |  138 +-
 sound/soc/codecs/88pm860x-codec.c                  |   15 +-
 sound/soc/codecs/Kconfig                           |   18 +-
 sound/soc/codecs/Makefile                          |   14 +-
 sound/soc/codecs/ab8500-codec.c                    |   85 +-
 sound/soc/codecs/ab8500-codec.h                    |   42 +-
 sound/soc/codecs/ac97.c                            |    7 +-
 sound/soc/codecs/ad1980.c                          |   12 +-
 sound/soc/codecs/adau1701.c                        |  321 +-
 sound/soc/codecs/arizona.c                         |    7 +
 sound/soc/codecs/arizona.h                         |    3 +-
 sound/soc/codecs/{dfbmcs320.c => bt-sco.c}         |   37 +-
 sound/soc/codecs/{omap-hdmi.c => hdmi.c}           |   26 +-
 sound/soc/codecs/jz4740.c                          |    2 -
 sound/soc/codecs/max98090.c                        |   24 +-
 sound/soc/codecs/rt5640.c                          | 2128 ++++++++++
 sound/soc/codecs/rt5640.h                          | 2092 +++++++++
 sound/soc/codecs/sgtl5000.c                        |  267 +-
 sound/soc/codecs/sgtl5000.h                        |    2 +-
 sound/soc/codecs/sn95031.c                         |    2 +-
 sound/soc/codecs/spdif_receiver.c                  |   10 +
 .../{spdif_transciever.c => spdif_transmitter.c}   |   10 +
 sound/soc/codecs/ssm2518.c                         |  856 ++++
 sound/soc/codecs/ssm2518.h                         |   20 +
 sound/soc/codecs/stac9766.c                        |   26 +-
 sound/soc/codecs/tas5086.c                         |  330 +-
 sound/soc/codecs/tlv320aic3x.c                     |    6 +-
 sound/soc/codecs/twl6040.c                         |  109 +-
 sound/soc/codecs/wm0010.c                          |   10 +
 sound/soc/codecs/wm5102.c                          |  205 +-
 sound/soc/codecs/wm5110.c                          |  192 +
 sound/soc/codecs/wm8400.c                          |    9 +-
 sound/soc/codecs/wm8903.c                          |    6 +-
 sound/soc/codecs/wm8904.c                          |    9 +-
 sound/soc/codecs/wm8962.c                          |  143 +-
 sound/soc/codecs/wm8990.c                          |   11 +-
 sound/soc/codecs/wm8991.h                          |    9 +-
 sound/soc/codecs/wm8994.c                          |  200 +-
 sound/soc/codecs/wm8994.h                          |    3 +
 sound/soc/codecs/wm8995.h                          |    7 +-
 sound/soc/codecs/wm9705.c                          |   16 +-
 sound/soc/codecs/wm9712.c                          |   18 +-
 sound/soc/codecs/wm9713.c                          |   18 +-
 sound/soc/codecs/wm_adsp.c                         |  461 +-
 sound/soc/codecs/wm_adsp.h                         |   13 +-
 sound/soc/codecs/wm_hubs.c                         |    6 +-
 sound/soc/davinci/Kconfig                          |   10 -
 sound/soc/davinci/Makefile                         |    2 -
 sound/soc/davinci/davinci-mcasp.c                  |    4 +-
 sound/soc/davinci/davinci-sffsdr.c                 |  181 -
 sound/soc/dwc/designware_i2s.c                     |    6 +-
 sound/soc/fsl/Kconfig                              |   17 +-
 sound/soc/fsl/Makefile                             |   13 +-
 sound/soc/fsl/eukrea-tlv320.c                      |    2 +-
 sound/soc/fsl/fsl_ssi.c                            |   13 +-
 sound/soc/fsl/imx-audmux.c                         |    8 -
 sound/soc/fsl/imx-mc13783.c                        |    2 +-
 sound/soc/fsl/imx-pcm-dma.c                        |    2 +
 sound/soc/fsl/imx-pcm-fiq.c                        |   92 +
 sound/soc/fsl/imx-pcm.c                            |  145 -
 sound/soc/fsl/imx-pcm.h                            |   10 +-
 sound/soc/fsl/imx-sgtl5000.c                       |   39 +-
 sound/soc/fsl/imx-ssi.c                            |   55 +-
 sound/soc/fsl/imx-ssi.h                            |    3 -
 sound/soc/fsl/imx-wm8962.c                         |  323 ++
 sound/soc/fsl/mpc5200_psc_ac97.c                   |   10 +-
 sound/soc/fsl/mx27vis-aic32x4.c                    |    2 +-
 sound/soc/fsl/phycore-ac97.c                       |    2 +-
 sound/soc/fsl/wm1133-ev1.c                         |    2 +-
 sound/soc/jz4740/jz4740-i2s.c                      |   17 +-
 sound/soc/kirkwood/kirkwood-dma.c                  |    2 +-
 sound/soc/mid-x86/mfld_machine.c                   |   32 +-
 sound/soc/mxs/mxs-pcm.c                            |   18 -
 sound/soc/mxs/mxs-pcm.h                            |    7 -
 sound/soc/mxs/mxs-saif.c                           |   37 +-
 sound/soc/mxs/mxs-saif.h                           |    1 -
 sound/soc/mxs/mxs-sgtl5000.c                       |   10 +-
 sound/soc/nuc900/nuc900-ac97.c                     |   60 +-
 sound/soc/omap/Kconfig                             |    2 +-
 sound/soc/omap/Makefile                            |    1 -
 sound/soc/omap/omap-hdmi-card.c                    |    2 +-
 sound/soc/omap/omap-mcbsp.c                        |    2 -
 sound/soc/pxa/Kconfig                              |   20 -
 sound/soc/pxa/Makefile                             |    4 -
 sound/soc/pxa/mmp-pcm.c                            |    6 +-
 sound/soc/pxa/mmp-sspa.c                           |    2 +-
 sound/soc/pxa/pxa2xx-ac97.c                        |   10 +-
 sound/soc/pxa/pxa2xx-ac97.h                        |    3 -
 sound/soc/pxa/saarb.c                              |  190 -
 sound/soc/pxa/tavorevb3.c                          |  189 -
 sound/soc/pxa/zylonite.c                           |    1 -
 sound/soc/samsung/Kconfig                          |    2 +-
 sound/soc/samsung/ac97.c                           |   42 +-
 sound/soc/samsung/bells.c                          |   14 +
 sound/soc/samsung/neo1973_wm8753.c                 |    2 +-
 sound/soc/samsung/smdk_wm8580pcm.c                 |    1 -
 sound/soc/samsung/smdk_wm8994pcm.c                 |    1 -
 sound/soc/sh/fsi.c                                 |   10 +-
 sound/soc/sh/hac.c                                 |    8 +-
 sound/soc/soc-core.c                               |  123 +-
 sound/soc/soc-dapm.c                               |  110 +-
 sound/soc/soc-pcm.c                                |   91 +-
 sound/soc/soc-utils.c                              |   13 +-
 sound/soc/spear/Kconfig                            |    9 +
 sound/soc/spear/Makefile                           |    8 +
 sound/soc/spear/spdif_in.c                         |   31 +-
 sound/soc/spear/spdif_out.c                        |   43 +-
 sound/soc/spear/spear_pcm.c                        |  152 +-
 sound/soc/tegra/Kconfig                            |   10 +
 sound/soc/tegra/Makefile                           |    2 +
 sound/soc/tegra/tegra20_ac97.c                     |   67 +-
 sound/soc/tegra/tegra30_ahub.c                     |   25 +
 sound/soc/tegra/tegra30_i2s.c                      |   26 +
 sound/soc/tegra/tegra_asoc_utils.c                 |   23 +-
 sound/soc/tegra/tegra_rt5640.c                     |  257 ++
 sound/soc/txx9/txx9aclc-ac97.c                     |   17 +-
 sound/soc/ux500/mop500.c                           |    2 +-
 sound/soc/ux500/mop500_ab8500.c                    |   62 +-
 sound/soc/ux500/ux500_msp_dai.c                    |   11 +-
 sound/soc/ux500/ux500_msp_dai.h                    |    4 -
 sound/soc/ux500/ux500_msp_i2s.c                    |   88 +-
 sound/soc/ux500/ux500_msp_i2s.h                    |   74 +-
 sound/soc/ux500/ux500_pcm.c                        |   30 +
 sound/sparc/dbri.c                                 |    2 -
 sound/spi/at73c213.c                               |    1 -
 sound/usb/6fire/chip.c                             |    2 +-
 sound/usb/6fire/pcm.c                              |   12 +-
 sound/usb/Kconfig                                  |   31 +
 sound/usb/Makefile                                 |    2 +-
 sound/usb/caiaq/audio.c                            |   14 +-
 sound/usb/caiaq/device.c                           |   31 +-
 sound/usb/card.h                                   |    1 +
 sound/usb/clock.c                                  |    4 +-
 sound/usb/format.c                                 |   34 +-
 sound/usb/format.h                                 |    2 +-
 sound/usb/hiface/Makefile                          |    2 +
 sound/usb/hiface/chip.c                            |  297 ++
 sound/usb/hiface/chip.h                            |   30 +
 sound/usb/hiface/pcm.c                             |  621 +++
 sound/usb/hiface/pcm.h                             |   24 +
 sound/usb/midi.c                                   |   74 +
 sound/usb/misc/ua101.c                             |    2 +-
 sound/usb/mixer_quirks.c                           |  212 +
 sound/usb/pcm.c                                    |   45 +-
 sound/usb/quirks-table.h                           |  509 +--
 sound/usb/quirks.c                                 |  209 +
 sound/usb/stream.c                                 |   18 +-
 sound/usb/usbaudio.h                               |    2 +
 sound/usb/usx2y/usbusx2y.c                         |    2 +-
 sound/usb/usx2y/usbusx2yaudio.c                    |    3 -
 tools/testing/ktest/ktest.pl                       |    2 +-
 1016 files changed, 41820 insertions(+), 15818 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/hwmon/g762.txt
 create mode 100644 Documentation/devicetree/bindings/i2c/i2c-vt8500.txt
 create mode 100644 Documentation/devicetree/bindings/i2c/ina2xx.txt
 create mode 100644 Documentation/devicetree/bindings/input/pxa27x-keypad.txt
 create mode 100644 Documentation/devicetree/bindings/input/ti,nspire-keypad.txt
 create mode 100644 Documentation/devicetree/bindings/leds/leds-lp55xx.txt
 create mode 100644 Documentation/devicetree/bindings/mfd/arizona.txt
 create mode 100644 Documentation/devicetree/bindings/mfd/palmas.txt
 create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/interlaken-lac.txt
 create mode 100644 Documentation/devicetree/bindings/regulator/palmas-pmic.txt
 create mode 100644 Documentation/devicetree/bindings/serio/olpc,ap-sp.txt
 create mode 100644 Documentation/devicetree/bindings/sound/adi,adau1701.txt
 create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt
 create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.txt
 create mode 100644 Documentation/devicetree/bindings/sound/rt5640.txt
 create mode 100644 Documentation/devicetree/bindings/sound/spdif-receiver.txt
 create mode 100644 Documentation/devicetree/bindings/sound/spdif-transmitter.txt
 create mode 100644 Documentation/devicetree/bindings/sound/ssm2518.txt
 create mode 100644 Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt
 create mode 100644 Documentation/hwmon/g762
 create mode 100644 Documentation/powerpc/pmu-ebb.txt
 create mode 100644 arch/powerpc/boot/dts/fsl/interlaken-lac-portals.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/interlaken-lac.dtsi
 create mode 100644 arch/powerpc/include/asm/mpic_timer.h
 rename arch/powerpc/{platforms/pseries => kernel}/eeh.c (86%)
 rename arch/powerpc/{platforms/pseries => kernel}/eeh_cache.c (99%)
 rename arch/powerpc/{platforms/pseries => kernel}/eeh_dev.c (100%)
 rename arch/powerpc/{platforms/pseries => kernel}/eeh_driver.c (81%)
 rename arch/powerpc/{platforms/pseries => kernel}/eeh_event.c (56%)
 rename arch/powerpc/{platforms/pseries => kernel}/eeh_pe.c (75%)
 rename arch/powerpc/{platforms/pseries => kernel}/eeh_sysfs.c (99%)
 create mode 100644 arch/powerpc/kernel/pci-hotplug.c
 create mode 100644 arch/powerpc/math-emu/fre.c
 create mode 100644 arch/powerpc/math-emu/frsqrtes.c
 create mode 100644 arch/powerpc/mm/hugepage-hash64.c
 rename arch/powerpc/mm/{mmap_64.c => mmap.c} (100%)
 create mode 100644 arch/powerpc/platforms/powernv/eeh-ioda.c
 create mode 100644 arch/powerpc/platforms/powernv/eeh-powernv.c
 create mode 100644 arch/powerpc/sysdev/fsl_mpic_timer_wakeup.c
 create mode 100644 arch/powerpc/sysdev/mpic_timer.c
 create mode 100644 drivers/hid/hid-elo.c
 create mode 100644 drivers/hid/hid-holtek-mouse.c
 create mode 100644 drivers/hid/hid-huion.c
 delete mode 100644 drivers/hid/hid-ps3remote.c
 delete mode 100644 drivers/hid/hid-wiimote-ext.c
 create mode 100644 drivers/hid/hid-wiimote-modules.c
 create mode 100644 drivers/hwmon/g762.c
 delete mode 100644 drivers/i2c/busses/i2c-intel-mid.c
 create mode 100644 drivers/i2c/busses/i2c-kempld.c
 create mode 100644 drivers/i2c/busses/i2c-wmt.c
 create mode 100644 drivers/input/keyboard/nspire-keypad.c
 create mode 100644 drivers/input/misc/sirfsoc-onkey.c
 create mode 100644 drivers/input/serio/olpc_apsp.c
 create mode 100644 drivers/input/touchscreen/cyttsp4_core.c
 create mode 100644 drivers/input/touchscreen/cyttsp4_core.h
 create mode 100644 drivers/input/touchscreen/cyttsp4_i2c.c
 create mode 100644 drivers/input/touchscreen/cyttsp4_spi.c
 create mode 100644 drivers/input/touchscreen/cyttsp_i2c_common.c
 delete mode 100644 drivers/s390/scsi/zfcp_cfdc.c
 create mode 100644 drivers/vfio/vfio_iommu_spapr_tce.c
 create mode 100644 include/linux/platform_data/cyttsp4.h
 create mode 100644 include/linux/platform_data/g762.h
 create mode 100644 include/linux/platform_data/ssm2518.h
 create mode 100644 include/sound/rt5640.h
 delete mode 100644 sound/soc/blackfin/bf5xx-ac97-pcm.h
 delete mode 100644 sound/soc/blackfin/bf5xx-tdm-pcm.c
 delete mode 100644 sound/soc/blackfin/bf5xx-tdm-pcm.h
 delete mode 100644 sound/soc/blackfin/bf5xx-tdm.c
 delete mode 100644 sound/soc/blackfin/bf5xx-tdm.h
 rename sound/soc/codecs/{dfbmcs320.c => bt-sco.c} (53%)
 rename sound/soc/codecs/{omap-hdmi.c => hdmi.c} (69%)
 create mode 100644 sound/soc/codecs/rt5640.c
 create mode 100644 sound/soc/codecs/rt5640.h
 rename sound/soc/codecs/{spdif_transciever.c => spdif_transmitter.c} (88%)
 create mode 100644 sound/soc/codecs/ssm2518.c
 create mode 100644 sound/soc/codecs/ssm2518.h
 delete mode 100644 sound/soc/davinci/davinci-sffsdr.c
 delete mode 100644 sound/soc/fsl/imx-pcm.c
 create mode 100644 sound/soc/fsl/imx-wm8962.c
 delete mode 100644 sound/soc/pxa/saarb.c
 delete mode 100644 sound/soc/pxa/tavorevb3.c
 create mode 100644 sound/soc/spear/Kconfig
 create mode 100644 sound/soc/spear/Makefile
 create mode 100644 sound/soc/tegra/tegra_rt5640.c
 create mode 100644 sound/usb/hiface/Makefile
 create mode 100644 sound/usb/hiface/chip.c
 create mode 100644 sound/usb/hiface/chip.h
 create mode 100644 sound/usb/hiface/pcm.c
 create mode 100644 sound/usb/hiface/pcm.h
Merging fixes/master (8177a9d lseek(fd, n, SEEK_END) does *not* go to eof - n)
$ git merge --no-ff fixes/master
Already up-to-date.
Merging kbuild-current/rc-fixes (42a0940 Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes)
$ git merge --no-ff kbuild-current/rc-fixes
Already up-to-date.
Merging arc-current/for-curr (baadb8f ARC: warn on improper stack unwind FDE entries)
$ git merge --no-ff arc-current/for-curr
Already up-to-date.
Merging arm-current/fixes (3e0a07f ARM: 7773/1: PJ4B: Add support for errata 4742)
$ git merge --no-ff arm-current/fixes
Already up-to-date.
Merging m68k-current/for-linus (767bcb4 Merge branch 'exotic-arch-fixes' into for-next)
$ git merge --no-ff m68k-current/for-linus
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging powerpc-merge/merge (ea461ab powerpc/eeh: Fix fetching bus for single-dev-PE)
$ git merge --no-ff powerpc-merge/merge
Already up-to-date.
Merging sparc/master (c069114 mn10300: Fix include dependency in irqflags.h et al.)
$ git merge --no-ff sparc/master
Already up-to-date.
Merging net/master (8bb495e Linux 3.10)
$ git merge --no-ff net/master
Already up-to-date.
Merging ipsec/master (01cb71d net_sched: restore "overhead xxx" handling)
$ git merge --no-ff ipsec/master
Already up-to-date.
Merging sound-current/for-linus (8f0b3b7 ALSA: hda - Fix EAPD vmaster hook for AD1884 & co)
$ git merge --no-ff sound-current/for-linus
Merge made by the 'recursive' strategy.
 sound/pci/hda/patch_analog.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
Merging pci-current/for-linus (65694c5 x86/PCI: Map PCI setup data with ioremap() so it can be in highmem)
$ git merge --no-ff pci-current/for-linus
Already up-to-date.
Merging wireless/master (57bf744 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth)
$ git merge --no-ff wireless/master
Already up-to-date.
Merging driver-core.current/driver-core-linus (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core)
$ git merge --no-ff driver-core.current/driver-core-linus
Already up-to-date.
Merging tty.current/tty-linus (9e895ac Linux 3.10-rc7)
$ git merge --no-ff tty.current/tty-linus
Already up-to-date.
Merging usb.current/usb-linus (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core)
$ git merge --no-ff usb.current/usb-linus
Already up-to-date.
Merging staging.current/staging-linus (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core)
$ git merge --no-ff staging.current/staging-linus
Already up-to-date.
Merging char-misc.current/char-misc-linus (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core)
$ git merge --no-ff char-misc.current/char-misc-linus
Already up-to-date.
Merging input-current/for-linus (57961e3 Input: cyttsp4 - kfree xfer_buf on error path in probe())
$ git merge --no-ff input-current/for-linus
Already up-to-date.
Merging md-current/for-linus (1376512 md/raid10: fix bug which causes all RAID10 reshapes to move no data.)
$ git merge --no-ff md-current/for-linus
Already up-to-date.
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
$ git merge --no-ff audit-current/for-linus
Already up-to-date.
Merging crypto-current/master (939e177 crypto: algboss - Hold ref count on larval)
$ git merge --no-ff crypto-current/master
Already up-to-date.
Merging ide/master (bf6b438 ide: gayle: use module_platform_driver_probe())
$ git merge --no-ff ide/master
Merge made by the 'recursive' strategy.
 drivers/ide/gayle.c     | 15 +--------------
 drivers/ide/tx4938ide.c | 13 +------------
 drivers/ide/tx4939ide.c | 13 +------------
 3 files changed, 3 insertions(+), 38 deletions(-)
Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff)
$ git merge --no-ff dwmw2/master
Already up-to-date.
Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
$ git merge --no-ff sh-current/sh-fixes-for-linus
Already up-to-date.
Merging irqdomain-current/irqdomain/merge (d94ea3f irqchip: Return -EPERM for reserved IRQs)
$ git merge --no-ff irqdomain-current/irqdomain/merge
Already up-to-date.
Merging devicetree-current/devicetree/merge (706b78f dtc: ensure #line directives don't consume data from the next line)
$ git merge --no-ff devicetree-current/devicetree/merge
Already up-to-date.
Merging spi-current/spi/merge (0d2d0cc spi/davinci: fix module build error)
$ git merge --no-ff spi-current/spi/merge
Already up-to-date.
Merging gpio-current/gpio/merge (397eada gpio/omap: don't use linear domain mapping for OMAP1)
$ git merge --no-ff gpio-current/gpio/merge
Already up-to-date.
Merging rr-fixes/fixes (6407d75 virtio_console: fix uapi header)
$ git merge --no-ff rr-fixes/fixes
Already up-to-date.
Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work without pdata)
$ git merge --no-ff mfd-fixes/master
Already up-to-date.
Merging vfio-fixes/for-linus (7d13205 Linux 3.10-rc6)
$ git merge --no-ff vfio-fixes/for-linus
Already up-to-date.
Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu)
$ git merge --no-ff asm-generic/master
Already up-to-date.
Merging arc/for-next (723e2b8 ARC: [TB10x] Updates for irqchip driver)
$ git merge --no-ff arc/for-next
Auto-merging arch/arc/configs/fpga_defconfig
Merge made by the 'recursive' strategy.
 arch/arc/boot/dts/abilis_tb100.dtsi         | 32 +++++++++++++----------------
 arch/arc/boot/dts/abilis_tb101.dtsi         | 32 +++++++++++++----------------
 arch/arc/boot/dts/abilis_tb10x.dtsi         | 32 +++++++++++++----------------
 arch/arc/boot/dts/angel4.dts                | 16 +++++++++++++++
 arch/arc/configs/fpga_defconfig             |  3 +++
 arch/arc/plat-arcfpga/include/plat/irq.h    |  2 --
 arch/arc/plat-arcfpga/include/plat/memmap.h |  2 --
 arch/arc/plat-tb10x/Kconfig                 |  1 +
 8 files changed, 62 insertions(+), 58 deletions(-)
Merging arm/for-next (3c0c01a Merge branch 'devel-stable' into for-next)
$ git merge --no-ff arm/for-next
Already up-to-date.
Merging arm-perf/for-next/perf (642bd4e perf: ARM: Record the user-mode PC in the call chain.)
$ git merge --no-ff arm-perf/for-next/perf
Merge made by the 'recursive' strategy.
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
$ git merge --no-ff davinci/davinci-next
Already up-to-date.
Merging xilinx/arm-next (b028161 Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup)
$ git merge --no-ff xilinx/arm-next
Already up-to-date.
Merging arm64/upstream (aa729dc Merge branch 'for-next/hugepages' of git://git.linaro.org/people/stevecapper/linux into upstream-hugepages)
$ git merge --no-ff arm64/upstream
Already up-to-date.
Merging blackfin/blackfin-linus (5ae89ee bfin cache: dcplb map: add 16M dcplb map for BF60x)
$ git merge --no-ff blackfin/blackfin-linus
Already up-to-date.
Merging c6x/for-linux-next (f934af0 add memory barrier to arch_local_irq_restore)
$ git merge --no-ff c6x/for-linux-next
Already up-to-date.
Merging cris/for-next (32ade6a CRIS: Add kvm_para.h which includes generic file)
$ git merge --no-ff cris/for-next
Resolved 'arch/cris/arch-v32/drivers/Kconfig' using previous resolution.
Auto-merging arch/cris/include/asm/processor.h
Auto-merging arch/cris/arch-v32/drivers/Kconfig
CONFLICT (content): Merge conflict in arch/cris/arch-v32/drivers/Kconfig
Auto-merging arch/cris/Kconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 7df79d9] Merge remote-tracking branch 'cris/for-next'
$ git diff -M --stat --summary HEAD^..
 arch/cris/Kconfig                     |  81 -------
 arch/cris/arch-v10/drivers/Kconfig    |  70 ------
 arch/cris/arch-v10/drivers/Makefile   |   2 -
 arch/cris/arch-v32/drivers/Kconfig    | 394 ----------------------------------
 arch/cris/arch-v32/mach-a3/Kconfig    |   4 -
 arch/cris/include/asm/processor.h     |   1 -
 arch/cris/include/uapi/asm/kvm_para.h |   1 +
 7 files changed, 1 insertion(+), 552 deletions(-)
 create mode 100644 arch/cris/include/uapi/asm/kvm_para.h
Merging hexagon/linux-next (de44443 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD)
$ git merge --no-ff hexagon/linux-next
Already up-to-date.
Merging ia64/next (27d7181 Merge branch 'pstore' into next)
$ git merge --no-ff ia64/next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging m68k/for-next (767bcb4 Merge branch 'exotic-arch-fixes' into for-next)
$ git merge --no-ff m68k/for-next
Already up-to-date.
Merging m68knommu/for-next (e4aa937 Linux 3.10-rc3)
$ git merge --no-ff m68knommu/for-next
Already up-to-date.
Merging metag/for-next (c20eb0f metag: move EXPORT_SYMBOL(csum_partial) to metag_ksyms.c)
$ git merge --no-ff metag/for-next
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/metag/meta.txt   | 30 +++++++++++
 .../devicetree/bindings/vendor-prefixes.txt        |  1 +
 arch/metag/Kconfig.soc                             | 12 +++++
 arch/metag/Makefile                                |  2 +-
 arch/metag/boot/.gitignore                         |  2 +-
 arch/metag/boot/dts/Makefile                       |  2 +
 arch/metag/boot/dts/include/dt-bindings            |  1 +
 arch/metag/boot/dts/skeleton.dts                   |  2 +-
 arch/metag/boot/dts/tz1090.dtsi                    | 41 +++++++++++++++
 arch/metag/boot/dts/tz1090_generic.dts             | 10 ++++
 arch/metag/configs/tz1090_defconfig                | 42 +++++++++++++++
 arch/metag/include/asm/bug.h                       |  4 +-
 arch/metag/include/asm/clock.h                     |  8 +++
 arch/metag/include/asm/irq.h                       |  1 +
 arch/metag/include/asm/processor.h                 |  2 +
 arch/metag/kernel/cachepart.c                      | 13 ++---
 arch/metag/kernel/clock.c                          | 59 +++++++++++++++++++++-
 arch/metag/kernel/irq.c                            |  7 +--
 arch/metag/kernel/kick.c                           |  9 ++++
 arch/metag/kernel/metag_ksyms.c                    |  5 ++
 arch/metag/kernel/setup.c                          | 16 +++---
 arch/metag/kernel/smp.c                            | 35 ++++---------
 arch/metag/kernel/time.c                           | 14 ++++-
 arch/metag/kernel/traps.c                          |  5 +-
 arch/metag/lib/checksum.c                          |  1 -
 arch/metag/mm/cache.c                              |  2 +-
 drivers/clocksource/metag_generic.c                |  2 +
 27 files changed, 276 insertions(+), 52 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/metag/meta.txt
 create mode 120000 arch/metag/boot/dts/include/dt-bindings
 create mode 100644 arch/metag/boot/dts/tz1090.dtsi
 create mode 100644 arch/metag/boot/dts/tz1090_generic.dts
 create mode 100644 arch/metag/configs/tz1090_defconfig
Merging microblaze/next (c421cee microblaze: Enable KGDB in defconfig)
$ git merge --no-ff microblaze/next
Merge made by the 'recursive' strategy.
 arch/microblaze/configs/mmu_defconfig | 4 +++-
 arch/microblaze/kernel/kgdb.c         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
Merging mips/mips-for-linux-next (075a8d5 Merge branch '3.10-fixes' into mips-for-linux-next)
$ git merge --no-ff mips/mips-for-linux-next
Auto-merging lib/Kconfig.debug
Auto-merging kernel/irq/irqdomain.c
Auto-merging include/uapi/linux/Kbuild
Auto-merging drivers/usb/host/Kconfig
Auto-merging drivers/spi/Kconfig
Auto-merging drivers/rapidio/switches/idt_gen2.c
Auto-merging drivers/i2c/busses/Kconfig
Auto-merging drivers/edac/Kconfig
Auto-merging drivers/ata/Kconfig
Removing arch/mips/wrppmc/time.c
Removing arch/mips/wrppmc/setup.c
Removing arch/mips/wrppmc/serial.c
Removing arch/mips/wrppmc/reset.c
Removing arch/mips/wrppmc/pci.c
Removing arch/mips/wrppmc/irq.c
Removing arch/mips/wrppmc/Platform
Removing arch/mips/wrppmc/Makefile
Auto-merging arch/mips/sibyte/common/bus_watcher.c
Removing arch/mips/pmcs-msp71xx/gpio_extended.c
Removing arch/mips/pmcs-msp71xx/gpio.c
Removing arch/mips/pci/fixup-wrppmc.c
Auto-merging arch/mips/kernel/scall32-o32.S
Removing arch/mips/include/asm/mach-wrppmc/war.h
Removing arch/mips/include/asm/mach-wrppmc/mach-gt64120.h
Removing arch/mips/include/asm/mach-pmcs-msp71xx/gpio.h
Removing arch/mips/include/asm/kspd.h
Removing arch/mips/dec/promcon.c
Removing arch/mips/configs/wrppmc_defconfig
Removing arch/mips/cavium-octeon/serial.c
Auto-merging arch/mips/Kconfig
Merge made by the 'recursive' strategy.
 arch/mips/Kbuild.platforms                         |   1 -
 arch/mips/Kconfig                                  |  76 +++---
 arch/mips/Makefile                                 |   4 +
 arch/mips/ath79/mach-ap136.c                       |   2 +-
 arch/mips/bcm63xx/Kconfig                          |   9 +-
 arch/mips/bcm63xx/boards/board_bcm963xx.c          |  53 +++-
 arch/mips/bcm63xx/clk.c                            |  30 ++-
 arch/mips/bcm63xx/cpu.c                            |  28 ++-
 arch/mips/bcm63xx/dev-flash.c                      |   1 +
 arch/mips/bcm63xx/dev-spi.c                        |   6 +-
 arch/mips/bcm63xx/dev-uart.c                       |   3 +-
 arch/mips/bcm63xx/irq.c                            |  23 ++
 arch/mips/bcm63xx/nvram.c                          |  10 +
 arch/mips/bcm63xx/prom.c                           |  49 +++-
 arch/mips/bcm63xx/reset.c                          |  29 ++-
 arch/mips/bcm63xx/setup.c                          |   3 +
 arch/mips/boot/compressed/Makefile                 |   2 +
 arch/mips/boot/compressed/uart-16550.c             |  22 +-
 arch/mips/cavium-octeon/Kconfig                    |  17 +-
 arch/mips/cavium-octeon/Makefile                   |   5 +-
 arch/mips/cavium-octeon/Platform                   |   8 +-
 .../cavium-octeon/executive/cvmx-helper-board.c    |  13 +
 arch/mips/cavium-octeon/octeon-platform.c          |   9 +-
 arch/mips/cavium-octeon/serial.c                   | 109 ---------
 arch/mips/cavium-octeon/setup.c                    |  32 +--
 arch/mips/configs/cavium_octeon_defconfig          |   6 +-
 arch/mips/configs/wrppmc_defconfig                 |  97 --------
 arch/mips/dec/Makefile                             |   1 -
 arch/mips/dec/promcon.c                            |  54 -----
 arch/mips/fw/cfe/cfe_api.c                         |   4 +-
 arch/mips/include/asm/cop2.h                       |  29 +++
 arch/mips/include/asm/cpu-features.h               |  49 ++--
 arch/mips/include/asm/cpu.h                        |  23 +-
 arch/mips/include/asm/fw/cfe/cfe_api.h             |   4 +-
 arch/mips/include/asm/gic.h                        |   2 +-
 arch/mips/include/asm/io.h                         |  10 +
 arch/mips/include/asm/kspd.h                       |  32 ---
 arch/mips/include/asm/mach-ar7/spaces.h            |   7 +-
 arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h   | 112 +++++++++
 arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h  |   1 +
 arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h  |  52 +++-
 .../mips/include/asm/mach-bcm63xx/board_bcm963xx.h |   6 +
 arch/mips/include/asm/mach-bcm63xx/ioremap.h       |   4 +
 .../include/asm/mach-cavium-octeon/dma-coherence.h |   7 +
 .../asm/mach-cavium-octeon/kernel-entry-init.h     |   7 +-
 arch/mips/include/asm/mach-cavium-octeon/spaces.h  |  24 ++
 arch/mips/include/asm/mach-generic/dma-coherence.h |  12 +
 .../include/asm/mach-generic/kernel-entry-init.h   |   4 +-
 .../mips/include/asm/mach-ip27/kernel-entry-init.h |  47 ++++
 arch/mips/include/asm/mach-ip28/spaces.h           |   9 +-
 arch/mips/include/asm/mach-pmcs-msp71xx/gpio.h     |  46 ----
 arch/mips/include/asm/mach-wrppmc/mach-gt64120.h   |  83 -------
 arch/mips/include/asm/mach-wrppmc/war.h            |  24 --
 arch/mips/include/asm/mips-boards/generic.h        |   6 -
 arch/mips/include/asm/mipsregs.h                   |   2 +-
 arch/mips/include/asm/mmu_context.h                |   6 +-
 arch/mips/include/asm/netlogic/common.h            |  21 +-
 arch/mips/include/asm/netlogic/xlp-hal/pic.h       |   2 +-
 arch/mips/include/asm/netlogic/xlp-hal/xlp.h       |   1 +
 arch/mips/include/asm/netlogic/xlr/fmn.h           |  12 +-
 arch/mips/include/asm/octeon/cvmx-bootinfo.h       |   2 +
 arch/mips/include/asm/page.h                       |   6 +-
 arch/mips/include/asm/pci.h                        |   1 -
 arch/mips/include/asm/processor.h                  |  35 ++-
 arch/mips/include/asm/stackframe.h                 |  29 ++-
 arch/mips/include/asm/stackprotector.h             |  40 ++++
 arch/mips/include/asm/switch_to.h                  |  19 +-
 arch/mips/include/asm/thread_info.h                |  11 +-
 arch/mips/include/asm/xtalk/xtalk.h                |   9 +
 arch/mips/include/uapi/asm/fcntl.h                 |  16 +-
 arch/mips/include/uapi/asm/inst.h                  |   9 +-
 arch/mips/include/uapi/asm/msgbuf.h                |  12 +-
 arch/mips/include/uapi/asm/resource.h              |   2 +-
 arch/mips/include/uapi/asm/siginfo.h               |   4 +-
 arch/mips/include/uapi/asm/swab.h                  |  12 +-
 arch/mips/kernel/asm-offsets.c                     |   3 +
 arch/mips/kernel/branch.c                          |   1 -
 arch/mips/kernel/cpu-bugs64.c                      |   5 +
 arch/mips/kernel/cpu-probe.c                       |  12 +-
 arch/mips/kernel/head.S                            |  39 ---
 arch/mips/kernel/irq-gic.c                         |  15 +-
 arch/mips/kernel/mcount.S                          |   4 -
 arch/mips/kernel/octeon_switch.S                   |  34 +--
 arch/mips/kernel/proc.c                            |   4 +-
 arch/mips/kernel/process.c                         |   9 +-
 arch/mips/kernel/prom.c                            |   2 +-
 arch/mips/kernel/ptrace.c                          |  12 +
 arch/mips/kernel/r2300_switch.S                    |   7 +
 arch/mips/kernel/r4k_switch.S                      |   6 +
 arch/mips/kernel/rtlx.c                            |   1 -
 arch/mips/kernel/scall32-o32.S                     |   2 +-
 arch/mips/kernel/scall64-64.S                      |   2 +-
 arch/mips/kernel/scall64-n32.S                     |   2 +-
 arch/mips/kernel/scall64-o32.S                     |   2 +-
 arch/mips/kernel/signal.c                          |   5 +
 arch/mips/kernel/smp-bmips.c                       |  29 ++-
 arch/mips/kernel/traps.c                           | 104 +++++---
 arch/mips/kernel/unaligned.c                       |   8 +-
 arch/mips/kernel/watch.c                           |   8 +
 arch/mips/lantiq/prom.c                            |   2 +-
 arch/mips/lasat/sysctl.c                           |  14 +-
 arch/mips/loongson/common/cs5536/cs5536_isa.c      |  14 ++
 arch/mips/math-emu/cp1emu.c                        |   3 +
 arch/mips/mm/Makefile                              |   2 +-
 arch/mips/mm/cerr-sb1.c                            |   4 -
 arch/mips/mm/dma-default.c                         |   3 +
 arch/mips/mm/fault.c                               |  15 +-
 arch/mips/mm/page.c                                |   2 +-
 arch/mips/mm/tlb-funcs.S                           |  37 +++
 arch/mips/mm/tlbex.c                               | 183 ++++++++------
 arch/mips/mti-malta/Makefile                       |   1 -
 arch/mips/mti-malta/malta-int.c                    |   4 +-
 arch/mips/mti-malta/malta-reset.c                  |  33 +--
 arch/mips/mti-sead3/sead3-reset.c                  |   5 +-
 arch/mips/netlogic/Kconfig                         |  11 +
 arch/mips/netlogic/common/Makefile                 |   2 +
 arch/mips/netlogic/common/irq.c                    |   7 +-
 arch/mips/netlogic/common/nlm-dma.c                | 107 +++++++++
 arch/mips/netlogic/common/reset.S                  | 230 ++++++++++++++++++
 arch/mips/netlogic/common/smp.c                    |  18 +-
 arch/mips/netlogic/common/smpboot.S                | 194 +--------------
 arch/mips/netlogic/xlp/Makefile                    |   2 +-
 arch/mips/netlogic/xlp/cop2-ex.c                   | 118 +++++++++
 arch/mips/netlogic/xlp/dt.c                        |  99 ++++++++
 arch/mips/netlogic/xlp/setup.c                     |  95 ++------
 arch/mips/netlogic/xlp/wakeup.c                    |  26 +-
 arch/mips/netlogic/xlr/fmn.c                       |  18 +-
 arch/mips/netlogic/xlr/setup.c                     |   7 +
 arch/mips/netlogic/xlr/wakeup.c                    |   3 +-
 arch/mips/pci/Makefile                             |   7 +-
 arch/mips/pci/fixup-wrppmc.c                       |  37 ---
 arch/mips/pci/pci-bcm63xx.c                        |   3 +-
 arch/mips/pci/pci-ip27.c                           |   2 +
 .../{mti-malta/malta-pci.c => pci/pci-malta.c}     |   0
 arch/mips/pmcs-msp71xx/Makefile                    |   1 -
 arch/mips/pmcs-msp71xx/gpio.c                      | 216 -----------------
 arch/mips/pmcs-msp71xx/gpio_extended.c             | 146 -----------
 arch/mips/powertv/asic/asic_devices.c              |  13 +-
 arch/mips/ralink/of.c                              |   2 +-
 arch/mips/sgi-ip27/Makefile                        |   1 +
 arch/mips/sgi-ip27/ip27-irq-pci.c                  | 266 +++++++++++++++++++++
 arch/mips/sgi-ip27/ip27-irq.c                      | 214 -----------------
 arch/mips/sibyte/Kconfig                           |   3 +-
 arch/mips/sibyte/Platform                          |   5 +-
 arch/mips/sibyte/common/Makefile                   |   1 +
 arch/mips/sibyte/{sb1250 => common}/bus_watcher.c  |  14 +-
 arch/mips/sibyte/common/sb_tbprof.c                |   1 +
 arch/mips/sibyte/sb1250/Makefile                   |   1 -
 arch/mips/sni/pcimt.c                              |   2 +
 arch/mips/sni/pcit.c                               |  16 +-
 arch/mips/wrppmc/Makefile                          |  12 -
 arch/mips/wrppmc/Platform                          |   7 -
 arch/mips/wrppmc/irq.c                             |  56 -----
 arch/mips/wrppmc/pci.c                             |  52 ----
 arch/mips/wrppmc/reset.c                           |  41 ----
 arch/mips/wrppmc/serial.c                          |  80 -------
 arch/mips/wrppmc/setup.c                           | 128 ----------
 arch/mips/wrppmc/time.c                            |  39 ---
 drivers/ata/Kconfig                                |   2 +-
 drivers/char/hw_random/Kconfig                     |   2 +-
 drivers/edac/Kconfig                               |   6 +-
 drivers/i2c/busses/Kconfig                         |   2 +-
 drivers/net/ethernet/octeon/Kconfig                |   2 +-
 drivers/net/phy/Kconfig                            |   2 +-
 drivers/rapidio/switches/idt_gen2.c                |   2 +
 drivers/spi/Kconfig                                |   2 +-
 drivers/ssb/Kconfig                                |   2 +-
 drivers/staging/octeon/Kconfig                     |   2 +-
 drivers/tty/serial/8250/8250_dw.c                  | 108 ++++++---
 drivers/usb/host/Kconfig                           |   4 +-
 drivers/watchdog/Kconfig                           |   2 +-
 drivers/watchdog/sb_wdog.c                         |   2 +-
 include/uapi/linux/Kbuild                          |   1 +
 include/uapi/linux/bcm933xx_hcs.h                  |  24 ++
 kernel/irq/irqdomain.c                             |  12 -
 lib/Kconfig.debug                                  |   2 +-
 176 files changed, 2301 insertions(+), 2376 deletions(-)
 delete mode 100644 arch/mips/cavium-octeon/serial.c
 delete mode 100644 arch/mips/configs/wrppmc_defconfig
 delete mode 100644 arch/mips/dec/promcon.c
 delete mode 100644 arch/mips/include/asm/kspd.h
 create mode 100644 arch/mips/include/asm/mach-cavium-octeon/spaces.h
 delete mode 100644 arch/mips/include/asm/mach-pmcs-msp71xx/gpio.h
 delete mode 100644 arch/mips/include/asm/mach-wrppmc/mach-gt64120.h
 delete mode 100644 arch/mips/include/asm/mach-wrppmc/war.h
 create mode 100644 arch/mips/include/asm/stackprotector.h
 create mode 100644 arch/mips/mm/tlb-funcs.S
 create mode 100644 arch/mips/netlogic/common/nlm-dma.c
 create mode 100644 arch/mips/netlogic/common/reset.S
 create mode 100644 arch/mips/netlogic/xlp/cop2-ex.c
 create mode 100644 arch/mips/netlogic/xlp/dt.c
 delete mode 100644 arch/mips/pci/fixup-wrppmc.c
 rename arch/mips/{mti-malta/malta-pci.c => pci/pci-malta.c} (100%)
 delete mode 100644 arch/mips/pmcs-msp71xx/gpio.c
 delete mode 100644 arch/mips/pmcs-msp71xx/gpio_extended.c
 create mode 100644 arch/mips/sgi-ip27/ip27-irq-pci.c
 rename arch/mips/sibyte/{sb1250 => common}/bus_watcher.c (94%)
 delete mode 100644 arch/mips/wrppmc/Makefile
 delete mode 100644 arch/mips/wrppmc/Platform
 delete mode 100644 arch/mips/wrppmc/irq.c
 delete mode 100644 arch/mips/wrppmc/pci.c
 delete mode 100644 arch/mips/wrppmc/reset.c
 delete mode 100644 arch/mips/wrppmc/serial.c
 delete mode 100644 arch/mips/wrppmc/setup.c
 delete mode 100644 arch/mips/wrppmc/time.c
 create mode 100644 include/uapi/linux/bcm933xx_hcs.h
Merging openrisc/for-upstream (6af6095 openrisc: remove HAVE_VIRT_TO_BUS)
$ git merge --no-ff openrisc/for-upstream
Already up-to-date.
Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
$ git merge --no-ff parisc/for-next
Already up-to-date.
Merging parisc-hd/for-next (c069114 mn10300: Fix include dependency in irqflags.h et al.)
$ git merge --no-ff parisc-hd/for-next
Already up-to-date.
Merging powerpc/next (1d8b368 pstore: Add hsize argument in write_buf call of pstore_ftrace_call)
$ git merge --no-ff powerpc/next
Already up-to-date.
Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
$ git merge --no-ff 4xx/next
Already up-to-date.
Merging mpc5xxx/next (dd0120d powerpc/mpc512x: enable USB support in defconfig)
$ git merge --no-ff mpc5xxx/next
Already up-to-date.
Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
$ git merge --no-ff galak/next
Already up-to-date.
Merging s390/features (2bec2ca s390/ptrace: PTRACE_TE_ABORT_RAND)
$ git merge --no-ff s390/features
Merge made by the 'recursive' strategy.
 arch/s390/include/asm/processor.h   | 10 ++++++-
 arch/s390/include/asm/switch_to.h   |  4 +--
 arch/s390/include/uapi/asm/ptrace.h |  1 +
 arch/s390/kernel/ptrace.c           | 52 +++++++++++++++++++++++++++++--------
 4 files changed, 53 insertions(+), 14 deletions(-)
Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest)
$ git merge --no-ff sh/sh-latest
Resolved 'arch/sh/kernel/cpu/sh2a/Makefile' 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
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 0010507] 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 (f8ce1fa Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux)
$ git merge --no-ff sparc-next/master
Already up-to-date.
Merging tile/master (317ddd2 Linux 3.10-rc5)
$ git merge --no-ff tile/master
Already up-to-date.
Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL)
$ git merge --no-ff unicore32/unicore32
Already up-to-date.
Merging xtensa/for_next (72b4a6b xtensa: ccount based sched_clock)
$ git merge --no-ff xtensa/for_next
Auto-merging arch/xtensa/include/asm/pgtable.h
Merge made by the 'recursive' strategy.
 arch/xtensa/Kconfig                  |   2 +
 arch/xtensa/boot/.gitignore          |   2 +
 arch/xtensa/boot/boot-elf/.gitignore |   1 +
 arch/xtensa/boot/lib/.gitignore      |   3 +
 arch/xtensa/include/asm/cmpxchg.h    |   1 +
 arch/xtensa/include/asm/delay.h      |  13 +---
 arch/xtensa/include/asm/pgtable.h    | 140 +++++++++++++++++++++--------------
 arch/xtensa/include/asm/platform.h   |   5 --
 arch/xtensa/include/asm/timex.h      |  12 +--
 arch/xtensa/kernel/.gitignore        |   1 +
 arch/xtensa/kernel/entry.S           |   7 +-
 arch/xtensa/kernel/pci.c             |  10 +--
 arch/xtensa/kernel/platform.c        |   3 +-
 arch/xtensa/kernel/time.c            | 123 +++++++++++++++++++++---------
 arch/xtensa/mm/tlb.c                 |   7 +-
 arch/xtensa/platforms/iss/network.c  |   2 +-
 arch/xtensa/platforms/xtfpga/setup.c |   5 +-
 arch/xtensa/variants/s6000/delay.c   |   6 +-
 18 files changed, 207 insertions(+), 136 deletions(-)
 create mode 100644 arch/xtensa/boot/.gitignore
 create mode 100644 arch/xtensa/boot/boot-elf/.gitignore
 create mode 100644 arch/xtensa/boot/lib/.gitignore
 create mode 100644 arch/xtensa/kernel/.gitignore
Merging btrfs/next (cbacd76 Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into next)
$ git merge --no-ff btrfs/next
Resolved 'fs/btrfs/free-space-cache.c' using previous resolution.
Removing fs/btrfs/version.h
Auto-merging fs/btrfs/ioctl.c
Auto-merging fs/btrfs/inode.c
Auto-merging fs/btrfs/free-space-cache.c
CONFLICT (content): Merge conflict in fs/btrfs/free-space-cache.c
Auto-merging fs/btrfs/file.c
Auto-merging fs/btrfs/extent_io.c
Auto-merging fs/btrfs/disk-io.c
Auto-merging fs/btrfs/delayed-inode.c
Auto-merging fs/btrfs/ctree.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 5080b94] Merge remote-tracking branch 'btrfs/next'
$ git diff -M --stat --summary HEAD^..
 fs/btrfs/backref.c           |  72 ++++---
 fs/btrfs/backref.h           |   2 -
 fs/btrfs/ctree.c             | 118 ++++------
 fs/btrfs/ctree.h             | 105 +++++++--
 fs/btrfs/delayed-inode.c     |  14 --
 fs/btrfs/dev-replace.c       |   6 +-
 fs/btrfs/disk-io.c           | 483 ++++++++++++++++++++++++-----------------
 fs/btrfs/disk-io.h           |  32 ++-
 fs/btrfs/export.c            |   5 -
 fs/btrfs/extent-tree.c       | 315 +++++++++++++++++++++------
 fs/btrfs/extent_io.c         |  41 +++-
 fs/btrfs/extent_io.h         |   1 +
 fs/btrfs/file-item.c         | 144 +++++--------
 fs/btrfs/file.c              | 150 +++++++++++--
 fs/btrfs/free-space-cache.c  | 103 ++++-----
 fs/btrfs/free-space-cache.h  |   2 -
 fs/btrfs/inode.c             | 501 +++++++++++++++++++------------------------
 fs/btrfs/ioctl.c             |  74 ++++---
 fs/btrfs/lzo.c               |   4 +-
 fs/btrfs/ordered-data.c      | 128 +++++++----
 fs/btrfs/ordered-data.h      |  27 +--
 fs/btrfs/qgroup.c            | 283 +++++++++++++++---------
 fs/btrfs/relocation.c        | 102 ++++++---
 fs/btrfs/root-tree.c         | 201 +++++++----------
 fs/btrfs/scrub.c             |  90 ++++----
 fs/btrfs/send.c              | 235 +++++++++++---------
 fs/btrfs/super.c             |  25 ++-
 fs/btrfs/transaction.c       | 322 ++++++++++++++-------------
 fs/btrfs/transaction.h       |  50 +++--
 fs/btrfs/tree-log.c          |  41 ++--
 fs/btrfs/ulist.c             |  15 ++
 fs/btrfs/version.h           |   4 -
 fs/btrfs/volumes.c           | 351 ++++++++++++++----------------
 fs/btrfs/volumes.h           |   7 +-
 include/trace/events/btrfs.h |  35 +--
 include/uapi/linux/btrfs.h   |  42 +++-
 36 files changed, 2391 insertions(+), 1739 deletions(-)
 delete mode 100644 fs/btrfs/version.h
Merging ceph/master (bf09339 ceph: Reconstruct the func ceph_reserve_caps.)
$ git merge --no-ff ceph/master
Auto-merging fs/ceph/mds_client.c
Auto-merging fs/ceph/locks.c
Auto-merging fs/ceph/file.c
Auto-merging fs/ceph/addr.c
Merge made by the 'recursive' strategy.
 drivers/block/rbd.c             | 206 +++++++++++++++++++++++-----------------
 fs/ceph/addr.c                  |  88 ++++++++---------
 fs/ceph/caps.c                  |  58 +++++------
 fs/ceph/file.c                  |   2 -
 fs/ceph/locks.c                 |   2 +-
 fs/ceph/mds_client.c            |   6 +-
 fs/ceph/mdsmap.c                |  42 ++++----
 fs/ceph/super.h                 |   2 +-
 fs/ceph/xattr.c                 |   9 +-
 include/linux/ceph/osd_client.h |   1 -
 net/ceph/osd_client.c           |  49 +++++-----
 11 files changed, 248 insertions(+), 217 deletions(-)
Merging cifs/for-next (6658b9f [CIFS] use sensible file nlink values if unprovided)
$ git merge --no-ff cifs/for-next
Merge made by the 'recursive' strategy.
 fs/cifs/cifsencrypt.c   | 195 +++++++++++++++++++++---------------------------
 fs/cifs/cifsproto.h     |   1 -
 fs/cifs/connect.c       |   6 --
 fs/cifs/inode.c         |   5 ++
 fs/cifs/smb2transport.c |  90 +++++++++++++++++++++-
 5 files changed, 179 insertions(+), 118 deletions(-)
Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
$ git merge --no-ff configfs/linux-next
Already up-to-date.
Merging ecryptfs/next (0df5ed6 eCryptfs: Make extent and scatterlist crypt function parameters similar)
$ git merge --no-ff ecryptfs/next
Auto-merging fs/ecryptfs/crypto.c
Merge made by the 'recursive' strategy.
 fs/ecryptfs/crypto.c    | 337 +++++++++++-------------------------------------
 fs/ecryptfs/messaging.c |   3 +-
 2 files changed, 79 insertions(+), 261 deletions(-)
Merging ext3/for_next (e628753 quota: Convert use of typedef ctl_table to struct ctl_table)
$ git merge --no-ff ext3/for_next
Merge made by the 'recursive' strategy.
 fs/ext3/fsync.c  |  8 ++++++--
 fs/ext3/super.c  | 13 ++++++++++++-
 fs/quota/dquot.c |  6 +++---
 3 files changed, 21 insertions(+), 6 deletions(-)
Merging ext4/dev (6ae06ff ext4: optimize starting extent in ext4_ext_rm_leaf())
$ git merge --no-ff ext4/dev
Already up-to-date.
Merging f2fs/dev (42daabf Merge tag 'late-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
$ git merge --no-ff f2fs/dev
Already up-to-date.
Merging fscache/fscache (bcd7351 Merge tag 'fscache-20130702' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs)
$ git merge --no-ff fscache/fscache
Already up-to-date.
Merging fuse/for-next (e5c5f05 fuse: fix alignment in short read optimization for async_dio)
$ git merge --no-ff fuse/for-next
Already up-to-date.
Merging gfs2/master (a01aedf GFS2: Reserve journal space for quota change in do_grow)
$ git merge --no-ff gfs2/master
Already up-to-date.
Merging jfs/jfs-next (eb8630d jfs: Update jfs_error)
$ git merge --no-ff jfs/jfs-next
Auto-merging fs/jfs/namei.c
Auto-merging fs/jfs/jfs_metapage.c
Auto-merging fs/jfs/jfs_dtree.c
Merge made by the 'recursive' strategy.
 fs/jfs/jfs_dmap.c       | 70 +++++++++++++++++++------------------------------
 fs/jfs/jfs_dtree.c      | 37 +++++++++++++-------------
 fs/jfs/jfs_extent.c     |  2 +-
 fs/jfs/jfs_imap.c       | 69 ++++++++++++++++++++----------------------------
 fs/jfs/jfs_metapage.c   |  5 ++--
 fs/jfs/jfs_superblock.h |  1 +
 fs/jfs/jfs_txnmgr.c     |  2 +-
 fs/jfs/jfs_xtree.c      | 62 +++++++++++++++++++++----------------------
 fs/jfs/namei.c          |  2 +-
 fs/jfs/resize.c         |  2 +-
 fs/jfs/super.c          | 22 +++++++++-------
 fs/jfs/xattr.c          |  8 +++---
 12 files changed, 128 insertions(+), 154 deletions(-)
Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found)
$ git merge --no-ff 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 (959d921 Merge branch 'labeled-nfs' into linux-next)
$ git merge --no-ff nfs/linux-next
Auto-merging security/smack/smack_lsm.c
Auto-merging security/selinux/hooks.c
Auto-merging net/sunrpc/sched.c
Auto-merging include/linux/security.h
Auto-merging fs/nfs/nfs4state.c
Auto-merging fs/nfs/nfs4proc.c
Auto-merging fs/nfs/nfs3proc.c
Auto-merging fs/nfs/inode.c
Auto-merging fs/nfs/dir.c
Auto-merging fs/nfs/callback.c
Merge made by the 'recursive' strategy.
 fs/nfs/Kconfig                      |  14 +
 fs/nfs/Makefile                     |   6 +-
 fs/nfs/blocklayout/blocklayout.c    |   3 +-
 fs/nfs/callback.c                   |   1 +
 fs/nfs/callback.h                   |   3 +
 fs/nfs/callback_proc.c              |   3 +-
 fs/nfs/callback_xdr.c               |  52 ++-
 fs/nfs/client.c                     |   4 +-
 fs/nfs/dir.c                        |  75 ++--
 fs/nfs/dns_resolve.c                |  32 +-
 fs/nfs/getroot.c                    |   2 +-
 fs/nfs/idmap.c                      |  56 ++-
 fs/nfs/inode.c                      | 136 +++++--
 fs/nfs/internal.h                   |   3 +-
 fs/nfs/mount_clnt.c                 |  14 +-
 fs/nfs/namespace.c                  |   2 +-
 fs/nfs/nfs3proc.c                   |   7 +-
 fs/nfs/nfs4_fs.h                    |   8 +-
 fs/nfs/nfs4client.c                 |  15 +-
 fs/nfs/nfs4file.c                   |   1 -
 fs/nfs/nfs4filelayout.c             |   3 +-
 fs/nfs/nfs4filelayout.h             |   3 +-
 fs/nfs/nfs4filelayoutdev.c          |   8 +-
 fs/nfs/nfs4proc.c                   | 687 ++++++++++++++++++++++++++++++------
 fs/nfs/nfs4session.c                |  40 +--
 fs/nfs/nfs4session.h                |   7 +-
 fs/nfs/nfs4state.c                  |  36 +-
 fs/nfs/nfs4super.c                  |  14 +-
 fs/nfs/nfs4xdr.c                    | 182 ++++++++--
 fs/nfs/objlayout/objlayout.c        |   4 +-
 fs/nfs/pnfs.c                       |  42 +--
 fs/nfs/pnfs.h                       |   6 +-
 fs/nfs/proc.c                       |  13 +-
 fs/nfs/super.c                      | 199 ++++++-----
 fs/nfsd/nfsd.h                      |   6 +
 include/linux/nfs4.h                |  22 ++
 include/linux/nfs_fs.h              |  27 +-
 include/linux/nfs_fs_sb.h           |   8 +-
 include/linux/nfs_xdr.h             |  20 +-
 include/linux/security.h            |  57 ++-
 include/linux/sunrpc/sched.h        |  20 --
 net/sunrpc/clnt.c                   |  71 ++--
 net/sunrpc/rpc_pipe.c               |   8 +-
 net/sunrpc/sched.c                  |  19 +-
 security/capability.c               |  19 +-
 security/security.c                 |  24 +-
 security/selinux/hooks.c            |  92 ++++-
 security/selinux/include/security.h |   2 +
 security/selinux/ss/policydb.c      |   5 +-
 security/smack/smack_lsm.c          |  11 +
 50 files changed, 1550 insertions(+), 542 deletions(-)
Merging nfsd/nfsd-next (0bebc63 sunrpc: Don't schedule an upcall on a replaced cache entry.)
$ git merge --no-ff nfsd/nfsd-next
Auto-merging security/capability.c
Auto-merging net/sunrpc/auth_gss/svcauth_gss.c
Auto-merging fs/nfsd/vfs.c
Auto-merging fs/nfsd/nfs4state.c
Merge made by the 'recursive' strategy.
 fs/nfsd/Kconfig                       |  16 +++
 fs/nfsd/nfs4proc.c                    |  44 +++++++-
 fs/nfsd/nfs4state.c                   | 202 +++++++++++++++++++++++-----------
 fs/nfsd/nfs4xdr.c                     | 163 +++++++++++++++++++++++----
 fs/nfsd/nfsd.h                        |  20 +++-
 fs/nfsd/state.h                       |   1 +
 fs/nfsd/vfs.c                         |  28 +++++
 fs/nfsd/vfs.h                         |   7 +-
 fs/nfsd/xdr4.h                        |   4 +
 include/linux/sunrpc/cache.h          |  49 ++++-----
 include/linux/sunrpc/gss_api.h        |   2 +
 include/linux/sunrpc/svcauth.h        |  11 ++
 net/sunrpc/auth_gss/gss_mech_switch.c |   5 +-
 net/sunrpc/auth_gss/svcauth_gss.c     |  10 +-
 net/sunrpc/cache.c                    |  83 ++++++++------
 net/sunrpc/svcauth_unix.c             |   4 +-
 net/sunrpc/svcsock.c                  |   9 +-
 net/sunrpc/xprtsock.c                 |   1 -
 security/capability.c                 |   2 +-
 19 files changed, 492 insertions(+), 169 deletions(-)
Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
$ git merge --no-ff ocfs2/linux-next
Auto-merging fs/ocfs2/dlm/dlmrecovery.c
Auto-merging fs/ocfs2/dlm/dlmmaster.c
Auto-merging fs/ocfs2/cluster/heartbeat.c
Merge made by the 'recursive' strategy.
 fs/ocfs2/cluster/heartbeat.c | 40 +++++++++-------------------------------
 fs/ocfs2/cluster/masklog.h   |  3 ++-
 fs/ocfs2/dlm/dlmmaster.c     |  8 +++++++-
 fs/ocfs2/dlm/dlmrecovery.c   |  7 +++++++
 4 files changed, 25 insertions(+), 33 deletions(-)
Merging omfs/for-next (976d167 Linux 3.1-rc9)
$ git merge --no-ff omfs/for-next
Already up-to-date.
Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
$ git merge --no-ff squashfs/master
Already up-to-date.
Merging v9fs/for-next (59b3e32 fs/9p: Remove the unused variable "err" in v9fs_vfs_getattr())
$ git merge --no-ff v9fs/for-next
Auto-merging net/9p/client.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                |   5 ++
 fs/9p/Kconfig              |  13 +++++
 fs/9p/Makefile             |   4 +-
 fs/9p/vfs_inode.c          |   2 -
 fs/9p/xattr.c              |   4 ++
 fs/9p/xattr.h              |   2 +
 fs/9p/xattr_security.c     |  80 +++++++++++++++++++++++++++
 fs/9p/xattr_trusted.c      |  80 +++++++++++++++++++++++++++
 include/net/9p/transport.h |   6 +++
 include/trace/events/9p.h  |  28 ++--------
 net/9p/client.c            |  70 ++++++++++++++----------
 net/9p/trans_fd.c          |  40 +++++++++++++-
 net/9p/trans_rdma.c        | 132 ++++++++++++++++++++++++++++-----------------
 13 files changed, 362 insertions(+), 104 deletions(-)
 create mode 100644 fs/9p/xattr_security.c
 create mode 100644 fs/9p/xattr_trusted.c
Merging ubifs/linux-next (c1be5a5 Linux 3.9)
$ git merge --no-ff ubifs/linux-next
Already up-to-date.
Merging xfs/for-next (83e782e xfs: Remove incore use of XFS_OQUOTA_ENFD and XFS_OQUOTA_CHKD)
$ git merge --no-ff xfs/for-next
Resolved 'fs/xfs/xfs_log_cil.c' using previous resolution.
Resolved 'fs/xfs/xfs_log_recover.c' using previous resolution.
Auto-merging fs/xfs/xfs_vnodeops.c
Auto-merging fs/xfs/xfs_trace.h
Auto-merging fs/xfs/xfs_symlink.c
Auto-merging fs/xfs/xfs_super.c
Auto-merging fs/xfs/xfs_quota.h
Auto-merging fs/xfs/xfs_qm_syscalls.c
Auto-merging fs/xfs/xfs_qm.c
Auto-merging fs/xfs/xfs_mount.c
Auto-merging fs/xfs/xfs_log_recover.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_log_recover.c
Auto-merging fs/xfs/xfs_log_cil.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_log_cil.c
Auto-merging fs/xfs/xfs_iops.c
Auto-merging fs/xfs/xfs_inode.c
Auto-merging fs/xfs/xfs_fsops.c
Auto-merging fs/xfs/xfs_dquot.c
Auto-merging fs/xfs/xfs_dir2_leaf.c
Auto-merging fs/xfs/xfs_dfrag.c
Auto-merging fs/xfs/xfs_buf_item.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 0f6db09] Merge remote-tracking branch 'xfs/for-next'
$ git diff -M --stat --summary HEAD^..
 fs/xfs/Makefile           |   1 +
 fs/xfs/xfs_alloc.c        |  24 ++++--
 fs/xfs/xfs_bmap_btree.h   |   2 +
 fs/xfs/xfs_buf_item.c     |  87 ++++++++++++++-------
 fs/xfs/xfs_buf_item.h     |   4 +-
 fs/xfs/xfs_dfrag.c        |   8 +-
 fs/xfs/xfs_dir2_leaf.c    |   3 +
 fs/xfs/xfs_dquot.c        |  16 ++--
 fs/xfs/xfs_dquot.h        |   4 -
 fs/xfs/xfs_fsops.c        |   2 +-
 fs/xfs/xfs_ialloc.c       |  74 +++++++++++++-----
 fs/xfs/xfs_ialloc.h       |   8 ++
 fs/xfs/xfs_icache.c       |   3 +-
 fs/xfs/xfs_icache.h       |   1 -
 fs/xfs/xfs_icreate_item.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++
 fs/xfs/xfs_icreate_item.h |  52 +++++++++++++
 fs/xfs/xfs_inode.c        |  68 ++++++++--------
 fs/xfs/xfs_iomap.c        |  13 ++++
 fs/xfs/xfs_iops.c         |   3 +-
 fs/xfs/xfs_itable.c       |   5 +-
 fs/xfs/xfs_log.c          |  22 +++++-
 fs/xfs/xfs_log.h          |   5 +-
 fs/xfs/xfs_log_cil.c      |  75 ++++++++++++------
 fs/xfs/xfs_log_recover.c  | 114 +++++++++++++++++++++++++--
 fs/xfs/xfs_mount.c        |  92 +++++++++++++++-------
 fs/xfs/xfs_mount.h        |   4 -
 fs/xfs/xfs_qm.c           | 175 +++++++++++++++++++++--------------------
 fs/xfs/xfs_qm.h           |  83 ++++++++++++++------
 fs/xfs/xfs_qm_syscalls.c  |  51 ++++++------
 fs/xfs/xfs_quota.h        |  47 ++++++-----
 fs/xfs/xfs_quotaops.c     |   6 +-
 fs/xfs/xfs_sb.h           |   6 ++
 fs/xfs/xfs_super.c        |  39 ++++++----
 fs/xfs/xfs_symlink.c      |  51 +++++++++++-
 fs/xfs/xfs_symlink.h      |   2 +-
 fs/xfs/xfs_sysctl.c       |  26 +++----
 fs/xfs/xfs_trace.h        |   5 ++
 fs/xfs/xfs_trans.c        | 118 ++++++++++++++++++----------
 fs/xfs/xfs_trans.h        |  16 ++--
 fs/xfs/xfs_trans_buf.c    |  34 +++++++-
 fs/xfs/xfs_trans_dquot.c  |  87 +++++++++------------
 fs/xfs/xfs_trans_inode.c  |  11 +++
 fs/xfs/xfs_vnodeops.c     |  15 +---
 43 files changed, 1180 insertions(+), 477 deletions(-)
 create mode 100644 fs/xfs/xfs_icreate_item.c
 create mode 100644 fs/xfs/xfs_icreate_item.h
Merging vfs/for-next (d405be4 ext4: ->tmpfile() support)
$ git merge --no-ff vfs/for-next
Auto-merging fs/coredump.c
Merge made by the 'recursive' strategy.
 arch/ia64/kernel/elfcore.c                   | 13 ++---
 arch/powerpc/include/asm/spu.h               |  3 +-
 arch/powerpc/platforms/cell/spu_syscalls.c   |  4 +-
 arch/powerpc/platforms/cell/spufs/coredump.c | 64 ++++----------------
 arch/powerpc/platforms/cell/spufs/spufs.h    |  2 +-
 arch/x86/ia32/ia32_aout.c                    | 20 +++----
 arch/x86/um/elfcore.c                        | 16 ++---
 fs/binfmt_aout.c                             |  9 ++-
 fs/binfmt_elf.c                              | 84 +++++++++++----------------
 fs/binfmt_elf_fdpic.c                        | 87 ++++++++++------------------
 fs/coredump.c                                | 62 ++++++++++++--------
 include/linux/binfmts.h                      |  1 +
 include/linux/coredump.h                     |  5 +-
 include/linux/elf.h                          |  7 ++-
 include/linux/elfcore.h                      |  5 +-
 kernel/elfcore.c                             |  6 +-
 16 files changed, 152 insertions(+), 236 deletions(-)
Merging pci/next (a0f75f9 Merge branch 'pci/misc' into next)
$ git merge --no-ff pci/next
Already up-to-date.
Merging hid/for-next (d750045 Merge branch 'for-3.11/upstream' into for-next)
$ git merge --no-ff hid/for-next
Merge made by the 'recursive' strategy.
Merging i2c/i2c/for-next (97191d7 i2c-designware: use div_u64 to fix link)
$ git merge --no-ff i2c/i2c/for-next
Already up-to-date.
Merging jdelvare-hwmon/master (1aaf6d3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge --no-ff jdelvare-hwmon/master
Already up-to-date.
Merging hwmon-staging/hwmon-next (a50d9a4 hwmon: (ds1621) Fix temperature rounding operations)
$ git merge --no-ff hwmon-staging/hwmon-next
Already up-to-date.
Merging v4l-dvb/master (17a6961 Merge /home/v4l/v4l/patchwork)
$ git merge --no-ff v4l-dvb/master
Removing include/media/v4l2-chip-ident.h
Auto-merging drivers/usb/gadget/f_uvc.c
Auto-merging drivers/media/platform/exynos4-is/Kconfig
Auto-merging drivers/media/platform/Kconfig
Auto-merging drivers/media/pci/ivtv/ivtv-driver.c
Auto-merging drivers/media/i2c/tvaudio.c
Auto-merging MAINTAINERS
Auto-merging Documentation/media-framework.txt
Removing Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml
Merge made by the 'recursive' strategy.
 Documentation/DocBook/media/v4l/compat.xml         |   14 +-
 Documentation/DocBook/media/v4l/v4l2.xml           |   11 +-
 .../DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml  |  271 --
 .../DocBook/media/v4l/vidioc-dbg-g-chip-info.xml   |   20 +-
 .../DocBook/media/v4l/vidioc-dbg-g-register.xml    |   64 +-
 .../DocBook/media/v4l/vidioc-querystd.xml          |    3 +-
 .../devicetree/bindings/media/exynos-fimc-lite.txt |    6 +-
 .../devicetree/bindings/media/i2c/mt9p031.txt      |   40 +
 .../devicetree/bindings/media/i2c/tvp514x.txt      |   44 +
 .../devicetree/bindings/media/samsung-fimc.txt     |   26 +-
 .../bindings/media/samsung-mipi-csis.txt           |    4 +-
 .../devicetree/bindings/media/sh_mobile_ceu.txt    |   18 +
 Documentation/media-framework.txt                  |    2 +-
 Documentation/video4linux/CARDLIST.bttv            |    3 +
 Documentation/video4linux/CARDLIST.saa7134         |    1 +
 Documentation/video4linux/CARDLIST.tuner           |    6 +-
 Documentation/video4linux/fimc.txt                 |   21 +-
 Documentation/video4linux/v4l2-framework.txt       |  103 +-
 Documentation/zh_CN/video4linux/v4l2-framework.txt |   13 +-
 MAINTAINERS                                        |   18 +-
 arch/arm/mach-davinci/board-dm365-evm.c            |    1 -
 drivers/base/dma-buf.c                             |    5 +-
 drivers/media/common/saa7146/saa7146_video.c       |   23 -
 drivers/media/common/siano/smscoreapi.c            |   23 +-
 drivers/media/common/siano/smsdvb-main.c           |    1 +
 drivers/media/common/tveeprom.c                    |  142 +-
 drivers/media/dvb-core/dmxdev.c                    |    8 +-
 drivers/media/dvb-core/dvb-usb-ids.h               |    2 +
 drivers/media/dvb-frontends/au8522_decoder.c       |   21 -
 drivers/media/dvb-frontends/dib8000.c              |    4 +-
 drivers/media/dvb-frontends/drxk.h                 |    2 +-
 drivers/media/dvb-frontends/drxk_hard.c            | 3154 ++++++++++----------
 drivers/media/dvb-frontends/drxk_hard.h            |  277 +-
 drivers/media/dvb-frontends/stb0899_algo.c         |  105 +-
 drivers/media/dvb-frontends/stb0899_drv.c          |    7 +-
 drivers/media/dvb-frontends/stb0899_drv.h          |    5 +-
 drivers/media/i2c/Kconfig                          |   18 +
 drivers/media/i2c/Makefile                         |    2 +
 drivers/media/i2c/ad9389b.c                        |   35 +-
 drivers/media/i2c/adp1653.c                        |    5 +-
 drivers/media/i2c/adv7170.c                        |   16 +-
 drivers/media/i2c/adv7175.c                        |   12 +-
 drivers/media/i2c/adv7180.c                        |   79 +-
 drivers/media/i2c/adv7183.c                        |   80 +-
 drivers/media/i2c/adv7343.c                        |   10 -
 drivers/media/i2c/adv7393.c                        |   18 +-
 drivers/media/i2c/adv7604.c                        |   33 +-
 drivers/media/i2c/ak881x.c                         |   39 +-
 drivers/media/i2c/as3645a.c                        |    7 +-
 drivers/media/i2c/bt819.c                          |   26 +-
 drivers/media/i2c/bt856.c                          |   12 +-
 drivers/media/i2c/bt866.c                          |   16 +-
 drivers/media/i2c/cs5345.c                         |   25 +-
 drivers/media/i2c/cs53l32a.c                       |   14 +-
 drivers/media/i2c/cx25840/cx25840-core.c           |   72 +-
 drivers/media/i2c/cx25840/cx25840-core.h           |   34 +-
 drivers/media/i2c/cx25840/cx25840-ir.c             |    7 +-
 drivers/media/i2c/ir-kbd-i2c.c                     |   10 +-
 drivers/media/i2c/ks0127.c                         |   36 +-
 drivers/media/i2c/m52790.c                         |   22 +-
 drivers/media/i2c/m5mols/m5mols_core.c             |   43 +-
 drivers/media/i2c/ml86v7667.c                      |  431 +++
 drivers/media/i2c/msp3400-driver.c                 |   15 +-
 drivers/media/i2c/mt9m032.c                        |   13 +-
 drivers/media/i2c/mt9p031.c                        |   87 +-
 drivers/media/i2c/mt9t001.c                        |    4 +-
 drivers/media/i2c/mt9v011.c                        |   34 +-
 drivers/media/i2c/mt9v032.c                        |    8 +-
 drivers/media/i2c/noon010pc30.c                    |   41 +-
 drivers/media/i2c/ov7640.c                         |    6 +-
 drivers/media/i2c/ov7670.c                         |   26 +-
 drivers/media/i2c/s5c73m3/s5c73m3-core.c           |   88 +-
 drivers/media/i2c/s5c73m3/s5c73m3-spi.c            |    4 +-
 drivers/media/i2c/s5k6aa.c                         |   73 +-
 drivers/media/i2c/saa6588.c                        |   19 +-
 drivers/media/i2c/saa7110.c                        |   17 +-
 drivers/media/i2c/saa7115.c                        |  297 +-
 drivers/media/i2c/saa7127.c                        |   55 +-
 drivers/media/i2c/saa717x.c                        |   16 +-
 drivers/media/i2c/saa7185.c                        |   12 +-
 drivers/media/i2c/saa7191.c                        |   28 +-
 drivers/media/i2c/smiapp/smiapp-core.c             |   20 +-
 drivers/media/i2c/soc_camera/imx074.c              |   51 +-
 drivers/media/i2c/soc_camera/mt9m001.c             |   50 +-
 drivers/media/i2c/soc_camera/mt9m111.c             |   53 +-
 drivers/media/i2c/soc_camera/mt9t031.c             |   54 +-
 drivers/media/i2c/soc_camera/mt9t112.c             |   35 +-
 drivers/media/i2c/soc_camera/mt9v022.c             |   64 +-
 drivers/media/i2c/soc_camera/ov2640.c              |   35 +-
 drivers/media/i2c/soc_camera/ov5642.c              |   39 +-
 drivers/media/i2c/soc_camera/ov6650.c              |   29 +-
 drivers/media/i2c/soc_camera/ov772x.c              |   31 +-
 drivers/media/i2c/soc_camera/ov9640.c              |   35 +-
 drivers/media/i2c/soc_camera/ov9640.h              |    1 +
 drivers/media/i2c/soc_camera/ov9740.c              |   35 +-
 drivers/media/i2c/soc_camera/rj54n1cb0c.c          |   48 +-
 drivers/media/i2c/soc_camera/tw9910.c              |   33 +-
 drivers/media/i2c/sony-btf-mpx.c                   |    5 +-
 drivers/media/i2c/sr030pc30.c                      |  280 +-
 drivers/media/i2c/tda7432.c                        |    4 +-
 drivers/media/i2c/tda9840.c                        |   16 +-
 drivers/media/i2c/tea6415c.c                       |   16 +-
 drivers/media/i2c/tea6420.c                        |   16 +-
 drivers/media/i2c/ths7303.c                        |   81 +-
 drivers/media/i2c/ths8200.c                        |  556 ++++
 drivers/media/i2c/ths8200_regs.h                   |  161 +
 drivers/media/i2c/tlv320aic23b.c                   |    4 +-
 drivers/media/i2c/tvaudio.c                        |   14 +-
 drivers/media/i2c/tvp514x.c                        |   87 +-
 drivers/media/i2c/tvp5150.c                        |   50 +-
 drivers/media/i2c/tvp7002.c                        |  143 +-
 drivers/media/i2c/tw2804.c                         |    6 +-
 drivers/media/i2c/tw9903.c                         |    5 +-
 drivers/media/i2c/tw9906.c                         |    5 +-
 drivers/media/i2c/uda1342.c                        |    3 +-
 drivers/media/i2c/upd64031a.c                      |   24 +-
 drivers/media/i2c/upd64083.c                       |   24 +-
 drivers/media/i2c/vp27smpx.c                       |   12 +-
 drivers/media/i2c/vpx3220.c                        |   29 +-
 drivers/media/i2c/vs6624.c                         |   46 +-
 drivers/media/i2c/wm8739.c                         |   13 +-
 drivers/media/i2c/wm8775.c                         |   13 +-
 drivers/media/media-device.c                       |    3 +
 drivers/media/media-entity.c                       |   81 +-
 drivers/media/parport/bw-qcam.c                    |    2 +
 drivers/media/pci/Kconfig                          |    4 +-
 drivers/media/pci/b2c2/flexcop-pci.c               |   13 +-
 drivers/media/pci/bt8xx/bttv-cards.c               |   52 +-
 drivers/media/pci/bt8xx/bttv-driver.c              |   48 +-
 drivers/media/pci/bt8xx/bttv.h                     |    4 +
 drivers/media/pci/cx18/cx18-av-core.c              |   36 -
 drivers/media/pci/cx18/cx18-av-core.h              |    1 -
 drivers/media/pci/cx18/cx18-ioctl.c                |   82 +-
 drivers/media/pci/cx23885/cx23885-417.c            |    9 +-
 drivers/media/pci/cx23885/cx23885-ioctl.c          |  145 +-
 drivers/media/pci/cx23885/cx23885-ioctl.h          |    4 +-
 drivers/media/pci/cx23885/cx23885-video.c          |    9 +-
 drivers/media/pci/cx23885/cx23888-ir.c             |   31 -
 drivers/media/pci/cx88/cx88-cards.c                |   12 +-
 drivers/media/pci/cx88/cx88-core.c                 |    7 +
 drivers/media/pci/cx88/cx88-video.c                |   25 +-
 drivers/media/pci/cx88/cx88.h                      |    8 +-
 drivers/media/pci/dm1105/dm1105.c                  |   13 +-
 drivers/media/pci/ivtv/ivtv-driver.c               |    8 +-
 drivers/media/pci/ivtv/ivtv-ioctl.c                |   45 +-
 drivers/media/pci/mantis/hopper_cards.c            |   13 +-
 drivers/media/pci/mantis/mantis_cards.c            |   13 +-
 drivers/media/pci/mantis/mantis_vp1041.c           |    2 +-
 drivers/media/pci/pluto2/pluto2.c                  |   13 +-
 drivers/media/pci/pt1/pt1.c                        |   15 +-
 drivers/media/pci/saa7134/saa6752hs.c              |  525 +---
 drivers/media/pci/saa7134/saa7134-empress.c        |   33 +-
 drivers/media/pci/saa7134/saa7134-video.c          |  260 +-
 drivers/media/pci/saa7134/saa7134.h                |   17 +-
 drivers/media/pci/saa7146/mxb.c                    |   23 +-
 drivers/media/pci/saa7164/saa7164-core.c           |    8 +
 drivers/media/pci/saa7164/saa7164-encoder.c        |   58 +-
 drivers/media/pci/saa7164/saa7164-vbi.c            |   24 +-
 drivers/media/pci/saa7164/saa7164.h                |    5 +-
 drivers/media/pci/sta2x11/sta2x11_vip.c            |    3 +-
 drivers/media/pci/ttpci/budget-av.c                |    2 +-
 drivers/media/pci/ttpci/budget-ci.c                |    2 +-
 drivers/media/pci/zoran/zoran_card.c               |    2 +-
 drivers/media/pci/zoran/zoran_driver.c             |   23 -
 drivers/media/platform/Kconfig                     |    2 +-
 drivers/media/platform/blackfin/bfin_capture.c     |   81 +-
 drivers/media/platform/blackfin/ppi.c              |   12 +
 drivers/media/platform/coda.c                      |  635 ++--
 drivers/media/platform/coda.h                      |   11 +-
 drivers/media/platform/davinci/vpbe_display.c      |   31 +-
 drivers/media/platform/davinci/vpbe_osd.c          |   24 +-
 drivers/media/platform/davinci/vpif.c              |   45 +-
 drivers/media/platform/davinci/vpif_capture.c      |  160 +-
 drivers/media/platform/davinci/vpif_capture.h      |    5 +-
 drivers/media/platform/davinci/vpif_display.c      |  153 +-
 drivers/media/platform/davinci/vpif_display.h      |    5 +-
 drivers/media/platform/exynos-gsc/gsc-core.c       |    2 +-
 drivers/media/platform/exynos4-is/Kconfig          |    5 +
 drivers/media/platform/exynos4-is/Makefile         |    5 +-
 drivers/media/platform/exynos4-is/common.c         |   53 +
 drivers/media/platform/exynos4-is/common.h         |   16 +
 drivers/media/platform/exynos4-is/fimc-capture.c   |  412 +--
 drivers/media/platform/exynos4-is/fimc-core.c      |   11 -
 drivers/media/platform/exynos4-is/fimc-core.h      |   15 +-
 drivers/media/platform/exynos4-is/fimc-is-i2c.c    |    2 +-
 drivers/media/platform/exynos4-is/fimc-is-param.c  |   84 +-
 drivers/media/platform/exynos4-is/fimc-is-regs.c   |    4 +-
 drivers/media/platform/exynos4-is/fimc-is.c        |   12 +-
 drivers/media/platform/exynos4-is/fimc-is.h        |   12 +-
 drivers/media/platform/exynos4-is/fimc-isp.c       |  130 +-
 drivers/media/platform/exynos4-is/fimc-isp.h       |   21 +-
 drivers/media/platform/exynos4-is/fimc-lite-reg.c  |   55 +-
 drivers/media/platform/exynos4-is/fimc-lite-reg.h  |   10 +-
 drivers/media/platform/exynos4-is/fimc-lite.c      |  321 +-
 drivers/media/platform/exynos4-is/fimc-lite.h      |   35 +-
 drivers/media/platform/exynos4-is/fimc-m2m.c       |    1 +
 drivers/media/platform/exynos4-is/fimc-reg.c       |    7 +-
 drivers/media/platform/exynos4-is/media-dev.c      |  272 +-
 drivers/media/platform/exynos4-is/media-dev.h      |   54 +-
 drivers/media/platform/exynos4-is/mipi-csis.c      |   67 +-
 drivers/media/platform/fsl-viu.c                   |    2 +-
 drivers/media/platform/indycam.c                   |   12 -
 drivers/media/platform/m2m-deinterlace.c           |    1 +
 drivers/media/platform/marvell-ccic/cafe-driver.c  |    4 +-
 drivers/media/platform/marvell-ccic/mcam-core.c    |   67 +-
 drivers/media/platform/marvell-ccic/mcam-core.h    |    9 +-
 drivers/media/platform/marvell-ccic/mmp-driver.c   |    4 +-
 drivers/media/platform/mem2mem_testdev.c           |    3 +-
 drivers/media/platform/mx2_emmaprp.c               |    1 +
 drivers/media/platform/omap/omap_vout.c            |    3 +-
 drivers/media/platform/omap24xxcam.c               |    9 +-
 drivers/media/platform/omap24xxcam.h               |    3 +
 drivers/media/platform/omap3isp/isp.c              |   51 +-
 drivers/media/platform/omap3isp/ispccdc.c          |    2 +-
 drivers/media/platform/omap3isp/ispccp2.c          |   21 +-
 drivers/media/platform/omap3isp/ispcsi2.c          |    2 +-
 drivers/media/platform/omap3isp/ispqueue.h         |    1 +
 drivers/media/platform/omap3isp/ispvideo.c         |    6 +-
 drivers/media/platform/s3c-camif/camif-capture.c   |    2 +-
 drivers/media/platform/s3c-camif/camif-core.c      |    6 +-
 drivers/media/platform/s3c-camif/camif-regs.c      |    6 +-
 drivers/media/platform/s5p-mfc/s5p_mfc.c           |    2 +-
 drivers/media/platform/s5p-tv/hdmi_drv.c           |   39 +-
 drivers/media/platform/s5p-tv/mixer_drv.c          |   22 +-
 drivers/media/platform/s5p-tv/mixer_video.c        |    3 +-
 drivers/media/platform/s5p-tv/sdo_drv.c            |   22 +-
 drivers/media/platform/s5p-tv/sii9234_drv.c        |    4 +-
 drivers/media/platform/sh_veu.c                    |    5 +-
 drivers/media/platform/sh_vou.c                    |   34 +-
 drivers/media/platform/soc_camera/Kconfig          |   12 +-
 drivers/media/platform/soc_camera/Makefile         |    6 +-
 drivers/media/platform/soc_camera/atmel-isi.c      |   38 +-
 drivers/media/platform/soc_camera/mx1_camera.c     |   48 +-
 drivers/media/platform/soc_camera/mx2_camera.c     |   41 +-
 drivers/media/platform/soc_camera/mx3_camera.c     |   44 +-
 drivers/media/platform/soc_camera/omap1_camera.c   |   41 +-
 drivers/media/platform/soc_camera/pxa_camera.c     |   46 +-
 .../platform/soc_camera/sh_mobile_ceu_camera.c     |  642 ++--
 drivers/media/platform/soc_camera/sh_mobile_csi2.c |  161 +-
 drivers/media/platform/soc_camera/soc_camera.c     |  737 ++++-
 .../platform/soc_camera/soc_camera_platform.c      |   14 +-
 drivers/media/platform/soc_camera/soc_scale_crop.c |  402 +++
 drivers/media/platform/soc_camera/soc_scale_crop.h |   47 +
 drivers/media/platform/timblogiw.c                 |   11 +-
 drivers/media/platform/via-camera.c                |   24 +-
 drivers/media/radio/radio-keene.c                  |    7 +-
 drivers/media/radio/radio-sf16fmi.c                |  127 +-
 drivers/media/radio/radio-si476x.c                 |   11 -
 drivers/media/radio/radio-tea5764.c                |  190 +-
 drivers/media/radio/radio-timb.c                   |   81 +-
 drivers/media/radio/saa7706h.c                     |   66 +-
 drivers/media/radio/tef6862.c                      |   24 +-
 drivers/media/radio/wl128x/fmdrv.h                 |    2 +
 drivers/media/radio/wl128x/fmdrv_common.c          |   24 +-
 drivers/media/radio/wl128x/fmdrv_v4l2.c            |    8 +
 drivers/media/rc/gpio-ir-recv.c                    |    2 -
 drivers/media/rc/keymaps/Makefile                  |    1 +
 drivers/media/rc/keymaps/rc-delock-61959.c         |   83 +
 drivers/media/tuners/r820t.c                       |   18 +-
 drivers/media/usb/Kconfig                          |    5 +-
 drivers/media/usb/Makefile                         |    1 +
 drivers/media/usb/au0828/au0828-video.c            |   40 +-
 drivers/media/usb/cx231xx/cx231xx-417.c            |    1 -
 drivers/media/usb/cx231xx/cx231xx-avcore.c         |    1 -
 drivers/media/usb/cx231xx/cx231xx-cards.c          |    1 -
 drivers/media/usb/cx231xx/cx231xx-vbi.c            |    1 -
 drivers/media/usb/cx231xx/cx231xx-video.c          |  424 +--
 drivers/media/usb/cx231xx/cx231xx.h                |    2 +-
 drivers/media/usb/dvb-usb-v2/af9035.c              |   66 +-
 drivers/media/usb/dvb-usb-v2/af9035.h              |   11 +-
 drivers/media/usb/dvb-usb-v2/dvb_usb.h             |    2 +-
 drivers/media/usb/dvb-usb-v2/it913x.c              |    5 +-
 drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c      |    8 +-
 drivers/media/usb/dvb-usb-v2/mxl111sf.c            |   90 +-
 drivers/media/usb/dvb-usb-v2/rtl28xxu.c            |  180 +-
 drivers/media/usb/dvb-usb-v2/rtl28xxu.h            |    6 +
 drivers/media/usb/dvb-usb/az6027.c                 |    2 +-
 drivers/media/usb/dvb-usb/pctv452e.c               |    2 +-
 drivers/media/usb/em28xx/em28xx-cards.c            |  239 +-
 drivers/media/usb/em28xx/em28xx-core.c             |   27 +-
 drivers/media/usb/em28xx/em28xx-dvb.c              |   73 +-
 drivers/media/usb/em28xx/em28xx-input.c            |    1 -
 drivers/media/usb/em28xx/em28xx-reg.h              |   23 +-
 drivers/media/usb/em28xx/em28xx-video.c            |   66 +-
 drivers/media/usb/em28xx/em28xx.h                  |    7 +-
 drivers/media/usb/gspca/gspca.c                    |   32 +-
 drivers/media/usb/gspca/gspca.h                    |    6 +-
 drivers/media/usb/gspca/pac7302.c                  |   19 +-
 drivers/media/usb/gspca/sn9c20x.c                  |   69 +-
 drivers/media/usb/hdpvr/Kconfig                    |    2 +-
 drivers/media/usb/hdpvr/hdpvr-control.c            |   34 +-
 drivers/media/usb/hdpvr/hdpvr-core.c               |    8 -
 drivers/media/usb/hdpvr/hdpvr-video.c              |  110 +-
 drivers/media/usb/hdpvr/hdpvr.h                    |    3 +-
 drivers/media/usb/pvrusb2/pvrusb2-hdw.c            |   42 +-
 drivers/media/usb/pvrusb2/pvrusb2-hdw.h            |   13 +-
 drivers/media/usb/pvrusb2/pvrusb2-io.c             |    4 +-
 drivers/media/usb/pvrusb2/pvrusb2-v4l2.c           |   43 +-
 drivers/media/usb/sn9c102/sn9c102.h                |    3 +
 drivers/media/usb/sn9c102/sn9c102_core.c           |   13 +-
 drivers/media/usb/stk1160/stk1160-v4l.c            |   41 -
 drivers/media/usb/tm6000/tm6000-cards.c            |    2 +-
 drivers/media/usb/tm6000/tm6000-video.c            |   13 +-
 drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c  |    2 +
 drivers/media/usb/usbtv/Kconfig                    |   10 +
 drivers/media/usb/usbtv/Makefile                   |    1 +
 drivers/media/usb/usbtv/usbtv.c                    |  696 +++++
 drivers/media/usb/usbvision/usbvision-video.c      |   19 +-
 drivers/media/usb/uvc/Kconfig                      |    1 +
 drivers/media/usb/uvc/uvc_driver.c                 |   41 +-
 drivers/media/usb/uvc/uvc_status.c                 |   21 +-
 drivers/media/usb/uvc/uvc_v4l2.c                   |   14 +-
 drivers/media/usb/uvc/uvcvideo.h                   |    7 +-
 drivers/media/v4l2-core/Makefile                   |    3 +-
 drivers/media/v4l2-core/v4l2-async.c               |  284 ++
 drivers/media/v4l2-core/v4l2-clk.c                 |  242 ++
 drivers/media/v4l2-core/v4l2-common.c              |   60 +-
 drivers/media/v4l2-core/v4l2-compat-ioctl32.c      |    1 -
 drivers/media/v4l2-core/v4l2-dev.c                 |   40 +-
 drivers/media/v4l2-core/v4l2-device.c              |   13 +-
 drivers/media/v4l2-core/v4l2-ioctl.c               |   83 +-
 drivers/media/v4l2-core/videobuf-dma-contig.c      |   19 +-
 drivers/media/v4l2-core/videobuf-dma-sg.c          |   10 +-
 drivers/media/v4l2-core/videobuf-vmalloc.c         |   10 +-
 drivers/media/v4l2-core/videobuf2-core.c           |    4 +-
 drivers/staging/media/davinci_vpfe/dm365_ipipe.c   |    4 +-
 drivers/staging/media/davinci_vpfe/dm365_ipipeif.c |    4 +-
 drivers/staging/media/davinci_vpfe/dm365_isif.c    |    4 +-
 drivers/staging/media/davinci_vpfe/dm365_resizer.c |   14 +-
 drivers/staging/media/davinci_vpfe/vpfe_video.c    |   14 +-
 drivers/staging/media/dt3155v4l/dt3155v4l.c        |    1 -
 drivers/staging/media/go7007/go7007-usb.c          |    4 +-
 drivers/staging/media/lirc/lirc_imon.c             |    7 +-
 drivers/staging/media/solo6x10/solo6x10-tw28.c     |  112 +-
 drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c |   38 +-
 drivers/usb/gadget/f_uvc.c                         |    9 +-
 drivers/usb/gadget/uvc.h                           |    2 +
 include/media/davinci/vpbe_osd.h                   |    4 +-
 include/media/media-device.h                       |    9 +-
 include/media/media-entity.h                       |    5 +-
 include/media/rc-map.h                             |    1 +
 include/media/s5p_fimc.h                           |   58 +-
 include/media/sh_mobile_ceu.h                      |    2 +
 include/media/sh_mobile_csi2.h                     |    2 +-
 include/media/soc_camera.h                         |   43 +-
 include/media/ths7303.h                            |    2 -
 include/media/tveeprom.h                           |   11 +
 include/media/tvp7002.h                            |   46 +-
 include/media/v4l2-async.h                         |  105 +
 include/media/v4l2-chip-ident.h                    |  352 ---
 include/media/v4l2-clk.h                           |   54 +
 include/media/v4l2-common.h                        |   10 -
 include/media/v4l2-dev.h                           |    5 +-
 include/media/v4l2-int-device.h                    |    3 -
 include/media/v4l2-ioctl.h                         |    2 -
 include/media/v4l2-subdev.h                        |   14 +-
 include/uapi/linux/v4l2-controls.h                 |    4 +-
 include/uapi/linux/videodev2.h                     |   27 +-
 358 files changed, 10865 insertions(+), 9825 deletions(-)
 delete mode 100644 Documentation/DocBook/media/v4l/vidioc-dbg-g-chip-ident.xml
 create mode 100644 Documentation/devicetree/bindings/media/i2c/mt9p031.txt
 create mode 100644 Documentation/devicetree/bindings/media/i2c/tvp514x.txt
 create mode 100644 Documentation/devicetree/bindings/media/sh_mobile_ceu.txt
 create mode 100644 drivers/media/i2c/ml86v7667.c
 create mode 100644 drivers/media/i2c/ths8200.c
 create mode 100644 drivers/media/i2c/ths8200_regs.h
 create mode 100644 drivers/media/platform/exynos4-is/common.c
 create mode 100644 drivers/media/platform/exynos4-is/common.h
 create mode 100644 drivers/media/platform/soc_camera/soc_scale_crop.c
 create mode 100644 drivers/media/platform/soc_camera/soc_scale_crop.h
 create mode 100644 drivers/media/rc/keymaps/rc-delock-61959.c
 create mode 100644 drivers/media/usb/usbtv/Kconfig
 create mode 100644 drivers/media/usb/usbtv/Makefile
 create mode 100644 drivers/media/usb/usbtv/usbtv.c
 create mode 100644 drivers/media/v4l2-core/v4l2-async.c
 create mode 100644 drivers/media/v4l2-core/v4l2-clk.c
 create mode 100644 include/media/v4l2-async.h
 delete mode 100644 include/media/v4l2-chip-ident.h
 create mode 100644 include/media/v4l2-clk.h
Merging kbuild/for-next (cca867d Merge branch 'kbuild/kbuild' into kbuild/for-next)
$ git merge --no-ff kbuild/for-next
Auto-merging scripts/mod/file2alias.c
Auto-merging scripts/Makefile.lib
Auto-merging Makefile
Auto-merging MAINTAINERS
Auto-merging Documentation/kbuild/kconfig.txt
Merge made by the 'recursive' strategy.
 Documentation/coccinelle.txt                       | 63 ++++++++------
 Documentation/kbuild/kconfig.txt                   | 13 +++
 MAINTAINERS                                        |  3 +
 Makefile                                           |  8 +-
 scripts/Makefile.headersinst                       | 20 +++--
 scripts/Makefile.lib                               |  4 +-
 scripts/coccicheck                                 | 76 ++++++++++++-----
 .../coccinelle/api/alloc/drop_kmalloc_cast.cocci   |  2 +-
 scripts/coccinelle/api/alloc/kzalloc-simple.cocci  |  2 +-
 scripts/coccinelle/api/d_find_alias.cocci          |  2 +-
 .../coccinelle/api/devm_request_and_ioremap.cocci  |  2 +-
 scripts/coccinelle/api/kstrdup.cocci               |  2 +-
 scripts/coccinelle/api/memdup.cocci                |  2 +-
 scripts/coccinelle/api/memdup_user.cocci           |  2 +-
 scripts/coccinelle/api/ptr_ret.cocci               |  2 +-
 scripts/coccinelle/api/simple_open.cocci           |  2 +-
 scripts/coccinelle/free/devm_free.cocci            |  2 +-
 scripts/coccinelle/free/kfree.cocci                |  2 +-
 scripts/coccinelle/free/kfreeaddr.cocci            | 32 +++++++
 scripts/coccinelle/free/pci_free_consistent.cocci  | 52 ++++++++++++
 scripts/coccinelle/iterators/fen.cocci             |  2 +-
 scripts/coccinelle/iterators/itnull.cocci          |  2 +-
 .../coccinelle/iterators/list_entry_update.cocci   |  2 +-
 scripts/coccinelle/iterators/use_after_iter.cocci  |  2 +-
 scripts/coccinelle/locks/call_kern.cocci           |  2 +-
 scripts/coccinelle/locks/double_lock.cocci         |  2 +-
 scripts/coccinelle/locks/flags.cocci               |  2 +-
 scripts/coccinelle/locks/mini_lock.cocci           |  2 +-
 scripts/coccinelle/misc/boolinit.cocci             |  2 +-
 scripts/coccinelle/misc/cstptr.cocci               |  2 +-
 scripts/coccinelle/misc/doubleinit.cocci           |  2 +-
 scripts/coccinelle/misc/ifaddr.cocci               |  2 +-
 scripts/coccinelle/misc/ifcol.cocci                |  2 +-
 scripts/coccinelle/misc/noderef.cocci              |  2 +-
 scripts/coccinelle/misc/orplus.cocci               |  2 +-
 scripts/coccinelle/misc/warn.cocci                 |  2 +-
 scripts/coccinelle/null/eno.cocci                  |  2 +-
 scripts/coccinelle/null/kmerr.cocci                |  2 +-
 scripts/coccinelle/tests/doublebitand.cocci        |  2 +-
 scripts/coccinelle/tests/doubletest.cocci          |  2 +-
 scripts/coccinelle/tests/odd_ptr_err.cocci         |  2 +-
 scripts/config                                     | 12 +--
 scripts/headers_install.sh                         |  7 +-
 scripts/kconfig/conf.c                             |  6 +-
 scripts/kconfig/confdata.c                         | 33 ++++++--
 scripts/kconfig/expr.h                             |  3 +
 scripts/kconfig/lkc.h                              |  3 +-
 scripts/kconfig/lkc_proto.h                        |  1 +
 scripts/kconfig/lxdialog/checklist.c               |  8 +-
 scripts/kconfig/lxdialog/dialog.h                  | 14 +++
 scripts/kconfig/lxdialog/inputbox.c                |  8 +-
 scripts/kconfig/lxdialog/menubox.c                 |  6 +-
 scripts/kconfig/lxdialog/textbox.c                 |  6 +-
 scripts/kconfig/lxdialog/util.c                    | 46 +++++-----
 scripts/kconfig/lxdialog/yesno.c                   |  8 +-
 scripts/kconfig/mconf.c                            | 21 +++--
 scripts/kconfig/menu.c                             | 16 ++++
 scripts/kconfig/nconf.c                            | 39 +++++----
 scripts/kconfig/nconf.gui.c                        | 20 +++--
 scripts/kconfig/symbol.c                           | 99 +++++++++++++++++++---
 scripts/mod/Makefile                               | 15 ++--
 scripts/mod/file2alias.c                           | 10 ++-
 scripts/package/mkspec                             |  1 +
 scripts/setlocalversion                            |  3 -
 tools/include/tools/be_byteshift.h                 | 34 ++++----
 tools/include/tools/le_byteshift.h                 | 34 ++++----
 66 files changed, 550 insertions(+), 238 deletions(-)
 create mode 100644 scripts/coccinelle/free/kfreeaddr.cocci
 create mode 100644 scripts/coccinelle/free/pci_free_consistent.cocci
Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
$ git merge --no-ff kconfig/for-next
Already up-to-date.
Merging libata/for-next (930ed52 Merge branch 'for-3.11' into for-next)
$ git merge --no-ff libata/for-next
Merge made by the 'recursive' strategy.
Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block)
$ git merge --no-ff pstore/master
Already up-to-date.
Merging pm/linux-next (c766c15 Merge branch 'cpupower-next' into linux-next)
$ git merge --no-ff pm/linux-next
Merge made by the 'recursive' strategy.
 drivers/acpi/acpica/aclocal.h                      |  13 --
 drivers/acpi/device_pm.c                           |  23 ++-
 drivers/acpi/dock.c                                |   7 +-
 drivers/acpi/fan.c                                 |   2 +-
 drivers/acpi/scan.c                                |   1 -
 drivers/acpi/video.c                               |  93 +++++++++-
 drivers/cpufreq/cpufreq.c                          |   7 +-
 drivers/gpu/drm/i915/i915_dma.c                    |   3 +
 drivers/gpu/drm/radeon/atombios_encoders.c         |   4 +
 include/acpi/acpixf.h                              |   1 +
 include/acpi/actypes.h                             |  15 ++
 include/acpi/video.h                               |   2 +
 include/linux/acpi.h                               |   6 +
 include/linux/cpufreq.h                            |   2 +-
 tools/power/cpupower/Makefile                      |   4 +-
 tools/power/cpupower/man/cpupower-monitor.1        |  10 +-
 tools/power/cpupower/utils/builtin.h               |   1 +
 tools/power/cpupower/utils/cpuidle-info.c          |  24 +--
 tools/power/cpupower/utils/cpuidle-set.c           | 118 +++++++++++++
 tools/power/cpupower/utils/cpupower.c              |  13 +-
 tools/power/cpupower/utils/helpers/sysfs.c         | 118 ++++++++++++-
 tools/power/cpupower/utils/helpers/sysfs.h         |  10 +-
 .../cpupower/utils/idle_monitor/hsw_ext_idle.c     | 196 +++++++++++++++++++++
 .../cpupower/utils/idle_monitor/idle_monitors.def  |   1 +
 tools/power/cpupower/utils/idle_monitor/snb_idle.c |   4 +
 25 files changed, 618 insertions(+), 60 deletions(-)
 create mode 100644 tools/power/cpupower/utils/cpuidle-set.c
 create mode 100644 tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c
$ git reset --hard HEAD^
HEAD is now at 876a5a0 Merge remote-tracking branch 'libata/for-next'
Merging next-20130704 version of pm
$ git merge -m next-20130704/pm dab9b86c7681c9788da2bfcd3c964ca72afed923
Merge made by the 'recursive' strategy.
 drivers/cpufreq/cpufreq.c | 7 ++++---
 include/linux/cpufreq.h   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)
Merging idle/next (5c99726b Merge branch 'fspin' into next)
$ git merge --no-ff idle/next
Merge made by the 'recursive' strategy.
 tools/power/fspin/Makefile |  21 +++
 tools/power/fspin/fspin.1  |  68 +++++++
 tools/power/fspin/fspin.c  | 443 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 532 insertions(+)
 create mode 100644 tools/power/fspin/Makefile
 create mode 100644 tools/power/fspin/fspin.1
 create mode 100644 tools/power/fspin/fspin.c
Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
$ git merge --no-ff apm/for-next
Already up-to-date.
Merging cpuidle/cpuidle-next (817c876 Merge branch 'pm-fixes-next' into fixes-next)
$ git merge --no-ff cpuidle/cpuidle-next
Resolved 'drivers/acpi/processor_driver.c' using previous resolution.
Resolved 'drivers/base/power/qos.c' using previous resolution.
Auto-merging drivers/base/power/qos.c
CONFLICT (content): Merge conflict in drivers/base/power/qos.c
Auto-merging drivers/acpi/processor_driver.c
CONFLICT (content): Merge conflict in drivers/acpi/processor_driver.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 9dd907b] Merge remote-tracking branch 'cpuidle/cpuidle-next'
$ git diff -M --stat --summary HEAD^..
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
$ git merge --no-ff cpupowerutils/master
Already up-to-date.
Merging thermal/next (9d1968f Merge branch 'cpu-package-thermal' of .git into next)
$ git merge --no-ff thermal/next
Resolved 'Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt' using previous resolution.
Resolved 'drivers/thermal/ti-soc-thermal/ti-thermal-common.c' using previous resolution.
Auto-merging drivers/thermal/ti-soc-thermal/ti-thermal.h
Auto-merging drivers/thermal/ti-soc-thermal/ti-thermal-common.c
CONFLICT (content): Merge conflict in drivers/thermal/ti-soc-thermal/ti-thermal-common.c
Auto-merging drivers/thermal/ti-soc-thermal/ti-bandgap.h
Auto-merging drivers/thermal/ti-soc-thermal/ti-bandgap.c
Auto-merging drivers/thermal/ti-soc-thermal/Makefile
Auto-merging drivers/thermal/ti-soc-thermal/Kconfig
Auto-merging drivers/thermal/exynos_thermal.c
Auto-merging drivers/thermal/dove_thermal.c
Auto-merging drivers/thermal/armada_thermal.c
Auto-merging drivers/staging/Makefile
Auto-merging drivers/staging/Kconfig
Auto-merging arch/x86/kernel/cpu/mcheck/therm_throt.c
Auto-merging arch/x86/include/asm/mce.h
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 80e4a2c] Merge remote-tracking branch 'thermal/next'
$ git diff -M --stat --summary HEAD^..
 .../bindings/thermal}/ti_soc_thermal.txt           |  12 +
 Documentation/thermal/x86_pkg_temperature_thermal  |  47 ++
 MAINTAINERS                                        |   4 +-
 arch/x86/include/asm/mce.h                         |   7 +
 arch/x86/kernel/cpu/mcheck/therm_throt.c           |  63 +-
 drivers/staging/Kconfig                            |   2 -
 drivers/staging/Makefile                           |   1 -
 drivers/thermal/Kconfig                            |  15 +
 drivers/thermal/Makefile                           |   3 +-
 drivers/thermal/armada_thermal.c                   |   3 +-
 drivers/thermal/cpu_cooling.c                      |   2 +-
 drivers/thermal/dove_thermal.c                     |  10 +-
 drivers/thermal/exynos_thermal.c                   |   3 -
 drivers/thermal/kirkwood_thermal.c                 |  10 +-
 drivers/thermal/rcar_thermal.c                     |  10 +-
 drivers/thermal/spear_thermal.c                    |  20 +-
 drivers/thermal/thermal_core.c                     |  11 +-
 .../{staging => thermal}/ti-soc-thermal/Kconfig    |  12 +
 .../{staging => thermal}/ti-soc-thermal/Makefile   |   1 +
 drivers/{staging => thermal}/ti-soc-thermal/TODO   |   0
 drivers/thermal/ti-soc-thermal/dra752-bandgap.h    | 280 +++++++++
 .../thermal/ti-soc-thermal/dra752-thermal-data.c   | 476 +++++++++++++++
 .../ti-soc-thermal/omap4-thermal-data.c            |   0
 .../ti-soc-thermal/omap4xxx-bandgap.h              |   0
 .../ti-soc-thermal/omap5-thermal-data.c            |   0
 .../ti-soc-thermal/omap5xxx-bandgap.h              |   0
 .../ti-soc-thermal/ti-bandgap.c                    |  28 +-
 .../ti-soc-thermal/ti-bandgap.h                    |   5 +
 .../ti-soc-thermal/ti-thermal-common.c             |  15 +-
 .../ti-soc-thermal/ti-thermal.h                    |   6 +
 drivers/thermal/x86_pkg_temp_thermal.c             | 642 +++++++++++++++++++++
 31 files changed, 1617 insertions(+), 71 deletions(-)
 rename {drivers/staging/ti-soc-thermal => Documentation/devicetree/bindings/thermal}/ti_soc_thermal.txt (89%)
 create mode 100644 Documentation/thermal/x86_pkg_temperature_thermal
 rename drivers/{staging => thermal}/ti-soc-thermal/Kconfig (81%)
 rename drivers/{staging => thermal}/ti-soc-thermal/Makefile (80%)
 rename drivers/{staging => thermal}/ti-soc-thermal/TODO (100%)
 create mode 100644 drivers/thermal/ti-soc-thermal/dra752-bandgap.h
 create mode 100644 drivers/thermal/ti-soc-thermal/dra752-thermal-data.c
 rename drivers/{staging => thermal}/ti-soc-thermal/omap4-thermal-data.c (100%)
 rename drivers/{staging => thermal}/ti-soc-thermal/omap4xxx-bandgap.h (100%)
 rename drivers/{staging => thermal}/ti-soc-thermal/omap5-thermal-data.c (100%)
 rename drivers/{staging => thermal}/ti-soc-thermal/omap5xxx-bandgap.h (100%)
 rename drivers/{staging => thermal}/ti-soc-thermal/ti-bandgap.c (98%)
 rename drivers/{staging => thermal}/ti-soc-thermal/ti-bandgap.h (99%)
 rename drivers/{staging => thermal}/ti-soc-thermal/ti-thermal-common.c (97%)
 rename drivers/{staging => thermal}/ti-soc-thermal/ti-thermal.h (95%)
 create mode 100644 drivers/thermal/x86_pkg_temp_thermal.c
Merging ieee1394/for-next (bcabcfd firewire: remove support of fw_driver.driver.probe and .remove methods)
$ git merge --no-ff ieee1394/for-next
Auto-merging sound/firewire/scs1x.c
Auto-merging drivers/staging/fwserial/fwserial.c
Merge made by the 'recursive' strategy.
 drivers/firewire/core-device.c      |  39 ++++++++++---
 drivers/firewire/net.c              |  50 ++++++++---------
 drivers/firewire/sbp2.c             |  17 +++---
 drivers/media/firewire/firedtv-fw.c |  19 +++----
 drivers/staging/fwserial/fwserial.c |  14 ++---
 include/linux/firewire.h            |   2 +
 sound/firewire/isight.c             |  44 +++++++--------
 sound/firewire/scs1x.c              |  39 ++++++-------
 sound/firewire/speakers.c           | 106 +++++++++++++++---------------------
 9 files changed, 160 insertions(+), 170 deletions(-)
Merging ubi/linux-next (83ff59a UBI: support ubi_num on mtd.ubi command line)
$ git merge --no-ff ubi/linux-next
Auto-merging drivers/mtd/ubi/build.c
Merge made by the 'recursive' strategy.
 drivers/mtd/ubi/build.c     | 59 ++++++++++++++++++++++++++++++---------------
 drivers/mtd/ubi/fastmap.c   |  4 ++-
 include/uapi/mtd/ubi-user.h |  5 +++-
 3 files changed, 47 insertions(+), 21 deletions(-)
Merging dlm/next (cfa805f dlm: Avoid LVB truncation)
$ git merge --no-ff dlm/next
Already up-to-date.
Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
$ git merge --no-ff swiotlb/linux-next
Already up-to-date.
Merging slave-dma/next (469fd0d DMA: shdma: add DT support)
$ git merge --no-ff slave-dma/next
Auto-merging drivers/dma/ppc4xx/adma.c
Auto-merging drivers/dma/pl330.c
Auto-merging drivers/dma/dw/regs.h
Auto-merging drivers/dma/dw/core.c
Auto-merging drivers/dma/Kconfig
Removing arch/mips/jz4740/dma.c
Auto-merging arch/arm/mach-spear/spear6xx.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/dma/atmel-dma.txt          |   7 +-
 .../devicetree/bindings/dma/fsl-imx-dma.txt        |  48 ++
 .../devicetree/bindings/dma/fsl-imx-sdma.txt       |  56 ++
 Documentation/devicetree/bindings/dma/shdma.txt    |  75 +++
 MAINTAINERS                                        |   3 +-
 arch/arm/mach-lpc32xx/phy3250.c                    |   4 +-
 arch/arm/mach-spear/spear3xx.c                     |   4 +-
 arch/arm/mach-spear/spear6xx.c                     |   4 +-
 arch/mips/include/asm/mach-jz4740/dma.h            |  56 --
 arch/mips/include/asm/mach-jz4740/platform.h       |   1 +
 arch/mips/jz4740/Makefile                          |   2 +-
 arch/mips/jz4740/board-qi_lb60.c                   |   1 +
 arch/mips/jz4740/clock.c                           |   2 +-
 arch/mips/jz4740/dma.c                             | 287 ----------
 arch/mips/jz4740/platform.c                        |  21 +
 drivers/dma/Kconfig                                |  26 +-
 drivers/dma/Makefile                               |   3 +-
 drivers/dma/amba-pl08x.c                           |   8 +-
 drivers/dma/at_hdmac.c                             | 211 ++++---
 drivers/dma/at_hdmac_regs.h                        |   5 +
 drivers/dma/dma-jz4740.c                           | 617 +++++++++++++++++++++
 drivers/dma/dw/Kconfig                             |  29 +
 drivers/dma/dw/Makefile                            |   8 +
 drivers/dma/{dw_dmac.c => dw/core.c}               | 320 ++---------
 drivers/dma/dw/internal.h                          |  70 +++
 drivers/dma/dw/pci.c                               | 101 ++++
 drivers/dma/dw/platform.c                          | 317 +++++++++++
 drivers/dma/{dw_dmac_regs.h => dw/regs.h}          |   7 +
 drivers/dma/fsldma.c                               |   5 +-
 drivers/dma/imx-dma.c                              |  77 ++-
 drivers/dma/imx-sdma.c                             |  40 ++
 drivers/dma/mmp_tdma.c                             |   4 +
 drivers/dma/mxs-dma.c                              |   2 +-
 drivers/dma/of-dma.c                               |  17 +-
 drivers/dma/pl330.c                                |  29 +-
 drivers/dma/ppc4xx/adma.c                          |   5 +-
 drivers/dma/sh/Makefile                            |   2 +-
 drivers/dma/sh/shdma-base.c                        |  26 +-
 drivers/dma/sh/shdma-of.c                          |  82 +++
 drivers/dma/sh/shdma.c                             |  33 +-
 drivers/dma/sirf-dma.c                             |  17 +
 drivers/dma/tegra20-apb-dma.c                      |   3 +-
 drivers/dma/timb_dma.c                             |   2 -
 include/linux/amba/pl08x.h                         |   8 +-
 include/linux/of_dma.h                             |   1 -
 include/linux/platform_data/dma-atmel.h            |   4 +
 include/linux/platform_data/dma-imx.h              |   6 +-
 include/linux/sh_dma.h                             |   2 -
 include/linux/shdma-base.h                         |   3 +
 49 files changed, 1862 insertions(+), 799 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/dma/fsl-imx-dma.txt
 create mode 100644 Documentation/devicetree/bindings/dma/shdma.txt
 delete mode 100644 arch/mips/jz4740/dma.c
 create mode 100644 drivers/dma/dma-jz4740.c
 create mode 100644 drivers/dma/dw/Kconfig
 create mode 100644 drivers/dma/dw/Makefile
 rename drivers/dma/{dw_dmac.c => dw/core.c} (85%)
 create mode 100644 drivers/dma/dw/internal.h
 create mode 100644 drivers/dma/dw/pci.c
 create mode 100644 drivers/dma/dw/platform.c
 rename drivers/dma/{dw_dmac_regs.h => dw/regs.h} (97%)
 create mode 100644 drivers/dma/sh/shdma-of.c
Merging dmaengine/next (41ef2d5 Linux 3.9-rc7)
$ git merge --no-ff dmaengine/next
Already up-to-date.
Merging net-next/master (0e07647 dt:net:stmmac: Add dt specific phy reset callback support.)
$ git merge --no-ff net-next/master
Resolved 'Documentation/networking/netlink_mmap.txt' using previous resolution.
Resolved 'arch/arm/boot/dts/am335x-evmsk.dts' using previous resolution.
Resolved 'arch/arm/boot/dts/sun4i-a10.dtsi' using previous resolution.
Resolved 'arch/arm/mach-mxs/Kconfig' using previous resolution.
Resolved 'arch/arm/mach-mxs/mach-mxs.c' using previous resolution.
Resolved 'arch/arm/mach-shmobile/clock-r8a7740.c' using previous resolution.
Resolved 'arch/arm/mach-shmobile/clock-r8a7778.c' using previous resolution.
Resolved 'drivers/staging/silicom/bpctl_mod.c' using previous resolution.
Resolved 'fs/select.c' using previous resolution.
Auto-merging net/sunrpc/xprtsock.c
Auto-merging net/mac80211/main.c
Auto-merging net/ipv4/inet_fragment.c
Removing net/ipv4/gre.c
Auto-merging net/core/netpoll.c
Auto-merging net/bluetooth/hidp/core.c
Auto-merging net/bluetooth/hci_core.c
Removing net/batman-adv/ring_buffer.h
Removing net/batman-adv/ring_buffer.c
Auto-merging net/Kconfig
Auto-merging lib/vsprintf.c
Auto-merging include/linux/sched.h
Removing include/linux/can/platform/flexcan.h
Auto-merging fs/select.c
CONFLICT (content): Merge conflict in fs/select.c
Auto-merging drivers/staging/silicom/bpctl_mod.c
CONFLICT (content): Merge conflict in drivers/staging/silicom/bpctl_mod.c
Auto-merging drivers/staging/rtl8192u/r8192U_core.c
Auto-merging drivers/staging/csr/netdev.c
Auto-merging drivers/scsi/libiscsi_tcp.c
Auto-merging drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
Auto-merging drivers/s390/net/qeth_core_main.c
Auto-merging drivers/nfc/pn533.c
Auto-merging drivers/net/wireless/rtlwifi/base.c
Auto-merging drivers/net/wireless/rt2x00/rt2x00dev.c
Removing drivers/net/wireless/iwlwifi/iwl-testmode.h
Removing drivers/net/wireless/iwlwifi/iwl-test.h
Removing drivers/net/wireless/iwlwifi/iwl-test.c
Removing drivers/net/wireless/iwlwifi/dvm/testmode.c
Auto-merging drivers/net/wireless/ipw2x00/ipw2200.c
Auto-merging drivers/net/wireless/ath/ath9k/Kconfig
Auto-merging drivers/net/phy/phy.c
Auto-merging drivers/net/phy/Kconfig
Auto-merging drivers/net/netconsole.c
Auto-merging drivers/net/ethernet/ti/davinci_mdio.c
Auto-merging drivers/net/ethernet/ti/cpsw.c
Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
Auto-merging drivers/net/ethernet/mellanox/mlx4/main.c
Auto-merging drivers/net/ethernet/intel/igb/e1000_phy.c
Auto-merging drivers/net/ethernet/ibm/ehea/ehea_main.c
Auto-merging arch/powerpc/Kconfig
Auto-merging arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
Auto-merging arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
Auto-merging arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
Auto-merging arch/mips/bcm63xx/boards/board_bcm963xx.c
Auto-merging arch/cris/arch-v32/drivers/Kconfig
Auto-merging arch/cris/arch-v10/drivers/Kconfig
Auto-merging arch/arm/mach-shmobile/clock-r8a7779.c
Auto-merging arch/arm/mach-shmobile/clock-r8a7778.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/clock-r8a7778.c
Auto-merging arch/arm/mach-shmobile/clock-r8a7740.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/clock-r8a7740.c
Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c
Auto-merging arch/arm/mach-mxs/mach-mxs.c
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/mach-mxs.c
Auto-merging arch/arm/mach-mxs/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/Kconfig
Auto-merging arch/arm/mach-imx/Kconfig
Auto-merging arch/arm/configs/omap2plus_defconfig
Auto-merging arch/arm/boot/dts/sun4i-a10.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun4i-a10.dtsi
Auto-merging arch/arm/boot/dts/sun4i-a10-cubieboard.dts
Auto-merging arch/arm/boot/dts/am335x-evmsk.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/am335x-evmsk.dts
Auto-merging arch/arm/boot/dts/am335x-evm.dts
Auto-merging arch/arm/boot/dts/am335x-bone.dts
Auto-merging MAINTAINERS
Auto-merging Documentation/sysctl/net.txt
Auto-merging Documentation/networking/netlink_mmap.txt
CONFLICT (content): Merge conflict in Documentation/networking/netlink_mmap.txt
Auto-merging Documentation/networking/ip-sysctl.txt
Removing Documentation/networking/ifenslave.c
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 302a963] Merge remote-tracking branch 'net-next/master'
$ git diff -M --stat --summary HEAD^..
 Documentation/DocBook/80211.tmpl                   |   13 +-
 .../bindings/net/allwinner,sun4i-emac.txt          |   22 +
 .../bindings/net/allwinner,sun4i-mdio.txt          |   26 +
 Documentation/devicetree/bindings/net/arc_emac.txt |   38 +
 .../devicetree/bindings/net/can/fsl-flexcan.txt    |    2 +
 Documentation/devicetree/bindings/net/cpsw.txt     |    6 +
 .../devicetree/bindings/net/davicom-dm9000.txt     |   26 +
 .../devicetree/bindings/net/marvell-orion-net.txt  |   85 +
 .../devicetree/bindings/net/micrel-ks8851.txt      |    9 +
 Documentation/devicetree/bindings/net/stmmac.txt   |   10 +
 .../devicetree/bindings/net/via-velocity.txt       |   20 +
 .../devicetree/bindings/vendor-prefixes.txt        |    1 +
 Documentation/networking/.gitignore                |    1 -
 Documentation/networking/00-INDEX                  |    2 -
 Documentation/networking/Makefile                  |    5 -
 Documentation/networking/bonding.txt               |   79 +-
 Documentation/networking/ifenslave.c               | 1105 -------
 Documentation/networking/ip-sysctl.txt             |   11 +-
 Documentation/networking/ipvs-sysctl.txt           |   13 +
 Documentation/networking/netlink_mmap.txt          |    8 +-
 Documentation/networking/packet_mmap.txt           |  133 +-
 Documentation/networking/scaling.txt               |   58 +
 Documentation/printk-formats.txt                   |   32 +
 Documentation/sysctl/net.txt                       |   41 +-
 MAINTAINERS                                        |    5 +
 arch/alpha/include/uapi/asm/socket.h               |    2 +
 arch/arm/boot/dts/am335x-bone.dts                  |    2 +
 arch/arm/boot/dts/am335x-evm.dts                   |    2 +
 arch/arm/boot/dts/am335x-evmsk.dts                 |   10 +
 arch/arm/boot/dts/imx28-evk.dts                    |   12 +
 arch/arm/boot/dts/sun4i-a10-cubieboard.dts         |   15 +
 arch/arm/boot/dts/sun4i-a10-hackberry.dts          |   41 +
 arch/arm/boot/dts/sun4i-a10.dtsi                   |   27 +
 arch/arm/configs/omap2plus_defconfig               |    1 +
 arch/arm/mach-imx/Kconfig                          |    4 -
 arch/arm/mach-imx/devices-imx25.h                  |    8 +-
 arch/arm/mach-imx/devices-imx35.h                  |    8 +-
 arch/arm/mach-imx/devices/Kconfig                  |    1 -
 arch/arm/mach-imx/devices/devices-common.h         |    4 +-
 arch/arm/mach-imx/devices/platform-flexcan.c       |    5 +-
 arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c     |    2 +-
 arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c     |    2 +-
 arch/arm/mach-imx/mach-mx25_3ds.c                  |    2 +-
 arch/arm/mach-imx/mach-pcm043.c                    |    2 +-
 arch/arm/mach-mxs/Kconfig                          |    1 -
 arch/arm/mach-mxs/mach-mxs.c                       |   50 +-
 arch/arm/mach-shmobile/board-armadillo800eva.c     |    2 +-
 arch/arm/mach-shmobile/clock-r8a7740.c             |    2 +-
 arch/arm/mach-shmobile/clock-r8a7778.c             |    2 +-
 arch/arm/mach-shmobile/clock-r8a7779.c             |    2 +-
 arch/arm/net/bpf_jit_32.c                          |   18 +-
 arch/avr32/include/uapi/asm/socket.h               |    2 +
 arch/cris/arch-v10/drivers/Kconfig                 |    4 +-
 arch/cris/arch-v32/drivers/Kconfig                 |    4 +-
 arch/cris/include/uapi/asm/socket.h                |    2 +
 arch/frv/include/uapi/asm/socket.h                 |    2 +
 arch/h8300/include/uapi/asm/socket.h               |    2 +
 arch/ia64/hp/sim/simeth.c                          |    2 +-
 arch/ia64/include/uapi/asm/socket.h                |    2 +
 arch/m32r/include/uapi/asm/socket.h                |    2 +
 arch/mips/bcm63xx/boards/board_bcm963xx.c          |    4 +
 arch/mips/bcm63xx/dev-enet.c                       |  181 +-
 arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h   |    7 +-
 .../include/asm/mach-bcm63xx/bcm63xx_dev_enet.h    |  122 +
 arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h  |   93 +-
 .../mips/include/asm/mach-bcm63xx/board_bcm963xx.h |    2 +
 arch/mips/include/uapi/asm/socket.h                |    2 +
 arch/mips/txx9/generic/setup_tx4939.c              |    3 +-
 arch/mn10300/include/uapi/asm/socket.h             |    2 +
 arch/parisc/include/uapi/asm/socket.h              |    2 +
 arch/powerpc/Kconfig                               |    1 -
 arch/powerpc/include/uapi/asm/socket.h             |    2 +
 arch/powerpc/net/bpf_jit_comp.c                    |   19 +-
 arch/s390/include/uapi/asm/socket.h                |    2 +
 arch/sh/boards/board-espt.c                        |    2 +-
 arch/sh/boards/board-sh7757lcr.c                   |    8 +-
 arch/sh/boards/mach-ecovec24/setup.c               |    4 +-
 arch/sh/boards/mach-se/770x/setup.c                |    8 +-
 arch/sh/boards/mach-se/7724/setup.c                |    4 +-
 arch/sh/boards/mach-sh7763rdp/setup.c              |    2 +-
 arch/sh/kernel/cpu/sh2/setup-sh7619.c              |    4 +-
 arch/sh/kernel/cpu/sh4a/clock-sh7724.c             |    2 +-
 arch/sh/kernel/cpu/sh4a/clock-sh7734.c             |    2 +-
 arch/sparc/include/uapi/asm/socket.h               |    2 +
 arch/sparc/net/bpf_jit_comp.c                      |   20 +-
 arch/x86/net/bpf_jit_comp.c                        |   61 +-
 arch/xtensa/include/uapi/asm/socket.h              |    2 +
 drivers/atm/ambassador.c                           |    2 +-
 drivers/bcma/Kconfig                               |    1 +
 drivers/bcma/bcma_private.h                        |    2 +
 drivers/bcma/core.c                                |   28 +-
 drivers/bcma/driver_chipcommon.c                   |   11 +-
 drivers/bcma/driver_chipcommon_pmu.c               |  123 +
 drivers/bcma/driver_chipcommon_sflash.c            |    8 +-
 drivers/bcma/host_pci.c                            |    1 +
 drivers/bcma/main.c                                |   19 +
 drivers/bcma/sprom.c                               |   72 +-
 drivers/bluetooth/btmrvl_sdio.c                    |    1 +
 drivers/bluetooth/btusb.c                          |    4 +
 drivers/infiniband/core/cma.c                      |    4 +-
 drivers/infiniband/hw/mlx4/main.c                  |    2 +-
 drivers/isdn/i4l/isdn_net.c                        |    2 +-
 drivers/net/Kconfig                                |   20 +-
 drivers/net/Makefile                               |    1 +
 drivers/net/bonding/bond_alb.c                     |   99 +-
 drivers/net/bonding/bond_main.c                    |  290 +-
 drivers/net/bonding/bond_sysfs.c                   |  133 +-
 drivers/net/bonding/bonding.h                      |   49 +-
 drivers/net/can/Kconfig                            |    5 +-
 drivers/net/can/at91_can.c                         |    8 +-
 drivers/net/can/bfin_can.c                         |   10 +-
 drivers/net/can/c_can/c_can_platform.c             |    6 +-
 drivers/net/can/cc770/cc770_isa.c                  |    5 +-
 drivers/net/can/cc770/cc770_platform.c             |    4 +-
 drivers/net/can/flexcan.c                          |   52 +-
 drivers/net/can/grcan.c                            |   12 +-
 drivers/net/can/janz-ican3.c                       |    2 +-
 drivers/net/can/led.c                              |    4 +-
 drivers/net/can/mscan/mpc5xxx_can.c                |   10 +-
 drivers/net/can/sja1000/sja1000_isa.c              |    5 +-
 drivers/net/can/sja1000/sja1000_of_platform.c      |    6 +-
 drivers/net/can/sja1000/sja1000_platform.c         |    5 +-
 drivers/net/can/slcan.c                            |    2 +-
 drivers/net/can/softing/softing_main.c             |    2 +-
 drivers/net/can/ti_hecc.c                          |    1 -
 drivers/net/ethernet/3com/3c509.c                  |   19 -
 drivers/net/ethernet/3com/3c59x.c                  |   42 +-
 drivers/net/ethernet/3com/Kconfig                  |    1 -
 drivers/net/ethernet/8390/ne.c                     |    1 -
 drivers/net/ethernet/8390/ne2k-pci.c               |    2 +-
 drivers/net/ethernet/Kconfig                       |    6 +-
 drivers/net/ethernet/Makefile                      |    2 +
 drivers/net/ethernet/adaptec/Kconfig               |    1 -
 drivers/net/ethernet/adi/Kconfig                   |    1 -
 drivers/net/ethernet/adi/bfin_mac.c                |    4 -
 drivers/net/ethernet/aeroflex/greth.c              |    4 +-
 drivers/net/ethernet/allwinner/Kconfig             |   35 +
 drivers/net/ethernet/allwinner/Makefile            |    5 +
 drivers/net/ethernet/allwinner/sun4i-emac.c        |  954 ++++++
 drivers/net/ethernet/allwinner/sun4i-emac.h        |  108 +
 drivers/net/ethernet/alteon/acenic.c               |   15 +-
 drivers/net/ethernet/amd/Kconfig                   |    2 -
 drivers/net/ethernet/amd/amd8111e.c                |   19 +-
 drivers/net/ethernet/amd/au1000_eth.c              |    2 -
 drivers/net/ethernet/amd/sunlance.c                |    6 +-
 drivers/net/ethernet/apple/bmac.c                  |    5 +-
 drivers/net/ethernet/arc/Kconfig                   |   31 +
 drivers/net/ethernet/arc/Makefile                  |    6 +
 drivers/net/ethernet/arc/emac.h                    |  214 ++
 drivers/net/ethernet/arc/emac_main.c               |  819 ++++++
 drivers/net/ethernet/arc/emac_mdio.c               |  152 +
 drivers/net/ethernet/atheros/Kconfig               |    5 -
 drivers/net/ethernet/atheros/alx/alx.h             |    8 +-
 drivers/net/ethernet/atheros/alx/ethtool.c         |  132 +-
 drivers/net/ethernet/atheros/alx/hw.c              |  212 +-
 drivers/net/ethernet/atheros/alx/hw.h              |   25 +-
 drivers/net/ethernet/atheros/alx/main.c            |  173 +-
 drivers/net/ethernet/atheros/atl1c/atl1c_main.c    |   25 +-
 drivers/net/ethernet/atheros/atl1e/atl1e_main.c    |   25 +-
 drivers/net/ethernet/atheros/atlx/atl1.c           |   27 +-
 drivers/net/ethernet/broadcom/Kconfig              |    2 -
 drivers/net/ethernet/broadcom/bcm63xx_enet.c       | 1188 +++++++-
 drivers/net/ethernet/broadcom/bcm63xx_enet.h       |   86 +
 drivers/net/ethernet/broadcom/bnx2.c               |   18 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x.h        |  185 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c    |  211 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h    |   75 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c    |   52 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h    |    3 -
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h   |    7 -
 .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c    |  115 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h    |    5 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   |  687 +++--
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h    |    6 +
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c     |  284 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h     |   55 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c  |   89 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h  |    9 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c  |    1 -
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h  |    4 -
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c   |   33 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h   |    5 +-
 drivers/net/ethernet/broadcom/cnic.c               |    2 +-
 drivers/net/ethernet/broadcom/sb1250-mac.c         |    9 +-
 drivers/net/ethernet/broadcom/tg3.c                |  425 ++-
 drivers/net/ethernet/broadcom/tg3.h                |    2 +
 drivers/net/ethernet/brocade/bna/bfa_defs.h        |    3 +-
 drivers/net/ethernet/brocade/bna/bfa_ioc.c         |    7 +-
 drivers/net/ethernet/brocade/bna/bfa_ioc.h         |    2 +
 drivers/net/ethernet/brocade/bna/bna.h             |    2 +
 drivers/net/ethernet/brocade/bna/bna_enet.c        |    7 +-
 drivers/net/ethernet/brocade/bna/bna_tx_rx.c       |   15 +
 drivers/net/ethernet/brocade/bna/bnad.c            |    3 +
 drivers/net/ethernet/brocade/bna/bnad.h            |    2 +-
 drivers/net/ethernet/brocade/bna/cna.h             |    4 +-
 drivers/net/ethernet/cadence/Kconfig               |    1 -
 drivers/net/ethernet/cadence/at91_ether.c          |    1 -
 drivers/net/ethernet/cadence/macb.c                |  325 ++-
 drivers/net/ethernet/cadence/macb.h                |   14 +
 drivers/net/ethernet/calxeda/xgmac.c               |    2 -
 drivers/net/ethernet/chelsio/cxgb/cxgb2.c          |   15 +-
 drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c    |    2 +
 drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c |    9 +-
 drivers/net/ethernet/chelsio/cxgb3/sge.c           |  116 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h         |    2 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |   27 +-
 drivers/net/ethernet/chelsio/cxgb4/sge.c           |    2 +-
 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c         |   10 +-
 drivers/net/ethernet/cirrus/Kconfig                |    1 -
 drivers/net/ethernet/cirrus/ep93xx_eth.c           |    1 -
 drivers/net/ethernet/davicom/Kconfig               |    1 -
 drivers/net/ethernet/davicom/dm9000.c              |   53 +-
 drivers/net/ethernet/dec/tulip/Kconfig             |    1 -
 drivers/net/ethernet/dec/tulip/tulip_core.c        |    6 -
 drivers/net/ethernet/dec/tulip/xircom_cb.c         |   14 +-
 drivers/net/ethernet/dlink/Kconfig                 |    1 -
 drivers/net/ethernet/emulex/benet/be.h             |    4 +
 drivers/net/ethernet/emulex/benet/be_cmds.c        |   66 +
 drivers/net/ethernet/emulex/benet/be_cmds.h        |    3 +
 drivers/net/ethernet/emulex/benet/be_ethtool.c     |   37 +-
 drivers/net/ethernet/emulex/benet/be_hw.h          |    2 +
 drivers/net/ethernet/emulex/benet/be_main.c        |  150 +-
 drivers/net/ethernet/ethoc.c                       |    2 -
 drivers/net/ethernet/faraday/Kconfig               |    1 -
 drivers/net/ethernet/faraday/ftgmac100.c           |    2 -
 drivers/net/ethernet/faraday/ftmac100.c            |    2 -
 drivers/net/ethernet/freescale/fec.h               |   61 +-
 drivers/net/ethernet/freescale/fec_main.c          |  254 +-
 drivers/net/ethernet/freescale/fec_mpc52xx.c       |    9 +-
 drivers/net/ethernet/freescale/fec_ptp.c           |    3 +-
 drivers/net/ethernet/freescale/fs_enet/Kconfig     |    1 -
 .../net/ethernet/freescale/fs_enet/fs_enet-main.c  |    5 +-
 .../net/ethernet/freescale/fs_enet/mii-bitbang.c   |    6 +-
 drivers/net/ethernet/freescale/fs_enet/mii-fec.c   |    6 +-
 drivers/net/ethernet/freescale/gianfar.c           |   57 +-
 drivers/net/ethernet/freescale/gianfar_ptp.c       |    4 +-
 drivers/net/ethernet/freescale/ucc_geth.c          |    4 +-
 drivers/net/ethernet/freescale/xgmac_mdio.c        |    4 +-
 drivers/net/ethernet/ibm/Kconfig                   |    3 +-
 drivers/net/ethernet/ibm/ehea/ehea_main.c          |    4 +-
 drivers/net/ethernet/ibm/emac/mal.c                |    6 +-
 drivers/net/ethernet/ibm/emac/rgmii.c              |   18 +-
 drivers/net/ethernet/ibm/emac/tah.c                |   14 +-
 drivers/net/ethernet/ibm/emac/zmii.c               |   18 +-
 drivers/net/ethernet/icplus/Kconfig                |    1 -
 drivers/net/ethernet/icplus/ipg.c                  |   13 +-
 drivers/net/ethernet/intel/Kconfig                 |    1 -
 drivers/net/ethernet/intel/e100.c                  |    4 +-
 drivers/net/ethernet/intel/e1000e/80003es2lan.c    |   24 +-
 drivers/net/ethernet/intel/e1000e/82571.c          |   30 +-
 drivers/net/ethernet/intel/e1000e/ethtool.c        |   34 +-
 drivers/net/ethernet/intel/e1000e/hw.h             |   34 +-
 drivers/net/ethernet/intel/e1000e/ich8lan.c        |   62 +-
 drivers/net/ethernet/intel/e1000e/netdev.c         |   55 +-
 drivers/net/ethernet/intel/e1000e/nvm.c            |    1 -
 drivers/net/ethernet/intel/e1000e/phy.c            |   22 +-
 drivers/net/ethernet/intel/igb/e1000_82575.c       |  120 +-
 drivers/net/ethernet/intel/igb/e1000_defines.h     |   36 +-
 drivers/net/ethernet/intel/igb/e1000_hw.h          |    2 +
 drivers/net/ethernet/intel/igb/e1000_i210.h        |    6 +-
 drivers/net/ethernet/intel/igb/e1000_mac.c         |   45 +-
 drivers/net/ethernet/intel/igb/e1000_phy.c         |  124 +
 drivers/net/ethernet/intel/igb/e1000_phy.h         |   20 +
 drivers/net/ethernet/intel/igb/igb.h               |   14 +-
 drivers/net/ethernet/intel/igb/igb_ethtool.c       |   74 +-
 drivers/net/ethernet/intel/igb/igb_main.c          |    9 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe.h           |  134 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c       |   23 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h       |    2 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h |    1 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c    |    3 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c   |   40 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c       |    2 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |   69 +-
 drivers/net/ethernet/jme.c                         |    1 -
 drivers/net/ethernet/korina.c                      |    7 +-
 drivers/net/ethernet/marvell/mv643xx_eth.c         |  200 +-
 drivers/net/ethernet/marvell/mvneta.c              |   46 +-
 drivers/net/ethernet/marvell/pxa168_eth.c          |    3 +-
 drivers/net/ethernet/marvell/skge.c                |    2 +-
 drivers/net/ethernet/marvell/sky2.c                |    2 +-
 drivers/net/ethernet/mellanox/mlx4/cmd.c           |  196 +-
 drivers/net/ethernet/mellanox/mlx4/en_cq.c         |    3 +
 drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c     |    3 -
 drivers/net/ethernet/mellanox/mlx4/en_ethtool.c    |   20 +-
 drivers/net/ethernet/mellanox/mlx4/en_main.c       |    2 +-
 drivers/net/ethernet/mellanox/mlx4/en_netdev.c     |   88 +-
 drivers/net/ethernet/mellanox/mlx4/en_rx.c         |  184 +-
 drivers/net/ethernet/mellanox/mlx4/en_tx.c         |    2 +-
 drivers/net/ethernet/mellanox/mlx4/eq.c            |    9 +-
 drivers/net/ethernet/mellanox/mlx4/fw.c            |   13 +-
 drivers/net/ethernet/mellanox/mlx4/main.c          |   11 +-
 drivers/net/ethernet/mellanox/mlx4/mlx4.h          |   22 +
 drivers/net/ethernet/mellanox/mlx4/mlx4_en.h       |  145 +-
 .../net/ethernet/mellanox/mlx4/resource_tracker.c  |  163 +-
 drivers/net/ethernet/micrel/Kconfig                |    4 -
 drivers/net/ethernet/micrel/ks8695net.c            |    1 -
 drivers/net/ethernet/micrel/ks8842.c               |    1 -
 drivers/net/ethernet/micrel/ks8851_mll.c           |   34 +-
 drivers/net/ethernet/myricom/myri10ge/myri10ge.c   |    2 +-
 drivers/net/ethernet/netx-eth.c                    |    5 +-
 drivers/net/ethernet/nuvoton/Kconfig               |    1 -
 drivers/net/ethernet/nuvoton/w90p910_ether.c       |    2 -
 drivers/net/ethernet/nvidia/forcedeth.c            |   17 +-
 drivers/net/ethernet/nxp/lpc_eth.c                 |    2 -
 drivers/net/ethernet/octeon/octeon_mgmt.c          |    4 +-
 drivers/net/ethernet/oki-semi/pch_gbe/Kconfig      |    1 -
 drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h    |    2 +
 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c    |   70 +-
 .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c    |    2 +-
 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c   |  327 ++-
 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c  |   63 +-
 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c    |   26 +-
 drivers/net/ethernet/packetengines/Kconfig         |    1 -
 drivers/net/ethernet/qlogic/netxen/netxen_nic.h    |   14 +-
 .../net/ethernet/qlogic/netxen/netxen_nic_hdr.h    |    3 +
 .../net/ethernet/qlogic/netxen/netxen_nic_main.c   |  133 +-
 drivers/net/ethernet/qlogic/qlcnic/qlcnic.h        |   59 +-
 .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c    |  346 ++-
 .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h    |   13 +-
 .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c  |   59 +-
 .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c  |   62 +-
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c    |  172 +-
 .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c    |    6 +-
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h    |    1 +
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c     |  103 +-
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h     |    8 +-
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c   |  226 +-
 .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c   |  225 +-
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h  |    4 +
 .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c   |   60 +-
 .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c   |   36 +
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c  |  126 +-
 drivers/net/ethernet/qlogic/qlge/qlge_main.c       |   13 +-
 drivers/net/ethernet/rdc/Kconfig                   |    1 -
 drivers/net/ethernet/realtek/8139cp.c              |    2 +-
 drivers/net/ethernet/realtek/Kconfig               |    3 -
 drivers/net/ethernet/renesas/Kconfig               |    7 -
 drivers/net/ethernet/renesas/sh_eth.c              |  521 ++--
 drivers/net/ethernet/renesas/sh_eth.h              |   29 +-
 drivers/net/ethernet/s6gmac.c                      |    1 -
 drivers/net/ethernet/seeq/sgiseeq.c                |    1 -
 drivers/net/ethernet/sfc/efx.c                     |   42 +-
 drivers/net/ethernet/sfc/efx.h                     |    1 +
 drivers/net/ethernet/sfc/ethtool.c                 |   16 +-
 drivers/net/ethernet/sfc/filter.c                  |   15 +-
 drivers/net/ethernet/sfc/net_driver.h              |    5 +-
 drivers/net/ethernet/sfc/nic.c                     |   74 +-
 drivers/net/ethernet/sfc/nic.h                     |    4 +-
 drivers/net/ethernet/sfc/ptp.c                     |   13 +-
 drivers/net/ethernet/sfc/rx.c                      |    8 +-
 drivers/net/ethernet/sfc/siena.c                   |    2 +-
 drivers/net/ethernet/sgi/Kconfig                   |    1 -
 drivers/net/ethernet/sgi/ioc3-eth.c                |   14 +-
 drivers/net/ethernet/sgi/meth.c                    |    1 -
 drivers/net/ethernet/silan/sc92031.c               |   14 +-
 drivers/net/ethernet/sis/Kconfig                   |    2 -
 drivers/net/ethernet/sis/sis190.c                  |   13 +-
 drivers/net/ethernet/smsc/Kconfig                  |    7 +-
 drivers/net/ethernet/smsc/smc911x.c                |    2 -
 drivers/net/ethernet/smsc/smc91x.c                 |    3 -
 drivers/net/ethernet/smsc/smsc911x.c               |    2 -
 drivers/net/ethernet/stmicro/stmmac/Kconfig        |    1 -
 drivers/net/ethernet/stmicro/stmmac/common.h       |   10 -
 .../net/ethernet/stmicro/stmmac/dwmac1000_core.c   |   57 +-
 .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c    |   10 +-
 .../net/ethernet/stmicro/stmmac/dwmac100_core.c    |    4 -
 drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c |    8 +-
 drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c    |   72 +-
 drivers/net/ethernet/stmicro/stmmac/enh_desc.c     |   95 +-
 drivers/net/ethernet/stmicro/stmmac/norm_desc.c    |    4 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |  160 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c  |   48 +-
 .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |   34 +-
 drivers/net/ethernet/sun/cassini.c                 |   18 +-
 drivers/net/ethernet/sun/niu.c                     |    5 +-
 drivers/net/ethernet/sun/sunbmac.c                 |    6 +-
 drivers/net/ethernet/sun/sungem.c                  |   13 +-
 drivers/net/ethernet/sun/sunhme.c                  |    4 +-
 drivers/net/ethernet/sun/sunqe.c                   |   10 +-
 drivers/net/ethernet/ti/cpsw.c                     |    7 +-
 drivers/net/ethernet/ti/davinci_cpdma.c            |    5 +
 drivers/net/ethernet/ti/davinci_emac.c             |  119 +-
 drivers/net/ethernet/ti/davinci_mdio.c             |    5 +-
 drivers/net/ethernet/ti/tlan.c                     |    3 +-
 drivers/net/ethernet/ti/tlan.h                     |    1 -
 drivers/net/ethernet/toshiba/tc35815.c             |   14 +-
 drivers/net/ethernet/tundra/tsi108_eth.c           |    1 -
 drivers/net/ethernet/via/Kconfig                   |    5 +-
 drivers/net/ethernet/via/via-velocity.c            |  507 ++--
 drivers/net/ethernet/via/via-velocity.h            |    8 +-
 drivers/net/ethernet/wiznet/w5100.c                |    2 -
 drivers/net/ethernet/wiznet/w5300.c                |    2 -
 drivers/net/ethernet/xilinx/Kconfig                |    4 +-
 drivers/net/ethernet/xilinx/ll_temac_main.c        |    5 +-
 drivers/net/ethernet/xilinx/xilinx_axienet_main.c  |    6 +-
 drivers/net/ethernet/xilinx/xilinx_emaclite.c      |  236 +-
 drivers/net/ethernet/xscale/ixp4xx_eth.c           |    2 -
 drivers/net/fddi/skfp/skfddi.c                     |   13 +-
 drivers/net/hamradio/bpqether.c                    |    7 +-
 drivers/net/hippi/rrunner.c                        |   13 +-
 drivers/net/irda/bfin_sir.c                        |    1 -
 drivers/net/irda/sh_irda.c                         |    1 -
 drivers/net/irda/sh_sir.c                          |    1 -
 drivers/net/macvlan.c                              |   12 +-
 drivers/net/macvtap.c                              |  341 ++-
 drivers/net/netconsole.c                           |    5 +-
 drivers/net/nlmon.c                                |  181 ++
 drivers/net/phy/Kconfig                            |   10 +
 drivers/net/phy/Makefile                           |    1 +
 drivers/net/phy/at803x.c                           |  128 +-
 drivers/net/phy/bcm63xx.c                          |    4 +-
 drivers/net/phy/marvell.c                          |  108 +-
 drivers/net/phy/mdio-sun4i.c                       |  194 ++
 drivers/net/phy/phy.c                              |   26 +-
 drivers/net/phy/phy_device.c                       |   11 +-
 drivers/net/phy/spi_ks8995.c                       |   14 +-
 drivers/net/phy/vitesse.c                          |   38 +-
 drivers/net/ppp/pppoe.c                            |    2 +-
 drivers/net/team/team.c                            |   86 +-
 drivers/net/team/team_mode_loadbalance.c           |    3 +-
 drivers/net/team/team_mode_roundrobin.c            |    3 +-
 drivers/net/tun.c                                  |   12 +-
 drivers/net/usb/Kconfig                            |    4 -
 drivers/net/usb/ax88179_178a.c                     |    5 +-
 drivers/net/usb/cdc_ether.c                        |   22 +-
 drivers/net/usb/ipheth.c                           |    5 +
 drivers/net/usb/kalmia.c                           |   45 +-
 drivers/net/usb/qmi_wwan.c                         |    4 +-
 drivers/net/usb/r8152.c                            |   14 +-
 drivers/net/veth.c                                 |    7 -
 drivers/net/vxlan.c                                |  788 +++--
 drivers/net/wan/dlci.c                             |    2 +-
 drivers/net/wan/hdlc.c                             |    2 +-
 drivers/net/wan/ixp4xx_hss.c                       |    1 -
 drivers/net/wan/lapbether.c                        |    2 +-
 drivers/net/wireless/Kconfig                       |    1 +
 drivers/net/wireless/Makefile                      |    2 +
 drivers/net/wireless/ath/Kconfig                   |    1 +
 drivers/net/wireless/ath/Makefile                  |    1 +
 drivers/net/wireless/ath/ath.h                     |   13 +-
 drivers/net/wireless/ath/ath10k/Kconfig            |   39 +
 drivers/net/wireless/ath/ath10k/Makefile           |   20 +
 drivers/net/wireless/ath/ath10k/bmi.c              |  295 ++
 drivers/net/wireless/ath/ath10k/bmi.h              |  224 ++
 drivers/net/wireless/ath/ath10k/ce.c               | 1189 ++++++++
 drivers/net/wireless/ath/ath10k/ce.h               |  516 ++++
 drivers/net/wireless/ath/ath10k/core.c             |  665 +++++
 drivers/net/wireless/ath/ath10k/core.h             |  369 +++
 drivers/net/wireless/ath/ath10k/debug.c            |  503 ++++
 drivers/net/wireless/ath/ath10k/debug.h            |   90 +
 drivers/net/wireless/ath/ath10k/hif.h              |  137 +
 drivers/net/wireless/ath/ath10k/htc.c              | 1000 +++++++
 drivers/net/wireless/ath/ath10k/htc.h              |  368 +++
 drivers/net/wireless/ath/ath10k/htt.c              |  152 +
 drivers/net/wireless/ath/ath10k/htt.h              | 1338 +++++++++
 drivers/net/wireless/ath/ath10k/htt_rx.c           | 1167 ++++++++
 drivers/net/wireless/ath/ath10k/htt_tx.c           |  510 ++++
 drivers/net/wireless/ath/ath10k/hw.h               |  304 ++
 drivers/net/wireless/ath/ath10k/mac.c              | 3069 ++++++++++++++++++++
 drivers/net/wireless/ath/ath10k/mac.h              |   61 +
 drivers/net/wireless/ath/ath10k/pci.c              | 2507 ++++++++++++++++
 drivers/net/wireless/ath/ath10k/pci.h              |  355 +++
 drivers/net/wireless/ath/ath10k/rx_desc.h          |  990 +++++++
 drivers/net/wireless/ath/ath10k/targaddrs.h        |  449 +++
 drivers/net/wireless/ath/ath10k/trace.c            |   20 +
 drivers/net/wireless/ath/ath10k/trace.h            |  170 ++
 drivers/net/wireless/ath/ath10k/txrx.c             |  417 +++
 drivers/net/wireless/ath/ath10k/txrx.h             |   39 +
 drivers/net/wireless/ath/ath10k/wmi.c              | 2081 +++++++++++++
 drivers/net/wireless/ath/ath10k/wmi.h              | 3052 +++++++++++++++++++
 drivers/net/wireless/ath/ath5k/ahb.c               |    2 -
 drivers/net/wireless/ath/ath5k/base.c              |   79 +-
 drivers/net/wireless/ath/ath5k/base.h              |   14 +-
 drivers/net/wireless/ath/ath5k/mac80211-ops.c      |    2 +-
 drivers/net/wireless/ath/ath6kl/cfg80211.c         |   51 +-
 drivers/net/wireless/ath/ath6kl/debug.c            |    8 +-
 drivers/net/wireless/ath/ath6kl/init.c             |   14 +-
 drivers/net/wireless/ath/ath6kl/sdio.c             |   12 +-
 drivers/net/wireless/ath/ath6kl/usb.c              |   36 +-
 drivers/net/wireless/ath/ath9k/Kconfig             |    8 -
 drivers/net/wireless/ath/ath9k/ahb.c               |    2 -
 drivers/net/wireless/ath/ath9k/ani.c               |   89 +-
 drivers/net/wireless/ath/ath9k/ani.h               |   23 +-
 drivers/net/wireless/ath/ath9k/ar5008_phy.c        |    6 +-
 drivers/net/wireless/ath/ath9k/ar9002_hw.c         |    4 -
 drivers/net/wireless/ath/ath9k/ar9002_initvals.h   |   14 -
 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |   33 +-
 drivers/net/wireless/ath/ath9k/ar9003_hw.c         |   80 +-
 drivers/net/wireless/ath/ath9k/ar9003_mac.c        |    5 +-
 drivers/net/wireless/ath/ath9k/ar9003_paprd.c      |   19 +-
 drivers/net/wireless/ath/ath9k/ar9003_phy.c        |  107 +-
 drivers/net/wireless/ath/ath9k/ar9003_phy.h        |    6 +-
 .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h   |  345 ++-
 .../net/wireless/ath/ath9k/ar9462_2p1_initvals.h   | 1774 +++++++++++
 drivers/net/wireless/ath/ath9k/ath9k.h             |   16 +-
 drivers/net/wireless/ath/ath9k/beacon.c            |   31 +-
 drivers/net/wireless/ath/ath9k/calib.c             |    1 -
 drivers/net/wireless/ath/ath9k/debug.c             |  430 +--
 drivers/net/wireless/ath/ath9k/debug.h             |   59 -
 drivers/net/wireless/ath/ath9k/dfs_debug.c         |    2 +-
 drivers/net/wireless/ath/ath9k/hif_usb.c           |    8 +-
 drivers/net/wireless/ath/ath9k/htc.h               |   24 +
 drivers/net/wireless/ath/ath9k/htc_drv_beacon.c    |    5 +-
 drivers/net/wireless/ath/ath9k/htc_drv_debug.c     |   99 +-
 drivers/net/wireless/ath/ath9k/htc_drv_init.c      |   17 +-
 drivers/net/wireless/ath/ath9k/htc_drv_main.c      |   81 +-
 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c      |    2 +-
 drivers/net/wireless/ath/ath9k/hw.c                |   28 +-
 drivers/net/wireless/ath/ath9k/hw.h                |   20 +-
 drivers/net/wireless/ath/ath9k/init.c              |   66 +-
 drivers/net/wireless/ath/ath9k/link.c              |    9 +-
 drivers/net/wireless/ath/ath9k/mac.c               |   16 +-
 drivers/net/wireless/ath/ath9k/mac.h               |    4 +-
 drivers/net/wireless/ath/ath9k/main.c              |   55 +-
 drivers/net/wireless/ath/ath9k/pci.c               |  101 +
 drivers/net/wireless/ath/ath9k/recv.c              |    9 +-
 drivers/net/wireless/ath/ath9k/reg.h               |   13 +-
 drivers/net/wireless/ath/ath9k/wow.c               |  168 +-
 drivers/net/wireless/ath/ath9k/xmit.c              |  343 ++-
 drivers/net/wireless/ath/carl9170/carl9170.h       |    3 +
 drivers/net/wireless/ath/carl9170/main.c           |    3 +
 drivers/net/wireless/ath/carl9170/tx.c             |  182 +-
 drivers/net/wireless/ath/regd.c                    |    6 +-
 drivers/net/wireless/ath/wil6210/Kconfig           |   12 +
 drivers/net/wireless/ath/wil6210/Makefile          |   21 +-
 drivers/net/wireless/ath/wil6210/cfg80211.c        |   38 +-
 drivers/net/wireless/ath/wil6210/debug.c           |   69 +
 drivers/net/wireless/ath/wil6210/debugfs.c         |    8 +-
 drivers/net/wireless/ath/wil6210/interrupt.c       |   29 +-
 drivers/net/wireless/ath/wil6210/main.c            |   64 +-
 drivers/net/wireless/ath/wil6210/netdev.c          |   54 +
 drivers/net/wireless/ath/wil6210/trace.c           |   20 +
 drivers/net/wireless/ath/wil6210/trace.h           |  235 ++
 drivers/net/wireless/ath/wil6210/txrx.c            |  205 +-
 drivers/net/wireless/ath/wil6210/txrx.h            |   36 +-
 drivers/net/wireless/ath/wil6210/wil6210.h         |   28 +-
 drivers/net/wireless/ath/wil6210/wmi.c             |   60 +-
 drivers/net/wireless/b43/Kconfig                   |   12 +-
 drivers/net/wireless/b43/main.c                    |   12 +-
 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c   |  302 +-
 .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c |  117 +-
 drivers/net/wireless/brcm80211/brcmfmac/dhd.h      |    2 +
 drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c  |    3 +
 drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c  |   18 +-
 drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h  |    6 +-
 .../net/wireless/brcm80211/brcmfmac/dhd_linux.c    |   52 +-
 drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c |  176 +-
 drivers/net/wireless/brcm80211/brcmfmac/fweh.h     |    3 +-
 drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c |  943 +++---
 drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h |    1 +
 .../net/wireless/brcm80211/brcmfmac/sdio_host.h    |   20 +-
 .../net/wireless/brcm80211/brcmfmac/tracepoint.h   |   21 +
 drivers/net/wireless/brcm80211/brcmfmac/usb.c      |    8 +
 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c  |   18 +-
 drivers/net/wireless/brcm80211/brcmsmac/ampdu.c    |    2 +-
 drivers/net/wireless/cw1200/Kconfig                |   30 +
 drivers/net/wireless/cw1200/Makefile               |   21 +
 drivers/net/wireless/cw1200/bh.c                   |  619 ++++
 drivers/net/wireless/cw1200/bh.h                   |   28 +
 drivers/net/wireless/cw1200/cw1200.h               |  323 ++
 drivers/net/wireless/cw1200/cw1200_sdio.c          |  425 +++
 drivers/net/wireless/cw1200/cw1200_spi.c           |  471 +++
 drivers/net/wireless/cw1200/debug.c                |  428 +++
 drivers/net/wireless/cw1200/debug.h                |   93 +
 drivers/net/wireless/cw1200/fwio.c                 |  520 ++++
 drivers/net/wireless/cw1200/fwio.h                 |   39 +
 drivers/net/wireless/cw1200/hwbus.h                |   33 +
 drivers/net/wireless/cw1200/hwio.c                 |  312 ++
 drivers/net/wireless/cw1200/hwio.h                 |  247 ++
 drivers/net/wireless/cw1200/main.c                 |  605 ++++
 drivers/net/wireless/cw1200/pm.c                   |  367 +++
 drivers/net/wireless/cw1200/pm.h                   |   43 +
 drivers/net/wireless/cw1200/queue.c                |  583 ++++
 drivers/net/wireless/cw1200/queue.h                |  116 +
 drivers/net/wireless/cw1200/scan.c                 |  461 +++
 drivers/net/wireless/cw1200/scan.h                 |   56 +
 drivers/net/wireless/cw1200/sta.c                  | 2403 +++++++++++++++
 drivers/net/wireless/cw1200/sta.h                  |  123 +
 drivers/net/wireless/cw1200/txrx.c                 | 1473 ++++++++++
 drivers/net/wireless/cw1200/txrx.h                 |  106 +
 drivers/net/wireless/cw1200/wsm.c                  | 1822 ++++++++++++
 drivers/net/wireless/cw1200/wsm.h                  | 1870 ++++++++++++
 drivers/net/wireless/ipw2x00/ipw2100.c             |    2 -
 drivers/net/wireless/ipw2x00/ipw2200.c             |    1 +
 drivers/net/wireless/ipw2x00/libipw_rx.c           |    2 +-
 drivers/net/wireless/iwlegacy/3945-mac.c           |    5 +-
 drivers/net/wireless/iwlegacy/3945.c               |   18 +
 drivers/net/wireless/iwlegacy/4965-mac.c           |   25 +-
 drivers/net/wireless/iwlegacy/commands.h           |    8 -
 drivers/net/wireless/iwlegacy/common.c             |   11 +
 drivers/net/wireless/iwlegacy/common.h             |   41 +-
 drivers/net/wireless/iwlwifi/Kconfig               |   10 -
 drivers/net/wireless/iwlwifi/Makefile              |    7 +-
 drivers/net/wireless/iwlwifi/dvm/Makefile          |    1 -
 drivers/net/wireless/iwlwifi/dvm/agn.h             |   58 +-
 drivers/net/wireless/iwlwifi/dvm/calib.c           |    8 +-
 drivers/net/wireless/iwlwifi/dvm/commands.h        |   12 -
 drivers/net/wireless/iwlwifi/dvm/dev.h             |   73 +-
 drivers/net/wireless/iwlwifi/dvm/devices.c         |  107 +-
 drivers/net/wireless/iwlwifi/dvm/lib.c             |   26 +-
 drivers/net/wireless/iwlwifi/dvm/mac80211.c        |   37 +-
 drivers/net/wireless/iwlwifi/dvm/main.c            |   67 +-
 drivers/net/wireless/iwlwifi/dvm/power.c           |    6 +-
 drivers/net/wireless/iwlwifi/dvm/rs.c              |   51 +-
 drivers/net/wireless/iwlwifi/dvm/rx.c              |   42 +-
 drivers/net/wireless/iwlwifi/dvm/scan.c            |   12 +-
 drivers/net/wireless/iwlwifi/dvm/testmode.c        |  471 ---
 drivers/net/wireless/iwlwifi/dvm/tt.c              |    2 +-
 drivers/net/wireless/iwlwifi/dvm/tx.c              |   24 +-
 drivers/net/wireless/iwlwifi/dvm/ucode.c           |   10 +-
 drivers/net/wireless/iwlwifi/iwl-1000.c            |    3 -
 drivers/net/wireless/iwlwifi/iwl-2000.c            |   39 +-
 drivers/net/wireless/iwlwifi/iwl-5000.c            |    4 -
 drivers/net/wireless/iwlwifi/iwl-6000.c            |   32 +-
 drivers/net/wireless/iwlwifi/iwl-7000.c            |   65 +-
 drivers/net/wireless/iwlwifi/iwl-config.h          |   54 +-
 drivers/net/wireless/iwlwifi/iwl-csr.h             |   19 +
 drivers/net/wireless/iwlwifi/iwl-debug.h           |    4 +
 drivers/net/wireless/iwlwifi/iwl-drv.c             |   19 +-
 drivers/net/wireless/iwlwifi/iwl-drv.h             |    3 +-
 drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c    |   15 +-
 drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h    |    3 +-
 drivers/net/wireless/iwlwifi/iwl-fw.h              |    7 +-
 drivers/net/wireless/iwlwifi/iwl-modparams.h       |    9 +-
 drivers/net/wireless/iwlwifi/iwl-nvm-parse.c       |   20 +-
 drivers/net/wireless/iwlwifi/iwl-nvm-parse.h       |    2 +-
 drivers/net/wireless/iwlwifi/iwl-phy-db.c          |   39 +-
 drivers/net/wireless/iwlwifi/iwl-prph.h            |   12 +
 drivers/net/wireless/iwlwifi/iwl-test.c            |  852 ------
 drivers/net/wireless/iwlwifi/iwl-test.h            |  161 -
 drivers/net/wireless/iwlwifi/iwl-testmode.h        |  309 --
 drivers/net/wireless/iwlwifi/iwl-trans.h           |   21 +-
 drivers/net/wireless/iwlwifi/mvm/Makefile          |    2 +-
 drivers/net/wireless/iwlwifi/mvm/bt-coex.c         |   29 +-
 drivers/net/wireless/iwlwifi/mvm/d3.c              |  197 +-
 drivers/net/wireless/iwlwifi/mvm/debugfs.c         |  453 ++-
 drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h       |    4 +-
 drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h      |    8 +-
 drivers/net/wireless/iwlwifi/mvm/fw-api-power.h    |   98 +-
 drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h       |   10 +-
 drivers/net/wireless/iwlwifi/mvm/fw-api.h          |  233 ++
 drivers/net/wireless/iwlwifi/mvm/fw.c              |   37 +-
 drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c        |   97 +-
 drivers/net/wireless/iwlwifi/mvm/mac80211.c        |  299 +-
 drivers/net/wireless/iwlwifi/mvm/mvm.h             |  204 +-
 drivers/net/wireless/iwlwifi/mvm/nvm.c             |  212 +-
 drivers/net/wireless/iwlwifi/mvm/ops.c             |   37 +-
 drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c        |   76 +-
 drivers/net/wireless/iwlwifi/mvm/power.c           |  218 +-
 drivers/net/wireless/iwlwifi/mvm/quota.c           |   25 +-
 drivers/net/wireless/iwlwifi/mvm/rs.c              |  171 +-
 drivers/net/wireless/iwlwifi/mvm/rs.h              |   17 +
 drivers/net/wireless/iwlwifi/mvm/rx.c              |   22 +
 drivers/net/wireless/iwlwifi/mvm/scan.c            |    6 -
 drivers/net/wireless/iwlwifi/mvm/sta.c             |   24 +-
 drivers/net/wireless/iwlwifi/mvm/sta.h             |    8 +-
 drivers/net/wireless/iwlwifi/mvm/tt.c              |  530 ++++
 drivers/net/wireless/iwlwifi/mvm/tx.c              |    7 +-
 drivers/net/wireless/iwlwifi/mvm/utils.c           |   41 +
 drivers/net/wireless/iwlwifi/pcie/drv.c            |   54 +-
 drivers/net/wireless/iwlwifi/pcie/internal.h       |    2 +
 drivers/net/wireless/iwlwifi/pcie/rx.c             |  115 +-
 drivers/net/wireless/iwlwifi/pcie/trans.c          |   68 +-
 drivers/net/wireless/iwlwifi/pcie/tx.c             |   40 +-
 drivers/net/wireless/libertas/mesh.c               |    2 +-
 drivers/net/wireless/mwifiex/11h.c                 |  101 +
 drivers/net/wireless/mwifiex/Kconfig               |    4 +-
 drivers/net/wireless/mwifiex/Makefile              |    1 +
 drivers/net/wireless/mwifiex/cfg80211.c            |  122 +-
 drivers/net/wireless/mwifiex/cmdevt.c              |    1 +
 drivers/net/wireless/mwifiex/fw.h                  |   33 +
 drivers/net/wireless/mwifiex/init.c                |  115 +-
 drivers/net/wireless/mwifiex/join.c                |    7 +-
 drivers/net/wireless/mwifiex/main.c                |  101 +-
 drivers/net/wireless/mwifiex/main.h                |   32 +-
 drivers/net/wireless/mwifiex/scan.c                |   60 +-
 drivers/net/wireless/mwifiex/sdio.c                |  463 ++-
 drivers/net/wireless/mwifiex/sdio.h                |  340 ++-
 drivers/net/wireless/mwifiex/sta_cmd.c             |   62 +
 drivers/net/wireless/mwifiex/sta_cmdresp.c         |   17 +
 drivers/net/wireless/mwifiex/sta_event.c           |   11 +
 drivers/net/wireless/mwifiex/sta_ioctl.c           |   52 +-
 drivers/net/wireless/mwifiex/uap_cmd.c             |   21 +
 drivers/net/wireless/mwifiex/uap_event.c           |   25 +-
 drivers/net/wireless/mwifiex/wmm.c                 |    5 +-
 drivers/net/wireless/mwl8k.c                       |   11 +-
 drivers/net/wireless/orinoco/orinoco_pci.h         |    2 +-
 drivers/net/wireless/orinoco/orinoco_usb.c         |    3 +-
 drivers/net/wireless/p54/p54spi.c                  |   37 +-
 drivers/net/wireless/rt2x00/rt2400pci.c            |   66 +-
 drivers/net/wireless/rt2x00/rt2500pci.c            |   66 +-
 drivers/net/wireless/rt2x00/rt2500usb.c            |   66 +-
 drivers/net/wireless/rt2x00/rt2800.h               |   12 +-
 drivers/net/wireless/rt2x00/rt2800lib.c            |  835 ++++--
 drivers/net/wireless/rt2x00/rt2800pci.c            |   68 +-
 drivers/net/wireless/rt2x00/rt2800usb.c            |  127 +-
 drivers/net/wireless/rt2x00/rt2x00.h               |    9 +-
 drivers/net/wireless/rt2x00/rt2x00dev.c            |   54 +-
 drivers/net/wireless/rt2x00/rt2x00pci.c            |    9 +-
 drivers/net/wireless/rt2x00/rt2x00queue.c          |   32 +-
 drivers/net/wireless/rt2x00/rt2x00queue.h          |   21 +-
 drivers/net/wireless/rt2x00/rt61pci.c              |   60 +-
 drivers/net/wireless/rt2x00/rt73usb.c              |   58 +-
 drivers/net/wireless/rtlwifi/base.c                |    2 +-
 drivers/net/wireless/rtlwifi/rtl8192cu/rf.c        |    2 +-
 drivers/net/wireless/rtlwifi/rtl8192cu/sw.c        |    1 +
 drivers/net/wireless/rtlwifi/rtl8192de/dm.c        |    2 +-
 drivers/net/wireless/rtlwifi/rtl8723ae/sw.c        |    6 +-
 drivers/net/wireless/ti/wl1251/spi.c               |   30 +-
 drivers/net/wireless/ti/wl18xx/main.c              |   47 +-
 drivers/net/wireless/ti/wl18xx/reg.h               |   15 +
 drivers/net/wireless/ti/wlcore/Makefile            |    2 +-
 drivers/net/wireless/ti/wlcore/main.c              |  284 +-
 drivers/net/wireless/ti/wlcore/ps.c                |    2 +-
 drivers/net/wireless/ti/wlcore/spi.c               |   14 +-
 drivers/net/wireless/ti/wlcore/sysfs.c             |  216 ++
 drivers/net/wireless/ti/wlcore/sysfs.h             |   28 +
 drivers/net/wireless/ti/wlcore/tx.c                |    2 +-
 drivers/net/xen-netback/common.h                   |   14 +-
 drivers/net/xen-netback/interface.c                |  102 +-
 drivers/net/xen-netback/netback.c                  |   42 +-
 drivers/net/xen-netback/xenbus.c                   |   53 +-
 drivers/net/xen-netfront.c                         |  253 +-
 drivers/nfc/Kconfig                                |   10 +
 drivers/nfc/Makefile                               |    1 +
 drivers/nfc/mei_phy.c                              |    6 +-
 drivers/nfc/microread/microread.c                  |    6 +-
 drivers/nfc/nfcsim.c                               |  541 ++++
 drivers/nfc/nfcwilink.c                            |   18 +-
 drivers/nfc/pn533.c                                |   31 +-
 drivers/nfc/pn544/pn544.c                          |   40 +-
 drivers/of/of_net.c                                |    1 +
 drivers/s390/net/netiucv.c                         |   20 -
 drivers/s390/net/qeth_core.h                       |    2 +-
 drivers/s390/net/qeth_core_main.c                  |   23 +-
 drivers/scsi/cxgbi/cxgb4i/cxgb4i.c                 |    2 +-
 drivers/scsi/fcoe/fcoe.c                           |    2 +-
 drivers/scsi/fcoe/fcoe_transport.c                 |    2 +-
 drivers/scsi/libiscsi_tcp.c                        |    1 -
 drivers/ssb/driver_chipcommon_sflash.c             |   34 +-
 drivers/ssb/main.c                                 |    8 +
 drivers/ssb/pcihost_wrapper.c                      |    2 +-
 drivers/ssb/sprom.c                                |    2 +-
 drivers/ssb/ssb_private.h                          |    4 +
 drivers/staging/csr/netdev.c                       |    2 +-
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c |    2 +-
 drivers/staging/ft1000/ft1000-usb/ft1000_proc.c    |    2 +-
 drivers/staging/rtl8192u/r8192U_core.c             |    4 +-
 drivers/staging/silicom/Kconfig                    |    7 +-
 drivers/staging/silicom/bpctl_mod.c                |    2 +-
 fs/select.c                                        |   39 +-
 include/linux/bcma/bcma.h                          |    1 +
 include/linux/bcma/bcma_driver_chipcommon.h        |   55 +
 include/linux/can/platform/flexcan.h               |   20 -
 include/linux/filter.h                             |    4 +-
 include/linux/ieee80211.h                          |   10 +
 include/linux/if_link.h                            |    1 +
 include/linux/if_macvlan.h                         |   12 +-
 include/linux/if_team.h                            |   11 +
 include/linux/if_vlan.h                            |    2 -
 include/linux/igmp.h                               |    1 +
 include/linux/inetdevice.h                         |    5 +
 include/linux/jiffies.h                            |    4 +
 include/linux/ktime.h                              |   13 +
 include/linux/marvell_phy.h                        |    2 +
 include/linux/mlx4/cmd.h                           |    3 +-
 include/linux/mlx4/device.h                        |    3 +-
 include/linux/mlx4/qp.h                            |   36 +
 include/linux/mv643xx_eth.h                        |    2 +
 include/linux/net.h                                |    6 +-
 include/linux/netdev_features.h                    |    4 +-
 include/linux/netdevice.h                          |   85 +-
 include/linux/netfilter.h                          |    2 +-
 include/linux/netlink.h                            |   27 +
 include/linux/netpoll.h                            |    4 +-
 include/linux/phy.h                                |   27 +
 include/linux/platform_data/brcmfmac-sdio.h        |    5 +
 include/linux/platform_data/net-cw1200.h           |   81 +
 include/linux/sched.h                              |    9 +
 include/linux/skbuff.h                             |  137 +-
 include/linux/ssb/ssb_driver_mips.h                |   15 +
 include/linux/ssb/ssb_regs.h                       |    1 +
 include/linux/stmmac.h                             |    4 +
 include/linux/tcp.h                                |    1 -
 include/net/act_api.h                              |    2 +-
 include/net/addrconf.h                             |    4 +
 include/net/bluetooth/hci.h                        |    1 -
 include/net/bluetooth/hci_core.h                   |   29 +-
 include/net/bluetooth/l2cap.h                      |    2 +-
 include/net/cfg80211.h                             |  236 +-
 include/net/gen_stats.h                            |   10 +-
 include/net/gre.h                                  |   31 +
 include/net/ieee80211_radiotap.h                   |    7 +
 include/net/if_inet6.h                             |   13 +-
 include/net/inet_ecn.h                             |    6 +-
 include/net/inet_sock.h                            |    1 -
 include/net/ip_fib.h                               |    5 +-
 include/net/ip_tunnels.h                           |   36 +-
 include/net/ip_vs.h                                |   92 +-
 include/net/ipv6.h                                 |   10 +-
 include/net/ll_poll.h                              |  200 ++
 include/net/mac80211.h                             |   27 +-
 include/net/ndisc.h                                |    2 +-
 include/net/net_namespace.h                        |   13 +
 include/net/netfilter/xt_rateest.h                 |    2 +-
 include/net/netns/x_tables.h                       |    6 +
 include/net/nfc/hci.h                              |    7 +-
 include/net/nfc/nci_core.h                         |   58 +-
 include/net/nfc/nfc.h                              |   35 +-
 include/net/ping.h                                 |   65 +-
 include/net/sch_generic.h                          |   17 +-
 include/net/sctp/checksum.h                        |    5 +
 include/net/sctp/sctp.h                            |  111 -
 include/net/sctp/structs.h                         |    6 +-
 include/net/sock.h                                 |   21 +-
 include/net/tcp.h                                  |   29 +-
 include/net/transp_v6.h                            |   79 +-
 include/net/udp.h                                  |    8 +-
 include/uapi/asm-generic/poll.h                    |    2 +
 include/uapi/asm-generic/socket.h                  |    2 +
 include/uapi/linux/ethtool.h                       |    4 +-
 include/uapi/linux/gen_stats.h                     |   11 +
 include/uapi/linux/if_arp.h                        |    1 +
 include/uapi/linux/if_link.h                       |   15 +
 include/uapi/linux/if_pppox.h                      |    4 +-
 include/uapi/linux/if_tun.h                        |    2 +
 include/uapi/linux/ip_vs.h                         |    6 +
 include/uapi/linux/netfilter/nfnetlink_queue.h     |    2 +
 include/uapi/linux/netfilter/xt_socket.h           |    7 +
 include/uapi/linux/nfc.h                           |   18 +-
 include/uapi/linux/nl80211.h                       |   37 +
 include/uapi/linux/openvswitch.h                   |   20 +-
 include/uapi/linux/rtnetlink.h                     |    2 +
 include/uapi/linux/snmp.h                          |    2 +
 include/uapi/linux/tipc.h                          |    2 +-
 include/uapi/linux/tipc_config.h                   |    2 +-
 include/xen/interface/io/netif.h                   |   12 +
 kernel/sysctl_binary.c                             |    1 -
 lib/vsprintf.c                                     |  124 +-
 net/8021q/vlan.c                                   |    2 +-
 net/Kconfig                                        |   17 +
 net/Makefile                                       |    1 +
 net/appletalk/aarp.c                               |    2 +-
 net/appletalk/ddp.c                                |    2 +-
 net/atm/clip.c                                     |    8 +-
 net/atm/mpc.c                                      |    6 +-
 net/ax25/af_ax25.c                                 |    6 +-
 net/ax25/sysctl_net_ax25.c                         |    2 +-
 net/batman-adv/Makefile                            |    1 -
 net/batman-adv/bat_iv_ogm.c                        |  123 +-
 net/batman-adv/bridge_loop_avoidance.c             |   94 +-
 net/batman-adv/bridge_loop_avoidance.h             |   12 +-
 net/batman-adv/distributed-arp-table.c             |   82 +-
 net/batman-adv/hard-interface.c                    |   98 +-
 net/batman-adv/icmp_socket.c                       |    4 +-
 net/batman-adv/main.c                              |    1 -
 net/batman-adv/main.h                              |   18 +-
 net/batman-adv/network-coding.c                    |   22 +-
 net/batman-adv/network-coding.h                    |    6 +-
 net/batman-adv/originator.c                        |    6 +-
 net/batman-adv/originator.h                        |    2 +-
 net/batman-adv/ring_buffer.c                       |   51 -
 net/batman-adv/ring_buffer.h                       |   27 -
 net/batman-adv/routing.c                           |   64 +-
 net/batman-adv/routing.h                           |    1 -
 net/batman-adv/send.c                              |   36 +-
 net/batman-adv/send.h                              |    6 +-
 net/batman-adv/soft-interface.c                    |    6 +-
 net/batman-adv/translation-table.c                 |   74 +-
 net/batman-adv/translation-table.h                 |    2 +-
 net/batman-adv/types.h                             |    6 +-
 net/batman-adv/unicast.c                           |    2 +-
 net/batman-adv/vis.c                               |   19 +-
 net/bluetooth/hci_core.c                           |  192 +-
 net/bluetooth/hci_event.c                          |   71 +-
 net/bluetooth/hidp/core.c                          |   14 +-
 net/bluetooth/l2cap_core.c                         |  121 +-
 net/bluetooth/l2cap_sock.c                         |    4 +-
 net/bluetooth/mgmt.c                               |  229 +-
 net/bridge/br_device.c                             |   21 +-
 net/bridge/br_fdb.c                                |    5 +
 net/bridge/br_forward.c                            |   14 +-
 net/bridge/br_if.c                                 |    2 +-
 net/bridge/br_input.c                              |   15 +-
 net/bridge/br_multicast.c                          |   72 +-
 net/bridge/br_netfilter.c                          |    4 +-
 net/bridge/br_netlink.c                            |   10 +-
 net/bridge/br_notify.c                             |    2 +-
 net/bridge/br_private.h                            |    9 +-
 net/bridge/br_sysfs_br.c                           |   26 +
 net/bridge/br_sysfs_if.c                           |    4 +
 net/bridge/netfilter/ebt_ulog.c                    |    6 +
 net/bridge/netfilter/ebtables.c                    |    6 +-
 net/caif/caif_dev.c                                |    4 +-
 net/caif/caif_usb.c                                |    4 +-
 net/can/af_can.c                                   |    4 +-
 net/can/bcm.c                                      |    4 +-
 net/can/gw.c                                       |    4 +-
 net/can/raw.c                                      |    4 +-
 net/core/datagram.c                                |    4 +
 net/core/dev.c                                     |  238 +-
 net/core/drop_monitor.c                            |    4 +-
 net/core/dst.c                                     |    2 +-
 net/core/ethtool.c                                 |   24 +-
 net/core/fib_rules.c                               |    4 +-
 net/core/gen_estimator.c                           |   12 +-
 net/core/gen_stats.c                               |   22 +-
 net/core/link_watch.c                              |    3 +
 net/core/neighbour.c                               |   34 +-
 net/core/net-procfs.c                              |   16 +-
 net/core/netpoll.c                                 |   16 +-
 net/core/netprio_cgroup.c                          |    2 +-
 net/core/pktgen.c                                  |   81 +-
 net/core/rtnetlink.c                               |   32 +-
 net/core/skbuff.c                                  |   69 +-
 net/core/sock.c                                    |   26 +
 net/core/sysctl_net_core.c                         |  139 +-
 net/decnet/af_decnet.c                             |    4 +-
 net/decnet/dn_dev.c                                |    6 +-
 net/decnet/sysctl_net_decnet.c                     |    6 +-
 net/ieee802154/6lowpan.c                           |    5 +-
 net/ipv4/Kconfig                                   |   11 +-
 net/ipv4/Makefile                                  |    7 +-
 net/ipv4/af_inet.c                                 |   26 +-
 net/ipv4/ah4.c                                     |    7 +-
 net/ipv4/arp.c                                     |    8 +-
 net/ipv4/devinet.c                                 |    9 +-
 net/ipv4/esp4.c                                    |    7 +-
 net/ipv4/fib_frontend.c                            |    4 +-
 net/ipv4/fib_semantics.c                           |    3 +-
 net/ipv4/gre.c                                     |  253 --
 net/ipv4/gre_demux.c                               |  414 +++
 net/ipv4/gre_offload.c                             |  127 +
 net/ipv4/icmp.c                                    |   51 +-
 net/ipv4/igmp.c                                    |   79 +-
 net/ipv4/inet_fragment.c                           |    2 -
 net/ipv4/ip_gre.c                                  |  258 +-
 net/ipv4/ip_tunnel.c                               |  177 +-
 net/ipv4/ip_tunnel_core.c                          |  122 +
 net/ipv4/ip_vti.c                                  |    7 -
 net/ipv4/ipcomp.c                                  |    7 +-
 net/ipv4/ipip.c                                    |   20 +-
 net/ipv4/ipmr.c                                    |    4 +-
 net/ipv4/netfilter/Kconfig                         |    2 +-
 net/ipv4/netfilter/ipt_MASQUERADE.c                |    7 +-
 net/ipv4/netfilter/ipt_ULOG.c                      |    6 +
 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c     |    2 +-
 net/ipv4/ping.c                                    |  641 ++--
 net/ipv4/proc.c                                    |    1 +
 net/ipv4/route.c                                   |  144 +-
 net/ipv4/sysctl_net_ipv4.c                         |   31 +-
 net/ipv4/tcp.c                                     |  344 +--
 net/ipv4/tcp_input.c                               |  517 ++--
 net/ipv4/tcp_ipv4.c                                |   78 +-
 net/ipv4/tcp_minisocks.c                           |    6 +-
 net/ipv4/tcp_offload.c                             |  332 +++
 net/ipv4/tcp_output.c                              |   39 +-
 net/ipv4/udp.c                                     |   90 +-
 net/ipv4/udp_offload.c                             |  100 +
 net/ipv4/xfrm4_tunnel.c                            |    2 +-
 net/ipv6/Makefile                                  |    2 +-
 net/ipv6/addrconf.c                                |  304 +-
 net/ipv6/addrconf_core.c                           |    1 +
 net/ipv6/af_inet6.c                                |   12 +
 net/ipv6/datagram.c                                |   27 +
 net/ipv6/exthdrs_core.c                            |    2 +-
 net/ipv6/icmp.c                                    |   23 +-
 net/ipv6/ip6_offload.c                             |    1 +
 net/ipv6/ip6_output.c                              |   16 +-
 net/ipv6/ip6mr.c                                   |    2 +-
 net/ipv6/mcast.c                                   |   75 +-
 net/ipv6/mip6.c                                    |    6 +-
 net/ipv6/ndisc.c                                   |   11 +-
 net/ipv6/netfilter/ip6t_MASQUERADE.c               |    6 +-
 net/ipv6/output_core.c                             |    3 +-
 net/ipv6/ping.c                                    |  277 ++
 net/ipv6/raw.c                                     |   48 +-
 net/ipv6/route.c                                   |   24 +-
 net/ipv6/sit.c                                     |  207 +-
 net/ipv6/sysctl_net_ipv6.c                         |    4 +-
 net/ipv6/tcp_ipv6.c                                |    2 +
 net/ipv6/udp.c                                     |   62 +-
 net/ipv6/udp_offload.c                             |    3 +-
 net/ipx/af_ipx.c                                   |    2 +-
 net/irda/irsysctl.c                                |    6 +-
 net/iucv/af_iucv.c                                 |    2 +-
 net/l2tp/l2tp_core.c                               |  114 +-
 net/l2tp/l2tp_core.h                               |    5 +
 net/l2tp/l2tp_ppp.c                                |    3 +-
 net/mac80211/aes_ccm.c                             |    6 +-
 net/mac80211/cfg.c                                 |   67 +-
 net/mac80211/debugfs_netdev.c                      |   15 +-
 net/mac80211/driver-ops.h                          |    3 +-
 net/mac80211/ht.c                                  |    8 +-
 net/mac80211/ibss.c                                |  114 +-
 net/mac80211/ieee80211_i.h                         |   37 +-
 net/mac80211/iface.c                               |   34 +-
 net/mac80211/key.c                                 |   24 +-
 net/mac80211/key.h                                 |   15 +-
 net/mac80211/main.c                                |    7 +-
 net/mac80211/mesh.c                                |  107 +-
 net/mac80211/mesh.h                                |    7 +-
 net/mac80211/mesh_plink.c                          |    8 +-
 net/mac80211/mlme.c                                |  436 ++-
 net/mac80211/rate.c                                |    8 +-
 net/mac80211/rx.c                                  |   56 +-
 net/mac80211/scan.c                                |    9 +
 net/mac80211/sta_info.c                            |    8 +-
 net/mac80211/sta_info.h                            |    9 +
 net/mac80211/tx.c                                  |   11 +-
 net/mac80211/util.c                                |   41 +-
 net/mac80211/vht.c                                 |    2 +-
 net/mac80211/wep.c                                 |   48 +-
 net/mac80211/wpa.c                                 |   68 +-
 net/mpls/Kconfig                                   |    9 +
 net/mpls/Makefile                                  |    4 +
 net/mpls/mpls_gso.c                                |  108 +
 net/netfilter/core.c                               |   21 +-
 net/netfilter/ipvs/ip_vs_conn.c                    |   35 +-
 net/netfilter/ipvs/ip_vs_core.c                    |    4 +-
 net/netfilter/ipvs/ip_vs_ctl.c                     |   35 +-
 net/netfilter/ipvs/ip_vs_dh.c                      |   10 +-
 net/netfilter/ipvs/ip_vs_lblc.c                    |   14 +-
 net/netfilter/ipvs/ip_vs_lblcr.c                   |   14 +-
 net/netfilter/ipvs/ip_vs_lc.c                      |    3 +-
 net/netfilter/ipvs/ip_vs_nq.c                      |    3 +-
 net/netfilter/ipvs/ip_vs_proto_sctp.c              |  860 +-----
 net/netfilter/ipvs/ip_vs_proto_tcp.c               |   14 +-
 net/netfilter/ipvs/ip_vs_rr.c                      |    3 +-
 net/netfilter/ipvs/ip_vs_sed.c                     |    3 +-
 net/netfilter/ipvs/ip_vs_sh.c                      |  108 +-
 net/netfilter/ipvs/ip_vs_sync.c                    |   19 +-
 net/netfilter/ipvs/ip_vs_wlc.c                     |    3 +-
 net/netfilter/ipvs/ip_vs_wrr.c                     |    3 +-
 net/netfilter/nf_conntrack_ftp.c                   |   73 +-
 net/netfilter/nf_conntrack_netlink.c               |   30 +-
 net/netfilter/nf_conntrack_proto_tcp.c             |    6 +
 net/netfilter/nf_conntrack_standalone.c            |    4 +-
 net/netfilter/nf_log.c                             |    6 +-
 net/netfilter/nf_nat_helper.c                      |    2 +-
 net/netfilter/nfnetlink_cthelper.c                 |   16 +-
 net/netfilter/nfnetlink_cttimeout.c                |    6 +-
 net/netfilter/nfnetlink_queue_core.c               |   47 +-
 net/netfilter/xt_CT.c                              |   10 +-
 net/netfilter/xt_TEE.c                             |    2 +-
 net/netfilter/xt_rateest.c                         |    2 +-
 net/netfilter/xt_socket.c                          |   96 +-
 net/netlabel/netlabel_unlabeled.c                  |    7 +-
 net/netlink/af_netlink.c                           |  178 +-
 net/netlink/af_netlink.h                           |    1 +
 net/netrom/af_netrom.c                             |    2 +-
 net/netrom/sysctl_net_netrom.c                     |    2 +-
 net/nfc/core.c                                     |  224 +-
 net/nfc/hci/core.c                                 |   75 +-
 net/nfc/llcp.h                                     |    3 +-
 net/nfc/llcp_commands.c                            |   22 +-
 net/nfc/llcp_core.c                                |   16 +-
 net/nfc/llcp_sock.c                                |   19 +-
 net/nfc/nci/Kconfig                                |   10 +
 net/nfc/nci/Makefile                               |    4 +-
 net/nfc/nci/core.c                                 |   37 +-
 net/nfc/nci/data.c                                 |    2 -
 net/nfc/nci/spi.c                                  |  378 +++
 net/nfc/netlink.c                                  |  183 +-
 net/nfc/nfc.h                                      |   11 +
 net/openvswitch/Kconfig                            |   14 +
 net/openvswitch/Makefile                           |    3 +-
 net/openvswitch/actions.c                          |    8 +
 net/openvswitch/datapath.c                         |  371 ++-
 net/openvswitch/datapath.h                         |    4 +
 net/openvswitch/dp_notify.c                        |    2 +-
 net/openvswitch/flow.c                             |  211 +-
 net/openvswitch/flow.h                             |   47 +-
 net/openvswitch/vport-gre.c                        |  275 ++
 net/openvswitch/vport-internal_dev.c               |    3 +-
 net/openvswitch/vport-netdev.c                     |    9 +-
 net/openvswitch/vport-netdev.h                     |    1 -
 net/openvswitch/vport.c                            |   34 +-
 net/openvswitch/vport.h                            |   23 +-
 net/packet/af_packet.c                             |    5 +-
 net/phonet/pn_dev.c                                |    4 +-
 net/phonet/sysctl.c                                |    4 +-
 net/rds/ib_sysctl.c                                |    2 +-
 net/rds/iw_sysctl.c                                |    2 +-
 net/rds/sysctl.c                                   |    2 +-
 net/rose/af_rose.c                                 |    6 +-
 net/rose/sysctl_net_rose.c                         |    2 +-
 net/sched/act_mirred.c                             |    2 +-
 net/sched/sch_cbq.c                                |    2 +-
 net/sched/sch_drr.c                                |    2 +-
 net/sched/sch_generic.c                            |   44 +-
 net/sched/sch_hfsc.c                               |    2 +-
 net/sched/sch_htb.c                                |  261 +-
 net/sched/sch_netem.c                              |  111 +-
 net/sched/sch_qfq.c                                |    2 +-
 net/sched/sch_tbf.c                                |   47 +-
 net/sctp/Kconfig                                   |   11 +-
 net/sctp/associola.c                               |   84 +-
 net/sctp/bind_addr.c                               |    2 +-
 net/sctp/chunk.c                                   |    7 +-
 net/sctp/debug.c                                   |    4 -
 net/sctp/endpointola.c                             |   25 +-
 net/sctp/input.c                                   |   12 +-
 net/sctp/inqueue.c                                 |    9 +-
 net/sctp/ipv6.c                                    |   29 +-
 net/sctp/output.c                                  |   40 +-
 net/sctp/outqueue.c                                |  205 +-
 net/sctp/proc.c                                    |   12 +-
 net/sctp/protocol.c                                |   56 +-
 net/sctp/sm_make_chunk.c                           |   54 +-
 net/sctp/sm_sideeffect.c                           |  101 +-
 net/sctp/sm_statefuns.c                            |   85 +-
 net/sctp/socket.c                                  |  289 +-
 net/sctp/sysctl.c                                  |   10 +-
 net/sctp/transport.c                               |   51 +-
 net/sctp/tsnmap.c                                  |   10 +-
 net/sctp/ulpevent.c                                |   10 +-
 net/socket.c                                       |   23 +-
 net/sunrpc/sysctl.c                                |   10 +-
 net/sunrpc/xprtrdma/svc_rdma.c                     |    8 +-
 net/sunrpc/xprtrdma/transport.c                    |    4 +-
 net/sunrpc/xprtsock.c                              |    4 +-
 net/tipc/Makefile                                  |    3 +-
 net/tipc/bcast.c                                   |    3 +-
 net/tipc/bcast.h                                   |    3 +-
 net/tipc/config.c                                  |  119 +-
 net/tipc/core.c                                    |   22 +-
 net/tipc/core.h                                    |   17 +-
 net/tipc/discover.c                                |    7 +-
 net/tipc/eth_media.c                               |   19 +-
 net/tipc/ib_media.c                                |   17 +-
 net/tipc/link.c                                    |   88 +-
 net/tipc/msg.c                                     |   19 +-
 net/tipc/msg.h                                     |    8 +-
 net/tipc/name_table.c                              |   10 +-
 net/tipc/name_table.h                              |   11 +-
 net/tipc/node_subscr.c                             |    2 +-
 net/tipc/port.c                                    |  320 +-
 net/tipc/port.h                                    |   85 +-
 net/tipc/server.c                                  |  596 ++++
 net/tipc/server.h                                  |   94 +
 net/tipc/socket.c                                  |  146 +-
 net/tipc/subscr.c                                  |  348 +--
 net/tipc/subscr.h                                  |   21 +-
 net/tipc/sysctl.c                                  |   64 +
 net/unix/sysctl_net_unix.c                         |    2 +-
 net/vmw_vsock/af_vsock.c                           |   55 +-
 net/vmw_vsock/vmci_transport.c                     |   18 +-
 net/wireless/chan.c                                |   57 +-
 net/wireless/core.c                                |  270 +-
 net/wireless/core.h                                |  123 +-
 net/wireless/debugfs.c                             |    4 +-
 net/wireless/ibss.c                                |   16 +-
 net/wireless/mesh.c                                |   15 +-
 net/wireless/mlme.c                                |  433 +--
 net/wireless/nl80211.c                             |  814 +++---
 net/wireless/reg.c                                 |  138 +-
 net/wireless/scan.c                                |   51 +-
 net/wireless/sme.c                                 |  652 ++---
 net/wireless/sysfs.c                               |    8 +-
 net/wireless/trace.h                               |   46 +-
 net/wireless/util.c                                |   39 +-
 net/wireless/wext-compat.c                         |   22 +-
 net/wireless/wext-sme.c                            |   49 +-
 net/x25/af_x25.c                                   |   17 +-
 net/xfrm/xfrm_input.c                              |    5 +
 net/xfrm/xfrm_output.c                             |    9 +-
 net/xfrm/xfrm_policy.c                             |    2 +-
 net/xfrm/xfrm_proc.c                               |    1 +
 security/selinux/netif.c                           |    2 +-
 tools/testing/selftests/net/psock_tpacket.c        |   59 +-
 1172 files changed, 73855 insertions(+), 21740 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt
 create mode 100644 Documentation/devicetree/bindings/net/allwinner,sun4i-mdio.txt
 create mode 100644 Documentation/devicetree/bindings/net/arc_emac.txt
 create mode 100644 Documentation/devicetree/bindings/net/davicom-dm9000.txt
 create mode 100644 Documentation/devicetree/bindings/net/marvell-orion-net.txt
 create mode 100644 Documentation/devicetree/bindings/net/micrel-ks8851.txt
 create mode 100644 Documentation/devicetree/bindings/net/via-velocity.txt
 delete mode 100644 Documentation/networking/ifenslave.c
 create mode 100644 drivers/net/ethernet/allwinner/Kconfig
 create mode 100644 drivers/net/ethernet/allwinner/Makefile
 create mode 100644 drivers/net/ethernet/allwinner/sun4i-emac.c
 create mode 100644 drivers/net/ethernet/allwinner/sun4i-emac.h
 create mode 100644 drivers/net/ethernet/arc/Kconfig
 create mode 100644 drivers/net/ethernet/arc/Makefile
 create mode 100644 drivers/net/ethernet/arc/emac.h
 create mode 100644 drivers/net/ethernet/arc/emac_main.c
 create mode 100644 drivers/net/ethernet/arc/emac_mdio.c
 create mode 100644 drivers/net/nlmon.c
 create mode 100644 drivers/net/phy/mdio-sun4i.c
 create mode 100644 drivers/net/wireless/ath/ath10k/Kconfig
 create mode 100644 drivers/net/wireless/ath/ath10k/Makefile
 create mode 100644 drivers/net/wireless/ath/ath10k/bmi.c
 create mode 100644 drivers/net/wireless/ath/ath10k/bmi.h
 create mode 100644 drivers/net/wireless/ath/ath10k/ce.c
 create mode 100644 drivers/net/wireless/ath/ath10k/ce.h
 create mode 100644 drivers/net/wireless/ath/ath10k/core.c
 create mode 100644 drivers/net/wireless/ath/ath10k/core.h
 create mode 100644 drivers/net/wireless/ath/ath10k/debug.c
 create mode 100644 drivers/net/wireless/ath/ath10k/debug.h
 create mode 100644 drivers/net/wireless/ath/ath10k/hif.h
 create mode 100644 drivers/net/wireless/ath/ath10k/htc.c
 create mode 100644 drivers/net/wireless/ath/ath10k/htc.h
 create mode 100644 drivers/net/wireless/ath/ath10k/htt.c
 create mode 100644 drivers/net/wireless/ath/ath10k/htt.h
 create mode 100644 drivers/net/wireless/ath/ath10k/htt_rx.c
 create mode 100644 drivers/net/wireless/ath/ath10k/htt_tx.c
 create mode 100644 drivers/net/wireless/ath/ath10k/hw.h
 create mode 100644 drivers/net/wireless/ath/ath10k/mac.c
 create mode 100644 drivers/net/wireless/ath/ath10k/mac.h
 create mode 100644 drivers/net/wireless/ath/ath10k/pci.c
 create mode 100644 drivers/net/wireless/ath/ath10k/pci.h
 create mode 100644 drivers/net/wireless/ath/ath10k/rx_desc.h
 create mode 100644 drivers/net/wireless/ath/ath10k/targaddrs.h
 create mode 100644 drivers/net/wireless/ath/ath10k/trace.c
 create mode 100644 drivers/net/wireless/ath/ath10k/trace.h
 create mode 100644 drivers/net/wireless/ath/ath10k/txrx.c
 create mode 100644 drivers/net/wireless/ath/ath10k/txrx.h
 create mode 100644 drivers/net/wireless/ath/ath10k/wmi.c
 create mode 100644 drivers/net/wireless/ath/ath10k/wmi.h
 create mode 100644 drivers/net/wireless/ath/ath9k/ar9462_2p1_initvals.h
 create mode 100644 drivers/net/wireless/ath/wil6210/debug.c
 create mode 100644 drivers/net/wireless/ath/wil6210/trace.c
 create mode 100644 drivers/net/wireless/ath/wil6210/trace.h
 create mode 100644 drivers/net/wireless/cw1200/Kconfig
 create mode 100644 drivers/net/wireless/cw1200/Makefile
 create mode 100644 drivers/net/wireless/cw1200/bh.c
 create mode 100644 drivers/net/wireless/cw1200/bh.h
 create mode 100644 drivers/net/wireless/cw1200/cw1200.h
 create mode 100644 drivers/net/wireless/cw1200/cw1200_sdio.c
 create mode 100644 drivers/net/wireless/cw1200/cw1200_spi.c
 create mode 100644 drivers/net/wireless/cw1200/debug.c
 create mode 100644 drivers/net/wireless/cw1200/debug.h
 create mode 100644 drivers/net/wireless/cw1200/fwio.c
 create mode 100644 drivers/net/wireless/cw1200/fwio.h
 create mode 100644 drivers/net/wireless/cw1200/hwbus.h
 create mode 100644 drivers/net/wireless/cw1200/hwio.c
 create mode 100644 drivers/net/wireless/cw1200/hwio.h
 create mode 100644 drivers/net/wireless/cw1200/main.c
 create mode 100644 drivers/net/wireless/cw1200/pm.c
 create mode 100644 drivers/net/wireless/cw1200/pm.h
 create mode 100644 drivers/net/wireless/cw1200/queue.c
 create mode 100644 drivers/net/wireless/cw1200/queue.h
 create mode 100644 drivers/net/wireless/cw1200/scan.c
 create mode 100644 drivers/net/wireless/cw1200/scan.h
 create mode 100644 drivers/net/wireless/cw1200/sta.c
 create mode 100644 drivers/net/wireless/cw1200/sta.h
 create mode 100644 drivers/net/wireless/cw1200/txrx.c
 create mode 100644 drivers/net/wireless/cw1200/txrx.h
 create mode 100644 drivers/net/wireless/cw1200/wsm.c
 create mode 100644 drivers/net/wireless/cw1200/wsm.h
 delete mode 100644 drivers/net/wireless/iwlwifi/dvm/testmode.c
 delete mode 100644 drivers/net/wireless/iwlwifi/iwl-test.c
 delete mode 100644 drivers/net/wireless/iwlwifi/iwl-test.h
 delete mode 100644 drivers/net/wireless/iwlwifi/iwl-testmode.h
 create mode 100644 drivers/net/wireless/iwlwifi/mvm/tt.c
 create mode 100644 drivers/net/wireless/mwifiex/11h.c
 create mode 100644 drivers/net/wireless/ti/wlcore/sysfs.c
 create mode 100644 drivers/net/wireless/ti/wlcore/sysfs.h
 create mode 100644 drivers/nfc/nfcsim.c
 delete mode 100644 include/linux/can/platform/flexcan.h
 create mode 100644 include/linux/platform_data/net-cw1200.h
 create mode 100644 include/net/ll_poll.h
 delete mode 100644 net/batman-adv/ring_buffer.c
 delete mode 100644 net/batman-adv/ring_buffer.h
 delete mode 100644 net/ipv4/gre.c
 create mode 100644 net/ipv4/gre_demux.c
 create mode 100644 net/ipv4/gre_offload.c
 create mode 100644 net/ipv4/ip_tunnel_core.c
 create mode 100644 net/ipv4/tcp_offload.c
 create mode 100644 net/ipv4/udp_offload.c
 create mode 100644 net/ipv6/ping.c
 create mode 100644 net/mpls/Kconfig
 create mode 100644 net/mpls/Makefile
 create mode 100644 net/mpls/mpls_gso.c
 create mode 100644 net/nfc/nci/spi.c
 create mode 100644 net/openvswitch/vport-gre.c
 create mode 100644 net/tipc/server.c
 create mode 100644 net/tipc/server.h
 create mode 100644 net/tipc/sysctl.c
Merging ipsec-next/master (0289094 af_key: constify lookup tables)
$ git merge --no-ff ipsec-next/master
Auto-merging net/key/af_key.c
Merge made by the 'recursive' strategy.
 include/net/xfrm.h    |  2 +-
 net/key/af_key.c      |  6 +++---
 net/xfrm/xfrm_state.c | 12 +++++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)
Merging wireless-next/master (98f32f7 ath9k_htc: fix data race between request_firmware_nowait() callback and suspend())
$ git merge --no-ff wireless-next/master
Merge made by the 'recursive' strategy.
 drivers/net/wireless/ath/ath9k/hif_usb.c |  9 ++++---
 drivers/net/wireless/ath/ath9k/xmit.c    | 44 ++++++++++++++++++++------------
 drivers/net/wireless/rtlwifi/pci.c       | 13 ----------
 drivers/net/wireless/rtlwifi/ps.c        | 12 +++++++++
 drivers/net/wireless/rtlwifi/ps.h        |  1 +
 drivers/net/wireless/rtlwifi/usb.c       |  2 ++
 6 files changed, 49 insertions(+), 32 deletions(-)
Merging bluetooth/master (2237c82 Bluetooth: Add support for Atheros [0cf3:e003])
$ git merge --no-ff bluetooth/master
Merge made by the 'recursive' strategy.
 drivers/bluetooth/ath3k.c | 2 ++
 drivers/bluetooth/btusb.c | 1 +
 2 files changed, 3 insertions(+)
Merging infiniband/for-next (669d6a2 Merge branches 'af_ib', 'cxgb4', 'misc', 'ocrdma', 'qib' and 'srp' into for-next)
$ git merge --no-ff infiniband/for-next
Auto-merging drivers/infiniband/hw/qib/qib_file_ops.c
Auto-merging drivers/infiniband/hw/ehca/ehca_main.c
Auto-merging drivers/infiniband/core/sysfs.c
Merge made by the 'recursive' strategy.
 Documentation/ABI/stable/sysfs-driver-ib_srp |   7 +
 drivers/infiniband/core/addr.c               |  20 +-
 drivers/infiniband/core/cma.c                | 906 +++++++++++++++------------
 drivers/infiniband/core/sa_query.c           |   6 +
 drivers/infiniband/core/sysfs.c              |   8 +-
 drivers/infiniband/core/ucma.c               | 321 ++++++++--
 drivers/infiniband/hw/cxgb3/iwch_qp.c        |   3 +-
 drivers/infiniband/hw/ehca/ehca_main.c       |   1 +
 drivers/infiniband/hw/ocrdma/ocrdma.h        |  63 +-
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c     |  86 ++-
 drivers/infiniband/hw/ocrdma/ocrdma_main.c   |   6 +-
 drivers/infiniband/hw/ocrdma/ocrdma_sli.h    |  35 +-
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c  | 135 ++--
 drivers/infiniband/hw/qib/Kconfig            |   8 +
 drivers/infiniband/hw/qib/Makefile           |   1 +
 drivers/infiniband/hw/qib/qib.h              |  61 +-
 drivers/infiniband/hw/qib/qib_common.h       |   2 +-
 drivers/infiniband/hw/qib/qib_cq.c           |  67 +-
 drivers/infiniband/hw/qib/qib_debugfs.c      | 283 +++++++++
 drivers/infiniband/hw/qib/qib_debugfs.h      |  45 ++
 drivers/infiniband/hw/qib/qib_driver.c       |   1 -
 drivers/infiniband/hw/qib/qib_file_ops.c     | 176 ++++--
 drivers/infiniband/hw/qib/qib_iba6120.c      |  10 +
 drivers/infiniband/hw/qib/qib_iba7220.c      |  10 +
 drivers/infiniband/hw/qib/qib_iba7322.c      | 393 +++++++++++-
 drivers/infiniband/hw/qib/qib_init.c         | 139 +++-
 drivers/infiniband/hw/qib/qib_qp.c           | 123 +++-
 drivers/infiniband/hw/qib/qib_verbs.c        |   8 +-
 drivers/infiniband/hw/qib/qib_verbs.h        |  33 +-
 drivers/infiniband/ulp/srp/ib_srp.c          |  90 ++-
 drivers/infiniband/ulp/srp/ib_srp.h          |   1 +
 include/linux/socket.h                       |   2 +
 include/rdma/ib.h                            |  89 +++
 include/rdma/ib_addr.h                       |   6 +-
 include/rdma/ib_sa.h                         |   7 +
 include/rdma/rdma_cm.h                       |  13 +
 include/uapi/rdma/rdma_user_cm.h             |  73 ++-
 37 files changed, 2443 insertions(+), 795 deletions(-)
 create mode 100644 drivers/infiniband/hw/qib/qib_debugfs.c
 create mode 100644 drivers/infiniband/hw/qib/qib_debugfs.h
 create mode 100644 include/rdma/ib.h
Merging mtd/master (a637b0d Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd)
$ git merge --no-ff mtd/master
Already up-to-date.
Merging l2-mtd/master (fb1585b mtd: nand: omap2: clean-up BCHx_HW and BCHx_SW ECC configurations in device_probe)
$ git merge --no-ff l2-mtd/master
Auto-merging drivers/mtd/nand/Kconfig
Auto-merging arch/mips/bcm63xx/nvram.c
Auto-merging arch/avr32/mach-at32ap/at32ap700x.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/mtd/atmel-nand.txt         |   1 +
 .../devicetree/bindings/mtd/fsmc-nand.txt          |  25 +-
 arch/avr32/mach-at32ap/at32ap700x.c                |   3 +
 arch/mips/bcm63xx/nvram.c                          |  11 +
 arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h |   2 +
 drivers/mtd/bcm63xxpart.c                          |   9 +-
 drivers/mtd/chips/cfi_cmdset_0002.c                |   4 +-
 drivers/mtd/devices/bcm47xxsflash.c                |  68 +++
 drivers/mtd/devices/bcm47xxsflash.h                |   2 +
 drivers/mtd/devices/block2mtd.c                    |  58 +--
 drivers/mtd/devices/elm.c                          | 124 ++++-
 drivers/mtd/devices/m25p80.c                       |  44 +-
 drivers/mtd/devices/mtd_dataflash.c                |   8 +-
 drivers/mtd/devices/spear_smi.c                    |  11 +-
 drivers/mtd/devices/sst25l.c                       |   6 +-
 drivers/mtd/maps/ixp4xx.c                          |   2 -
 drivers/mtd/maps/latch-addr-flash.c                |   1 -
 drivers/mtd/maps/physmap.c                         |   1 -
 drivers/mtd/maps/plat-ram.c                        |   2 -
 drivers/mtd/maps/pxa2xx-flash.c                    |   2 -
 drivers/mtd/maps/rbtx4939-flash.c                  |   1 -
 drivers/mtd/maps/sa1100-flash.c                    |   1 -
 drivers/mtd/nand/Kconfig                           |   2 +-
 drivers/mtd/nand/ams-delta.c                       |   1 -
 drivers/mtd/nand/atmel_nand.c                      |  25 +-
 drivers/mtd/nand/bf5xx_nand.c                      |   3 -
 drivers/mtd/nand/davinci_nand.c                    |  13 +-
 drivers/mtd/nand/docg4.c                           |   2 -
 drivers/mtd/nand/fsl_ifc_nand.c                    |   3 +-
 drivers/mtd/nand/fsmc_nand.c                       |  26 +-
 drivers/mtd/nand/gpio.c                            | 227 +++------
 drivers/mtd/nand/gpmi-nand/gpmi-nand.c             |  14 +-
 drivers/mtd/nand/jz4740_nand.c                     |   2 -
 drivers/mtd/nand/lpc32xx_mlc.c                     |   2 -
 drivers/mtd/nand/lpc32xx_slc.c                     |   2 -
 drivers/mtd/nand/mxc_nand.c                        |   2 -
 drivers/mtd/nand/nand_base.c                       |  27 +-
 drivers/mtd/nand/nuc900_nand.c                     |   2 -
 drivers/mtd/nand/omap2.c                           | 505 ++++++++++-----------
 drivers/mtd/nand/orion_nand.c                      |   1 -
 drivers/mtd/nand/plat_nand.c                       |   1 -
 drivers/mtd/nand/pxa3xx_nand.c                     | 110 ++---
 drivers/mtd/nand/r852.c                            |   5 +-
 drivers/mtd/nand/s3c2410.c                         |   2 -
 drivers/mtd/nand/sharpsl.c                         |   3 -
 drivers/mtd/nand/txx9ndfmc.c                       |   1 -
 drivers/mtd/onenand/generic.c                      |   2 -
 drivers/mtd/onenand/omap2.c                        |   1 -
 drivers/mtd/onenand/samsung.c                      |   1 -
 drivers/mtd/tests/mtd_oobtest.c                    |  12 +-
 drivers/mtd/tests/mtd_pagetest.c                   |  20 +-
 drivers/mtd/tests/mtd_readtest.c                   |  12 +-
 drivers/mtd/tests/mtd_speedtest.c                  |   8 +-
 drivers/mtd/tests/mtd_stresstest.c                 |   8 +-
 drivers/mtd/tests/mtd_subpagetest.c                |  12 +-
 include/linux/mtd/fsmc.h                           |   1 +
 include/linux/mtd/nand.h                           |   9 +-
 include/linux/platform_data/atmel.h                |   4 +
 include/linux/platform_data/elm.h                  |   4 +
 59 files changed, 759 insertions(+), 702 deletions(-)
Merging crypto/master (02c0241 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto)
$ git merge --no-ff crypto/master
Auto-merging lib/Kconfig
Auto-merging drivers/crypto/ux500/cryp/cryp_core.c
Auto-merging drivers/char/hw_random/omap-rng.c
Removing arch/x86/include/asm/crypto/blowfish.h
Removing arch/x86/crypto/twofish_avx2_glue.c
Removing arch/x86/crypto/twofish-avx2-asm_64.S
Removing arch/x86/crypto/blowfish_avx2_glue.c
Removing arch/x86/crypto/blowfish-avx2-asm_64.S
Auto-merging arch/arm/boot/dts/imx28.dtsi
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/imx28.dtsi                 |   2 +-
 arch/x86/crypto/Makefile                     |   8 +-
 arch/x86/crypto/blowfish-avx2-asm_64.S       | 449 -------------
 arch/x86/crypto/blowfish_avx2_glue.c         | 585 -----------------
 arch/x86/crypto/blowfish_glue.c              |  32 +-
 arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 160 ++---
 arch/x86/crypto/crct10dif-pcl-asm_64.S       | 643 +++++++++++++++++++
 arch/x86/crypto/crct10dif-pclmul_glue.c      | 151 +++++
 arch/x86/crypto/sha256_ssse3_glue.c          |  57 +-
 arch/x86/crypto/sha512_ssse3_glue.c          |  58 +-
 arch/x86/crypto/twofish-avx2-asm_64.S        | 600 ------------------
 arch/x86/crypto/twofish_avx2_glue.c          | 584 -----------------
 arch/x86/crypto/twofish_avx_glue.c           |  14 +-
 arch/x86/include/asm/crypto/blowfish.h       |  43 --
 arch/x86/include/asm/crypto/twofish.h        |  18 -
 crypto/Kconfig                               |  63 +-
 crypto/Makefile                              |   1 +
 crypto/crct10dif.c                           | 178 ++++++
 crypto/sha512_generic.c                      |   2 +
 crypto/tcrypt.c                              |   8 +
 crypto/testmgr.c                             | 176 ++++--
 crypto/testmgr.h                             |  33 +
 drivers/char/hw_random/atmel-rng.c           |   2 -
 drivers/char/hw_random/bcm63xx-rng.c         |   2 -
 drivers/char/hw_random/n2-drv.c              |   6 +-
 drivers/char/hw_random/nomadik-rng.c         |   2 +-
 drivers/char/hw_random/octeon-rng.c          |   4 +-
 drivers/char/hw_random/omap-rng.c            |   6 +-
 drivers/char/hw_random/timeriomem-rng.c      |   2 -
 drivers/char/hw_random/tx4939-rng.c          |   1 -
 drivers/crypto/Kconfig                       |  12 +-
 drivers/crypto/Makefile                      |   1 +
 drivers/crypto/caam/ctrl.c                   |  10 +-
 drivers/crypto/caam/desc.h                   |  22 +-
 drivers/crypto/caam/desc_constr.h            |  81 ++-
 drivers/crypto/caam/pdb.h                    |   1 +
 drivers/crypto/caam/regs.h                   |  42 +-
 drivers/crypto/dcp.c                         | 912 +++++++++++++++++++++++++++
 drivers/crypto/hifn_795x.c                   |   4 +-
 drivers/crypto/mv_cesa.c                     |   1 -
 drivers/crypto/omap-aes.c                    |  36 +-
 drivers/crypto/omap-sham.c                   |   7 +-
 drivers/crypto/picoxcell_crypto.c            |   2 +-
 drivers/crypto/s5p-sss.c                     |   2 -
 drivers/crypto/ux500/cryp/cryp_core.c        |   2 +-
 include/linux/crc-t10dif.h                   |   4 +
 lib/Kconfig                                  |   2 +
 lib/crc-t10dif.c                             |  73 +--
 48 files changed, 2541 insertions(+), 2563 deletions(-)
 delete mode 100644 arch/x86/crypto/blowfish-avx2-asm_64.S
 delete mode 100644 arch/x86/crypto/blowfish_avx2_glue.c
 create mode 100644 arch/x86/crypto/crct10dif-pcl-asm_64.S
 create mode 100644 arch/x86/crypto/crct10dif-pclmul_glue.c
 delete mode 100644 arch/x86/crypto/twofish-avx2-asm_64.S
 delete mode 100644 arch/x86/crypto/twofish_avx2_glue.c
 delete mode 100644 arch/x86/include/asm/crypto/blowfish.h
 create mode 100644 crypto/crct10dif.c
 create mode 100644 drivers/crypto/dcp.c
Merging drm/drm-next (69163ea drm/mm: kill color_search_free/get_block)
$ git merge --no-ff drm/drm-next
Resolved 'drivers/gpu/drm/drm_vm.c' using previous resolution.
Auto-merging sound/pci/hda/hda_intel.c
Auto-merging sound/pci/hda/Kconfig
Auto-merging drivers/staging/imx-drm/ipuv3-crtc.c
Removing drivers/gpu/drm/nouveau/core/engine/graph/fuc/nve0.fuc
Auto-merging drivers/gpu/drm/nouveau/core/engine/graph/fuc/com.fuc
Auto-merging drivers/gpu/drm/nouveau/core/engine/falcon.c
Auto-merging drivers/gpu/drm/i915/intel_lvds.c
Auto-merging drivers/gpu/drm/i915/i915_suspend.c
Auto-merging drivers/gpu/drm/i915/i915_gem.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/drm_vm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_vm.c
Auto-merging arch/x86/kernel/cpu/mtrr/main.c
Auto-merging arch/arm/boot/dts/exynos5250.dtsi
Auto-merging arch/arm/boot/dts/exynos5250-smdk5250.dts
Auto-merging MAINTAINERS
Auto-merging Documentation/DocBook/drm.tmpl
Auto-merging Documentation/DocBook/device-drivers.tmpl
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 64d7519] Merge remote-tracking branch 'drm/drm-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/DocBook/device-drivers.tmpl          |    2 +
 Documentation/DocBook/drm.tmpl                     |  271 +-
 .../devicetree/bindings/drm/tilcdc/tilcdc.txt      |    8 +
 .../devicetree/bindings/video/display-timing.txt   |    1 +
 .../devicetree/bindings/video/exynos_hdmi.txt      |    7 +-
 .../devicetree/bindings/video/exynos_hdmiddc.txt   |    7 +-
 .../devicetree/bindings/video/exynos_hdmiphy.txt   |    7 +-
 .../devicetree/bindings/video/exynos_mixer.txt     |    9 +-
 Documentation/fb/uvesafb.txt                       |   16 +-
 MAINTAINERS                                        |    8 +-
 arch/arm/boot/dts/cros5250-common.dtsi             |    4 +-
 arch/arm/boot/dts/exynos5250-smdk5250.dts          |    4 +-
 arch/arm/boot/dts/exynos5250.dtsi                  |    4 +-
 arch/x86/include/asm/io.h                          |    7 +
 arch/x86/include/asm/mtrr.h                        |   10 +-
 arch/x86/kernel/cpu/mtrr/main.c                    |   71 +
 drivers/base/Makefile                              |    2 +-
 drivers/base/reservation.c                         |   39 +
 drivers/char/agp/ati-agp.c                         |    4 +-
 drivers/char/agp/frontend.c                        |    8 +-
 drivers/char/agp/nvidia-agp.c                      |    6 +-
 drivers/gpu/drm/Kconfig                            |    3 +
 drivers/gpu/drm/Makefile                           |    4 +-
 drivers/gpu/drm/ast/ast_drv.h                      |   20 +-
 drivers/gpu/drm/ast/ast_fb.c                       |    5 +-
 drivers/gpu/drm/ast/ast_ttm.c                      |   31 +-
 drivers/gpu/drm/cirrus/cirrus_drv.h                |   21 +-
 drivers/gpu/drm/cirrus/cirrus_fbdev.c              |    5 +-
 drivers/gpu/drm/cirrus/cirrus_ttm.c                |   33 +-
 drivers/gpu/drm/drm_bufs.c                         |   26 +-
 drivers/gpu/drm/drm_crtc.c                         |  191 +-
 drivers/gpu/drm/drm_crtc_helper.c                  |   45 +-
 drivers/gpu/drm/drm_drv.c                          |    1 +
 drivers/gpu/drm/drm_edid.c                         |  115 +-
 drivers/gpu/drm/drm_edid_load.c                    |    3 +-
 drivers/gpu/drm/drm_fb_helper.c                    |   43 +-
 drivers/gpu/drm/drm_fops.c                         |   25 +-
 drivers/gpu/drm/drm_gem.c                          |  113 +-
 drivers/gpu/drm/drm_gem_cma_helper.c               |  412 +-
 drivers/gpu/drm/drm_ioctl.c                        |   15 +-
 drivers/gpu/drm/drm_mm.c                           |   45 +-
 drivers/gpu/drm/drm_modes.c                        |   14 +-
 drivers/gpu/drm/drm_pci.c                          |    8 +-
 drivers/gpu/drm/drm_prime.c                        |  179 +-
 drivers/gpu/drm/drm_rect.c                         |  295 +
 drivers/gpu/drm/drm_stub.c                         |   14 +-
 drivers/gpu/drm/drm_sysfs.c                        |   33 +-
 drivers/gpu/drm/drm_trace.h                        |    6 +-
 drivers/gpu/drm/drm_vm.c                           |   24 +-
 drivers/gpu/drm/exynos/exynos_ddc.c                |    2 +
 drivers/gpu/drm/exynos/exynos_drm_buf.c            |    7 -
 drivers/gpu/drm/exynos/exynos_drm_connector.c      |   51 +-
 drivers/gpu/drm/exynos/exynos_drm_core.c           |   12 -
 drivers/gpu/drm/exynos/exynos_drm_crtc.c           |   39 +-
 drivers/gpu/drm/exynos/exynos_drm_dmabuf.c         |    6 -
 drivers/gpu/drm/exynos/exynos_drm_drv.c            |   20 -
 drivers/gpu/drm/exynos/exynos_drm_drv.h            |    4 +-
 drivers/gpu/drm/exynos/exynos_drm_encoder.c        |   28 +-
 drivers/gpu/drm/exynos/exynos_drm_fb.c             |   10 -
 drivers/gpu/drm/exynos/exynos_drm_fbdev.c          |    8 -
 drivers/gpu/drm/exynos/exynos_drm_fimc.c           |  129 +-
 drivers/gpu/drm/exynos/exynos_drm_fimd.c           |  146 +-
 drivers/gpu/drm/exynos/exynos_drm_gem.c            |   29 +-
 drivers/gpu/drm/exynos/exynos_drm_gsc.c            |  102 +-
 drivers/gpu/drm/exynos/exynos_drm_hdmi.c           |   63 +-
 drivers/gpu/drm/exynos/exynos_drm_hdmi.h           |    6 +-
 drivers/gpu/drm/exynos/exynos_drm_ipp.c            |  202 +-
 drivers/gpu/drm/exynos/exynos_drm_plane.c          |   16 -
 drivers/gpu/drm/exynos/exynos_drm_rotator.c        |   53 +-
 drivers/gpu/drm/exynos/exynos_drm_vidi.c           |   50 +-
 drivers/gpu/drm/exynos/exynos_hdmi.c               |  131 +-
 drivers/gpu/drm/exynos/exynos_hdmiphy.c            |    4 +
 drivers/gpu/drm/exynos/exynos_mixer.c              |  122 +-
 drivers/gpu/drm/exynos/regs-mixer.h                |    7 +
 drivers/gpu/drm/i915/Makefile                      |    1 +
 drivers/gpu/drm/i915/dvo_ch7xxx.c                  |   28 +-
 drivers/gpu/drm/i915/i915_debugfs.c                |  473 +-
 drivers/gpu/drm/i915/i915_dma.c                    |   90 +-
 drivers/gpu/drm/i915/i915_drv.c                    |  116 +-
 drivers/gpu/drm/i915/i915_drv.h                    |  359 +-
 drivers/gpu/drm/i915/i915_gem.c                    |  293 +-
 drivers/gpu/drm/i915/i915_gem_context.c            |  118 +-
 drivers/gpu/drm/i915/i915_gem_execbuffer.c         |   18 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c                |  114 +-
 drivers/gpu/drm/i915/i915_gem_stolen.c             |   31 +-
 drivers/gpu/drm/i915/i915_irq.c                    | 1034 ++-
 drivers/gpu/drm/i915/i915_reg.h                    |  708 +-
 drivers/gpu/drm/i915/i915_suspend.c                |   10 +
 drivers/gpu/drm/i915/i915_sysfs.c                  |   74 +-
 drivers/gpu/drm/i915/i915_ums.c                    |   90 +-
 drivers/gpu/drm/i915/intel_bios.c                  |  100 +-
 drivers/gpu/drm/i915/intel_crt.c                   |   35 +-
 drivers/gpu/drm/i915/intel_ddi.c                   |  754 +--
 drivers/gpu/drm/i915/intel_display.c               | 3162 +++++----
 drivers/gpu/drm/i915/intel_dp.c                    |  670 +-
 drivers/gpu/drm/i915/intel_drv.h                   |  186 +-
 drivers/gpu/drm/i915/intel_dvo.c                   |   31 +
 drivers/gpu/drm/i915/intel_fb.c                    |   28 +-
 drivers/gpu/drm/i915/intel_hdmi.c                  |  158 +-
 drivers/gpu/drm/i915/intel_lvds.c                  |  297 +-
 drivers/gpu/drm/i915/intel_opregion.c              |  110 +-
 drivers/gpu/drm/i915/intel_overlay.c               |   17 +-
 drivers/gpu/drm/i915/intel_panel.c                 |  296 +-
 drivers/gpu/drm/i915/intel_pm.c                    | 1387 +++-
 drivers/gpu/drm/i915/intel_ringbuffer.c            |  236 +-
 drivers/gpu/drm/i915/intel_ringbuffer.h            |   31 +-
 drivers/gpu/drm/i915/intel_sdvo.c                  |  168 +-
 drivers/gpu/drm/i915/intel_sideband.c              |  177 +
 drivers/gpu/drm/i915/intel_sprite.c                |  229 +-
 drivers/gpu/drm/i915/intel_tv.c                    |   11 +-
 drivers/gpu/drm/mgag200/Makefile                   |    2 +-
 drivers/gpu/drm/mgag200/mgag200_cursor.c           |  275 +
 drivers/gpu/drm/mgag200/mgag200_drv.h              |   44 +-
 drivers/gpu/drm/mgag200/mgag200_fb.c               |    5 +-
 drivers/gpu/drm/mgag200/mgag200_main.c             |   25 +-
 drivers/gpu/drm/mgag200/mgag200_mode.c             |   72 +-
 drivers/gpu/drm/mgag200/mgag200_reg.h              |    6 +-
 drivers/gpu/drm/mgag200/mgag200_ttm.c              |   32 +-
 drivers/gpu/drm/nouveau/Kconfig                    |    7 +
 drivers/gpu/drm/nouveau/Makefile                   |   18 +-
 drivers/gpu/drm/nouveau/core/core/mm.c             |    1 -
 drivers/gpu/drm/nouveau/core/engine/bsp/nv84.c     |   27 +-
 drivers/gpu/drm/nouveau/core/engine/bsp/nv98.c     |   93 +
 drivers/gpu/drm/nouveau/core/engine/bsp/nvc0.c     |    3 +-
 drivers/gpu/drm/nouveau/core/engine/bsp/nve0.c     |    3 +-
 .../drm/nouveau/core/engine/copy/fuc/nva3.fuc.h    |    4 +-
 .../drm/nouveau/core/engine/copy/fuc/nvc0.fuc.h    |    4 +-
 drivers/gpu/drm/nouveau/core/engine/copy/nva3.c    |   21 +-
 drivers/gpu/drm/nouveau/core/engine/copy/nvc0.c    |   10 +-
 drivers/gpu/drm/nouveau/core/engine/copy/nve0.c    |   47 +
 .../drm/nouveau/core/engine/crypt/fuc/nv98.fuc.h   |    4 +-
 drivers/gpu/drm/nouveau/core/engine/crypt/nv84.c   |    8 -
 drivers/gpu/drm/nouveau/core/engine/crypt/nv98.c   |   10 +-
 drivers/gpu/drm/nouveau/core/engine/device/nv50.c  |   36 +-
 drivers/gpu/drm/nouveau/core/engine/device/nvc0.c  |   16 +-
 drivers/gpu/drm/nouveau/core/engine/device/nve0.c  |   11 +-
 drivers/gpu/drm/nouveau/core/engine/disp/nv50.c    |    6 +-
 drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c    |   14 +-
 drivers/gpu/drm/nouveau/core/engine/disp/nve0.c    |    3 +
 drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c    |    3 +
 .../gpu/drm/nouveau/core/{core => engine}/falcon.c |    3 +-
 drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c    |    2 +-
 drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c    |    4 +
 drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c    |   53 +-
 .../gpu/drm/nouveau/core/engine/graph/ctxnvc0.c    |  601 +-
 .../gpu/drm/nouveau/core/engine/graph/ctxnve0.c    |  401 +-
 .../core/engine/graph/fuc/{nvc0.fuc => com.fuc}    |   73 +-
 .../gpu/drm/nouveau/core/engine/graph/fuc/gpc.fuc  |  369 ++
 .../drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc  |  444 +-
 .../nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h    |  116 +-
 .../drm/nouveau/core/engine/graph/fuc/gpcnve0.fuc  |  427 +-
 .../nouveau/core/engine/graph/fuc/gpcnve0.fuc.h    |   80 +-
 .../gpu/drm/nouveau/core/engine/graph/fuc/hub.fuc  |  755 +++
 .../drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc  |  790 +--
 .../nouveau/core/engine/graph/fuc/hubnvc0.fuc.h    | 1020 +--
 .../drm/nouveau/core/engine/graph/fuc/hubnve0.fuc  |  770 +--
 .../nouveau/core/engine/graph/fuc/hubnve0.fuc.h    |  959 +--
 .../drm/nouveau/core/engine/graph/fuc/macros.fuc   |   53 +
 .../gpu/drm/nouveau/core/engine/graph/fuc/nve0.fuc |  400 --
 drivers/gpu/drm/nouveau/core/engine/graph/fuc/os.h |    7 +
 drivers/gpu/drm/nouveau/core/engine/graph/nv50.c   |   18 +-
 drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c   |  593 +-
 drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h   |    6 +-
 drivers/gpu/drm/nouveau/core/engine/graph/nve0.c   |  384 +-
 drivers/gpu/drm/nouveau/core/engine/mpeg/nv50.c    |    8 -
 drivers/gpu/drm/nouveau/core/engine/mpeg/nv84.c    |    1 -
 drivers/gpu/drm/nouveau/core/engine/ppp/nvc0.c     |    3 +-
 drivers/gpu/drm/nouveau/core/engine/vp/nv84.c      |   27 +-
 drivers/gpu/drm/nouveau/core/engine/vp/nv98.c      |   93 +
 drivers/gpu/drm/nouveau/core/engine/vp/nvc0.c      |    3 +-
 drivers/gpu/drm/nouveau/core/engine/vp/nve0.c      |    3 +-
 drivers/gpu/drm/nouveau/core/engine/xtensa.c       |  170 +
 drivers/gpu/drm/nouveau/core/include/core/device.h |    5 +-
 drivers/gpu/drm/nouveau/core/include/core/mm.h     |    2 -
 drivers/gpu/drm/nouveau/core/include/engine/bsp.h  |    1 +
 drivers/gpu/drm/nouveau/core/include/engine/copy.h |    1 +
 .../nouveau/core/include/{core => engine}/falcon.h |    0
 drivers/gpu/drm/nouveau/core/include/engine/mpeg.h |    1 -
 drivers/gpu/drm/nouveau/core/include/engine/vp.h   |    1 +
 .../gpu/drm/nouveau/core/include/engine/xtensa.h   |   38 +
 .../gpu/drm/nouveau/core/include/subdev/clock.h    |    2 -
 .../gpu/drm/nouveau/core/include/subdev/devinit.h  |   21 +-
 drivers/gpu/drm/nouveau/core/include/subdev/fb.h   |   95 +-
 drivers/gpu/drm/nouveau/core/include/subdev/vm.h   |    5 +-
 drivers/gpu/drm/nouveau/core/subdev/bar/nv50.c     |   13 +-
 drivers/gpu/drm/nouveau/core/subdev/bar/nvc0.c     |   10 +-
 drivers/gpu/drm/nouveau/core/subdev/bios/base.c    |    6 +-
 drivers/gpu/drm/nouveau/core/subdev/bios/init.c    |    7 +-
 drivers/gpu/drm/nouveau/core/subdev/clock/nv04.c   |  274 +-
 drivers/gpu/drm/nouveau/core/subdev/clock/nv40.c   |    1 -
 drivers/gpu/drm/nouveau/core/subdev/clock/nv50.c   |   45 -
 drivers/gpu/drm/nouveau/core/subdev/clock/nva3.c   |   37 +-
 drivers/gpu/drm/nouveau/core/subdev/clock/nvc0.c   |   36 -
 drivers/gpu/drm/nouveau/core/subdev/clock/pll.h    |    4 +-
 .../gpu/drm/nouveau/core/subdev/clock/pllnv04.c    |   17 +-
 .../gpu/drm/nouveau/core/subdev/clock/pllnva3.c    |   18 +-
 drivers/gpu/drm/nouveau/core/subdev/devinit/base.c |   23 +-
 drivers/gpu/drm/nouveau/core/subdev/devinit/nv04.c |  329 +-
 drivers/gpu/drm/nouveau/core/subdev/devinit/nv05.c |    3 +-
 drivers/gpu/drm/nouveau/core/subdev/devinit/nv10.c |    3 +-
 drivers/gpu/drm/nouveau/core/subdev/devinit/nv1a.c |    4 +-
 drivers/gpu/drm/nouveau/core/subdev/devinit/nv20.c |    5 +-
 drivers/gpu/drm/nouveau/core/subdev/devinit/nv50.c |   78 +-
 drivers/gpu/drm/nouveau/core/subdev/devinit/nva3.c |   87 +
 drivers/gpu/drm/nouveau/core/subdev/devinit/nvc0.c |   90 +
 drivers/gpu/drm/nouveau/core/subdev/devinit/priv.h |   25 +
 drivers/gpu/drm/nouveau/core/subdev/fb/base.c      |  125 +-
 drivers/gpu/drm/nouveau/core/subdev/fb/nv04.c      |   54 +-
 drivers/gpu/drm/nouveau/core/subdev/fb/nv10.c      |   20 +-
 drivers/gpu/drm/nouveau/core/subdev/fb/nv1a.c      |   32 +-
 drivers/gpu/drm/nouveau/core/subdev/fb/nv20.c      |   26 +-
 drivers/gpu/drm/nouveau/core/subdev/fb/nv25.c      |    9 +-
 drivers/gpu/drm/nouveau/core/subdev/fb/nv30.c      |    9 +-
 drivers/gpu/drm/nouveau/core/subdev/fb/nv35.c      |    9 +-
 drivers/gpu/drm/nouveau/core/subdev/fb/nv36.c      |    9 +-
 drivers/gpu/drm/nouveau/core/subdev/fb/nv40.c      |   25 +-
 drivers/gpu/drm/nouveau/core/subdev/fb/nv41.c      |   23 +-
 drivers/gpu/drm/nouveau/core/subdev/fb/nv44.c      |   22 +-
 drivers/gpu/drm/nouveau/core/subdev/fb/nv46.c      |    7 +-
 drivers/gpu/drm/nouveau/core/subdev/fb/nv47.c      |    7 +-
 drivers/gpu/drm/nouveau/core/subdev/fb/nv49.c      |   25 +-
 drivers/gpu/drm/nouveau/core/subdev/fb/nv4e.c      |   15 +-
 drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c      |  199 +-
 drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c      |  143 +-
 drivers/gpu/drm/nouveau/core/subdev/fb/priv.h      |   87 +
 drivers/gpu/drm/nouveau/core/subdev/fb/ramnv04.c   |   95 +
 drivers/gpu/drm/nouveau/core/subdev/fb/ramnv10.c   |   61 +
 drivers/gpu/drm/nouveau/core/subdev/fb/ramnv1a.c   |   71 +
 drivers/gpu/drm/nouveau/core/subdev/fb/ramnv20.c   |   63 +
 drivers/gpu/drm/nouveau/core/subdev/fb/ramnv40.c   |   65 +
 drivers/gpu/drm/nouveau/core/subdev/fb/ramnv41.c   |   64 +
 drivers/gpu/drm/nouveau/core/subdev/fb/ramnv44.c   |   62 +
 drivers/gpu/drm/nouveau/core/subdev/fb/ramnv49.c   |   64 +
 drivers/gpu/drm/nouveau/core/subdev/fb/ramnv4e.c   |   55 +
 drivers/gpu/drm/nouveau/core/subdev/fb/ramnv50.c   |  232 +
 drivers/gpu/drm/nouveau/core/subdev/fb/ramnvc0.c   |  186 +
 drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c |    4 +-
 drivers/gpu/drm/nouveau/core/subdev/ltcg/nvc0.c    |    2 +-
 drivers/gpu/drm/nouveau/core/subdev/mc/nv50.c      |    1 +
 drivers/gpu/drm/nouveau/core/subdev/mc/nvc0.c      |    1 +
 drivers/gpu/drm/nouveau/core/subdev/vm/base.c      |   38 +-
 drivers/gpu/drm/nouveau/core/subdev/vm/nv50.c      |   56 +-
 drivers/gpu/drm/nouveau/core/subdev/vm/nvc0.c      |   57 +-
 drivers/gpu/drm/nouveau/nouveau_abi16.c            |    1 +
 drivers/gpu/drm/nouveau/nouveau_bios.c             |   10 +-
 drivers/gpu/drm/nouveau/nouveau_bo.c               |    9 +-
 drivers/gpu/drm/nouveau/nouveau_chan.c             |    4 +-
 drivers/gpu/drm/nouveau/nouveau_display.c          |  116 +-
 drivers/gpu/drm/nouveau/nouveau_drm.c              |    1 +
 drivers/gpu/drm/nouveau/nouveau_fbcon.c            |   27 +-
 drivers/gpu/drm/nouveau/nouveau_fence.c            |   73 +-
 drivers/gpu/drm/nouveau/nouveau_fence.h            |    2 +
 drivers/gpu/drm/nouveau/nouveau_gem.c              |   84 +-
 drivers/gpu/drm/nouveau/nouveau_gem.h              |    1 +
 drivers/gpu/drm/nouveau/nouveau_mem.c              |   14 +-
 drivers/gpu/drm/nouveau/nouveau_prime.c            |    9 +-
 drivers/gpu/drm/nouveau/nouveau_ttm.c              |   28 +-
 drivers/gpu/drm/nouveau/nv50_display.c             |   18 +-
 drivers/gpu/drm/nouveau/nv50_pm.c                  |    4 +-
 drivers/gpu/drm/nouveau/nva3_pm.c                  |    4 +-
 drivers/gpu/drm/nouveau/nvc0_pm.c                  |    8 +-
 drivers/gpu/drm/omapdrm/Kconfig                    |    2 +-
 drivers/gpu/drm/omapdrm/omap_crtc.c                |    5 -
 drivers/gpu/drm/omapdrm/omap_fbdev.c               |   14 -
 drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c          |   35 +-
 drivers/gpu/drm/qxl/qxl_display.c                  |   29 +-
 drivers/gpu/drm/qxl/qxl_fb.c                       |    4 -
 drivers/gpu/drm/qxl/qxl_object.h                   |    5 -
 drivers/gpu/drm/radeon/Makefile                    |    5 +-
 drivers/gpu/drm/radeon/ObjectID.h                  |   40 +
 drivers/gpu/drm/radeon/atombios.h                  |  547 +-
 drivers/gpu/drm/radeon/atombios_crtc.c             |   88 +-
 drivers/gpu/drm/radeon/atombios_encoders.c         |   51 +-
 drivers/gpu/drm/radeon/btc_dpm.c                   | 2737 ++++++++
 drivers/gpu/drm/radeon/btc_dpm.h                   |   57 +
 drivers/gpu/drm/radeon/btcd.h                      |  181 +
 drivers/gpu/drm/radeon/cik.c                       | 6987 ++++++++++++++++++++
 drivers/gpu/drm/radeon/cik_blit_shaders.c          |  246 +
 drivers/gpu/drm/radeon/cik_blit_shaders.h          |   32 +
 drivers/gpu/drm/radeon/cik_reg.h                   |  147 +
 drivers/gpu/drm/radeon/cikd.h                      | 1297 ++++
 drivers/gpu/drm/radeon/clearstate_cayman.h         | 1081 +++
 drivers/gpu/drm/radeon/clearstate_defs.h           |   44 +
 drivers/gpu/drm/radeon/clearstate_evergreen.h      | 1080 +++
 drivers/gpu/drm/radeon/clearstate_si.h             |  941 +++
 drivers/gpu/drm/radeon/cypress_dpm.c               | 2176 ++++++
 drivers/gpu/drm/radeon/cypress_dpm.h               |  160 +
 drivers/gpu/drm/radeon/evergreen.c                 |  642 +-
 drivers/gpu/drm/radeon/evergreen_hdmi.c            |   11 +-
 drivers/gpu/drm/radeon/evergreen_reg.h             |   12 +
 drivers/gpu/drm/radeon/evergreen_smc.h             |   67 +
 drivers/gpu/drm/radeon/evergreend.h                |  389 +-
 drivers/gpu/drm/radeon/ni.c                        |  198 +-
 drivers/gpu/drm/radeon/ni_dpm.c                    | 4332 ++++++++++++
 drivers/gpu/drm/radeon/ni_dpm.h                    |  248 +
 drivers/gpu/drm/radeon/nid.h                       |  565 ++
 drivers/gpu/drm/radeon/nislands_smc.h              |  329 +
 drivers/gpu/drm/radeon/ppsmc.h                     |  113 +
 drivers/gpu/drm/radeon/r600.c                      |  147 +-
 drivers/gpu/drm/radeon/r600_dpm.c                  | 1024 +++
 drivers/gpu/drm/radeon/r600_dpm.h                  |  226 +
 drivers/gpu/drm/radeon/r600_hdmi.c                 |   11 +-
 drivers/gpu/drm/radeon/r600_reg.h                  |    6 +
 drivers/gpu/drm/radeon/r600d.h                     |  232 +-
 drivers/gpu/drm/radeon/radeon.h                    |  522 +-
 drivers/gpu/drm/radeon/radeon_acpi.c               |  145 +
 drivers/gpu/drm/radeon/radeon_asic.c               |  706 +-
 drivers/gpu/drm/radeon/radeon_asic.h               |  190 +
 drivers/gpu/drm/radeon/radeon_atombios.c           |  881 ++-
 drivers/gpu/drm/radeon/radeon_cs.c                 |   19 +-
 drivers/gpu/drm/radeon/radeon_cursor.c             |   10 +-
 drivers/gpu/drm/radeon/radeon_device.c             |  106 +-
 drivers/gpu/drm/radeon/radeon_display.c            |   21 +-
 drivers/gpu/drm/radeon/radeon_drv.c                |    9 +-
 drivers/gpu/drm/radeon/radeon_family.h             |    3 +
 drivers/gpu/drm/radeon/radeon_irq_kms.c            |   20 +
 drivers/gpu/drm/radeon/radeon_kms.c                |   41 +-
 drivers/gpu/drm/radeon/radeon_mode.h               |   93 +
 drivers/gpu/drm/radeon/radeon_object.c             |   41 +-
 drivers/gpu/drm/radeon/radeon_object.h             |   30 +-
 drivers/gpu/drm/radeon/radeon_pm.c                 |  647 +-
 drivers/gpu/drm/radeon/radeon_prime.c              |   18 +-
 drivers/gpu/drm/radeon/radeon_reg.h                |    1 +
 drivers/gpu/drm/radeon/radeon_ring.c               |   51 +-
 drivers/gpu/drm/radeon/radeon_test.c               |   75 +-
 drivers/gpu/drm/radeon/radeon_ucode.h              |  129 +
 drivers/gpu/drm/radeon/radeon_uvd.c                |   59 +-
 drivers/gpu/drm/radeon/rs690.c                     |  291 +-
 drivers/gpu/drm/radeon/rs780_dpm.c                 |  963 +++
 drivers/gpu/drm/radeon/rs780_dpm.h                 |  109 +
 drivers/gpu/drm/radeon/rs780d.h                    |  168 +
 drivers/gpu/drm/radeon/rv515.c                     |  224 +-
 drivers/gpu/drm/radeon/rv6xx_dpm.c                 | 2085 ++++++
 drivers/gpu/drm/radeon/rv6xx_dpm.h                 |   95 +
 drivers/gpu/drm/radeon/rv6xxd.h                    |  246 +
 drivers/gpu/drm/radeon/rv730_dpm.c                 |  508 ++
 drivers/gpu/drm/radeon/rv730d.h                    |  165 +
 drivers/gpu/drm/radeon/rv740_dpm.c                 |  416 ++
 drivers/gpu/drm/radeon/rv740d.h                    |  117 +
 drivers/gpu/drm/radeon/rv770_dpm.c                 | 2493 +++++++
 drivers/gpu/drm/radeon/rv770_dpm.h                 |  288 +
 drivers/gpu/drm/radeon/rv770_smc.c                 |  621 ++
 drivers/gpu/drm/radeon/rv770_smc.h                 |  209 +
 drivers/gpu/drm/radeon/rv770d.h                    |  283 +-
 drivers/gpu/drm/radeon/si.c                        | 1337 +++-
 drivers/gpu/drm/radeon/si_dpm.c                    | 6407 ++++++++++++++++++
 drivers/gpu/drm/radeon/si_dpm.h                    |  227 +
 drivers/gpu/drm/radeon/si_smc.c                    |  284 +
 drivers/gpu/drm/radeon/sid.h                       |  603 +-
 drivers/gpu/drm/radeon/sislands_smc.h              |  397 ++
 drivers/gpu/drm/radeon/sumo_dpm.c                  | 1832 +++++
 drivers/gpu/drm/radeon/sumo_dpm.h                  |  220 +
 drivers/gpu/drm/radeon/sumo_smc.c                  |  222 +
 drivers/gpu/drm/radeon/sumod.h                     |  372 ++
 drivers/gpu/drm/radeon/trinity_dpm.c               | 1917 ++++++
 drivers/gpu/drm/radeon/trinity_dpm.h               |  131 +
 drivers/gpu/drm/radeon/trinity_smc.c               |  115 +
 drivers/gpu/drm/radeon/trinityd.h                  |  228 +
 drivers/gpu/drm/rcar-du/Kconfig                    |    9 +
 drivers/gpu/drm/rcar-du/Makefile                   |    8 +
 drivers/gpu/drm/rcar-du/rcar_du_crtc.c             |  595 ++
 drivers/gpu/drm/rcar-du/rcar_du_crtc.h             |   50 +
 drivers/gpu/drm/rcar-du/rcar_du_drv.c              |  325 +
 drivers/gpu/drm/rcar-du/rcar_du_drv.h              |   66 +
 drivers/gpu/drm/rcar-du/rcar_du_kms.c              |  245 +
 drivers/gpu/drm/rcar-du/rcar_du_kms.h              |   59 +
 drivers/gpu/drm/rcar-du/rcar_du_lvds.c             |  216 +
 drivers/gpu/drm/rcar-du/rcar_du_lvds.h             |   24 +
 drivers/gpu/drm/rcar-du/rcar_du_plane.c            |  507 ++
 drivers/gpu/drm/rcar-du/rcar_du_plane.h            |   67 +
 drivers/gpu/drm/rcar-du/rcar_du_regs.h             |  445 ++
 drivers/gpu/drm/rcar-du/rcar_du_vga.c              |  149 +
 drivers/gpu/drm/rcar-du/rcar_du_vga.h              |   24 +
 drivers/gpu/drm/savage/savage_bci.c                |   43 +-
 drivers/gpu/drm/savage/savage_drv.h                |    5 +-
 drivers/gpu/drm/shmobile/Kconfig                   |    2 +-
 drivers/gpu/drm/shmobile/shmob_drm_drv.c           |   35 +-
 drivers/gpu/drm/shmobile/shmob_drm_kms.c           |    2 +-
 drivers/gpu/drm/shmobile/shmob_drm_plane.c         |    9 +-
 drivers/gpu/drm/tilcdc/tilcdc_crtc.c               |  122 +-
 drivers/gpu/drm/tilcdc/tilcdc_drv.c                |   37 +-
 drivers/gpu/drm/tilcdc/tilcdc_drv.h                |   25 +-
 drivers/gpu/drm/tilcdc/tilcdc_panel.c              |    2 +
 drivers/gpu/drm/tilcdc/tilcdc_regs.h               |    1 +
 drivers/gpu/drm/tilcdc/tilcdc_slave.c              |   51 +-
 drivers/gpu/drm/tilcdc/tilcdc_tfp410.c             |    2 +
 drivers/gpu/drm/ttm/ttm_bo.c                       |  239 +-
 drivers/gpu/drm/ttm/ttm_bo_manager.c               |    8 +-
 drivers/gpu/drm/ttm/ttm_bo_util.c                  |    6 +-
 drivers/gpu/drm/ttm/ttm_execbuf_util.c             |   86 +-
 drivers/gpu/drm/udl/udl_fb.c                       |   15 -
 drivers/gpu/drm/udl/udl_modeset.c                  |    5 -
 drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c             |    2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c                |   10 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c            |   14 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c                |    3 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_resource.c           |   27 +-
 drivers/gpu/host1x/dev.h                           |    8 +-
 drivers/gpu/host1x/drm/dc.c                        |    5 +
 drivers/gpu/host1x/drm/drm.c                       |   14 +-
 drivers/gpu/host1x/drm/gr2d.c                      |   12 +-
 drivers/gpu/host1x/hw/cdma_hw.c                    |    2 +-
 drivers/gpu/host1x/hw/syncpt_hw.c                  |   12 +-
 drivers/gpu/host1x/job.c                           |  135 +-
 drivers/gpu/host1x/syncpt.c                        |   26 +-
 drivers/gpu/host1x/syncpt.h                        |   13 +-
 drivers/staging/imx-drm/ipuv3-crtc.c               |    5 -
 drivers/video/console/vgacon.c                     |   17 +-
 drivers/video/of_display_timing.c                  |    7 +-
 drivers/video/uvesafb.c                            |   70 +-
 include/drm/drmP.h                                 |   38 +-
 include/drm/drm_crtc.h                             |   37 +-
 include/drm/drm_fixed.h                            |   94 +
 include/drm/drm_gem_cma_helper.h                   |    9 +
 include/drm/drm_mm.h                               |   38 +-
 include/drm/drm_os_linux.h                         |   16 -
 include/drm/drm_pciids.h                           |   24 +
 include/drm/drm_rect.h                             |  167 +
 include/drm/i915_powerwell.h                       |   36 +
 include/drm/ttm/ttm_bo_api.h                       |   37 +-
 include/drm/ttm/ttm_bo_driver.h                    |  169 +-
 include/drm/ttm/ttm_execbuf_util.h                 |   12 +-
 include/linux/io.h                                 |   25 +
 include/linux/platform_data/rcar-du.h              |   54 +
 include/linux/reservation.h                        |   62 +
 include/uapi/drm/drm.h                             |    1 +
 include/uapi/drm/drm_mode.h                        |   13 +
 include/uapi/drm/i915_drm.h                        |    3 +-
 include/uapi/drm/tegra_drm.h                       |    2 +
 include/video/display_timing.h                     |    1 +
 include/video/uvesafb.h                            |    1 +
 sound/pci/hda/Kconfig                              |   10 +
 sound/pci/hda/Makefile                             |    2 +
 sound/pci/hda/hda_i915.c                           |   75 +
 sound/pci/hda/hda_i915.h                           |   35 +
 sound/pci/hda/hda_intel.c                          |   87 +-
 436 files changed, 74814 insertions(+), 12313 deletions(-)
 create mode 100644 drivers/base/reservation.c
 create mode 100644 drivers/gpu/drm/drm_rect.c
 create mode 100644 drivers/gpu/drm/i915/intel_sideband.c
 create mode 100644 drivers/gpu/drm/mgag200/mgag200_cursor.c
 create mode 100644 drivers/gpu/drm/nouveau/core/engine/bsp/nv98.c
 rename drivers/gpu/drm/nouveau/core/{core => engine}/falcon.c (99%)
 rename drivers/gpu/drm/nouveau/core/engine/graph/fuc/{nvc0.fuc => com.fuc} (88%)
 create mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpc.fuc
 create mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/fuc/hub.fuc
 create mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/fuc/macros.fuc
 delete mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/fuc/nve0.fuc
 create mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/fuc/os.h
 create mode 100644 drivers/gpu/drm/nouveau/core/engine/vp/nv98.c
 create mode 100644 drivers/gpu/drm/nouveau/core/engine/xtensa.c
 rename drivers/gpu/drm/nouveau/core/include/{core => engine}/falcon.h (100%)
 create mode 100644 drivers/gpu/drm/nouveau/core/include/engine/xtensa.h
 create mode 100644 drivers/gpu/drm/nouveau/core/subdev/devinit/nva3.c
 create mode 100644 drivers/gpu/drm/nouveau/core/subdev/devinit/nvc0.c
 create mode 100644 drivers/gpu/drm/nouveau/core/subdev/devinit/priv.h
 create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/priv.h
 create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/ramnv04.c
 create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/ramnv10.c
 create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/ramnv1a.c
 create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/ramnv20.c
 create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/ramnv40.c
 create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/ramnv41.c
 create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/ramnv44.c
 create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/ramnv49.c
 create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/ramnv4e.c
 create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/ramnv50.c
 create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/ramnvc0.c
 create mode 100644 drivers/gpu/drm/radeon/btc_dpm.c
 create mode 100644 drivers/gpu/drm/radeon/btc_dpm.h
 create mode 100644 drivers/gpu/drm/radeon/btcd.h
 create mode 100644 drivers/gpu/drm/radeon/cik.c
 create mode 100644 drivers/gpu/drm/radeon/cik_blit_shaders.c
 create mode 100644 drivers/gpu/drm/radeon/cik_blit_shaders.h
 create mode 100644 drivers/gpu/drm/radeon/cik_reg.h
 create mode 100644 drivers/gpu/drm/radeon/cikd.h
 create mode 100644 drivers/gpu/drm/radeon/clearstate_cayman.h
 create mode 100644 drivers/gpu/drm/radeon/clearstate_defs.h
 create mode 100644 drivers/gpu/drm/radeon/clearstate_evergreen.h
 create mode 100644 drivers/gpu/drm/radeon/clearstate_si.h
 create mode 100644 drivers/gpu/drm/radeon/cypress_dpm.c
 create mode 100644 drivers/gpu/drm/radeon/cypress_dpm.h
 create mode 100644 drivers/gpu/drm/radeon/evergreen_smc.h
 create mode 100644 drivers/gpu/drm/radeon/ni_dpm.c
 create mode 100644 drivers/gpu/drm/radeon/ni_dpm.h
 create mode 100644 drivers/gpu/drm/radeon/nislands_smc.h
 create mode 100644 drivers/gpu/drm/radeon/ppsmc.h
 create mode 100644 drivers/gpu/drm/radeon/r600_dpm.c
 create mode 100644 drivers/gpu/drm/radeon/r600_dpm.h
 create mode 100644 drivers/gpu/drm/radeon/radeon_ucode.h
 create mode 100644 drivers/gpu/drm/radeon/rs780_dpm.c
 create mode 100644 drivers/gpu/drm/radeon/rs780_dpm.h
 create mode 100644 drivers/gpu/drm/radeon/rs780d.h
 create mode 100644 drivers/gpu/drm/radeon/rv6xx_dpm.c
 create mode 100644 drivers/gpu/drm/radeon/rv6xx_dpm.h
 create mode 100644 drivers/gpu/drm/radeon/rv6xxd.h
 create mode 100644 drivers/gpu/drm/radeon/rv730_dpm.c
 create mode 100644 drivers/gpu/drm/radeon/rv730d.h
 create mode 100644 drivers/gpu/drm/radeon/rv740_dpm.c
 create mode 100644 drivers/gpu/drm/radeon/rv740d.h
 create mode 100644 drivers/gpu/drm/radeon/rv770_dpm.c
 create mode 100644 drivers/gpu/drm/radeon/rv770_dpm.h
 create mode 100644 drivers/gpu/drm/radeon/rv770_smc.c
 create mode 100644 drivers/gpu/drm/radeon/rv770_smc.h
 create mode 100644 drivers/gpu/drm/radeon/si_dpm.c
 create mode 100644 drivers/gpu/drm/radeon/si_dpm.h
 create mode 100644 drivers/gpu/drm/radeon/si_smc.c
 create mode 100644 drivers/gpu/drm/radeon/sislands_smc.h
 create mode 100644 drivers/gpu/drm/radeon/sumo_dpm.c
 create mode 100644 drivers/gpu/drm/radeon/sumo_dpm.h
 create mode 100644 drivers/gpu/drm/radeon/sumo_smc.c
 create mode 100644 drivers/gpu/drm/radeon/sumod.h
 create mode 100644 drivers/gpu/drm/radeon/trinity_dpm.c
 create mode 100644 drivers/gpu/drm/radeon/trinity_dpm.h
 create mode 100644 drivers/gpu/drm/radeon/trinity_smc.c
 create mode 100644 drivers/gpu/drm/radeon/trinityd.h
 create mode 100644 drivers/gpu/drm/rcar-du/Kconfig
 create mode 100644 drivers/gpu/drm/rcar-du/Makefile
 create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_crtc.c
 create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_crtc.h
 create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_drv.c
 create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_drv.h
 create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_kms.c
 create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_kms.h
 create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvds.c
 create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvds.h
 create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_plane.c
 create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_plane.h
 create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_regs.h
 create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vga.c
 create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vga.h
 create mode 100644 include/drm/drm_rect.h
 create mode 100644 include/drm/i915_powerwell.h
 create mode 100644 include/linux/platform_data/rcar-du.h
 create mode 100644 include/linux/reservation.h
 create mode 100644 sound/pci/hda/hda_i915.c
 create mode 100644 sound/pci/hda/hda_i915.h
Merging drm-intel/for-linux-next (035dc1e drm/i915: reinit status page registers after gpu reset)
$ git merge --no-ff drm-intel/for-linux-next
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/i915/intel_ringbuffer.c | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)
Merging drm-tegra/drm/for-next (ebae30b gpu: host1x: Rework CPU syncpoint increment)
$ git merge --no-ff drm-tegra/drm/for-next
Already up-to-date.
Merging sound/for-next (8f0b3b7 ALSA: hda - Fix EAPD vmaster hook for AD1884 & co)
$ git merge --no-ff sound/for-next
Already up-to-date.
Merging sound-asoc/for-next (7fb8325 Merge remote-tracking branch 'asoc/fix/wm8962' into asoc-linus)
$ git merge --no-ff sound-asoc/for-next
Merge made by the 'recursive' strategy.
 sound/soc/codecs/wm8962.c      |  2 +-
 sound/soc/fsl/imx-sgtl5000.c   |  4 +--
 sound/soc/mxs/mxs-saif.c       | 35 ++++++++++++++++++++++
 sound/soc/samsung/i2s.c        | 66 +++---------------------------------------
 sound/soc/samsung/s3c-i2s-v2.c |  4 +--
 5 files changed, 43 insertions(+), 68 deletions(-)
Merging modules/modules-next (9eb76d7 module: cleanup call chain.)
$ git merge --no-ff modules/modules-next
Auto-merging kernel/module.c
Merge made by the 'recursive' strategy.
 Documentation/ABI/stable/sysfs-module | 10 +++--
 include/linux/moduleparam.h           |  2 +-
 kernel/module.c                       | 77 +++++++++++++++++++----------------
 kernel/params.c                       |  2 +-
 4 files changed, 52 insertions(+), 39 deletions(-)
Merging virtio/virtio-next (e6dc041 lguest: fix example launcher compilation for broken glibc headers.)
$ git merge --no-ff virtio/virtio-next
Auto-merging drivers/virtio/virtio_balloon.c
Auto-merging drivers/net/virtio_net.c
Merge made by the 'recursive' strategy.
 drivers/net/virtio_net.c        |  5 +----
 drivers/virtio/virtio_balloon.c |  3 ++-
 drivers/virtio/virtio_pci.c     |  5 +++--
 tools/lguest/Makefile           |  1 -
 tools/lguest/lguest.c           | 32 +++++++++++++++++++++++---------
 5 files changed, 29 insertions(+), 17 deletions(-)
Merging input/next (a608026 Input: ads7846 - add device tree bindings)
$ git merge --no-ff input/next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/input/ads7846.txt          |  91 +++++++++++++++
 drivers/input/touchscreen/ads7846.c                | 123 ++++++++++++++++++---
 2 files changed, 199 insertions(+), 15 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/input/ads7846.txt
Merging input-mt/for-next (257867d Input: MT - Specify that ABS_MT_SLOT must have a minimum of 0)
$ git merge --no-ff input-mt/for-next
Already up-to-date.
Merging cgroup/for-next (9109d44 Merge branch 'for-3.11' into for-next)
$ git merge --no-ff cgroup/for-next
Resolved 'include/linux/cgroup.h' using previous resolution.
Auto-merging include/linux/cgroup.h
CONFLICT (content): Merge conflict in include/linux/cgroup.h
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 5107ce1] Merge remote-tracking branch 'cgroup/for-next'
$ git diff -M --stat --summary HEAD^..
 include/linux/cgroup.h | 7 +++++++
 1 file changed, 7 insertions(+)
Merging block/for-next (4841577 Merge branch 'for-3.11/core' into for-next)
$ git merge --no-ff block/for-next
Resolved 'include/linux/cgroup.h' using previous resolution.
Auto-merging include/linux/cgroup.h
CONFLICT (content): Merge conflict in include/linux/cgroup.h
Auto-merging fs/block_dev.c
Auto-merging drivers/md/bcache/bset.c
Auto-merging drivers/block/xen-blkback/xenbus.c
Auto-merging MAINTAINERS
Auto-merging Documentation/bcache.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 161ab5d] Merge remote-tracking branch 'block/for-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/ABI/testing/sysfs-driver-xen-blkback |   17 +
 .../ABI/testing/sysfs-driver-xen-blkfront          |   10 +
 Documentation/bcache.txt                           |   37 +-
 Documentation/cgroups/blkio-controller.txt         |   29 +-
 MAINTAINERS                                        |    4 +-
 block/blk-cgroup.c                                 |  105 +-
 block/blk-cgroup.h                                 |   38 +-
 block/blk-tag.c                                    |   11 +-
 block/blk-throttle.c                               | 1064 ++++++++++++++------
 block/cfq-iosched.c                                |   17 +-
 block/deadline-iosched.c                           |   16 +-
 block/elevator.c                                   |   25 +-
 block/noop-iosched.c                               |   17 +-
 drivers/block/Kconfig                              |    4 +-
 drivers/block/drbd/drbd_actlog.c                   |   21 +
 drivers/block/drbd/drbd_int.h                      |   15 +-
 drivers/block/drbd/drbd_main.c                     |   61 +-
 drivers/block/drbd/drbd_nl.c                       |  185 +++-
 drivers/block/drbd/drbd_receiver.c                 |   12 +-
 drivers/block/drbd/drbd_state.c                    |    4 +-
 drivers/block/rsxx/core.c                          |  359 ++++++-
 drivers/block/rsxx/cregs.c                         |   14 +
 drivers/block/rsxx/dev.c                           |   33 +-
 drivers/block/rsxx/dma.c                           |  185 ++--
 drivers/block/rsxx/rsxx_priv.h                     |   10 +-
 drivers/block/xen-blkback/blkback.c                |  872 ++++++++++------
 drivers/block/xen-blkback/common.h                 |  147 ++-
 drivers/block/xen-blkback/xenbus.c                 |   85 ++
 drivers/block/xen-blkfront.c                       |  532 ++++++++--
 drivers/md/bcache/alloc.c                          |   44 +-
 drivers/md/bcache/bcache.h                         |   56 +-
 drivers/md/bcache/bset.c                           |   56 +-
 drivers/md/bcache/bset.h                           |    4 +
 drivers/md/bcache/btree.c                          |  447 ++++----
 drivers/md/bcache/btree.h                          |   35 +-
 drivers/md/bcache/debug.c                          |  178 +---
 drivers/md/bcache/debug.h                          |   11 +-
 drivers/md/bcache/io.c                             |   68 +-
 drivers/md/bcache/journal.c                        |   18 +-
 drivers/md/bcache/movinggc.c                       |   24 +-
 drivers/md/bcache/request.c                        |  189 ++--
 drivers/md/bcache/request.h                        |    2 +-
 drivers/md/bcache/super.c                          |  131 ++-
 drivers/md/bcache/sysfs.c                          |   66 +-
 drivers/md/bcache/trace.c                          |   47 +-
 drivers/md/bcache/util.c                           |   17 -
 drivers/md/bcache/util.h                           |    6 -
 drivers/md/bcache/writeback.c                      |  133 ++-
 drivers/md/bcache/writeback.h                      |   64 ++
 fs/block_dev.c                                     |    9 +-
 include/linux/cgroup.h                             |    2 +
 include/linux/drbd.h                               |    6 +-
 include/linux/drbd_genl.h                          |    2 +
 include/linux/drbd_limits.h                        |    9 +
 include/linux/elevator.h                           |    6 +-
 include/trace/events/bcache.h                      |  381 +++++--
 include/xen/interface/io/blkif.h                   |   53 +
 include/xen/interface/io/ring.h                    |    5 +
 58 files changed, 4036 insertions(+), 1962 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-driver-xen-blkback
 create mode 100644 Documentation/ABI/testing/sysfs-driver-xen-blkfront
 create mode 100644 drivers/md/bcache/writeback.h
Merging device-mapper/master (7cf5960 dm-switch is a new target that maps IO to underlying block devices efficiently when there are a large number of fixed-sized address regions but there is no simple pattern to allow for a compact mapping representation such as dm-stripe.)
$ git merge --no-ff device-mapper/master
Merge made by the 'recursive' strategy.
 Documentation/device-mapper/switch.txt |  83 +++++
 drivers/md/Kconfig                     |  14 +
 drivers/md/Makefile                    |   1 +
 drivers/md/dm-bufio.c                  |  75 ++++-
 drivers/md/dm-cache-target.c           |   4 +
 drivers/md/dm-ioctl.c                  | 127 +++++---
 drivers/md/dm-mpath.c                  |   8 +-
 drivers/md/dm-switch.c                 | 538 +++++++++++++++++++++++++++++++++
 drivers/md/dm-table.c                  |  35 ---
 drivers/md/dm-verity.c                 |  17 +-
 drivers/md/dm.c                        | 177 ++++++-----
 include/linux/device-mapper.h          |   6 +-
 include/uapi/linux/dm-ioctl.h          |   4 +-
 13 files changed, 905 insertions(+), 184 deletions(-)
 create mode 100644 Documentation/device-mapper/switch.txt
 create mode 100644 drivers/md/dm-switch.c
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
$ git merge --no-ff embedded/master
Already up-to-date.
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
$ git merge --no-ff firmware/master
Already up-to-date.
Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
$ git merge --no-ff pcmcia/master
Already up-to-date.
Merging mmc/mmc-next (058f426 mmc: sdhci-pci: add another device id)
$ git merge --no-ff mmc/mmc-next
Auto-merging drivers/mmc/host/davinci_mmc.c
Auto-merging drivers/mmc/core/bus.c
Auto-merging Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/mmc/mmc.txt      |   1 +
 .../devicetree/bindings/mmc/rockchip-dw-mshc.txt   |  23 ++
 .../devicetree/bindings/mmc/synopsis-dw-mshc.txt   |  20 ++
 drivers/mmc/card/block.c                           | 130 ++++++++---
 drivers/mmc/card/mmc_test.c                        |   5 +
 drivers/mmc/card/queue.c                           |   2 +-
 drivers/mmc/core/bus.c                             |  51 ++++-
 drivers/mmc/core/core.c                            | 200 +++++------------
 drivers/mmc/core/core.h                            |   7 +-
 drivers/mmc/core/debugfs.c                         |   8 +-
 drivers/mmc/core/host.c                            |  32 ++-
 drivers/mmc/core/mmc.c                             | 249 +++++++++++++++------
 drivers/mmc/core/mmc_ops.c                         |  36 +--
 drivers/mmc/core/mmc_ops.h                         |   1 -
 drivers/mmc/core/sd.c                              |  68 +++++-
 drivers/mmc/core/sdio.c                            |  76 ++++++-
 drivers/mmc/host/Kconfig                           |   8 +
 drivers/mmc/host/Makefile                          |   1 +
 drivers/mmc/host/android-goldfish.c                |   2 -
 drivers/mmc/host/atmel-mci.c                       |  14 +-
 drivers/mmc/host/au1xmmc.c                         |   1 -
 drivers/mmc/host/bfin_sdh.c                        |   2 -
 drivers/mmc/host/cb710-mmc.c                       |   2 +-
 drivers/mmc/host/cb710-mmc.h                       |   2 +-
 drivers/mmc/host/davinci_mmc.c                     |   1 -
 drivers/mmc/host/dw_mmc-exynos.c                   |   2 -
 drivers/mmc/host/dw_mmc-pci.c                      |  58 ++---
 drivers/mmc/host/dw_mmc-pltfm.c                    |  73 +++---
 drivers/mmc/host/dw_mmc-socfpga.c                  | 140 ++++++++++++
 drivers/mmc/host/dw_mmc.c                          |  65 ++++--
 drivers/mmc/host/dw_mmc.h                          |   3 +-
 drivers/mmc/host/jz4740_mmc.c                      | 180 ++++-----------
 drivers/mmc/host/mvsdio.c                          |  74 +++---
 drivers/mmc/host/mxcmmc.c                          |   6 +-
 drivers/mmc/host/mxs-mmc.c                         |  11 +-
 drivers/mmc/host/omap.c                            |  18 --
 drivers/mmc/host/omap_hsmmc.c                      |   2 -
 drivers/mmc/host/pxamci.c                          |   2 -
 drivers/mmc/host/rtsx_pci_sdmmc.c                  |   2 -
 drivers/mmc/host/sdhci-acpi.c                      |  96 +++++++-
 drivers/mmc/host/sdhci-bcm2835.c                   |   2 +-
 drivers/mmc/host/sdhci-cns3xxx.c                   |   2 +-
 drivers/mmc/host/sdhci-dove.c                      |   2 +-
 drivers/mmc/host/sdhci-esdhc-imx.c                 |  30 ++-
 drivers/mmc/host/sdhci-esdhc.h                     |  16 +-
 drivers/mmc/host/sdhci-of-esdhc.c                  |  63 +++++-
 drivers/mmc/host/sdhci-of-hlwd.c                   |   2 +-
 drivers/mmc/host/sdhci-pci.c                       |  43 +++-
 drivers/mmc/host/sdhci-pltfm.c                     |  23 +-
 drivers/mmc/host/sdhci-pltfm.h                     |  14 +-
 drivers/mmc/host/sdhci-pxav2.c                     |   4 +-
 drivers/mmc/host/sdhci-pxav3.c                     |  18 +-
 drivers/mmc/host/sdhci-s3c.c                       |   1 -
 drivers/mmc/host/sdhci-sirf.c                      |  59 ++---
 drivers/mmc/host/sdhci-spear.c                     |   2 -
 drivers/mmc/host/sdhci-tegra.c                     |  11 +-
 drivers/mmc/host/sdhci.c                           |  59 ++++-
 drivers/mmc/host/sh_mmcif.c                        |  12 +-
 drivers/mmc/host/sh_mobile_sdhi.c                  |  34 ++-
 drivers/mmc/host/tmio_mmc.c                        |   2 -
 drivers/mmc/host/tmio_mmc.h                        |  21 +-
 drivers/mmc/host/tmio_mmc_dma.c                    |  48 ++--
 drivers/mmc/host/tmio_mmc_pio.c                    |  40 ++--
 drivers/mmc/host/wmt-sdmmc.c                       |   2 -
 include/linux/mfd/tmio.h                           |   5 +
 include/linux/mmc/card.h                           |  11 +-
 include/linux/mmc/core.h                           |   5 +
 include/linux/mmc/host.h                           |  12 +-
 include/linux/mmc/sdhci.h                          |   6 +-
 include/linux/platform_data/mmc-esdhc-imx.h        |   1 +
 70 files changed, 1434 insertions(+), 790 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt
 create mode 100644 drivers/mmc/host/dw_mmc-socfpga.c
Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command)
$ git merge --no-ff kgdb/kgdb-next
Merge made by the 'recursive' strategy.
Merging slab/for-next (c55d728 Merge branch 'slab/next' into for-next)
$ git merge --no-ff slab/for-next
Merge made by the 'recursive' strategy.
 include/linux/slab.h | 39 ++++++++++++++++++++++++++++-----------
 mm/slab.c            | 23 +++++++++++------------
 2 files changed, 39 insertions(+), 23 deletions(-)
Merging uclinux/for-next (6dbe51c Linux 3.9-rc1)
$ git merge --no-ff uclinux/for-next
Already up-to-date.
Merging md/for-next (c9a3dcd md: fix dev_sectors when data_offset changes.)
$ git merge --no-ff md/for-next
Merge made by the 'recursive' strategy.
 drivers/md/md.c    |  13 +-
 drivers/md/md.h    |   8 +
 drivers/md/raid5.c | 458 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 drivers/md/raid5.h |  22 +++
 4 files changed, 472 insertions(+), 29 deletions(-)
Merging mfd/master (25f311f mfd: sec: Provide max_register to regmap)
$ git merge --no-ff mfd/master
Resolved 'arch/arm/boot/dts/am33xx.dtsi' using previous resolution.
Resolved 'include/linux/mfd/davinci_voicecodec.h' using previous resolution.
Removing include/linux/platform_data/ti_am335x_adc.h
Auto-merging include/linux/mfd/wm8994/pdata.h
Auto-merging include/linux/mfd/palmas.h
Auto-merging include/linux/mfd/davinci_voicecodec.h
CONFLICT (content): Merge conflict in include/linux/mfd/davinci_voicecodec.h
Removing include/linux/input/ti_am335x_tsc.h
Auto-merging drivers/watchdog/Kconfig
Removing drivers/ssbi/Makefile
Removing drivers/ssbi/Kconfig
Auto-merging drivers/rtc/rtc-max8998.c
Auto-merging drivers/mfd/twl4030-irq.c
Auto-merging drivers/mfd/dbx500-prcmu-regs.h
Auto-merging drivers/mfd/ab8500-gpadc.c
Auto-merging drivers/input/touchscreen/ti_am335x_tsc.c
Auto-merging drivers/Makefile
Auto-merging drivers/Kconfig
CONFLICT (modify/delete): arch/arm/mach-exynos/mach-universal_c210.c deleted in HEAD and modified in mfd/master. Version mfd/master of arch/arm/mach-exynos/mach-universal_c210.c left in tree.
Auto-merging arch/arm/boot/dts/am33xx.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/am33xx.dtsi
Auto-merging arch/arm/boot/dts/am335x-evm.dts
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f arch/arm/mach-exynos/mach-universal_c210.c
arch/arm/mach-exynos/mach-universal_c210.c: needs merge
rm 'arch/arm/mach-exynos/mach-universal_c210.c'
$ git commit -v -a
[master 34167e3] Merge remote-tracking branch 'mfd/master'
$ git diff -M --stat --summary HEAD^..
 .../bindings/input/touchscreen/ti-tsc-adc.txt      |   44 +
 Documentation/devicetree/bindings/mfd/max8998.txt  |  119 ++
 .../devicetree/bindings/mfd/twl4030-power.txt      |   28 +
 .../bindings/regulator/twl-regulator.txt           |   26 +-
 .../devicetree/bindings/usb/twlxxxx-usb.txt        |    2 +-
 MAINTAINERS                                        |    5 +-
 arch/arm/boot/dts/am335x-evm.dts                   |   14 +
 arch/arm/boot/dts/am33xx.dtsi                      |   18 +
 arch/arm/mach-s5pv210/mach-aquila.c                |    8 +-
 arch/arm/mach-s5pv210/mach-goni.c                  |    8 +-
 drivers/Kconfig                                    |    2 -
 drivers/Makefile                                   |    1 -
 drivers/iio/adc/ti_am335x_adc.c                    |  132 +-
 drivers/input/touchscreen/ti_am335x_tsc.c          |  288 ++--
 drivers/mfd/88pm800.c                              |  238 +--
 drivers/mfd/88pm805.c                              |   20 +-
 drivers/mfd/88pm80x.c                              |   47 +-
 drivers/mfd/88pm860x-core.c                        |    8 +-
 drivers/mfd/Kconfig                                |   36 +-
 drivers/mfd/Makefile                               |    6 +-
 drivers/mfd/aat2870-core.c                         |    5 +-
 drivers/mfd/ab3100-core.c                          |   28 +-
 drivers/mfd/ab3100-otp.c                           |   14 +-
 drivers/mfd/ab8500-core.c                          |   79 +-
 drivers/mfd/ab8500-debugfs.c                       |   36 +-
 drivers/mfd/ab8500-gpadc.c                         |    6 +-
 drivers/mfd/abx500-core.c                          |   10 +-
 drivers/mfd/adp5520.c                              |    8 +-
 drivers/mfd/arizona-core.c                         |   27 +
 drivers/mfd/arizona-i2c.c                          |    6 +
 drivers/mfd/arizona-irq.c                          |    8 +
 drivers/mfd/arizona.h                              |    5 +
 drivers/mfd/asic3.c                                |   14 +-
 drivers/mfd/cros_ec.c                              |   28 +-
 drivers/mfd/davinci_voicecodec.c                   |   58 +-
 drivers/mfd/dbx500-prcmu-regs.h                    |    4 +-
 drivers/mfd/htc-egpio.c                            |   13 +-
 drivers/mfd/htc-i2cpld.c                           |   15 +-
 drivers/mfd/htc-pasic3.c                           |    4 +-
 drivers/mfd/intel_msic.c                           |    1 -
 drivers/mfd/janz-cmodio.c                          |   12 +-
 drivers/mfd/jz4740-adc.c                           |    7 +-
 drivers/mfd/kempld-core.c                          |  641 ++++++++
 drivers/mfd/lpc_ich.c                              |   30 +-
 drivers/mfd/max77686.c                             |   26 +-
 drivers/mfd/max8925-i2c.c                          |    4 +-
 drivers/mfd/max8998-irq.c                          |   65 +-
 drivers/mfd/max8998.c                              |   67 +-
 drivers/mfd/mcp-sa11x0.c                           |    3 -
 drivers/mfd/palmas.c                               |  146 +-
 drivers/mfd/rtl8411.c                              |  132 ++
 drivers/mfd/rtsx_pcr.c                             |    5 +
 drivers/mfd/rtsx_pcr.h                             |    1 +
 drivers/mfd/sec-core.c                             |   44 +-
 drivers/{ssbi => mfd}/ssbi.c                       |    0
 drivers/mfd/t7l66xb.c                              |    1 -
 drivers/mfd/tc6387xb.c                             |    1 -
 drivers/mfd/tc6393xb.c                             |    1 -
 drivers/mfd/ti_am335x_tscadc.c                     |  112 +-
 drivers/mfd/tps65912-core.c                        |    2 -
 drivers/mfd/tps65912-i2c.c                         |    3 +-
 drivers/mfd/tps65912-spi.c                         |    3 +-
 drivers/mfd/twl-core.c                             |   70 +-
 drivers/mfd/twl4030-audio.c                        |    5 +-
 drivers/mfd/twl4030-irq.c                          |    1 +
 drivers/mfd/twl4030-madc.c                         |    5 +-
 drivers/mfd/twl4030-power.c                        |  148 +-
 drivers/mfd/vexpress-sysreg.c                      |   10 +-
 drivers/mfd/wm8994-core.c                          |   25 +-
 drivers/mfd/wm8994-irq.c                           |  100 +-
 drivers/mfd/wm8997-tables.c                        | 1525 ++++++++++++++++++++
 drivers/regulator/max8998.c                        |  227 ++-
 drivers/regulator/palmas-regulator.c               |    4 +
 drivers/regulator/twl-regulator.c                  |   76 +-
 drivers/rtc/rtc-max8998.c                          |   14 +-
 drivers/ssbi/Kconfig                               |   16 -
 drivers/ssbi/Makefile                              |    1 -
 drivers/usb/phy/phy-twl6030-usb.c                  |    2 +-
 drivers/watchdog/Kconfig                           |   11 +
 drivers/watchdog/Makefile                          |    1 +
 drivers/watchdog/kempld_wdt.c                      |  581 ++++++++
 include/linux/i2c/twl.h                            |   31 +-
 include/linux/input/ti_am335x_tsc.h                |   23 -
 include/linux/mfd/88pm80x.h                        |   17 +-
 include/linux/mfd/abx500/ab8500.h                  |    2 +
 include/linux/mfd/arizona/core.h                   |    2 +
 include/linux/mfd/davinci_voicecodec.h             |    4 +-
 include/linux/mfd/kempld.h                         |  125 ++
 include/linux/mfd/max8998-private.h                |    7 +-
 include/linux/mfd/max8998.h                        |   20 +-
 include/linux/mfd/palmas.h                         |   14 +
 include/linux/mfd/rtsx_pci.h                       |    1 +
 include/linux/mfd/samsung/core.h                   |    6 -
 include/linux/mfd/ti_am335x_tscadc.h               |   35 +-
 include/linux/mfd/wm8994/core.h                    |    2 +
 include/linux/mfd/wm8994/pdata.h                   |    5 +
 include/linux/platform_data/ti_am335x_adc.h        |   14 -
 97 files changed, 4837 insertions(+), 1018 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt
 create mode 100644 Documentation/devicetree/bindings/mfd/max8998.txt
 create mode 100644 Documentation/devicetree/bindings/mfd/twl4030-power.txt
 create mode 100644 drivers/mfd/kempld-core.c
 rename drivers/{ssbi => mfd}/ssbi.c (100%)
 create mode 100644 drivers/mfd/wm8997-tables.c
 delete mode 100644 drivers/ssbi/Kconfig
 delete mode 100644 drivers/ssbi/Makefile
 create mode 100644 drivers/watchdog/kempld_wdt.c
 delete mode 100644 include/linux/input/ti_am335x_tsc.h
 create mode 100644 include/linux/mfd/kempld.h
 delete mode 100644 include/linux/platform_data/ti_am335x_adc.h
Merging battery/master (5a6c220 charger-manager: Fix regulator_get() return check)
$ git merge --no-ff battery/master
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../bindings/power_supply/lp8727_charger.txt       |  44 +++++++
 MAINTAINERS                                        |   8 +-
 drivers/power/88pm860x_battery.c                   |   1 -
 drivers/power/88pm860x_charger.c                   |   1 -
 drivers/power/ab8500_btemp.c                       |   1 -
 drivers/power/ab8500_charger.c                     |   2 -
 drivers/power/ab8500_fg.c                          |   7 +-
 drivers/power/abx500_chargalg.c                    |   1 -
 drivers/power/bq27x00_battery.c                    |   2 -
 drivers/power/charger-manager.c                    | 146 +++++++++------------
 drivers/power/generic-adc-battery.c                |   4 +-
 drivers/power/gpio-charger.c                       |   2 -
 drivers/power/intel_mid_battery.c                  |   2 +-
 drivers/power/jz4740-battery.c                     |   4 +-
 drivers/power/lp8727_charger.c                     |  68 ++++++++++
 drivers/power/pcf50633-charger.c                   |   8 +-
 drivers/power/pm2301_charger.c                     |  11 +-
 drivers/power/power_supply_core.c                  |   4 +
 drivers/power/reset/Kconfig                        |   3 +-
 drivers/power/rx51_battery.c                       |   5 +-
 drivers/power/sbs-battery.c                        |   1 +
 drivers/power/tps65090-charger.c                   |  40 +++++-
 drivers/power/twl4030_charger.c                    |   2 -
 include/linux/power_supply.h                       |   4 +-
 24 files changed, 241 insertions(+), 130 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/power_supply/lp8727_charger.txt
Merging fbdev/for-next (19fd744 Merge tag 'fbdev-3.11-2' of git://gitorious.org/linux-omap-dss2/linux into fbdev/for-next)
$ git merge --no-ff fbdev/for-next
Resolved 'drivers/video/of_display_timing.c' using previous resolution.
Resolved 'drivers/video/omap2/displays/panel-n8x0.c' using previous resolution.
Auto-merging drivers/video/uvesafb.c
Auto-merging drivers/video/pxa3xx-gcu.c
Auto-merging drivers/video/omap2/displays/panel-n8x0.c
CONFLICT (content): Merge conflict in drivers/video/omap2/displays/panel-n8x0.c
Auto-merging drivers/video/of_display_timing.c
CONFLICT (content): Merge conflict in drivers/video/of_display_timing.c
Auto-merging drivers/video/au1100fb.c
Auto-merging drivers/gpu/drm/omapdrm/omap_crtc.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 0ac099d] Merge remote-tracking branch 'fbdev/for-next'
$ git diff -M --stat --summary HEAD^..
 .../devicetree/bindings/video/ssd1307fb.txt        |   10 +-
 drivers/gpu/drm/omapdrm/omap_crtc.c                |   46 +-
 drivers/gpu/drm/omapdrm/omap_drv.c                 |   27 +-
 drivers/gpu/drm/omapdrm/omap_drv.h                 |    1 +
 drivers/video/Kconfig                              |    2 +-
 drivers/video/aty/aty128fb.c                       |    2 +-
 drivers/video/aty/atyfb_base.c                     |    9 +-
 drivers/video/aty/radeon_pm.c                      |    2 +-
 drivers/video/au1100fb.c                           |    1 -
 drivers/video/bf54x-lq043fb.c                      |    1 -
 drivers/video/bfin-lq035q1-fb.c                    |   24 +-
 drivers/video/bfin-t350mcqb-fb.c                   |    2 -
 drivers/video/ep93xx-fb.c                          |    2 -
 drivers/video/fbmem.c                              |    6 +-
 drivers/video/fsl-diu-fb.c                         |    4 +-
 drivers/video/i740fb.c                             |    2 +-
 drivers/video/imxfb.c                              |    7 +-
 drivers/video/jz4740_fb.c                          |    2 -
 drivers/video/mmp/fb/mmpfb.c                       |    1 -
 drivers/video/mmp/hw/mmp_ctrl.c                    |    9 +-
 drivers/video/mxsfb.c                              |    3 -
 drivers/video/nuc900fb.c                           |    1 -
 drivers/video/of_display_timing.c                  |   56 +-
 drivers/video/omap2/Kconfig                        |    1 +
 drivers/video/omap2/Makefile                       |    1 +
 drivers/video/omap2/displays-new/Kconfig           |   73 ++
 drivers/video/omap2/displays-new/Makefile          |   12 +
 .../video/omap2/displays-new/connector-analog-tv.c |  265 ++++
 drivers/video/omap2/displays-new/connector-dvi.c   |  351 +++++
 drivers/video/omap2/displays-new/connector-hdmi.c  |  375 ++++++
 drivers/video/omap2/displays-new/encoder-tfp410.c  |  267 ++++
 .../video/omap2/displays-new/encoder-tpd12s015.c   |  395 ++++++
 drivers/video/omap2/displays-new/panel-dpi.c       |  270 ++++
 drivers/video/omap2/displays-new/panel-dsi-cm.c    | 1336 ++++++++++++++++++++
 .../omap2/displays-new/panel-lgphilips-lb035q02.c  |  358 ++++++
 .../omap2/displays-new/panel-nec-nl8048hl11.c      |  394 ++++++
 .../omap2/displays-new/panel-sharp-ls037v7dw01.c   |  324 +++++
 .../omap2/displays-new/panel-sony-acx565akm.c      |  865 +++++++++++++
 .../omap2/displays-new/panel-tpo-td043mtea1.c      |  646 ++++++++++
 drivers/video/omap2/displays/Kconfig               |    2 +-
 drivers/video/omap2/displays/panel-acx565akm.c     |   16 +-
 drivers/video/omap2/displays/panel-generic-dpi.c   |   26 +-
 .../omap2/displays/panel-lgphilips-lb035q02.c      |   10 +-
 drivers/video/omap2/displays/panel-n8x0.c          |   30 +-
 .../omap2/displays/panel-nec-nl8048hl11-01b.c      |    4 +-
 drivers/video/omap2/displays/panel-picodlp.c       |   34 +-
 .../video/omap2/displays/panel-sharp-ls037v7dw01.c |   10 +-
 drivers/video/omap2/displays/panel-taal.c          |  170 +--
 drivers/video/omap2/displays/panel-tfp410.c        |   32 +-
 .../video/omap2/displays/panel-tpo-td043mtea1.c    |   36 +-
 drivers/video/omap2/dss/Kconfig                    |    1 +
 drivers/video/omap2/dss/apply.c                    |   59 +-
 drivers/video/omap2/dss/core.c                     |  108 +-
 drivers/video/omap2/dss/dispc-compat.c             |    3 +-
 drivers/video/omap2/dss/dispc.c                    |   24 +-
 drivers/video/omap2/dss/display-sysfs.c            |  154 ++-
 drivers/video/omap2/dss/display.c                  |  247 ++--
 drivers/video/omap2/dss/dpi.c                      |  209 ++-
 drivers/video/omap2/dss/dsi.c                      |  232 ++--
 drivers/video/omap2/dss/dss.c                      |    3 +-
 drivers/video/omap2/dss/dss.h                      |   35 +-
 drivers/video/omap2/dss/dss_features.c             |    1 -
 drivers/video/omap2/dss/hdmi.c                     |  345 ++++-
 drivers/video/omap2/dss/manager-sysfs.c            |   47 +-
 drivers/video/omap2/dss/manager.c                  |   29 +-
 drivers/video/omap2/dss/output.c                   |   87 +-
 drivers/video/omap2/dss/rfbi.c                     |   43 +-
 drivers/video/omap2/dss/sdi.c                      |  143 ++-
 drivers/video/omap2/dss/ti_hdmi.h                  |    5 +-
 drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c          |   87 +-
 drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h          |    1 +
 drivers/video/omap2/dss/venc.c                     |  163 ++-
 drivers/video/omap2/dss/venc_panel.c               |   16 +-
 drivers/video/omap2/omapfb/omapfb-ioctl.c          |    9 +-
 drivers/video/omap2/omapfb/omapfb-main.c           |   27 +-
 drivers/video/pxa3xx-gcu.c                         |    2 -
 drivers/video/pxafb.c                              |    1 -
 drivers/video/s3c2410fb.c                          |    2 -
 drivers/video/sa1100fb.c                           |    1 -
 drivers/video/sh7760fb.c                           |    1 -
 drivers/video/sh_mipi_dsi.c                        |    1 -
 drivers/video/smscufx.c                            |    2 +-
 drivers/video/ssd1307fb.c                          |  392 ++++--
 drivers/video/tmiofb.c                             |    3 -
 drivers/video/udlfb.c                              |   12 +-
 drivers/video/uvesafb.c                            |    4 +-
 drivers/video/vga16fb.c                            |    1 -
 drivers/video/vt8500lcdfb.c                        |    1 -
 drivers/video/wm8505fb.c                           |    2 +-
 drivers/video/xilinxfb.c                           |  135 +-
 include/linux/fb.h                                 |    2 +-
 include/video/of_display_timing.h                  |    3 +
 include/video/omap-panel-data.h                    |  209 +++
 include/video/omapdss.h                            |  293 ++++-
 94 files changed, 8488 insertions(+), 1180 deletions(-)
 create mode 100644 drivers/video/omap2/displays-new/Kconfig
 create mode 100644 drivers/video/omap2/displays-new/Makefile
 create mode 100644 drivers/video/omap2/displays-new/connector-analog-tv.c
 create mode 100644 drivers/video/omap2/displays-new/connector-dvi.c
 create mode 100644 drivers/video/omap2/displays-new/connector-hdmi.c
 create mode 100644 drivers/video/omap2/displays-new/encoder-tfp410.c
 create mode 100644 drivers/video/omap2/displays-new/encoder-tpd12s015.c
 create mode 100644 drivers/video/omap2/displays-new/panel-dpi.c
 create mode 100644 drivers/video/omap2/displays-new/panel-dsi-cm.c
 create mode 100644 drivers/video/omap2/displays-new/panel-lgphilips-lb035q02.c
 create mode 100644 drivers/video/omap2/displays-new/panel-nec-nl8048hl11.c
 create mode 100644 drivers/video/omap2/displays-new/panel-sharp-ls037v7dw01.c
 create mode 100644 drivers/video/omap2/displays-new/panel-sony-acx565akm.c
 create mode 100644 drivers/video/omap2/displays-new/panel-tpo-td043mtea1.c
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
$ git merge --no-ff viafb/viafb-next
Already up-to-date.
Merging omap_dss2/for-next (e72b753 fbdev/ps3fb: fix compile warning)
$ git merge --no-ff omap_dss2/for-next
Merge made by the 'recursive' strategy.
Merging regulator/for-next (37c3f01 Merge remote-tracking branch 'regulator/fix/sec' into regulator-linus)
$ git merge --no-ff regulator/for-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/regulator/max8997-regulator.txt    |  2 +-
 .../devicetree/bindings/regulator/s5m8767-regulator.txt    | 14 +++++++-------
 MAINTAINERS                                                |  2 +-
 drivers/regulator/s2mps11.c                                |  7 ++++++-
 include/linux/mfd/samsung/s2mps11.h                        |  1 +
 5 files changed, 16 insertions(+), 10 deletions(-)
Merging security/next (572e5b0 tpm/tpm_i2c_infineon: Remove unused header file)
$ git merge --no-ff security/next
Already up-to-date.
Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
$ git merge --no-ff selinux/master
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging lblnet/master (5bfd379 selinux: remove the BUG_ON() from selinux_skb_xfrm_sid())
$ git merge --no-ff lblnet/master
Auto-merging security/selinux/hooks.c
Auto-merging security/security.c
Auto-merging security/capability.c
Auto-merging include/linux/security.h
Merge made by the 'recursive' strategy.
 include/linux/security.h        |  26 ++-
 security/capability.c           |  15 +-
 security/security.c             |  13 +-
 security/selinux/hooks.c        |  11 +-
 security/selinux/include/xfrm.h |  45 ++--
 security/selinux/netnode.c      |   2 +
 security/selinux/xfrm.c         | 453 ++++++++++++++++++----------------------
 7 files changed, 264 insertions(+), 301 deletions(-)
Merging watchdog/master (5a94250 Watchdog: fix clearing of the watchdog interrupt)
$ git merge --no-ff watchdog/master
Auto-merging drivers/watchdog/s3c2410_wdt.c
Removing drivers/watchdog/mpcore_wdt.c
Auto-merging drivers/watchdog/Makefile
Auto-merging drivers/watchdog/Kconfig
Auto-merging arch/arm/mach-kirkwood/include/mach/bridge-regs.h
Merge made by the 'recursive' strategy.
 .../bindings/watchdog/brcm,bcm2835-pm-wdog.txt     |   5 +
 Documentation/watchdog/watchdog-parameters.txt     |   8 -
 arch/arm/configs/spear13xx_defconfig               |   1 -
 arch/arm/mach-dove/include/mach/bridge-regs.h      |   1 +
 arch/arm/mach-kirkwood/include/mach/bridge-regs.h  |   2 -
 arch/arm/mach-orion5x/include/mach/bridge-regs.h   |   3 -
 drivers/watchdog/Kconfig                           |  22 +-
 drivers/watchdog/Makefile                          |   2 +-
 drivers/watchdog/at32ap700x_wdt.c                  |  17 +-
 drivers/watchdog/bcm2835_wdt.c                     | 189 +++++++++
 drivers/watchdog/bcm63xx_wdt.c                     |   9 +-
 drivers/watchdog/cpwd.c                            |   4 +-
 drivers/watchdog/da9052_wdt.c                      |   4 +-
 drivers/watchdog/da9055_wdt.c                      |   4 +-
 drivers/watchdog/dw_wdt.c                          |  11 +-
 drivers/watchdog/imx2_wdt.c                        |   6 +-
 drivers/watchdog/jz4740_wdt.c                      |   2 +-
 drivers/watchdog/mpcore_wdt.c                      | 456 ---------------------
 drivers/watchdog/mtx-1_wdt.c                       |   3 +-
 drivers/watchdog/mv64x60_wdt.c                     |   4 +-
 drivers/watchdog/nuc900_wdt.c                      |  50 +--
 drivers/watchdog/of_xilinx_wdt.c                   |  31 +-
 drivers/watchdog/orion_wdt.c                       |   7 +-
 drivers/watchdog/pnx4008_wdt.c                     |   7 +-
 drivers/watchdog/rc32434_wdt.c                     |  10 +-
 drivers/watchdog/riowd.c                           |  12 +-
 drivers/watchdog/s3c2410_wdt.c                     |  20 +-
 drivers/watchdog/shwdt.c                           |  18 +-
 drivers/watchdog/sp805_wdt.c                       |   7 +-
 drivers/watchdog/ts72xx_wdt.c                      |  67 +--
 drivers/watchdog/twl4030_wdt.c                     |   5 +-
 drivers/watchdog/watchdog_dev.c                    |   6 +-
 drivers/watchdog/wdrtas.c                          |  29 +-
 drivers/watchdog/wm831x_wdt.c                      |  21 +-
 34 files changed, 308 insertions(+), 735 deletions(-)
 create mode 100644 drivers/watchdog/bcm2835_wdt.c
 delete mode 100644 drivers/watchdog/mpcore_wdt.c
Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage)
$ git merge --no-ff dwmw2-iommu/master
Already up-to-date.
Merging iommu/next (01ce784 Merge branches 'x86/vt-d', 'arm/omap', 'core', 'x86/amd' and 'arm/smmu' into next)
$ git merge --no-ff iommu/next
Resolved 'drivers/iommu/Kconfig' using previous resolution.
Auto-merging drivers/iommu/Kconfig
CONFLICT (content): Merge conflict in drivers/iommu/Kconfig
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 82d5d38] Merge remote-tracking branch 'iommu/next'
$ git diff -M --stat --summary HEAD^..
 .../devicetree/bindings/iommu/arm,smmu.txt         |   70 +
 MAINTAINERS                                        |    6 +
 drivers/iommu/Kconfig                              |   13 +
 drivers/iommu/Makefile                             |    1 +
 drivers/iommu/amd_iommu.c                          |  104 +-
 drivers/iommu/arm-smmu.c                           | 1969 ++++++++++++++++++++
 drivers/iommu/dmar.c                               |    4 +
 drivers/iommu/intel-iommu.c                        |   25 +-
 drivers/iommu/intel_irq_remapping.c                |    3 +-
 drivers/iommu/iommu.c                              |   86 +-
 drivers/iommu/omap-iommu.c                         |   15 +-
 drivers/iommu/omap-iopgtable.h                     |    2 +-
 drivers/iommu/omap-iovmm.c                         |    4 +-
 13 files changed, 2212 insertions(+), 90 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/iommu/arm,smmu.txt
 create mode 100644 drivers/iommu/arm-smmu.c
Merging vfio/next (8d38ef1 vfio/type1: Fix leak on error path)
$ git merge --no-ff vfio/next
Auto-merging include/uapi/linux/vfio.h
Auto-merging drivers/vfio/vfio.c
Auto-merging Documentation/vfio.txt
Merge made by the 'recursive' strategy.
 Documentation/vfio.txt          |   6 +-
 drivers/vfio/vfio.c             |  14 +
 drivers/vfio/vfio_iommu_type1.c | 626 +++++++++++++++++++++++++---------------
 include/uapi/linux/vfio.h       |   8 +-
 4 files changed, 424 insertions(+), 230 deletions(-)
Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error)
$ git merge --no-ff osd/linux-next
Already up-to-date.
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
$ git merge --no-ff jc_docs/docs-next
Already up-to-date.
Merging trivial/for-next (83a35e3 treewide: relase -> release)
$ git merge --no-ff trivial/for-next
Already up-to-date.
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
$ git merge --no-ff audit/for-next
Already up-to-date.
Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls)
$ git merge --no-ff fsnotify/for-next
Already up-to-date.
Merging edac/linux_next (de4772c edac: sb_edac.c should not require prescence of IMC_DDRIO device)
$ git merge --no-ff edac/linux_next
Already up-to-date.
Merging edac-amd/for-next (aad19e5 EDAC, MCE, AMD: Add an MCE signature for new Fam15h models)
$ git merge --no-ff edac-amd/for-next
Already up-to-date.
Merging devicetree/devicetree/next (6dd18e4 of: Fix address decoding on Bimini and js2x machines)
$ git merge --no-ff devicetree/devicetree/next
Already up-to-date.
Merging dt-rh/for-next (d683b96 Linux 3.10-rc4)
$ git merge --no-ff dt-rh/for-next
Already up-to-date.
Merging spi/spi/next (00ab539 spi/s3c64xx: let device core setup the default pin configuration)
$ git merge --no-ff spi/spi/next
Already up-to-date.
Merging spi-mb/for-next (ed89355 Merge remote-tracking branch 'spi/topic/xilinx' into spi-next)
$ git merge --no-ff spi-mb/for-next
Already up-to-date.
Merging tip/auto-latest (6bc8853 Merge branch 'x86/uv')
$ git merge --no-ff tip/auto-latest
Resolved 'arch/arm/kernel/Makefile' using previous resolution.
Resolved 'arch/arm/mach-integrator/integrator_ap.c' using previous resolution.
Resolved 'arch/arm/mach-u300/timer.c' using previous resolution.
Resolved 'arch/x86/xen/time.c' using previous resolution.
Resolved 'drivers/clocksource/dw_apb_timer_of.c' using previous resolution.
Auto-merging kernel/time/sched_clock.c
Auto-merging kernel/hrtimer.c
Auto-merging init/main.c
Auto-merging init/Kconfig
Auto-merging include/linux/ktime.h
Auto-merging include/linux/dw_apb_timer.h
Auto-merging drivers/xen/manage.c
Auto-merging drivers/clocksource/nomadik-mtu.c
Auto-merging drivers/clocksource/dw_apb_timer_of.c
CONFLICT (content): Merge conflict in drivers/clocksource/dw_apb_timer_of.c
Auto-merging drivers/clocksource/clksrc-dbx500-prcmu.c
Auto-merging drivers/clocksource/Kconfig
Auto-merging arch/x86/xen/time.c
CONFLICT (content): Merge conflict in arch/x86/xen/time.c
Auto-merging arch/arm/mach-u300/timer.c
CONFLICT (content): Merge conflict in arch/arm/mach-u300/timer.c
Auto-merging arch/arm/mach-omap2/timer.c
Auto-merging arch/arm/mach-ixp4xx/common.c
Auto-merging arch/arm/mach-integrator/integrator_ap.c
CONFLICT (content): Merge conflict in arch/arm/mach-integrator/integrator_ap.c
Auto-merging arch/arm/kernel/Makefile
CONFLICT (content): Merge conflict in arch/arm/kernel/Makefile
Auto-merging arch/arm/Kconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 6a72bdf] Merge remote-tracking branch 'tip/auto-latest'
$ git diff -M --stat --summary HEAD^..
 .../devicetree/bindings/timer/lsi,zevio-timer.txt  |  33 +++
 arch/arm/Kconfig                                   |   1 +
 arch/arm/common/timer-sp.c                         |   2 +-
 arch/arm/include/asm/sched_clock.h                 |  18 +-
 arch/arm/kernel/Makefile                           |   2 +-
 arch/arm/kernel/arch_timer.c                       |   2 +-
 arch/arm/kernel/time.c                             |   4 +-
 arch/arm/mach-davinci/time.c                       |   2 +-
 arch/arm/mach-imx/time.c                           |   2 +-
 arch/arm/mach-integrator/integrator_ap.c           |   2 +-
 arch/arm/mach-ixp4xx/common.c                      |   2 +-
 arch/arm/mach-mmp/time.c                           |   2 +-
 arch/arm/mach-msm/timer.c                          |   2 +-
 arch/arm/mach-omap1/time.c                         |   2 +-
 arch/arm/mach-omap2/timer.c                        |   2 +-
 arch/arm/mach-pxa/time.c                           |   2 +-
 arch/arm/mach-sa1100/time.c                        |   2 +-
 arch/arm/mach-u300/timer.c                         |   2 +-
 arch/arm/plat-iop/time.c                           |   2 +-
 arch/arm/plat-omap/counter_32k.c                   |   2 +-
 arch/arm/plat-orion/time.c                         |   2 +-
 arch/arm/plat-samsung/samsung-time.c               |   2 +-
 arch/arm/plat-versatile/sched-clock.c              |   2 +-
 arch/x86/include/asm/mc146818rtc.h                 |   4 +-
 arch/x86/include/asm/mrst-vrtc.h                   |   4 +-
 arch/x86/include/asm/x86_init.h                    |   6 +-
 arch/x86/kernel/kvmclock.c                         |   9 +-
 arch/x86/kernel/rtc.c                              |  17 +-
 arch/x86/kernel/smp.c                              |  29 ++-
 arch/x86/lguest/boot.c                             |   4 +-
 arch/x86/platform/efi/efi.c                        |  10 +-
 arch/x86/platform/mrst/vrtc.c                      |  11 +-
 arch/x86/xen/time.c                                |  58 +++--
 drivers/clocksource/Kconfig                        |   5 +
 drivers/clocksource/Makefile                       |   3 +
 drivers/clocksource/bcm2835_timer.c                |   2 +-
 drivers/clocksource/clksrc-dbx500-prcmu.c          |   3 +-
 drivers/clocksource/dummy_timer.c                  |  69 ++++++
 drivers/clocksource/dw_apb_timer.c                 |  12 -
 drivers/clocksource/dw_apb_timer_of.c              |   6 +-
 drivers/clocksource/mxs_timer.c                    |   2 +-
 drivers/clocksource/nomadik-mtu.c                  |   2 +-
 drivers/clocksource/samsung_pwm_timer.c            |   2 +-
 drivers/clocksource/tegra20_timer.c                |   2 +-
 drivers/clocksource/time-armada-370-xp.c           |   2 +-
 drivers/clocksource/timer-marco.c                  |   2 +-
 drivers/clocksource/timer-prima2.c                 |   2 +-
 drivers/clocksource/vf_pit_timer.c                 | 194 +++++++++++++++
 drivers/clocksource/zevio-timer.c                  | 215 ++++++++++++++++
 drivers/xen/manage.c                               |   3 -
 fs/timerfd.c                                       | 131 ++++++++--
 include/linux/alarmtimer.h                         |   4 +
 include/linux/clockchips.h                         |   5 +-
 include/linux/clocksource.h                        |   7 +-
 include/linux/dw_apb_timer.h                       |   1 -
 include/linux/efi.h                                |   4 +-
 include/linux/ktime.h                              |  10 +-
 include/linux/pvclock_gtod.h                       |   7 +
 include/linux/sched_clock.h                        |  21 ++
 init/Kconfig                                       |   3 +
 init/main.c                                        |   2 +
 kernel/hrtimer.c                                   |  15 +-
 kernel/printk.c                                    |   2 +-
 kernel/time/Makefile                               |   2 +
 kernel/time/alarmtimer.c                           |  47 +++-
 kernel/time/clockevents.c                          | 271 ++++++++++++++++++---
 kernel/time/clocksource.c                          | 209 ++++++++++++----
 {arch/arm/kernel => kernel/time}/sched_clock.c     |  17 +-
 kernel/time/tick-broadcast.c                       |  33 ++-
 kernel/time/tick-common.c                          | 194 ++++++---------
 kernel/time/tick-internal.h                        |  17 +-
 kernel/time/timekeeping.c                          |  65 +++--
 kernel/time/timekeeping_debug.c                    |  72 ++++++
 kernel/time/timekeeping_internal.h                 |  14 ++
 kernel/timer.c                                     |   8 +-
 75 files changed, 1524 insertions(+), 409 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/timer/lsi,zevio-timer.txt
 create mode 100644 drivers/clocksource/dummy_timer.c
 create mode 100644 drivers/clocksource/vf_pit_timer.c
 create mode 100644 drivers/clocksource/zevio-timer.c
 create mode 100644 include/linux/sched_clock.h
 rename {arch/arm/kernel => kernel/time}/sched_clock.c (94%)
 create mode 100644 kernel/time/timekeeping_debug.c
 create mode 100644 kernel/time/timekeeping_internal.h
Merging ftrace/for-next (dcc3022 tracing: Make tracing_open_generic_{tr,tc}() static)
$ git merge --no-ff ftrace/for-next
Auto-merging kernel/trace/trace.h
Auto-merging kernel/trace/trace.c
Auto-merging kernel/sysctl.c
Auto-merging Documentation/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 Documentation/kernel-parameters.txt |  13 ++
 Documentation/trace/events.txt      |  15 +-
 Documentation/trace/ftrace.txt      |  13 ++
 include/linux/ftrace.h              |   9 +-
 include/trace/syscall.h             |   1 +
 kernel/panic.c                      |   3 +
 kernel/sysctl.c                     |   7 +
 kernel/trace/ftrace.c               |  38 +++-
 kernel/trace/trace.c                | 338 ++++++++++++++++++++++++++++--------
 kernel/trace/trace.h                |  17 +-
 kernel/trace/trace_events.c         | 166 ++++++++++++++----
 kernel/trace/trace_events_filter.c  |   6 +
 kernel/trace/trace_functions.c      | 103 ++++++++++-
 kernel/trace/trace_irqsoff.c        |   4 +-
 kernel/trace/trace_kprobe.c         | 190 +++++++-------------
 kernel/trace/trace_selftest.c       |  18 +-
 kernel/trace/trace_syscalls.c       |  21 ++-
 kernel/trace/trace_uprobe.c         |   4 +-
 18 files changed, 694 insertions(+), 272 deletions(-)
Merging rcu/rcu/next (be77f87 Merge branches 'cbnum.2013.06.10a', 'doc.2013.06.10a', 'fixes.2013.06.10a', 'srcu.2013.06.10a' and 'tiny.2013.06.10a' into HEAD)
$ git merge --no-ff rcu/rcu/next
Already up-to-date.
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
$ git merge --no-ff cputime/cputime
Already up-to-date.
Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
$ git merge --no-ff uprobes/for-next
Already up-to-date.
Merging kvm/linux-next (03617c1 KVM: VMX: mark unusable segment as nonpresent)
$ git merge --no-ff kvm/linux-next
Merge made by the 'recursive' strategy.
 arch/arm64/Kconfig              |  2 ++
 arch/arm64/kernel/asm-offsets.c |  1 +
 arch/arm64/kvm/Kconfig          | 51 +++++++++++++++++++++++++++++++++++++++++
 arch/x86/kvm/vmx.c              | 11 +++++++--
 4 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm64/kvm/Kconfig
Merging kvm-arm/kvm-arm-next (8bd4ffd ARM: kvm: don't include drivers/virtio/Kconfig)
$ git merge --no-ff kvm-arm/kvm-arm-next
Already up-to-date.
Merging kvm-ppc/kvm-ppc-next (a3ff5fb KVM: PPC: Ignore PIR writes)
$ git merge --no-ff kvm-ppc/kvm-ppc-next
Already up-to-date.
Merging oprofile/for-next (f722406 Linux 3.10-rc1)
$ git merge --no-ff oprofile/for-next
Already up-to-date.
Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work)
$ git merge --no-ff fw-nohz/nohz/next
Already up-to-date.
Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
$ git merge --no-ff xen/upstream/xen
Already up-to-date.
Merging xen-two/linux-next (21f3c04 Merge branch 'stable/for-linus-3.11' into linux-next)
$ git merge --no-ff xen-two/linux-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging xen-arm/linux-next (176455e xen/arm and xen/arm64: implement HYPERVISOR_tmem_op)
$ git merge --no-ff xen-arm/linux-next
Merge made by the 'recursive' strategy.
 arch/arm/include/asm/xen/hypercall.h | 1 +
 arch/arm/xen/enlighten.c             | 1 +
 arch/arm/xen/hypercall.S             | 1 +
 arch/arm64/xen/hypercall.S           | 1 +
 4 files changed, 4 insertions(+)
Merging percpu/for-next (a424445 percpu-refcount: use RCU-sched insted of normal RCU)
$ git merge --no-ff percpu/for-next
Already up-to-date.
Merging workqueues/for-next (bbe2a23 Merge branch 'for-3.10-fixes' into for-next)
$ git merge --no-ff workqueues/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging drivers-x86/linux-next (a1ec56e Add support for fan button on Ideapad Z580)
$ git merge --no-ff drivers-x86/linux-next
Already up-to-date.
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
$ git merge --no-ff hwpoison/hwpoison
Already up-to-date.
Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
$ git merge --no-ff sysctl/master
Already up-to-date.
Merging regmap/for-next (f2e055e regmap: cache: bail in regmap_async_complete() for bus-less maps)
$ git merge --no-ff regmap/for-next
Auto-merging drivers/base/regmap/regmap.c
Merge made by the 'recursive' strategy.
 drivers/base/regmap/regmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
$ git merge --no-ff hsi/for-next
Already up-to-date.
Merging leds/for-next (cf3b1c2 leds: mc13783: Fix "uninitialized variable" warning)
$ git merge --no-ff leds/for-next
Already up-to-date.
Merging driver-core/driver-core-next (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core)
$ git merge --no-ff driver-core/driver-core-next
Already up-to-date.
Merging tty/tty-next (828c6a1 Revert "serial: 8250_pci: add support for another kind of NetMos Technology PCI 9835 Multi-I/O Controller")
$ git merge --no-ff tty/tty-next
Already up-to-date.
Merging usb/usb-next (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core)
$ git merge --no-ff usb/usb-next
Already up-to-date.
Merging usb-gadget/next (b1fd6cb usb: dwc3: omap: Adds dwc3_omap_readl/writel wrappers)
$ git merge --no-ff usb-gadget/next
Already up-to-date.
Merging staging/staging-next (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core)
$ git merge --no-ff staging/staging-next
Already up-to-date.
Merging char-misc/char-misc-next (fc76a25 Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core)
$ git merge --no-ff char-misc/char-misc-next
Already up-to-date.
Merging scsi/for-next (082af1e Merge branch 'misc' into for-next)
$ git merge --no-ff scsi/for-next
Merge made by the 'recursive' strategy.
 drivers/scsi/storvsc_drv.c | 139 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 134 insertions(+), 5 deletions(-)
Merging target-updates/for-next (775d722 iser-target: Add support for ISCSI_OP_TEXT opcode + payload handling)
$ git merge --no-ff target-updates/for-next
Auto-merging drivers/target/iscsi/iscsi_target_nego.c
Auto-merging drivers/target/iscsi/iscsi_target_erl0.c
Auto-merging drivers/target/iscsi/iscsi_target_configfs.c
Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c
Auto-merging drivers/infiniband/ulp/isert/ib_isert.c
Merge made by the 'recursive' strategy.
 drivers/infiniband/ulp/isert/ib_isert.c        | 254 +++++++--
 drivers/infiniband/ulp/isert/ib_isert.h        |   5 +-
 drivers/scsi/qla2xxx/qla_target.c              | 151 +----
 drivers/scsi/qla2xxx/tcm_qla2xxx.c             |   6 +-
 drivers/target/iscsi/iscsi_target.c            | 744 +++++++++++++------------
 drivers/target/iscsi/iscsi_target.h            |   2 +-
 drivers/target/iscsi/iscsi_target_configfs.c   | 126 +++++
 drivers/target/iscsi/iscsi_target_core.h       |  11 +-
 drivers/target/iscsi/iscsi_target_erl0.c       |   7 +-
 drivers/target/iscsi/iscsi_target_erl1.c       |  26 +-
 drivers/target/iscsi/iscsi_target_nego.c       |  13 +-
 drivers/target/iscsi/iscsi_target_parameters.c |   3 -
 drivers/target/iscsi/iscsi_target_util.c       |  27 +-
 drivers/target/iscsi/iscsi_target_util.h       |   3 +-
 drivers/target/target_core_configfs.c          |  13 +-
 drivers/target/target_core_device.c            |   5 +-
 drivers/target/target_core_fabric_configfs.c   |  21 +-
 drivers/target/target_core_pr.c                | 499 ++++++-----------
 drivers/target/target_core_pr.h                |   2 +-
 drivers/target/target_core_rd.c                |   5 +
 drivers/target/target_core_sbc.c               |  18 +-
 drivers/target/target_core_tmr.c               |  12 +-
 drivers/target/target_core_transport.c         |  87 ++-
 drivers/vhost/scsi.c                           |  33 +-
 include/target/iscsi/iscsi_transport.h         |  17 +-
 include/target/target_core_base.h              |  10 +-
 include/target/target_core_configfs.h          |   1 +
 include/target/target_core_fabric_configfs.h   |  11 +
 include/trace/events/target.h                  | 214 +++++++
 29 files changed, 1314 insertions(+), 1012 deletions(-)
 create mode 100644 include/trace/events/target.h
Merging target-merge/for-next-merge (317ddd2 Linux 3.10-rc5)
$ git merge --no-ff target-merge/for-next-merge
Already up-to-date.
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
$ git merge --no-ff ibft/linux-next
Already up-to-date.
Merging isci/all (6734092 isci: add a couple __iomem annotations)
$ git merge --no-ff isci/all
Already up-to-date.
Merging bcon/master (e284f34 netconsole: s/syslogd/cancd/ in documentation)
$ git merge --no-ff bcon/master
Resolved 'drivers/block/Kconfig' using previous resolution.
Auto-merging kernel/printk.c
Auto-merging init/do_mounts.c
Auto-merging include/linux/mount.h
Auto-merging include/linux/console.h
Auto-merging drivers/net/netconsole.c
Auto-merging drivers/block/Makefile
Auto-merging drivers/block/Kconfig
CONFLICT (content): Merge conflict in drivers/block/Kconfig
Auto-merging block/partitions/check.h
Auto-merging block/partitions/check.c
Auto-merging Documentation/networking/netconsole.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 579607c] Merge remote-tracking branch 'bcon/master'
$ git diff -M --stat --summary HEAD^..
 Documentation/block/blockconsole.txt            |  94 ++++
 Documentation/block/blockconsole/bcon_tail      |  82 ++++
 Documentation/block/blockconsole/mkblockconsole |  29 ++
 Documentation/networking/netconsole.txt         |  16 +-
 block/partitions/Makefile                       |   1 +
 block/partitions/blockconsole.c                 |  22 +
 block/partitions/check.c                        |   3 +
 block/partitions/check.h                        |   3 +
 drivers/block/Kconfig                           |   6 +
 drivers/block/Makefile                          |   1 +
 drivers/block/blockconsole.c                    | 618 ++++++++++++++++++++++++
 drivers/net/netconsole.c                        |   2 +-
 include/linux/blockconsole.h                    |   7 +
 include/linux/console.h                         |   1 +
 include/linux/mount.h                           |   2 +-
 init/do_mounts.c                                |   2 +-
 kernel/printk.c                                 |   5 +-
 17 files changed, 885 insertions(+), 9 deletions(-)
 create mode 100644 Documentation/block/blockconsole.txt
 create mode 100755 Documentation/block/blockconsole/bcon_tail
 create mode 100755 Documentation/block/blockconsole/mkblockconsole
 create mode 100644 block/partitions/blockconsole.c
 create mode 100644 drivers/block/blockconsole.c
 create mode 100644 include/linux/blockconsole.h
Merging tmem/linux-next (8f0d816 Linux 3.7-rc3)
$ git merge --no-ff tmem/linux-next
Already up-to-date.
Merging writeback/writeback-for-next (ed84825 Negative (setpoint-dirty) in bdi_position_ratio())
$ git merge --no-ff writeback/writeback-for-next
Already up-to-date.
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
$ git merge --no-ff arm-dt/devicetree/arm-next
Already up-to-date.
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
$ git merge --no-ff hwspinlock/linux-next
Already up-to-date.
Merging pinctrl/for-next (5b81d55 pinctrl: remove bindings for pinconf options needing more thought)
$ git merge --no-ff pinctrl/for-next
Already up-to-date.
Merging vhost/linux-next (f722406 Linux 3.10-rc1)
$ git merge --no-ff vhost/linux-next
Already up-to-date.
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
$ git merge --no-ff memblock/memblock-kill-early_node_map
Already up-to-date.
Merging remoteproc/for-next (b977785 remoteproc: fix kconfig dependencies for VIRTIO)
$ git merge --no-ff remoteproc/for-next
Already up-to-date.
Merging rpmsg/for-next (397944d rpmsg: fix kconfig dependencies for VIRTIO)
$ git merge --no-ff rpmsg/for-next
Already up-to-date.
Merging irqdomain/irqdomain/next (798f0fd irq: fix checkpatch error)
$ git merge --no-ff irqdomain/irqdomain/next
Resolved 'kernel/irq/irqdomain.c' using previous resolution.
Auto-merging kernel/irq/irqdomain.c
CONFLICT (content): Merge conflict in kernel/irq/irqdomain.c
Auto-merging kernel/irq/generic-chip.c
Auto-merging arch/powerpc/platforms/powermac/smp.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master e051206] Merge remote-tracking branch 'irqdomain/irqdomain/next'
$ git diff -M --stat --summary HEAD^..
 arch/powerpc/platforms/cell/beat_interrupt.c |   2 +-
 arch/powerpc/platforms/powermac/smp.c        |   2 +-
 arch/x86/kernel/devicetree.c                 |   4 +-
 include/linux/irqdomain.h                    | 142 +++----
 kernel/irq/generic-chip.c                    |   6 +-
 kernel/irq/irqdomain.c                       | 579 +++++++++------------------
 kernel/irq/proc.c                            |   2 +
 7 files changed, 264 insertions(+), 473 deletions(-)
Merging gpio/gpio/next (644c8df gpio: sx150x: convert to use devm_* functions)
$ git merge --no-ff gpio/gpio/next
Already up-to-date.
Merging gpio-lw/for-next (69acf2e Merge branch 'merge' into for-next)
$ git merge --no-ff gpio-lw/for-next
Merge made by the 'recursive' strategy.
 drivers/gpio/gpio-omap.c | 84 ++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 70 insertions(+), 14 deletions(-)
Merging arm-soc/for-next (f99d90e arm-soc: add back contents.txt file)
$ git merge --no-ff arm-soc/for-next
Merge made by the 'recursive' strategy.
 arch/arm/arm-soc-for-next-contents.txt | 345 +++++++++++++++++++++++++++++++++
 arch/arm/configs/multi_v7_defconfig    | 121 +++++++++---
 2 files changed, 438 insertions(+), 28 deletions(-)
 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
Merging bcm2835/for-next (7d13205 Linux 3.10-rc6)
$ git merge --no-ff bcm2835/for-next
Already up-to-date.
Merging cortex/for-next (3ad87ac ARM: ARMv7-M: Fix name of NVIC handler function)
$ git merge --no-ff cortex/for-next
Merge made by the 'recursive' strategy.
 arch/arm/kernel/entry-v7m.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging ep93xx/ep93xx-for-next (7ec4429 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
$ git merge --no-ff ep93xx/ep93xx-for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging imx-mxs/for-next (0fe2ea9 Merge branches 'mxs/dt', 'imx/weim', 'imx/soc', 'imx/fixes' and 'imx/dt' into for-next)
$ git merge --no-ff imx-mxs/for-next
Auto-merging drivers/bus/Kconfig
Auto-merging arch/arm/mach-mxs/mach-mxs.c
Auto-merging arch/arm/boot/dts/imx6q.dtsi
Auto-merging arch/arm/boot/dts/imx6dl.dtsi
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/bus/imx-weim.txt |  17 ++-
 .../devicetree/bindings/clock/imx27-clock.txt      |   1 +
 arch/arm/boot/dts/Makefile                         |   4 +
 arch/arm/boot/dts/imx25.dtsi                       |  21 ++-
 arch/arm/boot/dts/imx27-apf27dev.dts               |   5 +
 arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts   |  62 +++++++++
 arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts   |  72 ++++++++++
 arch/arm/boot/dts/imx27-phytec-phycore-som.dts     |   2 +-
 arch/arm/boot/dts/imx27.dtsi                       |  96 ++++++++++---
 arch/arm/boot/dts/imx28-cfa10036.dts               |   7 +-
 arch/arm/boot/dts/imx28-cfa10037.dts               |  19 ++-
 arch/arm/boot/dts/imx28-cfa10049.dts               |  73 ++++++++--
 arch/arm/boot/dts/imx28-cfa10055.dts               |  38 ++----
 arch/arm/boot/dts/imx28-cfa10056.dts               | 119 +++++++++++++++++
 arch/arm/boot/dts/imx28-cfa10057.dts               |  23 +---
 arch/arm/boot/dts/imx28-cfa10058.dts               | 141 ++++++++++++++++++++
 arch/arm/boot/dts/imx31.dtsi                       |   7 +
 arch/arm/boot/dts/imx51-babbage.dts                |   1 +
 arch/arm/boot/dts/imx51.dtsi                       |  76 +++++++++--
 arch/arm/boot/dts/imx53-qsb.dts                    |   4 +
 arch/arm/boot/dts/imx53.dtsi                       |  67 +++++++---
 arch/arm/boot/dts/imx6dl.dtsi                      | 148 ++++++++++++++++++++-
 arch/arm/boot/dts/imx6q.dtsi                       |  11 +-
 arch/arm/boot/dts/imx6qdl-sabresd.dtsi             |  16 +++
 arch/arm/boot/dts/imx6qdl.dtsi                     |  33 +++--
 arch/arm/configs/imx_v6_v7_defconfig               |   7 +
 arch/arm/mach-imx/clk-imx6q.c                      |   2 +-
 arch/arm/mach-imx/mach-imx6q.c                     |  65 ++++++++-
 arch/arm/mach-imx/mx27.h                           |   2 +-
 arch/arm/mach-mxs/mach-mxs.c                       |   5 +-
 drivers/bus/Kconfig                                |   3 +-
 drivers/bus/imx-weim.c                             | 129 ++++++++++--------
 include/linux/mfd/syscon/imx6q-iomuxc-gpr.h        |  16 +--
 33 files changed, 1080 insertions(+), 212 deletions(-)
 create mode 100644 arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts
 create mode 100644 arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts
 create mode 100644 arch/arm/boot/dts/imx28-cfa10056.dts
 create mode 100644 arch/arm/boot/dts/imx28-cfa10058.dts
Merging ixp4xx/next (19f949f Linux 3.8)
$ git merge --no-ff ixp4xx/next
Already up-to-date.
Merging msm/for-next (d701eda ARM: dts: msm: Fix merge resolution)
$ git merge --no-ff msm/for-next
Merge made by the 'recursive' strategy.
Merging mvebu/for-next (04864c6 Merge branch 'mvebu/regmap' into for-next)
$ git merge --no-ff mvebu/for-next
Resolved 'arch/arm/boot/dts/kirkwood-6281.dtsi' using previous resolution.
Auto-merging arch/arm/boot/dts/kirkwood-6281.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/kirkwood-6281.dtsi
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 9577139] Merge remote-tracking branch 'mvebu/for-next'
$ git diff -M --stat --summary HEAD^..
Merging renesas/next (c5cf440 Merge branch 'heads/phy-rcar-usb' into next)
$ git merge --no-ff renesas/next
Resolved 'arch/arm/mach-shmobile/Kconfig' using previous resolution.
Resolved 'arch/arm/mach-shmobile/board-bockw.c' using previous resolution.
Resolved 'arch/arm/mach-shmobile/clock-r8a7778.c' using previous resolution.
Resolved 'arch/arm/mach-shmobile/include/mach/r8a7778.h' using previous resolution.
Auto-merging arch/arm/mach-shmobile/setup-r8a7778.c
Auto-merging arch/arm/mach-shmobile/include/mach/r8a7778.h
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/include/mach/r8a7778.h
Auto-merging arch/arm/mach-shmobile/clock-r8a7778.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/clock-r8a7778.c
Auto-merging arch/arm/mach-shmobile/board-bockw.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-bockw.c
Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c
Auto-merging arch/arm/mach-shmobile/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Kconfig
Auto-merging arch/arm/boot/dts/Makefile
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master a5e7311] Merge remote-tracking branch 'renesas/next'
$ git diff -M --stat --summary HEAD^..
 arch/arm/boot/compressed/head-shmobile.S       |  43 ++-
 arch/arm/boot/dts/Makefile                     |   1 +
 arch/arm/boot/dts/emev2-kzm9d.dts              |   2 +-
 arch/arm/boot/dts/emev2.dtsi                   |  59 ++++
 arch/arm/boot/dts/r8a73a4-ape6evm.dts          |  22 ++
 arch/arm/boot/dts/r8a73a4.dtsi                 |  81 ++++++
 arch/arm/boot/dts/r8a7790-lager-reference.dts  |  31 ++
 arch/arm/mach-shmobile/Kconfig                 |  15 +-
 arch/arm/mach-shmobile/Makefile                |   1 +
 arch/arm/mach-shmobile/Makefile.boot           |   1 +
 arch/arm/mach-shmobile/board-ape6evm.c         |   3 +-
 arch/arm/mach-shmobile/board-armadillo800eva.c |  11 +-
 arch/arm/mach-shmobile/board-kzm9d.c           |   4 +-
 arch/arm/mach-shmobile/board-kzm9g-reference.c |   2 -
 arch/arm/mach-shmobile/board-lager-reference.c |  46 +++
 arch/arm/mach-shmobile/board-lager.c           |   3 +-
 arch/arm/mach-shmobile/clock-emev2.c           |  18 --
 arch/arm/mach-shmobile/clock-r8a73a4.c         | 199 ++++++++++++-
 arch/arm/mach-shmobile/clock-r8a7790.c         |  12 +-
 arch/arm/mach-shmobile/include/mach/emev2.h    |   4 +-
 arch/arm/mach-shmobile/include/mach/r8a73a4.h  |   1 +
 arch/arm/mach-shmobile/include/mach/r8a7740.h  |   2 +
 arch/arm/mach-shmobile/include/mach/r8a7790.h  |   2 +
 arch/arm/mach-shmobile/include/mach/zboot.h    |   2 -
 arch/arm/mach-shmobile/setup-emev2.c           | 376 +++++--------------------
 arch/arm/mach-shmobile/setup-r8a73a4.c         |  34 ++-
 arch/arm/mach-shmobile/setup-r8a7740.c         |  26 +-
 arch/arm/mach-shmobile/setup-r8a7778.c         |  35 +--
 arch/arm/mach-shmobile/setup-r8a7779.c         |   7 +-
 arch/arm/mach-shmobile/setup-r8a7790.c         |  55 +++-
 arch/arm/mach-shmobile/setup-sh7372.c          |   7 +-
 arch/arm/mach-shmobile/setup-sh73a0.c          |  34 +--
 arch/arm/mach-shmobile/smp-emev2.c             |  26 +-
 drivers/clocksource/sh_cmt.c                   |  50 +++-
 34 files changed, 737 insertions(+), 478 deletions(-)
 create mode 100644 arch/arm/boot/dts/r8a7790-lager-reference.dts
 create mode 100644 arch/arm/mach-shmobile/board-lager-reference.c
Merging samsung/for-next (65ef7e0 Merge tag 'soc-exynos5420-2' into for-next)
$ git merge --no-ff samsung/for-next
Resolved 'arch/arm/Kconfig' using previous resolution.
Auto-merging arch/arm/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 6359978] Merge remote-tracking branch 'samsung/for-next'
$ git diff -M --stat --summary HEAD^..
Merging tegra/for-next (7d13205 Linux 3.10-rc6)
$ git merge --no-ff tegra/for-next
Already up-to-date.
Merging dma-mapping/dma-mapping-next (1e3d09b ARM: dma: Drop __GFP_COMP for iommu dma memory allocations)
$ git merge --no-ff dma-mapping/dma-mapping-next
Auto-merging arch/arm/mm/dma-mapping.c
Merge made by the 'recursive' strategy.
 arch/arm/mm/dma-mapping.c | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)
Merging pwm/for-next (b388f15 pwm: pwm-tiehrpwm: Use clk_enable/disable instead clk_prepare/unprepare.)
$ git merge --no-ff pwm/for-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-class-pwm          |  79 ++++
 .../devicetree/bindings/pwm/nxp,pca9685-pwm.txt    |  27 ++
 Documentation/pwm.txt                              |  37 ++
 MAINTAINERS                                        |   4 +-
 drivers/pwm/Kconfig                                |  23 +
 drivers/pwm/Makefile                               |   3 +
 drivers/pwm/core.c                                 |  29 +-
 drivers/pwm/pwm-atmel-tcb.c                        |   5 +-
 drivers/pwm/pwm-bfin.c                             |   1 +
 drivers/pwm/pwm-imx.c                              |   1 +
 drivers/pwm/pwm-lpc32xx.c                          |   1 +
 drivers/pwm/pwm-mxs.c                              |   7 +-
 drivers/pwm/pwm-pca9685.c                          | 300 +++++++++++++
 drivers/pwm/pwm-puv3.c                             |   1 +
 drivers/pwm/pwm-renesas-tpu.c                      | 474 +++++++++++++++++++++
 drivers/pwm/pwm-spear.c                            |   1 +
 drivers/pwm/pwm-tegra.c                            |   1 +
 drivers/pwm/pwm-tiehrpwm.c                         |  13 +-
 drivers/pwm/sysfs.c                                | 352 +++++++++++++++
 include/linux/platform_data/pwm-renesas-tpu.h      |  16 +
 include/linux/pwm.h                                |  29 +-
 21 files changed, 1387 insertions(+), 17 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-class-pwm
 create mode 100644 Documentation/devicetree/bindings/pwm/nxp,pca9685-pwm.txt
 create mode 100644 drivers/pwm/pwm-pca9685.c
 create mode 100644 drivers/pwm/pwm-renesas-tpu.c
 create mode 100644 drivers/pwm/sysfs.c
 create mode 100644 include/linux/platform_data/pwm-renesas-tpu.h
Merging dma-buf/for-next (8bb495e Linux 3.10)
$ git merge --no-ff dma-buf/for-next
Already up-to-date.
Merging userns/for-next (78008c4 proc: Restrict mounting the proc filesystem)
$ git merge --no-ff userns/for-next
Auto-merging fs/proc/root.c
Merge made by the 'recursive' strategy.
 fs/proc/root.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Merging ktest/for-next (df5f7c6 ktest: Reset grub menu cache with different machines)
$ git merge --no-ff ktest/for-next
Already up-to-date.
Merging signal/for-next (20b4fb4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge --no-ff signal/for-next
Already up-to-date.
Merging clk/clk-next (45e3ec3 clk: tegra: fix ifdef for tegra_periph_reset_assert inline)
$ git merge --no-ff clk/clk-next
Already up-to-date.
Merging random/dev (b980955 random: fix locking dependency with the tasklist_lock)
$ git merge --no-ff random/dev
Already up-to-date.
Merging lzo-update/lzo-update (42b775a lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
$ git merge --no-ff 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 (af07484 ARM64: mm: THP support.)
$ git merge --no-ff arm64-hugepages/for-next/hugepages
Already up-to-date.
Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6)
Merging akpm-current/current (7f0ef02 Merge branch 'akpm' (updates from Andrew Morton))
$ git merge akpm-current/current
Already up-to-date.
$ 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: slab: fix init_lock_keys
Applying: drivers/platform/x86/intel_ips.c: convert to module_pci_driver
Applying: x86: make 'mem=' option to work for efi platform
Applying: audit: fix mq_open and mq_unlink to add the MQ root as a hidden parent audit_names record
Applying: kernel/auditfilter.c: fixing build warning
Applying: kernel/auditfilter.c: fix leak in audit_add_rule() error path
Applying: audit: Fix decimal constant description
Applying: drivers/pcmcia/pd6729.c: convert to module_pci_driver
Applying: drivers/pcmcia/yenta_socket.c: convert to module_pci_driver
Applying: drm/fb-helper: don't sleep for screen unblank when an oops is in progress
Applying: drm/cirrus: correct register values for 16bpp
Applying: drm/nouveau: make vga_switcheroo code depend on VGA_SWITCHEROO
Applying: drivers/video/acornfb.c: remove dead code
Applying: cyber2000fb: avoid palette corruption at higher clocks
Applying: fanotify: info leak in copy_event_to_user()
Applying: fanotify: fix races when adding/removing marks
Applying: fanotify: put duplicate code for adding vfsmount/inode marks into an own function
Applying: dnotify: replace dnotify_mark_mutex with mark mutex of dnotify_group
Applying: inotify: fix race when adding a new watch
Applying: fsnotify: update comments concerning locking scheme
Applying: drivers/iommu/msm_iommu_dev.c: fix leak and clean up error paths
Applying: drivers-iommu-msm_iommu_devc-fix-leak-and-clean-up-error-paths-fix
Applying: include/linux/interrupt.h: add dummy irq_set_irq_wake() for "!GENERIC_HARDIRQS"
Applying: posix_cpu_timer: consolidate expiry time type
Applying: posix_cpu_timers: consolidate timer list cleanups
Applying: posix_cpu_timers: consolidate expired timers check
Applying: selftests: add basic posix timers selftests
Applying: posix-timers: correctly get dying task time sample in posix_cpu_timer_schedule()
Applying: posix_timers: fix racy timer delta caching on task exit
Applying: hrtimer: one more expiry time overflow check in hrtimer_interrupt
Applying: drivers/infiniband/core/cm.c: convert to using idr_alloc_cyclic()
Applying: drivers/ide/delkin_cb.c: convert to module_pci_driver
Applying: drivers/mtd/chips/gen_probe.c: refactor call to request_module()
Applying: drivers/net/ethernet/ibm/ehea/ehea_main.c: add alias entry for portN properties
Applying: mISDN: add support for group membership check
Applying: drivers/atm/he.c: convert to module_pci_driver
Applying: isdn: clean up debug format string usage
Applying: ocfs2: should call ocfs2_journal_access_di() before ocfs2_delete_entry() in ocfs2_orphan_del()
Applying: ocfs2: llseek requires ocfs2 inode lock for the file in SEEK_END
Applying: ocfs2: fix issue that ocfs2_setattr() does not deal with new_i_size==i_size
Applying: ocfs2-fix-issue-that-ocfs2_setattr-does-not-deal-with-new_i_size==i_size-v2
Applying: include/linux/sched.h: don't use task->pid/tgid in same_thread_group/has_group_leader_pid
Applying: lockdep: introduce lock_acquire_exclusive/shared helper macros
Applying: lglock: update lockdep annotations to report recursive local locks
Applying: drivers/scsi/a100u2w.c: convert to module_pci_driver
Applying: drivers/scsi/dc395x.c: convert to module_pci_driver
Applying: drivers/scsi/dmx3191d.c: convert to module_pci_driver
Applying: drivers/scsi/initio.c: convert to module_pci_driver
Applying: drivers/scsi/mvumi.c: convert to module_pci_driver
Applying: drivers/net/irda/donauboe.c: convert to module_pci_driver
Applying: block: restore /proc/partitions to not display non-partitionable removable devices
Applying: fs/file_table.c:fput(): add comment
Applying: fput: turn "list_head delayed_fput_list" into llist_head
Applying: llist: fix/simplify llist_add() and llist_add_batch()
Applying: llist: llist_add() can use llist_add_batch()
Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic
Applying: mm: remove free_area_cache
Applying: swap: add a simple detector for inappropriate swapin readahead
Applying: swap: swapin_nr_pages() can be static
Applying: vmcore: allow user process to remap ELF note segment buffer
Applying: vmcore-allow-user-process-to-remap-elf-note-segment-buffer-fix
Applying: vmcore: disable mmap_vmcore() if CONFIG_MMU is not defined
Applying: mm-use-a-dedicated-lock-to-protect-totalram_pages-and-zone-managed_pages-fix
Applying: mm-correctly-update-zone-managed_pages-fix-fix-fix
Applying: fs: bump inode and dentry counters to long
Applying: super: fix calculation of shrinkable objects for small numbers
Applying: dcache: convert dentry_stat.nr_unused to per-cpu counters
Applying: dentry: move to per-sb LRU locks
Applying: dcache: remove dentries from LRU before putting on dispose list
Applying: mm: new shrinker API
Applying: shrinker: convert superblock shrinkers to new API
Applying: shrinker-convert-superblock-shrinkers-to-new-api-fix
Applying: list: add a new LRU list type
Applying: inode: convert inode lru list to generic lru list code.
Applying: inode: move inode to a different list inside lock
Applying: dcache: convert to use new lru list infrastructure
Applying: list_lru: per-node list infrastructure
Applying: list_lru: per-node list infrastructure fix
Applying: list_lru: per-node API
Applying: list_lru: remove special case function list_lru_dispose_all.
Applying: shrinker: add node awareness
Applying: vmscan: per-node deferred work
Applying: fs: convert inode and dentry shrinking to be node aware
Applying: xfs: convert buftarg LRU to generic code
Applying: xfs-convert-buftarg-lru-to-generic-code-fix
Applying: xfs: rework buffer dispose list tracking
Applying: xfs: convert dquot cache lru to list_lru
Applying: xfs-convert-dquot-cache-lru-to-list_lru-fix
Applying: fs: convert fs shrinkers to new scan/count API
Applying: fs-convert-fs-shrinkers-to-new-scan-count-api-fix
Applying: UBIFS: signedness bug in ubifs_shrink_count()
Applying: drivers: convert shrinkers to new count/scan API
Applying: drivers-convert-shrinkers-to-new-count-scan-api-fix
Applying: drivers-convert-shrinkers-to-new-count-scan-api-fix-2
Applying: i915: bail out earlier when shrinker cannot acquire mutex
Applying: shrinker: convert remaining shrinkers to count/scan API
Applying: shrinker-convert-remaining-shrinkers-to-count-scan-api-fix
Applying: hugepage: convert huge zero page shrinker to new shrinker API
Applying: hugepage-convert-huge-zero-page-shrinker-to-new-shrinker-api-fix
Applying: shrinker: Kill old ->shrink API.
Applying: shrinker-kill-old-shrink-api-fix
Applying: list_lru: dynamically adjust node arrays
Applying: super: fix for destroy lrus
Applying: mm: mremap: validate input before taking lock
Applying: memcg: clean up memcg->nodeinfo
Applying: mm: invoke oom-killer from remaining unconverted page fault handlers
Applying: mm: remove duplicated call of get_pfn_range_for_nid
Applying: mm-remove-duplicated-call-of-get_pfn_range_for_nid-v2
Applying: mm-remove-duplicated-call-of-get_pfn_range_for_nid-v2-fix
Applying: mm/vmalloc.c: unbreak __vunmap()
Applying: mm/vmalloc.c: remove dead code in vb_alloc
Applying: mm/vmalloc.c: remove unused purge_fragmented_blocks_thiscpu
Applying: mm/vmalloc.c: remove alloc_map from vmap_block
Applying: mm/vmalloc.c: emit the failure message before return
Applying: mm/vmalloc.c: rename VM_UNLIST to VM_UNINITIALIZED
Applying: mm/vmalloc.c: check VM_UNINITIALIZED flag in s_show instead of show_numa_info
Applying: memcg: also test for skip accounting at the page allocation level
Applying: memcg: do not account memory used for cache creation
Applying: include/linux/gfp.h: fix the comment for GFP_ZONE_TABLE
Applying: zbud: add to mm/
Applying: zswap: init under_reclaim
Applying: zswap: add to mm/
Applying: zswap: fix Kconfig to depend on CRYPTO=y
Applying: zswap: add documentation
Applying: MAINTAINERS: add zswap and zbud maintainer
Applying: mm/page_alloc.c: remove zone_type argument of build_zonelists_node
Applying: mm: remove unused functions is_{normal_idx, normal, dma32, dma}
Applying: mm/page_alloc.c: remove unlikely() from the current_order test
Applying: vfree: don't schedule free_work() if llist_add() returns false
Applying: mm: remove unused __put_page()
Applying: mm/sparse.c: put clear_hwpoisoned_pages within CONFIG_MEMORY_HOTREMOVE
Applying: fs/fs-writeback.c: : make wb_do_writeback() as static
Applying: mm/writeback: remove wb_reason_name
Applying: mm/writeback: don't check force_wait to handle bdi->work_list
Applying: mm/writeback: commit reason of WB_REASON_FORKER_THREAD mismatch name
Applying: mm/page_alloc: fix doc for numa_zonelist_order
Applying: mm/thp: fix doc for transparent huge zero page
Applying: mm/pgtable: don't accumulate addr during pgd prepopulate pmd
Applying: mm: remove unused VM_<READfoo> macros and expand other in-place
Applying: mm/vmalloc.c: fix an overflow bug in alloc_vmap_area()
Applying: page migration: fix wrong comment in address_space_operations.migratepage()
Applying: mm/memblock.c: fix wrong comment in __next_free_mem_range()
Applying: mm/memory_hotplug.c: fix a comment typo in register_page_bootmem_info_node()
Applying: mm: vmscan: do not continue scanning if reclaim was aborted for compaction
Applying: mm: vmscan: do not scale writeback pages when deciding whether to set ZONE_WRITEBACK
Applying: hugetlb: properly account rss
Applying: mmap: allow MAP_HUGETLB for hugetlbfs files v2
Applying: Revert "memcg: avoid dangling reference count in creation failure"
Applying: memcg, kmem: fix reference count handling on the error path
Applying: memcg: use css_get() in sock_update_memcg()
Applying: memcg: don't use mem_cgroup_get() when creating a kmemcg cache
Applying: memcg: use css_get/put when charging/uncharging kmem
Applying: memcg-use-css_get-put-when-charging-uncharging-kmem-fix
Applying: memcg: use css_get/put for swap memcg
Applying: memcg: don't need to get a reference to the parent
Applying: memcg: kill memcg refcnt
Applying: memcg: don't need to free memcg via RCU or workqueue
Applying: include/linux/mmzone.h: cleanups
Applying: mm: memmap_init_zone() performance improvement
Applying: drop_caches: add some documentation and info message
Applying: drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create() with NULL dev
Applying: mm/dmapool.c: fix null dev in dma_pool_create()
Applying: mm: add vm event counters for balloon pages compaction
Applying: panic: add cpu/pid to warn_slowpath_common in WARNING printk()s
Applying: panic-add-cpu-pid-to-warn_slowpath_common-in-warning-printks-fix
Applying: smp: Give WARN()ing when calling smp_call_function_many()/single() in serving irq
Applying: list: remove __list_for_each()
Applying: checkpatch: warn when networking block comment lines don't start with *
Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting
Applying: autofs4: allow autofs to work outside the initial PID namespace
Applying: autofs4: translate pids to the right namespace for the daemon
Applying: fat: additions to support fat_fallocate
Applying: fat-additions-to-support-fat_fallocate-fix
Applying: ptrace/x86: revert "hw_breakpoints: Fix racy access to ptrace breakpoints"
Applying: ptrace/powerpc: revert "hw_breakpoints: Fix racy access to ptrace breakpoints"
Applying: ptrace/arm: revert "hw_breakpoints: Fix racy access to ptrace breakpoints"
Applying: ptrace/sh: revert "hw_breakpoints: Fix racy access to ptrace breakpoints"
Applying: ptrace: revert "Prepare to fix racy accesses on task breakpoints"
Applying: ptrace/x86: simplify the "disable" logic in ptrace_write_dr7()
Applying: ptrace/x86: dont delay "disable" till second pass in ptrace_write_dr7()
Applying: ptrace/x86: introduce ptrace_register_breakpoint()
Applying: ptrace/x86: ptrace_write_dr7() should create bp if !disabled
Applying: ptrace/x86: cleanup ptrace_set_debugreg()
Applying: ptrace: PTRACE_DETACH should do flush_ptrace_hw_breakpoint(child)
Applying: ptrace/x86: flush_ptrace_hw_breakpoint() shoule clear the virtual debug registers
Applying: signals: eventpoll: set ->saved_sigmask at the start
Applying: coredump: '% at the end' shouldn't bypass core_uses_pid logic
Applying: move-exit_task_namespaces-outside-of-exit_notify-fix
Applying: ipc/shmc.c: eliminate ugly 80-col tricks
Applying: ipc: move rcu lock out of ipc_addid
Applying: ipc: restore rcu locking in ipc_addid
Applying: ipc: introduce ipc object locking helpers
Applying: ipc: close open coded spin lock calls
Applying: ipc: move locking out of ipcctl_pre_down_nolock
Applying: ipc,msg: shorten critical region in msgctl_down
Applying: ipc,msg: introduce msgctl_nolock
Applying: ipc,msg: introduce lockless functions to obtain the ipc object
Applying: ipc,msg: make msgctl_nolock lockless
Applying: ipc,msg: shorten critical region in msgsnd
Applying: ipc,msg: shorten critical region in msgrcv
Applying: ipc,msq: fix race in msgrcv(2)
Applying: ipc: remove unused functions
Applying: ipc/util.c, ipc_rcu_alloc: cacheline align allocation
Applying: ipc-utilc-ipc_rcu_alloc-cacheline-align-allocation-checkpatch-fixes
Applying: ipc/sem.c: cacheline align the semaphore structures
Applying: ipc/sem: separate wait-for-zero and alter tasks into seperate queues
Applying: ipc/sem.c: scan complex wait-for-zero after undefined updates
Applying: ipc/sem.c: always use only one queue for alter operations
Applying: ipc/sem.c: replace shared sem_otime with per-semaphore value
Applying: ipc/sem.c: rename try_atomic_semop() to perform_atomic_semop(), docu update
Applying: mwave: fix info leak in mwave_ioctl()
Applying: partitions/msdos.c: end-of-line whitespace and semicolon cleanup
Applying: partitions: add aix lvm partition support files
Applying: partitions-add-aix-lvm-partition-support-files-v2
Applying: partitions-add-aix-lvm-partition-support-files-checkpatch-fixes
Applying: partitions-add-aix-lvm-partition-support-files: compile aix.c if configured
Applying: partitions-add-aix-lvm-partition-support-files: add the AIX_PARTITION entry
Applying: partitions/msdos: enumerate also AIX LVM partitions
Applying: relay: fix timer madness
Applying: reboot: remove -stable friendly PF_THREAD_BOUND define
Applying: reboot: move shutdown/reboot related functions to kernel/reboot.c
Applying: reboot: checkpatch.pl the new kernel/reboot.c file
Applying: reboot: x86: prepare reboot_mode for moving to generic kernel code
Applying: reboot: unicore32: prepare reboot_mode for moving to generic kernel code
Applying: reboot: arm: remove unused restart_mode fields from some arm subarchs
Applying: reboot: arm: prepare reboot_mode for moving to generic kernel code
Applying: reboot: arm: change reboot_mode to use enum reboot_mode
Applying: reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix
Applying: reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix-fix
Applying: reboot: move arch/x86 reboot= handling to generic kernel
Applying: lib: add weak clz/ctz functions
Applying: decompressor: add LZ4 decompressor module
Applying: lib: add support for LZ4-compressed kernel
Applying: kbuild: fix for updated LZ4 tool with the new streaming format
Applying: arm: add support for LZ4-compressed kernel
Applying: arm: Remove enforced Os flag for LZ4 decompressor
Applying: x86: add support for LZ4-compressed kernel
Applying: x86, doc: Add LZ4 magic number for the new compression
Applying: lib: add lz4 compressor module
Applying: lib-add-lz4-compressor-module-fix
Applying: crypto: add lz4 Cryptographic API
Applying: crypto-add-lz4-cryptographic-api-fix
Applying: drivers/iio/inkern.c: fix iio_convert_raw_to_processed_unlocked()
Applying: lib/scatterlist: factor out sg_miter_get_next_page() from sg_miter_next()
Applying: lib/scatterlist: introduce sg_pcopy_from_buffer() and sg_pcopy_to_buffer()
Applying: crypto: talitos: use sg_pcopy_to_buffer()
Applying: scsi_debug: fix do_device_access() with wrap around range
Applying: lib/scatterlist: error handling in __sg_alloc_table()
Applying: staging/lustre/ldlm: convert to shrinkers to count/scan API
Applying: staging/lustre/obdclass: convert lu_object shrinker to count/scan API
Applying: staging/lustre/ptlrpc: convert to new shrinker API
Applying: staging/lustre/libcfs: cleanup linux-mem.h
Applying: staging/lustre: replace num_physpages with totalram_pages
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
 + 87a8d6f...a324732 akpm       -> akpm/master  (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (a324732 staging/lustre: replace num_physpages with totalram_pages)
$ git merge --no-ff akpm/master
Merge made by the 'recursive' strategy.
 Documentation/kernel-parameters.txt                |  14 +-
 Documentation/sysctl/vm.txt                        |  35 +-
 Documentation/vm/transhuge.txt                     |   4 +-
 Documentation/vm/zswap.txt                         |  68 ++
 Documentation/x86/boot.txt                         |   7 +-
 MAINTAINERS                                        |  13 +
 arch/arc/mm/fault.c                                |   6 +-
 arch/arm/Kconfig                                   |   1 +
 arch/arm/boot/compressed/.gitignore                |   1 +
 arch/arm/boot/compressed/Makefile                  |   3 +-
 arch/arm/boot/compressed/decompress.c              |   4 +
 arch/arm/boot/compressed/piggy.lz4.S               |   6 +
 arch/arm/include/asm/hardware/iop3xx.h             |   3 +-
 arch/arm/include/asm/mach/arch.h                   |   5 +-
 arch/arm/include/asm/system_misc.h                 |   3 +-
 arch/arm/kernel/process.c                          |  15 +-
 arch/arm/kernel/ptrace.c                           |   8 -
 arch/arm/kernel/setup.c                            |   6 +-
 arch/arm/mach-at91/at91rm9200.c                    |   3 +-
 arch/arm/mach-at91/generic.h                       |   5 +-
 arch/arm/mach-bcm2835/bcm2835.c                    |   4 +-
 arch/arm/mach-clps711x/common.c                    |   2 +-
 arch/arm/mach-clps711x/common.h                    |   4 +-
 arch/arm/mach-cns3xxx/core.h                       |   4 +-
 arch/arm/mach-cns3xxx/pm.c                         |   2 +-
 arch/arm/mach-davinci/devices-da8xx.c              |   3 +-
 arch/arm/mach-davinci/devices.c                    |   3 +-
 arch/arm/mach-davinci/include/mach/common.h        |   3 +-
 arch/arm/mach-davinci/include/mach/da8xx.h         |   3 +-
 arch/arm/mach-davinci/include/mach/tnetv107x.h     |   3 +-
 arch/arm/mach-davinci/tnetv107x.c                  |   3 +-
 arch/arm/mach-dove/common.c                        |   2 +-
 arch/arm/mach-dove/common.h                        |   4 +-
 arch/arm/mach-ebsa110/core.c                       |   3 +-
 arch/arm/mach-ep93xx/core.c                        |   3 +-
 arch/arm/mach-ep93xx/include/mach/platform.h       |   4 +-
 arch/arm/mach-exynos/common.c                      |   4 +-
 arch/arm/mach-exynos/common.h                      |   5 +-
 arch/arm/mach-footbridge/cats-hw.c                 |   2 +-
 arch/arm/mach-footbridge/common.c                  |   4 +-
 arch/arm/mach-footbridge/common.h                  |   3 +-
 arch/arm/mach-footbridge/netwinder-hw.c            |   4 +-
 arch/arm/mach-highbank/core.h                      |   4 +-
 arch/arm/mach-highbank/system.c                    |   5 +-
 arch/arm/mach-imx/common.h                         |   4 +-
 arch/arm/mach-imx/mach-imx6q.c                     |   3 +-
 arch/arm/mach-imx/system.c                         |   2 +-
 arch/arm/mach-integrator/common.h                  |   3 +-
 arch/arm/mach-integrator/core.c                    |   2 +-
 arch/arm/mach-iop13xx/include/mach/iop13xx.h       |   5 +-
 arch/arm/mach-iop13xx/setup.c                      |   2 +-
 arch/arm/mach-iop32x/n2100.c                       |   2 +-
 arch/arm/mach-ixp4xx/common.c                      |   4 +-
 arch/arm/mach-ixp4xx/dsmg600-setup.c               |   1 +
 arch/arm/mach-ixp4xx/include/mach/platform.h       |   4 +-
 arch/arm/mach-kirkwood/common.c                    |   3 +-
 arch/arm/mach-kirkwood/common.h                    |   4 +-
 arch/arm/mach-ks8695/generic.h                     |   2 +-
 arch/arm/mach-ks8695/time.c                        |   4 +-
 arch/arm/mach-lpc32xx/common.c                     |   6 +-
 arch/arm/mach-lpc32xx/common.h                     |   3 +-
 arch/arm/mach-mmp/common.c                         |   2 +-
 arch/arm/mach-mmp/common.h                         |   3 +-
 arch/arm/mach-mmp/include/mach/pxa168.h            |   4 +-
 arch/arm/mach-mmp/pxa168.c                         |   2 +-
 arch/arm/mach-mv78xx0/common.c                     |   2 +-
 arch/arm/mach-mv78xx0/common.h                     |   4 +-
 arch/arm/mach-mvebu/common.h                       |   4 +-
 arch/arm/mach-mvebu/system-controller.c            |   3 +-
 arch/arm/mach-mxs/mach-mxs.c                       |   3 +-
 arch/arm/mach-netx/generic.c                       |   3 +-
 arch/arm/mach-netx/generic.h                       |   4 +-
 arch/arm/mach-nomadik/cpu-8815.c                   |   2 +-
 arch/arm/mach-omap1/board-voiceblue.c              |   3 +-
 arch/arm/mach-omap1/common.h                       |   3 +-
 arch/arm/mach-omap1/reset.c                        |   3 +-
 arch/arm/mach-omap2/am33xx-restart.c               |   3 +-
 arch/arm/mach-omap2/common.h                       |  17 +-
 arch/arm/mach-omap2/omap2-restart.c                |   2 +-
 arch/arm/mach-omap2/omap3-restart.c                |   3 +-
 arch/arm/mach-omap2/omap4-common.c                 |   1 +
 arch/arm/mach-omap2/omap4-restart.c                |   3 +-
 arch/arm/mach-orion5x/common.c                     |   2 +-
 arch/arm/mach-orion5x/common.h                     |   4 +-
 arch/arm/mach-orion5x/ls-chl-setup.c               |   2 +-
 arch/arm/mach-orion5x/ls_hgl-setup.c               |   2 +-
 arch/arm/mach-orion5x/lsmini-setup.c               |   2 +-
 arch/arm/mach-picoxcell/common.c                   |   3 +-
 arch/arm/mach-prima2/common.h                      |   4 +-
 arch/arm/mach-prima2/rstc.c                        |   3 +-
 arch/arm/mach-pxa/corgi.c                          |   6 +-
 arch/arm/mach-pxa/generic.h                        |   4 +-
 arch/arm/mach-pxa/mioa701.c                        |   8 +-
 arch/arm/mach-pxa/poodle.c                         |   2 +-
 arch/arm/mach-pxa/reset.c                          |   8 +-
 arch/arm/mach-pxa/spitz.c                          |   8 +-
 arch/arm/mach-pxa/tosa.c                           |   6 +-
 arch/arm/mach-realview/realview_eb.c               |   3 +-
 arch/arm/mach-realview/realview_pb1176.c           |   3 +-
 arch/arm/mach-realview/realview_pb11mp.c           |   3 +-
 arch/arm/mach-realview/realview_pba8.c             |   3 +-
 arch/arm/mach-realview/realview_pbx.c              |   3 +-
 arch/arm/mach-rpc/riscpc.c                         |   3 +-
 arch/arm/mach-s3c24xx/common.h                     |  12 +-
 arch/arm/mach-s3c24xx/s3c2410.c                    |   5 +-
 arch/arm/mach-s3c24xx/s3c2412.c                    |   5 +-
 arch/arm/mach-s3c24xx/s3c2416.c                    |   5 +-
 arch/arm/mach-s3c24xx/s3c2443.c                    |   5 +-
 arch/arm/mach-s3c24xx/s3c244x.c                    |   5 +-
 arch/arm/mach-s3c64xx/common.c                     |   5 +-
 arch/arm/mach-s3c64xx/common.h                     |   4 +-
 arch/arm/mach-s5p64x0/common.c                     |   5 +-
 arch/arm/mach-s5p64x0/common.h                     |   4 +-
 arch/arm/mach-s5pc100/common.c                     |   5 +-
 arch/arm/mach-s5pc100/common.h                     |   4 +-
 arch/arm/mach-s5pv210/common.c                     |   2 +-
 arch/arm/mach-s5pv210/common.h                     |   4 +-
 arch/arm/mach-sa1100/generic.c                     |   5 +-
 arch/arm/mach-sa1100/generic.h                     |   3 +-
 arch/arm/mach-shark/core.c                         |   3 +-
 arch/arm/mach-shmobile/board-armadillo800eva.c     |   3 +-
 arch/arm/mach-shmobile/board-kzm9g.c               |   3 +-
 arch/arm/mach-socfpga/socfpga.c                    |   5 +-
 arch/arm/mach-spear/generic.h                      |   4 +-
 arch/arm/mach-spear/restart.c                      |   5 +-
 arch/arm/mach-sunxi/sunxi.c                        |   3 +-
 arch/arm/mach-tegra/board.h                        |   3 +-
 arch/arm/mach-tegra/common.c                       |   3 +-
 arch/arm/mach-u300/core.c                          |   6 +-
 arch/arm/mach-versatile/core.c                     |   3 +-
 arch/arm/mach-versatile/core.h                     |   3 +-
 arch/arm/mach-vt8500/vt8500.c                      |   3 +-
 arch/arm/mach-w90x900/cpu.c                        |   4 +-
 arch/arm/mach-w90x900/nuc9xx.h                     |   5 +-
 arch/arm/mm/mmap.c                                 |   2 -
 arch/arm/plat-iop/gpio.c                           |   1 +
 arch/arm/plat-iop/restart.c                        |   2 +-
 arch/arm64/mm/mmap.c                               |   2 -
 arch/metag/mm/fault.c                              |   6 +-
 arch/mips/mm/mmap.c                                |   2 -
 arch/mn10300/mm/fault.c                            |   7 +-
 arch/openrisc/mm/fault.c                           |   8 +-
 arch/powerpc/kernel/ptrace.c                       |  30 +-
 arch/powerpc/mm/mmap.c                             |   2 -
 arch/s390/mm/mmap.c                                |   4 -
 arch/score/mm/fault.c                              |   8 +-
 arch/sh/kernel/ptrace_32.c                         |   4 -
 arch/sparc/kernel/sys_sparc_64.c                   |   2 -
 arch/tile/mm/fault.c                               |   8 +-
 arch/tile/mm/mmap.c                                |   2 -
 arch/unicore32/kernel/process.c                    |  14 +-
 arch/unicore32/kernel/setup.h                      |   2 +-
 arch/unicore32/mm/mmu.c                            |   2 +-
 arch/x86/Kconfig                                   |   1 +
 arch/x86/boot/compressed/Makefile                  |   6 +-
 arch/x86/boot/compressed/misc.c                    |   4 +
 arch/x86/ia32/ia32_aout.c                          |   2 -
 arch/x86/include/asm/e820.h                        |   2 +
 arch/x86/include/asm/emergency-restart.h           |  12 -
 arch/x86/kernel/apic/x2apic_uv_x.c                 |   2 +-
 arch/x86/kernel/e820.c                             |  72 +-
 arch/x86/kernel/hw_breakpoint.c                    |   3 +
 arch/x86/kernel/ptrace.c                           | 204 ++---
 arch/x86/kernel/reboot.c                           | 117 +--
 arch/x86/kvm/mmu.c                                 |  25 +-
 arch/x86/mm/mmap.c                                 |   2 -
 arch/x86/mm/pgtable.c                              |   4 +-
 arch/x86/platform/efi/efi.c                        |  15 +-
 block/genhd.c                                      |   2 +-
 block/partitions/Kconfig                           |  11 +
 block/partitions/Makefile                          |   1 +
 block/partitions/aix.c                             | 293 +++++++
 block/partitions/aix.h                             |   1 +
 block/partitions/msdos.c                           |  17 +-
 crypto/Kconfig                                     |  16 +
 crypto/Makefile                                    |   2 +
 crypto/lz4.c                                       | 106 +++
 crypto/lz4hc.c                                     | 106 +++
 drivers/atm/he.c                                   |  13 +-
 drivers/char/mwave/tp3780i.c                       |   1 +
 drivers/crypto/talitos.c                           |  60 +-
 drivers/gpu/drm/cirrus/cirrus_mode.c               |   4 +-
 drivers/gpu/drm/drm_fb_helper.c                    |   8 +
 drivers/gpu/drm/i915/i915_dma.c                    |   4 +-
 drivers/gpu/drm/i915/i915_gem.c                    |  78 +-
 drivers/gpu/drm/nouveau/nouveau_acpi.c             |   5 +
 drivers/gpu/drm/ttm/ttm_page_alloc.c               |  44 +-
 drivers/gpu/drm/ttm/ttm_page_alloc_dma.c           |  51 +-
 drivers/ide/delkin_cb.c                            |  13 +-
 drivers/iio/inkern.c                               |   2 +-
 drivers/infiniband/core/cm.c                       |   5 +-
 drivers/iommu/msm_iommu_dev.c                      |  24 +-
 drivers/isdn/hisax/amd7930_fn.c                    |   4 +-
 drivers/isdn/hisax/avm_pci.c                       |   4 +-
 drivers/isdn/hisax/config.c                        |   2 +-
 drivers/isdn/hisax/diva.c                          |   4 +-
 drivers/isdn/hisax/elsa.c                          |   2 +-
 drivers/isdn/hisax/elsa_ser.c                      |   2 +-
 drivers/isdn/hisax/hfc_pci.c                       |   2 +-
 drivers/isdn/hisax/hfc_sx.c                        |   2 +-
 drivers/isdn/hisax/hscx_irq.c                      |   4 +-
 drivers/isdn/hisax/icc.c                           |   4 +-
 drivers/isdn/hisax/ipacx.c                         |   8 +-
 drivers/isdn/hisax/isac.c                          |   4 +-
 drivers/isdn/hisax/isar.c                          |   6 +-
 drivers/isdn/hisax/jade.c                          |  18 +-
 drivers/isdn/hisax/jade_irq.c                      |   4 +-
 drivers/isdn/hisax/l3_1tr6.c                       |  50 +-
 drivers/isdn/hisax/netjet.c                        |   2 +-
 drivers/isdn/hisax/q931.c                          |   6 +-
 drivers/isdn/hisax/w6692.c                         |   8 +-
 drivers/isdn/mISDN/core.c                          |   6 +
 drivers/isdn/mISDN/core.h                          |   1 +
 drivers/isdn/mISDN/socket.c                        |   9 +
 drivers/md/bcache/btree.c                          |  45 +-
 drivers/md/bcache/sysfs.c                          |   2 +-
 drivers/md/dm-bufio.c                              |  64 +-
 drivers/mtd/chips/gen_probe.c                      |   4 +-
 drivers/net/ethernet/ibm/ehea/ehea_main.c          |  14 +-
 drivers/net/irda/donauboe.c                        |  15 +-
 drivers/pcmcia/pd6729.c                            |  13 +-
 drivers/pcmcia/yenta_socket.c                      |  16 +-
 drivers/platform/x86/intel_ips.c                   |  13 +-
 drivers/power/reset/restart-poweroff.c             |   3 +-
 drivers/power/reset/vexpress-poweroff.c            |   2 +-
 drivers/scsi/a100u2w.c                             |  12 +-
 drivers/scsi/dc395x.c                              |  24 +-
 drivers/scsi/dmx3191d.c                            |  13 +-
 drivers/scsi/initio.c                              |  13 +-
 drivers/scsi/mvumi.c                               |  20 +-
 drivers/scsi/scsi_debug.c                          |  48 +-
 drivers/staging/android/ashmem.c                   |  44 +-
 drivers/staging/android/lowmemorykiller.c          |  43 +-
 .../lustre/include/linux/libcfs/linux/linux-mem.h  |  42 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_lib.c      |  10 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_pool.c     | 139 +--
 .../lustre/lustre/libcfs/linux/linux-tracefile.c   |   2 +-
 drivers/staging/lustre/lustre/llite/lproc_llite.c  |   8 +-
 drivers/staging/lustre/lustre/obdclass/class_obd.c |   6 +-
 .../lustre/lustre/obdclass/linux/linux-sysctl.c    |   6 +-
 drivers/staging/lustre/lustre/obdclass/lu_object.c | 100 ++-
 drivers/staging/lustre/lustre/osc/lproc_osc.c      |   2 +-
 .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c    |   2 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c    |  80 +-
 drivers/staging/zcache/zcache-main.c               |  29 +-
 drivers/usb/gadget/amd5536udc.c                    |   4 +-
 drivers/video/acornfb.c                            | 266 +-----
 drivers/video/acornfb.h                            |  29 -
 drivers/video/cyber2000fb.c                        |   3 +
 fs/autofs4/autofs_i.h                              |   4 +-
 fs/autofs4/dev-ioctl.c                             |  16 +-
 fs/autofs4/inode.c                                 |  33 +-
 fs/autofs4/waitq.c                                 |  16 +-
 fs/binfmt_aout.c                                   |   2 -
 fs/binfmt_elf.c                                    |  23 +-
 fs/coredump.c                                      |   3 +
 fs/dcache.c                                        | 279 +++---
 fs/drop_caches.c                                   |   3 +
 fs/eventpoll.c                                     |  34 +-
 fs/ext4/extents_status.c                           |  32 +-
 fs/fat/file.c                                      | 108 ++-
 fs/fat/inode.c                                     |  54 ++
 fs/file_table.c                                    |  30 +-
 fs/fs-writeback.c                                  |  10 +-
 fs/gfs2/glock.c                                    |  30 +-
 fs/gfs2/main.c                                     |   3 +-
 fs/gfs2/quota.c                                    |  18 +-
 fs/gfs2/quota.h                                    |   6 +-
 fs/inode.c                                         | 193 ++---
 fs/internal.h                                      |   6 +-
 fs/mbcache.c                                       |  49 +-
 fs/nfs/dir.c                                       |  16 +-
 fs/nfs/internal.h                                  |   6 +-
 fs/nfs/super.c                                     |   3 +-
 fs/nfsd/nfscache.c                                 |  32 +-
 fs/notify/dnotify/dnotify.c                        |  25 +-
 fs/notify/fanotify/fanotify_user.c                 |  89 +-
 fs/notify/inotify/inotify_user.c                   |  13 +-
 fs/notify/mark.c                                   |  50 +-
 fs/ocfs2/alloc.c                                   |   2 +-
 fs/ocfs2/file.c                                    |  20 +-
 fs/ocfs2/namei.c                                   |  12 +-
 fs/quota/dquot.c                                   |  34 +-
 fs/super.c                                         | 111 ++-
 fs/ubifs/shrinker.c                                |  29 +-
 fs/ubifs/super.c                                   |   3 +-
 fs/ubifs/ubifs.h                                   |   5 +-
 fs/xfs/xfs_buf.c                                   | 253 +++---
 fs/xfs/xfs_buf.h                                   |  17 +-
 fs/xfs/xfs_dquot.c                                 |   7 +-
 fs/xfs/xfs_icache.c                                |   4 +-
 fs/xfs/xfs_icache.h                                |   2 +-
 fs/xfs/xfs_qm.c                                    | 285 ++++---
 fs/xfs/xfs_qm.h                                    |   4 +-
 fs/xfs/xfs_super.c                                 |  12 +-
 include/linux/audit.h                              |  26 +-
 include/linux/balloon_compaction.h                 |   7 +
 include/linux/dcache.h                             |  14 +-
 include/linux/decompress/unlz4.h                   |  10 +
 include/linux/fs.h                                 |  31 +-
 include/linux/gfp.h                                |   2 +-
 include/linux/hardirq.h                            |   5 +
 include/linux/interrupt.h                          |  23 +-
 include/linux/list.h                               |  11 -
 include/linux/list_lru.h                           | 131 +++
 include/linux/llist.h                              |  19 +-
 include/linux/lockdep.h                            |  92 +-
 include/linux/lz4.h                                |  87 ++
 include/linux/mm.h                                 |   6 -
 include/linux/mm_types.h                           |   3 -
 include/linux/mmzone.h                             |  39 +-
 include/linux/page-flags.h                         |   4 +-
 include/linux/posix-timers.h                       |  16 +-
 include/linux/ptrace.h                             |  10 -
 include/linux/reboot.h                             |  27 +-
 include/linux/scatterlist.h                        |   5 +
 include/linux/sched.h                              |  13 +-
 include/linux/sem.h                                |   6 +-
 include/linux/shrinker.h                           |  54 +-
 include/linux/vexpress.h                           |   1 +
 include/linux/vm_event_item.h                      |   7 +-
 include/linux/vmalloc.h                            |  12 +-
 include/linux/writeback.h                          |   8 +-
 include/linux/zbud.h                               |  22 +
 include/trace/events/vmscan.h                      |   4 +-
 include/uapi/linux/fs.h                            |   6 +-
 init/Kconfig                                       |  17 +-
 ipc/mqueue.c                                       |   2 +
 ipc/msg.c                                          | 226 +++--
 ipc/sem.c                                          | 442 +++++++---
 ipc/shm.c                                          |  34 +-
 ipc/util.c                                         |  36 +-
 ipc/util.h                                         |  22 +-
 kernel/Makefile                                    |   2 +-
 kernel/audit.h                                     |   1 +
 kernel/auditfilter.c                               |   8 +-
 kernel/auditsc.c                                   |  12 +-
 kernel/exit.c                                      |   2 +-
 kernel/fork.c                                      |   4 -
 kernel/hrtimer.c                                   |   2 +
 kernel/lglock.c                                    |  12 +-
 kernel/panic.c                                     |   5 +-
 kernel/posix-cpu-timers.c                          | 395 +++------
 kernel/ptrace.c                                    |  17 +-
 kernel/reboot.c                                    | 419 +++++++++
 kernel/relay.c                                     |  14 +-
 kernel/smp.c                                       |  11 +-
 kernel/sys.c                                       | 336 --------
 kernel/sysctl.c                                    |   6 +-
 kernel/watchdog.c                                  |  10 +-
 lib/Kconfig                                        |  13 +
 lib/Makefile                                       |   6 +-
 lib/clz_ctz.c                                      |  58 ++
 lib/decompress.c                                   |   5 +
 lib/decompress_unlz4.c                             | 187 ++++
 lib/llist.c                                        |  15 +-
 lib/lz4/Makefile                                   |   3 +
 lib/lz4/lz4_compress.c                             | 443 ++++++++++
 lib/lz4/lz4_decompress.c                           | 326 +++++++
 lib/lz4/lz4defs.h                                  | 156 ++++
 lib/lz4/lz4hc_compress.c                           | 539 ++++++++++++
 lib/scatterlist.c                                  | 133 ++-
 mm/Kconfig                                         |  30 +
 mm/Makefile                                        |   4 +-
 mm/balloon_compaction.c                            |   2 +
 mm/dmapool.c                                       |   5 +-
 mm/filemap.c                                       |   6 +-
 mm/huge_memory.c                                   |  17 +-
 mm/hugetlb.c                                       |   4 +
 mm/internal.h                                      |   5 -
 mm/list_lru.c                                      | 144 ++++
 mm/memblock.c                                      |   2 +-
 mm/memcontrol.c                                    | 258 +++---
 mm/memory-failure.c                                |   2 +
 mm/memory.c                                        |   2 +-
 mm/memory_hotplug.c                                |   4 +-
 mm/migrate.c                                       |   1 +
 mm/mmap.c                                          |  38 +-
 mm/mremap.c                                        |  18 +-
 mm/nommu.c                                         |   4 -
 mm/page_alloc.c                                    |  71 +-
 mm/rmap.c                                          |   2 +-
 mm/slab.c                                          |   2 +-
 mm/sparse.c                                        |   2 +-
 mm/swap_state.c                                    |  63 +-
 mm/util.c                                          |   1 -
 mm/vmalloc.c                                       |  63 +-
 mm/vmscan.c                                        | 265 +++---
 mm/vmstat.c                                        |   9 +-
 mm/zbud.c                                          | 527 ++++++++++++
 mm/zswap.c                                         | 943 +++++++++++++++++++++
 net/sunrpc/auth.c                                  |  41 +-
 scripts/Makefile.lib                               |   5 +
 scripts/checkpatch.pl                              |   8 +
 tools/testing/selftests/Makefile                   |   1 +
 tools/testing/selftests/timers/Makefile            |   8 +
 tools/testing/selftests/timers/posix_timers.c      | 221 +++++
 usr/Kconfig                                        |   9 +
 398 files changed, 8832 insertions(+), 3930 deletions(-)
 create mode 100644 Documentation/vm/zswap.txt
 create mode 100644 arch/arm/boot/compressed/piggy.lz4.S
 create mode 100644 block/partitions/aix.c
 create mode 100644 block/partitions/aix.h
 create mode 100644 crypto/lz4.c
 create mode 100644 crypto/lz4hc.c
 create mode 100644 include/linux/decompress/unlz4.h
 create mode 100644 include/linux/list_lru.h
 create mode 100644 include/linux/lz4.h
 create mode 100644 include/linux/zbud.h
 create mode 100644 kernel/reboot.c
 create mode 100644 lib/clz_ctz.c
 create mode 100644 lib/decompress_unlz4.c
 create mode 100644 lib/lz4/Makefile
 create mode 100644 lib/lz4/lz4_compress.c
 create mode 100644 lib/lz4/lz4_decompress.c
 create mode 100644 lib/lz4/lz4defs.h
 create mode 100644 lib/lz4/lz4hc_compress.c
 create mode 100644 mm/list_lru.c
 create mode 100644 mm/zbud.c
 create mode 100644 mm/zswap.c
 create mode 100644 tools/testing/selftests/timers/Makefile
 create mode 100644 tools/testing/selftests/timers/posix_timers.c
$ git clone -s -l -n -q . ../rebase-tmp
$ cd ../rebase-tmp
$ git checkout -b cpuinit remotes/origin/cpuinit/master
Switched to a new branch 'cpuinit'
$ git rebase --onto master remotes/origin/cpuinit/master-base
First, rewinding head to replay your work on top of it...
Applying: init.h: remove __cpuinit sections from the kernel
Applying: modpost: remove all traces of cpuinit/cpuexit sections
Applying: alpha: delete __cpuinit usage from all users
Applying: parisc: delete __cpuinit usage from all users
Applying: MIPS: Delete __cpuinit/__CPUINIT usage from MIPS code
Applying: arm: delete __cpuinit/__CPUINIT usage from all ARM users
Applying: sparc: delete __cpuinit/__CPUINIT usage from all users
Applying: arm64: delete __cpuinit usage from all users
Applying: blackfin: delete __cpuinit usage from all blackfin files
Applying: s390: delete __cpuinit usage from all s390 files
Applying: sh: delete __cpuinit usage from all sh files
Applying: tile: delete __cpuinit usage from all tile files
Applying: metag: delete __cpuinit usage from all metag files
Applying: cris: delete __cpuinit usage from all cris files
Applying: frv: delete __cpuinit usage from all frv files
Applying: hexagon: delete __cpuinit usage from all hexagon files
Applying: m32r: delete __cpuinit usage from all m32r files
Applying: openrisc: delete __cpuinit usage from all openrisc files
Applying: xtensa: delete __cpuinit usage from all xtensa files
Applying: score: delete __cpuinit usage from all score files
Applying: x86: delete __cpuinit usage from all x86 files
Applying: clocksource+irqchip: delete __cpuinit usage from all related files
Applying: cpufreq: delete __cpuinit usage from all cpufreq files
Applying: hwmon: delete __cpuinit usage from all hwmon files
Applying: acpi: delete __cpuinit usage from all acpi files
Applying: net: delete __cpuinit usage from all net files
Applying: rcu: delete __cpuinit usage from all rcu files
Applying: kernel: delete __cpuinit usage from all core kernel files
Applying: drivers: delete __cpuinit usage from all remaining drivers files
Applying: block: delete __cpuinit usage from all block files
$ cd ../next
$ git fetch -f ../rebase-tmp cpuinit:cpuinit/master
From ../rebase-tmp
 + a5832cb...1247de2 cpuinit    -> cpuinit/master  (forced update)
$ rm -rf ../rebase-tmp
Merging cpuinit/master (1247de2 block: delete __cpuinit usage from all block files)
$ git merge --no-ff cpuinit/master
Merge made by the 'recursive' strategy.
 Documentation/cpu-hotplug.txt                 |   6 +-
 arch/alpha/kernel/smp.c                       |  10 +-
 arch/alpha/kernel/traps.c                     |   4 +-
 arch/arm/common/mcpm_platsmp.c                |   4 +-
 arch/arm/include/asm/arch_timer.h             |   2 +-
 arch/arm/kernel/head-common.S                 |   1 -
 arch/arm/kernel/head-nommu.S                  |   1 -
 arch/arm/kernel/head.S                        |   1 -
 arch/arm/kernel/hw_breakpoint.c               |   4 +-
 arch/arm/kernel/perf_event_cpu.c              |   6 +-
 arch/arm/kernel/psci_smp.c                    |   3 +-
 arch/arm/kernel/smp.c                         |  18 ++--
 arch/arm/kernel/smp_twd.c                     |   6 +-
 arch/arm/lib/delay.c                          |   2 +-
 arch/arm/mach-exynos/headsmp.S                |   2 -
 arch/arm/mach-exynos/platsmp.c                |   4 +-
 arch/arm/mach-highbank/platsmp.c              |   2 +-
 arch/arm/mach-imx/platsmp.c                   |   2 +-
 arch/arm/mach-keystone/platsmp.c              |   2 +-
 arch/arm/mach-msm/headsmp.S                   |   2 -
 arch/arm/mach-msm/platsmp.c                   |   6 +-
 arch/arm/mach-msm/timer.c                     |   4 +-
 arch/arm/mach-mvebu/coherency.c               |   2 +-
 arch/arm/mach-mvebu/headsmp.S                 |   2 -
 arch/arm/mach-mvebu/platsmp.c                 |   5 +-
 arch/arm/mach-omap2/omap-headsmp.S            |   2 -
 arch/arm/mach-omap2/omap-mpuss-lowpower.c     |   2 +-
 arch/arm/mach-omap2/omap-smp.c                |   4 +-
 arch/arm/mach-omap2/omap-wakeupgen.c          |   4 +-
 arch/arm/mach-prima2/headsmp.S                |   2 -
 arch/arm/mach-prima2/platsmp.c                |   4 +-
 arch/arm/mach-shmobile/headsmp-scu.S          |   1 -
 arch/arm/mach-shmobile/headsmp.S              |   2 -
 arch/arm/mach-shmobile/smp-emev2.c            |   2 +-
 arch/arm/mach-shmobile/smp-r8a7779.c          |   2 +-
 arch/arm/mach-shmobile/smp-sh73a0.c           |   2 +-
 arch/arm/mach-socfpga/headsmp.S               |   1 -
 arch/arm/mach-socfpga/platsmp.c               |   2 +-
 arch/arm/mach-spear/generic.h                 |   2 +-
 arch/arm/mach-spear/platsmp.c                 |   4 +-
 arch/arm/mach-sti/platsmp.c                   |   6 +-
 arch/arm/mach-tegra/platsmp.c                 |   4 +-
 arch/arm/mach-tegra/pm.c                      |   2 +-
 arch/arm/mach-ux500/platsmp.c                 |   4 +-
 arch/arm/mach-zynq/common.h                   |   2 +-
 arch/arm/mach-zynq/headsmp.S                  |   2 -
 arch/arm/mach-zynq/platsmp.c                  |   6 +-
 arch/arm/mm/proc-arm1020.S                    |   2 -
 arch/arm/mm/proc-arm1020e.S                   |   2 -
 arch/arm/mm/proc-arm1022.S                    |   2 -
 arch/arm/mm/proc-arm1026.S                    |   3 -
 arch/arm/mm/proc-arm720.S                     |   2 -
 arch/arm/mm/proc-arm740.S                     |   2 -
 arch/arm/mm/proc-arm7tdmi.S                   |   2 -
 arch/arm/mm/proc-arm920.S                     |   2 -
 arch/arm/mm/proc-arm922.S                     |   2 -
 arch/arm/mm/proc-arm925.S                     |   2 -
 arch/arm/mm/proc-arm926.S                     |   2 -
 arch/arm/mm/proc-arm940.S                     |   2 -
 arch/arm/mm/proc-arm946.S                     |   2 -
 arch/arm/mm/proc-arm9tdmi.S                   |   2 -
 arch/arm/mm/proc-fa526.S                      |   2 -
 arch/arm/mm/proc-feroceon.S                   |   2 -
 arch/arm/mm/proc-mohawk.S                     |   2 -
 arch/arm/mm/proc-sa110.S                      |   2 -
 arch/arm/mm/proc-sa1100.S                     |   2 -
 arch/arm/mm/proc-v6.S                         |   2 -
 arch/arm/mm/proc-v7-2level.S                  |   4 -
 arch/arm/mm/proc-v7-3level.S                  |   4 -
 arch/arm/mm/proc-v7.S                         |   2 -
 arch/arm/mm/proc-xsc3.S                       |   2 -
 arch/arm/mm/proc-xscale.S                     |   2 -
 arch/arm/plat-versatile/platsmp.c             |   6 +-
 arch/arm64/include/asm/arch_timer.h           |   2 +-
 arch/arm64/kernel/debug-monitors.c            |   6 +-
 arch/arm64/kernel/hw_breakpoint.c             |   4 +-
 arch/arm64/kernel/smp.c                       |   8 +-
 arch/blackfin/kernel/perf_event.c             |   2 +-
 arch/blackfin/kernel/setup.c                  |   4 +-
 arch/blackfin/mach-bf561/smp.c                |   6 +-
 arch/blackfin/mach-common/cache-c.c           |   4 +-
 arch/blackfin/mach-common/ints-priority.c     |   2 +-
 arch/blackfin/mach-common/smp.c               |  12 +--
 arch/cris/arch-v32/kernel/smp.c               |   2 +-
 arch/frv/kernel/setup.c                       |   2 +-
 arch/hexagon/kernel/setup.c                   |   2 +-
 arch/hexagon/kernel/smp.c                     |   4 +-
 arch/m32r/kernel/smpboot.c                    |   2 +-
 arch/metag/kernel/perf/perf_event.c           |   6 +-
 arch/metag/kernel/smp.c                       |  22 ++--
 arch/metag/kernel/traps.c                     |   2 +-
 arch/mips/ath79/setup.c                       |   2 +-
 arch/mips/cavium-octeon/octeon-irq.c          |  12 +--
 arch/mips/cavium-octeon/smp.c                 |   6 +-
 arch/mips/include/asm/uasm.h                  |  37 +++----
 arch/mips/kernel/bmips_vec.S                  |   4 -
 arch/mips/kernel/cevt-bcm1480.c               |   2 +-
 arch/mips/kernel/cevt-gic.c                   |   2 +-
 arch/mips/kernel/cevt-r4k.c                   |   2 +-
 arch/mips/kernel/cevt-sb1250.c                |   2 +-
 arch/mips/kernel/cevt-smtc.c                  |   2 +-
 arch/mips/kernel/cpu-bugs64.c                 |   2 +-
 arch/mips/kernel/cpu-probe.c                  |  14 +--
 arch/mips/kernel/head.S                       |   4 -
 arch/mips/kernel/smp-bmips.c                  |   6 +-
 arch/mips/kernel/smp-mt.c                     |   6 +-
 arch/mips/kernel/smp-up.c                     |   6 +-
 arch/mips/kernel/smp.c                        |   6 +-
 arch/mips/kernel/smtc.c                       |   2 +-
 arch/mips/kernel/spram.c                      |  14 +--
 arch/mips/kernel/sync-r4k.c                   |  12 +--
 arch/mips/kernel/traps.c                      |  12 +--
 arch/mips/kernel/watch.c                      |   2 +-
 arch/mips/lantiq/irq.c                        |   2 +-
 arch/mips/lib/uncached.c                      |   2 +-
 arch/mips/mm/c-octeon.c                       |   6 +-
 arch/mips/mm/c-r3k.c                          |   8 +-
 arch/mips/mm/c-r4k.c                          |  34 +++---
 arch/mips/mm/c-tx39.c                         |   2 +-
 arch/mips/mm/cache.c                          |   2 +-
 arch/mips/mm/cex-sb1.S                        |   4 -
 arch/mips/mm/page.c                           |  40 +++----
 arch/mips/mm/sc-ip22.c                        |   2 +-
 arch/mips/mm/sc-mips.c                        |   2 +-
 arch/mips/mm/sc-r5k.c                         |   2 +-
 arch/mips/mm/sc-rm7k.c                        |  12 +--
 arch/mips/mm/tlb-r3k.c                        |   2 +-
 arch/mips/mm/tlb-r4k.c                        |   4 +-
 arch/mips/mm/tlb-r8k.c                        |   4 +-
 arch/mips/mm/tlbex.c                          | 144 ++++++++++++--------------
 arch/mips/mm/uasm-micromips.c                 |  10 +-
 arch/mips/mm/uasm-mips.c                      |  10 +-
 arch/mips/mm/uasm.c                           | 106 +++++++++----------
 arch/mips/mti-malta/malta-smtc.c              |   6 +-
 arch/mips/mti-malta/malta-time.c              |   2 +-
 arch/mips/mti-sead3/sead3-time.c              |   2 +-
 arch/mips/netlogic/common/smp.c               |   4 +-
 arch/mips/netlogic/common/smpboot.S           |   4 -
 arch/mips/netlogic/common/time.c              |   2 +-
 arch/mips/netlogic/xlr/wakeup.c               |   2 +-
 arch/mips/pci/pci-ip27.c                      |   2 +-
 arch/mips/pmcs-msp71xx/msp_smtc.c             |   7 +-
 arch/mips/pmcs-msp71xx/msp_time.c             |   2 +-
 arch/mips/pnx833x/common/interrupts.c         |   2 +-
 arch/mips/powertv/time.c                      |   2 +-
 arch/mips/ralink/irq.c                        |   2 +-
 arch/mips/sgi-ip27/ip27-init.c                |   4 +-
 arch/mips/sgi-ip27/ip27-smp.c                 |   6 +-
 arch/mips/sgi-ip27/ip27-timer.c               |   6 +-
 arch/mips/sgi-ip27/ip27-xtalk.c               |   6 +-
 arch/mips/sibyte/bcm1480/smp.c                |   8 +-
 arch/mips/sibyte/sb1250/smp.c                 |   8 +-
 arch/openrisc/kernel/setup.c                  |   2 +-
 arch/parisc/kernel/firmware.c                 |  14 +--
 arch/parisc/kernel/hardware.c                 |   2 +-
 arch/parisc/kernel/processor.c                |   6 +-
 arch/parisc/kernel/smp.c                      |   8 +-
 arch/s390/kernel/cache.c                      |  15 ++-
 arch/s390/kernel/perf_cpum_cf.c               |   4 +-
 arch/s390/kernel/processor.c                  |   2 +-
 arch/s390/kernel/smp.c                        |  17 ++-
 arch/s390/kernel/sysinfo.c                    |   2 +-
 arch/s390/kernel/vtime.c                      |   6 +-
 arch/s390/mm/fault.c                          |   4 +-
 arch/score/mm/tlb-score.c                     |   2 +-
 arch/sh/kernel/cpu/init.c                     |  18 ++--
 arch/sh/kernel/cpu/sh2/probe.c                |   2 +-
 arch/sh/kernel/cpu/sh2a/probe.c               |   2 +-
 arch/sh/kernel/cpu/sh3/probe.c                |   2 +-
 arch/sh/kernel/cpu/sh4/probe.c                |   2 +-
 arch/sh/kernel/cpu/sh4a/smp-shx3.c            |   6 +-
 arch/sh/kernel/cpu/sh5/probe.c                |   2 +-
 arch/sh/kernel/perf_event.c                   |   4 +-
 arch/sh/kernel/process.c                      |   2 +-
 arch/sh/kernel/setup.c                        |   2 +-
 arch/sh/kernel/smp.c                          |   8 +-
 arch/sh/kernel/traps_32.c                     |   2 +-
 arch/sh/kernel/traps_64.c                     |   2 +-
 arch/sh/mm/tlb-sh5.c                          |   2 +-
 arch/sparc/kernel/ds.c                        |  11 +-
 arch/sparc/kernel/entry.h                     |   2 +-
 arch/sparc/kernel/hvtramp.S                   |   1 -
 arch/sparc/kernel/irq_64.c                    |   5 +-
 arch/sparc/kernel/leon_smp.c                  |  10 +-
 arch/sparc/kernel/mdesc.c                     |  34 +++---
 arch/sparc/kernel/smp_32.c                    |  20 ++--
 arch/sparc/kernel/smp_64.c                    |   9 +-
 arch/sparc/kernel/sun4d_smp.c                 |   6 +-
 arch/sparc/kernel/sun4m_smp.c                 |   6 +-
 arch/sparc/kernel/sysfs.c                     |   4 +-
 arch/sparc/kernel/trampoline_32.S             |   3 -
 arch/sparc/kernel/trampoline_64.S             |   2 -
 arch/sparc/mm/init_64.c                       |   2 +-
 arch/sparc/mm/srmmu.c                         |  12 +--
 arch/tile/kernel/irq.c                        |   2 +-
 arch/tile/kernel/messaging.c                  |   2 +-
 arch/tile/kernel/setup.c                      |  12 +--
 arch/tile/kernel/smpboot.c                    |   8 +-
 arch/tile/kernel/time.c                       |   2 +-
 arch/x86/include/asm/cpu.h                    |   2 +-
 arch/x86/include/asm/microcode.h              |   4 +-
 arch/x86/include/asm/microcode_amd.h          |   4 +-
 arch/x86/include/asm/microcode_intel.h        |   4 +-
 arch/x86/include/asm/mmconfig.h               |   4 +-
 arch/x86/include/asm/mpspec.h                 |   2 +-
 arch/x86/include/asm/numa.h                   |   6 +-
 arch/x86/include/asm/processor.h              |   2 +-
 arch/x86/include/asm/prom.h                   |   2 +-
 arch/x86/include/asm/smp.h                    |   2 +-
 arch/x86/kernel/acpi/boot.c                   |   6 +-
 arch/x86/kernel/apic/apic.c                   |  30 +++---
 arch/x86/kernel/apic/apic_numachip.c          |   2 +-
 arch/x86/kernel/apic/es7000_32.c              |   2 +-
 arch/x86/kernel/apic/numaq_32.c               |   2 +-
 arch/x86/kernel/apic/x2apic_cluster.c         |   2 +-
 arch/x86/kernel/apic/x2apic_uv_x.c            |  14 +--
 arch/x86/kernel/cpu/amd.c                     |  33 +++---
 arch/x86/kernel/cpu/centaur.c                 |  26 ++---
 arch/x86/kernel/cpu/common.c                  |  64 ++++++------
 arch/x86/kernel/cpu/cyrix.c                   |  40 +++----
 arch/x86/kernel/cpu/hypervisor.c              |   2 +-
 arch/x86/kernel/cpu/intel.c                   |  30 +++---
 arch/x86/kernel/cpu/intel_cacheinfo.c         |  55 +++++-----
 arch/x86/kernel/cpu/mcheck/mce.c              |  23 ++--
 arch/x86/kernel/cpu/mcheck/mce_amd.c          |  14 ++-
 arch/x86/kernel/cpu/mcheck/therm_throt.c      |   9 +-
 arch/x86/kernel/cpu/perf_event.c              |   2 +-
 arch/x86/kernel/cpu/perf_event_amd_ibs.c      |   2 +-
 arch/x86/kernel/cpu/perf_event_amd_uncore.c   |  31 +++---
 arch/x86/kernel/cpu/perf_event_intel_uncore.c |  20 ++--
 arch/x86/kernel/cpu/rdrand.c                  |   2 +-
 arch/x86/kernel/cpu/scattered.c               |   4 +-
 arch/x86/kernel/cpu/topology.c                |   2 +-
 arch/x86/kernel/cpu/transmeta.c               |   6 +-
 arch/x86/kernel/cpu/umc.c                     |   2 +-
 arch/x86/kernel/cpu/vmware.c                  |   2 +-
 arch/x86/kernel/cpuid.c                       |   7 +-
 arch/x86/kernel/devicetree.c                  |   2 +-
 arch/x86/kernel/head_32.S                     |   1 -
 arch/x86/kernel/i387.c                        |  10 +-
 arch/x86/kernel/irq_32.c                      |   2 +-
 arch/x86/kernel/kvm.c                         |  10 +-
 arch/x86/kernel/kvmclock.c                    |   2 +-
 arch/x86/kernel/microcode_amd_early.c         |   8 +-
 arch/x86/kernel/microcode_core.c              |   2 +-
 arch/x86/kernel/microcode_core_early.c        |   6 +-
 arch/x86/kernel/microcode_intel_early.c       |  26 ++---
 arch/x86/kernel/mmconf-fam10h_64.c            |  12 +--
 arch/x86/kernel/msr.c                         |   6 +-
 arch/x86/kernel/process.c                     |   2 +-
 arch/x86/kernel/setup.c                       |   2 +-
 arch/x86/kernel/smpboot.c                     |  28 ++---
 arch/x86/kernel/tboot.c                       |   6 +-
 arch/x86/kernel/tsc.c                         |   4 +-
 arch/x86/kernel/tsc_sync.c                    |  18 ++--
 arch/x86/kernel/vsyscall_64.c                 |   6 +-
 arch/x86/kernel/x86_init.c                    |   4 +-
 arch/x86/kernel/xsave.c                       |   4 +-
 arch/x86/mm/mmio-mod.c                        |   4 +-
 arch/x86/mm/numa.c                            |  12 +--
 arch/x86/mm/numa_emulation.c                  |  12 +--
 arch/x86/mm/setup_nx.c                        |   4 +-
 arch/x86/pci/amd_bus.c                        |   8 +-
 arch/x86/platform/ce4100/ce4100.c             |   2 +-
 arch/x86/platform/mrst/mrst.c                 |   4 +-
 arch/x86/xen/enlighten.c                      |   6 +-
 arch/x86/xen/setup.c                          |   6 +-
 arch/x86/xen/smp.c                            |  12 +--
 arch/x86/xen/spinlock.c                       |   2 +-
 arch/x86/xen/xen-ops.h                        |   2 +-
 arch/xtensa/kernel/time.c                     |   2 +-
 block/blk-iopoll.c                            |   6 +-
 block/blk-softirq.c                           |   6 +-
 drivers/acpi/acpi_processor.c                 |   2 +-
 drivers/acpi/processor_core.c                 |   8 +-
 drivers/acpi/processor_driver.c               |   8 +-
 drivers/acpi/processor_idle.c                 |   6 +-
 drivers/base/cpu.c                            |   2 +-
 drivers/base/topology.c                       |  10 +-
 drivers/clocksource/arm_arch_timer.c          |   8 +-
 drivers/clocksource/dummy_timer.c             |   6 +-
 drivers/clocksource/exynos_mct.c              |   4 +-
 drivers/clocksource/metag_generic.c           |   6 +-
 drivers/clocksource/time-armada-370-xp.c      |   4 +-
 drivers/clocksource/timer-marco.c             |   4 +-
 drivers/cpufreq/cpufreq.c                     |   2 +-
 drivers/cpufreq/cpufreq_stats.c               |   2 +-
 drivers/cpufreq/dbx500-cpufreq.c              |   2 +-
 drivers/cpufreq/intel_pstate.c                |   4 +-
 drivers/cpufreq/longhaul.c                    |   6 +-
 drivers/cpufreq/longhaul.h                    |  26 ++---
 drivers/cpufreq/longrun.c                     |   6 +-
 drivers/cpufreq/omap-cpufreq.c                |   2 +-
 drivers/cpufreq/powernow-k7.c                 |   8 +-
 drivers/cpufreq/powernow-k8.c                 |   6 +-
 drivers/hwmon/coretemp.c                      |  39 ++++---
 drivers/hwmon/via-cputemp.c                   |   8 +-
 drivers/irqchip/irq-gic.c                     |   8 +-
 drivers/oprofile/timer_int.c                  |   4 +-
 drivers/xen/xen-acpi-cpuhotplug.c             |   2 +-
 include/asm-generic/vmlinux.lds.h             |  12 ---
 include/linux/cpu.h                           |   2 +-
 include/linux/init.h                          |  19 ++--
 include/linux/perf_event.h                    |   2 +-
 init/calibrate.c                              |  13 ++-
 kernel/cpu.c                                  |   6 +-
 kernel/events/core.c                          |   4 +-
 kernel/fork.c                                 |   2 +-
 kernel/hrtimer.c                              |   6 +-
 kernel/printk.c                               |   2 +-
 kernel/profile.c                              |   2 +-
 kernel/rcutorture.c                           |   6 +-
 kernel/rcutree.c                              |   6 +-
 kernel/rcutree.h                              |   4 +-
 kernel/rcutree_plugin.h                       |   6 +-
 kernel/relay.c                                |   2 +-
 kernel/sched/core.c                           |  12 +--
 kernel/sched/fair.c                           |   2 +-
 kernel/smp.c                                  |   2 +-
 kernel/smpboot.c                              |   2 +-
 kernel/softirq.c                              |   8 +-
 kernel/time/tick-sched.c                      |   2 +-
 kernel/timer.c                                |  10 +-
 kernel/workqueue.c                            |   4 +-
 lib/Kconfig.debug                             |   2 +-
 lib/earlycpio.c                               |   2 +-
 lib/percpu_counter.c                          |   2 +-
 mm/memcontrol.c                               |   2 +-
 mm/page-writeback.c                           |   4 +-
 mm/slab.c                                     |  10 +-
 mm/slub.c                                     |   4 +-
 mm/vmstat.c                                   |   6 +-
 net/core/flow.c                               |   4 +-
 net/iucv/iucv.c                               |   2 +-
 scripts/mod/modpost.c                         |  52 ++--------
 335 files changed, 1093 insertions(+), 1282 deletions(-)