Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 24 Jun 2005 00:19:56 +0000 (17:19 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 24 Jun 2005 00:19:56 +0000 (17:19 -0700)
commitadb7ee3746b579a7fa7af7c4ec2c8164bc910ed4
treed8a1f9223b3b7384af7f653a519032b69ef60e0c
parentf46f6b20cb01508f5020142ff91021f8fb39550b
parent691027b91be99413dc60fab0902b366434555015
Merge master.kernel.org:/home/rmk/linux-2.6-arm