Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:24:46 +0000 (15:24 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:24:46 +0000 (15:24 -0400)
commitd15a88fc21ef225768ce31be16edfc9c6e2e02e3
treed4cb0a1bc97973bb947e2667ae56bc4bc2256e9d
parentb53471711f21ba0e151075f0e1d6d531eb50f1b1
parent1def630a6a49dda5bc89dfbd86656293640456f0
Merge branch 'master' into upstream
MAINTAINERS
drivers/net/forcedeth.c
include/linux/pci_ids.h