diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 22:22:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 22:22:25 -0400 |
| commit | 15895b932b8a047a1db7006a4f9ca74485d5a826 (patch) | |
| tree | 948551299d14d09815e0b012f26589b33e133d8b /fs/efs | |
| parent | 3e2a078ca6a0d3122bbf2b904cd7ccf21a5ca21d (diff) | |
| parent | 08383ef29faa7fa247962e6b8662c8683e34da01 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5131/1: Annotate platform_secondary_init with trace_hardirqs_off
[ARM] 5117/1: pxafb: fix __devinit/exit annotations
[ARM] Export dma_sync_sg_for_device()
[ARM] 5109/1: Mark rtc sa1100 driver as wakeup source before registering it
[ARM] 5116/1: pxafb: cleanup and fix order of failure handling
[ARM] 5115/1: pxafb: fix ifdef for command line option handling
ARM: OMAP: Correcting the gpmc prefetch control register address
ARM: OMAP: DMA: Don't mark channel active in omap_enable_channel_irq
Diffstat (limited to 'fs/efs')
0 files changed, 0 insertions, 0 deletions