git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 695884f f5412be)
Merge branch 'linus' into x86/platform
authorThomas Gleixner <tglx@linutronix.de>
Wed, 23 Feb 2011 08:21:41 +0000 (09:21 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 23 Feb 2011 08:21:41 +0000 (09:21 +0100)
commit7acdbb3f35f4d08c0c4f7cfa306bc7006b6ba902
treec76aeb5996fa8f39b838e9cc41f40f854db01912tree | snapshot
parent695884fb8acd9857e0e7120ccb2150e30f4b8fefcommit | diff
parentf5412be599602124d2bdd49947b231dd77c0bf99commit | 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>
drivers/rtc/rtc-mrst.c diff1 | diff2 | blob | history
drivers/spi/pxa2xx_spi_pci.c diff1 | diff2 | blob | history
Pandora Kernel Repository