Commit 7acdbb3f authored 14 years ago by Thomas Gleixner

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>

parents 695884fb f5412be5

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing with 8 additions and 3 deletions

Please register or to comment