OSDN Git Service

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.4
authorMarcelo Tosatti <marcelo@dmt.cnet>
Wed, 28 Dec 2005 20:15:56 +0000 (18:15 -0200)
committerMarcelo Tosatti <marcelo@dmt.cnet>
Wed, 28 Dec 2005 20:15:56 +0000 (18:15 -0200)

Trivial merge