Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 16 Apr 2007 20:21:11 +0000 (13:21 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 16 Apr 2007 20:21:11 +0000 (13:21 -0700)
commit1d00e832f0d65039abdebf83054b323a9aa05687
tree5330573338f976957d3a156cb015c9ef5d40b946
parent94a05509a9e11806acd797153d03019706e466f1
parent1af1e32adef775dfc103f9679417009f2cf838ab
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