Merge branch 'master' into for-next

Sync up with Linus' tree to be able to apply Cesar's patch
against newer version of the code.

Signed-off-by: Jiri Kosina <[email protected]>

diff --cc README
Simple merge

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

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

diff --cc drivers/tty/hvc/hvc_vio.c
Simple merge

diff --cc drivers/tty/serial/8250/Kconfig
Simple merge

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

diff --cc mm/util.c
Simple merge

diff --cc net/rfkill/core.c
Simple merge

diff --cc security/keys/process_keys.c
Simple merge