Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Dec 2008 18:03:55 +0000 (10:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Dec 2008 18:03:55 +0000 (10:03 -0800)
commit942c88cc112d9038049a4d66dd0fb0da7b30667f
tree9e5db3f2ef27722f5209e20c8d4e6c89290f1cf3
parentcba767175becadc5c4016cceb7bfdd2c7fe722f4
parent98873f53becea9a8a46972ff252e96fe575b120d
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: Better than nothing implementation of PCI mmap to fix X.