From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Dec 2008 18:03:55 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.28-rc8~13
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=942c88cc112d9038049a4d66dd0fb0da7b30667f

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.
---

942c88cc112d9038049a4d66dd0fb0da7b30667f