From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 8 Sep 2008 22:50:19 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.27-rc6~14
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4ced08b89f591521c3d2e3e87ab914016e6b7d94;p=linux-2.6-omap-h63xx.git

Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5241/1: provide ioremap_wc()
  [ARM] omap: fix virtual vs physical address space confusions
  [ARM] remove unused #include <version.h>
  [ARM] omap: fix build error in ohci-omap.c
  [ARM] omap: fix gpio.c build error
---

4ced08b89f591521c3d2e3e87ab914016e6b7d94