Merge remote-tracking branch 'trivial/for-next'

Conflicts:
	Documentation/virtual/virtio-spec.txt

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/arc/kernel/disasm.c
Simple merge

diff --cc arch/arm/mach-mvebu/irq-armada-370-xp.c
Simple merge

diff --cc arch/s390/kernel/irq.c
Simple merge

diff --cc arch/s390/kvm/trace.h
Simple merge

diff --cc drivers/ata/sata_fsl.c
Simple merge

diff --cc drivers/crypto/caam/ctrl.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_dp.c
Simple merge

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

diff --cc drivers/i2c/busses/i2c-puv3.c
Simple merge

diff --cc drivers/isdn/i4l/isdn_tty.c
Simple merge

diff --cc drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
Simple merge

diff --cc drivers/power/pm2301_charger.c
Simple merge

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

diff --cc mm/hugetlb.c
Simple merge