diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-20 14:35:58 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-20 14:35:58 +0000 |
| commit | 1b1c7409b75a8b62906b78b84c8469002072b738 (patch) | |
| tree | 91ceea4d8fae61b29e9a716c5e6ad56c3b5f588b /MAINTAINERS | |
| parent | 573f8c8d13377ec03c2d23269f8eea50c11a7432 (diff) | |
| parent | b28748fb5d21d5d64c9ce31579ffbbd41f317042 (diff) | |
| download | op-kernel-dev-1b1c7409b75a8b62906b78b84c8469002072b738.zip op-kernel-dev-1b1c7409b75a8b62906b78b84c8469002072b738.tar.gz | |
Merge branch 'misc' into for-linus
Conflicts:
arch/arm/include/asm/memory.h
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 35a56bc..1f8e194 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -670,8 +670,16 @@ F: drivers/input/serio/ambakmi.* F: include/linux/amba/kmi.h ARM PRIMECELL MMCI PL180/1 DRIVER -S: Orphan +M: Russell King <linux@arm.linux.org.uk> +S: Maintained F: drivers/mmc/host/mmci.* +F: include/linux/amba/mmci.h + +ARM PRIMECELL UART PL010 AND PL011 DRIVERS +M: Russell King <linux@arm.linux.org.uk> +S: Maintained +F: drivers/tty/serial/amba-pl01*.c +F: include/linux/amba/serial.h ARM PRIMECELL BUS SUPPORT M: Russell King <linux@arm.linux.org.uk> |
