tree c67f226858e68f8ccc41a47823ae898796f3bf99
parent 5921dfe8dc2acc132600aa3e6eba53ecc9cd4c32
parent 26713c81231363c07cbd0f7392a8c94d7ba8e61c
author Linus Torvalds <torvalds@linux-foundation.org> 1422676184 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1422676184 -0800
mergetag object 26713c81231363c07cbd0f7392a8c94d7ba8e61c
 type commit
 tag char-misc-3.19-rc7
 tagger Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1422667556 -0800
 
 Char/misc driver fixes for 3.19-rc7
 
 Here are two tiny patches, one fixing up the drivers/Kconfig file, and
 one adding a MAINTAINERS entry for the UIO git tree.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iEYEABECAAYFAlTML2MACgkQMUfUDdst+ynVBQCfUDkF9rW1UziWD7z1suWoIb46
 wa8An0Szv5VAQXctCojeRWDPqZHPyVlD
 =Kje6
 -----END PGP SIGNATURE-----

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