git » linux-kernel » commit 1126388

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

author Linus Torvalds
2008-09-24 23:38:52 UTC
committer Linus Torvalds
2008-09-24 23:38:52 UTC
parent 08ec3c2d45bac41c782acb4e3331ac5881b2c68a
parent 5291925a9a65ea334f6e887d0f01dd119b8e2b2e
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