Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linus

author Paul Mundt <[email protected]>

Fri, 11 Nov 2011 07:16:25 +0000 (16:16 +0900)

committer Paul Mundt <[email protected]>

Fri, 11 Nov 2011 07:16:25 +0000 (16:16 +0900)
author Paul Mundt <[email protected]>
Fri, 11 Nov 2011 07:16:25 +0000 (16:16 +0900)
committer Paul Mundt <[email protected]>
Fri, 11 Nov 2011 07:16:25 +0000 (16:16 +0900)
diff --cc drivers/tty/serial/sh-sci.c
Simple merge
diff --cc include/linux/serial_sci.h
Simple merge
author	Paul Mundt <[email protected]>
	Fri, 11 Nov 2011 07:16:25 +0000 (16:16 +0900)
committer	Paul Mundt <[email protected]>
	Fri, 11 Nov 2011 07:16:25 +0000 (16:16 +0900)
		1	2	3
drivers/tty/serial/sh-sci.c	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
include/linux/serial_sci.h	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history