]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into...
authorJeff Garzik <jeff@garzik.org>
Wed, 5 Jul 2006 18:32:39 +0000 (14:32 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 5 Jul 2006 18:32:39 +0000 (14:32 -0400)
commitc0bc8721b8d0380ec69fa97578c91201201b05a9
treeb027c9aa8e0d601ebe6c86bddc181c4d4ecc7cda
parentbce305f4fe779f29d99d414685243f5da0803254
parente4ac9773be2ea01b707da0496ab1527ec6cdda4e
Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream

Conflicts:

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