Public Git Hosting - linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: bce305f e4ac977)

commit	c0bc8721b8d0380ec69fa97578c91201201b05a9
author	Jeff Garzik <jeff@garzik.org>
	Wed, 5 Jul 2006 18:32:39 +0000 (5 14:32 -0400)
committer	Jeff Garzik <jeff@garzik.org>
	Wed, 5 Jul 2006 18:32:39 +0000 (5 14:32 -0400)
tree	b027c9aa8e0d601ebe6c86bddc181c4d4ecc7cda	tree \| snapshot (tar.gz zip)
parent	bce305f4fe779f29d99d414685243f5da0803254	commit \| diff
parent	e4ac9773be2ea01b707da0496ab1527ec6cdda4e	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000/e1000_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000/e1000_main.c	diff1 \|	diff2 \|	blob \| history

Linux 2.6 ibm-acpi/thinkpad-acpi driver git tree