tree a0fef9252200a78634f0fa4eaa714c7a40e802b9
parent 92320cec611d4ed44a9bd635727d61f6caa669a7
parent dfff0a0671baf4e69fc676bf8150635407548288
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1172518890 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1172518890 -0800

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

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  Revert "Driver core: let request_module() send a /sys/modules/kmod/-uevent"
  Driver core: fix error by cleanup up symlinks properly
  make kernel/kmod.c:kmod_mk static
  power management: fix struct layout and docs
  power management: no valid states w/o pm_ops
  Driver core: more fallout from class_device changes for pcmcia
  sysfs: move struct sysfs_dirent to private header
  driver core: refcounting fix
  Driver core: remove class_device_rename