tree f12c2f6ce3c6a541f5192aa5a2da400024015fb7
parent 12f981f9028da2402c236544c78b8378a278f830
parent 3634634edd49c115da931998b9540bcc17665b05
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1204677455 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1204677455 -0800

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

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  debugfs: fix sparse warnings
  Driver core: Fix cleanup when failing device_add().
  driver core: Remove dpm_sysfs_remove() from error path of device_add()
  PM: fix new mutex-locking bug in the PM core
  PM: Do not acquire device semaphores upfront during suspend
  kobject: properly initialize ksets
  sysfs: CONFIG_SYSFS_DEPRECATED fix
  driver core: fix up Kconfig text for CONFIG_SYSFS_DEPRECATED