ree f7d841e7e1aecfb639fedb1bfefeb5f6ba7fa22d
parent 906bf113beb07a76b665c3863aa864acdc8f9950
parent 8959dabdf2f8f9ce982a2c4cfe6d1652a2fb6320
author Linus Torvalds <torvalds@linux-foundation.org> 1226604625 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1226604625 -0800

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] cdb89712: avoid namespace clashes with SRAM_ and BOOTROM_ constants
  [ARM] cdb89712,clps7500,h720x: avoid namespace clash for FLASH_* constants
  [ARM] integrator,realview,versatile: remove FLASH_* and EPROM_* constants
  [ARM] dma-mapping: fix compiler warning
  [ARM] iop: iop3xx needs registers mapped uncached+unbuffered
  [ARM] versatile: correct MMC clock rate
  [ARM] realview: correct MMC clock rate
  [ARM] 5329/1: Feroceon: fix feroceon_l2_inv_range
ÌU