| commit | 942c88cc112d9038049a4d66dd0fb0da7b30667f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 10 10:03:55 2008 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 10 10:03:55 2008 -0800 |
| tree | 9e5db3f2ef27722f5209e20c8d4e6c89290f1cf3 | |
| parent | cba767175becadc5c4016cceb7bfdd2c7fe722f4 [diff] | |
| parent | 98873f53becea9a8a46972ff252e96fe575b120d [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: Better than nothing implementation of PCI mmap to fix X.