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: (47 commits)
  Driver core: Don't call put methods while holding a spinlock
  Driver core: Remove unneeded routines from driver core
  Driver core: Fix potential deadlock in driver core
  PCI: enable driver multi-threaded probe
  Driver Core: add ability for drivers to do a threaded probe
  sysfs: add proper sysfs_init() prototype
  drivers/base: check errors
  drivers/base: Platform notify needs to occur before drivers attach to the device
  v4l-dev2: handle __must_check
  add CONFIG_ENABLE_MUST_CHECK
  add __must_check to device management code
  Driver core: fixed add_bind_files() definition
  Driver core: fix comments in drivers/base/power/resume.c
  sysfs_remove_bin_file: no return value, dump_stack on error
  kobject: must_check fixes
  Driver core: add ability for devices to create and remove bin files
  Class: add support for class interfaces for devices
  Driver core: create devices/virtual/ tree
  Driver core: add device_rename function
  Driver core: add ability for classes to handle devices properly
  ...

diff --cc kernel/power/Kconfig
Simple merge

diff --cc kernel/power/disk.c
Simple merge

diff --cc kernel/power/swsusp.c
Simple merge

diff --cc kernel/power/user.c
index 2e4499f3e4d9a0a7c09d3caeb700c66aed671a1f,5a8d060d7909993f149ebd14c152e0366ac8505d..72825c853cd7251bf73fa13cbea63e78c09d8845
--- 1/kernel/power/user.c
--- 2/kernel/power/user.c
+++ b/kernel/power/user.c
@@@ -193,10 -189,9 +193,10 @@@ static int snapshot_ioctl(struct inode 
                        error = -EPERM;
                        break;
                }
 +              snapshot_free_unused_memory(&data->handle);
                down(&pm_sem);
                pm_prepare_console();
-               error = device_suspend(PMSG_FREEZE);
+               error = device_suspend(PMSG_PRETHAW);
                if (!error) {
                        error = swsusp_resume();
                        device_resume();

diff --cc lib/Kconfig.debug
Simple merge