]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6e5fee 54caf44)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 22 Sep 2006 22:37:31 +0000 (15:37 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 22 Sep 2006 22:37:31 +0000 (15:37 -0700)
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  [netdrvr] mv643xx_eth: fix obvious typo, which caused build breakage
  [netdrvr] lp486e: fix typo


Trivial merge
Linux 2.6 source tree