Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 16 Jun 2005 20:22:23 +0000 (13:22 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 16 Jun 2005 20:22:23 +0000 (13:22 -0700)
commit043cf3fd20a22df5957c28888f4c8d41438f2140
treeca0c79f43fd55a34e7694290e9d214cf59ca6819
parentc081474c184b34136e09e1e335f41356a11c7b68
parent95220a2ea334b5ff2168cc9bf31c0e08b29bae21
Merge master.kernel.org:/home/rmk/linux-2.6-arm