aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-06 20:56:20 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-06 20:56:20 -0400
commit4157368edbc3d69b05e9294a73c84fc9c96bdec4 (patch)
tree60072b082dad509d270a9c53427cfedb1c997b3b /MAINTAINERS
parent9479f0f8018a0317b0b5e0c2b338bec6e26fdf2d (diff)
parent00a62d4bc9b9a0388abee5c5ea946b9631b149d5 (diff)
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull arch/tile bug fixes from Chris Metcalf: "This includes Paul Gortmaker's change to fix the <asm/system.h> disintegration issues on tile, a fix to unbreak the tilepro ethernet driver, and a backlog of bugfix-only changes from internal Tilera development over the last few months. They have all been to LKML and on linux-next for the last few days. The EDAC change to MAINTAINERS is an oddity but discussion on the linux-edac list suggested I ask you to pull that change through my tree since they don't have a tree to pull edac changes from at the moment." * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: (39 commits) drivers/net/ethernet/tile: fix netdev_alloc_skb() bombing MAINTAINERS: update EDAC information tilepro ethernet driver: fix a few minor issues tile-srom.c driver: minor code cleanup edac: say "TILEGx" not "TILEPro" for the tilegx edac driver arch/tile: avoid accidentally unmasking NMI-type interrupt accidentally arch/tile: remove bogus performance optimization arch/tile: return SIGBUS for addresses that are unaligned AND invalid arch/tile: fix finv_buffer_remote() for tilegx arch/tile: use atomic exchange in arch_write_unlock() arch/tile: stop mentioning the "kvm" subdirectory arch/tile: export the page_home() function. arch/tile: fix pointer cast in cacheflush.c arch/tile: fix single-stepping over swint1 instructions on tilegx arch/tile: implement panic_smp_self_stop() arch/tile: add "nop" after "nap" to help GX idle power draw arch/tile: use proper memparse() for "maxmem" options arch/tile: fix up locking in pgtable.c slightly arch/tile: don't leak kernel memory when we unload modules arch/tile: fix bug in delay_backoff() ...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS22
1 files changed, 11 insertions, 11 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 6d05ae236036..0a2e44ce077a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2450,17 +2450,17 @@ F: fs/ecryptfs/
2450 2450
2451EDAC-CORE 2451EDAC-CORE
2452M: Doug Thompson <dougthompson@xmission.com> 2452M: Doug Thompson <dougthompson@xmission.com>
2453L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers) 2453L: linux-edac@vger.kernel.org
2454W: bluesmoke.sourceforge.net 2454W: bluesmoke.sourceforge.net
2455S: Supported 2455S: Supported
2456F: Documentation/edac.txt 2456F: Documentation/edac.txt
2457F: drivers/edac/edac_* 2457F: drivers/edac/
2458F: include/linux/edac.h 2458F: include/linux/edac.h
2459 2459
2460EDAC-AMD64 2460EDAC-AMD64
2461M: Doug Thompson <dougthompson@xmission.com> 2461M: Doug Thompson <dougthompson@xmission.com>
2462M: Borislav Petkov <borislav.petkov@amd.com> 2462M: Borislav Petkov <borislav.petkov@amd.com>
2463L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers) 2463L: linux-edac@vger.kernel.org
2464W: bluesmoke.sourceforge.net 2464W: bluesmoke.sourceforge.net
2465S: Supported 2465S: Supported
2466F: drivers/edac/amd64_edac* 2466F: drivers/edac/amd64_edac*
@@ -2468,35 +2468,35 @@ F: drivers/edac/amd64_edac*
2468EDAC-E752X 2468EDAC-E752X
2469M: Mark Gross <mark.gross@intel.com> 2469M: Mark Gross <mark.gross@intel.com>
2470M: Doug Thompson <dougthompson@xmission.com> 2470M: Doug Thompson <dougthompson@xmission.com>
2471L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers) 2471L: linux-edac@vger.kernel.org
2472W: bluesmoke.sourceforge.net 2472W: bluesmoke.sourceforge.net
2473S: Maintained 2473S: Maintained
2474F: drivers/edac/e752x_edac.c 2474F: drivers/edac/e752x_edac.c
2475 2475
2476EDAC-E7XXX 2476EDAC-E7XXX
2477M: Doug Thompson <dougthompson@xmission.com> 2477M: Doug Thompson <dougthompson@xmission.com>
2478L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers) 2478L: linux-edac@vger.kernel.org
2479W: bluesmoke.sourceforge.net 2479W: bluesmoke.sourceforge.net
2480S: Maintained 2480S: Maintained
2481F: drivers/edac/e7xxx_edac.c 2481F: drivers/edac/e7xxx_edac.c
2482 2482
2483EDAC-I82443BXGX 2483EDAC-I82443BXGX
2484M: Tim Small <tim@buttersideup.com> 2484M: Tim Small <tim@buttersideup.com>
2485L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers) 2485L: linux-edac@vger.kernel.org
2486W: bluesmoke.sourceforge.net 2486W: bluesmoke.sourceforge.net
2487S: Maintained 2487S: Maintained
2488F: drivers/edac/i82443bxgx_edac.c 2488F: drivers/edac/i82443bxgx_edac.c
2489 2489
2490EDAC-I3000 2490EDAC-I3000
2491M: Jason Uhlenkott <juhlenko@akamai.com> 2491M: Jason Uhlenkott <juhlenko@akamai.com>
2492L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers) 2492L: linux-edac@vger.kernel.org
2493W: bluesmoke.sourceforge.net 2493W: bluesmoke.sourceforge.net
2494S: Maintained 2494S: Maintained
2495F: drivers/edac/i3000_edac.c 2495F: drivers/edac/i3000_edac.c
2496 2496
2497EDAC-I5000 2497EDAC-I5000
2498M: Doug Thompson <dougthompson@xmission.com> 2498M: Doug Thompson <dougthompson@xmission.com>
2499L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers) 2499L: linux-edac@vger.kernel.org
2500W: bluesmoke.sourceforge.net 2500W: bluesmoke.sourceforge.net
2501S: Maintained 2501S: Maintained
2502F: drivers/edac/i5000_edac.c 2502F: drivers/edac/i5000_edac.c
@@ -2525,21 +2525,21 @@ F: drivers/edac/i7core_edac.c
2525EDAC-I82975X 2525EDAC-I82975X
2526M: Ranganathan Desikan <ravi@jetztechnologies.com> 2526M: Ranganathan Desikan <ravi@jetztechnologies.com>
2527M: "Arvind R." <arvino55@gmail.com> 2527M: "Arvind R." <arvino55@gmail.com>
2528L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers) 2528L: linux-edac@vger.kernel.org
2529W: bluesmoke.sourceforge.net 2529W: bluesmoke.sourceforge.net
2530S: Maintained 2530S: Maintained
2531F: drivers/edac/i82975x_edac.c 2531F: drivers/edac/i82975x_edac.c
2532 2532
2533EDAC-PASEMI 2533EDAC-PASEMI
2534M: Egor Martovetsky <egor@pasemi.com> 2534M: Egor Martovetsky <egor@pasemi.com>
2535L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers) 2535L: linux-edac@vger.kernel.org
2536W: bluesmoke.sourceforge.net 2536W: bluesmoke.sourceforge.net
2537S: Maintained 2537S: Maintained
2538F: drivers/edac/pasemi_edac.c 2538F: drivers/edac/pasemi_edac.c
2539 2539
2540EDAC-R82600 2540EDAC-R82600
2541M: Tim Small <tim@buttersideup.com> 2541M: Tim Small <tim@buttersideup.com>
2542L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers) 2542L: linux-edac@vger.kernel.org
2543W: bluesmoke.sourceforge.net 2543W: bluesmoke.sourceforge.net
2544S: Maintained 2544S: Maintained
2545F: drivers/edac/r82600_edac.c 2545F: drivers/edac/r82600_edac.c