diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-03 12:38:17 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-03 12:38:17 +1000 |
| commit | 139d2e265b2ad0f1b82898bec331310a0db25914 (patch) | |
| tree | 6bf252e4cd9738deeace8bf3cf1bd6284f9d0b36 /MAINTAINERS | |
| parent | 1fb5fe2464d5dac787a683586f65bb7f78eeb008 (diff) | |
| parent | 628b3198ccc235e387c0b8ee200c10c883e86644 (diff) | |
Merge remote-tracking branch 'drivers-x86/for-next'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fd470bf1aa8f..7719de285d71 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6852,6 +6852,12 @@ T: git git://git.monstr.eu/linux-2.6-microblaze.git S: Supported F: arch/microblaze/ +MICROSOFT SURFACE PRO 3 BUTTON DRIVER +M: Chen Yu <yu.c.chen@intel.com> +L: platform-driver-x86@vger.kernel.org +S: Supported +F: drivers/platform/x86/surfacepro3_button.c + MICROTEK X6 SCANNER M: Oliver Neukum <oliver@neukum.org> S: Maintained @@ -10495,7 +10501,6 @@ F: drivers/platform/x86/toshiba_haps.c TOSHIBA SMM DRIVER M: Jonathan Buzzard <jonathan@buzzard.org.uk> -L: tlinux-users@tce.toshiba-dme.co.jp W: http://www.buzzard.org.uk/toshiba/ S: Maintained F: drivers/char/toshiba.c |