Merge branch 'master' into for-next

diff --cc arch/ia64/kvm/kvm-ia64.c
Simple merge

diff --cc arch/sparc/boot/btfixupprep.c
Simple merge

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

diff --cc drivers/dma/at_hdmac.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
Simple merge

diff --cc drivers/ide/ide-gd.c
Simple merge

diff --cc drivers/infiniband/hw/cxgb4/qp.c
Simple merge

diff --cc drivers/net/gianfar.c
Simple merge

diff --cc drivers/net/ibm_newemac/core.c
Simple merge

diff --cc drivers/net/ksz884x.c
Simple merge

diff --cc drivers/net/ll_temac_main.c
Simple merge

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

diff --cc drivers/staging/comedi/drivers/usbdux.c
Simple merge

diff --cc drivers/staging/pohmelfs/inode.c
Simple merge

diff --cc drivers/staging/rt2860/common/cmm_wpa.c
Simple merge

diff --cc drivers/staging/rtl8192e/r8190_rtl8256.c
Simple merge

diff --cc fs/ext4/extents.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc fs/ocfs2/super.c
Simple merge

diff --cc include/linux/ide.h
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc kernel/cpuset.c
Simple merge

diff --cc lib/random32.c
Simple merge

diff --cc sound/soc/fsl/mpc8610_hpcd.c
Simple merge