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)
commite7957ec6b6edf7838c7d7506669ffb6e28ec481b
tree91c6c28b6d93b181bd626736d94f79ed59d7a8c8
parent59c0b586aebdfff2c79d61139a2f5ea3b6d62675
parent83db93f4de2d9ae441a491d1dc61c2204f0195de
Merge git://git./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.