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
..
2010-06-09 16:20:54 +02:00
2010-08-04 10:22:35 +02:00
2010-10-21 15:51:58 +10:00
2010-08-02 10:44:03 +02:00
2009-03-27 14:25:15 +01:00
2010-08-04 10:22:35 +02:00
2010-10-21 15:52:00 +10:00
2010-08-04 10:22:35 +02:00
2010-08-04 10:22:35 +02:00
2010-11-18 13:02:54 +01:00