kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux-hardened/arch/arm/mach-mxs/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 23:25:41 +01:00
/* empty */
Reference in a new issue Copy permalink