projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c378aa2 c233d94)
Merge branch 'next-s3c64xx-moves' into next-s3c
authorBen Dooks <ben-linux@fluff.org>
Fri, 14 Aug 2009 14:24:06 +0000 (15:24 +0100)
committerBen Dooks <ben-linux@fluff.org>
Fri, 14 Aug 2009 14:24:06 +0000 (15:24 +0100)
1  2 
arch/arm/mach-s3c2410/include/mach/map.h patch | diff1 | diff2 | blob | history
arch/arm/mach-s3c6400/include/mach/map.h patch | diff1 | diff2 | blob | history
arch/arm/plat-s3c24xx/Makefile patch | diff1 | diff2 | blob | history
arch/arm/plat-s3c24xx/devs.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/plat-s3c24xx/Makefile
Simple merge
diff --cc arch/arm/plat-s3c24xx/devs.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.