Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 24 Jun 2005 22:32:01 +0000 (15:32 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 24 Jun 2005 22:32:01 +0000 (15:32 -0700)
commitf647a27417d2adc43d8c96d3d6f837422fbc076e
tree3cac5147575ba4cbd63cb8fa226b95e7886e1d7c
parent75043cb5b386e5a01fd03b88f647dd992de02f97
parent2966207c7e5945947c4db3a48aa4fa819807c5be
Merge master.kernel.org:/home/rmk/linux-2.6-arm