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