Linux 3.4.73
Conflict in Drivers/mmc/block.c