]> www.infradead.org Git - users/hch/misc.git/commitdiff
projects / users / hch / misc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 149c370 d03299e 79e7066)
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)
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

diff --cc drivers/tty/serial/sh-sci.c
Simple merge
diff --cc include/linux/serial_sci.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.