Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstrea...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Apr 2008 21:54:07 +0000 (14:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Apr 2008 21:54:07 +0000 (14:54 -0700)
commitff09e2afe742f3ff52a0c9a660e8a3fe30cf587c
treeaff06e82c7d653d0b15c1f3cae7f0c8a90ba3d14
parentad3c7e42e33a842cf3b518e21a7f69e167649d8a
parent9c5a3d729cf430609d091ff610a7db363aafcd47
Merge branch 'upstream' of git://git./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.