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)
* '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


Trivial merge