aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2017-03-24 21:58:58 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2017-03-24 21:58:58 +0800
commit2e6d603e5163e6f32a8686744b4d53e8778957ba (patch)
treeead238ea5efe7b3f52728793fe9dfa76ca52bc31 /MAINTAINERS
parentMAINTAINERS: Add maintianer entry for crypto/s5p-sss (diff)
parentLinux 4.11-rc3 (diff)
downloadlinux-dev-2e6d603e5163e6f32a8686744b4d53e8778957ba.tar.xz
linux-dev-2e6d603e5163e6f32a8686744b4d53e8778957ba.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merging 4.11-rc3 to pick up md5 removal from /dev/random.
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 01565164bcc6..d569516fd48a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8307,7 +8307,6 @@ M: Richard Leitner <richard.leitner@skidata.com>
L: linux-usb@vger.kernel.org
S: Maintained
F: drivers/usb/misc/usb251xb.c
-F: include/linux/platform_data/usb251xb.h
F: Documentation/devicetree/bindings/usb/usb251xb.txt
MICROSOFT SURFACE PRO 3 BUTTON DRIVER