diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-16 13:11:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-16 13:11:29 +0200 |
| commit | 77e442461c74068217b59b356cf18992c78ed896 (patch) | |
| tree | 70f62a16bc6a81b63768279c9b40645d8f4dd4ff /MAINTAINERS | |
| parent | d54191b85e294c46f05a2249b1f55ae54930bcc7 (diff) | |
| parent | 45158894d4d6704afbb4cefe55e5f6ca279fe12a (diff) | |
Merge branch 'linus' into x86/kprobes
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1528e58b540..ee1c56a2075 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1686,6 +1686,13 @@ L: linuxppc-embedded@ozlabs.org L: linux-kernel@vger.kernel.org S: Maintained +FREESCALE I2C CPM DRIVER +P: Jochen Friedrich +M: jochen@scram.de +L: linuxppc-dev@ozlabs.org +L: i2c@lm-sensors.org +S: Maintained + FREESCALE SOC FS_ENET DRIVER P: Pantelis Antoniou M: pantelis.antoniou@gmail.com @@ -1770,6 +1777,11 @@ M: hch@infradead.org W: ftp://ftp.openlinux.org/pub/people/hch/vxfs S: Maintained +FTRACE +P: Steven Rostedt +M: srostedt@redhat.com +S: Maintained + FUJITSU FR-V (FRV) PORT P: David Howells M: dhowells@redhat.com @@ -2509,13 +2521,11 @@ W: http://www.penguinppc.org/ L: linuxppc-dev@ozlabs.org S: Maintained -LINUX FOR POWERPC EMBEDDED MPC52XX +LINUX FOR POWERPC EMBEDDED MPC5XXX P: Sylvain Munaut M: tnt@246tNt.com P: Grant Likely M: grant.likely@secretlab.ca -W: http://www.246tNt.com/mpc52xx/ -W: http://www.penguinppc.org/ L: linuxppc-dev@ozlabs.org S: Maintained |