Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 19 Apr 2006 01:01:19 +0000 (18:01 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 19 Apr 2006 01:01:19 +0000 (18:01 -0700)
commitc63f774ca10efa7cbcbd555c072353e1a7ab7fbe
tree69e843c2f25e384929579be2c3768618ea5b90c4
parent385910f2b275a636238f70844f1b6da9fda6f2da
parent608c783aaa0abe39e3672f65b786cdade8db6df9
Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3479/1: Corgi SSP: Fix potential concurrent access problem
  [ARM] 3478/1: SharpSL SCOOP: Fix potenial build failure