diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-24 16:38:52 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-24 16:38:52 -0700 |
commit | 1126388609dee3f2aca2a64de7b0709d0fede785 (patch) | |
tree | 4ab6b74ddcc7d4d1743b87efaf943da1e32fbcfe /net/9p | |
parent | 08ec3c2d45bac41c782acb4e3331ac5881b2c68a (diff) | |
parent | 5291925a9a65ea334f6e887d0f01dd119b8e2b2e (diff) |
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
Diffstat (limited to 'net/9p')
0 files changed, 0 insertions, 0 deletions