From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 8 Aug 2011 04:45:28 +0000 (+0900)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... 
X-Git-Tag: upstream/snapshot3+hdmi~8833^2~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=77c7ee51a062bb595c501ec098125a68999c20c3;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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>
---

77c7ee51a062bb595c501ec098125a68999c20c3