The following commit has been merged in the linux branch: commit e7957ec6b6edf7838c7d7506669ffb6e28ec481b Merge: 59c0b586aebdfff2c79d61139a2f5ea3b6d62675 83db93f4de2d9ae441a491d1dc61c2204f0195de Author: Linus Torvalds torvalds@linux-foundation.org Date: Thu Oct 15 15:05:46 2009 -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 sysfs_notify_dirent to be called from interrupt context. sysfs: Allow sysfs_move_dir(..., NULL) again.