Linux 3.4.21 - 3.4.30

Conflicts:

	mm/shmem.c

Conflicts:
	drivers/gpu/drm/radeon/radeon_mode.h
	drivers/nfc/pn533.c
	include/linux/freezer.h

	modified:   Documentation/ABI/testing/sysfs-bus-rbd
	modified:   Documentation/dvb/get_dvb_firmware
	modified:   Documentation/networking/ip-sysctl.txt
	modified:   Makefile
	modified:   arch/arm/Kconfig
	modified:   arch/arm/include/asm/hwcap.h
	modified:   arch/arm/include/asm/vfpmacros.h
	modified:   arch/arm/kernel/swp_emulate.c
	modified:   arch/arm/mach-at91/setup.c
	modified:   arch/arm/mach-dove/include/mach/pm.h
	modified:   arch/arm/mach-dove/irq.c
	modified:   arch/arm/mach-kirkwood/pcie.c
	modified:   arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
	modified:   arch/arm/mach-pxa/pxa27x.c
	modified:   arch/arm/mach-realview/include/mach/board-eb.h
	modified:   arch/arm/mm/mmu.c
	modified:   arch/arm/plat-omap/counter_32k.c
	modified:   arch/arm/vfp/entry.S
	modified:   arch/arm/vfp/vfphw.S
	modified:   arch/arm/vfp/vfpmodule.c
	modified:   arch/cris/include/asm/io.h
	modified:   arch/mips/kernel/process.c
	modified:   arch/parisc/kernel/signal32.c
	modified:   arch/parisc/kernel/sys_parisc.c
	modified:   arch/powerpc/kernel/head_64.S
	modified:   arch/powerpc/kernel/time.c
	modified:   arch/powerpc/kvm/44x_emulate.c
	modified:   arch/powerpc/platforms/40x/ppc40x_simple.c
	modified:   arch/powerpc/platforms/pseries/eeh_driver.c
	modified:   arch/s390/include/asm/timex.h
	modified:   arch/s390/kernel/time.c
	modified:   arch/s390/kvm/interrupt.c
	modified:   arch/sh/include/asm/elf.h
	modified:   arch/sparc/include/asm/hugetlb.h
	modified:   arch/sparc/kernel/signal_64.c
	modified:   arch/x86/boot/compressed/eboot.c
	modified:   arch/x86/ia32/ia32entry.S
	modified:   arch/x86/include/asm/fpu-internal.h
	modified:   arch/x86/include/asm/ptrace.h
	modified:   arch/x86/kernel/cpu/amd.c
	modified:   arch/x86/kernel/entry_32.S
	modified:   arch/x86/kernel/hpet.c
	modified:   arch/x86/kernel/microcode_amd.c
	modified:   arch/x86/kernel/msr.c
	modified:   arch/x86/kernel/ptrace.c
	modified:   arch/x86/kernel/setup.c
	modified:   arch/x86/kernel/smpboot.c
	modified:   arch/x86/kvm/cpuid.h
	modified:   arch/x86/kvm/x86.c
	modified:   arch/x86/platform/efi/efi.c
	modified:   arch/x86/platform/efi/efi_64.c
	modified:   block/scsi_ioctl.c
	modified:   drivers/acpi/battery.c
	modified:   drivers/acpi/processor_driver.c
	modified:   drivers/acpi/processor_idle.c
	modified:   drivers/acpi/scan.c
	modified:   drivers/acpi/sleep.c
	modified:   drivers/acpi/video.c
	modified:   drivers/ata/ahci.c
	modified:   drivers/ata/libata-core.c
	modified:   drivers/ata/libata-eh.c
	modified:   drivers/ata/libata-scsi.c
	modified:   drivers/ata/sata_promise.c
	modified:   drivers/ata/sata_svw.c
	modified:   drivers/atm/solos-pci.c
	modified:   drivers/base/power/qos.c
	modified:   drivers/base/regmap/regmap-debugfs.c
	modified:   drivers/bcma/driver_mips.c
	modified:   drivers/block/aoe/aoe.h
	modified:   drivers/block/aoe/aoeblk.c
	modified:   drivers/block/drbd/drbd_req.c
	modified:   drivers/block/nvme.c
	modified:   drivers/block/rbd.c
	modified:   drivers/bluetooth/ath3k.c
	modified:   drivers/bluetooth/btusb.c
	modified:   drivers/dma/ioat/dma_v3.c
	modified:   drivers/edac/edac_pci_sysfs.c
	modified:   drivers/edac/i7300_edac.c
	modified:   drivers/firewire/net.c
	modified:   drivers/firmware/dmi_scan.c
	modified:   drivers/gpu/drm/drm_edid.c
	modified:   drivers/gpu/drm/i915/i915_drv.c
	modified:   drivers/gpu/drm/i915/i915_drv.h
	modified:   drivers/gpu/drm/i915/i915_gem.c
	modified:   drivers/gpu/drm/i915/i915_gem_execbuffer.c
	modified:   drivers/gpu/drm/i915/i915_irq.c
	modified:   drivers/gpu/drm/i915/i915_reg.h
	modified:   drivers/gpu/drm/i915/intel_bios.c
	modified:   drivers/gpu/drm/i915/intel_display.c
	modified:   drivers/gpu/drm/i915/intel_hdmi.c
	modified:   drivers/gpu/drm/i915/intel_lvds.c
	modified:   drivers/gpu/drm/i915/intel_ringbuffer.c
	modified:   drivers/gpu/drm/i915/intel_sdvo.c
	modified:   drivers/gpu/drm/nouveau/nv04_dfp.c
	modified:   drivers/gpu/drm/radeon/atombios_crtc.c
	modified:   drivers/gpu/drm/radeon/atombios_encoders.c
	modified:   drivers/gpu/drm/radeon/evergreen.c
	modified:   drivers/gpu/drm/radeon/evergreen_cs.c
	modified:   drivers/gpu/drm/radeon/evergreen_reg.h
	modified:   drivers/gpu/drm/radeon/evergreend.h
	modified:   drivers/gpu/drm/radeon/radeon_agp.c
	modified:   drivers/gpu/drm/radeon/radeon_asic.h
	modified:   drivers/gpu/drm/radeon/radeon_combios.c
	modified:   drivers/gpu/drm/radeon/radeon_connectors.c
	modified:   drivers/gpu/drm/radeon/radeon_cursor.c
	modified:   drivers/gpu/drm/radeon/radeon_display.c
	modified:   drivers/gpu/drm/radeon/radeon_i2c.c
	modified:   drivers/gpu/drm/radeon/radeon_legacy_encoders.c
	modified:   drivers/gpu/drm/radeon/radeon_mode.h
	modified:   drivers/gpu/drm/radeon/radeon_ring.c
	modified:   drivers/gpu/drm/radeon/reg_srcs/cayman
	modified:   drivers/gpu/drm/udl/udl_connector.c
	modified:   drivers/hid/hid-core.c
	modified:   drivers/hid/hid-ids.h
	modified:   drivers/hid/usbhid/hid-quirks.c
	modified:   drivers/hwmon/fam15h_power.c
	modified:   drivers/hwmon/lm73.c
	modified:   drivers/infiniband/hw/nes/nes.h
	modified:   drivers/infiniband/hw/nes/nes_hw.c
	modified:   drivers/infiniband/hw/nes/nes_verbs.c
	modified:   drivers/input/joystick/walkera0701.c
	modified:   drivers/input/mouse/sentelic.c
	modified:   drivers/input/serio/i8042-x86ia64io.h
	modified:   drivers/iommu/amd_iommu_init.c
	modified:   drivers/iommu/intel-iommu.c
	modified:   drivers/isdn/gigaset/bas-gigaset.c
	modified:   drivers/leds/leds-lp5521.c
	modified:   drivers/md/persistent-data/dm-btree-internal.h
	modified:   drivers/md/persistent-data/dm-btree-remove.c
	modified:   drivers/md/persistent-data/dm-btree-spine.c
	modified:   drivers/md/persistent-data/dm-btree.c
	modified:   drivers/mfd/mfd-core.c
	modified:   drivers/mfd/wm8994-core.c
	modified:   drivers/misc/sgi-xp/xpc_main.c
	modified:   drivers/mmc/host/sdhci-s3c.c
	modified:   drivers/mmc/host/sh_mmcif.c
	modified:   drivers/mtd/devices/slram.c
	modified:   drivers/mtd/nand/cs553x_nand.c
	modified:   drivers/mtd/nand/gpmi-nand/gpmi-lib.c
	modified:   drivers/mtd/ofpart.c
	modified:   drivers/net/bonding/bond_main.c
	modified:   drivers/net/bonding/bond_sysfs.c
	modified:   drivers/net/can/c_can/c_can.c
	modified:   drivers/net/can/dev.c
	modified:   drivers/net/can/pch_can.c
	modified:   drivers/net/can/ti_hecc.c
	modified:   drivers/net/can/usb/peak_usb/pcan_usb.c
	modified:   drivers/net/can/usb/peak_usb/pcan_usb_pro.c
	modified:   drivers/net/ethernet/8390/ne.c
	modified:   drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
	modified:   drivers/net/ethernet/intel/igb/igb_main.c
	modified:   drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
	modified:   drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
	modified:   drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
	modified:   drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
	modified:   drivers/net/ethernet/realtek/r8169.c
	modified:   drivers/net/irda/sir_dev.c
	modified:   drivers/net/usb/ipheth.c
	modified:   drivers/net/wimax/i2400m/i2400m-usb.h
	modified:   drivers/net/wimax/i2400m/usb.c
	modified:   drivers/net/wireless/ath/ath5k/base.c
	modified:   drivers/net/wireless/ath/ath5k/mac80211-ops.c
	modified:   drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
	modified:   drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
	modified:   drivers/net/wireless/ath/ath9k/beacon.c
	modified:   drivers/net/wireless/ath/ath9k/calib.c
	modified:   drivers/net/wireless/ath/ath9k/calib.h
	modified:   drivers/net/wireless/ath/ath9k/htc_hst.c
	modified:   drivers/net/wireless/ath/ath9k/recv.c
	modified:   drivers/net/wireless/b43/b43.h
	modified:   drivers/net/wireless/b43/dma.c
	modified:   drivers/net/wireless/b43/main.c
	modified:   drivers/net/wireless/b43/main.h
	modified:   drivers/net/wireless/b43/pio.c
	modified:   drivers/net/wireless/b43legacy/b43legacy.h
	modified:   drivers/net/wireless/b43legacy/main.c
	modified:   drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
	modified:   drivers/net/wireless/ipw2x00/ipw2200.c
	modified:   drivers/net/wireless/iwlegacy/common.c
	modified:   drivers/net/wireless/iwlwifi/iwl-6000.c
	modified:   drivers/net/wireless/mwifiex/cmdevt.c
	modified:   drivers/net/wireless/mwifiex/pcie.c
	modified:   drivers/net/wireless/mwifiex/sdio.c
	modified:   drivers/net/wireless/mwifiex/sta_ioctl.c
	modified:   drivers/net/wireless/p54/p54usb.c
	modified:   drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
	modified:   drivers/net/wireless/rtlwifi/rtl8192se/phy.c
	modified:   drivers/net/wireless/rtlwifi/usb.c
	new file:   drivers/nfc/pn533.c
	modified:   drivers/pci/hotplug/pciehp.h
	modified:   drivers/pci/hotplug/pciehp_core.c
	modified:   drivers/pci/hotplug/pciehp_ctrl.c
	modified:   drivers/pci/hotplug/pciehp_hpc.c
	modified:   drivers/pci/hotplug/shpchp.h
	modified:   drivers/pci/hotplug/shpchp_core.c
	modified:   drivers/pci/hotplug/shpchp_ctrl.c
	modified:   drivers/pci/pcie/aer/aerdrv_core.c
	modified:   drivers/pci/pcie/aspm.c
	modified:   drivers/pci/quirks.c
	modified:   drivers/platform/x86/samsung-laptop.c
	modified:   drivers/pnp/pnpacpi/core.c
	modified:   drivers/regulator/wm831x-dcdc.c
	modified:   drivers/rtc/rtc-isl1208.c
	modified:   drivers/rtc/rtc-vt8500.c
	modified:   drivers/s390/cio/device_pgid.c
	modified:   drivers/scsi/aha152x.c
	modified:   drivers/scsi/isci/request.c
	modified:   drivers/scsi/mvsas/mv_94xx.h
	modified:   drivers/scsi/mvsas/mv_sas.c
	modified:   drivers/scsi/mvsas/mv_sas.h
	modified:   drivers/scsi/qla2xxx/qla_os.c
	modified:   drivers/scsi/scsi_sysfs.c
	modified:   drivers/scsi/sd.c
	modified:   drivers/staging/comedi/Kconfig
	modified:   drivers/staging/comedi/comedi_fops.c
	modified:   drivers/staging/comedi/comedidev.h
	modified:   drivers/staging/comedi/drivers.c
	modified:   drivers/staging/comedi/drivers/comedi_test.c
	modified:   drivers/staging/comedi/drivers/ni_pcimio.c
	modified:   drivers/staging/comedi/internal.h
	modified:   drivers/staging/rtl8712/usb_intf.c
	modified:   drivers/staging/speakup/synth.c
	modified:   drivers/staging/telephony/ixj.c
	modified:   drivers/staging/vt6656/bssdb.h
	modified:   drivers/staging/vt6656/dpc.c
	modified:   drivers/staging/vt6656/int.h
	modified:   drivers/staging/vt6656/iocmd.h
	modified:   drivers/staging/vt6656/iowpa.h
	modified:   drivers/staging/vt6656/key.c
	modified:   drivers/staging/vt6656/key.h
	modified:   drivers/staging/vt6656/mac.c
	modified:   drivers/staging/vt6656/rf.c
	modified:   drivers/staging/vt6656/rxtx.c
	modified:   drivers/staging/vt6656/ttype.h
	modified:   drivers/staging/vt6656/wcmd.c
	modified:   drivers/staging/vt6656/wpa2.h
	modified:   drivers/staging/wlan-ng/prism2mgmt.c
	modified:   drivers/target/iscsi/iscsi_target.c
	modified:   drivers/target/target_core_device.c
	modified:   drivers/target/target_core_fabric_configfs.c
	modified:   drivers/target/target_core_tpg.c
	modified:   drivers/target/target_core_transport.c
	modified:   drivers/target/tcm_fc/tfc_sess.c
	modified:   drivers/tty/serial/8250/8250_dw.c
	modified:   drivers/tty/serial/ifx6x60.c
	modified:   drivers/usb/class/cdc-acm.c
	modified:   drivers/usb/core/hub.c
	modified:   drivers/usb/core/message.c
	modified:   drivers/usb/dwc3/gadget.c
	modified:   drivers/usb/gadget/dummy_hcd.c
	modified:   drivers/usb/gadget/f_ecm.c
	modified:   drivers/usb/gadget/f_eem.c
	modified:   drivers/usb/gadget/f_midi.c
	modified:   drivers/usb/gadget/f_ncm.c
	modified:   drivers/usb/gadget/f_phonet.c
	modified:   drivers/usb/gadget/f_rndis.c
	modified:   drivers/usb/gadget/f_subset.c
	modified:   drivers/usb/gadget/f_uvc.c
	modified:   drivers/usb/host/ehci-hub.c
	modified:   drivers/usb/host/ehci-pci.c
	modified:   drivers/usb/host/ehci-sched.c
	modified:   drivers/usb/host/ohci-q.c
	modified:   drivers/usb/host/pci-quirks.c
	modified:   drivers/usb/host/uhci-hcd.c
	modified:   drivers/usb/host/xhci-hub.c
	modified:   drivers/usb/host/xhci-mem.c
	modified:   drivers/usb/host/xhci-pci.c
	modified:   drivers/usb/host/xhci-ring.c
	modified:   drivers/usb/host/xhci.c
	modified:   drivers/usb/musb/cppi_dma.c
	modified:   drivers/usb/musb/musb_core.c
	modified:   drivers/usb/serial/cp210x.c
	modified:   drivers/usb/serial/ftdi_sio.c
	modified:   drivers/usb/serial/ftdi_sio_ids.h
	modified:   drivers/usb/serial/mct_u232.c
	modified:   drivers/usb/serial/option.c
	modified:   drivers/usb/serial/qcserial.c
	modified:   drivers/usb/storage/Kconfig
	modified:   drivers/usb/storage/initializers.c
	modified:   drivers/usb/storage/initializers.h
	modified:   drivers/usb/storage/unusual_devs.h
	modified:   drivers/usb/storage/usb.c
	modified:   drivers/usb/storage/usual-tables.c
	modified:   drivers/video/mxsfb.c
	modified:   drivers/virtio/virtio_ring.c
	modified:   drivers/xen/grant-table.c
	modified:   fs/binfmt_misc.c
	modified:   fs/binfmt_script.c
	modified:   fs/ceph/addr.c
	modified:   fs/ceph/caps.c
	modified:   fs/ceph/file.c
	modified:   fs/ceph/inode.c
	modified:   fs/ceph/mds_client.c
	modified:   fs/ceph/super.c
	modified:   fs/cifs/cifs_dfs_ref.c
	modified:   fs/eventpoll.c
	modified:   fs/exec.c
	modified:   fs/ext4/acl.c
	modified:   fs/ext4/extents.c
	modified:   fs/ext4/ialloc.c
	modified:   fs/ext4/inode.c
	modified:   fs/ext4/super.c
	modified:   fs/gfs2/lops.c
	modified:   fs/gfs2/trans.c
	modified:   fs/jbd/transaction.c
	modified:   fs/jffs2/file.c
	modified:   fs/jffs2/nodemgmt.c
	modified:   fs/nfs/blocklayout/blocklayout.c
	modified:   fs/nfs/blocklayout/blocklayout.h
	modified:   fs/nfs/client.c
	modified:   fs/nfs/dir.c
	modified:   fs/nfs/namespace.c
	modified:   fs/nfs/nfs4proc.c
	modified:   fs/nfs/super.c
	modified:   fs/nfsd/nfs4proc.c
	modified:   fs/nfsd/nfs4state.c
	modified:   fs/nfsd/nfs4xdr.c
	modified:   fs/nfsd/nfssvc.c
	modified:   fs/nfsd/vfs.c
	modified:   fs/nilfs2/ioctl.c
	modified:   fs/splice.c
	modified:   fs/udf/inode.c
	modified:   fs/xfs/xfs_aops.c
	modified:   include/asm-generic/tlb.h
	modified:   include/drm/drm_pciids.h
	modified:   include/linux/binfmts.h
	modified:   include/linux/ceph/libceph.h
	modified:   include/linux/mempolicy.h
	modified:   include/linux/page-flags.h
	modified:   include/linux/pci_ids.h
	modified:   include/linux/snmp.h
	modified:   include/linux/usb/ch9.h
	modified:   include/net/inet_connection_sock.h
	modified:   include/net/tcp.h
	modified:   include/target/target_core_base.h
	modified:   kernel/cgroup.c
	modified:   kernel/futex.c
	modified:   kernel/irq/manage.c
	modified:   kernel/rcutree.c
	modified:   kernel/sched/auto_group.c
	modified:   kernel/sched/auto_group.h
	modified:   kernel/sched/core.c
	modified:   kernel/sched/rt.c
	modified:   kernel/smp.c
	modified:   kernel/trace/ftrace.c
	modified:   kernel/trace/ring_buffer.c
	modified:   kernel/watchdog.c
	modified:   kernel/workqueue.c
	modified:   lib/atomic64.c
	modified:   lib/digsig.c
	modified:   lib/mpi/longlong.h
	modified:   mm/huge_memory.c
	modified:   mm/memory-failure.c
	modified:   mm/memory.c
	modified:   mm/mempolicy.c
	modified:   mm/shmem.c
	modified:   mm/sparse.c
	modified:   net/batman-adv/bat_iv_ogm.c
	modified:   net/bluetooth/hci_core.c
	modified:   net/bluetooth/hci_event.c
	modified:   net/bluetooth/hidp/core.c
	modified:   net/bluetooth/rfcomm/sock.c
	modified:   net/can/bcm.c
	modified:   net/ceph/ceph_common.c
	modified:   net/ceph/messenger.c
	modified:   net/ceph/osd_client.c
	modified:   net/ceph/osdmap.c
	modified:   net/dccp/ipv4.c
	modified:   net/dccp/ipv6.c
	modified:   net/ipv4/inet_connection_sock.c
	modified:   net/ipv4/inet_diag.c
	modified:   net/ipv4/ip_fragment.c
	modified:   net/ipv4/proc.c
	modified:   net/ipv4/sysctl_net_ipv4.c
	modified:   net/ipv4/tcp_input.c
	modified:   net/ipv4/tcp_ipv4.c
	modified:   net/ipv6/tcp_ipv6.c
	modified:   net/mac80211/cfg.c
	modified:   net/mac80211/ibss.c
	modified:   net/mac80211/ieee80211_i.h
	modified:   net/mac80211/offchannel.c
	modified:   net/mac80211/scan.c
	modified:   net/mac80211/sta_info.c
	modified:   net/mac80211/work.c
	modified:   net/nfc/llcp/llcp.c
	modified:   net/sched/sch_htb.c
	modified:   net/sctp/chunk.c
	modified:   net/sctp/socket.c
	modified:   net/sunrpc/clnt.c
	modified:   net/sunrpc/rpc_pipe.c
	modified:   net/sunrpc/sched.c
	modified:   net/sunrpc/xprt.c
	modified:   scripts/package/buildtar
	modified:   security/integrity/evm/evm_crypto.c
	modified:   sound/arm/pxa2xx-ac97-lib.c
	modified:   sound/pci/hda/patch_cirrus.c
	modified:   sound/pci/hda/patch_realtek.c
	modified:   sound/pci/hda/patch_sigmatel.c
	modified:   sound/soc/Makefile
	modified:   sound/soc/codecs/sigmadsp.c
	modified:   sound/soc/codecs/wm2000.c
	modified:   sound/soc/codecs/wm2200.c
	modified:   sound/soc/codecs/wm5100.c
	modified:   sound/usb/caiaq/device.c
	modified:   sound/usb/endpoint.c
	modified:   sound/usb/midi.c
	modified:   sound/usb/mixer.c
	modified:   sound/usb/quirks.c
	modified:   tools/perf/builtin-test.c
	modified:   virt/kvm/kvm_main.c