From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 6 Aug 2010 17:13:19 +0000 (+0100)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
X-Git-Tag: v2.6.36-rc1~102^2^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=500b9fc922cbec572f4fd1436533bfaed5011262;p=pandora-kernel.git

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

Conflicts:
	drivers/net/irda/sh_irda.c
---

500b9fc922cbec572f4fd1436533bfaed5011262
Reading git-diff-tree failed