From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 6 Mar 2011 08:42:55 +0000 (+0000)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
X-Git-Tag: v2.6.39-rc1~434^2~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=71d8c5b11e3b5936ae6c2e0b1dd6f5c78b305b65;p=linux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
---

71d8c5b11e3b5936ae6c2e0b1dd6f5c78b305b65