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