Merge branches 'sh/serial-rework' and 'sh/oprofile'

author Paul Mundt <[email protected]>

Tue, 28 Oct 2008 10:44:15 +0000 (19:44 +0900)

committer Paul Mundt <[email protected]>

Tue, 28 Oct 2008 10:44:15 +0000 (19:44 +0900)
author Paul Mundt <[email protected]>
Tue, 28 Oct 2008 10:44:15 +0000 (19:44 +0900)
committer Paul Mundt <[email protected]>
Tue, 28 Oct 2008 10:44:15 +0000 (19:44 +0900)
diff --cc drivers/serial/sh-sci.c
Simple merge
diff --cc drivers/serial/sh-sci.h
Simple merge
author	Paul Mundt <[email protected]>
	Tue, 28 Oct 2008 10:44:15 +0000 (19:44 +0900)
committer	Paul Mundt <[email protected]>
	Tue, 28 Oct 2008 10:44:15 +0000 (19:44 +0900)
		1	2	3
drivers/serial/sh-sci.c	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/serial/sh-sci.h	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history