From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 28 Mar 2011 17:57:19 +0000 (+0100)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes
X-Git-Tag: v2.6.39-rc2~40^2~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=255bae73b214f143a3c7cc74d4792eb166a10d46;p=users%2Fjedix%2Flinux-maple.git

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

255bae73b214f143a3c7cc74d4792eb166a10d46