mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2026-10-14 05:55:17 +00:00
Merge branch 'arm/booting' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel-stable
Conflicts: arch/arm/Kconfig
This commit is contained in:
commit
a20df564d1
10 changed files with 152 additions and 79 deletions
105
arch/arm/Kconfig
105
arch/arm/Kconfig
Loading…
Add table
Add a link
Reference in a new issue