| commit | 56c035c9ce1f1850969778af6a4cc0b99089b6c8 | |
| author | Ben Dooks <ben-linux@fluff.org> | |
| Thu, 18 Dec 2008 16:17:37 +0000 (18 16:17 +0000) | ||
| committer | Ben Dooks <ben-linux@fluff.org> | |
| Thu, 18 Dec 2008 16:17:37 +0000 (18 16:17 +0000) | ||
| tree | b6f1998be0c1e6bb623a0c55e8ba04d74bb58cf2 | treesnapshot (tar.gz zip) |
| parent | 7f2754378f3522a42daafdbb9d2385f341008454 | commitdiff |
| parent | 438a5d42e052ec6126c5f1e24763b711210db33e | commitdiff |
Merge branch 'next-s3c64xx-device' into next-merged
Conflicts:
arch/arm/mach-s3c2440/mach-at2440evb.c
Conflicts:
arch/arm/mach-s3c2440/mach-at2440evb.c