Learn more about cloning repositories
You have read-only access
Merge branch 'pxa-tosa' into pxa Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/tosa.c arch/arm/mach-pxa/spitz.c