diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-20 23:28:34 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-20 23:28:34 +0200 |
| commit | 1b5e2a7e23439c13f73cacab1cf227f30cb9ae9f (patch) | |
| tree | bd9245e0d623558a820ae6a33c718a350c60c95d /MAINTAINERS | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba... (diff) | |
| parent | iop-adma: fixup some kzalloc/memset confusions (diff) | |
| download | linux-1b5e2a7e23439c13f73cacab1cf227f30cb9ae9f.tar.xz linux-1b5e2a7e23439c13f73cacab1cf227f30cb9ae9f.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
iop-adma: fixup some kzalloc/memset confusions
fsldma: update the fsldma driver MAINTAINERS info
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 461c2790e29e..b42dcfcbee44 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1646,8 +1646,10 @@ W: http://linux-fbdev.sourceforge.net/ S: Maintained FREESCALE DMA DRIVER -P; Zhang Wei -M: wei.zhang@freescale.com +P: Li Yang +M: leoli@freescale.com +P: Zhang Wei +M: zw@zh-kernel.org L: linuxppc-embedded@ozlabs.org L: linux-kernel@vger.kernel.org S: Maintained |