diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-21 12:28:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-21 12:28:50 -0400 |
commit | 95977d0ef23ee37990ce8704dfd6c61eab02a548 (patch) | |
tree | d3bb7133f8f51f8e48c0c74ee28c14deb45fedbe /MAINTAINERS | |
parent | a4ce96ac356e7024a7724ade9d18ba1bdf3c5c06 (diff) | |
parent | f8324e20f8289dffc646d64366332e05eaacab25 (diff) |
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:
math-emu: correct test for downshifting fraction in _FP_FROM_INT()
perf: Add DWARF register lookup for sparc
MAINTAINERS: Add SBUS driver path to sparc entry.
drivers/sbus: Remove unnecessary casts of private_data
sparc: remove homegrown L1_CACHE_ALIGN macro
sparc64: fix the build error due to smp_kgdb_capture_client()
sparc64: Fix maybe_change_configuration() PCR setting.
arch/sparc/kernel: Eliminate what looks like a NULL pointer dereference
sparc64: Update defconfig.
sunsu: Fix use after free in su_remove().
sunserial: Don't call add_preferred_console() when console= is specified.
sparc32: Kill none_mask, it's bogus.
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 58848125b8bf..db3d0f5061f9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -5336,6 +5336,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git | |||
5336 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git | 5336 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git |
5337 | S: Maintained | 5337 | S: Maintained |
5338 | F: arch/sparc/ | 5338 | F: arch/sparc/ |
5339 | F: drivers/sbus | ||
5339 | 5340 | ||
5340 | SPARC SERIAL DRIVERS | 5341 | SPARC SERIAL DRIVERS |
5341 | M: "David S. Miller" <davem@davemloft.net> | 5342 | M: "David S. Miller" <davem@davemloft.net> |