]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2affc85 0a9b0db)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-apm
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 9 Feb 2007 17:44:28 +0000 (09:44 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 9 Feb 2007 17:44:28 +0000 (09:44 -0800)
commit2fd592e45b9c89d69e126f172d0f991e2af955e5
treebacc34dbffb5da09b40840f409f7fad462e0acactree | snapshot
parent2affc857efdf7dacace234b63d289d67260c95a6commit | diff
parent0a9b0db19262dbb09f3a34195e68cafd5dc3fa10commit | 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
Linux 2.6 source tree