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)
1  2 
arch/arm/mach-sa1100/collie.c

Simple merge