From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 28 Oct 2010 19:14:38 +0000 (+0100)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
X-Git-Tag: v2.6.37-rc1~23^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3773301c4290f054aa2aa5379e59a1bf4f78bdf;p=pandora-kernel.git

Merge /linux/kernel/git/lethal/genesis-2.6 into devel-stable

Conflicts:
	drivers/video/sh_mobile_hdmi.c
---

b3773301c4290f054aa2aa5379e59a1bf4f78bdf
Reading git-diff-tree failed