Merge branch 'sa11x0-mcp-fixes' into fixes
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 26 Jan 2012 21:06:54 +0000 (21:06 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 26 Jan 2012 21:06:54 +0000 (21:06 +0000)
commit9a95b9e7416c2e7fa799e54078a1adf84a7ed0bf
tree158cd337307a4a4e09a3fb5110f29ab0136bef6c
parent4e7682d077d693e34a993ae7a2831b522930ebcb
parent0af5e4c36e70cfd4ae96d3704a425c414f530f2a
Merge branch 'sa11x0-mcp-fixes' into fixes
arch/arm/mach-sa1100/collie.c
arch/arm/mach-sa1100/generic.c