Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 24 Jun 2005 22:33:30 +0000 (15:33 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 24 Jun 2005 22:33:30 +0000 (15:33 -0700)
commitb3e112bcc19abd8e9657dca34a87316786e096f3
tree39040c7a05edd69381c0a25636a1a328d856cb9c
parentf647a27417d2adc43d8c96d3d6f837422fbc076e
parent0a8b80c52f44a6e84206618a8a450ba13a5809dc
Merge master.kernel.org:/home/rmk/linux-2.6-serial