diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 22:01:54 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 22:01:54 +0200 |
commit | f2556896597c43cb48f04b1c16214938a6ccce9a (patch) | |
tree | 9e068d92ecf2c41b7b0f36a9688c56fd5fe39709 /MAINTAINERS | |
parent | 7c13e6a3d15a4ebcc3f40df5f4d19665479f8ca3 (diff) | |
parent | 10fec20ef5eec1c91913baec1225400f0d02df40 (diff) | |
download | op-kernel-dev-f2556896597c43cb48f04b1c16214938a6ccce9a.zip op-kernel-dev-f2556896597c43cb48f04b1c16214938a6ccce9a.tar.gz |
Merge branch 'linus' into x86/defconfig
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 41d7a1e..b343814 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4683,12 +4683,6 @@ L: linux-wireless@vger.kernel.org L: zd1211-devs@lists.sourceforge.net (subscribers-only) S: Maintained -ZF MACHZ WATCHDOG -P: Fernando Fuganti -M: fuganti@netbank.com.br -W: http://cvs.conectiva.com.br/drivers/ZFL-watchdog/ -S: Maintained - ZR36067 VIDEO FOR LINUX DRIVER P: Ronald Bultje M: rbultje@ronald.bitfreak.net |