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
..
2011-02-15 15:25:48 -05:00
2011-01-13 08:03:09 -08:00
2011-01-20 21:37:29 +10:30
2011-01-12 04:59:44 -05:00
2011-01-26 10:50:00 +10:00
2011-02-17 13:13:58 +01:00
2011-01-12 05:14:15 -05:00
2011-02-01 16:48:46 +02:00