tree 2f9b65b58bf782ac59d3ee59a5f5a10da5aaca04
parent 26b0833366c2521b890dfa8cb0e922be7debed37
parent 84a6fcb368a080620d12fc4d79e07902dbee7335
author Linus Torvalds <torvalds@linux-foundation.org> 1266897099 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1266897099 -0800

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: BCM47xx: Fix 128MB RAM support
  MIPS: Highmem: Fix build error