From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 3 May 2011 20:09:11 +0000 (+0100)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
X-Git-Tag: v3.0-rc1~328^2^2~9
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c93212f387fdf5180d9d13cc207419abd5b3ec17;p=users%2Fjedix%2Flinux-maple.git

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

c93212f387fdf5180d9d13cc207419abd5b3ec17