From: Linus Torvalds Date: Fri, 9 Feb 2007 17:44:28 +0000 (-0800) Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-apm X-Git-Tag: v2.6.21-rc1~83^2~10 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2fd592e45b9c89d69e126f172d0f991e2af955e5;p=~emulex%2Finfiniband.git Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-apm * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-apm: [APM] SH: Convert to use shared APM emulation. [APM] MIPS: Convert to use shared APM emulation. [APM] ARM: Convert to use shared APM emulation. [APM] Add shared version of APM emulation --- 2fd592e45b9c89d69e126f172d0f991e2af955e5