diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 18:40:39 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 18:40:39 -0500 |
| commit | ea14fad0d416354a4e9bb1a04f32acba706f9548 (patch) | |
| tree | 2c8acc5331f189aef1d40ddce3f40d6be9314e77 /MAINTAINERS | |
| parent | 6ee7e78e7c78d871409ad4df30551c9355be7d0e (diff) | |
| parent | 6705cda24fad1cb0ac82ac4f312df8ec735b39b0 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (76 commits)
[ARM] 4002/1: S3C24XX: leave parent IRQs unmasked
[ARM] 4001/1: S3C24XX: shorten reboot time
[ARM] 3983/2: remove unused argument to __bug()
[ARM] 4000/1: Osiris: add third serial port in
[ARM] 3999/1: RX3715: suspend to RAM support
[ARM] 3998/1: VR1000: LED platform devices
[ARM] 3995/1: iop13xx: add iop13xx support
[ARM] 3968/1: iop13xx: add iop13xx_defconfig
[ARM] Update mach-types
[ARM] Allow gcc to optimise arm_add_memory a little more
[ARM] 3991/1: i.MX/MX1 high resolution time source
[ARM] 3990/1: i.MX/MX1 more precise PLL decode
[ARM] 3986/1: H1940: suspend to RAM support
[ARM] 3985/1: ixp4xx clocksource cleanup
[ARM] 3984/1: ixp4xx/nslu2: Fix disk LED numbering (take 2)
[ARM] 3994/1: ixp23xx: fix handling of pci master aborts
[ARM] 3981/1: sched_clock for PXA2xx
[ARM] 3980/1: extend the ARM Versatile sched_clock implementation from 32 to 63 bit
[ARM] 3979/1: extend the SA11x0 sched_clock implementation from 32 to 63 bit period
[ARM] 3978/1: macro to provide a 63-bit value from a 32-bit hardware counter
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cf24400213f8..89ef018cc4bc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -348,6 +348,13 @@ P: Ian Molton | |||
| 348 | M: spyro@f2s.com | 348 | M: spyro@f2s.com |
| 349 | S: Maintained | 349 | S: Maintained |
| 350 | 350 | ||
| 351 | ARM/ATMEL AT91RM9200 ARM ARCHITECTURE | ||
| 352 | P: Andrew Victor | ||
| 353 | M: andrew@sanpeople.com | ||
| 354 | L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) | ||
| 355 | W: http://maxim.org.za/at91_26.html | ||
| 356 | S: Maintained | ||
| 357 | |||
| 351 | ARM/CORGI MACHINE SUPPORT | 358 | ARM/CORGI MACHINE SUPPORT |
| 352 | P: Richard Purdie | 359 | P: Richard Purdie |
| 353 | M: rpurdie@rpsys.net | 360 | M: rpurdie@rpsys.net |