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

diff --cc drivers/char/ppdev.c
Simple merge

diff --cc drivers/target/iscsi/iscsi_target_parameters.c
Simple merge

diff --cc mm/util.c
Simple merge