From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 9 Nov 2007 23:24:19 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.24-rc3~172
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45ff993d2b0b4c07038457cdf07ecf648abd3d78;p=linux-2.6

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] pxa: fix one-shot timer mode
  [ARM] 4645/1: Cyberpro: Trivial fix to restore 16bpp mode.
  [ARM] 4644/2: fix flush_kern_tlb_range() in module space
  [ARM] Allow watchdog drivers to be selected again
  [ARM] 4633/1: omap build fix when FB enabled
  [ARM] 4642/2: netX: default config for netx based boards
  [ARM] 4641/2: netX: fix kobject_name type
  [ARM] Fix iop3xx macro
---

45ff993d2b0b4c07038457cdf07ecf648abd3d78