mirror of
https://github.com/torvalds/linux.git
synced 2026-02-04 15:28:49 +08:00
Conflicts: arch/arm/mach-omap1/board-htcherald.c arch/arm/mach-omap2/board-rx51-peripherals.c arch/arm/plat-omap/include/plat/gpio.h drivers/input/serio/ams_delta_serio.c