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)
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: BCM47xx: Fix 128MB RAM support
  MIPS: Highmem: Fix build error


Trivial merge