Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Wed, 20 Jun 2018 19:34:23 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994680AbeFTRe0OOSRA/[email protected]> |
Author: Ralf Baechle <[email protected]> Wed Jun 20 19:32:58 2018 +0200 Commit: a4509f5514884a894cc928a2e25a3e0252b8e461 Gitweb: https://git.linux-mips.org/g/ralf/linux/a4509f551488 Branch: master --- Documentation/driver-api/infrastructure.rst | 4 +- MAINTAINERS | 9 +---- drivers/base/Makefile | 3 -- drivers/hid/hid-google-hammer.c | 2 + drivers/hid/hid-ids.h | 1 + drivers/hid/hid-steam.c | 10 +++-- drivers/hid/intel-ish-hid/ipc/pci-ish.c | 22 ++++-------- drivers/hid/wacom_sys.c | 8 ++++ fs/proc/base.c | 28 ++++++++++++--- include/linux/dma-contiguous.h | 2 + init/Kconfig | 4 -- kernel/Makefile | 1 + kernel/dma/Kconfig | 50 +++++++++++++++++++++++++++ kernel/dma/Makefile | 11 ++++++ kernel/dma/coherent.c | 0 kernel/dma/contiguous.c | 0 kernel/dma/debug.c | 0 kernel/dma/direct.c | 0 kernel/dma/mapping.c | 2 + kernel/dma/noncoherent.c | 0 kernel/dma/swiotlb.c | 0 kernel/dma/virt.c | 2 - lib/Kconfig | 47 +------------------------ lib/Makefile | 6 --- 24 files changed, 115 insertions(+), 97 deletions(-)