]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c53ab5d 3b1d4ed)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 20 Jun 2007 21:40:52 +0000 (14:40 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 20 Jun 2007 21:40:52 +0000 (14:40 -0700)
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Don't drag a platform specific header into generic arch code.


Trivial merge
Linux 2.6 source tree