Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linus
Paul Mundt [Fri, 11 Nov 2011 07:16:25 +0000 (16:16 +0900)]
1  2  3 
drivers/tty/serial/sh-sci.c
include/linux/serial_sci.h

Simple merge
Simple merge