mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-05-05 09:57:21 +02:00
2e0e943436
Conflicts: arch/arm/kernel/setup.c arch/arm/mach-shmobile/board-kota2.c