| commit | 2141fd018156db0f29efb384f4d99ead23b48f18 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 30 19:49:44 2015 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 30 19:49:44 2015 -0800 |
| tree | c67f226858e68f8ccc41a47823ae898796f3bf99 | |
| 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