From: Linus Torvalds Date: Tue, 13 Mar 2007 18:37:38 +0000 (-0700) Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus X-Git-Tag: v2.6.21-rc4~40 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b174ec2c65d7fa13c88085a04670ac015fd9eb2e;p=linux-2.6-omap-h63xx.git 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 --- b174ec2c65d7fa13c88085a04670ac015fd9eb2e