From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 16 Apr 2007 20:21:11 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: firefly_0821_release~30364
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1d00e832f0d65039abdebf83054b323a9aa05687;p=firefly-linux-kernel-4.4.55.git

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4313/1: S3C24XX: Update s3c2410 defconfig to 2.6.21-rc6
  [ARM] Update mach-types
---

1d00e832f0d65039abdebf83054b323a9aa05687