OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
original_kernel/arch/arm/plat-mxc/include/mach/gpio.h

2 lines
12 B
C
Raw Normal View History

Merge branch 'next/fixes' into next/cleanup Conflicts: arch/arm/mach-mxs/include/mach/gpio.h arch/arm/plat-mxc/include/mach/gpio.h drivers/video/omap/lcd_apollon.c drivers/video/omap/lcd_ldp.c drivers/video/omap/lcd_overo.c
2011-11-01 06:25:41 +08:00
/* empty */