]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb7d404 74bd7d0)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 2 Mar 2007 01:28:31 +0000 (17:28 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 2 Mar 2007 01:28:31 +0000 (17:28 -0800)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix parport_pc build.
  [SPARC64]: Update defconfig.


Trivial merge
Linux 2.6 source tree