From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Sep 2008 23:38:52 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.27-rc8~22
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1126388609dee3f2aca2a64de7b0709d0fede785;p=linux-2.6-omap-h63xx.git

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] Fixe the definition of PTRS_PER_PGD
  [MIPS] au1000: Fix gpio direction
---

1126388609dee3f2aca2a64de7b0709d0fede785