From: Linus Torvalds Date: Thu, 13 Nov 2008 19:30:25 +0000 (-0800) Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm X-Git-Tag: v2.6.28-rc5~21 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=90aaa53c5a5af33a061313681d8f3234712b866b;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] 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 --- 90aaa53c5a5af33a061313681d8f3234712b866b