From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 3 May 2010 21:37:06 +0000 (+0100)
Subject: Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx into devel... 
X-Git-Tag: v2.6.35-rc1~503^2~1^2~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=941f81c16ec7497ecce6f1f611277d67e89bdfe1;p=linux.git

Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx into devel-stable
---

941f81c16ec7497ecce6f1f611277d67e89bdfe1