diff --git a/[refs] b/[refs] index 2d13b57c73d6..034e8b14e32b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f5a5e62aed455a4004685b6ee65ea91cc5acb87 +refs/heads/master: e8e31622a17e9820c650f99253c559f512112dd5 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index d04cfadcc129..f4672409960e 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -336,6 +336,13 @@ W: http://wireless.kernel.org/ S: Orphan F: drivers/net/wireless/adm8211.* +ADP1653 FLASH CONTROLLER DRIVER +M: Sakari Ailus +L: linux-media@vger.kernel.org +S: Maintained +F: drivers/media/i2c/adp1653.c +F: include/media/adp1653.h + ADP5520 BACKLIGHT DRIVER WITH IO EXPANDER (ADP5520/ADP5501) M: Michael Hennerich L: device-drivers-devel@blackfin.uclinux.org @@ -6707,6 +6714,15 @@ M: Nicolas Pitre S: Odd Fixes F: drivers/net/ethernet/smsc/smc91x.* +SMIA AND SMIA++ IMAGE SENSOR DRIVER +M: Sakari Ailus +L: linux-media@vger.kernel.org +S: Maintained +F: drivers/media/i2c/smiapp +F: include/media/smiapp.h +F: drivers/media/i2c/smiapp-pll.c +F: drivers/media/i2c/smiapp-pll.h + SMM665 HARDWARE MONITOR DRIVER M: Guenter Roeck L: lm-sensors@lm-sensors.org