Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 15 Jan 2006 21:33:09 +0000 (13:33 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 15 Jan 2006 21:33:09 +0000 (13:33 -0800)
commit0238cb4e7583c521bb3538060f98a73e65f61324
tree87081082bfd5c89fddfc1b351f31f6b5a14bfce5
parent3527761cb403fba72a37c4e6a1fad76eeedd990c
parentef0498a7bfbb5773e7ba4235207054b81ad5120e
Merge master.kernel.org:/home/rmk/linux-2.6-arm