From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 15 Oct 2009 22:05:46 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
X-Git-Tag: v2.6.32-rc5~10
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e7957ec6b6edf7838c7d7506669ffb6e28ec481b;p=~shefty%2Frdma-dev.git

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 sysfs_notify_dirent to be called from interrupt context.
  sysfs: Allow sysfs_move_dir(..., NULL) again.
---

e7957ec6b6edf7838c7d7506669ffb6e28ec481b