git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>

Trivial merge
Pandora Kernel Repository