projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge 4.5-rc4 into char-misc-next
[cascardo/linux.git]
/
MAINTAINERS
diff --git
a/MAINTAINERS
b/MAINTAINERS
index
cc2f753
..
b44209a
100644
(file)
--- a/
MAINTAINERS
+++ b/
MAINTAINERS
@@
-5741,6
+5741,7
@@
S: Supported
F: include/uapi/linux/mei.h
F: include/linux/mei_cl_bus.h
F: drivers/misc/mei/*
+F: drivers/watchdog/mei_wdt.c
F: Documentation/misc-devices/mei/*
INTEL MIC DRIVERS (mic)