Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
Paul Mundt [Mon, 8 Aug 2011 04:45:28 +0000 (13:45 +0900)]
Conflicts:
drivers/tty/serial/sh-sci.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1  2 
drivers/tty/serial/sh-sci.c

Simple merge