diff --git a/[refs] b/[refs] index 94bcc69ce4cb..ec5d5eca8c30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d1c20bce5bc1a7a94bca1324451532c28c89e36 +refs/heads/master: 1b4304e5ca4e7a52369cd5c381ba5527aaa5082e diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 915564eda145..d2a7cd4446af 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -673,6 +673,12 @@ ARM PRIMECELL MMCI PL180/1 DRIVER S: Orphan F: drivers/mmc/host/mmci.* +ARM PRIMECELL UART PL010 AND PL011 DRIVERS +M: Russell King +S: Maintained +F: drivers/tty/serial/amba-pl01*.c +F: include/linux/amba/serial.h + ARM PRIMECELL BUS SUPPORT M: Russell King S: Maintained