tree d7e6b740bf3c01cfc4b089653da7c16411ec6187
parent 1cce92aef225171705c3f53a871938abca2177de
parent 58005b325394b18b8b6a737e06b4128deb2c4e63
author Linus Torvalds <torvalds@linux-foundation.org> 1221865482 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1221865482 -0700

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5255/1: Update jornada ssp to remove build errors/warnings
  [ARM] omap: back out 'internal_clock' support
  [ARM] 5249/1: davinci: remove redundant check in davinci_psc_config()