From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Mon, 7 Jul 2008 15:26:41 +0000 (+0100)
Subject: Merge branches 'ns9x' and 'machtypes' into devel
X-Git-Tag: v2.6.27-rc1~850^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=66ee156078697cdc013d46aed3b2fee445c325a1;p=linux-2.6-omap-h63xx.git

Merge branches 'ns9x' and 'machtypes' into devel
---

66ee156078697cdc013d46aed3b2fee445c325a1