diff --git a/[refs] b/[refs] index 43cab9291a40..c1f0910724e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b104153e366396e6a631ee3c9d95c26ece36523b +refs/heads/master: 888f2804e46377b54f283707f87c09922ef87eb2 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 50b4d735f961..23fa78bb6253 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1467,6 +1467,12 @@ F: drivers/dma/at_hdmac.c F: drivers/dma/at_hdmac_regs.h F: include/linux/platform_data/dma-atmel.h +ATMEL I2C DRIVER +M: Ludovic Desroches +L: linux-i2c@vger.kernel.org +S: Supported +F: drivers/i2c/busses/i2c-at91.c + ATMEL ISI DRIVER M: Josh Wu L: linux-media@vger.kernel.org