Thomas Gleixner 7acdbb3f35 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>

2011-02-23 09:21:41 +01:00

3.9 KiB

Raw Blame History

View Raw