Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

Browse source

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Fix another bug in move of altivec code to vector.S
  powerpc: Fix booke user_disable_single_step()

...

This commit is contained in:

Linus Torvalds 2009-07-16 10:05:34 -07:00

parent 8077088449 0115cb544b

commit a132ebcb45

2 changed files with 12 additions and 11 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

17

arch/powerpc/kernel/ptrace.c

View file

6

arch/powerpc/kernel/vector.S

View file