Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
commitefefc6eb38d43b8e5daef482f575d767b002004e
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 12 Oct 2007 22:49:37 +0000 (12 15:49 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 12 Oct 2007 22:49:37 +0000 (12 15:49 -0700)
tree8a3933db1f8721f9bcc9912c800dc8406f4bdf94
parent117494a1b65183f0e3fcc817b07944bc5c465050
parentcd59abfcc441b2abb4cf2cd62c1eb0f02a60e8dd
Merge /pub/scm/linux/kernel/git/gregkh/driver-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (75 commits)
  PM: merge device power-management source files
  sysfs: add copyrights
  kobject: update the copyrights
  kset: add some kerneldoc to help describe what these strange things are
  Driver core: rename ktype_edd and ktype_efivar
  Driver core: rename ktype_driver
  Driver core: rename ktype_device
  Driver core: rename ktype_class
  driver core: remove subsystem_init()
  sysfs: move sysfs file poll implementation to sysfs_open_dirent
  sysfs: implement sysfs_open_dirent
  sysfs: move sysfs_dirent->s_children into sysfs_dirent->s_dir
  sysfs: make sysfs_root a regular directory dirent
  sysfs: open code sysfs_attach_dentry()
  sysfs: make s_elem an anonymous union
  sysfs: make bin attr open get active reference of parent too
  sysfs: kill unnecessary NULL pointer check in sysfs_release()
  sysfs: kill unnecessary sysfs_get() in open paths
  sysfs: reposition sysfs_dirent->s_mode.
  sysfs: kill sysfs_update_file()
  ...
Documentation/kernel-parameters.txt
drivers/cpufreq/cpufreq.c
drivers/input/misc/pcspkr.c
drivers/s390/cio/ccwgroup.c
drivers/s390/cio/device.c
drivers/s390/crypto/ap_bus.c
drivers/usb/core/devio.c
drivers/usb/core/driver.c
drivers/usb/core/message.c
fs/dlm/lockspace.c
fs/gfs2/sys.c