mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2026-10-16 22:39:48 +00:00
Merge branches 'pinmux' and 'soc' into boards-base
Conflicts: arch/arm/mach-shmobile/Kconfig arch/arm/mach-shmobile/include/mach/r8a7778.h arch/arm/mach-shmobile/setup-r8a7778.c
This commit is contained in:
commit
a961ee1c95
11 changed files with 924 additions and 132 deletions
Loading…
Add table
Add a link
Reference in a new issue