prism54: MAINTAINERS update
authorLuis R. Rodriguez <mcgrof@gmail.com>
Fri, 1 Jun 2007 07:46:57 +0000 (00:46 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 1 Jun 2007 15:18:29 +0000 (08:18 -0700)
Cc: "John W. Linville" <linville@tuxdriver.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
MAINTAINERS

diff --cc MAINTAINERS
Simple merge