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)
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  Revert "Driver core: remove class_device_*_bin_file"


Trivial merge