diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-16 10:05:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-16 10:05:34 -0700 |
| commit | a132ebcb454568cc06fbdf3a5629eb9d64c9d578 (patch) | |
| tree | 38e05a5a9b42f9e5a69dca6ad2de04ba126e95e8 /net/9p | |
| parent | 807708844979ba8c6d5717345a8608454992696d (diff) | |
| parent | 0115cb544b0a6709e9cf3de615e150d22e7d9d10 (diff) | |
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: Fix another bug in move of altivec code to vector.S
powerpc: Fix booke user_disable_single_step()
Diffstat (limited to 'net/9p')
0 files changed, 0 insertions, 0 deletions