Merge tag 'char-misc-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Jan 2015 03:49:44 +0000 (19:49 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Jan 2015 03:49:44 +0000 (19:49 -0800)
commit2141fd018156db0f29efb384f4d99ead23b48f18
treec67f226858e68f8ccc41a47823ae898796f3bf99
parent5921dfe8dc2acc132600aa3e6eba53ecc9cd4c32
parent26713c81231363c07cbd0f7392a8c94d7ba8e61c
Merge tag 'char-misc-3.19-rc7' of git://git./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
MAINTAINERS