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.
This commit is contained in:
Linus Torvalds 2008-04-07 14:54:07 -07:00
commit ff09e2afe7
4 changed files with 48 additions and 2 deletions