Learn more about cloning repositories
You have read-only access
Merge branch 'pxa-palm' into pxa-machines Conflicts: drivers/mfd/Kconfig drivers/pcmcia/Makefile