From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 29 Apr 2008 20:31:06 +0000 (+0100)
Subject: Merge branches 'pxa' and 'orion-fixes1'
X-Git-Tag: v2.6.26-rc1~351^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=92794a5d6359f9e8ed0d43fe0f3c653f748dcc90;p=linux.git

Merge branches 'pxa' and 'orion-fixes1'
---

92794a5d6359f9e8ed0d43fe0f3c653f748dcc90