]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66c669b ec7080d)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@woody.osdl.org>
Thu, 23 Nov 2006 00:36:33 +0000 (16:36 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Thu, 23 Nov 2006 00:36:33 +0000 (16:36 -0800)
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [PATCH] make au1xxx-ide compile again
  [MIPS] Hack for SB1 cache issues


Trivial merge
Linux 2.6 source tree