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

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (61 commits)
  Dynamic debug: fix pr_fmt() build error
  Dynamic debug: allow simple quoting of words
  dynamic debug: update docs
  dynamic debug: combine dprintk and dynamic printk
  sysfs: fix some bin_vm_ops errors
  kobject: don't block for each kobject_uevent
  sysfs: only allow one scheduled removal callback per kobj
  Driver core: Fix device_move() vs. dpm list ordering, v2
  Driver core: some cleanup on drivers/base/sys.c
  Driver core: implement uevent suppress in kobject
  vcs: hook sysfs devices into object lifetime instead of "binding"
  driver core: fix passing platform_data
  driver core: move platform_data into platform_device
  sysfs: don't block indefinitely for unmapped files.
  driver core: move knode_bus into private structure
  driver core: move knode_driver into private structure
  driver core: move klist_children into private structure
  driver core: create a private portion of struct device
  driver core: remove polling for driver_probe_done(v5)
  sysfs: reference sysfs_dirent from sysfs inodes
  ...

Fixed conflicts in drivers/sh/maple/maple.c manually

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc drivers/sh/maple/maple.c
index c71bb4b4ce8476efbaa0e70bca1fccc3ab2666b5,7e1257af3d41f70e03795153a4dd672d087c42a8..cab1ab7cfb789204f70924975fc78b94bafe802a
--- 1/drivers/sh/maple/maple.c
--- 2/drivers/sh/maple/maple.c
+++ b/drivers/sh/maple/maple.c
@@@ -376,10 -436,10 +376,9 @@@ static void maple_attach_driver(struct 
  
                if (matched == 0) {
                        /* Driver does not exist yet */
 -                      printk(KERN_INFO
 -                              "No maple driver found.\n");
 -                      mdev->driver = &maple_dummy_driver;
 +                      dev_info(&mdev->dev, "no driver found\n");
 +                      mdev->driver = &maple_unsupported_device;
                }
- 
                dev_set_name(&mdev->dev, "%d:0%d.%lX", mdev->port,
                             mdev->unit, function);
        }

diff --cc drivers/video/sh_mobile_lcdcfb.c
Simple merge

diff --cc lib/Makefile
index b2c09da02cae13fa974ec949600dee89ff7a0f66,8633d6be9d21afc5574147e906695cc7b84914e1..0dd9229fab7ebf914598558f7d79b36f89aecd66
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -82,10 -82,8 +82,10 @@@ obj-$(CONFIG_HAVE_LMB) += lmb.
  
  obj-$(CONFIG_HAVE_ARCH_TRACEHOOK) += syscall.o
  
- obj-$(CONFIG_DYNAMIC_PRINTK_DEBUG) += dynamic_printk.o
+ obj-$(CONFIG_DYNAMIC_DEBUG) += dynamic_debug.o
  
 +obj-$(CONFIG_NLATTR) += nlattr.o
 +
  hostprogs-y   := gen_crc32table
  clean-files   := crc32table.h