Merge ../torvalds-2.6/
Greg Kroah-Hartman [Fri, 6 Jan 2006 20:59:59 +0000 (12:59 -0800)]
1  2 
Documentation/feature-removal-schedule.txt
MAINTAINERS
drivers/macintosh/therm_adt746x.c
drivers/macintosh/therm_pm72.c
drivers/macintosh/windfarm_lm75_sensor.c
include/linux/pci_ids.h

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge