Merge branch 'master' into for-next
Jiri Kosina [Sun, 28 Oct 2012 18:28:52 +0000 (19:28 +0100)]
Sync up with Linus' tree to be able to apply Cesar's patch
against newer version of the code.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>

1  2 
README
drivers/char/ppdev.c
drivers/target/iscsi/iscsi_target_parameters.c
drivers/tty/hvc/hvc_vio.c
drivers/tty/serial/8250/Kconfig
drivers/tty/serial/bfin_uart.c
mm/util.c
net/rfkill/core.c
security/keys/process_keys.c

diff --cc README
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/util.c
Simple merge
Simple merge
Simple merge