| commit | 7acdbb3f35f4d08c0c4f7cfa306bc7006b6ba902 | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Wed Feb 23 09:21:41 2011 +0100 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Wed Feb 23 09:21:41 2011 +0100 |
| tree | c76aeb5996fa8f39b838e9cc41f40f854db01912 | |
| parent | 695884fb8acd9857e0e7120ccb2150e30f4b8fef [diff] | |
| parent | f5412be599602124d2bdd49947b231dd77c0bf99 [diff] |
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>