git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ff7f78 4e9687d)
Merge branch 'pxa-palm' into pxa-machines
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 7 Oct 2008 18:07:22 +0000 (19:07 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 7 Oct 2008 18:07:22 +0000 (19:07 +0100)
Conflicts:

drivers/mfd/Kconfig
drivers/pcmcia/Makefile


Trivial merge
Pandora Kernel Repository