From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 19 Oct 2010 21:06:36 +0000 (+0100)
Subject: Merge branch 'devel-stable' into devel
X-Git-Tag: v2.6.37-rc1~184^2~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=809b4e00baf006a990a73329ba381d536c6fa277;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'devel-stable' into devel
---

809b4e00baf006a990a73329ba381d536c6fa277