Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 16 Jun 2005 20:40:39 +0000 (13:40 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 16 Jun 2005 20:40:39 +0000 (13:40 -0700)
commit97008082eacab047c189028202e055280f799ace
tree5b80274682ef87606f13cd585f78f1c57b22031f
parent043cf3fd20a22df5957c28888f4c8d41438f2140
parent22f11c4e662ef0bdd87f09370a76c83ed738d5fd
Merge master.kernel.org:/home/rmk/linux-2.6-arm