Merge branches 'sh/serial-rework' and 'sh/oprofile'
authorPaul Mundt <lethal@linux-sh.org>
Tue, 28 Oct 2008 10:44:15 +0000 (19:44 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 28 Oct 2008 10:44:15 +0000 (19:44 +0900)
commit86d758ef2cb0677b471a88ffe33a29cdfec4ceca
tree6c0af4aee6b29fc426faecf827f768ec98b3b00b
parentb2d86a3fd9855380598c0c039e712a20086e119f
parent15c73aaa44e09222e9cccaa9f80e29f7f5351f2b
parent2a88b6e81589b1d064e03db066feaaa58f6a2d13
Merge branches 'sh/serial-rework' and 'sh/oprofile'
drivers/serial/sh-sci.c
drivers/serial/sh-sci.h