From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 7 Apr 2008 21:54:07 +0000 (-0700)
Subject: Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstrea... 
X-Git-Tag: v2.6.25-rc9~47
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ff09e2afe742f3ff52a0c9a660e8a3fe30cf587c;p=~shefty%2Frdma-dev.git

Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstream-linus

* 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstream-linus:
  [MIPS] Handle aliases in vmalloc correctly.
---

ff09e2afe742f3ff52a0c9a660e8a3fe30cf587c