tree 219379815f3d658a499f6a1a2971c9e7b14377b7
parent 2bf9d6d0f2dadc2a6c13684719c67dc043b9ce67
parent 41b11afb048d67cc0e221191191ba0b2012dce47
author Linus Torvalds <torvalds@g5.osdl.org> 1147387619 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1147387619 -0700

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