Public Git Hosting - linux-2.6/cjktty.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: f16f849 e657e07)

commit	3bd7bf1f0fe14f591c089ae61bbfa9bd356f178a
author	Jiri Kosina <jkosina@suse.cz>
	Sun, 28 Oct 2012 18:28:52 +0000 (28 19:28 +0100)
committer	Jiri Kosina <jkosina@suse.cz>
	Sun, 28 Oct 2012 18:29:19 +0000 (28 19:29 +0100)
tree	0058693cc9e70b7461dae551f8a19aff2efd13ca	tree \| snapshot (tar.gz zip)
parent	f16f84937d769c893492160b1a8c3672e3992beb	commit \| diff
parent	e657e078d3dfa9f96976db7a2b5fd7d7c9f1f1a6	commit \| diff

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 <jkosina@suse.cz>

README	diff1 \|	diff2 \|	blob \| history
drivers/char/ppdev.c	diff1 \|	diff2 \|	blob \| history
drivers/target/iscsi/iscsi_target_parameters.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/hvc/hvc_vio.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/8250/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/bfin_uart.c	diff1 \|	diff2 \|	blob \| history
mm/util.c	diff1 \|	diff2 \|	blob \| history
net/rfkill/core.c	diff1 \|	diff2 \|	blob \| history
security/keys/process_keys.c	diff1 \|	diff2 \|	blob \| history

CJK support for tty framebuffer vt