Merge ../torvalds-2.6/

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/macintosh/therm_adt746x.c
Simple merge

diff --cc drivers/macintosh/therm_pm72.c
Simple merge

diff --cc drivers/macintosh/windfarm_lm75_sensor.c
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge