From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 6 Jan 2011 09:27:34 +0000 (+0900)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: firefly_0821_release~7613^2~3120^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1928e87bcf185f56008d0746f887b691c1cb8c4a;p=firefly-linux-kernel-4.4.55.git

Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6

Conflicts:
	drivers/video/sh_mobile_lcdcfb.c

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

1928e87bcf185f56008d0746f887b691c1cb8c4a