tree 368ce644cc63a1a377b9254b440bfa73fd970919
parent 62568510b8e2679cbc331d7de10ea9ba81ae8b3d
parent e6b50c8d58bde1cdc5c9c9520be7ed8921d26aab
author Linus Torvalds <torvalds@linux-foundation.org> 1231887155 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1231887155 -0800

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  TWL4030: fix clk API usage
  [ARM] 5364/1: allow flush_ioremap_region() to be used from modules
  [ARM] w90x900: fix build errors and warnings
  [ARM] i.MX add missing include
  [ARM] i.MX: fix breakage from commit 278892736e99330195c8ae5861bcd9d791bbf19e
  [ARM] i.MX: remove LCDC controller register definitions from imx-regs.h