From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 5 Jun 2006 23:22:26 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.17-rc6~4
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=1b41526975d8318ca17c93f724893884d03a0560;p=cascardo%2Flinux.git

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3543/1: [Fwd: PXA270 bootparams address not set]
  [ARM] Trivial typo fixes
---

1b41526975d8318ca17c93f724893884d03a0560