Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Sep 2008 23:04:42 +0000 (16:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Sep 2008 23:04:42 +0000 (16:04 -0700)
commite72a68fc26887d2097fd7f14794aeb7c17851a5d
treed7e6b740bf3c01cfc4b089653da7c16411ec6187
parent1cce92aef225171705c3f53a871938abca2177de
parent58005b325394b18b8b6a737e06b4128deb2c4e63
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()