Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

Linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

86969cf7

Commit 86969cf7 authored 10 years ago by Benjamin Herrenschmidt

Downloads
- Plain Diff

Merge branch 'merge' into next

Merge the binutils and kexec fixes.

parents b9d80095 011e4b02

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

arch/powerpc/Makefile 3 additions, 1 deletion

arch/powerpc/Makefile
arch/powerpc/include/asm/ppc_asm.h 6 additions, 1 deletion

arch/powerpc/include/asm/ppc_asm.h
arch/powerpc/kernel/machine_kexec_64.c 1 addition, 1 deletion

arch/powerpc/kernel/machine_kexec_64.c
kernel/kexec.c 8 additions, 0 deletions

kernel/kexec.c

with 18 additions and 3 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment