diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 12:44:28 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 12:44:28 -0500 |
| commit | 2fd592e45b9c89d69e126f172d0f991e2af955e5 (patch) | |
| tree | bacc34dbffb5da09b40840f409f7fad462e0acac /include/asm-arm/arch-ixp4xx/io.h | |
| 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
Diffstat (limited to 'include/asm-arm/arch-ixp4xx/io.h')
0 files changed, 0 insertions, 0 deletions