You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		19 years ago
..
4xx_mmu.c	…
44x_mmu.c	…
Makefile	…
fault.c	…
fsl_booke_mmu.c	…
hash_low_32.S	[POWERPC] Remove stale 64bit on 32bit kernel code	19 years ago
hash_low_64.S	powerpc: Use 64k pages without needing cache-inhibited large pages	19 years ago
hash_native_64.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	19 years ago
hash_utils_64.c	powerpc: Use 64k pages without needing cache-inhibited large pages	19 years ago
hugetlbpage.c	[PATCH] powerpc: Fix pagetable bloat for hugepages	19 years ago
imalloc.c	…
init_32.c	…
init_64.c	[PATCH] powerpc: Fix pagetable bloat for hugepages	19 years ago
lmb.c	[PATCH] powerpc: Unify mem= handling	19 years ago
mem.c	[PATCH] powerpc: Less verbose mem configuration output	19 years ago
mmap.c	…
mmu_context_32.c	powerpc: add context.vdso_base for 32-bit too	19 years ago
mmu_context_64.c	powerpc: Use 64k pages without needing cache-inhibited large pages	19 years ago
mmu_decl.h	…
numa.c	Merge ../linux-2.6	19 years ago
pgtable_32.c	…
pgtable_64.c	…
ppc_mmu_32.c	[POWERPC] Add starting of secondary 86xx CPUs.	19 years ago
slb.c	powerpc: Use 64k pages without needing cache-inhibited large pages	19 years ago
slb_low.S	powerpc: Use 64k pages without needing cache-inhibited large pages	19 years ago
stab.c	powerpc: Remove unused paca->pgdir field	19 years ago
tlb_32.c	powerpc: add context.vdso_base for 32-bit too	19 years ago
tlb_64.c	powerpc: Use 64k pages without needing cache-inhibited large pages	19 years ago