]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge upstream (approx. 2.6.12-git8) into 'janitor' branch of netdev-2.6.
authorJeff Garzik <jgarzik@pretzel.yyz.us>
Sun, 26 Jun 2005 21:11:03 +0000 (17:11 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 26 Jun 2005 21:11:03 +0000 (17:11 -0400)
commit8b0ee07e108b2eefdab5bb73f33223f18926c3b2
treef68ca04180c5488301a40ec212ef2eb2467cf56c
parent4638aef40ba9ebb9734caeed1f373c24015259fd
parent8678887e7fb43cd6c9be6c9807b05e77848e0920
Merge upstream (approx. 2.6.12-git8) into 'janitor' branch of netdev-2.6.
drivers/net/8139cp.c
drivers/net/ixgb/ixgb_main.c