Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Sep 2008 23:38:52 +0000 (16:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Sep 2008 23:38:52 +0000 (16:38 -0700)
commit1126388609dee3f2aca2a64de7b0709d0fede785
tree4ab6b74ddcc7d4d1743b87efaf943da1e32fbcfe
parent08ec3c2d45bac41c782acb4e3331ac5881b2c68a
parent5291925a9a65ea334f6e887d0f01dd119b8e2b2e
Merge branch 'upstream' of git://ftp.linux-mips.org/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