The following commit has been merged in the linux branch: commit a9fd74cb5843d8b2e44fb42f792766649ad24bfc Merge: 7d531a7e519406c4bb2501a66e3da5ba39280739 657348a056eea4a27be20cf8e22c98a252597447 Author: Linus Torvalds torvalds@linux-foundation.org Date: Sat Oct 31 12:15:28 2009 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: Documentation: ABI: /sys/devices/system/cpu/cpu#/node Documentation: ABI: /sys/devices/system/cpu/cpuidle/ Documentation: ABI: /sys/devices/system/cpu/sched_[mc|smt]_power_savings Documentation: ABI: /sys/devices/system/cpu/cpu#/ topology files Documentation: ABI: /sys/devices/system/cpu/ topology files Documentation: ABI: document /sys/devices/system/cpu/ Documentation: ABI: rename sysfs-devices-cache_disable properly Driver core: allow certain drivers prohibit bind/unbind via sysfs Driver core: fix driver_register() return value