OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ff45000
baae856
)
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux...
author
Michael Ellerman
<mpe@ellerman.id.au>
Fri, 16 Dec 2016 04:05:38 +0000
(15:05 +1100)
committer
Michael Ellerman
<mpe@ellerman.id.au>
Fri, 16 Dec 2016 04:05:38 +0000
(15:05 +1100)
Freescale updates from Scott:
"Highlights include 8xx hugepage support, qbman fixes/cleanup, device
tree updates, and some misc cleanup."
1
2
arch/powerpc/include/asm/book3s/32/pgtable.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/include/asm/book3s/64/pgtable.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/include/asm/hugetlb.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/include/asm/mmu.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/include/asm/nohash/32/pgtable.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/include/asm/nohash/64/pgtable.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/mm/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/powerpc/include/asm/book3s/32/pgtable.h
Simple merge
diff --cc
arch/powerpc/include/asm/book3s/64/pgtable.h
Simple merge
diff --cc
arch/powerpc/include/asm/hugetlb.h
Simple merge
diff --cc
arch/powerpc/include/asm/mmu.h
Simple merge
diff --cc
arch/powerpc/include/asm/nohash/32/pgtable.h
Simple merge
diff --cc
arch/powerpc/include/asm/nohash/64/pgtable.h
Simple merge
diff --cc
arch/powerpc/mm/Makefile
Simple merge