Linux 3.4.11 - 3.4.20

Conflicts:

	drivers/usb/host/xhci.h
	include/sound/core.h
	mm/vmscan.c

Conflicts:

	arch/xtensa/kernel/process.c
	drivers/interceptor/linux_versions.h

Conflicts:
	Makefile
	arch/arm/include/asm/mutex.h
	arch/arm/include/asm/pgtable.h
	arch/arm/kernel/traps.c
	drivers/mmc/host/sdhci.c
	drivers/usb/host/xhci-pci.c
	drivers/usb/host/xhci.c
	drivers/usb/host/xhci.h
	include/asm-generic/mutex-xchg.h
	include/sound/core.h
	mm/vmscan.c

	modified:   Documentation/cgroups/memory.txt
	modified:   Documentation/devicetree/bindings/arm/atmel-at91.txt
	modified:   Documentation/sound/alsa/HD-Audio-Models.txt
	modified:   Makefile
	modified:   arch/alpha/include/asm/atomic.h
	modified:   arch/alpha/kernel/process.c
	modified:   arch/arm/Kconfig
	modified:   arch/arm/boot/compressed/head.S
	modified:   arch/arm/include/asm/pgtable.h
	modified:   arch/arm/include/asm/vfpmacros.h
	modified:   arch/arm/kernel/hw_breakpoint.c
	modified:   arch/arm/kernel/smp.c
	modified:   arch/arm/kernel/traps.c
	modified:   arch/arm/mach-at91/at91rm9200_devices.c
	modified:   arch/arm/mach-at91/at91sam9260_devices.c
	modified:   arch/arm/mach-at91/at91sam9261_devices.c
	modified:   arch/arm/mach-at91/at91sam9263_devices.c
	modified:   arch/arm/mach-at91/at91sam9rl_devices.c
	modified:   arch/arm/mach-at91/setup.c
	modified:   arch/arm/mm/cache-v7.S
	modified:   arch/cris/kernel/process.c
	modified:   arch/frv/kernel/process.c
	modified:   arch/h8300/kernel/process.c
	modified:   arch/ia64/kernel/process.c
	modified:   arch/m32r/kernel/process.c
	modified:   arch/m68k/include/asm/signal.h
	modified:   arch/m68k/kernel/process.c
	modified:   arch/mips/Makefile
	modified:   arch/mips/kernel/Makefile
	modified:   arch/mips/kernel/kgdb.c
	modified:   arch/mips/mm/gup.c
	modified:   arch/mn10300/Makefile
	modified:   arch/mn10300/kernel/process.c
	modified:   arch/parisc/kernel/process.c
	modified:   arch/powerpc/include/asm/pci-bridge.h
	modified:   arch/powerpc/platforms/85xx/p1022_ds.c
	modified:   arch/powerpc/platforms/pseries/eeh.c
	modified:   arch/s390/boot/compressed/vmlinux.lds.S
	modified:   arch/s390/include/asm/compat.h
	modified:   arch/s390/include/asm/ptrace.h
	modified:   arch/s390/kernel/compat_signal.c
	modified:   arch/s390/kernel/signal.c
	modified:   arch/s390/kernel/vmlinux.lds.S
	modified:   arch/s390/mm/gup.c
	modified:   arch/s390/oprofile/init.c
	modified:   arch/score/kernel/process.c
	modified:   arch/sparc/kernel/perf_event.c
	modified:   arch/sparc/kernel/sys_sparc_64.c
	modified:   arch/sparc/kernel/syscalls.S
	modified:   arch/sparc/mm/init_64.c
	modified:   arch/tile/Makefile
	modified:   arch/x86/Makefile
	modified:   arch/x86/boot/compressed/Makefile
	modified:   arch/x86/include/asm/efi.h
	modified:   arch/x86/include/asm/pgtable.h
	modified:   arch/x86/include/asm/xen/page.h
	modified:   arch/x86/kernel/alternative.c
	modified:   arch/x86/kernel/e820.c
	modified:   arch/x86/kernel/entry_32.S
	modified:   arch/x86/kernel/entry_64.S
	modified:   arch/x86/kernel/setup.c
	modified:   arch/x86/mm/init.c
	modified:   arch/x86/oprofile/nmi_int.c
	modified:   arch/x86/pci/fixup.c
	modified:   arch/x86/platform/efi/efi.c
	modified:   arch/x86/xen/enlighten.c
	modified:   arch/x86/xen/mmu.c
	modified:   arch/x86/xen/p2m.c
	modified:   arch/x86/xen/setup.c
	modified:   block/blk-core.c
	modified:   crypto/cryptd.c
	modified:   drivers/acpi/bus.c
	modified:   drivers/acpi/ec.c
	modified:   drivers/acpi/power.c
	modified:   drivers/acpi/video.c
	modified:   drivers/ata/ahci.c
	modified:   drivers/ata/libata-core.c
	modified:   drivers/base/power/main.c
	modified:   drivers/base/power/runtime.c
	modified:   drivers/bcma/main.c
	modified:   drivers/block/aoe/aoecmd.c
	modified:   drivers/block/cciss_scsi.c
	modified:   drivers/block/floppy.c
	modified:   drivers/block/nbd.c
	modified:   drivers/block/rbd.c
	modified:   drivers/block/xen-blkback/blkback.c
	modified:   drivers/bluetooth/btusb.c
	modified:   drivers/char/tpm/tpm.c
	modified:   drivers/char/ttyprintk.c
	modified:   drivers/cpufreq/powernow-k8.c
	modified:   drivers/dma/at_hdmac.c
	modified:   drivers/dma/dmaengine.c
	modified:   drivers/dma/imx-dma.c
	modified:   drivers/dma/pl330.c
	modified:   drivers/dma/sirf-dma.c
	modified:   drivers/edac/amd64_edac.c
	modified:   drivers/firewire/core-cdev.c
	modified:   drivers/firmware/efivars.c
	modified:   drivers/gpio/gpio-lpc32xx.c
	modified:   drivers/gpio/gpio-timberdale.c
	modified:   drivers/gpio/gpiolib.c
	modified:   drivers/gpu/drm/drm_crtc.c
	modified:   drivers/gpu/drm/drm_fops.c
	modified:   drivers/gpu/drm/i915/intel_crt.c
	modified:   drivers/gpu/drm/i915/intel_display.c
	modified:   drivers/gpu/drm/i915/intel_drv.h
	modified:   drivers/gpu/drm/i915/intel_hdmi.c
	modified:   drivers/gpu/drm/i915/intel_lvds.c
	modified:   drivers/gpu/drm/i915/intel_modes.c
	modified:   drivers/gpu/drm/i915/intel_overlay.c
	modified:   drivers/gpu/drm/i915/intel_ringbuffer.c
	modified:   drivers/gpu/drm/i915/intel_sdvo.c
	modified:   drivers/gpu/drm/i915/intel_sdvo_regs.h
	modified:   drivers/gpu/drm/nouveau/nouveau_display.c
	modified:   drivers/gpu/drm/nouveau/nouveau_drv.c
	modified:   drivers/gpu/drm/nouveau/nouveau_state.c
	modified:   drivers/gpu/drm/nouveau/nv04_dac.c
	modified:   drivers/gpu/drm/nouveau/nv04_dfp.c
	modified:   drivers/gpu/drm/nouveau/nv04_tv.c
	modified:   drivers/gpu/drm/radeon/atombios_crtc.c
	modified:   drivers/gpu/drm/radeon/atombios_encoders.c
	modified:   drivers/gpu/drm/radeon/evergreen_cs.c
	modified:   drivers/gpu/drm/radeon/evergreend.h
	modified:   drivers/gpu/drm/radeon/radeon.h
	modified:   drivers/gpu/drm/radeon/radeon_atombios.c
	modified:   drivers/gpu/drm/radeon/radeon_atpx_handler.c
	modified:   drivers/gpu/drm/radeon/radeon_bios.c
	modified:   drivers/gpu/drm/radeon/radeon_device.c
	modified:   drivers/gpu/drm/radeon/radeon_irq_kms.c
	modified:   drivers/gpu/drm/radeon/radeon_legacy_encoders.c
	modified:   drivers/gpu/drm/radeon/radeon_pm.c
	modified:   drivers/gpu/drm/radeon/si.c
	modified:   drivers/gpu/drm/radeon/sid.h
	modified:   drivers/gpu/drm/savage/savage_bci.c
	modified:   drivers/gpu/drm/ttm/ttm_page_alloc.c
	modified:   drivers/gpu/drm/udl/udl_connector.c
	modified:   drivers/gpu/drm/udl/udl_drv.h
	modified:   drivers/gpu/drm/udl/udl_fb.c
	modified:   drivers/gpu/drm/udl/udl_transfer.c
	modified:   drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
	modified:   drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
	modified:   drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
	modified:   drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
	modified:   drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
	modified:   drivers/hid/hid-microsoft.c
	modified:   drivers/hv/channel.c
	modified:   drivers/hwmon/ad7314.c
	modified:   drivers/hwmon/ads7871.c
	modified:   drivers/hwmon/fam15h_power.c
	modified:   drivers/hwmon/twl4030-madc-hwmon.c
	modified:   drivers/hwmon/w83627ehf.c
	modified:   drivers/infiniband/core/cma.c
	modified:   drivers/infiniband/core/netlink.c
	modified:   drivers/infiniband/ulp/ipoib/ipoib_main.c
	modified:   drivers/infiniband/ulp/ipoib/ipoib_multicast.c
	modified:   drivers/infiniband/ulp/srp/ib_srp.c
	modified:   drivers/input/serio/i8042-x86ia64io.h
	modified:   drivers/input/touchscreen/tsc40.c
	modified:   drivers/iommu/intel-iommu.c
	modified:   drivers/iommu/intr_remapping.c
	modified:   drivers/iommu/tegra-smmu.c
	modified:   drivers/isdn/isdnloop/isdnloop.c
	modified:   drivers/media/rc/ite-cir.c
	modified:   drivers/media/rc/rc-main.c
	modified:   drivers/media/video/au0828/au0828-video.c
	modified:   drivers/media/video/cx25821/cx25821-core.c
	modified:   drivers/media/video/cx25821/cx25821.h
	modified:   drivers/media/video/gspca/pac7302.c
	modified:   drivers/mfd/max8925-core.c
	modified:   drivers/misc/sgi-xp/xpc_uv.c
	modified:   drivers/mmc/host/mxs-mmc.c
	modified:   drivers/mmc/host/omap_hsmmc.c
	modified:   drivers/mmc/host/sdhci-esdhc.h
	modified:   drivers/mmc/host/sdhci.c
	modified:   drivers/mmc/host/sh_mmcif.c
	modified:   drivers/mtd/maps/autcpu12-nvram.c
	modified:   drivers/mtd/mtdpart.c
	modified:   drivers/mtd/nand/nand_base.c
	modified:   drivers/mtd/nand/nand_bbt.c
	modified:   drivers/mtd/nand/nandsim.c
	modified:   drivers/mtd/nand/omap2.c
	modified:   drivers/mtd/ubi/build.c
	modified:   drivers/mtd/ubi/vtbl.c
	modified:   drivers/net/can/janz-ican3.c
	modified:   drivers/net/can/mcp251x.c
	modified:   drivers/net/can/mscan/mpc5xxx_can.c
	modified:   drivers/net/can/ti_hecc.c
	modified:   drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
	modified:   drivers/net/ethernet/freescale/gianfar.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/marvell/skge.c
	modified:   drivers/net/ethernet/marvell/sky2.c
	modified:   drivers/net/ethernet/nxp/lpc_eth.c
	modified:   drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
	modified:   drivers/net/ethernet/realtek/r8169.c
	modified:   drivers/net/ethernet/sfc/efx.c
	modified:   drivers/net/ethernet/sfc/efx.h
	modified:   drivers/net/ethernet/sfc/ethtool.c
	modified:   drivers/net/ethernet/sfc/tx.c
	modified:   drivers/net/ethernet/ti/davinci_cpdma.c
	modified:   drivers/net/macvtap.c
	modified:   drivers/net/netconsole.c
	modified:   drivers/net/ppp/pppoe.c
	modified:   drivers/net/ppp/pptp.c
	modified:   drivers/net/rionet.c
	modified:   drivers/net/usb/asix.c
	modified:   drivers/net/usb/qmi_wwan.c
	modified:   drivers/net/usb/sierra_net.c
	modified:   drivers/net/wan/ixp4xx_hss.c
	modified:   drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
	modified:   drivers/net/wireless/ath/ath9k/beacon.c
	modified:   drivers/net/wireless/ath/ath9k/main.c
	modified:   drivers/net/wireless/ath/ath9k/pci.c
	modified:   drivers/net/wireless/ath/ath9k/xmit.c
	modified:   drivers/net/wireless/b43/main.c
	modified:   drivers/net/wireless/b43legacy/main.c
	modified:   drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
	modified:   drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
	modified:   drivers/net/wireless/rt2x00/rt2400pci.c
	modified:   drivers/net/wireless/rt2x00/rt2400pci.h
	modified:   drivers/net/wireless/rt2x00/rt2500pci.c
	modified:   drivers/net/wireless/rt2x00/rt2500usb.c
	modified:   drivers/net/wireless/rt2x00/rt2500usb.h
	modified:   drivers/net/wireless/rt2x00/rt2800lib.c
	modified:   drivers/net/wireless/rt2x00/rt2800pci.c
	modified:   drivers/net/wireless/rt2x00/rt2800usb.c
	modified:   drivers/net/wireless/rt2x00/rt2x00dev.c
	modified:   drivers/net/wireless/rt2x00/rt61pci.c
	modified:   drivers/net/wireless/rt2x00/rt61pci.h
	modified:   drivers/net/wireless/rt2x00/rt73usb.c
	modified:   drivers/net/wireless/rt2x00/rt73usb.h
	modified:   drivers/net/wireless/rtlwifi/rtl8192ce/def.h
	modified:   drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
	modified:   drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
	modified:   drivers/pci/hotplug/acpiphp_glue.c
	modified:   drivers/pci/probe.c
	modified:   drivers/pcmcia/pxa2xx_sharpsl.c
	modified:   drivers/pinctrl/pinctrl-tegra.c
	modified:   drivers/pinctrl/pinctrl-tegra30.c
	modified:   drivers/platform/x86/asus-laptop.c
	modified:   drivers/platform/x86/asus-nb-wmi.c
	modified:   drivers/remoteproc/Kconfig
	modified:   drivers/remoteproc/remoteproc_core.c
	modified:   drivers/rtc/rtc-imxdi.c
	modified:   drivers/rtc/rtc-rs5c348.c
	modified:   drivers/rtc/rtc-twl.c
	modified:   drivers/s390/scsi/zfcp_aux.c
	modified:   drivers/s390/scsi/zfcp_ccw.c
	modified:   drivers/s390/scsi/zfcp_cfdc.c
	modified:   drivers/s390/scsi/zfcp_dbf.c
	modified:   drivers/s390/scsi/zfcp_dbf.h
	modified:   drivers/s390/scsi/zfcp_def.h
	modified:   drivers/s390/scsi/zfcp_ext.h
	modified:   drivers/s390/scsi/zfcp_fsf.c
	modified:   drivers/s390/scsi/zfcp_qdio.c
	modified:   drivers/s390/scsi/zfcp_sysfs.c
	modified:   drivers/s390/scsi/zfcp_unit.c
	modified:   drivers/scsi/atp870u.c
	modified:   drivers/scsi/bnx2i/bnx2i_hwi.c
	modified:   drivers/scsi/device_handler/scsi_dh_alua.c
	modified:   drivers/scsi/hpsa.c
	modified:   drivers/scsi/hpsa.h
	modified:   drivers/scsi/hpsa_cmd.h
	modified:   drivers/scsi/ibmvscsi/ibmvscsi.c
	modified:   drivers/scsi/isci/init.c
	modified:   drivers/scsi/isci/probe_roms.c
	modified:   drivers/scsi/lpfc/Makefile
	modified:   drivers/scsi/mpt2sas/mpt2sas_base.c
	modified:   drivers/scsi/scsi_debug.c
	modified:   drivers/scsi/scsi_sysfs.c
	modified:   drivers/scsi/storvsc_drv.c
	modified:   drivers/scsi/virtio_scsi.c
	modified:   drivers/staging/comedi/comedi_fops.c
	modified:   drivers/staging/comedi/drivers/amplc_pc236.c
	modified:   drivers/staging/comedi/drivers/das08.c
	modified:   drivers/staging/comedi/drivers/jr3_pci.c
	modified:   drivers/staging/comedi/drivers/s626.c
	modified:   drivers/staging/media/lirc/lirc_sir.c
	modified:   drivers/staging/rtl8712/recv_linux.c
	modified:   drivers/staging/rtl8712/rtl8712_recv.c
	modified:   drivers/staging/speakup/main.c
	modified:   drivers/staging/speakup/speakup_soft.c
	modified:   drivers/staging/vt6656/dpc.c
	modified:   drivers/staging/vt6656/rxtx.c
	modified:   drivers/staging/zcache/zcache-main.c
	modified:   drivers/target/iscsi/iscsi_target.c
	modified:   drivers/target/iscsi/iscsi_target_core.h
	modified:   drivers/target/iscsi/iscsi_target_login.c
	modified:   drivers/target/iscsi/iscsi_target_tpg.c
	modified:   drivers/target/iscsi/iscsi_target_util.c
	modified:   drivers/target/iscsi/iscsi_target_util.h
	modified:   drivers/target/target_core_configfs.c
	modified:   drivers/target/target_core_device.c
	modified:   drivers/target/target_core_tmr.c
	modified:   drivers/target/target_core_transport.c
	modified:   drivers/tty/n_gsm.c
	modified:   drivers/tty/n_tty.c
	modified:   drivers/tty/serial/8250/8250_pci.c
	modified:   drivers/tty/serial/amba-pl011.c
	modified:   drivers/tty/serial/imx.c
	modified:   drivers/tty/serial/pch_uart.c
	modified:   drivers/tty/vt/keyboard.c
	modified:   drivers/tty/vt/vt.c
	modified:   drivers/usb/class/cdc-acm.c
	modified:   drivers/usb/class/cdc-wdm.c
	modified:   drivers/usb/core/devices.c
	modified:   drivers/usb/core/hcd.c
	modified:   drivers/usb/core/hub.c
	modified:   drivers/usb/core/quirks.c
	modified:   drivers/usb/gadget/at91_udc.c
	modified:   drivers/usb/gadget/dummy_hcd.c
	modified:   drivers/usb/host/ohci-at91.c
	modified:   drivers/usb/host/pci-quirks.c
	modified:   drivers/usb/host/pci-quirks.h
	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-plat.c
	modified:   drivers/usb/host/xhci-ring.c
	modified:   drivers/usb/host/xhci.c
	modified:   drivers/usb/host/xhci.h
	modified:   drivers/usb/serial/ftdi_sio.c
	modified:   drivers/usb/serial/ftdi_sio_ids.h
	modified:   drivers/usb/serial/mos7840.c
	modified:   drivers/usb/serial/opticon.c
	modified:   drivers/usb/serial/option.c
	modified:   drivers/usb/serial/qcaux.c
	modified:   drivers/usb/serial/sierra.c
	modified:   drivers/usb/serial/usb-serial.c
	modified:   drivers/usb/serial/whiteheat.c
	modified:   drivers/usb/storage/unusual_devs.h
	modified:   drivers/vhost/net.c
	modified:   drivers/video/console/fbcon.c
	modified:   drivers/video/udlfb.c
	modified:   drivers/video/via/via_clock.c
	modified:   drivers/watchdog/hpwdt.c
	modified:   drivers/xen/events.c
	modified:   drivers/xen/gntdev.c
	modified:   drivers/xen/grant-table.c
	modified:   fs/autofs4/root.c
	modified:   fs/binfmt_elf.c
	modified:   fs/ceph/addr.c
	modified:   fs/ceph/debugfs.c
	modified:   fs/ceph/export.c
	modified:   fs/ceph/mds_client.c
	modified:   fs/ceph/mds_client.h
	modified:   fs/cifs/cifs_unicode.c
	modified:   fs/cifs/cifsacl.c
	modified:   fs/cifs/connect.c
	modified:   fs/compat_ioctl.c
	modified:   fs/dcache.c
	modified:   fs/exec.c
	modified:   fs/ext4/extents.c
	modified:   fs/ext4/ialloc.c
	modified:   fs/ext4/inode.c
	modified:   fs/ext4/mballoc.c
	modified:   fs/ext4/move_extent.c
	modified:   fs/ext4/namei.c
	modified:   fs/ext4/resize.c
	modified:   fs/ext4/super.c
	modified:   fs/fs-writeback.c
	modified:   fs/gfs2/export.c
	modified:   fs/isofs/export.c
	modified:   fs/jbd/commit.c
	modified:   fs/jbd/transaction.c
	modified:   fs/jbd2/journal.c
	modified:   fs/jffs2/wbuf.c
	modified:   fs/lockd/clntxdr.c
	modified:   fs/lockd/mon.c
	modified:   fs/lockd/svc.c
	modified:   fs/lockd/svcproc.c
	modified:   fs/nfs/dir.c
	modified:   fs/nfs/dns_resolve.c
	modified:   fs/nfs/inode.c
	modified:   fs/nfs/internal.h
	modified:   fs/nfs/mount_clnt.c
	modified:   fs/nfs/namespace.c
	modified:   fs/nfs/nfs3proc.c
	modified:   fs/nfs/nfs4namespace.c
	modified:   fs/nfs/nfs4proc.c
	modified:   fs/nfs/nfs4xdr.c
	modified:   fs/nfs/super.c
	modified:   fs/nfsd/export.c
	modified:   fs/nfsd/nfs4idmap.c
	modified:   fs/nfsd/nfs4state.c
	modified:   fs/nfsd/nfsctl.c
	modified:   fs/nfsd/nfsd.h
	modified:   fs/nfsd/nfssvc.c
	modified:   fs/notify/fanotify/fanotify.c
	modified:   fs/proc/page.c
	modified:   fs/proc/proc_sysctl.c
	modified:   fs/proc/stat.c
	modified:   fs/reiserfs/inode.c
	modified:   fs/reiserfs/stree.c
	modified:   fs/reiserfs/super.c
	modified:   fs/stat.c
	modified:   fs/sysfs/dir.c
	modified:   fs/ubifs/find.c
	modified:   fs/ubifs/lprops.c
	modified:   fs/ubifs/ubifs.h
	modified:   fs/udf/super.c
	modified:   fs/xfs/xfs_buf.c
	modified:   fs/xfs/xfs_export.c
	modified:   fs/xfs/xfs_log_recover.c
	modified:   include/asm-generic/mutex-xchg.h
	modified:   include/drm/drm_mode.h
	modified:   include/drm/drm_pciids.h
	modified:   include/linux/ceph/auth.h
	modified:   include/linux/ceph/libceph.h
	modified:   include/linux/ceph/messenger.h
	modified:   include/linux/ceph/mon_client.h
	modified:   include/linux/ceph/msgpool.h
	modified:   include/linux/ceph/osd_client.h
	modified:   include/linux/ceph/osdmap.h
	modified:   include/linux/crush/crush.h
	modified:   include/linux/crush/mapper.h
	modified:   include/linux/dcache.h
	modified:   include/linux/efi.h
	modified:   include/linux/if_vlan.h
	modified:   include/linux/init_task.h
	modified:   include/linux/kobject.h
	modified:   include/linux/kthread.h
	modified:   include/linux/ktime.h
	modified:   include/linux/memblock.h
	modified:   include/linux/memory.h
	modified:   include/linux/mempolicy.h
	modified:   include/linux/mtd/nand.h
	modified:   include/linux/netdevice.h
	modified:   include/linux/netfilter/ipset/ip_set_timeout.h
	modified:   include/linux/netlink.h
	modified:   include/linux/nfs_fs.h
	modified:   include/linux/pci_ids.h
	modified:   include/linux/perf_event.h
	modified:   include/linux/sched.h
	modified:   include/linux/sunrpc/cache.h
	modified:   include/linux/sunrpc/xprt.h
	modified:   include/linux/time.h
	modified:   include/linux/xfrm.h
	modified:   include/net/cfg80211.h
	modified:   include/net/ip_vs.h
	modified:   include/net/netfilter/nf_conntrack_ecache.h
	modified:   include/net/sock.h
	modified:   include/net/xfrm.h
	modified:   include/rdma/rdma_netlink.h
	modified:   include/sound/core.h
	modified:   include/trace/events/kmem.h
	modified:   include/trace/events/xen.h
	modified:   include/xen/grant_table.h
	modified:   init/main.c
	modified:   kernel/async.c
	modified:   kernel/cgroup.c
	modified:   kernel/cpuset.c
	modified:   kernel/debug/kdb/kdb_io.c
	modified:   kernel/events/core.c
	modified:   kernel/futex.c
	modified:   kernel/kthread.c
	modified:   kernel/sched/core.c
	modified:   kernel/sched/sched.h
	modified:   kernel/sched/stop_task.c
	modified:   kernel/sys.c
	modified:   kernel/time/tick-sched.c
	modified:   kernel/time/timekeeping.c
	modified:   kernel/timer.c
	modified:   kernel/workqueue.c
	modified:   lib/digsig.c
	modified:   lib/gcd.c
	modified:   lib/genalloc.c
	modified:   mm/bootmem.c
	modified:   mm/hugetlb.c
	modified:   mm/memblock.c
	modified:   mm/memcontrol.c
	modified:   mm/memory_hotplug.c
	modified:   mm/mempolicy.c
	modified:   mm/page_alloc.c
	modified:   mm/rmap.c
	modified:   mm/shmem.c
	modified:   mm/slab.c
	modified:   mm/truncate.c
	modified:   mm/vmscan.c
	modified:   net/8021q/vlan_core.c
	modified:   net/atm/common.c
	modified:   net/atm/pvc.c
	modified:   net/bluetooth/hci_event.c
	modified:   net/bluetooth/hci_sock.c
	modified:   net/bluetooth/l2cap_sock.c
	modified:   net/bluetooth/rfcomm/sock.c
	modified:   net/bluetooth/rfcomm/tty.c
	modified:   net/bluetooth/smp.c
	modified:   net/ceph/auth_none.c
	modified:   net/ceph/auth_x.c
	modified:   net/ceph/ceph_common.c
	modified:   net/ceph/crush/crush.c
	modified:   net/ceph/crush/mapper.c
	modified:   net/ceph/crypto.c
	modified:   net/ceph/crypto.h
	modified:   net/ceph/debugfs.c
	modified:   net/ceph/messenger.c
	modified:   net/ceph/mon_client.c
	modified:   net/ceph/msgpool.c
	modified:   net/ceph/osd_client.c
	modified:   net/ceph/osdmap.c
	modified:   net/core/dev.c
	modified:   net/core/dev_addr_lists.c
	modified:   net/core/neighbour.c
	modified:   net/core/net_namespace.c
	modified:   net/core/pktgen.c
	modified:   net/core/sock.c
	modified:   net/dccp/ccids/ccid3.c
	modified:   net/ipv4/inet_diag.c
	modified:   net/ipv4/ip_sockglue.c
	modified:   net/ipv4/ipmr.c
	modified:   net/ipv4/netfilter/nf_nat_sip.c
	modified:   net/ipv4/netfilter/nf_nat_standalone.c
	modified:   net/ipv4/raw.c
	modified:   net/ipv4/tcp.c
	modified:   net/ipv4/tcp_cong.c
	modified:   net/ipv4/tcp_illinois.c
	modified:   net/ipv4/tcp_input.c
	modified:   net/ipv4/tcp_ipv4.c
	modified:   net/ipv4/tcp_output.c
	modified:   net/ipv6/addrconf.c
	modified:   net/ipv6/ip6_fib.c
	modified:   net/ipv6/ipv6_sockglue.c
	modified:   net/ipv6/mip6.c
	modified:   net/ipv6/ndisc.c
	modified:   net/ipv6/raw.c
	modified:   net/ipv6/route.c
	modified:   net/ipv6/tcp_ipv6.c
	modified:   net/l2tp/l2tp_core.c
	modified:   net/l2tp/l2tp_core.h
	modified:   net/l2tp/l2tp_eth.c
	modified:   net/llc/af_llc.c
	modified:   net/mac80211/ibss.c
	modified:   net/mac80211/ieee80211_i.h
	modified:   net/mac80211/mlme.c
	modified:   net/mac80211/rx.c
	modified:   net/mac80211/sta_info.c
	modified:   net/mac80211/status.c
	modified:   net/mac80211/tx.c
	modified:   net/mac80211/util.c
	modified:   net/mac80211/wpa.c
	modified:   net/netfilter/ipvs/ip_vs_ctl.c
	modified:   net/netfilter/nf_conntrack_core.c
	modified:   net/netfilter/nf_conntrack_expect.c
	modified:   net/netfilter/nf_conntrack_proto_tcp.c
	modified:   net/netfilter/xt_hashlimit.c
	modified:   net/netfilter/xt_limit.c
	modified:   net/netfilter/xt_set.c
	modified:   net/netlink/af_netlink.c
	modified:   net/netrom/af_netrom.c
	modified:   net/openvswitch/vport-internal_dev.c
	modified:   net/packet/af_packet.c
	modified:   net/rds/recv.c
	modified:   net/rds/send.c
	modified:   net/sched/act_gact.c
	modified:   net/sched/sch_cbq.c
	modified:   net/sctp/output.c
	modified:   net/sctp/sm_sideeffect.c
	modified:   net/socket.c
	modified:   net/sunrpc/cache.c
	modified:   net/sunrpc/xprt.c
	modified:   net/sunrpc/xprtrdma/transport.c
	modified:   net/sunrpc/xprtsock.c
	modified:   net/wireless/core.c
	modified:   net/wireless/reg.c
	modified:   net/wireless/util.c
	modified:   net/xfrm/xfrm_input.c
	modified:   net/xfrm/xfrm_policy.c
	modified:   net/xfrm/xfrm_replay.c
	modified:   net/xfrm/xfrm_user.c
	modified:   scripts/Kbuild.include
	modified:   scripts/gcc-version.sh
	modified:   scripts/gcc-x86_32-has-stack-protector.sh
	modified:   scripts/gcc-x86_64-has-stack-protector.sh
	modified:   scripts/kconfig/check.sh
	modified:   scripts/kconfig/lxdialog/check-lxdialog.sh
	modified:   scripts/kconfig/streamline_config.pl
	modified:   security/selinux/netnode.c
	modified:   security/yama/yama_lsm.c
	modified:   sound/core/compress_offload.c
	modified:   sound/core/control.c
	modified:   sound/core/hwdep.c
	modified:   sound/core/init.c
	modified:   sound/core/oss/mixer_oss.c
	modified:   sound/core/oss/pcm_oss.c
	modified:   sound/core/pcm.c
	modified:   sound/core/pcm_native.c
	modified:   sound/core/rawmidi.c
	modified:   sound/core/sound.c
	modified:   sound/core/sound_oss.c
	modified:   sound/drivers/aloop.c
	modified:   sound/pci/ac97/ac97_codec.c
	modified:   sound/pci/emu10k1/emu10k1_main.c
	modified:   sound/pci/hda/hda_codec.c
	modified:   sound/pci/hda/patch_analog.c
	modified:   sound/pci/hda/patch_cirrus.c
	modified:   sound/pci/hda/patch_realtek.c
	modified:   sound/pci/hda/patch_sigmatel.c
	modified:   sound/pci/hda/patch_via.c
	modified:   sound/pci/ice1712/prodigy_hifi.c
	modified:   sound/soc/codecs/wm2000.c
	modified:   sound/soc/codecs/wm2200.c
	modified:   sound/soc/codecs/wm8978.c
	modified:   sound/soc/codecs/wm9712.c
	modified:   sound/soc/omap/omap-abe-twl6040.c
	modified:   sound/soc/samsung/dma.c
	modified:   sound/soc/sh/fsi.c
	modified:   sound/soc/soc-dapm.c
	modified:   sound/soc/tegra/tegra_alc5632.c
	modified:   sound/usb/card.c
	modified:   sound/usb/card.h
	modified:   sound/usb/endpoint.c
	modified:   sound/usb/mixer.c
	modified:   sound/usb/mixer_quirks.c
	modified:   sound/usb/pcm.c
	modified:   sound/usb/proc.c
	modified:   sound/usb/quirks-table.h
	modified:   sound/usb/usbaudio.h
	modified:   tools/hv/hv_kvp_daemon.c
	modified:   tools/lguest/lguest.c
	modified:   tools/perf/Makefile
	modified:   tools/power/cpupower/Makefile
	modified:   usr/gen_init_cpio.c
Merge branch 'android-msm-3.4-kk' of https://github.com/KernelLGE/lge-kernel-lproj into android-msm-3.4-kk