]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2bf9d6d 41b11af)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 11 May 2006 22:46:59 +0000 (15:46 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 11 May 2006 22:46:59 +0000 (15:46 -0700)
* 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


Trivial merge
Linux 2.6 source tree