tree b5b99f8111a72a81d085cc3e3acca706de43062e
parent 8fdb7e9f612b7c6ba6c3ba460c14263b5ce90f79
parent 12ee3c0a0ac42bed0939420468fd35f5cdceae4f
author Linus Torvalds <torvalds@linux-foundation.org> 1269031182 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1269031182 -0700

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:
  driver core: numa: fix BUILD_BUG_ON for node_read_distance
  driver-core: document ERR_PTR() return values
  kobject: documentation: Update to refer to kset-example.c.
  sysdev: the cpu probe/release attributes should be sysdev_class_attributes
  kobject: documentation: Fix erroneous example in kobject doc.
  driver-core: fix missing kernel-doc in firmware_class
  Driver core: Early platform kernel-doc update
  sysfs: fix sysfs lockdep warning in mlx4 code
  sysfs: fix sysfs lockdep warning in infiniband code
  sysfs: fix sysfs lockdep warning in ipmi code
  sysfs: Initialised pci bus legacy_mem field before use
  sysfs: use sysfs_bin_attr_init in firmware class driver