[git pull] Please pull powerpc.git merge branch
Kumar Gala
galak at kernel.crashing.org
Tue May 18 04:27:08 EST 2010
On May 13, 2010, at 11:28 PM, Kumar Gala wrote:
> The following changes since commit 131c6c9eddfa252e376edb4aeff9c7fe1b96a798:
> Benjamin Herrenschmidt (1):
> Merge commit 'kumar/merge' into merge
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git merge
>
> Kumar Gala (1):
> powerpc/fsl-booke: Move loadcam_entry back to asm code to fix SMP ftrace
>
> Li Yang (1):
> powerpc/fsl-booke: Fix InstructionTLBError execute permission check
>
> arch/powerpc/kernel/asm-offsets.c | 8 ++++++++
> arch/powerpc/kernel/head_fsl_booke.S | 13 ++++++++++---
> arch/powerpc/mm/fsl_booke_mmu.c | 25 +++----------------------
> arch/powerpc/mm/mmu_decl.h | 10 +++++++++-
> arch/powerpc/mm/tlb_nohash_low.S | 28 ++++++++++++++++++++++++++++
> 5 files changed, 58 insertions(+), 26 deletions(-)
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev at lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
I've just moved these into my next branch. Will send them to stable once they get pulled into .35.
- k
More information about the Linuxppc-dev
mailing list