Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
Paul Mundt [Wed, 26 Jan 2011 09:23:27 +0000 (18:23 +0900)]
1  2 
drivers/tty/serial/sh-sci.c
drivers/tty/serial/sh-sci.h

Simple merge
Simple merge