Linux 3.4.12

Conflicts:
	arch/arm/kernel/traps.c
	drivers/hid/hid-logitech-dj.c

	modified:   Documentation/sound/alsa/HD-Audio-Models.txt
	modified:   Makefile
	modified:   arch/alpha/include/asm/atomic.h
	modified:   arch/arm/Makefile
	modified:   arch/arm/boot/compressed/head.S
	modified:   arch/arm/include/asm/mutex.h
	modified:   arch/arm/kernel/hw_breakpoint.c
	modified:   arch/arm/kernel/traps.c
	modified:   arch/arm/mm/mm.h
	modified:   arch/arm/mm/mmu.c
	modified:   arch/mips/mm/gup.c
	modified:   arch/powerpc/platforms/85xx/p1022_ds.c
	modified:   arch/s390/oprofile/init.c
	modified:   arch/x86/include/asm/xen/page.h
	modified:   arch/x86/pci/fixup.c
	modified:   arch/x86/xen/p2m.c
	modified:   arch/x86/xen/setup.c
	modified:   drivers/acpi/power.c
	modified:   drivers/ata/ahci.c
	modified:   drivers/ata/libata-core.c
	modified:   drivers/base/power/runtime.c
	modified:   drivers/block/cciss_scsi.c
	modified:   drivers/block/nbd.c
	modified:   drivers/block/xen-blkback/blkback.c
	modified:   drivers/bluetooth/btusb.c
	modified:   drivers/cpufreq/powernow-k8.c
	modified:   drivers/dma/at_hdmac.c
	modified:   drivers/dma/pl330.c
	modified:   drivers/gpio/gpio-lpc32xx.c
	modified:   drivers/gpu/drm/drm_crtc.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_modes.c
	modified:   drivers/gpu/drm/i915/intel_ringbuffer.c
	modified:   drivers/gpu/drm/nouveau/nouveau_display.c
	modified:   drivers/gpu/drm/radeon/atombios_crtc.c
	modified:   drivers/gpu/drm/radeon/atombios_encoders.c
	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/udl/udl_connector.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-logitech-dj.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/input/serio/i8042-x86ia64io.h
	modified:   drivers/iommu/intr_remapping.c
	modified:   drivers/isdn/isdnloop/isdnloop.c
	modified:   drivers/md/md.c
	modified:   drivers/md/raid10.c
	modified:   drivers/md/raid10.h
	modified:   drivers/md/raid5.c
	modified:   drivers/media/rc/rc-main.c
	modified:   drivers/media/video/cx25821/cx25821-core.c
	modified:   drivers/media/video/cx25821/cx25821.h
	modified:   drivers/misc/sgi-xp/xpc_uv.c
	modified:   drivers/mmc/card/block.c
	modified:   drivers/mmc/host/mxs-mmc.c
	modified:   drivers/mmc/host/sdhci-esdhc.h
	modified:   drivers/mtd/ubi/vtbl.c
	modified:   drivers/net/can/janz-ican3.c
	modified:   drivers/net/can/mcp251x.c
	modified:   drivers/net/can/ti_hecc.c
	modified:   drivers/net/ethernet/freescale/gianfar.c
	modified:   drivers/net/ethernet/ibm/ibmveth.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/macvtap.c
	modified:   drivers/net/netconsole.c
	modified:   drivers/net/ppp/pptp.c
	modified:   drivers/net/usb/asix.c
	modified:   drivers/net/usb/qmi_wwan.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/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/platform/x86/asus-laptop.c
	modified:   drivers/platform/x86/asus-nb-wmi.c
	modified:   drivers/rtc/rtc-rs5c348.c
	modified:   drivers/rtc/rtc-twl.c
	modified:   drivers/scsi/bnx2i/bnx2i_hwi.c
	modified:   drivers/scsi/hpsa.c
	modified:   drivers/scsi/lpfc/Makefile
	modified:   drivers/scsi/mpt2sas/mpt2sas_base.c
	modified:   drivers/scsi/virtio_scsi.c
	modified:   drivers/staging/android/android_alarm.h
	modified:   drivers/staging/comedi/drivers/das08.c
	modified:   drivers/staging/media/lirc/lirc_sir.c
	modified:   drivers/staging/rtl8712/recv_linux.c
	modified:   drivers/staging/speakup/main.c
	modified:   drivers/staging/vt6656/dpc.c
	modified:   drivers/staging/vt6656/rxtx.c
	modified:   drivers/staging/zcache/zcache-main.c
	modified:   drivers/target/target_core_transport.c
	modified:   drivers/tty/serial/imx.c
	modified:   drivers/tty/serial/pch_uart.c
	modified:   drivers/usb/class/cdc-wdm.c
	modified:   drivers/usb/core/devices.c
	modified:   drivers/usb/core/hcd.c
	modified:   drivers/usb/core/quirks.c
	modified:   drivers/usb/dwc3/ep0.c
	modified:   drivers/usb/dwc3/gadget.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-plat.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/option.c
	modified:   drivers/video/console/fbcon.c
	modified:   drivers/watchdog/hpwdt.c
	modified:   drivers/xen/gntdev.c
	modified:   drivers/xen/grant-table.c
	modified:   fs/cifs/cifs_unicode.c
	modified:   fs/dcache.c
	modified:   fs/lockd/svc.c
	modified:   fs/nfs/inode.c
	modified:   fs/nfs/nfs3proc.c
	modified:   fs/nfs/nfs4proc.c
	modified:   fs/nfs/nfs4xdr.c
	modified:   fs/nfs/super.c
	modified:   fs/nfsd/nfsctl.c
	modified:   fs/nfsd/nfsd.h
	modified:   fs/nfsd/nfssvc.c
	modified:   fs/proc/proc_sysctl.c
	modified:   fs/stat.c
	modified:   include/asm-generic/mutex-xchg.h
	modified:   include/drm/drm_mode.h
	modified:   include/linux/dcache.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/memory.h
	modified:   include/linux/mmc/card.h
	modified:   include/linux/netdevice.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/time.h
	modified:   include/net/bluetooth/smp.h
	modified:   include/net/sock.h
	modified:   include/trace/events/kmem.h
	modified:   include/xen/grant_table.h
	modified:   kernel/async.c
	modified:   kernel/events/core.c
	modified:   kernel/kthread.c
	modified:   kernel/sched/core.c
	modified:   kernel/sched/sched.h
	modified:   kernel/time/tick-sched.c
	modified:   kernel/time/timekeeping.c
	modified:   kernel/workqueue.c
	modified:   lib/digsig.c
	modified:   mm/bootmem.c
	modified:   mm/memory_hotplug.c
	modified:   mm/page_alloc.c
	modified:   mm/vmscan.c
	modified:   net/atm/common.c
	modified:   net/atm/pvc.c
	modified:   net/bluetooth/hci_core.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/core/dev.c
	modified:   net/core/net_namespace.c
	modified:   net/core/sock.c
	modified:   net/dccp/ccids/ccid3.c
	modified:   net/ipv4/ipmr.c
	modified:   net/ipv4/tcp.c
	modified:   net/ipv4/tcp_cong.c
	modified:   net/ipv4/tcp_input.c
	modified:   net/ipv4/tcp_output.c
	modified:   net/ipv6/addrconf.c
	modified:   net/l2tp/l2tp_core.c
	modified:   net/l2tp/l2tp_core.h
	modified:   net/llc/af_llc.c
	modified:   net/mac80211/mlme.c
	modified:   net/netfilter/ipvs/ip_vs_ctl.c
	modified:   net/openvswitch/vport-internal_dev.c
	modified:   net/packet/af_packet.c
	modified:   net/rds/recv.c
	modified:   net/sched/act_gact.c
	modified:   net/socket.c
	modified:   net/wireless/reg.c
	modified:   sound/pci/hda/hda_codec.c
	modified:   sound/pci/hda/patch_realtek.c
	modified:   sound/pci/hda/patch_sigmatel.c
	modified:   sound/pci/ice1712/prodigy_hifi.c
	modified:   sound/soc/codecs/wm2000.c
	modified:   sound/soc/samsung/dma.c
	modified:   sound/soc/tegra/tegra_alc5632.c