]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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)
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Fixe the definition of PTRS_PER_PGD
  [MIPS] au1000: Fix gpio direction


Trivial merge