Merge branch 'sa11x0-lcd' into sa11x0
Conflicts: arch/arm/mach-sa1100/assabet.c
Showing
This diff is collapsed.
include/video/sa1100fb.h
0 → 100644
Please register or sign in to comment
Conflicts: arch/arm/mach-sa1100/assabet.c