Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

author Paul Mundt <lethal@linux-sh.org>

Wed, 26 Jan 2011 09:23:27 +0000 (18:23 +0900)

committer Paul Mundt <lethal@linux-sh.org>

Wed, 26 Jan 2011 09:23:27 +0000 (18:23 +0900)
author Paul Mundt <lethal@linux-sh.org>
Wed, 26 Jan 2011 09:23:27 +0000 (18:23 +0900)
committer Paul Mundt <lethal@linux-sh.org>
Wed, 26 Jan 2011 09:23:27 +0000 (18:23 +0900)
diff --cc drivers/tty/serial/sh-sci.c
Simple merge
diff --cc drivers/tty/serial/sh-sci.h
Simple merge
author	Paul Mundt <lethal@linux-sh.org>
	Wed, 26 Jan 2011 09:23:27 +0000 (18:23 +0900)
committer	Paul Mundt <lethal@linux-sh.org>
	Wed, 26 Jan 2011 09:23:27 +0000 (18:23 +0900)
		1	2
drivers/tty/serial/sh-sci.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/sh-sci.h	patch \|	diff1 \|	diff2 \|	blob \| history