lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37c3185a02
android_kernel_xiaomi_sm8350/arch/powerpc/mm
History
Linus Torvalds 45c091bb2d Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (139 commits)
  [POWERPC] re-enable OProfile for iSeries, using timer interrupt
  [POWERPC] support ibm,extended-*-frequency properties
  [POWERPC] Extra sanity check in EEH code
  [POWERPC] Dont look for class-code in pci children
  [POWERPC] Fix mdelay badness on shared processor partitions
  [POWERPC] disable floating point exceptions for init
  [POWERPC] Unify ppc syscall tables
  [POWERPC] mpic: add support for serial mode interrupts
  [POWERPC] pseries: Print PCI slot location code on failure
  [POWERPC] spufs: one more fix for 64k pages
  [POWERPC] spufs: fail spu_create with invalid flags
  [POWERPC] spufs: clear class2 interrupt status before wakeup
  [POWERPC] spufs: fix Makefile for "make clean"
  [POWERPC] spufs: remove stop_code from struct spu
  [POWERPC] spufs: fix spu irq affinity setting
  [POWERPC] spufs: further abstract priv1 register access
  [POWERPC] spufs: split the Cell BE support into generic and platform dependant parts
  [POWERPC] spufs: dont try to access SPE channel 1 count
  [POWERPC] spufs: use kzalloc in create_spu
  [POWERPC] spufs: fix initial state of wbox file
  ...

Manually resolved conflicts in:
	drivers/net/phy/Makefile
	include/asm-powerpc/spu.h
2006-06-22 22:11:30 -07:00
..
4xx_mmu.c [PATCH] mm: powerpc init_mm without ptlock 2005-11-23 16:08:38 -08:00
44x_mmu.c
fault.c [PATCH] powerpc: trivial spelling fixes in fault.c 2006-04-01 22:37:13 +11:00
fsl_booke_mmu.c [PATCH] Update email address for Kumar 2005-11-13 18:14:10 -08:00
hash_low_32.S [POWERPC] Remove stale 64bit on 32bit kernel code 2006-06-15 19:31:26 +10:00
hash_low_64.S powerpc: Use 64k pages without needing cache-inhibited large pages 2006-06-15 10:45:18 +10:00
hash_native_64.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
hash_utils_64.c powerpc: Use 64k pages without needing cache-inhibited large pages 2006-06-15 10:45:18 +10:00
hugetlbpage.c [PATCH] powerpc: Fix pagetable bloat for hugepages 2006-04-28 15:02:51 +10:00
imalloc.c [PATCH] sem2mutex: misc static one-file mutexes 2006-03-26 08:56:55 -08:00
init_32.c [PATCH] remove set_page_count() outside mm/ 2006-03-22 07:54:02 -08:00
init_64.c [PATCH] powerpc: Fix pagetable bloat for hugepages 2006-04-28 15:02:51 +10:00
lmb.c [PATCH] powerpc: Unify mem= handling 2006-05-19 15:02:15 +10:00
Makefile [PATCH] powerpc: Some more fixes to allow building for a Book-E processor 2005-10-20 09:43:32 +10:00
mem.c [PATCH] powerpc: Less verbose mem configuration output 2006-04-22 18:45:12 +10:00
mmap.c [PATCH] powerpc: trivial: modify comments to refer to new location of files 2006-02-10 16:53:51 +11:00
mmu_context_32.c powerpc: add context.vdso_base for 32-bit too 2006-06-11 14:15:17 +10:00
mmu_context_64.c powerpc: Use 64k pages without needing cache-inhibited large pages 2006-06-15 10:45:18 +10:00
mmu_decl.h [PATCH] powerpc: Remove imalloc.h 2005-11-19 14:46:02 +11:00
numa.c Merge ../linux-2.6 2006-05-05 15:45:48 +10:00
pgtable_32.c [PATCH] lock PTE before updating it in 440/BookE page fault handler 2006-03-29 13:44:15 +11:00
pgtable_64.c [PATCH] powerpc: IOMMU: don't ioremap null addresses 2006-01-10 15:30:31 +11:00
ppc_mmu_32.c [POWERPC] Add starting of secondary 86xx CPUs. 2006-06-21 15:01:28 +10:00
slb_low.S powerpc: Use 64k pages without needing cache-inhibited large pages 2006-06-15 10:45:18 +10:00
slb.c powerpc: Use 64k pages without needing cache-inhibited large pages 2006-06-15 10:45:18 +10:00
stab.c powerpc: Remove unused paca->pgdir field 2006-06-12 18:38:21 +10:00
tlb_32.c powerpc: add context.vdso_base for 32-bit too 2006-06-11 14:15:17 +10:00
tlb_64.c powerpc: Use 64k pages without needing cache-inhibited large pages 2006-06-15 10:45:18 +10:00