Merge branch 'cell-merge' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arnd/cell-2.6 (944b380e) · Commits · Clea OS / bsp / nxp / linux-seco-imx · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

linux-seco-imx
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Iterations
- Jira
- Terraform modules
- Model experiments

Snippets Groups Projects

944b380e

Commit 944b380e authored 18 years ago by Paul Mackerras

Downloads
- Plain Diff

Merge branch 'cell-merge' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arnd/cell-2.6

parents fff5f528 c7eb7347

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

arch/powerpc/oprofile/op_model_cell.c 94 additions, 55 deletions

arch/powerpc/oprofile/op_model_cell.c
arch/powerpc/platforms/cell/pmu.c 4 additions, 10 deletions

arch/powerpc/platforms/cell/pmu.c
arch/powerpc/platforms/cell/spufs/context.c 60 additions, 65 deletions

arch/powerpc/platforms/cell/spufs/context.c
arch/powerpc/platforms/cell/spufs/file.c 5 additions, 2 deletions

arch/powerpc/platforms/cell/spufs/file.c
arch/powerpc/platforms/cell/spufs/run.c 10 additions, 6 deletions

arch/powerpc/platforms/cell/spufs/run.c
arch/powerpc/platforms/cell/spufs/sched.c 267 additions, 119 deletions

arch/powerpc/platforms/cell/spufs/sched.c
arch/powerpc/platforms/cell/spufs/spufs.h 33 additions, 15 deletions

arch/powerpc/platforms/cell/spufs/spufs.h
arch/powerpc/xmon/xmon.c 0 additions, 1 deletion

arch/powerpc/xmon/xmon.c
include/asm-powerpc/cell-pmu.h 6 additions, 9 deletions

include/asm-powerpc/cell-pmu.h
include/asm-powerpc/spu.h 0 additions, 1 deletion

include/asm-powerpc/spu.h

with 479 additions and 283 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