-

HEAD detached from 9b1ac40
You are currently cherry-picking commit d4159d4.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   Documentation/cgroups/cpusets.txt
	modified:   Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
	modified:   Documentation/devicetree/bindings/tty/serial/of-serial.txt
	modified:   Documentation/hwmon/coretemp
	modified:   Documentation/i2c/busses/i2c-piix4
	modified:   Documentation/ja_JP/HOWTO
	modified:   Documentation/ja_JP/stable_kernel_rules.txt
	modified:   Documentation/kernel-parameters.txt
	new file:   Documentation/lzo.txt
	modified:   Documentation/stable_kernel_rules.txt
	modified:   Documentation/sysctl/kernel.txt
	modified:   Documentation/x86/x86_64/mm.txt
	modified:   Documentation/zh_CN/HOWTO
	modified:   Documentation/zh_CN/stable_kernel_rules.txt
	modified:   arch/alpha/include/asm/io.h
	modified:   arch/alpha/oprofile/common.c
	modified:   arch/arm/Kconfig
	modified:   arch/arm/boot/dts/imx51-babbage.dts
	deleted:    arch/arm/include/asm/a.out-core.h
	deleted:    arch/arm/include/asm/a.out.h
	modified:   arch/arm/include/asm/cacheflush.h
	modified:   arch/arm/include/asm/div64.h
	modified:   arch/arm/include/asm/outercache.h
	modified:   arch/arm/include/asm/processor.h
	modified:   arch/arm/include/asm/uaccess.h
	modified:   arch/arm/kernel/crash_dump.c
	modified:   arch/arm/kernel/entry-header.S
	modified:   arch/arm/kernel/head.S
	modified:   arch/arm/kernel/machine_kexec.c
	modified:   arch/arm/kernel/process.c
	modified:   arch/arm/kernel/stacktrace.c
	modified:   arch/arm/kernel/topology.c
	modified:   arch/arm/mach-at91/sam9_smc.c
	modified:   arch/arm/mach-dove/common.c
	modified:   arch/arm/mach-footbridge/common.c
	modified:   arch/arm/mach-footbridge/dc21285.c
	modified:   arch/arm/mach-integrator/integrator_cp.c
	modified:   arch/arm/mach-kirkwood/common.c
	modified:   arch/arm/mach-mv78xx0/common.c
	modified:   arch/arm/mach-omap2/irq.c
	modified:   arch/arm/mach-omap2/mux.c
	modified:   arch/arm/mach-omap2/omap_hwmod.c
	modified:   arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
	modified:   arch/arm/mach-orion5x/common.c
	modified:   arch/arm/mach-pxa/reset.c
	modified:   arch/arm/mach-pxa/tosa.c
	modified:   arch/arm/mach-sa1100/assabet.c
	modified:   arch/arm/mach-sa1100/include/mach/collie.h
	modified:   arch/arm/mach-shmobile/board-mackerel.c
	modified:   arch/arm/mach-u300/include/mach/u300-regs.h
	modified:   arch/arm/mach-w90x900/include/mach/entry-macro.S
	modified:   arch/arm/mm/abort-ev6.S
	modified:   arch/arm/mm/abort-ev7.S
	modified:   arch/arm/mm/idmap.c
	modified:   arch/arm/plat-orion/common.c
	modified:   arch/arm/plat-orion/include/plat/common.h
	modified:   arch/avr32/Makefile
	modified:   arch/avr32/boards/mimc200/fram.c
	modified:   arch/avr32/boot/u-boot/head.S
	modified:   arch/avr32/kernel/entry-avr32b.S
	modified:   arch/avr32/kernel/head.S
	modified:   arch/cris/include/asm/io.h
	modified:   arch/ia64/include/asm/processor.h
	modified:   arch/m68k/mm/hwtest.c
	modified:   arch/mips/boot/compressed/decompress.c
	modified:   arch/mips/cavium-octeon/setup.c
	modified:   arch/mips/include/asm/jump_label.h
	modified:   arch/mips/kernel/irq-msc01.c
	modified:   arch/mips/kernel/mcount.S
	modified:   arch/mips/kernel/perf_event_mipsxx.c
	modified:   arch/mips/mm/c-r4k.c
	modified:   arch/mips/mm/dma-default.c
	modified:   arch/mips/mm/tlbex.c
	modified:   arch/mips/oprofile/backtrace.c
	modified:   arch/mips/power/hibernate.S
	modified:   arch/openrisc/kernel/head.S
	modified:   arch/parisc/Makefile
	modified:   arch/parisc/kernel/head.S
	modified:   arch/parisc/kernel/syscall_table.S
	modified:   arch/powerpc/Makefile
	modified:   arch/powerpc/include/asm/exception-64s.h
	modified:   arch/powerpc/include/asm/jump_label.h
	modified:   arch/powerpc/include/asm/ppc_asm.h
	modified:   arch/powerpc/kernel/cacheinfo.c
	modified:   arch/powerpc/kernel/crash_dump.c
	modified:   arch/powerpc/kernel/entry_64.S
	modified:   arch/powerpc/kernel/exceptions-64s.S
	modified:   arch/powerpc/kernel/head_64.S
	modified:   arch/powerpc/kernel/lparcfg.c
	modified:   arch/powerpc/kernel/reloc_64.S
	modified:   arch/powerpc/kernel/setup_64.c
	modified:   arch/powerpc/kernel/signal_32.c
	modified:   arch/powerpc/kernel/signal_64.c
	modified:   arch/powerpc/kernel/sysfs.c
	modified:   arch/powerpc/kernel/time.c
	modified:   arch/powerpc/kernel/traps.c
	modified:   arch/powerpc/kvm/book3s_64_mmu_hv.c
	modified:   arch/powerpc/kvm/book3s_hv_rm_mmu.c
	modified:   arch/powerpc/kvm/emulate.c
	modified:   arch/powerpc/lib/checksum_64.S
	modified:   arch/powerpc/lib/crtsavres.S
	modified:   arch/powerpc/lib/sstep.c
	modified:   arch/powerpc/perf/core-book3s.c
	modified:   arch/powerpc/platforms/powernv/pci-ioda.c
	modified:   arch/powerpc/platforms/pseries/eeh_pseries.c
	modified:   arch/s390/crypto/aes_s390.c
	modified:   arch/s390/include/asm/jump_label.h
	modified:   arch/s390/include/asm/lowcore.h
	modified:   arch/s390/kernel/head64.S
	modified:   arch/s390/kernel/ptrace.c
	modified:   arch/s390/kvm/interrupt.c
	modified:   arch/s390/kvm/kvm-s390.c
	modified:   arch/s390/mm/page-states.c
	modified:   arch/sh/kernel/dumpstack.c
	modified:   arch/sh/lib/Makefile
	modified:   arch/sparc/Kconfig
	modified:   arch/sparc/include/asm/jump_label.h
	modified:   arch/sparc/include/asm/pgtable_64.h
	modified:   arch/sparc/include/asm/uaccess_64.h
	modified:   arch/sparc/kernel/ldc.c
	modified:   arch/sparc/kernel/pci.c
	modified:   arch/sparc/kernel/smp_64.c
	modified:   arch/sparc/kernel/sys32.S
	modified:   arch/sparc/kernel/unaligned_64.c
	modified:   arch/sparc/lib/NG2memcpy.S
	modified:   arch/sparc/math-emu/math_32.c
	modified:   arch/sparc/mm/fault_64.c
	modified:   arch/sparc/mm/init_64.c
	modified:   arch/sparc/mm/tsb.c
	modified:   arch/um/kernel/exitcode.c
	modified:   arch/unicore32/Kconfig
	modified:   arch/unicore32/include/asm/bug.h
	modified:   arch/unicore32/include/asm/cmpxchg.h
	modified:   arch/unicore32/kernel/setup.h
	modified:   arch/x86/Kconfig
	modified:   arch/x86/boot/Makefile
	modified:   arch/x86/boot/compressed/Makefile
	modified:   arch/x86/crypto/ghash-clmulni-intel_asm.S
	modified:   arch/x86/crypto/ghash-clmulni-intel_glue.c
	modified:   arch/x86/include/asm/cpufeature.h
	modified:   arch/x86/include/asm/desc.h
	modified:   arch/x86/include/asm/elf.h
	new file:   arch/x86/include/asm/espfix.h
	modified:   arch/x86/include/asm/fpu-internal.h
	modified:   arch/x86/include/asm/hugetlb.h
	modified:   arch/x86/include/asm/irqflags.h
	modified:   arch/x86/include/asm/jump_label.h
	modified:   arch/x86/include/asm/kvm_host.h
	modified:   arch/x86/include/asm/page_32_types.h
	modified:   arch/x86/include/asm/page_64_types.h
	modified:   arch/x86/include/asm/pgtable_64_types.h
	modified:   arch/x86/include/asm/ptrace.h
	modified:   arch/x86/include/asm/setup.h
	modified:   arch/x86/include/asm/topology.h
	modified:   arch/x86/include/asm/vmx.h
	modified:   arch/x86/kernel/Makefile
	modified:   arch/x86/kernel/apic/apic.c
	modified:   arch/x86/kernel/cpu/common.c
	modified:   arch/x86/kernel/cpu/intel.c
	modified:   arch/x86/kernel/cpu/perf_event.c
	modified:   arch/x86/kernel/cpu/perf_event_amd_ibs.c
	modified:   arch/x86/kernel/cpu/perf_event_intel.c
	modified:   arch/x86/kernel/crash.c
	modified:   arch/x86/kernel/dumpstack_64.c
	modified:   arch/x86/kernel/entry_32.S
	modified:   arch/x86/kernel/entry_64.S
	new file:   arch/x86/kernel/espfix_64.c
	modified:   arch/x86/kernel/kvm.c
	modified:   arch/x86/kernel/kvmclock.c
	modified:   arch/x86/kernel/ldt.c
	modified:   arch/x86/kernel/microcode_amd.c
	modified:   arch/x86/kernel/paravirt_patch_64.c
	modified:   arch/x86/kernel/quirks.c
	modified:   arch/x86/kernel/reboot.c
	modified:   arch/x86/kernel/smpboot.c
	modified:   arch/x86/kernel/step.c
	modified:   arch/x86/kernel/sys_x86_64.c
	modified:   arch/x86/kernel/tls.c
	modified:   arch/x86/kernel/traps.c
	modified:   arch/x86/kernel/tsc.c
	modified:   arch/x86/kvm/emulate.c
	modified:   arch/x86/kvm/i8254.c
	modified:   arch/x86/kvm/lapic.c
	modified:   arch/x86/kvm/lapic.h
	modified:   arch/x86/kvm/mmu.c
	modified:   arch/x86/kvm/svm.c
	modified:   arch/x86/kvm/vmx.c
	modified:   arch/x86/kvm/x86.c
	modified:   arch/x86/kvm/x86.h
	modified:   arch/x86/mm/dump_pagetables.c
	modified:   arch/x86/mm/ioremap.c
	modified:   arch/x86/mm/mmap.c
	modified:   arch/x86/net/bpf_jit.S
	modified:   arch/x86/xen/enlighten.c
	modified:   arch/x86/xen/smp.c
	modified:   arch/xtensa/include/asm/ioctls.h
	modified:   arch/xtensa/include/asm/pgtable.h
	modified:   arch/xtensa/include/asm/unistd.h
	modified:   arch/xtensa/kernel/entry.S
	modified:   arch/xtensa/kernel/pci-dma.c
	modified:   arch/xtensa/kernel/signal.c
	modified:   block/blk-core.c
	modified:   block/blk-exec.c
	modified:   block/blk-settings.c
	modified:   block/blk-tag.c
	modified:   block/blk-timeout.c
	modified:   block/elevator.c
	modified:   block/partition-generic.c
	modified:   block/scsi_ioctl.c
	modified:   crypto/af_alg.c
	modified:   crypto/algif_hash.c
	modified:   crypto/algif_skcipher.c
	modified:   crypto/ansi_cprng.c
	modified:   crypto/authenc.c
	modified:   crypto/ccm.c
	modified:   crypto/crypto_wq.c
	modified:   crypto/testmgr.h
	modified:   drivers/acpi/acpica/exoparg1.c
	modified:   drivers/acpi/acpica/exstore.c
	modified:   drivers/acpi/blacklist.c
	modified:   drivers/acpi/bus.c
	modified:   drivers/acpi/processor_idle.c
	modified:   drivers/acpi/processor_throttling.c
	modified:   drivers/acpi/video_detect.c
	modified:   drivers/ata/libahci.c
	modified:   drivers/ata/libata-eh.c
	modified:   drivers/ata/libata-pmp.c
	modified:   drivers/ata/libata-sff.c
	modified:   drivers/ata/libata-transport.c
	modified:   drivers/ata/pata_at91.c
	modified:   drivers/ata/pata_scc.c
	modified:   drivers/ata/pata_serverworks.c
	modified:   drivers/ata/sata_sil.c
	modified:   drivers/atm/ambassador.c
	modified:   drivers/atm/idt77252.c
	modified:   drivers/base/core.c
	modified:   drivers/base/dd.c
	modified:   drivers/base/regmap/regmap-debugfs.c
	modified:   drivers/base/regmap/regmap.c
	modified:   drivers/block/brd.c
	modified:   drivers/block/floppy.c
	modified:   drivers/block/loop.c
	modified:   drivers/block/virtio_blk.c
	modified:   drivers/block/xen-blkback/common.h
	modified:   drivers/block/xen-blkback/xenbus.c
	modified:   drivers/block/xen-blkfront.c
	modified:   drivers/bluetooth/ath3k.c
	modified:   drivers/char/applicom.c
	modified:   drivers/char/i8k.c
	modified:   drivers/char/ipmi/ipmi_bt_sm.c
	modified:   drivers/char/ipmi/ipmi_kcs_sm.c
	modified:   drivers/char/ipmi/ipmi_si_intf.c
	modified:   drivers/char/raw.c
	modified:   drivers/char/virtio_console.c
	modified:   drivers/connector/cn_proc.c
	modified:   drivers/connector/connector.c
	modified:   drivers/cpufreq/powernow-k6.c
	modified:   drivers/crypto/caam/error.c
	modified:   drivers/crypto/msm/qcrypto.c
	modified:   drivers/dma/Kconfig
	modified:   drivers/dma/ste_dma40.c
	modified:   drivers/edac/e752x_edac.c
	modified:   drivers/edac/i7300_edac.c
	modified:   drivers/edac/i7core_edac.c
	modified:   drivers/edac/i82975x_edac.c
	modified:   drivers/edac/mpc85xx_edac.c
	modified:   drivers/edac/sb_edac.c
	modified:   drivers/firewire/core-cdev.c
	modified:   drivers/firewire/core-device.c
	modified:   drivers/firewire/net.c
	modified:   drivers/firewire/sbp2.c
	modified:   drivers/firmware/Kconfig
	modified:   drivers/gpio/gpio-mpc8xxx.c
	modified:   drivers/gpio/gpio-mxs.c
	modified:   drivers/gpu/drm/drm_crtc_helper.c
	modified:   drivers/gpu/drm/drm_drv.c
	modified:   drivers/gpu/drm/i915/i915_debugfs.c
	modified:   drivers/gpu/drm/i915/i915_dma.c
	modified:   drivers/gpu/drm/i915/i915_gem.c
	modified:   drivers/gpu/drm/i915/i915_irq.c
	modified:   drivers/gpu/drm/i915/intel_bios.c
	modified:   drivers/gpu/drm/i915/intel_crt.c
	modified:   drivers/gpu/drm/i915/intel_dp.c
	modified:   drivers/gpu/drm/i915/intel_drv.h
	modified:   drivers/gpu/drm/i915/intel_lvds.c
	modified:   drivers/gpu/drm/i915/intel_opregion.c
	modified:   drivers/gpu/drm/i915/intel_panel.c
	modified:   drivers/gpu/drm/i915/intel_sdvo.c
	modified:   drivers/gpu/drm/nouveau/nouveau_acpi.c
	modified:   drivers/gpu/drm/nouveau/nouveau_bo.c
	modified:   drivers/gpu/drm/nouveau/nouveau_gem.c
	modified:   drivers/gpu/drm/radeon/atombios_crtc.c
	modified:   drivers/gpu/drm/radeon/evergreen_cs.c
	modified:   drivers/gpu/drm/radeon/r600.c
	modified:   drivers/gpu/drm/radeon/r600_cs.c
	modified:   drivers/gpu/drm/radeon/r600_hdmi.c
	modified:   drivers/gpu/drm/radeon/r600d.h
	modified:   drivers/gpu/drm/radeon/radeon_atombios.c
	modified:   drivers/gpu/drm/radeon/radeon_atpx_handler.c
	modified:   drivers/gpu/drm/radeon/radeon_connectors.c
	modified:   drivers/gpu/drm/radeon/radeon_display.c
	modified:   drivers/gpu/drm/radeon/radeon_i2c.c
	modified:   drivers/gpu/drm/radeon/radeon_kms.c
	modified:   drivers/gpu/drm/radeon/radeon_legacy_crtc.c
	modified:   drivers/gpu/drm/radeon/radeon_mode.h
	modified:   drivers/gpu/drm/radeon/radeon_pm.c
	modified:   drivers/gpu/drm/radeon/rs600.c
	modified:   drivers/gpu/drm/radeon/rv770.c
	modified:   drivers/gpu/drm/radeon/sid.h
	modified:   drivers/gpu/drm/ttm/ttm_bo.c
	modified:   drivers/gpu/drm/ttm/ttm_bo_util.c
	modified:   drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
	modified:   drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
	modified:   drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
	modified:   drivers/hid/hid-apple.c
	modified:   drivers/hid/hid-cherry.c
	modified:   drivers/hid/hid-ids.h
	modified:   drivers/hid/hid-input.c
	modified:   drivers/hid/hid-kye.c
	modified:   drivers/hid/hid-lg.c
	modified:   drivers/hid/hid-logitech-dj.h
	modified:   drivers/hid/hid-magicmouse.c
	modified:   drivers/hid/hid-monterey.c
	modified:   drivers/hid/hid-multitouch.c
	modified:   drivers/hid/hid-petalynx.c
	modified:   drivers/hid/hid-picolcd.c
	modified:   drivers/hid/hid-roccat-kovaplus.c
	modified:   drivers/hid/hid-sony.c
	modified:   drivers/hid/hid-sunplus.c
	modified:   drivers/hid/hidraw.c
	modified:   drivers/hv/connection.c
	modified:   drivers/hv/ring_buffer.c
	modified:   drivers/hv/vmbus_drv.c
	modified:   drivers/hwmon/adm1029.c
	modified:   drivers/hwmon/amc6821.c
	modified:   drivers/hwmon/applesmc.c
	modified:   drivers/hwmon/coretemp.c
	modified:   drivers/hwmon/emc1403.c
	modified:   drivers/hwmon/lm78.c
	modified:   drivers/hwmon/lm90.c
	modified:   drivers/hwmon/max1668.c
	modified:   drivers/hwmon/sis5595.c
	modified:   drivers/hwmon/vt8231.c
	modified:   drivers/hwmon/w83l786ng.c
	modified:   drivers/i2c/busses/i2c-designware-core.c
	modified:   drivers/i2c/busses/i2c-piix4.c
	modified:   drivers/i2c/busses/i2c-tegra.c
	modified:   drivers/idle/intel_idle.c
	modified:   drivers/infiniband/core/user_mad.c
	modified:   drivers/infiniband/hw/ehca/ehca_cq.c
	modified:   drivers/infiniband/hw/ipath/ipath_diag.c
	modified:   drivers/infiniband/hw/ipath/ipath_user_sdma.c
	modified:   drivers/infiniband/hw/mthca/mthca_provider.c
	modified:   drivers/infiniband/hw/nes/nes_verbs.c
	modified:   drivers/infiniband/hw/qib/qib_iba7322.c
	modified:   drivers/infiniband/hw/qib/qib_mad.c
	modified:   drivers/infiniband/hw/qib/qib_ud.c
	modified:   drivers/infiniband/hw/qib/qib_user_sdma.c
	modified:   drivers/infiniband/ulp/srp/ib_srp.c
	modified:   drivers/infiniband/ulp/srpt/ib_srpt.c
	modified:   drivers/input/Kconfig
	modified:   drivers/input/input.c
	modified:   drivers/input/keyboard/Kconfig
	modified:   drivers/input/mouse/alps.c
	modified:   drivers/input/mouse/elantech.c
	modified:   drivers/input/mouse/synaptics.c
	modified:   drivers/input/mouse/synaptics.h
	modified:   drivers/input/serio/Kconfig
	modified:   drivers/input/serio/i8042-x86ia64io.h
	modified:   drivers/input/serio/serport.c
	modified:   drivers/input/touchscreen/usbtouchscreen.c
	modified:   drivers/iommu/amd_iommu.c
	modified:   drivers/iommu/dmar.c
	modified:   drivers/isdn/isdnloop/isdnloop.c
	modified:   drivers/isdn/mISDN/socket.c
	modified:   drivers/md/Kconfig
	modified:   drivers/md/Makefile
	modified:   drivers/md/dm-bufio.c
	new file:   drivers/md/dm-builtin.c
	modified:   drivers/md/dm-crypt.c
	modified:   drivers/md/dm-delay.c
	modified:   drivers/md/dm-log-userspace-transfer.c
	modified:   drivers/md/dm-mpath.c
	modified:   drivers/md/dm-raid.c
	modified:   drivers/md/dm-snap-persistent.c
	modified:   drivers/md/dm-snap.c
	modified:   drivers/md/dm-sysfs.c
	modified:   drivers/md/dm-table.c
	modified:   drivers/md/dm-thin.c
	modified:   drivers/md/dm.c
	modified:   drivers/md/dm.h
	modified:   drivers/md/md.c
	modified:   drivers/md/persistent-data/dm-space-map-common.c
	modified:   drivers/md/raid1.c
	modified:   drivers/md/raid10.c
	modified:   drivers/md/raid5.c
	modified:   drivers/media/media-device.c
	modified:   drivers/media/video/gspca/kinect.c
	modified:   drivers/media/video/hdpvr/hdpvr-core.c
	modified:   drivers/media/video/omap/omap_vout.c
	modified:   drivers/media/video/saa7134/saa7134-alsa.c
	modified:   drivers/media/video/saa7164/saa7164-core.c
	modified:   drivers/media/video/v4l2-device.c
	modified:   drivers/mfd/max8925-i2c.c
	modified:   drivers/mfd/max8997.c
	modified:   drivers/mfd/max8998.c
	modified:   drivers/misc/enclosure.c
	modified:   drivers/misc/hpilo.c
	modified:   drivers/mmc/host/atmel-mci.c
	modified:   drivers/mmc/host/mxs-mmc.c
	modified:   drivers/mtd/devices/m25p80.c
	modified:   drivers/mtd/nand/gpmi-nand/gpmi-nand.c
	modified:   drivers/mtd/nand/mxc_nand.c
	modified:   drivers/mtd/nand/nand_base.c
	modified:   drivers/mtd/nand/nuc900_nand.c
	modified:   drivers/mtd/nand/pxa3xx_nand.c
	modified:   drivers/mtd/sm_ftl.c
	modified:   drivers/mtd/ubi/scan.c
	modified:   drivers/net/bonding/bond_3ad.c
	modified:   drivers/net/bonding/bond_3ad.h
	modified:   drivers/net/bonding/bond_main.c
	modified:   drivers/net/bonding/bond_sysfs.c
	modified:   drivers/net/can/at91_can.c
	modified:   drivers/net/can/c_can/c_can.c
	modified:   drivers/net/can/dev.c
	modified:   drivers/net/can/flexcan.c
	modified:   drivers/net/can/sja1000/peak_pci.c
	modified:   drivers/net/can/usb/esd_usb2.c
	modified:   drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
	modified:   drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
	modified:   drivers/net/ethernet/broadcom/tg3.c
	modified:   drivers/net/ethernet/broadcom/tg3.h
	modified:   drivers/net/ethernet/calxeda/xgmac.c
	modified:   drivers/net/ethernet/emulex/benet/be_main.c
	modified:   drivers/net/ethernet/ibm/ehea/ehea_main.c
	modified:   drivers/net/ethernet/ibm/ibmveth.c
	modified:   drivers/net/ethernet/intel/e1000e/e1000.h
	modified:   drivers/net/ethernet/intel/e1000e/netdev.c
	modified:   drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
	modified:   drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
	modified:   drivers/net/ethernet/marvell/mv643xx_eth.c
	modified:   drivers/net/ethernet/mellanox/mlx4/en_cq.c
	modified:   drivers/net/ethernet/mellanox/mlx4/en_netdev.c
	modified:   drivers/net/ethernet/mellanox/mlx4/main.c
	modified:   drivers/net/ethernet/mellanox/mlx4/mlx4.h
	modified:   drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
	modified:   drivers/net/ethernet/realtek/8139cp.c
	modified:   drivers/net/ethernet/tehuti/tehuti.c
	modified:   drivers/net/ethernet/ti/davinci_emac.c
	modified:   drivers/net/ethernet/via/via-rhine.c
	modified:   drivers/net/ethernet/xilinx/ll_temac_main.c
	modified:   drivers/net/ethernet/xilinx/xilinx_axienet_main.c
	modified:   drivers/net/hamradio/hdlcdrv.c
	modified:   drivers/net/hamradio/yam.c
	modified:   drivers/net/hyperv/netvsc_drv.c
	modified:   drivers/net/macvlan.c
	modified:   drivers/net/macvtap.c
	modified:   drivers/net/ppp/ppp_generic.c
	modified:   drivers/net/ppp/pppoe.c
	modified:   drivers/net/team/team.c
	modified:   drivers/net/tun.c
	modified:   drivers/net/usb/dm9601.c
	modified:   drivers/net/usb/gl620a.c
	modified:   drivers/net/usb/mcs7830.c
	modified:   drivers/net/usb/net1080.c
	modified:   drivers/net/usb/rndis_host.c
	modified:   drivers/net/usb/smsc75xx.c
	modified:   drivers/net/usb/smsc95xx.c
	modified:   drivers/net/usb/usbnet.c
	modified:   drivers/net/virtio_net.c
	modified:   drivers/net/vmxnet3/vmxnet3_drv.c
	modified:   drivers/net/wan/farsync.c
	modified:   drivers/net/wan/wanxl.c
	modified:   drivers/net/wimax/i2400m/usb-rx.c
	modified:   drivers/net/wireless/ath/ath9k/ar9002_mac.c
	modified:   drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
	modified:   drivers/net/wireless/ath/ath9k/ar9003_hw.c
	modified:   drivers/net/wireless/ath/ath9k/ar9003_phy.c
	modified:   drivers/net/wireless/ath/ath9k/ar9003_phy.h
	modified:   drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
	modified:   drivers/net/wireless/ath/ath9k/calib.c
	modified:   drivers/net/wireless/ath/ath9k/htc.h
	modified:   drivers/net/wireless/ath/ath9k/htc_drv_main.c
	modified:   drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
	modified:   drivers/net/wireless/ath/ath9k/hw.c
	modified:   drivers/net/wireless/ath/ath9k/hw.h
	modified:   drivers/net/wireless/ath/ath9k/main.c
	modified:   drivers/net/wireless/ath/ath9k/xmit.c
	modified:   drivers/net/wireless/b43/Kconfig
	modified:   drivers/net/wireless/b43/phy_n.c
	modified:   drivers/net/wireless/b43/xmit.c
	modified:   drivers/net/wireless/b43legacy/main.c
	modified:   drivers/net/wireless/iwlwifi/iwl-6000.c
	modified:   drivers/net/wireless/iwlwifi/iwl-agn.c
	modified:   drivers/net/wireless/iwlwifi/iwl-cfg.h
	modified:   drivers/net/wireless/iwlwifi/iwl-core.c
	modified:   drivers/net/wireless/iwlwifi/iwl-debugfs.c
	modified:   drivers/net/wireless/iwlwifi/iwl-pci.c
	modified:   drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
	modified:   drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
	modified:   drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
	modified:   drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
	modified:   drivers/net/wireless/libertas/debugfs.c
	modified:   drivers/net/wireless/mwifiex/11n.c
	modified:   drivers/net/wireless/mwifiex/main.c
	modified:   drivers/net/wireless/mwifiex/sdio.c
	modified:   drivers/net/wireless/p54/txrx.c
	modified:   drivers/net/wireless/prism54/islpci_dev.c
	modified:   drivers/net/wireless/rt2x00/rt2400pci.c
	modified:   drivers/net/wireless/rt2x00/rt2500pci.c
	modified:   drivers/net/wireless/rt2x00/rt2500usb.c
	modified:   drivers/net/wireless/rt2x00/rt2800.h
	modified:   drivers/net/wireless/rt2x00/rt2800usb.c
	modified:   drivers/net/wireless/rt2x00/rt2x00.h
	modified:   drivers/net/wireless/rt2x00/rt2x00dev.c
	modified:   drivers/net/wireless/rt2x00/rt2x00mac.c
	modified:   drivers/net/wireless/rt2x00/rt2x00queue.c
	modified:   drivers/net/wireless/rt2x00/rt73usb.c
	modified:   drivers/net/wireless/rtl818x/rtl8187/rtl8187.h
	modified:   drivers/net/wireless/rtlwifi/core.c
	modified:   drivers/net/wireless/rtlwifi/pci.c
	modified:   drivers/net/wireless/rtlwifi/ps.c
	modified:   drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
	modified:   drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
	modified:   drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
	modified:   drivers/net/wireless/rtlwifi/rtl8192cu/mac.c
	modified:   drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
	modified:   drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
	modified:   drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
	modified:   drivers/net/wireless/rtlwifi/rtl8192de/trx.c
	modified:   drivers/net/wireless/rtlwifi/rtl8192se/hw.c
	modified:   drivers/net/wireless/rtlwifi/rtl8192se/rf.c
	modified:   drivers/net/wireless/rtlwifi/rtl8192se/trx.c
	modified:   drivers/net/wireless/rtlwifi/wifi.h
	modified:   drivers/net/xen-netback/common.h
	modified:   drivers/net/xen-netback/interface.c
	modified:   drivers/net/xen-netfront.c
	modified:   drivers/of/address.c
	modified:   drivers/of/base.c
	modified:   drivers/of/selftest.c
	modified:   drivers/parport/parport_pc.c
	modified:   drivers/pci/hotplug/pciehp_core.c
	modified:   drivers/pci/pci-driver.c
	modified:   drivers/pci/pci-sysfs.c
	modified:   drivers/pci/pci.c
	modified:   drivers/pci/pcie/aspm.c
	modified:   drivers/pci/pcie/portdrv_pci.c
	modified:   drivers/pci/quirks.c
	modified:   drivers/pci/setup-res.c
	modified:   drivers/platform/x86/acer-wmi.c
	modified:   drivers/platform/x86/hp_accel.c
	modified:   drivers/platform/x86/msi-wmi.c
	modified:   drivers/platform/x86/thinkpad_acpi.c
	modified:   drivers/power/charger-manager.c
	modified:   drivers/power/max17040_battery.c
	modified:   drivers/pps/clients/pps-ldisc.c
	modified:   drivers/pps/pps.c
	modified:   drivers/rapidio/devices/tsi721.c
	modified:   drivers/regulator/max8997.c
	modified:   drivers/regulator/max8998.c
	modified:   drivers/rtc/rtc-at91rm9200.c
	modified:   drivers/rtc/rtc-cmos.c
	modified:   drivers/rtc/rtc-pl031.c
	modified:   drivers/s390/net/qeth_core_main.c
	modified:   drivers/sbus/char/bbc_envctrl.c
	modified:   drivers/sbus/char/bbc_i2c.c
	modified:   drivers/scsi/aacraid/commctrl.c
	modified:   drivers/scsi/aacraid/linit.c
	modified:   drivers/scsi/arcmsr/arcmsr_hba.c
	modified:   drivers/scsi/bfa/bfad.c
	modified:   drivers/scsi/hpsa.c
	modified:   drivers/scsi/ibmvscsi/ibmvscsi.c
	modified:   drivers/scsi/isci/host.h
	modified:   drivers/scsi/isci/port_config.c
	modified:   drivers/scsi/isci/task.c
	modified:   drivers/scsi/libiscsi.c
	modified:   drivers/scsi/libsas/sas_ata.c
	modified:   drivers/scsi/megaraid/megaraid_mm.c
	modified:   drivers/scsi/megaraid/megaraid_sas.h
	modified:   drivers/scsi/megaraid/megaraid_sas_base.c
	modified:   drivers/scsi/mpt2sas/mpt2sas_base.c
	modified:   drivers/scsi/mpt2sas/mpt2sas_base.h
	modified:   drivers/scsi/mpt2sas/mpt2sas_scsih.c
	modified:   drivers/scsi/qla2xxx/qla_def.h
	modified:   drivers/scsi/scsi_error.c
	modified:   drivers/scsi/scsi_lib.c
	modified:   drivers/scsi/storvsc_drv.c
	modified:   drivers/scsi/sym53c8xx_2/sym_hipd.c
	modified:   drivers/spi/spi-dw-mid.c
	modified:   drivers/spi/spi-pl022.c
	modified:   drivers/staging/bcm/Bcmchar.c
	modified:   drivers/staging/bcm/InterfaceInit.c
	modified:   drivers/staging/bcm/InterfaceInit.h
	modified:   drivers/staging/comedi/comedi_fops.c
	modified:   drivers/staging/comedi/drivers/cb_pcidio.c
	modified:   drivers/staging/comedi/drivers/das08.c
	modified:   drivers/staging/comedi/drivers/pcmuio.c
	modified:   drivers/staging/comedi/drivers/ssv_dnp.c
	modified:   drivers/staging/et131x/et131x.c
	modified:   drivers/staging/iio/adc/ad799x_core.c
	modified:   drivers/staging/iio/impedance-analyzer/ad5933.c
	modified:   drivers/staging/iio/meter/ade7758_ring.c
	modified:   drivers/staging/line6/pcm.c
	modified:   drivers/staging/media/lirc/lirc_zilog.c
	modified:   drivers/staging/octeon/ethernet-tx.c
	modified:   drivers/staging/ozwpan/ozcdev.c
	modified:   drivers/staging/rtl8712/rtl871x_recv.c
	modified:   drivers/staging/rtl8712/usb_intf.c
	modified:   drivers/staging/serqt_usb2/serqt_usb2.c
	modified:   drivers/staging/speakup/i18n.c
	modified:   drivers/staging/speakup/i18n.h
	modified:   drivers/staging/speakup/keyhelp.c
	modified:   drivers/staging/speakup/kobjects.c
	modified:   drivers/staging/speakup/main.c
	modified:   drivers/staging/speakup/selection.c
	modified:   drivers/staging/speakup/serialio.c
	modified:   drivers/staging/speakup/speakup.h
	modified:   drivers/staging/speakup/speakup_acntpc.c
	modified:   drivers/staging/speakup/speakup_acntsa.c
	modified:   drivers/staging/speakup/speakup_apollo.c
	modified:   drivers/staging/speakup/speakup_audptr.c
	modified:   drivers/staging/speakup/speakup_bns.c
	modified:   drivers/staging/speakup/speakup_decext.c
	modified:   drivers/staging/speakup/speakup_decpc.c
	modified:   drivers/staging/speakup/speakup_dectlk.c
	modified:   drivers/staging/speakup/speakup_dtlk.c
	modified:   drivers/staging/speakup/speakup_dummy.c
	modified:   drivers/staging/speakup/speakup_keypc.c
	modified:   drivers/staging/speakup/speakup_ltlk.c
	modified:   drivers/staging/speakup/speakup_soft.c
	modified:   drivers/staging/speakup/speakup_spkout.c
	modified:   drivers/staging/speakup/speakup_txprt.c
	modified:   drivers/staging/speakup/spk_priv.h
	modified:   drivers/staging/speakup/synth.c
	modified:   drivers/staging/speakup/thread.c
	modified:   drivers/staging/speakup/varhandlers.c
	modified:   drivers/staging/tidspbridge/Kconfig
	modified:   drivers/staging/tidspbridge/core/dsp-clock.c
	modified:   drivers/staging/vt6656/baseband.c
	modified:   drivers/staging/vt6656/rndis.h
	modified:   drivers/staging/wlags49_h2/wl_priv.c
	modified:   drivers/target/iscsi/iscsi_target.c
	modified:   drivers/target/iscsi/iscsi_target_auth.c
	modified:   drivers/target/iscsi/iscsi_target_login.c
	modified:   drivers/target/iscsi/iscsi_target_nego.c
	modified:   drivers/target/iscsi/iscsi_target_parameters.c
	modified:   drivers/target/target_core_alua.c
	modified:   drivers/target/target_core_file.c
	modified:   drivers/target/target_core_file.h
	modified:   drivers/target/target_core_pscsi.c
	modified:   drivers/target/target_core_rd.c
	modified:   drivers/target/target_core_transport.c
	modified:   drivers/target/tcm_fc/tfc_sess.c
	modified:   drivers/tty/hvc/hvc_console.c
	modified:   drivers/tty/n_gsm.c
	modified:   drivers/tty/serial/8250/8250.c
	modified:   drivers/tty/serial/8250/8250.h
	modified:   drivers/tty/serial/8250/8250_pci.c
	modified:   drivers/tty/serial/atmel_serial.c
	modified:   drivers/tty/serial/imx.c
	modified:   drivers/tty/serial/of_serial.c
	modified:   drivers/tty/serial/pmac_zilog.c
	modified:   drivers/tty/serial/serial_core.c
	modified:   drivers/tty/serial/sunsab.c
	modified:   drivers/tty/tty_buffer.c
	modified:   drivers/tty/tty_io.c
	modified:   drivers/tty/vt/consolemap.c
	modified:   drivers/usb/class/cdc-acm.c
	modified:   drivers/usb/class/cdc-acm.h
	modified:   drivers/usb/class/cdc-wdm.c
	modified:   drivers/usb/core/config.c
	modified:   drivers/usb/core/driver.c
	modified:   drivers/usb/core/hcd-pci.c
	modified:   drivers/usb/core/hcd.c
	modified:   drivers/usb/core/usb.h
	modified:   drivers/usb/dwc3/core.c
	modified:   drivers/usb/dwc3/core.h
	modified:   drivers/usb/dwc3/dwc3-pci.c
	modified:   drivers/usb/gadget/at91_udc.c
	modified:   drivers/usb/gadget/composite.c
	modified:   drivers/usb/gadget/f_fs.c
	modified:   drivers/usb/gadget/inode.c
	modified:   drivers/usb/host/ehci-pci.c
	modified:   drivers/usb/host/ehci-q.c
	modified:   drivers/usb/host/ehci-sched.c
	modified:   drivers/usb/host/ohci-pci.c
	modified:   drivers/usb/host/pci-quirks.c
	modified:   drivers/usb/host/uhci-pci.c
	modified:   drivers/usb/host/xhci-pci.c
	modified:   drivers/usb/host/xhci-ring.c
	modified:   drivers/usb/host/xhci.c
	modified:   drivers/usb/misc/adutux.c
	modified:   drivers/usb/misc/usbtest.c
	modified:   drivers/usb/musb/musb_gadget.c
	modified:   drivers/usb/serial/ark3116.c
	modified:   drivers/usb/serial/ch341.c
	modified:   drivers/usb/serial/cypress_m8.c
	modified:   drivers/usb/serial/cypress_m8.h
	modified:   drivers/usb/serial/generic.c
	modified:   drivers/usb/serial/io_edgeport.c
	modified:   drivers/usb/serial/io_ti.c
	modified:   drivers/usb/serial/io_usbvend.h
	modified:   drivers/usb/serial/keyspan.c
	modified:   drivers/usb/serial/kobil_sct.c
	modified:   drivers/usb/serial/mct_u232.c
	modified:   drivers/usb/serial/opticon.c
	modified:   drivers/usb/serial/oti6858.c
	modified:   drivers/usb/serial/pl2303.c
	modified:   drivers/usb/serial/pl2303.h
	modified:   drivers/usb/serial/spcp8x5.c
	modified:   drivers/usb/serial/ssu100.c
	modified:   drivers/usb/serial/usb-serial.c
	modified:   drivers/usb/serial/usb_wwan.c
	modified:   drivers/usb/serial/whiteheat.c
	modified:   drivers/usb/storage/Kconfig
	modified:   drivers/usb/storage/scsiglue.c
	modified:   drivers/usb/storage/shuttle_usbat.c
	modified:   drivers/usb/storage/transport.c
	modified:   drivers/usb/wusbcore/wa-rpipe.c
	modified:   drivers/usb/wusbcore/wa-xfer.c
	modified:   drivers/uwb/lc-dev.c
	modified:   drivers/vhost/net.c
	modified:   drivers/video/aty/mach64_accel.c
	modified:   drivers/video/aty/mach64_cursor.c
	modified:   drivers/video/backlight/atmel-pwm-bl.c
	modified:   drivers/video/cfbcopyarea.c
	modified:   drivers/video/console/bitblit.c
	modified:   drivers/video/console/fbcon_ccw.c
	modified:   drivers/video/console/fbcon_cw.c
	modified:   drivers/video/console/fbcon_ud.c
	modified:   drivers/video/console/vgacon.c
	modified:   drivers/video/kyro/fbdev.c
	modified:   drivers/video/matrox/matroxfb_accel.c
	modified:   drivers/video/matrox/matroxfb_base.h
	modified:   drivers/video/omap2/omapfb/omapfb-main.c
	modified:   drivers/video/tgafb.c
	modified:   drivers/virtio/virtio_balloon.c
	modified:   drivers/virtio/virtio_pci.c
	modified:   drivers/w1/w1_netlink.c
	modified:   drivers/watchdog/sc1200wdt.c
	modified:   drivers/watchdog/sp805_wdt.c
	modified:   drivers/xen/events.c
	modified:   drivers/xen/manage.c
	modified:   fs/btrfs/backref.c
	modified:   fs/btrfs/compression.c
	modified:   fs/btrfs/extent_io.c
	modified:   fs/btrfs/file-item.c
	modified:   fs/btrfs/volumes.c
	modified:   fs/cachefiles/rdwr.c
	modified:   fs/ceph/addr.c
	modified:   fs/ceph/mds_client.c
	modified:   fs/ceph/snap.c
	modified:   fs/cifs/cifsfs.c
	modified:   fs/cifs/cifsfs.h
	modified:   fs/cifs/cifssmb.c
	modified:   fs/cifs/file.c
	modified:   fs/cifs/inode.c
	modified:   fs/cifs/readdir.c
	modified:   fs/cifs/transport.c
	modified:   fs/configfs/dir.c
	modified:   fs/dcache.c
	modified:   fs/devpts/inode.c
	modified:   fs/ecryptfs/inode.c
	modified:   fs/ecryptfs/keystore.c
	modified:   fs/exec.c
	modified:   fs/exofs/ore.c
	modified:   fs/ext2/inode.c
	modified:   fs/ext2/xip.c
	modified:   fs/ext3/dir.c
	modified:   fs/ext3/ext3.h
	modified:   fs/ext3/hash.c
	modified:   fs/ext3/super.c
	modified:   fs/ext4/extents.c
	modified:   fs/file.c
	modified:   fs/gfs2/aops.c
	modified:   fs/gfs2/ops_fstype.c
	modified:   fs/hpfs/dir.c
	modified:   fs/hpfs/file.c
	modified:   fs/ioprio.c
	modified:   fs/isofs/inode.c
	modified:   fs/isofs/isofs.h
	modified:   fs/isofs/rock.c
	modified:   fs/jbd2/transaction.c
	modified:   fs/jffs2/compr_rtime.c
	modified:   fs/jffs2/nodelist.h
	modified:   fs/jffs2/nodemgmt.c
	modified:   fs/jfs/jfs_inode.c
	modified:   fs/lockd/mon.c
	modified:   fs/lockd/svclock.c
	modified:   fs/locks.c
	modified:   fs/namei.c
	modified:   fs/ncpfs/dir.c
	modified:   fs/nfs/blocklayout/extents.c
	modified:   fs/nfs/callback_xdr.c
	modified:   fs/nfs/delegation.c
	modified:   fs/nfs/inode.c
	modified:   fs/nfs/nfs3proc.c
	modified:   fs/nfs/nfs4filelayout.c
	modified:   fs/nfs/nfs4renewd.c
	modified:   fs/nfs/nfs4state.c
	modified:   fs/nfs/nfs4xdr.c
	modified:   fs/nfs/pnfs.c
	modified:   fs/nfs/proc.c
	modified:   fs/nfs/write.c
	modified:   fs/nfsd/nfs4acl.c
	modified:   fs/nfsd/nfs4proc.c
	modified:   fs/nfsd/nfs4state.c
	modified:   fs/nfsd/nfs4xdr.c
	modified:   fs/nfsd/nfsctl.c
	modified:   fs/nfsd/nfsd.h
	modified:   fs/nfsd/vfs.c
	modified:   fs/nilfs2/page.c
	modified:   fs/nilfs2/segment.c
	modified:   fs/notify/fanotify/fanotify_user.c
	modified:   fs/ocfs2/buffer_head_io.c
	modified:   fs/ocfs2/dlm/dlmmaster.c
	modified:   fs/ocfs2/dlm/dlmrecovery.c
	modified:   fs/ocfs2/file.c
	modified:   fs/ocfs2/quota_global.c
	modified:   fs/ocfs2/quota_local.c
	modified:   fs/pnode.c
	modified:   fs/posix_acl.c
	modified:   fs/proc/array.c
	modified:   fs/proc/base.c
	modified:   fs/proc/inode.c
	modified:   fs/quota/dquot.c
	modified:   fs/reiserfs/dir.c
	modified:   fs/super.c
	modified:   fs/ubifs/commit.c
	modified:   fs/ubifs/log.c
	modified:   fs/ubifs/master.c
	modified:   fs/ubifs/orphan.c
	modified:   fs/ubifs/shrinker.c
	modified:   fs/ubifs/super.c
	modified:   fs/ubifs/ubifs.h
	modified:   fs/xfs/xfs_ioctl.c
	modified:   fs/xfs/xfs_ioctl32.c
	modified:   include/crypto/scatterwalk.h
	modified:   include/drm/drm_mem_util.h
	modified:   include/drm/drm_mode.h
	modified:   include/linux/audit.h
	modified:   include/linux/binfmts.h
	modified:   include/linux/blkdev.h
	modified:   include/linux/cgroup.h
	modified:   include/linux/compiler-gcc.h
	modified:   include/linux/compiler-gcc4.h
	new file:   include/linux/compiler-gcc5.h
	modified:   include/linux/compiler-intel.h
	modified:   include/linux/cpuset.h
	modified:   include/linux/firewire.h
	modified:   include/linux/fs.h
	modified:   include/linux/ftrace.h
	modified:   include/linux/hid.h
	modified:   include/linux/hidraw.h
	modified:   include/linux/idr.h
	modified:   include/linux/if_team.h
	modified:   include/linux/irqdesc.h
	modified:   include/linux/jiffies.h
	modified:   include/linux/kernel.h
	modified:   include/linux/khugepaged.h
	modified:   include/linux/libata.h
	modified:   include/linux/mempolicy.h
	modified:   include/linux/mm.h
	modified:   include/linux/mm_types.h
	modified:   include/linux/msg.h
	modified:   include/linux/mtd/map.h
	modified:   include/linux/mv643xx_eth.h
	modified:   include/linux/nbd.h
	modified:   include/linux/net.h
	modified:   include/linux/netdevice.h
	modified:   include/linux/of.h
	modified:   include/linux/oom.h
	modified:   include/linux/pci_ids.h
	modified:   include/linux/perf_event.h
	modified:   include/linux/pps_kernel.h
	modified:   include/linux/printk.h
	modified:   include/linux/ptrace.h
	modified:   include/linux/random.h
	modified:   include/linux/serial_core.h
	modified:   include/linux/skbuff.h
	modified:   include/linux/slab.h
	modified:   include/linux/string.h
	modified:   include/linux/sunrpc/svcsock.h
	modified:   include/linux/tracepoint.h
	modified:   include/linux/usb.h
	modified:   include/linux/usb/hcd.h
	modified:   include/linux/usb/quirks.h
	modified:   include/linux/usb/serial.h
	modified:   include/linux/virtio_console.h
	modified:   include/net/dst.h
	modified:   include/net/inetpeer.h
	modified:   include/net/mac80211.h
	modified:   include/net/regulatory.h
	modified:   include/scsi/osd_ore.h
	modified:   include/sound/memalloc.h
	modified:   include/trace/events/block.h
	modified:   include/trace/events/module.h
	modified:   include/trace/ftrace.h
	modified:   include/trace/syscall.h
	modified:   include/xen/interface/io/netif.h
	modified:   include/xen/interface/io/ring.h
	modified:   init/Kconfig
	modified:   init/main.c
	modified:   ipc/msg.c
	modified:   ipc/msgutil.c
	modified:   ipc/util.h
	modified:   kernel/audit.c
	modified:   kernel/audit_tree.c
	modified:   kernel/auditsc.c
	modified:   kernel/cgroup.c
	modified:   kernel/cgroup_freezer.c
	modified:   kernel/cpuset.c
	modified:   kernel/events/core.c
	modified:   kernel/events/ring_buffer.c
	modified:   kernel/exit.c
	modified:   kernel/fork.c
	modified:   kernel/freezer.c
	modified:   kernel/futex.c
	modified:   kernel/hrtimer.c
	modified:   kernel/irq/irqdesc.c
	modified:   kernel/irq/manage.c
	modified:   kernel/irq/pm.c
	modified:   kernel/irq/spurious.c
	modified:   kernel/module.c
	modified:   kernel/posix-timers.c
	modified:   kernel/power/hibernate.c
	modified:   kernel/power/process.c
	modified:   kernel/power/snapshot.c
	modified:   kernel/printk.c
	modified:   kernel/ptrace.c
	modified:   kernel/rtmutex-debug.h
	modified:   kernel/rtmutex.c
	modified:   kernel/rtmutex.h
	modified:   kernel/sched/core.c
	modified:   kernel/sched/cpupri.c
	modified:   kernel/sched/debug.c
	modified:   kernel/sched/fair.c
	modified:   kernel/sched/rt.c
	modified:   kernel/sched/sched.h
	modified:   kernel/sysctl.c
	modified:   kernel/time.c
	modified:   kernel/time/alarmtimer.c
	modified:   kernel/time/clockevents.c
	modified:   kernel/time/jiffies.c
	modified:   kernel/time/tick-sched.c
	modified:   kernel/timer.c
	modified:   kernel/trace/blktrace.c
	modified:   kernel/trace/ring_buffer.c
	modified:   kernel/trace/trace_event_perf.c
	modified:   kernel/trace/trace_events.c
	modified:   kernel/tracepoint.c
	modified:   kernel/workqueue.c
	modified:   lib/Makefile
	modified:   lib/bitmap.c
	modified:   lib/btree.c
	modified:   lib/idr.c
	modified:   lib/nlattr.c
	modified:   lib/random32.c
	modified:   lib/scatterlist.c
	modified:   lib/string.c
	modified:   lib/vsprintf.c
	modified:   mm/huge_memory.c
	modified:   mm/hugetlb.c
	modified:   mm/kmemleak.c
	modified:   mm/memory-failure.c
	modified:   mm/memory.c
	modified:   mm/mempolicy.c
	modified:   mm/migrate.c
	modified:   mm/mlock.c
	modified:   mm/mmap.c
	modified:   mm/oom_kill.c
	modified:   mm/page-writeback.c
	modified:   mm/page_cgroup.c
	modified:   mm/percpu-vm.c
	modified:   mm/percpu.c
	modified:   mm/rmap.c
	modified:   mm/shmem.c
	modified:   mm/slab.c
	modified:   mm/slub.c
	modified:   mm/swap.c
	modified:   mm/truncate.c
	modified:   mm/vmalloc.c
	modified:   net/8021q/vlan_core.c
	modified:   net/8021q/vlan_dev.c
	modified:   net/8021q/vlan_netlink.c
	modified:   net/9p/trans_virtio.c
	modified:   net/appletalk/ddp.c
	modified:   net/ax25/af_ax25.c
	modified:   net/bluetooth/af_bluetooth.c
	modified:   net/bluetooth/hci_sock.c
	modified:   net/bridge/br_if.c
	modified:   net/bridge/br_multicast.c
	modified:   net/bridge/netfilter/ebtables.c
	modified:   net/caif/caif_socket.c
	modified:   net/ceph/auth_x.c
	modified:   net/ceph/crypto.c
	modified:   net/ceph/mon_client.c
	modified:   net/core/dev.c
	modified:   net/core/drop_monitor.c
	modified:   net/core/fib_rules.c
	modified:   net/core/filter.c
	modified:   net/core/iovec.c
	modified:   net/core/pktgen.c
	modified:   net/core/rtnetlink.c
	modified:   net/core/skbuff.c
	modified:   net/core/sock.c
	modified:   net/dns_resolver/dns_query.c
	modified:   net/ieee802154/6lowpan.c
	modified:   net/ipv4/datagram.c
	modified:   net/ipv4/fib_semantics.c
	modified:   net/ipv4/igmp.c
	modified:   net/ipv4/inet_diag.c
	modified:   net/ipv4/inet_hashtables.c
	modified:   net/ipv4/ip_options.c
	modified:   net/ipv4/ip_output.c
	modified:   net/ipv4/ipip.c
	modified:   net/ipv4/ipmr.c
	modified:   net/ipv4/netfilter/arp_tables.c
	modified:   net/ipv4/netfilter/ip_tables.c
	modified:   net/ipv4/netfilter/nf_defrag_ipv4.c
	modified:   net/ipv4/ping.c
	modified:   net/ipv4/route.c
	modified:   net/ipv4/tcp_cubic.c
	modified:   net/ipv4/tcp_input.c
	modified:   net/ipv4/tcp_ipv4.c
	modified:   net/ipv4/tcp_output.c
	modified:   net/ipv4/tcp_vegas.c
	modified:   net/ipv4/tcp_veno.c
	modified:   net/ipv4/udp.c
	modified:   net/ipv6/datagram.c
	modified:   net/ipv6/icmp.c
	modified:   net/ipv6/inet6_hashtables.c
	modified:   net/ipv6/ip6_tunnel.c
	modified:   net/ipv6/ip6mr.c
	modified:   net/ipv6/mcast.c
	modified:   net/ipv6/netfilter/ip6_tables.c
	modified:   net/ipv6/sit.c
	modified:   net/ipv6/udp.c
	modified:   net/ipx/af_ipx.c
	modified:   net/irda/af_irda.c
	modified:   net/key/af_key.c
	modified:   net/l2tp/l2tp_ppp.c
	modified:   net/llc/af_llc.c
	modified:   net/mac80211/debugfs_netdev.c
	modified:   net/mac80211/ieee80211_i.h
	modified:   net/mac80211/iface.c
	modified:   net/mac80211/scan.c
	modified:   net/mac80211/sta_info.c
	modified:   net/mac80211/sta_info.h
	modified:   net/mac80211/status.c
	modified:   net/mac80211/tx.c
	modified:   net/netfilter/nf_conntrack_sip.c
	modified:   net/netlink/af_netlink.c
	modified:   net/netrom/af_netrom.c
	modified:   net/nfc/rawsock.c
	modified:   net/packet/af_packet.c
	modified:   net/rds/ib.c
	modified:   net/rds/ib_send.c
	modified:   net/rds/iw.c
	modified:   net/rxrpc/ar-recvmsg.c
	modified:   net/sched/act_mirred.c
	modified:   net/sctp/associola.c
	modified:   net/sctp/output.c
	modified:   net/sctp/sm_make_chunk.c
	modified:   net/sctp/sm_statefuns.c
	modified:   net/sctp/socket.c
	modified:   net/sctp/ulpevent.c
	modified:   net/sunrpc/clnt.c
	modified:   net/sunrpc/sched.c
	modified:   net/sunrpc/svcsock.c
	modified:   net/sunrpc/xprtsock.c
	modified:   net/tipc/bcast.c
	modified:   net/unix/af_unix.c
	modified:   net/unix/diag.c
	modified:   net/wireless/radiotap.c
	modified:   net/wireless/sme.c
	modified:   net/x25/af_x25.c
	modified:   scripts/mod/file2alias.c
	modified:   scripts/mod/modpost.c
	modified:   scripts/package/builddeb
	modified:   scripts/recordmcount.h
	modified:   scripts/tags.sh
	modified:   security/integrity/evm/evm_main.c
	modified:   security/integrity/ima/ima_policy.c
	modified:   security/selinux/ss/policydb.c
	modified:   sound/arm/pxa2xx-pcm-lib.c
	modified:   sound/core/pcm_compat.c
	modified:   sound/core/pcm_lib.c
	modified:   sound/core/pcm_native.c
	modified:   sound/drivers/aloop.c
	modified:   sound/drivers/pcsp/pcsp.c
	modified:   sound/i2c/other/ak4xxx-adda.c
	modified:   sound/isa/msnd/msnd_pinnacle.c
	modified:   sound/pci/Kconfig
	modified:   sound/pci/asihpi/asihpi.c
	modified:   sound/pci/atiixp.c
	modified:   sound/pci/atiixp_modem.c
	modified:   sound/pci/emu10k1/emu10k1_callback.c
	modified:   sound/pci/hda/hda_intel.c
	modified:   sound/pci/hda/patch_conexant.c
	modified:   sound/pci/hda/patch_hdmi.c
	modified:   sound/pci/ice1712/ice1712.c
	modified:   sound/pci/oxygen/xonar_dg.c
	modified:   sound/pci/rme9652/rme9652.c
	modified:   sound/soc/blackfin/bf5xx-i2s.c
	modified:   sound/soc/codecs/adau1701.c
	modified:   sound/soc/codecs/ak4642.c
	modified:   sound/soc/codecs/cs42l73.c
	modified:   sound/soc/codecs/sgtl5000.c
	modified:   sound/soc/codecs/sgtl5000.h
	modified:   sound/soc/codecs/sta32x.c
	modified:   sound/soc/codecs/wm8731.c
	modified:   sound/soc/codecs/wm8770.c
	modified:   sound/soc/codecs/wm8904.c
	modified:   sound/soc/codecs/wm8958-dsp2.c
	modified:   sound/soc/codecs/wm8962.c
	modified:   sound/soc/codecs/wm8962.h
	modified:   sound/soc/codecs/wm8990.c
	modified:   sound/soc/codecs/wm_hubs.c
	modified:   sound/soc/imx/imx-ssi.c
	modified:   sound/soc/pxa/pxa-ssp.c
	modified:   sound/soc/s6000/s6000-pcm.c
	modified:   sound/soc/samsung/i2s.c
	modified:   sound/soc/sh/fsi.c
	modified:   sound/soc/soc-dapm.c
	modified:   sound/usb/6fire/chip.c
	modified:   sound/usb/6fire/midi.c
	modified:   sound/usb/6fire/midi.h
	modified:   sound/usb/6fire/pcm.c
	modified:   sound/usb/6fire/pcm.h
	modified:   sound/usb/mixer.c
	modified:   sound/usb/quirks-table.h
	modified:   sound/usb/usx2y/usbusx2yaudio.c
	modified:   tools/perf/util/parse-events.c
	modified:   tools/power/x86/turbostat/turbostat.c
	modified:   tools/usb/ffs-test.c
	modified:   virt/kvm/coalesced_mmio.c
	modified:   virt/kvm/iommu.c
	modified:   virt/kvm/irq_comm.c
	modified:   virt/kvm/kvm_main.c

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

	both modified:      Documentation/i2c/busses/i2c-i801
	both modified:      Makefile
	both modified:      arch/powerpc/kernel/vio.c
	both modified:      arch/sparc/include/asm/tlbflush_64.h
	both modified:      arch/sparc/kernel/syscalls.S
	both modified:      arch/x86/kernel/setup.c
	both modified:      arch/x86/platform/efi/efi.c
	both modified:      arch/x86/syscalls/syscall_64.tbl
	both modified:      block/genhd.c
	both modified:      drivers/acpi/battery.c
	both modified:      drivers/acpi/video.c
	both modified:      drivers/ata/ahci.c
	both modified:      drivers/ata/ata_piix.c
	both modified:      drivers/ata/libata-core.c
	both modified:      drivers/block/nbd.c
	both modified:      drivers/block/xen-blkback/blkback.c
	both modified:      drivers/bluetooth/btusb.c
	both modified:      drivers/char/random.c
	both modified:      drivers/firmware/efivars.c
	both modified:      drivers/gpu/drm/drm_edid.c
	both modified:      drivers/gpu/drm/i915/i915_drv.h
	both modified:      drivers/gpu/drm/i915/intel_display.c
	both modified:      drivers/gpu/drm/radeon/atombios_encoders.c
	both modified:      drivers/gpu/drm/radeon/evergreen.c
	both modified:      drivers/gpu/drm/radeon/ni.c
	both modified:      drivers/gpu/drm/radeon/radeon_combios.c
	both modified:      drivers/gpu/drm/radeon/si.c
	both modified:      drivers/hid/hid-core.c
	both modified:      drivers/hid/hid-logitech-dj.c
	both modified:      drivers/hid/usbhid/hid-quirks.c
	both modified:      drivers/hv/channel.c
	both modified:      drivers/i2c/busses/Kconfig
	both modified:      drivers/i2c/busses/i2c-i801.c
	both modified:      drivers/iommu/intel-iommu.c
	both modified:      drivers/md/persistent-data/dm-btree-remove.c
	both modified:      drivers/net/can/sja1000/sja1000.c
	both modified:      drivers/net/ethernet/sun/sunvnet.c
	both modified:      drivers/net/usb/asix.c
	both modified:      drivers/net/usb/qmi_wwan.c
	both modified:      drivers/net/wireless/b43/b43.h
	both modified:      drivers/net/wireless/b43/main.c
	both modified:      drivers/net/wireless/rtlwifi/base.c
	both modified:      drivers/net/xen-netback/netback.c
	both modified:      drivers/pci/hotplug/shpchp.h
	both modified:      drivers/pci/hotplug/shpchp_core.c
	both modified:      drivers/pci/hotplug/shpchp_ctrl.c
	both modified:      drivers/platform/x86/samsung-laptop.c
	both modified:      drivers/tty/serial/pch_uart.c
	both modified:      drivers/usb/core/hub.c
	both modified:      drivers/usb/core/quirks.c
	both modified:      drivers/usb/dwc3/gadget.c
	both modified:      drivers/usb/host/xhci-hub.c
	both modified:      drivers/usb/host/xhci-mem.c
	both modified:      drivers/usb/misc/sisusbvga/sisusb.c
	both modified:      drivers/usb/serial/cp210x.c
	both modified:      drivers/usb/serial/ftdi_sio.c
	both modified:      drivers/usb/serial/ftdi_sio_ids.h
	both modified:      drivers/usb/serial/mos7840.c
	both modified:      drivers/usb/serial/option.c
	both modified:      drivers/usb/serial/sierra.c
	both modified:      drivers/usb/serial/ti_usb_3410_5052.c
	both modified:      drivers/usb/storage/unusual_cypress.h
	both modified:      drivers/usb/storage/unusual_devs.h
	both modified:      fs/btrfs/extent-tree.c
	both modified:      fs/buffer.c
	both modified:      fs/cifs/cifs_unicode.c
	both modified:      fs/namespace.c
	both modified:      fs/nfs/nfs4proc.c
	both modified:      fs/nfsd/nfssvc.c
	both modified:      fs/nilfs2/inode.c
	both modified:      fs/stat.c
	both modified:      include/drm/drm_pciids.h
	both modified:      include/linux/efi.h
	both modified:      include/linux/list.h
	both modified:      include/linux/sched.h
	both modified:      include/net/cipso_ipv4.h
	both modified:      kernel/time/timekeeping.c
	both modified:      kernel/trace/ftrace.c
	both modified:      kernel/trace/trace.c
	deleted by us:      lib/lzo/lzo1x_decompress_safe.c
	both modified:      mm/page_alloc.c
	both modified:      mm/vmscan.c
	both modified:      net/bridge/br_stp_if.c
	both modified:      net/ceph/osd_client.c
	both modified:      net/compat.c
	both modified:      net/ipv6/addrconf.c
	both modified:      net/ipv6/ip6_output.c
	both modified:      net/ipv6/route.c
	both modified:      net/mac80211/rx.c
	both modified:      net/rose/af_rose.c
	both modified:      net/socket.c
	both modified:      sound/core/compress_offload.c
	both modified:      sound/pci/hda/patch_realtek.c