Merge master.kernel.org:/home/rmk/linux-2.6-arm
commit1b41526975d8318ca17c93f724893884d03a0560
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 5 Jun 2006 23:22:26 +0000 (5 16:22 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 5 Jun 2006 23:22:26 +0000 (5 16:22 -0700)
tree929f6def777a63e1565b751ad70f5ae75b07c660
parentb1c231f5a57cb4a417c38a8a946f1e66db3bb9c0
parenta7d14f875f03cb78992da8387be81a4c9197f101
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