diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:14:29 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:14:29 +0100 |
| commit | 5fdf7e5975a0b0f6a0370655612c5dca3fd6311b (patch) | |
| tree | 639c536e818c6ace974aa285ba94576df0353b01 /MAINTAINERS | |
| parent | 7a51cffbd10886c0557677dd916c090097c691ef (diff) | |
| parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) | |
| download | op-kernel-dev-5fdf7e5975a0b0f6a0370655612c5dca3fd6311b.zip op-kernel-dev-5fdf7e5975a0b0f6a0370655612c5dca3fd6311b.tar.gz | |
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 857c877..72d6eed 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1755,6 +1755,13 @@ L: linuxppc-dev@ozlabs.org L: linux-i2c@vger.kernel.org S: Maintained +FREESCALE IMX / MXC FRAMEBUFFER DRIVER +P: Sascha Hauer +M: kernel@pengutronix.de +L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers) +L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) +S: Maintained + FREESCALE SOC FS_ENET DRIVER P: Pantelis Antoniou M: pantelis.antoniou@gmail.com |
