Merge branch 'sa11x0-mcp-fixes' into fixes
Russell King [Thu, 26 Jan 2012 21:06:54 +0000 (21:06 +0000)]
1  2 
arch/arm/mach-sa1100/collie.c
arch/arm/mach-sa1100/generic.c

Simple merge
Simple merge