| commit | 2fd592e45b9c89d69e126f172d0f991e2af955e5 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Feb 09 09:44:28 2007 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Feb 09 09:44:28 2007 -0800 |
| tree | bacc34dbffb5da09b40840f409f7fad462e0acac | |
| parent | 2affc857efdf7dacace234b63d289d67260c95a6 [diff] | |
| parent | 0a9b0db19262dbb09f3a34195e68cafd5dc3fa10 [diff] |
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