• Russell King's avatar
    Merge branch 'sa11x0-mcp' into sa11x0 · 7256ecc2
    Russell King authored
    Conflicts:
    	arch/arm/mach-sa1100/assabet.c
    	arch/arm/mach-sa1100/collie.c
    	arch/arm/mach-sa1100/generic.c
    	arch/arm/mach-sa1100/lart.c
    	arch/arm/mach-sa1100/shannon.c
    7256ecc2
shannon.c 2.3 KB