Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorPaul Mundt <lethal@linux-sh.org>
Mon, 8 Aug 2011 04:45:28 +0000 (13:45 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 8 Aug 2011 04:45:28 +0000 (13:45 +0900)
commit77c7ee51a062bb595c501ec098125a68999c20c3
treec5060ca5786ef353e005dae04b61d2c49967284d
parent1ba762209491e2496e58baffa3fd65d661f54404
parent322a8b034003c0d46d39af85bf24fee27b902f48
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux into sh-latest

Conflicts:
drivers/tty/serial/sh-sci.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
drivers/tty/serial/sh-sci.c