Merge branch 'master' into for-next

Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.

diff --cc arch/arm/mach-omap2/smartreflex.c
Simple merge

diff --cc arch/x86/kernel/process_32.c
Simple merge

diff --cc arch/x86/mm/mmio-mod.c
Simple merge

diff --cc drivers/atm/idt77252.c
Simple merge

diff --cc drivers/block/drbd/drbd_nl.c
Simple merge

diff --cc drivers/block/rbd.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_fence.c
Simple merge

diff --cc drivers/media/radio/wl128x/fmdrv_v4l2.c
Simple merge

diff --cc drivers/net/atlx/atl1.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/pci.c
Simple merge

diff --cc drivers/scsi/bfa/bfad_drv.h
Simple merge

diff --cc drivers/scsi/fcoe/fcoe.c
Simple merge

diff --cc drivers/scsi/isci/phy.c
Simple merge

diff --cc drivers/scsi/mpt2sas/mpt2sas_scsih.c
Simple merge

diff --cc drivers/scsi/mvsas/mv_sas.h
Simple merge

diff --cc drivers/scsi/pmcraid.c
Simple merge

diff --cc drivers/target/target_core_fabric_configfs.c
Simple merge

diff --cc drivers/target/target_core_pr.c
Simple merge

diff --cc drivers/target/target_core_rd.c
Simple merge

diff --cc drivers/target/target_core_transport.c
Simple merge

diff --cc drivers/target/tcm_fc/tfc_cmd.c
Simple merge

diff --cc drivers/target/tcm_fc/tfc_conf.c
Simple merge

diff --cc drivers/target/tcm_fc/tfc_io.c
Simple merge

diff --cc drivers/tty/serial/mrst_max3110.c
Simple merge

diff --cc drivers/usb/gadget/uvc_v4l2.c
Simple merge

diff --cc drivers/usb/musb/musb_gadget.c
Simple merge

diff --cc fs/eventpoll.c
Simple merge

diff --cc fs/xfs/kmem.h
Simple merge

diff --cc include/linux/ceph/messenger.h
Simple merge

diff --cc kernel/futex.c
Simple merge

diff --cc lib/idr.c
Simple merge

diff --cc mm/vmscan.c
Simple merge

diff --cc scripts/checkpatch.pl
Simple merge