ARM: Merge for-2637/s3c24xx/h1940
authorBen Dooks <ben-linux@fluff.org>
Fri, 29 Oct 2010 23:46:49 +0000 (00:46 +0100)
committerBen Dooks <ben-linux@fluff.org>
Fri, 29 Oct 2010 23:46:49 +0000 (00:46 +0100)
1  2 
arch/arm/mach-s3c2410/mach-h1940.c

Simple merge