diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-05 18:22:26 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-05 18:22:26 -0500 |
| commit | 28b4d5cc17c20786848cdc07b7ea237a309776bb (patch) | |
| tree | bae406a4b17229dcce7c11be5073f7a67665e477 /MAINTAINERS | |
| parent | d29cecda036f251aee4947f47eea0fe9ed8cc931 (diff) | |
| parent | 96fa2b508d2d3fe040cf4ef2fffb955f0a537ea1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/pcmcia/fmvj18x_cs.c
drivers/net/pcmcia/nmclan_cs.c
drivers/net/pcmcia/xirc2ps_cs.c
drivers/net/wireless/ray_cs.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1186b1978b2e..89ceb4005c5d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3023,11 +3023,8 @@ S: Maintained | |||
| 3023 | F: fs/autofs4/ | 3023 | F: fs/autofs4/ |
| 3024 | 3024 | ||
| 3025 | KERNEL BUILD | 3025 | KERNEL BUILD |
| 3026 | M: Sam Ravnborg <sam@ravnborg.org> | ||
| 3027 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git | ||
| 3028 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git | ||
| 3029 | L: linux-kbuild@vger.kernel.org | 3026 | L: linux-kbuild@vger.kernel.org |
| 3030 | S: Maintained | 3027 | S: Orphan |
| 3031 | F: Documentation/kbuild/ | 3028 | F: Documentation/kbuild/ |
| 3032 | F: Makefile | 3029 | F: Makefile |
| 3033 | F: scripts/Makefile.* | 3030 | F: scripts/Makefile.* |