From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 20 Jun 2006 19:57:34 +0000 (+0100)
Subject: Merge S3Cxxxx branch
X-Git-Tag: v2.6.18-rc1~1098^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=098a4cb7c0c9bdd86e9d99f607e9f31206a914eb;p=users%2Fjedix%2Flinux-maple.git

Merge S3Cxxxx branch
---

098a4cb7c0c9bdd86e9d99f607e9f31206a914eb