projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b828f96 b60752f)
Merge branches 'misc' and 'sa1111-base' into for-linus
authorRussell King <rmk+kernel@armlinux.org.uk>
Thu, 6 Oct 2016 07:56:43 +0000 (08:56 +0100)
committerRussell King <rmk+kernel@armlinux.org.uk>
Thu, 6 Oct 2016 07:56:43 +0000 (08:56 +0100)
1  2 
arch/arm/Makefile patch | diff1 | diff2 | blob | history
arch/arm/mm/mmu.c patch | diff1 | diff2 | blob | history
include/linux/cpuhotplug.h patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Makefile
Simple merge
diff --cc arch/arm/mm/mmu.c
Simple merge
diff --cc include/linux/cpuhotplug.h
Simple merge