Merge branch 'for-lak' of git://git.linuxtogo.org/home/thesing/collie into sa1100
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 6 Dec 2009 16:53:09 +0000 (16:53 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 6 Dec 2009 16:53:12 +0000 (16:53 +0000)
commitba71e17269633ea36e776d744d5cc0fcb5a41f93
tree0a51c86e5c218ac2ae74ff8193880a64053a77bc
parent729fae44dd8332cbf5b9d05a9af17a7455e165b2
parent9823b2d0f9547742fc40857f9ef153d6956266f2
Merge branch 'for-lak' of git://git.linuxtogo.org/home/thesing/collie into sa1100
arch/arm/mach-sa1100/collie.c