]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0dd3c78 1a9fe63)
Merge /spare/repo/netdev-2.6/ branch 'orinoco'
authorJeff Garzik <jgarzik@pretzel.yyz.us>
Mon, 27 Jun 2005 04:27:47 +0000 (00:27 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 27 Jun 2005 04:27:47 +0000 (00:27 -0400)

Trivial merge
Linux 2.6 source tree