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

Conflicts:
	Documentation/virtual/virtio-spec.txt

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

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

diff --cc drivers/ata/sata_fsl.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/isdn/i4l/isdn_tty.c
Simple merge

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

diff --cc fs/f2fs/f2fs.h
Simple merge

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