“25985edcedea6396277003854657b5f3cb31a628”上不存在“sound/soc/intel/sst_platform.c”
-
由 Tony Lindgren 提交于
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
2533c2cf