From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 17 Aug 2009 20:39:52 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.31-rc7~30
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=df4ecf1524c7793de3121b2d4e5fc6bcc0da3bfb;p=linux.git

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: Fix HPAGE_SIZE redefinition
---

df4ecf1524c7793de3121b2d4e5fc6bcc0da3bfb