Merge branch 'next-s3c64xx-device' into next-merged
Conflicts: arch/arm/mach-s3c2440/mach-at2440evb.c
Showing
arch/arm/plat-s3c/dev-fb.c
0 → 100644
arch/arm/plat-s3c/dev-i2c0.c
0 → 100644
arch/arm/plat-s3c/dev-i2c1.c
0 → 100644
arch/arm/plat-s3c/gpio.c
0 → 100644
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment