Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 31 Oct 2007 20:43:31 +0000 (13:43 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 31 Oct 2007 20:43:31 +0000 (13:43 -0700)
commitb1d08ac064268d0ae2281e98bf5e82627e0f0c56
tree00aec5eed543558856b7dd6f0de7dede98e6c851
parent57eb06e584be3b702d1ba5c39e0b57ddcdabdc66
parentd919fd433b5823d1cf9d0688eb2eec183de9b74c
Merge git://git./linux/kernel/git/gregkh/driver-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  Revert "Driver core: remove class_device_*_bin_file"