Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linus
authorPaul Mundt <lethal@linux-sh.org>
Fri, 11 Nov 2011 07:16:25 +0000 (16:16 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 11 Nov 2011 07:16:25 +0000 (16:16 +0900)
commit37bef8f989ed85cdc6cf6fb9c1b1c096179b0708
treebf90e7eaa25d3fb36a8cb2f88e75f49727e8c04a
parent149c370f3e06a6b43bf1d922ccd1f969c59c7c77
parentd03299ee6020b0cc64fc4180162fb2e8795394e1
parent79e7066415a8b12adbeacc41b3dc44423534b8be
Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linus
drivers/tty/serial/sh-sci.c
include/linux/serial_sci.h