Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 16:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
740418ef19
linux/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-10-31 22:25:41 +00:00
/* empty */
Reference in New Issue Copy Permalink