diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-31 06:49:44 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-31 06:49:44 +0300 |
| commit | 2141fd018156db0f29efb384f4d99ead23b48f18 (patch) | |
| tree | c67f226858e68f8ccc41a47823ae898796f3bf99 | |
| parent | 5921dfe8dc2acc132600aa3e6eba53ecc9cd4c32 (diff) | |
| parent | 26713c81231363c07cbd0f7392a8c94d7ba8e61c (diff) | |
| download | linux-2141fd018156db0f29efb384f4d99ead23b48f18.tar.xz | |
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
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | drivers/Kconfig | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 038f517f90ef..aaa039dee999 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10176,6 +10176,7 @@ USERSPACE I/O (UIO) M: "Hans J. Koch" <hjk@hansjkoch.de> M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> S: Maintained +T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git F: Documentation/DocBook/uio-howto.tmpl F: drivers/uio/ F: include/linux/uio*.h diff --git a/drivers/Kconfig b/drivers/Kconfig index 694d5a70d6ce..c70d6e45dc10 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -134,8 +134,6 @@ source "drivers/staging/Kconfig" source "drivers/platform/Kconfig" -source "drivers/soc/Kconfig" - source "drivers/clk/Kconfig" source "drivers/hwspinlock/Kconfig" |