tree 8fa32c991375c382539c39b35603d2289b4610c6
parent bf4282cbcf7f53c23e87fb0cef945591cdc8d631
parent 75de46b98dda624397ccb17c106e51f478a79c15
author Linus Torvalds <torvalds@linux-foundation.org> 1275690447 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1275690447 -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:
  fix setattr error handling in sysfs, configfs
  kobject: free memory if netlink_kernel_create() fails
  lib/kobject_uevent.c: fix CONIG_NET=n warning