diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 15:58:30 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 15:58:30 (GMT) |
| commit | 673b864fd76a29031aa0b4b08fc80886d527b3b7 (patch) | |
| tree | c9b3f01206e7d0dd5c801b504bfd7e82383470d6 /MAINTAINERS | |
| parent | 93b9e9a2d91b8a6c93f14e98382694f83de9f02e (diff) | |
| parent | 71cd03b0044183843318bfac0b6ce5868a96ef34 (diff) | |
| download | linux-673b864fd76a29031aa0b4b08fc80886d527b3b7.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
arch/sparc/mm: Use GFP_KERNEL
MAINTAINERS: Add trailing slash to SBUS path.
sbus: autoconvert trivial BKL users to private mutex
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1e5f233..05741e0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5357,7 +5357,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git S: Maintained F: arch/sparc/ -F: drivers/sbus +F: drivers/sbus/ SPARC SERIAL DRIVERS M: "David S. Miller" <davem@davemloft.net> |