Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/perf_event: Fix oops due to perf_event_do_pending call powerpc/swiotlb: Fix off by one in determining boundary of which ops to use
No related branches found
No related tags found
Showing
- arch/powerpc/include/asm/hw_irq.h 0 additions, 38 deletionsarch/powerpc/include/asm/hw_irq.h
- arch/powerpc/kernel/asm-offsets.c 0 additions, 1 deletionarch/powerpc/kernel/asm-offsets.c
- arch/powerpc/kernel/dma-swiotlb.c 3 additions, 2 deletionsarch/powerpc/kernel/dma-swiotlb.c
- arch/powerpc/kernel/entry_64.S 0 additions, 9 deletionsarch/powerpc/kernel/entry_64.S
- arch/powerpc/kernel/irq.c 0 additions, 6 deletionsarch/powerpc/kernel/irq.c
- arch/powerpc/kernel/time.c 48 additions, 12 deletionsarch/powerpc/kernel/time.c
Loading
Please register or sign in to comment