diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-20 14:40:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-20 14:40:52 -0700 |
| commit | 044f620ac65d0d90727cdbd0c058e4d150d62ddc (patch) | |
| tree | 89bcf2829803979ff8384d14c159daebabc3244d /drivers/net/pcmcia | |
| parent | c53ab5d56c66816fe06dc6cd0abb93f6dd81a145 (diff) | |
| parent | 3b1d4ed5353af04d6aa20be2701727b9cdb2ac61 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Don't drag a platform specific header into generic arch code.
Diffstat (limited to 'drivers/net/pcmcia')
0 files changed, 0 insertions, 0 deletions