projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 598bcc6 06312f4)
Merge branch 'devel-stable' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 12 Jan 2016 13:41:03 +0000 (13:41 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 12 Jan 2016 13:41:03 +0000 (13:41 +0000)
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/kernel/Makefile patch | diff1 | diff2 | blob | history
arch/arm/kernel/setup.c patch | diff1 | diff2 | blob | history
arch/arm/mm/init.c patch | diff1 | diff2 | blob | history
arch/arm/mm/mmu.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/kernel/Makefile
Simple merge
diff --cc arch/arm/kernel/setup.c
Simple merge
diff --cc arch/arm/mm/init.c
Simple merge
diff --cc arch/arm/mm/mmu.c
Simple merge