From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 7 Oct 2008 18:06:52 +0000 (+0100)
Subject: Merge branch 'pxa-trizeps' into pxa-machines
X-Git-Tag: v2.6.28-rc1~293^2~6^2~17^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ff7f78a3db462ea4edf1a781a2002d4e8a8a473;p=pandora-kernel.git

Merge branch 'pxa-trizeps' into pxa-machines

Conflicts:

	drivers/pcmcia/Makefile
---

5ff7f78a3db462ea4edf1a781a2002d4e8a8a473
Reading git-diff-tree failed