diff --git a/[refs] b/[refs] index 138c1032560b..d92d031d7039 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3bdf28feafc52864bd7f17b39deec64833a89d19 +refs/heads/master: 59ec6da2e3e53a3e4f3cb4d35b6449e05f1bcc18 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 4f555d8e5346..0b4ccdd35bbb 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -7200,6 +7200,9 @@ W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices S: Supported F: Documentation/hwmon/wm83?? F: drivers/leds/leds-wm83*.c +F: drivers/input/misc/wm831x-on.c +F: drivers/input/touchscreen/wm831x-ts.c +F: drivers/input/touchscreen/wm97*.c F: drivers/mfd/wm8*.c F: drivers/power/wm83*.c F: drivers/rtc/rtc-wm83*.c @@ -7209,6 +7212,7 @@ F: drivers/watchdog/wm83*_wdt.c F: include/linux/mfd/wm831x/ F: include/linux/mfd/wm8350/ F: include/linux/mfd/wm8400* +F: include/linux/wm97xx.h F: include/sound/wm????.h F: sound/soc/codecs/wm*