From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 24 May 2010 22:08:54 +0000 (+0100)
Subject: Merge branch 'master' into devel
X-Git-Tag: v2.6.35-rc1~264^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f949c0edd84101bfd30b3e7389c1a12b067e561d;p=users%2Fhch%2Fmisc.git

Merge branch 'master' into devel
---

f949c0edd84101bfd30b3e7389c1a12b067e561d