From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 23 Feb 2010 03:51:39 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: MMI-PSA29.97-13-9~24914
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9f3a6284880ceea452903e2043c88d7226736318;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

9f3a6284880ceea452903e2043c88d7226736318