tree 948551299d14d09815e0b012f26589b33e133d8b
parent 3e2a078ca6a0d3122bbf2b904cd7ccf21a5ca21d
parent 08383ef29faa7fa247962e6b8662c8683e34da01
author Linus Torvalds <torvalds@linux-foundation.org> 1215051745 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1215051745 -0700

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