From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 16 May 2011 22:06:49 +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~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e87347c2f6e124d73b4921c4580adad4ac534d6;p=thirdparty%2Flinux.git

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

1e87347c2f6e124d73b4921c4580adad4ac534d6