-
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6Paul Mundt authored
Conflicts: include/linux/serial_sci.h Signed-off-by: Paul Mundt <lethal@linux-sh.org>
285eba57
Conflicts:
include/linux/serial_sci.h
Signed-off-by: Paul Mundt <lethal@linux-sh.org>