git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 784f4d5 8dd851d)
Merge git://git.infradead.org/~dwmw2/cafe-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Sun, 22 Oct 2006 01:17:05 +0000 (02:17 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Sun, 22 Oct 2006 01:17:05 +0000 (02:17 +0100)
Conflicts:

drivers/mtd/nand/Kconfig


Trivial merge
Pandora Kernel Repository