mirror of
https://github.com/torvalds/linux
synced 2024-10-22 03:09:41 +00:00
efa62e1355
Conflicts: arch/arm/mach-mxs/include/mach/gpio.h arch/arm/plat-mxc/include/mach/gpio.h Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 lines
12 B
C
2 lines
12 B
C
/* empty */
|