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
..
2007-02-14 08:09:53 -08:00
2010-12-24 01:23:25 -07:00
2010-12-24 01:23:25 -07:00
2011-01-12 22:50:54 -07:00
2010-12-25 15:32:27 +01:00
2010-11-01 15:38:34 -04:00