]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad3c7e4 9c5a3d7)
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)
* 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstream-linus:
  [MIPS] Handle aliases in vmalloc correctly.


Trivial merge
Linux 2.6 source tree