Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 5 Feb 2009 00:52:41 +0000 (16:52 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 5 Feb 2009 00:52:41 +0000 (16:52 -0800)
commit7870389478d3c682c79c07abe7f1fce8b8a81952
tree8dc50c5aa48c65c7eb5cc2770501a45f1e2371f6
parent005c79b3d4df48fa01b77e5ccf46e5cd4754cfd5
parentb98ac702f49042ab0c382b839465b95a2bd0cd65
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
drivers/net/cxgb3/sge.c
drivers/net/gianfar.c
drivers/net/gianfar.h