commit | b174ec2c65d7fa13c88085a04670ac015fd9eb2e | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Mar 13 11:37:38 2007 -0700 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Mar 13 11:37:38 2007 -0700 |
tree | 83f096a470c050c406f4ff7fab07e4fa7577fd60 | |
parent | 8b9909ded6922c33c221b105b26917780cfa497d [diff] | |
parent | 0e6ee854e7be9f12146c35aa09da3fe366d60f8c [diff] |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] kspd: ioctl needs a translation entry. [MIPS] Viper2: Remove defective support. [MIPS] Oprofile: Reset all performance registers for MIPS_MT_SMP configs