Linus Torvalds 0c93ea4064 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
2009-03-26 11:17:04 -07:00
..
2008-07-25 10:53:26 -07:00
2008-02-03 17:48:52 +02:00
2005-10-18 08:26:15 -07:00
2007-05-11 05:38:25 -04:00
2008-07-24 10:47:33 -07:00
2008-06-06 11:29:10 -07:00
2007-07-16 09:05:50 -07:00
2007-07-17 10:23:04 -07:00
2006-06-25 10:01:20 -07:00
2008-02-03 17:48:52 +02:00
2006-06-25 10:01:20 -07:00
2007-05-10 18:24:13 +02:00
2009-01-06 15:59:11 -08:00
2009-01-01 10:12:19 +10:30
2008-04-29 08:11:16 -07:00
2008-05-14 19:11:14 -07:00
2007-10-19 11:53:41 -07:00
2006-06-20 20:24:58 -07:00
2008-07-26 12:00:07 -07:00
2006-10-06 08:53:40 -07:00
2009-03-24 16:38:27 -07:00
2008-01-24 20:40:05 -08:00
2009-03-11 23:18:32 +08:00
2008-07-26 12:00:07 -07:00
2008-07-30 16:29:19 -07:00
2008-01-30 13:33:00 +01:00
2008-07-26 12:00:10 -07:00
2008-07-26 12:00:10 -07:00
2008-07-22 19:24:31 +10:00
2009-01-06 15:59:12 -08:00