diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-30 22:49:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-30 22:49:44 -0500 |
| commit | 2141fd018156db0f29efb384f4d99ead23b48f18 (patch) | |
| tree | c67f226858e68f8ccc41a47823ae898796f3bf99 /MAINTAINERS | |
| parent | 5921dfe8dc2acc132600aa3e6eba53ecc9cd4c32 (diff) | |
| parent | 26713c81231363c07cbd0f7392a8c94d7ba8e61c (diff) | |
Merge tag 'char-misc-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver fixes from Greg KH:
"Here are two tiny patches, one fixing up the drivers/Kconfig file, and
one adding a MAINTAINERS entry for the UIO git tree"
* tag 'char-misc-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
drivers/Kconfig: remove duplicate entry for soc
MAINTAINERS: add git url entry for UIO
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 038f517f90ef..aaa039dee999 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -10176,6 +10176,7 @@ USERSPACE I/O (UIO) | |||
| 10176 | M: "Hans J. Koch" <hjk@hansjkoch.de> | 10176 | M: "Hans J. Koch" <hjk@hansjkoch.de> |
| 10177 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 10177 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| 10178 | S: Maintained | 10178 | S: Maintained |
| 10179 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git | ||
| 10179 | F: Documentation/DocBook/uio-howto.tmpl | 10180 | F: Documentation/DocBook/uio-howto.tmpl |
| 10180 | F: drivers/uio/ | 10181 | F: drivers/uio/ |
| 10181 | F: include/linux/uio*.h | 10182 | F: include/linux/uio*.h |