Merge ../torvalds-2.6/
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 6 Jan 2006 20:59:59 +0000 (12:59 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 6 Jan 2006 20:59:59 +0000 (12:59 -0800)
commitccf18968b1bbc2fb117190a1984ac2a826dac228
tree7bc8fbf5722aecf1e84fa50c31c657864cba1daa
parente91c021c487110386a07facd0396e6c3b7cf9c1f
parentd99cf9d679a520d67f81d805b7cb91c68e1847f0
Merge ../torvalds-2.6/
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