From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Jul 2008 02:22:25 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.26-rc9~74
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15895b932b8a047a1db7006a4f9ca74485d5a826;p=linux-2.6

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
---

15895b932b8a047a1db7006a4f9ca74485d5a826