arch/arm/mach-sa1100/lart.c · 7256ecc2b7b91b4212ccc5511cb12254bdf806d0 · xcap / xcap-capability-linux

Merge branch 'sa11x0-mcp' into sa11x0 · 7256ecc2

Russell King authored Mar 25, 2012

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