diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-31 02:14:29 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-31 02:14:29 -0500 |
| commit | 5fdf7e5975a0b0f6a0370655612c5dca3fd6311b (patch) | |
| tree | 639c536e818c6ace974aa285ba94576df0353b01 /MAINTAINERS | |
| parent | 7a51cffbd10886c0557677dd916c090097c691ef (diff) | |
| parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) | |
Merge branch 'linus' into tracing/kmemtrace
Conflicts:
mm/slub.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 857c877eee20..72d6eed3f204 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1755,6 +1755,13 @@ L: linuxppc-dev@ozlabs.org | |||
| 1755 | L: linux-i2c@vger.kernel.org | 1755 | L: linux-i2c@vger.kernel.org |
| 1756 | S: Maintained | 1756 | S: Maintained |
| 1757 | 1757 | ||
| 1758 | FREESCALE IMX / MXC FRAMEBUFFER DRIVER | ||
| 1759 | P: Sascha Hauer | ||
| 1760 | M: kernel@pengutronix.de | ||
| 1761 | L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) | ||
| 1762 | L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) | ||
| 1763 | S: Maintained | ||
| 1764 | |||
| 1758 | FREESCALE SOC FS_ENET DRIVER | 1765 | FREESCALE SOC FS_ENET DRIVER |
| 1759 | P: Pantelis Antoniou | 1766 | P: Pantelis Antoniou |
| 1760 | M: pantelis.antoniou@gmail.com | 1767 | M: pantelis.antoniou@gmail.com |