diff --git a/[refs] b/[refs] index 8cf99917e55e..baf0a4a4919e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da0d7f982d538f4a5bcdddb84df4a484a3b1770b +refs/heads/master: 87544653abe4a03324bc85dae32d5bdaabcfccef diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index f2a2b8e647c5..22aa0945cb6e 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2050,14 +2050,16 @@ F: drivers/block/drbd/ F: lib/lru_cache.c F: Documentation/blockdev/drbd/ -DRIVER CORE, KOBJECTS, AND SYSFS +DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS M: Greg Kroah-Hartman T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ S: Supported F: Documentation/kobject.txt F: drivers/base/ F: fs/sysfs/ +F: fs/debugfs/ F: include/linux/kobj* +F: include/linux/debugfs.h F: lib/kobj* DRM DRIVERS