Merge branch 'sa11x0-ir' into sa11x0
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 25 Mar 2012 22:54:52 +0000 (23:54 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 25 Mar 2012 22:54:57 +0000 (23:54 +0100)
commit277dc7ae147e971cfdbf4aa3529477909852b780
tree59fe6d5cb428e1a543f24cf0d4d16edebb247c5e
parent374da9da22ebaad0524c77905b5e89ae4619bef3
parentd138dacb4b8255c02e4380ce2aadab758a99d2c1
Merge branch 'sa11x0-ir' into sa11x0
arch/arm/mach-sa1100/generic.c