From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 23 Feb 2011 08:21:41 +0000 (+0100)
Subject: Merge branch 'linus' into x86/platform
X-Git-Tag: v2.6.39-rc1~498^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7acdbb3f35f4d08c0c4f7cfa306bc7006b6ba902;p=pandora-kernel.git

Merge branch 'linus' into x86/platform

Reason: Import mainline device tree changes on which further patches
        depend on or conflict.

Trivial conflict in: drivers/spi/pxa2xx_spi_pci.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

7acdbb3f35f4d08c0c4f7cfa306bc7006b6ba902
Reading git-diff-tree failed