tree b104ce5e32369809fa1cd24e61faf225aa87f0fe
parent 592d32cc4156ee512e55c5bc052fdece215f52b2
parent d33002129eee4717a92e320b0b764a784bbcad3a
author Linus Torvalds <torvalds@linux-foundation.org> 1280174845 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1280174845 -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:
  sysfs: allow creating symlinks from untagged to tagged directories
  sysfs: sysfs_delete_link handle symlinks from untagged to tagged directories.
  sysfs: Don't allow the creation of symlinks we can't remove