diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-29 05:54:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-29 05:54:24 -0400 |
| commit | 3825c9e8d01e4310c40a3903a354c433c32a7b6f (patch) | |
| tree | 87c94a8076bbb38bd2cf20ab9bc23d6f74f6a0a8 /MAINTAINERS | |
| parent | 5d7b605245b1aa1a9cd6549b1f57d69273eb0c37 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge commit 'v2.6.27-rc1' into x86/microcode
Conflicts:
arch/x86/kernel/microcode.c
Manual resolutions:
arch/x86/kernel/microcode_amd.c
arch/x86/kernel/microcode_intel.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 28f867d99a8c..4bfa468ceae2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3801,6 +3801,12 @@ P: Ben Nizette | |||
| 3801 | M: bn@niasdigital.com | 3801 | M: bn@niasdigital.com |
| 3802 | S: Maintained | 3802 | S: Maintained |
| 3803 | 3803 | ||
| 3804 | SOC-CAMERA V4L2 SUBSYSTEM | ||
| 3805 | P: Guennadi Liakhovetski | ||
| 3806 | M: g.liakhovetski@gmx.de | ||
| 3807 | L: video4linux-list@redhat.com | ||
| 3808 | S: Maintained | ||
| 3809 | |||
| 3804 | SOFTWARE RAID (Multiple Disks) SUPPORT | 3810 | SOFTWARE RAID (Multiple Disks) SUPPORT |
| 3805 | P: Ingo Molnar | 3811 | P: Ingo Molnar |
| 3806 | M: mingo@redhat.com | 3812 | M: mingo@redhat.com |