]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:55:45 +0000 (15:55 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:55:45 +0000 (15:55 -0400)
commitcb5998ea5f8001bfb574bf10776b7c83267f5378
treee1a85b6a5f10c7ac20ef3b3357e15c5802dca019
parentba1bdae6805376dc2f0c6daccf7a07d269331cd2
parent6eefe1dca25f3bf70277395a619bd9ada6156bc1
Merge branch 'upstream-fixes' into upstream

Conflicts:

drivers/net/e1000/e1000_ethtool.c
drivers/net/e1000/e1000_ethtool.c
drivers/net/e1000/e1000_main.c