Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Oct 2009 22:05:46 +0000 (15:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Oct 2009 22:05:46 +0000 (15:05 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  sysfs: Allow sysfs_notify_dirent to be called from interrupt context.
  sysfs: Allow sysfs_move_dir(..., NULL) again.


Trivial merge