Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Feb 2010 03:51:39 +0000 (19:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Feb 2010 03:51:39 +0000 (19:51 -0800)
commit9f3a6284880ceea452903e2043c88d7226736318
tree2f9b65b58bf782ac59d3ee59a5f5a10da5aaca04
parent26b0833366c2521b890dfa8cb0e922be7debed37
parent84a6fcb368a080620d12fc4d79e07902dbee7335
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: BCM47xx: Fix 128MB RAM support
  MIPS: Highmem: Fix build error