From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 11 May 2006 22:46:59 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.17-rc4~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d649dafd0713f2f3dfe29baa783868db33aa2c11;p=linux-2.6

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3508/1: Update collie defconfig
  [ARM] Fix thread struct allocator for SMP case
  [ARM] Update mach-types
  [ARM] Update versatile_defconfig
---

d649dafd0713f2f3dfe29baa783868db33aa2c11