From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 7 Oct 2008 18:06:22 +0000 (+0100)
Subject: Merge branches 'metronomefb', 'pxa-cm2xx', 'pxa-gumstix', 'pxa-misc', 'pxa-mitac... 
X-Git-Tag: v2.6.28-rc1~293^2~6^2~17^2~4
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=35437b6192d9a4eb92f095dfd72396b6d2970f0b;p=linux.git

Merge branches 'metronomefb', 'pxa-cm2xx', 'pxa-gumstix', 'pxa-misc', 'pxa-mitac', 'pxa-mp900', 'pxa-zylonite' and 'pxa-zaurus' into pxa-machines

Conflicts:

	arch/arm/mach-pxa/poodle.c
---

35437b6192d9a4eb92f095dfd72396b6d2970f0b