diff --git a/[refs] b/[refs] index 7f9c4118f703..5c708fab2816 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7a5e24569fc3428df1f26ed663b980db82eeef0 +refs/heads/master: 046d0a37024a5b1e66ec9314e5e7feba42feb811 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 9efa5bf4ef2a..7559c1ca56ba 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4684,6 +4684,8 @@ Q: http://patchwork.kernel.org/project/linux-omap/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git S: Maintained F: arch/arm/*omap*/ +F: drivers/i2c/busses/i2c-omap.c +F: include/linux/i2c-omap.h OMAP CLOCK FRAMEWORK SUPPORT M: Paul Walmsley @@ -5957,6 +5959,7 @@ L: davinci-linux-open-source@linux.davincidsp.com (subscribers-only) Q: http://patchwork.kernel.org/project/linux-davinci/list/ S: Supported F: arch/arm/mach-davinci +F: drivers/i2c/busses/i2c-davinci.c SIS 190 ETHERNET DRIVER M: Francois Romieu