From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 3 Jan 2011 10:31:38 +0000 (+0000)
Subject: Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx into devel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=50401d77ee4904673042dd737eed436067cc23f5;p=linux.git

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

50401d77ee4904673042dd737eed436067cc23f5