Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Sep 2008 22:50:19 +0000 (15:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Sep 2008 22:50:19 +0000 (15:50 -0700)
commit4ced08b89f591521c3d2e3e87ab914016e6b7d94
treeba5850b531db27d4fb8960b17bf7ddce0f5749d7
parente1d7bf14999469b16e86889ac71c94a9d0d2f5f4
parent1ad77a876da48331451698cc4172c90ab9b6372f
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