]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c46f477 3ffaa8c)
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 22 Aug 2006 22:12:58 +0000 (15:12 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 22 Aug 2006 22:12:58 +0000 (15:12 -0700)

Trivial merge
Linux 2.6 source tree