diff --git a/[refs] b/[refs] index 3970ae098244..b8ba2c713ade 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2780ad42f5fe6739882603c61c8decba6e50eaa2 +refs/heads/master: adf9251fe9b87b5a50deebe489db2df8df4715fc diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 445537d46e7a..1eaeda66a525 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -465,6 +465,16 @@ M: Matt Turner L: linux-alpha@vger.kernel.org F: arch/alpha/ +ALTERA UART/JTAG UART SERIAL DRIVERS +M: Tobias Klauser +L: linux-serial@vger.kernel.org +L: nios2-dev@sopc.et.ntust.edu.tw (moderated for non-subscribers) +S: Maintained +F: drivers/tty/serial/altera_uart.c +F: drivers/tty/serial/altera_jtaguart.c +F: include/linux/altera_uart.h +F: include/linux/altera_jtaguart.h + AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER M: Thomas Dahlmann L: linux-geode@lists.infradead.org (moderated for non-subscribers)